src/views/cost/csotSettlement/component/exportDialog.vue

@@ -8,23 +8,19 @@
             :before-close="handleCloseDialog"
             width="30%"
         >
-            <el-form
+            <el-form :model="exportParams" label-width="120px">
-                :model="exportForm"
+                <el-form-item label="导出月份">
-                label-width="120px"
-                :rules="rules"
-                ref="formRef"
-            >
-                <!-- <el-form-item label="导出月份">
                     <el-date-picker
                         v-model="exportParams.dateMonth"
                         type="month"
                         placeholder="请选择导出月份"
                         value-format="yyyy-MM"
                     />
-                  
+                    <!-- 根据后台参数要求，是传递月份数字，还是 XXXX - XX 日期格式 -->
-                </el-form-item> -->
+                    <!-- value-format 可设置 M 或  yyyy-M-->
-                <el-form-item label="费用承担方" prop="costBearingParty">
+                </el-form-item>
-                    <el-checkbox-group v-model="exportForm.costBearingParty">
+                <el-form-item label="费用承担方">
+                    <el-checkbox-group v-model="exportParams.costBear">
                         <el-checkbox label="01" name="01" />
                         <el-checkbox label="03" name="03" />
                     </el-checkbox-group>
@@ -52,16 +48,11 @@ export default {
             default: () => false,
         },
     },
-
     data() {
         return {
-            exportForm: {
+            exportParams: {
-                costBearingParty: ['01', '03'],
+                dateMonth: '',
-            },
+                costBear: ['01', '03'],
-            rules: {
-                costBearingParty: [
-                    { required: true, message: '请选择费用承担方' },
-                ],
             },
         }
     },
@@ -72,18 +63,14 @@ export default {
         },
         /** 确定 */
         handleSubmit() {
-            this.$refs.formRef.validate((valid) => {
+            this.$emit('handleSubmit', this.exportParams)
-                if (valid) {
-                    this.$emit('handleSubmit', this.exportForm.costBearingParty)
-                }
-            })
         },
     },
     watch: {
         exportDialogVisible: {
             handler(newVla) {
                 if (!newVla) {
-                    // this.exportParams.dateMonth = ''
+                    this.exportParams.dateMonth = ''
                 }
             },
         },

src/views/cost/csotSettlement/component/finishAndDetails.vue

@@ -262,9 +262,9 @@ export default {
             ).then(async () => {
                 // 1. 先判断01 03 承担方是否有数据  若有数据 先确认终结日期是否为空 若为空 提示客户修改
                 this.$message.closeAll()
-                let isFlag = false
                 try {
                     // 1.1  先循环列表数据 判断 终结日期是否为空
+                    let isFlag = false
                     if (this.settleTableData_01.length > 0) {
                         this.settleTableData_01.map((e, v) => {
                             if (!e.endTime) {

src/views/cost/csotSettlement/component/monthRecord.vue

@@ -277,7 +277,7 @@ export default {
                 return
             } else if (!row && this.selectList.length > 0) {
                 this.selectList.map((e) => {
-                    exportList[0].codeNum += e.codeNum + ','
+                    exportList[0].codeNum += e.codeNum + '，'
                 })
                 exportList[0].codeNum = exportList[0].codeNum.slice(0, -1)
             } else {

src/views/cost/csotSettlement/costApplyList.vue

@@ -84,7 +84,6 @@
                 :data="agreementList"
                 border
                 @selection-change="handleSelectionChange"
-                ref="tableRef"
             >
                 <el-table-column type="selection" width="55" align="center" />
                 <el-table-column
@@ -169,7 +168,6 @@
             <!-- 批量导出月结明细 -->
             <ExportDialog
                 :exportDialogVisible="exportDialogVisible"
-                :exportParams="exportParams"
                 @handleCloseDialog="handleCloseDialog"
                 @handleSubmit="handleSubmit"
             />
@@ -258,8 +256,6 @@ export default {
             pageContent: '',
             // 查询月结记录的参数
             agreementId: '',
-            // 批量导出的参数
-            exportParams: [],
         }
     },
     created() {
@@ -339,16 +335,7 @@ export default {
                 return
             }
 
-            //  获取选中导出的协议 id 并组装参数
-            this.ids.forEach((e) => {
-                this.exportParams.push({
-                    agreementId: e.agreementId,
-                    costBearingParty: '',
-                })
-            })
-
             this.exportDialogVisible = true
-            this.$refs.tableRef.clearSelection()
         },
         /** 关闭弹框 */
         handleCloseDialog() {
@@ -356,18 +343,8 @@ export default {
         },
         /** 确定按钮 */
         handleSubmit(form) {
-            if (form.length === 1) {
+            console.log(form, '子组件传递的数据---')
-                this.exportParams.forEach((e) => {
+            // 拿到参数走导出逻辑 导出成功则关闭弹框
-                    e.costBearingParty = form[0]
-                })
-            }
-
-            this.downloadJson(
-                'material/sltAgreementInfo/exportSltInfoMonth',
-                JSON.stringify(this.exportParams),
-                `月结明细${new Date().getTime()}.xlsx`,
-            )
-
             this.exportDialogVisible = false
         },
         /** 月结记录 */

src/views/dashboard.vue

@@ -13,12 +13,11 @@ export default {
     },
     created() {
         const origin = window.location.origin
-        this.jumpUrl = origin
+        if (origin == 'http://112.29.103.165:21626') {
-        // if (origin == 'http://192.168.0.56:21626') {
+            this.jumpUrl = origin
-        //     this.jumpUrl = origin
+        } else {
-        // } else {
+            this.jumpUrl = 'http://192.168.0.14:18866'
-        //     this.jumpUrl = 'http://192.168.0.14:18866'
+        }
-        // }
         this.openNewWindow()
         this.$tab.closePage().then(() => {})
     },