From 10454298c73ab2e6cc1857b28c67a5cf18a6411f Mon Sep 17 00:00:00 2001
From: hyt <958868763@qq.com>
Date: Fri, 14 Jun 2024 15:43:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=81=E6=95=B0=E6=8D=AE=E6=BA=90=E3=80=81=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foregroundTask/rightDialog.vue            | 327 +++++++++---------
 1 file changed, 169 insertions(+), 158 deletions(-)

diff --git a/src/views/newIntegrationTask/foregroundTask/rightDialog.vue b/src/views/newIntegrationTask/foregroundTask/rightDialog.vue
index 5e2b786..f21c18a 100644
--- a/src/views/newIntegrationTask/foregroundTask/rightDialog.vue
+++ b/src/views/newIntegrationTask/foregroundTask/rightDialog.vue
@@ -45,14 +45,14 @@
         <!--        编码-->
         <template v-slot:argName="{ row }">
           <div style="width: 100%">
-            {{row.argName}}
+            {{ row.argName }}
           </div>
         </template>
         <template v-slot:argValue="{ row }">
           <div style="width: 100%">
             <!--            若参数类型为1 （字符串） 否则为2 （日期）-->
             <template v-if="row.argType==1">
-              <template v-if="!submitShow">{{row.argValue}}</template>
+              <template v-if="!submitShow">{{ row.argValue }}</template>
               <el-input
                 v-else
                 v-model="row.argValue"
@@ -61,9 +61,9 @@
                 :disabled="!submitShow"
               ></el-input>
             </template>
-<!--            日期选择器-->
+            <!--            日期选择器-->
             <template v-else-if="row.argType==2">
-              <template v-if="!submitShow">{{row.startDate}}/{{row.endDate}}</template>
+              <template v-if="!submitShow">{{ row.startDate }}/{{ row.endDate }}</template>
               <template v-else>
                 <el-date-picker
                   v-model="row.startDate"
@@ -71,7 +71,8 @@
                   placeholder="选择开始日期"
                   :disabled="!submitShow"
                   format="yyyy 年 MM 月 dd 日"
-                  value-format="yyyy-MM-dd">
+                  value-format="yyyy-MM-dd"
+                >
                 </el-date-picker>
                 <el-date-picker
                   v-model="row.endDate"
@@ -79,13 +80,14 @@
                   placeholder="选择结束日期"
                   :disabled="!submitShow"
                   format="yyyy 年 MM 月 dd 日"
-                  value-format="yyyy-MM-dd">
+                  value-format="yyyy-MM-dd"
+                >
                 </el-date-picker>
               </template>
             </template>
             <!--              年月-->
             <template v-else-if="row.argType==3">
-              <template v-if="!submitShow">{{row.argValue}}</template>
+              <template v-if="!submitShow">{{ row.argValue }}</template>
               <template v-else>
                 <el-date-picker
                   v-model="row.argValue"
@@ -93,13 +95,14 @@
                   placeholder="年月"
                   :disabled="!submitShow"
                   format="yyyy 年 MM 月"
-                  value-format="yyyy-MM">
+                  value-format="yyyy-MM"
+                >
                 </el-date-picker>
               </template>
             </template>
             <!--              年月日-->
             <template v-else-if="row.argType==4">
-              <template v-if="!submitShow">{{row.argValue}}</template>
+              <template v-if="!submitShow">{{ row.argValue }}</template>
               <template v-else>
                 <el-date-picker
                   v-model="row.argValue"
@@ -107,19 +110,21 @@
                   placeholder="年月日"
                   :disabled="!submitShow"
                   format="yyyy 年 MM 月 DD 日"
-                  value-format="yyyy-MM-DD">
+                  value-format="yyyy-MM-DD"
+                >
                 </el-date-picker>
               </template>
             </template>
             <!--              年月日时间-->
             <template v-else-if="row.argType==5">
-              <template v-if="!submitShow">{{row.argValue}}</template>
+              <template v-if="!submitShow">{{ row.argValue }}</template>
               <template v-else>
                 <el-date-picker
                   v-model="row.argValue"
                   type="datetime"
                   placeholder="年月日时间"
-                  :disabled="!submitShow">
+                  :disabled="!submitShow"
+                >
                 </el-date-picker>
               </template>
             </template>
@@ -135,7 +140,7 @@
         </template>
         <template v-slot:remark="{ row }">
           <div style="width: 100%">
-            <template v-if="!submitShow">{{row.remark}}</template>
+            <template v-if="!submitShow">{{ row.remark }}</template>
             <el-input
               v-else
               v-model="row.remark"
@@ -163,12 +168,13 @@
 </template>
 
 <script>
-import baseRightDialog from "@/components/base/baseRightDialog";
-import baseNewSelect from "./baseNewSelect.vue"
-import baseForm from "@/components/base/baseNewForm";
-import baseTable from "@/components/base/baseTable";
-import configData from "./configData";
-import { authApi } from "@/api/apis/auth";
+import baseRightDialog from '@/components/base/baseRightDialog'
+import baseNewSelect from './baseNewSelect.vue'
+import baseForm from '@/components/base/baseNewForm'
+import baseTable from '@/components/base/baseTable'
+import configData from './configData'
+import { authApi } from '@/api/apis/auth'
+
 export default {
   components: {
     baseRightDialog,
@@ -179,8 +185,8 @@ export default {
   data() {
     return {
       dialogVisible: false,
-      dialogTitle: "",
-      dialogType: "",
+      dialogTitle: '',
+      dialogType: '',
       formRow: configData.formRow,
       basicsRules: configData.basicsRules,
       vLoading: false,
@@ -191,75 +197,75 @@ export default {
       tableVersionColumn: configData.tableVersionColumn,
       funData: [],
       isEdit: false,
-      select_dist:{},
-      plugNameOptions:[],
-      tableColumn:configData.operationTableColumn,//操作记录
-      tableData:[],
-    };
+      select_dist: {},
+      plugNameOptions: [],
+      tableColumn: configData.operationTableColumn,//操作记录
+      tableData: []
+    }
   },
   mounted() {
     this.initSelect()
   },
   methods: {
     // 插件下拉
-    async initSelect(){
+    async initSelect() {
       let res = await authApi(
-        "pluginService",
-        "plugins",
-        "queryPlugins",
-        "",
+        'pluginService',
+        'plugins',
+        'queryPlugins',
+        '',
         {
-          "pluginType": "1"
+          'pluginType': '1'
         }
-      );
-      if(res.status == 200){
+      )
+      if (res.status == 200) {
         console.log(res.attribute)
-        res.attribute.forEach(item=>{
-          this.$set(this.select_dist,item.pluginId,item)
+        res.attribute.forEach(item => {
+          this.$set(this.select_dist, item.pluginId, item)
         })
         this.formRow[0].elCol[0].options = res.attribute
       }
     },
     //下拉改变事件
-    selectChangeHandle(val, options){
-      if(!val){
-        this.tableVersionData=[]
+    selectChangeHandle(val, options) {
+      if (!val) {
+        this.tableVersionData = []
         return
       }
       //找到这条
-      let obj = options.find(item=>{
+      let obj = options.find(item => {
         return item.plugName === val
       })
       console.log(obj)
-      this.$set(this.$refs.basicsForm.ruleForm,'plugId',obj.plugId)
-      this.$set(this.$refs.basicsForm.ruleForm,'plugName',obj.plugName)
+      this.$set(this.$refs.basicsForm.ruleForm, 'plugId', obj.plugId)
+      this.$set(this.$refs.basicsForm.ruleForm, 'plugName', obj.plugName)
       this.searchInfo(obj.plugId)
     },
     //下拉后查询单据详情
-    async searchInfo(plugId){
+    async searchInfo(plugId) {
       let params = {
         plugId
-      };
+      }
       let res = await authApi(
-        "sysPlugArgService",
-        "integrationTaskService",
-        "getPlugArgByPlugId",
-        "",
+        'sysPlugArgService',
+        'integrationTaskService',
+        'getPlugArgByPlugId',
+        '',
         params
-      );
-      console.log(res,'res')
-      if(res.status ==200){
+      )
+      console.log(res, 'res')
+      if (res.status == 200) {
         //数据处理
         let arr = []
-        res.attribute.forEach(item=>{
+        res.attribute.forEach(item => {
           arr.push({
-            startDate:"",
-            endDate:"",
-            remark:"",
-            argValue:"",
-            argName:item.argName,
-            argCode:item.argCode,
-            argType:item.argType,
+            startDate: '',
+            endDate: '',
+            remark: '',
+            argValue: '',
+            argName: item.argName,
+            argCode: item.argCode,
+            argType: item.argType
           })
 
         })
@@ -268,71 +274,71 @@ export default {
     },
     openDialog(type, row) {
       // this.queryProductClassfy();
-      this.formRow = configData.formRow;
-      this.submitShow = true;
+      this.formRow = configData.formRow
+      this.submitShow = true
       this.isEdit = false
       this.funData = []
       // 新增
-      if (type == "add") {
-        this.dialogTitle = "新增";
-        this.dialogType = "add";
+      if (type == 'add') {
+        this.dialogTitle = '新增'
+        this.dialogType = 'add'
       }
       // 编辑
-      if (type == "edit") {
+      if (type == 'edit') {
         this.isEdit = true
-        this.dialogTitle = "编辑";
-        this.dialogType = "edit";
-        this.productGetById(row.id);
+        this.dialogTitle = '编辑'
+        this.dialogType = 'edit'
+        this.productGetById(row.id)
       }
       // 查看
-      if (type == "show") {
-        this.funData = Object.assign([],[])
-        this.submitShow = false;
-        this.formRow = configData.formRowShow;
-        this.dialogTitle = "查看";
-        this.dialogType = "show";
-        this.productGetById(row.id);
+      if (type == 'show') {
+        this.funData = Object.assign([], [])
+        this.submitShow = false
+        this.formRow = configData.formRowShow
+        this.dialogTitle = '查看'
+        this.dialogType = 'show'
+        this.productGetById(row.id)
 
       }
-      this.dialogVisible = true;
+      this.dialogVisible = true
     },
     // 编辑详情
     async productGetById(id) {
       let params = {
-        id: id,
-      };
+        id: id
+      }
       let res = await authApi(
-        "sysIntegratedForegroundTaskService",
-        "integrationTaskService",
-        "getIntegratedForegroundTask",
-        "",
+        'sysIntegratedForegroundTaskService',
+        'integrationTaskService',
+        'getIntegratedForegroundTask',
+        '',
         params
-      );
-      if (res.status == "200") {
+      )
+      if (res.status == '200') {
         this.$nextTick(() => {
-          this.$refs.basicsForm.incomingParameters(res.attribute);
-          this.tableVersionData=res.attribute.sysIntegratedForegroundTaskDetailEntityList
-          this.tableVersionData.forEach(item=>{
-            if(item.argType ==2){
+          this.$refs.basicsForm.incomingParameters(res.attribute)
+          this.tableVersionData = res.attribute.sysIntegratedForegroundTaskDetailEntityList
+          this.tableVersionData.forEach(item => {
+            if (item.argType == 2) {
               //日期处理
-              this.$set(item,'startDate',item.argValue.split("/")[0])
-              this.$set(item,'endDate',item.argValue.split("/")[1])
+              this.$set(item, 'startDate', item.argValue.split('/')[0])
+              this.$set(item, 'endDate', item.argValue.split('/')[1])
             }
           })
-          this.tableData=res.attribute.sysIntegratedForegroundTaskParameterEntities
+          this.tableData = res.attribute.sysIntegratedForegroundTaskParameterEntities
           // let result = [];
           // this.tableVersionData = Object.assign([], result);
-        });
+        })
       }
     },
     addVersionDialog() {
       let obj = {
-        argName:"",
-        argCode:"",
-        argType:"1",
-        remark:"",
-      };
-      this.tableVersionData.push(obj);
+        argName: '',
+        argCode: '',
+        argType: '1',
+        remark: ''
+      }
+      this.tableVersionData.push(obj)
     },
     // 删除
     onFunc(index, row) {
@@ -340,109 +346,114 @@ export default {
         this.$delConfirm().then(() => {
           this.tableVersionData.forEach((item, itemIndex) => {
             if (item.id === row.id) {
-              this.tableVersionData.splice(itemIndex, 1);
+              this.tableVersionData.splice(itemIndex, 1)
             }
-          });
-        });
+          })
+        })
       }
     },
     // 弹窗关闭
     handleDialogClose() {
-      this.tableVersionData = Object.assign([], []);
-      this.$refs.basicsForm.resetFields();
-      this.dialogVisible = false;
+      this.tableVersionData = Object.assign([], [])
+      this.$refs.basicsForm.resetFields()
+      this.dialogVisible = false
     },
     // 弹窗确认按钮
     handleConfirmClick() {
-      this.$refs.basicsForm.$refs["ruleForm"].validate((valid) => {
+      this.$refs.basicsForm.$refs['ruleForm'].validate((valid) => {
         if (!valid) {
-          return;
+          return
         } else {
-          let flag = this.tableVersionData.some((item,index)=>{
+          let flag = this.tableVersionData.some((item, index) => {
             //日期特别处理 例：2024-12-13/2024-12-14
-            if(item.argType ==2){
+            if (item.argType == 2) {
               //判断开始时间和结束时间
-              let startDate = new Date(item.startDate); // 开始日期
-              let endDate = new Date(item.endDate);   // 结束日期
-              if(startDate > endDate){
-                this.$vmNews(`第${index+1}行结束时间不能大于开始时间`)
-                return true
+              if (item.startDate && item.endDate && item.endDate !== 'null' && item.startDate !== 'null') {
+                let startDate = new Date(item.startDate) // 开始日期
+                let endDate = new Date(item.endDate)   // 结束日期
+                if (startDate > endDate) {
+                  this.$vmNews(`第${index + 1}行结束时间不能大于开始时间`)
+                  return true
+                }
+                this.$set(item, 'argValue', item.startDate + '/' + item.endDate)
+              } else {
+                this.$set(item, 'argValue', null)
               }
-              this.$set(item,'argValue',item.startDate + "/" +item.endDate)
             }
           })
-          if(flag) return
+          if (flag) return
           let params = {
             ...this.$refs.basicsForm.ruleForm,
-            sysIntegratedForegroundTaskDetailEntityList: this.tableVersionData,
-          };
-          if (this.dialogType == "add") {
-            this.openLoading("submit");
-            this.productSaveDto(params);
+            sysIntegratedForegroundTaskDetailEntityList: this.tableVersionData
           }
-          if (this.dialogType == "edit") {
-            this.openLoading("submit");
-            this.productUpdateDto(params);
+          if (this.dialogType == 'add') {
+            this.openLoading('submit')
+            this.productSaveDto(params)
+          }
+          if (this.dialogType == 'edit') {
+            this.openLoading('submit')
+            this.productUpdateDto(params)
           }
         }
-      });
+      })
     },
     // 新增保存
     async productSaveDto(params) {
       let res = await authApi(
-        "sysIntegratedForegroundTaskService",
-        "integrationTaskService",
-        "saveIntegratedForegroundTask",
-        "",
+        'sysIntegratedForegroundTaskService',
+        'integrationTaskService',
+        'saveIntegratedForegroundTask',
+        '',
         params
-      );
-      if (res.status == "200") {
-        this.handleDialogClose();
-        this.$vmNews("新增成功", "success");
-        this.$emit("resetTable");
+      )
+      if (res.status == '200') {
+        this.handleDialogClose()
+        this.$vmNews('新增成功', 'success')
+        this.$emit('resetTable')
       }
     },
     // 编辑保存
     async productUpdateDto(params) {
       let res = await authApi(
-        "sysIntegratedForegroundTaskService",
-        "integrationTaskService",
-        "updateIntegratedForegroundTask",
-        "",
+        'sysIntegratedForegroundTaskService',
+        'integrationTaskService',
+        'updateIntegratedForegroundTask',
+        '',
         params
-      );
-      if (res.status == "200") {
-        this.handleDialogClose();
-        this.$vmNews("更新成功", "success");
-        this.$emit("resetTable");
+      )
+      if (res.status == '200') {
+        this.handleDialogClose()
+        this.$vmNews('更新成功', 'success')
+        this.$emit('resetTable')
       }
     },
     // 获取所有产品分类
     async queryProductClassfy() {
       let params = {
-        tab_name: "sys_product",
-        column_name: "classify",
-      };
-      let res = await authApi(
-        "generalServiceImpl",
-        "dictionaryshop",
-        "selectDictionaryshop",
-        "",
-        params
-      );
-      if (res.status == "200") {
-        this.formRow[1].elCol[0].options = res.attribute;
+        tab_name: 'sys_product',
+        column_name: 'classify'
       }
-    },
-  },
-};
+      let res = await authApi(
+        'generalServiceImpl',
+        'dictionaryshop',
+        'selectDictionaryshop',
+        '',
+        params
+      )
+      if (res.status == '200') {
+        this.formRow[1].elCol[0].options = res.attribute
+      }
+    }
+  }
+}
 </script>
 
 <style scoped lang="scss">
-.small_title{
+.small_title {
   margin: 10px 0;
   font-size: 16px;
 }
+
 .dialogList {
   padding: 16px 0;
   border-top: 1px solid #dcdfe6;