Merge remote-tracking branch 'origin/develop' into develop

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

@@ -498,7 +498,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, queryTaskFirst, saveTaskFirst, taskDel } from "api/process";
+import { inboundLiaisonDetail, queryTaskFirst, saveTaskFirst, saveTaskForPub, taskDel } from "api/process";
 
 export default {
   name: "bzpgStep1",
@@ -544,6 +544,7 @@ export default {
         standType: "",
         standNumber: ""
       },
+      taskIds: this.$route.query.taskIds,
       decomposeOptions: [], //分解单数据
       standardTypeOptions: [
         {
@@ -699,24 +700,45 @@ export default {
     getFormFieldList (item) {
       item.commentText = ''
       this.$nextTick(() => {
-        this.hisListForm =  JSON.parse(JSON.stringify(item))
+        if(item.form){
-        this.listForm = JSON.parse(JSON.stringify(item))
+          this.hisListForm = JSON.parse(JSON.stringify(item.form))
-        this.listForm.prcNum = this.prcNum
+          this.listForm = JSON.parse(JSON.stringify(item.form))
-        this.listForm.prcName = this.prcName
+          this.listForm.prcNum = this.prcNum
-        this.listForm['id'] = item.id
+          this.listForm.prcName = this.prcName
-        this.listForm.dataList = item.dataList
+          this.listForm['id'] = item.id
-        this.dataList = item.dataList
+          this.listForm.dataList = item.form.dataList
-        this.roleForm.dockUser = item.dockUser
+          this.dataList = item.form.dataList
-        this.roleForm.dockUserName = item.dockUserName
+          this.roleForm.dockUser = item.form.dockUser
-        this.roleForm.ministerUser = item.ministerUser
+          this.roleForm.dockUserName = item.form.dockUserName
-        this.roleForm.ministerUserName = item.ministerUserName
+          this.roleForm.ministerUser = item.form.ministerUser
-        this.submitFlag = '修改节点'
+          this.roleForm.ministerUserName = item.form.ministerUserName
-        this.dataList.distributePerson = item.dataList[0].distributePerson
+          this.submitFlag = '修改节点'
-        this.$http.get("SarStandItems/sar-stand-items/getFileType", {
+          this.dataList.distributePerson =  this.listForm.dataList[0].distributePerson
-          standId: item.standId
+          this.$http.get("SarStandItems/sar-stand-items/getFileType", {
-        }, {}, res => {
+            standId: item.standId
-          this.decomposeOptions = res.data;
+          }, {}, res => {
-        });
+            this.decomposeOptions = res.data;
+          });
+        }else{
+          this.hisListForm =  JSON.parse(JSON.stringify(item))
+          this.listForm = JSON.parse(JSON.stringify(item))
+          this.listForm.prcNum = this.prcNum
+          this.listForm.prcName = this.prcName
+          this.listForm['id'] = item.id
+          this.listForm.dataList =  item.dataList
+          this.dataList =  item.dataList
+          this.roleForm.dockUser =  item.dockUser
+          this.roleForm.dockUserName = item.dockUserName
+          this.roleForm.ministerUser =  item.ministerUser
+          this.roleForm.ministerUserName =  item.ministerUserName
+          this.submitFlag = '修改节点'
+          this.dataList.distributePerson =  this.listForm.dataList[0].distributePerson
+          this.$http.get("SarStandItems/sar-stand-items/getFileType", {
+            standId: item.standId
+          }, {}, res => {
+            this.decomposeOptions = res.data;
+          });
+        }
       })
     },
     //折叠/展开基础信息方法
@@ -871,24 +893,46 @@ export default {
     },
     //保存事件
     handleSave() {
-      this.saveLoading = true;
+      if(!this.submitFlag){
-      this.listForm.dataList = this.dataList
+        this.saveLoading = true;
-      let _formData = new FormData();
+        this.listForm.dataList = this.dataList
-      _formData.append("createUser", this.$store.getters.userInfo.userId);
+        let _formData = new FormData();
-      _formData.append("createUserName", this.$store.getters.userInfo.uName);
+        _formData.append("createUser", this.$store.getters.userInfo.userId);
-      _formData.append("prcType", "5");
+        _formData.append("createUserName", this.$store.getters.userInfo.uName);
-      _formData.append("json", JSON.stringify({
+        _formData.append("prcType", "5");
-        taskInfo: "选择已拆分标准",
+        _formData.append("json", JSON.stringify({
-        form: this.listForm,
+          taskInfo: "选择已拆分标准",
-        roleForm: this.roleForm,
+          form: this.listForm,
-        commentText: this.commentText
+          roleForm: this.roleForm,
-      }));
+          commentText: this.commentText
-      saveTaskFirst(_formData).then(res => {
+        }));
-        this.saveLoading = false;
+        saveTaskFirst(_formData).then(res => {
-        this.$message.success("保存成功");
+          this.saveLoading = false;
-      }).catch(e => {
+          this.$message.success("保存成功");
-        this.saveLoading = false;
+        }).catch(e => {
-      });
+          this.saveLoading = false;
+        });
+      }else{
+        this.saveLoading = true;
+        this.listForm.dataList = this.dataList
+        let _formData = new FormData();
+        _formData.append("id", this.bpnId || "");
+        _formData.append("taskIds", this.taskIds);
+        _formData.append("prcType", "5");
+        _formData.append("json", JSON.stringify({
+          taskInfo: "选择已拆分标准",
+          form: this.listForm,
+          roleForm: this.roleForm,
+          commentText: this.commentText
+        }));
+        saveTaskForPub(_formData).then(res => {
+          this.saveLoading = false;
+          this.$message.success("保存成功");
+          this.bpnId = res.result;
+        }).catch(e => {
+          this.saveLoading = false;
+        });
+      }
     },
 
     //提交事件