Merge branch 'dev' of git.echepei.com:caojunjie/Smart_platform_ui into dev

src/views/basicData/customerInformation/detailsPageEdit.vue

@@ -869,16 +869,10 @@ export default {
       this.$set(this.form, "corpsTypeId", this.detailData.treeDeptId);
       if (this.$route.query) {
         this.$set(this.form, "cname", this.$route.query.corpName);
-        this.$router.push({
-          query: {}
-        });
       }
     } else {
       if (this.$route.query) {
         this.$set(this.form, "cname", this.$route.query.corpName);
-        this.$router.push({
-          query: {}
-        });
       }
     }
     gainUser().then(res => {

src/views/workManagement/main-items/configuration/detailsPage.json

@@ -154,17 +154,6 @@
       "width": 100
     },
     {
-      "label": "提醒日",
-      "prop": "reminderDay",
-      "valueFormat": "yyyy-MM-dd HH:mm:ss",
-      "format": "yyyy-MM-dd",
-      "type": "date",
-      "overHidden": true,
-      "index": 16,
-      "width": 100,
-      "cell": true
-    },
-    {
       "label": "制单人",
       "prop": "createUserName",
       "disabled": true,

src/views/workManagement/main-items/detailsPage.vue

@@ -107,7 +107,8 @@
             <el-button v-if="row.status !== 5" type="text" size="small" @click="beforeCloseAccount(row)">结算</el-button>
             <el-button v-if="row.status === 5" type="text" size="small" :disabled="viewDisabled"
               @click="cancelCloseAccount(row)">取消结算</el-button>
-            <el-button :disabled="row.taskStatus != 10" type="text" size="small" @click="dispatch(row)">派工</el-button>
+            <el-button :disabled="row.taskStatus != 10" type="text" size="small" @click="dispatch(row, index)">派工
+            </el-button>
             <el-button type="text" size="small" @click="rowCellTwo(row, index)"
               :disabled="row.strStatus == '结算完成' || viewDisabled">{{ row.$cellEdit ? '修改完成' : '修改' }}</el-button>
             <el-button type="text" size="small" @click="rowDel(row, index)"
@@ -686,10 +687,17 @@ export default {
             type: "date",
             format: 'yyyy-MM-dd',
             valueFormat: 'yyyy-MM-dd 00:00:00'
+          }, {
+            label: '提醒日期',
+            prop: 'reminderDay',
+            cell: true,
+            type: "date",
+            format: 'yyyy-MM-dd',
+            valueFormat: 'yyyy-MM-dd 00:00:00'
           }
         ]
       },
-
+      pgIndex: 0
     };
   },
   async created() {
@@ -963,7 +971,7 @@ export default {
         this.accountDialog = true;
       }
     },
-    dispatch(row) {
+    dispatch(row, index) {
       if (row.id) {
         this.pgList = []
         if (row.frequency == 4 && row.second) {
@@ -971,22 +979,23 @@ export default {
             this.pgList.push({
               ...row,
               beginTime: "",
+              reminderDay: "",
               jine: row.amount / row.second,
               $cellEdit: true
             })
           }
-
-          //  row.second
         } else {
           this.pgList.push({
             ...row,
             beginTime: "",
+            reminderDay: "",
             jine: row.amount,
             $cellEdit: true
           })
         }
 
       }
+      this.pgIndex = index
       this.pgDialog = true
     },
     pgConfirm() {
@@ -995,10 +1004,18 @@ export default {
           return this.$message.error('请完善开始日期')
         }
       }
+      let projectItemDateList = []
+      this.pgList.forEach((e, index) => {
+        projectItemDateList.push({
+          beginTime: e.beginTime,
+          reminderDay: e.reminderDay
+        })
+      })
+      this.data[this.pgIndex].projectItemDateList = projectItemDateList
       const params = {
         ...this.form,
         ...this.formTwo,
-        itemList: this.pgList,
+        itemList: this.data,
         filesList: this.upLoadData
       }
       dispatch(params).then(res => {

src/views/workManagement/task/index.vue

@@ -23,7 +23,7 @@
       <template slot-scope="{row,index}" slot="menu">
         <el-button type="text" icon="el-icon-view" size="small" @click.stop="copyTo">发送
         </el-button>
-        <el-button type="text" icon="el-icon-edit" :disabled="row.status != 5" size="small"
+        <el-button type="text" icon="el-icon-edit" :disabled="row.status != 5||row.taskStatus==30" size="small"
           @click.stop="completion(row)">完工
         </el-button>
         <el-button type="text" icon="el-icon-edit" size="small" @click.stop="rowCell(row)">{{ row.$cellEdit ? "保存" :
@@ -235,7 +235,7 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       }).then(() => {
-        updateItemStatus(row.id, 4).then(res => {
+        updateItemStatus(row.id, 5).then(res => {
           if (res.data.success) {
             this.$message({
               type: "success",