优化专项行动

monkeyhouyi
1 parent eec97c6a
Showing 4 changed files with 15 additions and 16 deletions
src/components/InfoEditRecord/index.vue
src/views/baseSpecialAction/dynamicModel/list/Form.vue
src/views/baseSystemInfo/index.vue
src/views/overView/Overview.vue
@@ -188,12 +188,12 @@
                 >
                   <el-card>
                     <h4 v-if="v.content">
-                      更新
-                      <p v-for="(item, index) in v.updataList" :key="index">
+                      <!-- <p v-for="(item, index) in v.updataList" :key="index">
                         将“{{ item.PropertyName }}”从“{{
                           item.OldValue
                         }}”改为“{{ item.NewValue }}”
-                      </p>
+                      </p> -->
+                      <p v-for="(item, index) in v.changeRecord" :key="index">{{ item }}</p>
                     </h4>
                     <h4 v-else>
                       <p>{{ v.describe }}</p>
@@ -345,6 +345,7 @@ export default {
           let date = new Date(item.creatorTime * 1000);
           item.updataTime = this.$m(date).format("YYYY-MM-DD HH:mm:ss");
           item.updataList = JSON.parse(item.content);
+          item.changeRecord = item.content ? JSON.parse(item.describe) : item.describe;
         });
         this.updataRecordList = data.list;
         this.record_loading = false;
@@ -162,7 +162,7 @@ export default {
             if (callback && typeof callback === "function") callback()
             this.visible = false
             this.btnLoading = false
-            !this.dataForm.id && this.toSaveItemid(itemId)
+            !this.dataForm.id && await this.toSaveItemid(itemId)
             this.$emit('refreshDataList', true)
           }
         })
@@ -173,7 +173,7 @@ export default {
       let res = await request({
         url: '/Extend/BaseSpecialActionInfo/UpdateState',
         method: "PUT",
-        data: {
+        params: {
           id: this.taskId,
           itemId
         },
@@ -107,21 +107,19 @@
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
-                prop="contactUser"
+                prop="principalName"
                 label="联系人"
                 align="center"
               />
               <el-table-column
                 show-overflow-tooltip
-                prop="contactPhone"
+                prop="principalPhone"
                 label="联系电话"
                 align="center"
               />
-              <el-table-column
-                prop="areaName"
-                label="所属区域"
-                align="center"
-              />
+              <el-table-column label="所属区域" prop="areaId" align="left" show-overflow-tooltip>
+                <template slot-scope="scope">{{ scope.row.areaId | dynamicText(areaOptions) }}</template>
+              </el-table-column>
               <el-table-column label="操作" width="250">
                 <!-- 查看，修改，归属地变更，上报 -->
                 <template slot-scope="scope">
@@ -280,6 +278,7 @@ export default {
   },
   created() {
     this.initSystemTypeList();
+    this.initAreaTypeList();
     this.initList();
   },
   mounted() {},
@@ -334,7 +333,6 @@ export default {
               systemName: v.SysytemInfo.SystemName,
               systemType: v.SysytemInfo.SystemType,
               systemClass: v.SysytemInfo.SystemClass,
-              areaName: v.SysytemInfo.AreaName,
               areaId: v.SysytemInfo.AreaId,
               principalName: v.SysytemInfo.PrincipalName,
               principalPhone: v.SysytemInfo.PrincipalPhone,
@@ -121,7 +121,7 @@
     </el-row>
     <MsgForm v-if="MsgFormVisible" ref="MsgForm" @refreshDataList="msgRefresh"/>
     <HandleInspectForm v-if="HandleInspectFormVisible" ref="HandleInspectForm" @refresh="(val) => {taskRefresh('HandleInspectFormVisible', val)}"/>
-    <NCC-Form v-if="formVisible" ref="NCCForm" @refresh="(val) => {taskRefresh('formVisible', val)}" />
+    <NCC-Form v-if="formVisible" ref="NCCForm" @refreshDataList="(val) => {taskRefresh('formVisible', val)}" />
   </div>
 </template>
@@ -270,8 +270,8 @@ export default {
         })
       } else if(row.taskType == '专项行动') {
         this.formVisible = true;
-        let data = await this.getBaseSpecialActionInfo('588008032122701061');
-        // let row = await this.getBaseSpecialActionInfo(row.taskCorrelationId);
+        // let data = await this.getBaseSpecialActionInfo('588008032122701061');
+        let data = await this.getBaseSpecialActionInfo(row.taskCorrelationId);
         var  Itemid = data.itemId || '';//数据id，没有的话就是新增 ，有的话就是修改
         var  modelId = data.formId;//关联的表单id
         var taskId = data.id; // 当前专项行动id