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

src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue

@@ -460,6 +460,8 @@ export default {
         this.detailData = mes.form.detailData
         this.dataList = mes.form.dataList;
         this.commentText = mes.commentText;
+        // this.fileList = mes.form.fileName.split(",")
+        // console.log(this.fileList);
         this.getFileInfo();
       });
     },

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

@@ -693,15 +693,13 @@ export default {
       _formData.append("json", JSON.stringify({
         taskInfo: '根据会签意见修订',
         form: this.listForm,
-        detailData: this.detailData,
+        roleForm: this.roleForm,
         commentText: this.commentText
       }));
-      console.log(_formData);
       saveTaskFirst(_formData).then(res => {
         this.saveLoading = false;
         this.$message.success("保存成功");
         this.bpnId = res.result;
-        this.$router.push('/processCenter')
       }).catch(e => {
         this.saveLoading = false;
       });

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

@@ -708,7 +708,7 @@ export default {
     //选择拆分标准确定事件
     OkDrawer() {
       if (this.selectedList.length == 1) {
-        this.listForm.standNumber = this.selectedList[0].standNumber;
+        this.listForm.standNumber = this.selectedList[0].standSortShow + '-' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ;
         this.listForm.standName = this.selectedList[0].standName;
         this.listForm.id = this.selectedList[0].id;
         this.$http.get("SarStandItems/sar-stand-items/findAllItems", {