feat: There is no way the, bug #52552 #52542

src/pages/processCenter/pages/creatProcess/zczqyj/step1.vue

@@ -324,6 +324,7 @@
         </el-button>
       </div>
     </el-drawer>
+    <loading :loading="dataLoading">正在加载数据</loading>
   </div>
 </template>
 
@@ -353,6 +354,7 @@ export default {
         // 任务分解单数据
         taskTableData: []
       },
+      dataLoading: false,
       loadSarStandard: false,
       lawsTextStateOptions: [],
       standardDrawer: false,
@@ -455,6 +457,7 @@ export default {
   },
   methods: {
     getData(){
+      this.dataLoading = true
       queryTaskFirst({
         bpnId: this.$route.query.bpnId
       }).then(res => {
@@ -462,6 +465,7 @@ export default {
         this.form = mes.form
         this.roleForm = mes.roleForm
         this.commentText = mes.commentText
+        this.dataLoading = false
       });
     },
     filterObj(obj){
@@ -480,7 +484,6 @@ export default {
         case 1:
           this.standardCheckedList = []
           this.standardDrawer = false
-          this.verifySarStandard = true
           this.clearFormData(this.form)
           break
           // 带入
@@ -490,6 +493,8 @@ export default {
           }else if(this.standardCheckedList.length > 1){
               this.$message.warning('您只能选择一条政策信息进行带入')
           }else{
+            this.dataLoading = true
+            this.standardDrawer = false
             this.$http.get('lawss/sarLawsInfo/getStandInfoUpdateById', {id: this.standardCheckedList[0].id}, {
               _this: this
             }, res => {
@@ -514,8 +519,7 @@ export default {
                 this.form.prcNum = this.prcNum
                 this.form.prcName = this.prcName
                 this.form['id'] = bringData.id
-                this.standardDrawer = false
-                this.verifySarStandard = true
+                this.dataLoading = false
                 this.busVsFunc()
                 this.modelFunc()
                 this.$forceUpdate()
@@ -668,7 +672,7 @@ export default {
         if (valid) {
           this.$refs['Form'].validate((valid) => {
             if (valid) {
-              var json = Object.assign(this.form, this.roleForm)
+              const json = Object.assign(this.form, this.roleForm);
               json.commentText = this.commentText
               json.filesId = this.addFjList
               json.filesName = this.form.fjListName

src/pages/processCenter/pages/creatProcess/zczqyj/step2.vue

@@ -145,6 +145,7 @@
         @checkedRole="checkedRole2"
         :nodeList="nodeList"
     ></Role-tree>
+    <loading :loading="dataLoading">正在加载数据</loading>
   </div>
 </template>
 
@@ -159,6 +160,7 @@ export default {
   name: "zczqyjStep2",
   data() {
     return {
+      dataLoading: true,
       drawerModal: false,
       histortData: [],
       commentText: "",
@@ -284,17 +286,12 @@ export default {
     //保存事件
     handleSave() {
       this.saveLoading = true;
-      let json = this.json;
-      json.commentText = this.commentText;
-      json.responUserList = this.form.responUserList;
-      json.responUserListName = this.form.responUserListName;
-      json.responUserAndInstitutionNameMap = this.form.responUserAndInstitutionNameMap;
       let _formData = new FormData();
       _formData.append("id", this.bpnId || "");
       _formData.append("prcType", "laws2");
       _formData.append("taskIds", this.taskIds);
       _formData.append("json", JSON.stringify({
-        form: json,
+        form: this.form,
         dataList: this.dataList,
         commentText: this.commentText
       }));
@@ -311,7 +308,7 @@ export default {
         if (valid) {
           this.isSubmit = true;
           this.saveLoading = true;
-          var json = this.json;
+          var json = Object.assign(this.form)
           json.commentText = this.commentText;
           json.responUserList = this.form.responUserList;
           json.responUserListName = this.form.responUserListName;
@@ -335,24 +332,63 @@ export default {
         }
       });
     },
+    getFormFieldList (item) {
+      this.$nextTick(() => {
+        this.form = JSON.parse(JSON.stringify(item))
+        this.form['id'] = item.id
+        this.form.lawsNumber =  item.form ? item.form.lawsNumber : item.lawsNumber
+        this.form.responUserAndInstitutionNameMap = item.form ? item.form.responUserAndInstitutionNameMap : ''
+        this.form.lawsName = item.form ? item.form.lawsName : item.lawsName
+        this.form.responUserList = item.form ? item.form.responUserList: ''
+        this.form.responUserListName = item.form ? item.form.responUserListName : ''
+        this.form.endTime =  item.form ? item.form.endTime : item.endTime
+        this.form.cname =  item.form ? item.form.cname : item.cname
+        this.form.fjList =  item.form ? item.form.fjList : item.fjList
+        this.form.fjListId = item.form ?  item.form.fjListId : item.fjListId
+        this.dataLoading = false
+      })
+    },
+    filterObj(obj){
+      if(obj && obj !== ''){
+        if(obj instanceof Array){
+          return obj;
+        }else {
+          return obj.split(",")
+        }
+      }
+      return "";
+    },
+    getTaskId (item) {
+      this.form = item.form
+      this.form.lawsNumber =  item.form ? item.form.lawsNumber : item.lawsNumber
+      this.form.responUserAndInstitutionNameMap = item.form ? item.form.responUserAndInstitutionNameMap : ''
+      this.form.lawsName = item.form ? item.form.lawsName : item.lawsName
+      this.form.responUserList = item.form ? item.form.responUserList: ''
+      this.form.responUserListName = item.form ? item.form.responUserListName : ''
+      this.form.endTime =  item.form ? item.form.endTime : item.endTime
+      this.form.cname =  item.form ? item.form.cname : item.cname
+      this.form.fjList =  item.form ? item.form.fjList : item.fjList
+      this.form.fjListId = item.form ?  item.form.fjListId : item.fjListId
+      this.roleForm = item.roleForm
+      this.commentText = item.commentText
+      this.dataLoading = false
+    },
     getData() {
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-          let data = JSON.parse(res.mesg)
-          this.form.lawsNumber =  data.form ? data.form.lawsNumber : data.lawsNumber
-          this.form.responUserAndInstitutionNameMap = data.form ? data.form.responUserAndInstitutionNameMap : ''
-          this.form.lawsName = data.form ? data.form.lawsName : data.lawsName
-          this.form.responUserList = data.form ? data.form.responUserList: ''
-          this.form.responUserListName = data.form ? data.form.responUserListName : ''
-          this.form.endTime =  data.form ? data.form.endTime : data.endTime
-          this.form.cname =  data.form ? data.form.cname : data.cname
-          this.form.fjList =  data.form ? data.form.fjList : data.fjList
-          this.form.fjListId = data.form ?  data.form.fjListId : data.fjListId
-          this.json = data.form ? data.form : data
-          this.commentText = data.form ?  data.form.commentText : ''
+          if (res) {
+            const processForm = JSON.parse(res.mesg)
+            if (processForm.form === undefined) {
+              this.getFormFieldList(processForm)
+            } else {
+              //表单文件处理
+              this.getTaskId(processForm)
+            }
+
+          }
         }).catch(e => {
         });
       });

src/pages/processCenter/pages/creatProcess/zczqyj/step3.vue

@@ -230,6 +230,7 @@
         :is-visible.sync="drawerModal"
         @checkedRole="checkedRole"
     ></Role-tree>
+    <loading :loading="dataLoading">正在加载数据</loading>
   </div>
 </template>
 
@@ -244,6 +245,7 @@ export default {
   name: "zczqyjStep3",
   data() {
     return {
+      dataLoading: true,
       drawerModal: false,
       todoId: '',
       histortData: [],
@@ -405,16 +407,12 @@ export default {
     handleSave() {
       this.isSubmit = true;
       this.saveLoading = true;
-      let json = this.json
-      json.commentText = this.commentText
-      json.info = this.data
-      json.form = this.form
       let _formData = new FormData();
       _formData.append("id", this.bpnId || "");
       _formData.append("prcType", "laws2");
       _formData.append("taskIds", this.taskIds);
       _formData.append("json", JSON.stringify({
-        form: json,
+        form: this.form,
         dataList: this.data,
         commentText: this.commentText
       }));
@@ -458,10 +456,9 @@ export default {
         else {
           this.isSubmit = true
           this.saveLoading = true;
-          var json = this.json
+          var json = Object.assign(this.form)
           json.commentText = this.commentText
           json.info = this.data
-          json.form = this.form
           for (let i = 0; i < json.info.length; i++) {
             json.info[i].department = this.form.department
           }
@@ -482,36 +479,39 @@ export default {
         }
       }
     },
+    getTaskId (mesg) {
+      this.form = mesg.form
+      this.form.commentUser = this.$store.getters.userInfo.userId
+      this.form.commentUserName = this.$store.getters.userInfo.userName
+      this.data = mesg.form ? mesg.dataList : []
+      this.commentText = mesg.form ? mesg.commentText : ''
+      let commitStatus = mesg.commitStatus
+      if (commitStatus && commitStatus > 0) {
+        this.acceptShow = true
+        this.submitShow = false
+      } else {
+        this.acceptShow = false
+        this.submitShow = true
+      }
+      this.todoId = mesg.id
+      for (let i = 0; i < this.data.length; i++) {
+        this.data[i].department = mesg.department
+      }
+      this.dataLoading = false
+    },
     getData() {
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-          if (res) {
-            const processForm = JSON.parse(res.mesg)
+
+          const processForm = JSON.parse(res.mesg)
+          if (processForm.form === undefined) {
             this.getFormFieldList(processForm)
-          }
-          let data = JSON.parse(res.mesg)
-          let commitStatus = res.commitStatus
-          if (commitStatus && commitStatus > 0) {
-            this.acceptShow = true
-            this.submitShow = false
           } else {
-            this.acceptShow = false
-            this.submitShow = true
-          }
-          this.form.fjList = data.fjList || data.form.fjList
-          this.form.fjListId = data.fjListId || data.form.fjListId
-          this.form.lawsNumber = data.lawsNumber || data.form.lawsNumber
-          this.form.lawsName = data.lawsName || data.form.lawsName
-          this.form.endTime = data.endTime || data.form.endTime
-          this.form.department = data.department
-          this.todoId = res.id
-          this.json = data
-          this.data = data.info || data.data || data.form.data || []
-          for (let i = 0; i < this.data.length; i++) {
-            this.data[i].department = data.department
+            //表单文件处理
+            this.getTaskId(processForm)
           }
         }).catch(e => {
         })
@@ -521,13 +521,25 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList(item) {
-      console.log(item);
       this.$nextTick(() => {
-        this.form = item.form ? JSON.parse(JSON.stringify(item.form.form)) :  JSON.parse(JSON.stringify(item));
+        this.form = JSON.parse(JSON.stringify(item))
         this.form.commentUser = this.$store.getters.userInfo.userId
         this.form.commentUserName = this.$store.getters.userInfo.userName
         this.data = item.form ? item.dataList : []
         this.commentText = item.form ? item.commentText : ''
+        let commitStatus = item.commitStatus
+        if (commitStatus && commitStatus > 0) {
+          this.acceptShow = true
+          this.submitShow = false
+        } else {
+          this.acceptShow = false
+          this.submitShow = true
+        }
+        this.todoId = item.id
+        for (let i = 0; i < this.data.length; i++) {
+          this.data[i].department = item.department
+        }
+        this.dataLoading = false
       });
     },
   },

src/pages/processCenter/pages/creatProcess/zczqyj/step4.vue

@@ -191,8 +191,8 @@
               @transfer="handleTransfer"
               @save="handleSave"
               @submit="handleSubmit"
-              show-back
-              @back="handleSubmitNo"
+              show-over2
+              @over2="handleSubmitNo"
               approval
               submitBTNText="同意"
       >
@@ -203,6 +203,7 @@
               :is-visible.sync="drawerModal"
               @checkedRole="checkedRole"
       ></Role-tree>
+    <loading :loading="dataLoading">正在加载数据</loading>
   </div>
 </template>
 
@@ -217,7 +218,8 @@ export default {
   name: "zczqyjStep4",
   data() {
     return {
-        drawerModal: false,
+      dataLoading: true,
+      drawerModal: false,
       histortData: [],
       data: [],
       commentText: '',
@@ -316,7 +318,7 @@ export default {
     handleSubmit() {
       this.isSubmit = true
       this.saveLoading = true
-      var json = this.json
+      var json = Object.assign(this.form)
       //这个就是原来的actionFlag，用来表示流程是驳回还是同意
       json.actionFlag = 0
       json.commentText = this.commentText
@@ -337,7 +339,7 @@ export default {
       if (this.commentText) {
         this.isSubmit = true
         this.saveLoading = true
-        var json = this.json
+        var json = Object.assign(this.form)
         //这个就是原来的actionFlag，用来表示流程是驳回还是同意
         json.actionFlag = 1
         json.commentText = this.commentText
@@ -358,27 +360,26 @@ export default {
       }
 
     },
+    getTaskId (mesg) {
+      this.form = mesg.form
+      this.data = mesg.form ? mesg.dataList : []
+      this.commentText = mesg.form ? mesg.commentText : ''
+      this.dataLoading = false
+    },
     getData() {
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-          if (res) {
-            const processForm = JSON.parse(res.mesg)
+
+          const processForm = JSON.parse(res.mesg)
+          if (processForm.form === undefined) {
             this.getFormFieldList(processForm)
+          } else {
+            //表单文件处理
+            this.getTaskId(processForm)
           }
-          let data = JSON.parse(res.mesg)
-          this.form.fjList = data.fjList || data.form.fjList
-          this.form.fjListId = data.fjListId || data.form.fjListId
-          this.form.lawsNumber = data.lawsNumber || data.form.lawsNumber
-          this.form.lawsName = data.lawsName || data.form.lawsName
-          this.form.endTime = data.endTime || data.form.endTime
-          this.form.cname = data.cname || data.form.cname
-          this.form.commentUser = data.commentUser || data.form.commentUser
-          this.form.commentUserName = data.commentUserName || data.form.commentUserName
-          this.json = data
-          this.data = data.info || data.data
         }).catch(e => {
         })
       })
@@ -388,9 +389,9 @@ export default {
      */
     getFormFieldList(item) {
       this.$nextTick(() => {
-        this.form = JSON.parse(JSON.stringify(item));
-        this.form.lawsNumber = item.form.lawsNumber
-        this.form.lawsName = item.form.lawsName
+        this.form = JSON.parse(JSON.stringify(item))
+        this.data = item.info
+        this.dataLoading = false
       });
     },
   },

src/pages/processCenter/pages/creatProcess/zczqyj/step5.vue

@@ -261,10 +261,11 @@
       show-submit
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
+      show-save
       @save="handleSave"
       @submit="handleSubmit"
-      show-back
-      @back="handleSubmitNo"
+      show-over2
+      @over2="handleSubmitNo"
       show-transfer
       @transfer="handleTransfer"
       approval
@@ -277,6 +278,7 @@
             :is-visible.sync="drawerModal"
             @checkedRole="checkedRole"
     ></Role-tree>
+    <loading :loading="dataLoading">正在加载数据</loading>
   </div>
 </template>
 
@@ -284,7 +286,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, processCreateStand, changeAssigneeNew } from "api/process";
+import { inboundLiaisonDetail,saveTaskForPub, processCreateStand, changeAssigneeNew } from "api/process";
 import axios from "axios";
 
 export default {
@@ -292,6 +294,7 @@ export default {
   data() {
     return {
       //修订的标志
+      dataLoading: true,
       changeFlag:false,
       acceptShow: false,
       drawerModal: false,
@@ -367,7 +370,6 @@ export default {
 
     },
     addModal() {
-      console.log('318',this.form.form.department)
       this.changeFlag = true
       var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
       var json = {
@@ -378,7 +380,7 @@ export default {
         newText: '',
         changeReason: '',
         reason: '',
-        department: this.form.form.department,
+        department: this.form.department,
         id: id,
         responUserName: this.$store.getters.userInfo.userName,
         responUser: this.$store.getters.userInfo.userId,
@@ -462,6 +464,28 @@ export default {
       this.active = name;
     },
     handleSave() {
+
+      this.isSubmit = true;
+      this.saveLoading = true;
+      let _formData = new FormData();
+      _formData.append("id", this.bpnId || "");
+      _formData.append("prcType", "laws2");
+      _formData.append("taskIds", this.taskIds);
+      _formData.append("json", JSON.stringify({
+        form: this.form,
+        dataList: this.data,
+        commentText: this.commentText
+      }));
+      saveTaskForPub(_formData).then(res => {
+        this.saveLoading = false;
+        this.isSubmit = false;
+
+        this.$message.success("保存成功");
+        this.bpnId = res.result;
+      }).catch(e => {
+        this.saveLoading = false;
+        this.isSubmit = false;
+      });
     },
     handleSubmit() {
       if (this.data.length < 1) {
@@ -469,11 +493,10 @@ export default {
       } else {
         this.isSubmit = true;
         this.saveLoading = true
-        var json = this.json;
+        var json = Object.assign(this.form)
         json.actionFlag = 0;
         json.commentText = this.commentText;
         json.info = this.data
-        json.form = this.form
         this.$http.post("lawss/activiti/completeTask", {
           json: JSON.stringify(json),
           taskId: this.taskIds,
@@ -491,7 +514,7 @@ export default {
     handleSubmitNo() {
       if (this.commentText) {
         this.isSubmit = true;
-        var json = this.json;
+        var json = Object.assign(this.form)
         json.actionFlag = 1;
         json.commentText = this.commentText;
         this.$http.post("lawss/activiti/completeTask", {
@@ -509,40 +532,36 @@ export default {
         this.$message.warning("请输入反馈意见");
       }
     },
+    getTaskId (item) {
+      console.log(item)
+      this.form = item.form
+      this.form['id'] = item.id
+      this.form.responUserAndInstitutionNameMap = item.form ? item.form.responUserAndInstitutionNameMap : ''
+      this.form.lawsName = item.form ? item.form.lawsName : item.lawsName
+      this.form.responUserList = item.form ? item.form.responUserList: ''
+      this.form.responUserListName = item.form ? item.form.responUserListName : ''
+      this.form.endTime =  item.form ? item.form.endTime : item.endTime
+      this.form.cname =  item.form ? item.form.cname : item.cname
+      this.form.fjList =  item.form ? item.form.fjList : item.fjList
+      this.form.fjListId = item.form ?  item.form.fjListId : item.fjListId
+      this.data = item.dataList.filter ( item => item.state !== '3');
+      this.form.department = item.form ?  item.form.department : item.department
+      this.commentText = item.form ? item.commentText : ''
+      this.dataLoading = false
+    },
     getData() {
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-          if (res) {
-            const processForm = JSON.parse(res.mesg)
+          const processForm = JSON.parse(res.mesg)
+          if (processForm.form === undefined) {
             this.getFormFieldList(processForm)
+          } else {
+            //表单文件处理
+            this.getTaskId(processForm)
           }
-          let data = JSON.parse(res.mesg);
-          this.form.department = data.form.department
-          console.log(this.form.department,'517')
-          // 给后端的选人信息
-          this.form.responUserAndInstitutionNameMap = data.form.responUserAndInstitutionNameMap
-          this.form.fjList = data.fjList || data.form.fjList
-          this.form.fjListId = data.fjListId || data.form.fjListId
-          this.form.lawsNumber = data.lawsNumber || data.form.lawsNumber
-          this.form.lawsName = data.lawsName || data.form.lawsName
-          this.form.endTime = data.endTime || data.form.endTime;
-          this.form.cname = data.cname || data.form.cname;
-          this.oldData = JSON.parse(JSON.stringify(data.info))
-          var arr = []
-          data.info.forEach(item => {
-            if (item.state != '3') {
-              arr.push(item)
-            }
-          })
-          // for (let i = 0; i < this.data.length; i++) {
-          //   this.data[i].department = data.department
-          // }
-          this.json = data
-          this.data = arr
-          this.oldData = data.oldinfo
         }).catch(e => {
         });
       });
@@ -552,9 +571,20 @@ export default {
      */
     getFormFieldList(item) {
       this.$nextTick(() => {
-        this.form = JSON.parse(JSON.stringify(item));
-        this.form.lawsNumber = item.form.lawsNumber
-        this.form.lawsName = item.form.lawsName
+        this.form = JSON.parse(JSON.stringify(item))
+        this.form['id'] = item.id
+        this.form.lawsNumber =  item.form ? item.form.lawsNumber : item.lawsNumber
+        this.form.responUserAndInstitutionNameMap = item.form ? item.form.responUserAndInstitutionNameMap : ''
+        this.form.lawsName = item.form ? item.form.lawsName : item.lawsName
+        this.form.responUserList = item.form ? item.form.responUserList: ''
+        this.form.responUserListName = item.form ? item.form.responUserListName : ''
+        this.form.endTime =  item.form ? item.form.endTime : item.endTime
+        this.form.cname =  item.form ? item.form.cname : item.cname
+        this.form.fjList =  item.form ? item.form.fjList : item.fjList
+        this.form.fjListId = item.form ?  item.form.fjListId : item.fjListId
+        this.data = item.info.filter ( item => item.state !== '3');
+        this.form.department = item.form ?  item.form.department : item.department
+        this.dataLoading = false
       });
     },
   },

src/pages/processCenter/pages/creatProcess/zczqyj/step6.vue

@@ -197,8 +197,6 @@
       :saveLoading="saveLoading"
       @save="handleSave"
       @submit="handleSubmit"
-      show-back
-      @back="handleSubmitNo"
       approval
       submitBTNText="同意"
       show-transfer
@@ -211,6 +209,7 @@
             :is-visible.sync="drawerModal"
             @checkedRole="checkedRole"
     ></Role-tree>
+    <loading :loading="dataLoading">正在加载数据</loading>
   </div>
 </template>
 
@@ -225,6 +224,7 @@ export default {
   name: "zczqyjStep6",
   data() {
     return {
+      dataLoading: true,
       drawerModal: false,
       histortData: [],
       oldData: [],
@@ -357,7 +357,7 @@ export default {
       } else {
         this.isSubmit = true
         this.saveLoading = true
-        var json = this.json;
+        var json = Object.assign(this.form)
         json.actionFlag = 0;
         json.commentText = this.commentText;
         this.$http.post("lawss/activiti/completeTask", {
@@ -395,29 +395,31 @@ export default {
         this.$message.warning("请输入反馈意见");
       }
     },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        this.form = JSON.parse(JSON.stringify(item))
+        this.form['id'] = item.id
+        this.data = item.info.filter ( item => item.state !== '3');
+        this.dataLoading = false
+      });
+    },
     getData() {
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-          let data = JSON.parse(res.mesg)
-          this.form.fjList = data.fjList || data.form.fjList
-          this.form.fjListId = data.fjListId || data.form.fjListId
-          this.form.lawsNumber = data.lawsNumber || data.form.lawsNumber
-          this.form.lawsName = data.lawsName || data.form.lawsName
-          this.form.endTime = data.endTime || data.form.endTime;
-          this.form.cname = data.cname || data.form.cname;
-          this.oldData = JSON.parse(JSON.stringify(data.info))
-          var arr = []
-          data.info.forEach(item => {
-            if (item.state != '3') {
-              arr.push(item)
-            }
-          })
-          this.json = data
-          this.data = arr
-          this.oldData = data.oldinfo
+          const processForm = JSON.parse(res.mesg)
+          if (processForm.form === undefined) {
+            this.getFormFieldList(processForm)
+          } else {
+            //表单文件处理
+            // this.getTaskId(processForm)
+          }
+
         }).catch(e => {
         });
       });

src/pages/processCenter/pages/creatProcess/zczqyj/step7.vue

@@ -197,8 +197,8 @@
       :saveLoading="saveLoading"
       @save="handleSave"
       @submit="handleSubmit"
-      show-back
-      @back="handleSubmitNo"
+      show-over2
+      @over2="handleSubmitNo"
       approval
       submitBTNText="同意"
       show-transfer
@@ -211,6 +211,7 @@
             :is-visible.sync="drawerModal"
             @checkedRole="checkedRole"
     ></Role-tree>
+    <loading :loading="dataLoading">正在加载数据</loading>
   </div>
 </template>
 
@@ -222,9 +223,10 @@ import { inboundLiaisonDetail, processCreateStand, changeAssigneeNew } from "api
 import axios from "axios";
 
 export default {
-  name: "zczqyjStep6",
+  name: "zczqyjStep7",
   data() {
     return {
+      dataLoading: true,
       drawerModal: false,
       histortData: [],
       oldData: [],
@@ -357,7 +359,7 @@ export default {
       } else {
         this.isSubmit = true;
         this.saveLoading = true
-        var json = this.json;
+        var json = Object.assign(this.form)
         json.actionFlag = 0;
         json.commentText = this.commentText;
         this.$http.post("lawss/activiti/completeTask", {
@@ -377,7 +379,7 @@ export default {
     handleSubmitNo() {
       if (this.commentText) {
         this.isSubmit = true;
-        var json = this.json;
+        var json = Object.assign(this.form)
         json.actionFlag = 1;
         json.commentText = this.commentText;
         this.$http.post("lawss/activiti/completeTask", {
@@ -395,29 +397,30 @@ export default {
         this.$message.warning("请输入反馈意见");
       }
     },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        this.form = JSON.parse(JSON.stringify(item))
+        this.form['id'] = item.id
+        this.data = item.info.filter ( item => item.state !== '3');
+        this.dataLoading = false
+      });
+    },
     getData() {
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-          let data = JSON.parse(res.mesg)
-          this.form.fjList = data.fjList || data.form.fjList
-          this.form.fjListId = data.fjListId || data.form.fjListId
-          this.form.lawsNumber = data.lawsNumber || data.form.lawsNumber
-          this.form.lawsName = data.lawsName || data.form.lawsName
-          this.form.endTime = data.endTime || data.form.endTime;
-          this.form.cname = data.cname || data.form.cname;
-          this.oldData = JSON.parse(JSON.stringify(data.info))
-          var arr = []
-          data.info.forEach(item => {
-            if (item.state != '3') {
-              arr.push(item)
-            }
-          })
-          this.json = data
-          this.data = arr
-          this.oldData = data.oldinfo
+          const processForm = JSON.parse(res.mesg)
+          if (processForm.form === undefined) {
+            this.getFormFieldList(processForm)
+          } else {
+            //表单文件处理
+            // this.getTaskId(processForm)
+          }
         }).catch(e => {
         });
       });

src/pages/processCenter/pages/creatProcess/zczqyj/step8.vue

@@ -197,8 +197,8 @@
       :saveLoading="saveLoading"
       @save="handleSave"
       @submit="handleSubmit"
-      show-back
-      @back="handleSubmitNo"
+      show-over2
+      @over2="handleSubmitNo"
       approval
       submitBTNText="同意"
       show-transfer
@@ -211,6 +211,7 @@
             :is-visible.sync="drawerModal"
             @checkedRole="checkedRole"
     ></Role-tree>
+    <loading :loading="dataLoading">正在加载数据</loading>
   </div>
 </template>
 
@@ -222,9 +223,10 @@ import { inboundLiaisonDetail, processCreateStand, changeAssigneeNew } from "api
 import axios from "axios";
 
 export default {
-  name: "zczqyjStep6",
+  name: "zczqyjStep8",
   data() {
     return {
+      dataLoading: true,
       drawerModal: false,
       histortData: [],
       oldData: [],
@@ -357,7 +359,7 @@ export default {
       } else {
         this.isSubmit = true;
         this.saveLoading = true
-        var json = this.json;
+        var json = Object.assign(this.form)
         json.actionFlag = 0;
         json.commentText = this.commentText;
         this.$http.post("lawss/activiti/completeTask", {
@@ -395,29 +397,31 @@ export default {
         this.$message.warning("请输入反馈意见");
       }
     },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        this.form = JSON.parse(JSON.stringify(item))
+        this.form['id'] = item.id
+        this.data = item.info.filter ( item => item.state !== '3');
+        this.dataLoading = false
+      });
+    },
     getData() {
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-          let data = JSON.parse(res.mesg)
-          this.form.fjList = data.fjList || data.form.fjList
-          this.form.fjListId = data.fjListId || data.form.fjListId
-          this.form.lawsNumber = data.lawsNumber || data.form.lawsNumber
-          this.form.lawsName = data.lawsName || data.form.lawsName
-          this.form.endTime = data.endTime || data.form.endTime;
-          this.form.cname = data.cname || data.form.cname;
-          this.oldData = JSON.parse(JSON.stringify(data.info))
-          var arr = []
-          data.info.forEach(item => {
-            if (item.state != '3') {
-              arr.push(item)
-            }
-          })
-          this.json = data
-          this.data = arr
-          this.oldData = data.oldinfo
+
+          const processForm = JSON.parse(res.mesg)
+          if (processForm.form === undefined) {
+            this.getFormFieldList(processForm)
+          } else {
+            //表单文件处理
+            // this.getTaskId(processForm)
+          }
         }).catch(e => {
         });
       });

src/pages/processCenter/pages/creatProcess/zczqyj/step9.vue

@@ -197,8 +197,8 @@
       :saveLoading="saveLoading"
       @save="handleSave"
       @submit="handleSubmit"
-      show-back
-      @back="handleSubmitNo"
+      show-over2
+      @over2="handleSubmitNo"
       approval
       submitBTNText="同意"
       show-transfer
@@ -211,6 +211,7 @@
             :is-visible.sync="drawerModal"
             @checkedRole="checkedRole"
     ></Role-tree>
+    <loading :loading="dataLoading">正在加载数据</loading>
   </div>
 </template>
 
@@ -222,9 +223,10 @@ import { inboundLiaisonDetail, processCreateStand, changeAssigneeNew } from "api
 import axios from "axios";
 
 export default {
-  name: "zczqyjStep6",
+  name: "zczqyjStep9",
   data() {
     return {
+      dataLoading: true,
       drawerModal: false,
       histortData: [],
       oldData: [],
@@ -357,7 +359,7 @@ export default {
       } else {
         this.isSubmit = true
         this.saveLoading = true
-        var json = this.json;
+        var json = Object.assign(this.form)
         json.actionFlag = 0;
         json.commentText = this.commentText;
         this.$http.post("lawss/activiti/completeTask", {
@@ -377,7 +379,7 @@ export default {
     handleSubmitNo() {
       if (this.commentText) {
         this.isSubmit = true;
-        var json = this.json;
+        var json = Object.assign(this.form)
         json.actionFlag = 1;
         json.commentText = this.commentText;
         this.$http.post("lawss/activiti/completeTask", {
@@ -395,29 +397,30 @@ export default {
         this.$message.warning("请输入反馈意见");
       }
     },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        this.form = JSON.parse(JSON.stringify(item))
+        this.form['id'] = item.id
+        this.data = item.info.filter ( item => item.state !== '3');
+        this.dataLoading = false
+      });
+    },
     getData() {
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-          let data = JSON.parse(res.mesg)
-          this.form.fjList = data.fjList || data.form.fjList
-          this.form.fjListId = data.fjListId || data.form.fjListId
-          this.form.lawsNumber = data.lawsNumber || data.form.lawsNumber
-          this.form.lawsName = data.lawsName || data.form.lawsName
-          this.form.endTime = data.endTime || data.form.endTime;
-          this.form.cname = data.cname || data.form.cname;
-          this.oldData = JSON.parse(JSON.stringify(data.info))
-          const arr = [];
-          data.info.forEach(item => {
-            if (item.state !== '3') {
-              arr.push(item)
-            }
-          })
-          this.json = data
-          this.data = arr
-          this.oldData = data.oldinfo
+          const processForm = JSON.parse(res.mesg)
+          if (processForm.form === undefined) {
+            this.getFormFieldList(processForm)
+          } else {
+            //表单文件处理
+            // this.getTaskId(processForm)
+          }
         }).catch(e => {
         });
       });

src/pages/processCenter/pages/creatProcess/zczqyj/step9Detil.vue

@@ -0,0 +1,504 @@
+<template>
+  <div class="zczqyjStep6">
+    <ProcessHeader toggle>
+      <template slot="proName">政策征求意见流程</template>
+      <template slot="proNode">法规认证部总监批准</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto;">
+        <el-form
+          ref="zczqyjForm"
+          :model="form"
+          :rules="formRules"
+          class="label-input-form"
+          label-width="210px"
+        >
+          <ProcessTitle>
+            <template slot="title">基础信息</template>
+          </ProcessTitle>
+          <div class="prc-content-border">
+            <el-row :gutter="24">
+              <el-col :span="24">
+                <el-form-item label="政策编号" prop="lawsNumber" class="add-form-item form-item-disabled">
+                  <el-input
+                      disabled
+                      v-model="form.lawsNumber"
+                      placeholder="请输入政策编号"
+                      clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="政策名称" prop="lawsName" class="add-form-item form-item-disabled">
+                  <el-input
+                      disabled
+                      v-model="form.lawsName"
+                      placeholder="请输入政策名称"
+                      clearable
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+        </el-form>
+        <ProcessTitle>
+          <template slot="title">征求意见列表</template>
+        </ProcessTitle>
+        <el-table
+          ref="multipleTable"
+          :data="data"
+          tooltip-effect="dark"
+          border
+          style="width: 100%; flex: auto;"
+          class="drag-table"
+          :default-sort = "{prop: 'chapterNumber', order: 'ascending'}"
+          :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}">
+          <el-table-column
+            type="index"
+            label="序号"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="chapterNumber"
+            align="center"
+            sortable
+            label="章条编号"
+            width="101px">
+          </el-table-column>
+          <el-table-column
+            prop="chapterName"
+            align="center"
+            width="200px"
+            label="章节名称">
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="commentText"
+            label="修改意见内容（包括理由或依据）">
+            <el-table-column
+              prop="oldText"
+              align="center"
+              label="修改前">
+            </el-table-column>
+            <el-table-column
+              prop="newText"
+              align="center"
+              label="修改后">
+            </el-table-column>
+            <el-table-column
+              prop="changeReason"
+              align="center"
+              label="修改理由">
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+              prop="reason"
+              align="center"
+              label="原因"
+              width="200px">
+          </el-table-column>
+          <el-table-column
+            prop="department"
+            align="center"
+            label="提出部门">
+          </el-table-column>
+          <el-table-column
+            prop="responUserName"
+            align="center"
+            label="提出人">
+          </el-table-column>
+<!--          <el-table-column-->
+<!--            prop="dealComment"-->
+<!--            align="center"-->
+<!--            label="处理意见">-->
+<!--            <template slot-scope="scope">-->
+<!--              <div>{{ stateText(scope.row.state) }}</div>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+        </el-table>
+      </div>
+<!--      <el-collapse accordion>-->
+<!--        <el-collapse-item title="审批意见">-->
+<!--          <div style="margin: 10px 0;">-->
+<!--            <el-input-->
+<!--              type="textarea"-->
+<!--              :rows="3"-->
+<!--              resize="none"-->
+<!--              placeholder="请输入意见"-->
+<!--              v-model="commentText">-->
+<!--            </el-input>-->
+<!--          </div>-->
+<!--        </el-collapse-item>-->
+<!--      </el-collapse>-->
+    </div>
+    <div class="content" v-show="active === '2'">
+      <el-table
+        height="100%"
+        ref="selection"
+        :data="histortData"
+        tooltip-effect="dark"
+        style="width: 100%"
+        border
+        row-key="id"
+        :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+        <el-table-column
+          prop="name"
+          label="任务步骤"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="assignee"
+          label="任务受理人"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="createTime"
+          label="创建时间"
+          align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="endTime"
+          label="完成时间"
+          align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="comment"
+          label="流程信息"
+          align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.commentText }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="completeFlag"
+          label="状态"
+          align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+<!--    <ProcessFooter-->
+<!--      show-submit-->
+<!--      :submitLoading="isSubmit"-->
+<!--      :saveLoading="saveLoading"-->
+<!--      @save="handleSave"-->
+<!--      @submit="handleSubmit"-->
+<!--      show-over2-->
+<!--      @over2="handleSubmitNo"-->
+<!--      approval-->
+<!--      submitBTNText="同意"-->
+<!--      show-transfer-->
+<!--      @transfer="handleTransfer"-->
+<!--    >-->
+<!--    </ProcessFooter>-->
+    <Role-tree
+            check-box
+            is-title="转办处理人"
+            :is-visible.sync="drawerModal"
+            @checkedRole="checkedRole"
+    ></Role-tree>
+    <loading :loading="dataLoading">正在加载数据</loading>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { inboundLiaisonDetail, processCreateStand, changeAssigneeNew } from "api/process";
+import axios from "axios";
+
+export default {
+  name: "zczqyjStep9Detil",
+  data() {
+    return {
+      dataLoading: true,
+      drawerModal: false,
+      histortData: [],
+      oldData: [],
+      data: [],
+      commentText: "",
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      roleRow: {},
+      nodeList: [],
+      type: "",
+      defaultProps: {
+        children: "children",
+        label: "name"
+      },
+      treeData: [], // 人员数据
+      modalshowflag: false, // drawer开关
+      drawerTitle: "", //drawer标题
+      textarea: "", // 意见
+      ListModel: false, // 新增编辑抽屉开关
+      active: "1", // 默认显示
+      isSubmit: false,
+      saveLoading: false,
+      form: {
+        lawsNumber: '', // 政策编号
+        lawsName: '', // 政策名称
+        endTime: "", // 结束日期
+        cname: "", // 名称
+        fjList: [],
+        fjListId: '',
+      },
+      formRules: {
+        responUserList: [
+          {required: true, message: "请选择责任人", trigger: "change"}
+        ]
+      },
+      json: {}
+    };
+  },
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  methods: {
+      handleTransfer() {
+          this.drawerModal = true
+      },
+      checkedRole (data) {
+        this.isSubmit = true
+        this.saveLoading = true
+          changeAssigneeNew({
+              taskId: this.$route.query.taskIds, // 任务id
+              userId:this.$store.getters.userInfo.userId, // 委托人
+              assignee: data[0].id, // 被委托人
+              pId: this.$route.query.prcId, // 流程实例
+          }).then(res => {
+              if (res.success) {
+                  this.drawerModal = false
+                  this.$message.success('调整成功')
+                  this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                  this.processNum()
+              } else {
+                  this.$message.warning(res.message)
+              }
+            this.isSubmit = false
+            this.saveLoading = false
+          })
+      },
+      // 请求转换流程图
+      processNum (row) {
+          axios.request({
+              url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+              responseType: 'blob',
+              method: 'get',
+              params: {
+                  prcNum: this.$route.query.prcNum
+              }
+          }).then(res => {
+              this.processStep = window.URL.createObjectURL(res.data)
+          })
+      },
+    getHistoryData() {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
+        prcNum: this.$route.query.prcNum
+      }, {}, res => {
+        this.histortData = res;
+      }, e => {
+      });
+    },
+    upload(row, title) {
+      var params = {
+        columnName: {
+          chapterNumber: "章条编号",
+          chapterName: "章节名称",
+          commentText: "修改意见内容（包括理由或依据）",
+          department: "提出部门",
+          responUserName: "提出人",
+          stateText: "处理意见"
+        },
+        dataList: []
+      };
+      params.dataList = JSON.parse(JSON.stringify(row));
+      params.dataList.forEach(item => {
+        if (item.state === "1") {
+          item.stateText = "上报";
+        } else if (item.state === "2") {
+          item.stateText = "处理后上报";
+        } else {
+          item.stateText = "不上报";
+        }
+      });
+      this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
+      });
+    },
+    stateText(row) {
+      if (row === "1") {
+        return "上报";
+      } else if (row === "2") {
+        return "处理后上报";
+      }
+    },
+    handleTabs(name) {
+      this.active = name;
+    },
+    handleSave() {
+    },
+    handleSubmit() {
+      if (this.data.length < 1) {
+        this.$message.warning("请输入征求意见搞");
+      } else {
+        this.isSubmit = true
+        this.saveLoading = true
+        var json = Object.assign(this.form)
+        json.actionFlag = 0;
+        json.commentText = this.commentText;
+        this.$http.post("lawss/activiti/completeTask", {
+          json: JSON.stringify(json),
+          taskId: this.taskIds,
+          userId: this.$store.getters.userInfo.userId
+        }, {}, res => {
+          if (res.success) {
+            this.$message.success("提交成功");
+            this.$router.push("/processCenter");
+          }
+          this.isSubmit = false;
+          this.saveLoading = false
+        });
+      }
+    },
+    handleSubmitNo() {
+      if (this.commentText) {
+        this.isSubmit = true;
+        var json = Object.assign(this.form)
+        json.actionFlag = 1;
+        json.commentText = this.commentText;
+        this.$http.post("lawss/activiti/completeTask", {
+          json: JSON.stringify(json),
+          taskIds: this.taskIds,
+          userId: this.$store.getters.userInfo.userId
+        }, {}, res => {
+          if (res.success) {
+            this.$message.success("驳回成功");
+            this.$router.push("/processCenter");
+          }
+          this.isSubmit = false;
+        });
+      } else {
+        this.$message.warning("请输入反馈意见");
+      }
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        this.form = JSON.parse(JSON.stringify(item))
+        this.form['id'] = item.id
+        this.data = item.info.filter ( item => item.state !== '3');
+        this.dataLoading = false
+      });
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          const processForm = JSON.parse(res.mesg)
+          if (processForm.form === undefined) {
+            this.getFormFieldList(processForm)
+          } else {
+            //表单文件处理
+            // this.getTaskId(processForm)
+          }
+        }).catch(e => {
+        });
+      });
+    }
+  },
+  mounted() {
+    this.getHistoryData();
+    this.getData();
+  }
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.zczqyjStep6 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .fileClass {
+    cursor: pointer;
+  }
+
+  .fileClass:hover {
+    color: #0c91e5;
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+    }
+  }
+}
+</style>

src/pages/processCenter/pages/processDetail/index.vue

@@ -231,6 +231,9 @@ export default {
         }else if(prcType === 'laws1'){
           //政策入库
           this.toProcessDetail('zcrkStep5',row)
+        }else if(prcType === 'laws2'){
+          //政策入库
+          this.toProcessDetail('zczqyjStep9Detil',row)
         }else if(prcType === 'buss1'){
           //企标入库
           this.toProcessDetail('bussLibraryDetail',row)