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

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

@@ -3,7 +3,7 @@
   <div class="xmpg-step1">
     <ProcessHeader toggle>
       <template slot="proName">标准合规评估流程</template>
-      <template slot="proNode">发起流程</template>
+      <template slot="proNode">起草</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -194,7 +194,7 @@
             :model="roleForm"
             :rules="roleFormRules"
             class="label-input-form">
-            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="startUserName" style="margin-bottom: 0">
                   <h4>标准法规工程师</h4>
@@ -218,7 +218,7 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="标准法规部领导审批" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="批准" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="ministerUserName" style="margin-bottom: 0">
                   <h4>标准法规部领导</h4>
@@ -495,7 +495,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { queryTaskFirst, saveTaskFirst, taskDel } from "api/process";
+import { inboundLiaisonDetail, queryTaskFirst, saveTaskFirst, taskDel } from "api/process";
 
 export default {
   name: "bzpgStep1",
@@ -506,6 +506,7 @@ export default {
   },
   data() {
     return {
+      submitFlag: '',
       managementHostName: [], //管理主体名称下拉框
       developmentHostName: [], //开发主体名称下拉框
       categoryName: [], //项目细分类下拉框
@@ -642,6 +643,40 @@ export default {
     };
   },
   methods: {
+    getHistoryData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.$route.query.taskIds,
+          pId: this.$route.query.prcId,
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg)
+            this.getFormFieldList(processForm)
+          }
+        }).catch(e => {
+        })
+      })
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList (item) {
+      console.log(item);
+      this.$nextTick(() => {
+        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 = item.dataList[0].distributePerson
+      })
+    },
     //折叠/展开基础信息方法
     foldForm() {
       this.foldFormFlag = !this.foldFormFlag;
@@ -808,75 +843,118 @@ export default {
         this.saveLoading = false;
       });
     },
-    //提交事件
-    handleSubmit() {
-     if(!this.dataList.length){
-       this.$message.warning('请添加项目群信息')
-     }else{
-       this.dataList.forEach(item => {
-         if(!item.distributePerson || !item.projectGroupPeople){
-           this.$message.warning('请填写完整的人员信息')
-         }else {
-           this.isSubmit = true;
-           this.listForm.dataList = this.dataList;
-           this.listForm.commentText = this.commentText;
-           let json = Object.assign(this.listForm, this.roleForm);
-           console.log(json);
-           this.$refs["listForm"].validate((valid) => {
-             if (valid) {
-               this.$refs["roleForm"].validate((valid) => {
-                 if (valid) {
-                   this.$http.post("lawss/activiti/startProcessRollBack", {
-                     createUser: this.$store.getters.userInfo.userId,
-                     createUserName: this.$store.getters.userInfo.userName,
-                     type: "5",
-                     json: JSON.stringify({
-                       taskInfo: "选择已拆分标准",
-                       form: this.listForm,
-                       roleForm: this.roleForm,
-                       commentText: this.commentText
-                     })
-                   }, {
-                     _this: this
-                   }, res => {
-                     if (res.ok) {
-                       this.$http.post("lawss/activiti/completeTask", {
-                         taskIds: res.data,
-                         userId: this.$store.getters.userInfo.userId,
-                         json: JSON.stringify(json)
-                       }, {
-                         _this: this
-                       }, res => {
-                         if (res.success) {
-                           this.$message.success(res.message);
-                           if (this.bpnId !== '') {
-                             let taskId = {
-                               id: this.bpnId
-                             }
-                             taskDel(taskId).then(res=>{
-                               return res
-                             })
-                           }
-                           this.$router.push("/processCenter");
-                         }
-                         this.isSubmit = false;
-                       });
-                     }
-                   });
-                 } else {
-                   this.isSubmit = false;
-                   return this.$message.warning("请完善人员信息");
-                 }
-               });
-             } else {
-               this.isSubmit = false;
-               return this.$message.warning("请完善基础信息");
-             }
-           });
-         }
-       })
-     }
 
+    //提交事件
+    handleSubmit(){
+      let peopleFlag = true
+      if(!this.dataList.length){
+        this.$message.warning('请添加项目群信息')
+      }else{
+        this.dataList.forEach(item => {
+          if(!item.distributePerson || !item.projectGroupPeople){
+            peopleFlag = false
+            return
+          }
+        })
+        if(peopleFlag){
+          this.isSubmit = true;
+          this.listForm.dataList = this.dataList;
+          this.listForm.commentText = this.commentText;
+          let json = Object.assign(this.listForm, this.roleForm);
+          if(!this.submitFlag){
+            this.$refs["listForm"].validate((valid) => {
+              if (valid) {
+                this.$refs["roleForm"].validate((valid) => {
+                  if (valid) {
+                    this.$http.post("lawss/activiti/startProcessRollBack", {
+                      createUser: this.$store.getters.userInfo.userId,
+                      createUserName: this.$store.getters.userInfo.userName,
+                      type: "5",
+                      json: JSON.stringify({
+                        taskInfo: "选择已拆分标准",
+                        form: this.listForm,
+                        roleForm: this.roleForm,
+                        commentText: this.commentText
+                      })
+                    }, {
+                      _this: this
+                    }, res => {
+                      if (res.ok) {
+                        this.$http.post("lawss/activiti/completeTask", {
+                          taskIds: res.data,
+                          userId: this.$store.getters.userInfo.userId,
+                          json: JSON.stringify(json)
+                        }, {
+                          _this: this
+                        }, res => {
+                          if (res.success) {
+                            this.$message.success(res.message);
+                            if (this.bpnId !== '') {
+                              let taskId = {
+                                id: this.bpnId
+                              }
+                              taskDel(taskId).then(res=>{
+                                return res
+                              })
+                            }
+                            this.$router.push("/processCenter");
+                          }
+                          this.isSubmit = false;
+                        });
+                      }
+                    });
+                  } else {
+                    this.isSubmit = false;
+                    return this.$message.warning("请完善人员信息");
+                  }
+                });
+              } else {
+                this.isSubmit = false;
+                return this.$message.warning("请完善基础信息");
+              }
+            });
+          }else{
+            this.$refs["listForm"].validate((valid) => {
+              if (valid) {
+                this.$refs["roleForm"].validate((valid) => {
+                  if (valid) {
+                    this.$http.post("lawss/activiti/completeTask", {
+                      taskIds: this.$route.query.taskIds,
+                      userId: this.$store.getters.userInfo.userId,
+                      json: JSON.stringify(json),
+                    }, {
+                      _this: this
+                    }, res => {
+                      if (res.success) {
+                        this.$message.success(res.message);
+                        if (this.bpnId !== '') {
+                          let taskId = {
+                            id: this.bpnId
+                          }
+                          taskDel(taskId).then(res=>{
+                            return res
+                          })
+                        }
+                        this.$router.push("/processCenter");
+                      }
+                      this.isSubmit = false;
+                    });
+                  } else {
+                    this.isSubmit = false;
+                    return this.$message.warning("请完善人员信息");
+                  }
+                });
+              } else {
+                this.isSubmit = false;
+                return this.$message.warning("请完善基础信息");
+              }
+            });
+          }
+        }else{
+          this.$message.warning('请完善人员信息')
+        }
+
+      }
     },
     //选择拆分标准取消事件
     closeDrawer() {
@@ -1056,6 +1134,9 @@ export default {
     if (this.bpnId !== undefined) {
       this.getData()
     }
+    if(this.$route.query.taskIds){
+      this.getHistoryData()
+    }
     this.getStandData();
     /**
      * 获取项目群筛选项的值

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

@@ -3,7 +3,7 @@
 <div class="bzpg-step2">
   <ProcessHeader toggle>
     <template slot="proName">标准合规评估流程</template>
-    <template slot="proNode">业务经理审批流程</template>
+    <template slot="proNode">审核</template>
   </ProcessHeader>
   <div class="headerTabs">
     <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -3,7 +3,7 @@
   <div class="bzpg-step3">
     <ProcessHeader toggle>
       <template slot="proName">标准合规评估流程</template>
-      <template slot="proNode">分发人分发项目</template>
+      <template slot="proNode">项目分发</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -3,7 +3,7 @@
   <div class="bzpg-step4">
     <ProcessHeader toggle>
       <template slot="proName">标准合规评估流程</template>
-      <template slot="proNode">项目经理分发标准</template>
+      <template slot="proNode">任务分发</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -3,7 +3,7 @@
   <div class="bzpg-step5">
     <ProcessHeader toggle>
       <template slot="proName">标准合规评估流程</template>
-      <template slot="proNode">责任人评估</template>
+      <template slot="proNode">合规评估</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -3,7 +3,7 @@
   <div class="bzpg-step6">
     <ProcessHeader toggle>
       <template slot="proName">标准合规评估流程</template>
-      <template slot="proNode">项目经理审核</template>
+      <template slot="proNode">审核</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -3,7 +3,7 @@
   <div class="bzpg-step7">
     <ProcessHeader toggle>
       <template slot="proName">标准合规评估流程</template>
-      <template slot="proNode">项目负责人审核</template>
+      <template slot="proNode">审定</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue

@@ -3,7 +3,7 @@
   <div class="bzpg-step8">
     <ProcessHeader toggle>
       <template slot="proName">标准合规评估流程</template>
-      <template slot="proNode">标准法规部部长审批</template>
+      <template slot="proNode">批准</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -3,7 +3,7 @@
   <div class="bzpg-step8">
     <ProcessHeader toggle>
       <template slot="proName">标准合规评估流程</template>
-      <template slot="proNode">标准法规部部长审批</template>
+      <template slot="proNode">批准</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -3,7 +3,7 @@
     <!--        标准入库流程-->
     <ProcessHeader toggle>
       <template slot="proName">标准入库流程</template>
-      <template slot="proNode">发起流程</template>
+      <template slot="proNode">起草</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -950,7 +950,7 @@
               :model="roleForm"
               :rules="roleRules"
               class="label-input-form">
-              <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.prcCreateUserName ? '#66b1ff' : ''">
+              <el-timeline-item timestamp="起草" placement="top" :color="roleForm.prcCreateUserName ? '#66b1ff' : ''">
                 <el-card>
                   <el-form-item prop="prcCreateUserName" style="margin-bottom: 0">
                     <h4>流程发起人</h4>
@@ -960,7 +960,7 @@
                   </el-form-item>
                 </el-card>
               </el-timeline-item>
-              <el-timeline-item timestamp="选择会签责任人" v-if="form.signFlag === '1'" prop="zrUserName" placement="top" :color="roleForm.zrUserName ? '#66b1ff' : ''">
+              <el-timeline-item timestamp="会签" v-if="form.signFlag === '1'" prop="zrUserName" placement="top" :color="roleForm.zrUserName ? '#66b1ff' : ''">
                 <el-card>
                   <el-form-item prop="zrUserName" style="margin-bottom: 0">
                     <h4>会签责任人</h4>
@@ -971,7 +971,7 @@
                   </el-form-item>
                 </el-card>
               </el-timeline-item>
-              <el-timeline-item timestamp="修订申请人" v-if="form.signFlag === '1'" placement="top" :color="roleForm.applyUpdUserName ? '#66b1ff' : ''">
+              <el-timeline-item timestamp="修订" v-if="form.signFlag === '1'" placement="top" :color="roleForm.applyUpdUserName ? '#66b1ff' : ''">
                 <el-card>
                   <el-form-item prop="applyUpdUserName" style="margin-bottom: 0">
                     <h4>修订申请人</h4>
@@ -981,7 +981,7 @@
                   </el-form-item>
                 </el-card>
               </el-timeline-item>
-              <el-timeline-item timestamp="选择标准法规业务经理" prop="jlUserName" placement="top" :color="roleForm.jlUserName ? '#66b1ff' : ''">
+              <el-timeline-item timestamp="批准" prop="jlUserName" placement="top" :color="roleForm.jlUserName ? '#66b1ff' : ''">
                 <el-card>
                   <el-form-item prop="jlUserName" style="margin-bottom: 0">
                     <h4>标准法规业务经理</h4>

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

@@ -3,7 +3,7 @@
     <!--        标准入库流程-->
     <ProcessHeader toggle>
       <template slot="proName">标准入库流程</template>
-      <template slot="proNode">经理人审批</template>
+      <template slot="proNode">批准</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -1146,7 +1146,7 @@ export default {
         this.defaultCheckedKeys2 = [this.form.kccvppsbm]
         this.defaultCheckedKeys3 = [this.form.dybxh]
         this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
-        this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
+        this.form.standYear = this.form.standYear ? this.form.standYear : ''
         if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') {
           this.form.country = this.form.country.split(",");
         }

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

@@ -3,7 +3,7 @@
     <!--        标准入库流程-->
     <ProcessHeader toggle>
       <template slot="proName">标准入库流程</template>
-      <template slot="proNode">责任人会签</template>
+      <template slot="proNode">会签</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -3,7 +3,7 @@
     <!--        标准入库流程-->
     <ProcessHeader toggle>
       <template slot="proName">标准入库流程</template>
-      <template slot="proNode">申请人修订</template>
+      <template slot="proNode">修订</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue

@@ -101,7 +101,7 @@
             ></el-datePicker>
           </el-form-item>
           <el-form-item label="标准状态" prop="standStatus" class="add-form-item form-item-disabled">
-            <el-select v-model="form.standStatus" filterable clearable>
+            <el-select v-model="form.standStatus" filterable disabled>
               <el-option
                       v-for="item in opinionsStand"
                       :key="item.value"
@@ -416,20 +416,20 @@
 <!--          </el-form-item>-->
         </el-col>
         <el-col :span="12">
-          <!--                                <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">-->
+          <el-form-item label="被代替企标编号" prop="BDTQBBHBUSS" class="add-form-item form-item-disabled">
-          <!--                                  <el-input-->
+            <el-input
-          <!--                                      v-model="form.BDTWJHLAWS"-->
+                v-model="form.BDTQBBHBUSS"
-          <!--                                      placeholder="请输入被代替企标编号"-->
+                placeholder="请输入被代替企标编号"
-          <!--                                      clearable-->
+                clearable
-          <!--                                  ></el-input>-->
+            ></el-input>
-          <!--                                  <el-button-->
+            <el-button
-          <!--                                      type="primary"-->
+                type="primary"
-          <!--                                      class="common-button-primary"-->
+                class="common-button-primary"
-          <!--                                      size="mini"-->
+                size="mini"
-          <!--                                      style="position:absolute;top: 10px;right: 0;"-->
+                style="position:absolute;top: 10px;right: 0;"
-          <!--                                      @click="selectLaws('bfbdtbzh'),config.attrName = '被代替企标编号'"-->
+                @click="selectLaws('BDTQBBHBUSS'),config.attrName = '被代替企标编号'"
-          <!--                                  >{{'手动查找'}}</el-button>-->
+            >{{'手动查找'}}</el-button>
-          <!--                                </el-form-item>-->
+          </el-form-item>
           <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
             <el-input
                     v-model="form.XCSJBUSS"

src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue

@@ -284,12 +284,12 @@
 <!--          </el-form-item>-->
         </el-col>
         <el-col :span="12">
-<!--          <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">-->
+          <el-form-item label="被代替企标编号" prop="BDTQBBHBUSS" class="add-form-item form-item-disabled">
-<!--            <el-input-->
+            <el-input
-<!--                    v-model="form.BDTWJHLAWS" :disabled="disabledState"-->
+                    v-model="form.BDTQBBHBUSS" :disabled="disabledState"
-<!--                    clearable-->
+                    clearable
-<!--            ></el-input>-->
+            ></el-input>
-<!--          </el-form-item>-->
+          </el-form-item>
           <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
             <el-input
                     v-model="form.XCSJBUSS"

src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue

@@ -284,12 +284,12 @@
 <!--          </el-form-item>-->
         </el-col>
         <el-col :span="12">
-          <!--        <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">-->
+          <el-form-item label="被代替企标编号" prop="BDTQBBHBUSS" class="add-form-item form-item-disabled">
-          <!--          <el-input-->
+            <el-input
-          <!--                  v-model="form.BDTWJHLAWS" :disabled="disabledState"-->
+                    v-model="form.BDTQBBHBUSS" :disabled="disabledState"
-          <!--                  clearable-->
+                    clearable
-          <!--          ></el-input>-->
+            ></el-input>
-          <!--        </el-form-item>-->
+          </el-form-item>
           <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
             <el-input
                     v-model="form.XCSJBUSS"

src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue

@@ -82,6 +82,14 @@
 <!--                                </el-form-item>-->
                             </el-col>
                             <el-col :span="12">
+                                <el-form-item v-show="form.standStatus === '3'" class="add-form-item form-item-disabled" style="margin-left: -210px">
+                                    <el-button
+                                            type="primary"
+                                            :loading="loadSarStandard"
+                                            @click="handleSearchStandard">
+                                        根据企标名称、起草责任单位查询
+                                    </el-button>
+                                </el-form-item>
 <!--                              <el-form-item label="国家/地区" prop="country" class="add-form-item form-item-disabled">-->
 <!--                                <el-select :popper-append-to-body="false" v-model="form.country" multiple  placeholder="国家/地区">-->
 <!--                                  <el-option-->
@@ -394,20 +402,20 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-<!--                                <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">-->
+                                <el-form-item label="被代替企标编号" prop="BDTQBBHBUSS" class="add-form-item form-item-disabled">
-<!--                                  <el-input-->
+                                  <el-input
-<!--                                      v-model="form.BDTWJHLAWS"-->
+                                      v-model="form.BDTQBBHBUSS"
-<!--                                      placeholder="请输入被代替企标编号"-->
+                                      placeholder="请输入被代替企标编号"
-<!--                                      clearable-->
+                                      clearable
-<!--                                  ></el-input>-->
+                                  ></el-input>
-<!--                                  <el-button-->
+                                  <el-button
-<!--                                      type="primary"-->
+                                      type="primary"
-<!--                                      class="common-button-primary"-->
+                                      class="common-button-primary"
-<!--                                      size="mini"-->
+                                      size="mini"
-<!--                                      style="position:absolute;top: 10px;right: 0;"-->
+                                      style="position:absolute;top: 10px;right: 0;"
-<!--                                      @click="selectLaws('bfbdtbzh'),config.attrName = '被代替企标编号'"-->
+                                      @click="selectLaws('BDTQBBHBUSS'),config.attrName = '被代替企标编号'"
-<!--                                  >{{'手动查找'}}</el-button>-->
+                                  >{{'手动查找'}}</el-button>
-<!--                                </el-form-item>-->
+                                </el-form-item>
                                 <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
                                     <el-input
                                             v-model="form.XCSJBUSS"
@@ -854,30 +862,23 @@
             <div class="standard-content">
                 <div class="content">
                     <div class="standard-table-search">
-                        <el-form :model="standardSearchForm" inline class="label-input-form search-area">
+                        <el-form :model="standardSearchForm" inline class="label-input-form">
-                            <el-form-item label="政策编号" style="margin-right:-20px" prop="lawsNumber" class="search-item" >
+                            <el-form-item label="标准号" style="" prop="standNumber" class="search-item" >
                                 <el-input
-                                        v-model="standardSearchForm.lawsNumber"
+                                        v-model="standardSearchForm.standCode"
                                         clearable placeholder="根据编号查找"
                                         :maxlength="100"
                                         @keyup.enter.native="handleSearchStandard"/>
                             </el-form-item>
-                            <el-form-item label="中文名称" style="margin-right:-20px" prop="lawsName" class="search-item" >
+                            <el-form-item label="中文名称" style="" prop="lawsName" class="search-item" >
                                 <el-input
-                                        v-model="standardSearchForm.lawsName"
+                                        v-model="standardSearchForm.standName"
                                         placeholder="请输入中文名称"
                                         clearable
                                         :maxlength="100"></el-input>
                             </el-form-item>
-                            <el-form-item label="英文名称" style="margin-right:-20px" prop="lawsEnName" class="search-item" >
+                            <el-formItem label="文本状态" prop="textStatusBuss" class="search-item">
-                                <el-input
+                                <el-select v-model="standardSearchForm.textStatusBuss" filterable clearable>
-                                        v-model="standardSearchForm.lawsEnName"
-                                        placeholder="请输入英文名称"
-                                        clearable
-                                        :maxlength="100"></el-input>
-                            </el-form-item>
-                            <el-formItem label="文本状态" prop="lawsTextState" class="search-item">
-                                <el-select v-model="standardSearchForm.lawsTextState" filterable clearable>
                                     <el-option
                                             v-for="item in standStateOptions"
                                             placeholder="请选择"
@@ -926,20 +927,20 @@
                                     align="center"
                             ></el-table-column>
                             <el-table-column
-                                    label="政策编号"
+                                    label="企标标准号"
                                     align="center"
                             >
                                 <template slot-scope="scope">
-                                    <a @click="handlePreview(scope.row)">{{ scope.row.lawsNumber }}</a>
+                                    <a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
                                 </template>
                             </el-table-column>
                             <el-table-column
-                                    prop="lawsName"
+                                    prop="standName"
                                     label="中文名称"
                                     align="center">
                             </el-table-column>
                             <el-table-column
-                                    prop="lawsEnName"
+                                    prop="standEnName"
                                     label="英文名称"
                                     align="center">
                             </el-table-column>
@@ -972,12 +973,12 @@
                 </div>
             </div>
             <div class="demo-drawer-footer">
-                <el-button
+<!--                <el-button-->
-                        round
+<!--                        round-->
-                        class="common-button-primary"
+<!--                        class="common-button-primary"-->
-                        icon="el-icon-check"
+<!--                        icon="el-icon-check"-->
-                        type="primary"
+<!--                        type="primary"-->
-                        @click="handleProcessStandardNext(1)">新增</el-button>
+<!--                        @click="handleProcessStandardNext(1)">新增</el-button>-->
                 <el-button
                         round
                         class="common-button-primary"
@@ -1559,40 +1560,47 @@
                 let year = date.getFullYear();
                 if(this.form.standStatus === '2'){
                     this.form.id = ""
-                    if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
+                    this.form.standCode = ""
-                        this.$message.warning("请选择一条代替企标编号")
+                    this.FBGBUSSFileList = []
+                    this.LSBBBUSSFileList = []
+                    this.form.FBGBUSS = sessionStorage.getItem("FBGBUSSBF")
+                    this.form.FBGBUSSName = sessionStorage.getItem("FBGBUSSNameBF")
+                    this.form.LSBBBUSS = sessionStorage.getItem("LSBBBUSSBF")
+                    this.form.LSBBBUSSName = sessionStorage.getItem("LSBBBUSSNameBF")
+                    this.FBGBUSSFileList=this.assemble(sessionStorage.getItem("FBGBUSSBF"),sessionStorage.getItem("FBGBUSSNameBF"));
+                    this.LSBBBUSSFileList=this.assemble(sessionStorage.getItem("LSBBBUSSBF"),sessionStorage.getItem("LSBBBUSSNameBF"));
+                    if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) {
+                        this.$message.warning("请选择一条被代替企标编号")
                         return
                     }
-                    if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null){
+                    if(this.form.BDTQBBHBUSS !== undefined && this.form.BDTQBBHBUSS !== null){
                         this.form.standSn = this.form.standNum
                         this.form.standNumber = this.form.standNum
                         this.form.standYear = this.regDate(year)
                         this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
                     }
                 }else if(this.form.standStatus === '3' ){
-                    if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
+                    sessionStorage.removeItem("FBGBUSSBF")
-                        this.$message.warning("请选择一条代替企标编号")
+                    sessionStorage.removeItem("FBGBUSSNameBF")
+                    sessionStorage.removeItem("LSBBBUSSBF")
+                    sessionStorage.removeItem("LSBBBUSSNameBF")
+                    sessionStorage.setItem("FBGBUSSBF",this.form.FBGBUSS)
+                    sessionStorage.setItem("FBGBUSSNameBF",this.form.FBGBUSSName)
+                    sessionStorage.setItem("LSBBBUSSBF",this.form.LSBBBUSS)
+                    sessionStorage.setItem("LSBBBUSSNameBF",this.form.LSBBBUSSName)
+                    this.LSBBBUSSFileList=this.LSBBBUSSFileList.concat(this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName))
+                    this.form.LSBBBUSS = this.form.FBGBUSS
+                    this.form.LSBBBUSSName = this.form.FBGBUSSName
+                    this.FBGBUSSFileList= []
+                    this.FBGBUSS = ""
+                    this.FBGBUSSName = ""
+                    if((this.form.standStatus === '3') && (this.standardCheckedList === undefined || this.standardCheckedList.length === 0)) {
+                        this.$message.warning("请选择一条企标标准")
                         return
                     }
-                    if(this.form.selListRep2.length === 1){
-                        this.form.selListRep2.map((item) => {
-                            let texts = ''
-                            if (item.standYear != null && item.standYear !== '') {
-                                texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
-                            } else {
-                                texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
-                            }
-                            // 标准状态 修改 更新当前标准
-                            this.form.standSort = item.standSort
-                            this.form.standName = item.standName
-                            this.form.standNumber = item.standNumber
-                            this.form.standYear = item.standYear
-                            this.form.standCode = texts
-                            this.form.id = item.id
-                        })
-                    }
                 }else if(this.form.standStatus === '1' ){
                     this.form.id = ""
+                    this.form.standCode = ""
                     if(type === '1'){
                         this.isSubmit = true
                         this.saveLoading = true
@@ -1606,6 +1614,14 @@
                         this.form.standNumber = standSn
                         this.form.standYear = year // 待带入立项标准
                         this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
+                        this.FBGBUSSFileList = []
+                        this.LSBBBUSSFileList = []
+                        this.form.FBGBUSS = sessionStorage.getItem("FBGBUSSBF")
+                        this.form.FBGBUSSName = sessionStorage.getItem("FBGBUSSNameBF")
+                        this.form.LSBBBUSS = sessionStorage.getItem("LSBBBUSSBF")
+                        this.form.LSBBBUSSName = sessionStorage.getItem("LSBBBUSSNameBF")
+                        this.FBGBUSSFileList=this.assemble(sessionStorage.getItem("FBGBUSSBF"),sessionStorage.getItem("FBGBUSSNameBF"));
+                        this.LSBBBUSSFileList=this.assemble(sessionStorage.getItem("LSBBBUSSBF"),sessionStorage.getItem("LSBBBUSSNameBF"));
                         if(type === '1'){
                             this.isSubmit = false
                             this.saveLoading = false
@@ -1918,14 +1934,15 @@
               }
           },
          assemble(ids,names){
-            let list= new Array();
+             let list= new Array();
-            let idArray=ids.split(',');
+             if(ids && ids !== '' && names && names !== ''){
-            let nameArray=names.split(',');
+                 let idArray=ids.split(',');
-            for(let i=0; i<idArray.length; i++){
+                 let nameArray=names.split(',');
-                list.push({id:idArray[i],name:nameArray[i]});
+                 for(let i=0; i<idArray.length; i++){
-            }
+                     list.push({id:idArray[i],name:nameArray[i]});
-
+                 }
-            return list;
+             }
+             return list;
          },
           // 将文本状态的id与name对应
           setMap(data){
@@ -1997,7 +2014,7 @@
                     // 带入
                     case 2:
                         if (this.standardCheckedList.length === 1) {
-                          this.$http.get('lawss/sarLawsInfo/getStandInfoUpdateById', {id: this.standardCheckedList[0].id}, {
+                          this.$http.get('lawss/sarBussionessStand/getStandInfoUpdateById', {id: this.standardCheckedList[0].id}, {
                             _this: this
                           }, res => {
                             if(res && res.data){
@@ -2005,20 +2022,42 @@
 
                               const json = Object.assign(bringData, bringData.attrInfoMap);
                               this.form = JSON.parse(JSON.stringify(json))
-                              this.form.TGRLAWS = JSON.parse(JSON.stringify(json)).TGRLAWS && JSON.parse(JSON.stringify(json)).TGRLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).TGRLAWS.split(',') : []
-                              this.form.TGDWLAWS = JSON.parse(JSON.stringify(json)).TGDWLAWS && JSON.parse(JSON.stringify(json)).TGDWLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).TGDWLAWS.split(',') : []
-                              this.form.NYLXLAWS = JSON.parse(JSON.stringify(json)).NYLXLAWS && JSON.parse(JSON.stringify(json)).NYLXLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).NYLXLAWS.split(',') : []
-                              this.form.YYRZLAWS = JSON.parse(JSON.stringify(json)).YYRZLAWS && JSON.parse(JSON.stringify(json)).YYRZLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).YYRZLAWS.split(',') : []
-                              this.form.ZRBMLAWS = JSON.parse(JSON.stringify(json)).ZRBMLAWS && JSON.parse(JSON.stringify(json)).ZRBMLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).ZRBMLAWS.split(',') : []
-                              this.form.ZRGCSLAWS = JSON.parse(JSON.stringify(json)).ZRGCSLAWS && JSON.parse(JSON.stringify(json)).ZRGCSLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).ZRGCSLAWS.split(',') : []
                               this.form.prcNum = this.prcNum
                               this.form.prcName = this.prcName
+                              this.form.standStatus = "3"
+                              this.form.QCRBUSSID = ''
+                              this.form.standNum =''
+                              this.form.planId=''
+                              this.form.planStatus=''
+                              this.form.reviseStatus=''
+                              this.form.standSn=''
+                              this.form.modelData=[]
+                              this.form.modelDataNameVerify=[]
+                              this.form.modelDataZrUserVerify=[]
+                              this.form.QCDWID= ''
+                              this.form.WJSCRYBUSS= this.$store.getters.userInfo.userId
+                              this.form.WJSCRYBUSSName= this.$store.getters.userInfo.userName
                               this.form['id'] = bringData.id
                               this.standardDrawer = false
                               this.verifySarStandard = true
                               this.busVsFunc()
                               this.modelFunc()
                               this.$forceUpdate()
+                              this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
+                              this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
+                              this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
+                              this.LSBBBUSSFileList = []
+                              if(this.LSBBBUSSFileList && this.LSBBBUSSFileList.length > 0){
+                                this.LSBBBUSSFileList=this.LSBBBUSSFileList.concat(this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName))
+                              }else {
+                                this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
+                              }
+                              this.form.LSBBBUSS = this.form.FBGBUSS
+                              this.form.LSBBBUSSName = this.form.FBGBUSSName
+                              this.FBGBUSSFileList= []
+                              this.FBGBUSS = ""
+                              this.FBGBUSSName = ""
+                                console.log(this.form)
                             }
                             // 遍历对象初始化文件信息
                             for(const p in this.form) {
@@ -2030,9 +2069,9 @@
                           })
 
                         } else if (this.standardCheckedList.length > 1) {
-                            this.$message.warning('最多可以带入一条政策信息')
+                            this.$message.warning('最多可以带入一条企标信息')
                         } else {
-                            this.$message.warning('请选择要带入的政策信息')
+                            this.$message.warning('请选择要带入的企标信息')
                         }
                         break
                     // 取消
@@ -2136,7 +2175,7 @@
             },
             getDomesticStandardTable () {
                 this.loadSarStandard = true
-                this.$http.get('lawss/sarLawsInfo/page', this.standardSearchForm, {}, res => {
+                this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.standardSearchForm, {}, res => {
                     this.loadSarStandard = false
                     if (res.ok) {
                         this.tableData.standardData = res.data.list
@@ -2415,7 +2454,6 @@
                     })
                 }
                 let textArr2 = []
-                this.form.selListRep2 = []
                 this.selectedListRep.map((item) => {
                     let texts = ''
                     if (item.standYear != null && item.standYear !== '') {
@@ -2423,16 +2461,6 @@
                     } else {
                         texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
                     }
-                    // 标准状态 修改 更新当前标准
-                    if(this.form.standStatus === '3'){
-                        this.form.standSort = item.standSort
-                        this.form.standName = item.standName
-                        this.form.standNumber = item.standNumber
-                        this.form.standYear = item.standYear
-                        this.form.standCode = texts
-                        this.form.id = item.id
-                    }
-                    this.form.selListRep2.push(item)
                     textArr2.push(item.standNumber)
                     textArr.push(texts)
                     textArr = [...new Set(textArr)]
@@ -2443,13 +2471,13 @@
                 // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
                 if(this.replaceLawType === 'DTQBBHBUSS'){
                     this.form.DTQBBHBUSS = textArr.join(',')
-                    this.form.standNum = textArr2.join(',')
                 }else if(this.replaceLawType === 'yybj'){
                     this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'cbbh'){
                     this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
-                }else if(this.replaceLawType === 'bfbdtbzh'){
+                }else if(this.replaceLawType === 'BDTQBBHBUSS'){
-                    this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',')
+                    this.form.BDTQBBHBUSS = textArr.join(',')
+                    this.form.standNum = textArr2.join(',')
                 }else {
                     this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
                 }
@@ -2556,7 +2584,12 @@
             },
             // 文件预览及下载
             handleFilePreview(file) {
-                const attId = file.response.data.id
+                let attId = ""
+                if(file && file.id){
+                    attId = file.id
+                }else {
+                    attId = file.response.data.id
+                }
                 if (this.preview) {
                     if (attId) {
                         window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
@@ -2569,32 +2602,40 @@
             },
             // 导入标准数据成功后执行
             importFileSuccess (response, file,fileList) {
-              // 上传成功后判断是否是两条数据是的话替换掉旧数据
+                // 上传成功后判断是否是两条数据是的话替换掉旧数据
-              // if (fileList.length > 1) {
+                // if (fileList.length > 1) {
-              //   this.fileList = fileList.splice(0, 1)
+                //   this.fileList = fileList.splice(0, 1)
-              // }
+                // }
                 if (response.ok) {
-
+                    const fileObj = {}
-                  switch (this.fileType){
+                    fileObj.id = file.response.data.id
-                      case 'FBGBUSS':
+                    fileObj.name = file.response.data.name
-                        this.FBGBUSSFileList = fileList
+                    switch (this.fileType){
-                        break;
+                        case 'FBGBUSS':
-                      case 'BZSMBUSS' :
+                            this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined);
-                        this.BZSMBUSSFileList = fileList
+                            this.FBGBUSSFileList.push(fileObj)
-                        break;
+                            break;
-                      case 'LSBBBUSS':
+                        case 'BZSMBUSS' :
-                        this.LSBBBUSSFileList = fileList
+                            this.BZSMBUSSFileList = this.BZSMBUSSFileList.filter ( item => item.response === undefined);
-                        break;
+                            this.BZSMBUSSFileList.push(fileObj)
-                      case 'QTWJBUSS':
+                            break;
-                        this.QTWJBUSSFileList = fileList
+                        case 'LSBBBUSS':
-                        break;
+                            this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
-                      case 'GLWJBUSS':
+                            this.LSBBBUSSFileList.push(fileObj)
-                        this.GLWJBUSSFileList = fileList
+                            break;
-                        break;
+                        case 'GLWJLAWS':
-                      case 'XGD' :
+                            this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
-                        this.XGDFileList = fileList
+                            this.GLWJLAWSFileList.push(fileObj)
-                        break;
+                            break;
-                    default : ;
+                        case 'GLWJBUSS':
+                            this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
+                            this.GLWJBUSSFileList.push(fileObj)
+                            break;
+                        case 'XGD':
+                            this.XGDFileList = this.XGDFileList.filter ( item => item.response === undefined);
+                            this.XGDFileList.push(fileObj)
+                            break;
+                      default : ;
                   }
                   this.$message({
                         showClose: true,
@@ -2736,24 +2777,24 @@
             },
           fileInfoHandle(){
 
-            //拼接文件名和id 提交到流程Activity
+              //拼接文件名和id 提交到流程Activity
-            this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.response.data.id).join(",")
+              this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id).join(",")
-            this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",")
+              this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",")
 
-            this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.response.data.id).join(",")
+              this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.id).join(",")
-            this.form.BZSMBUSSName=this.BZSMBUSSFileList.map(item => item.name).join(",")
+              this.form.BZSMBUSSName=this.BZSMBUSSFileList.map(item => item.name).join(",")
 
-            this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.response.data.id).join(",")
+              this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id).join(",")
-            this.form.LSBBBUSSName=this.LSBBBUSSFileList.map(item => item.name).join(",")
+              this.form.LSBBBUSSName=this.LSBBBUSSFileList.map(item => item.name).join(",")
 
-            this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.response.data.id).join(",")
+              this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.id).join(",")
-            this.form.QTWJBUSSName=this.QTWJBUSSFileList.map(item => item.name).join(",")
+              this.form.QTWJBUSSName=this.QTWJBUSSFileList.map(item => item.name).join(",")
 
-            this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.response.data.id).join(",")
+              this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",")
-            this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",")
+              this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",")
 
-            this.form.XGD=this.XGDFileList.map(item => item.response.data.id).join(",")
+              this.form.XGD=this.XGDFileList.map(item => item.id).join(",")
-            this.form.XGDName=this.XGDFileList.map(item => item.name).join(",")
+              this.form.XGDName=this.XGDFileList.map(item => item.name).join(",")
 
           },
             // 删除方法
@@ -2847,7 +2888,7 @@
                                 this.isSubmit = true
                                 this.saveLoading = true
                                 this.form.country=this.countryArr;
-                                var json = Object.assign(this.form, this.roleForm)
+                                const json = Object.assign(this.form, this.roleForm);
                                 json.zrUserId = this.form.zrUserId
                                 json.jlUserId = this.form.jlUserId
                                 json.commentText = this.commentText

src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue

@@ -1087,13 +1087,6 @@
                     }
                 }
             },
-            'form.standStatus': {
-                handler (val) {
-                    if (val !== '' && val !== null && typeof (val) !== 'undefined') {
-                        this.getStandInfoByReviseStatus("1")
-                    }
-                }
-            },
             filterText(val) {
                 this.$refs.tree.filter(val);
             },
@@ -1865,7 +1858,6 @@
                     })
                 }
                 let textArr2 = []
-                this.form.selListRep2 = []
                 this.selectedListRep.map((item) => {
                     let texts = ''
                     if (item.standYear != null && item.standYear !== '') {
@@ -1873,16 +1865,6 @@
                     } else {
                         texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
                     }
-                    // 标准状态 修改 更新当前标准
-                    if(this.form.standStatus === '3'){
-                        this.form.standSort = item.standSort
-                        this.form.standName = item.standName
-                        this.form.standNumber = item.standNumber
-                        this.form.standYear = item.standYear
-                        this.form.standCode = texts
-                        this.form.id = item.id
-                    }
-                    this.form.selListRep2.push(item)
                     textArr2.push(item.standNumber)
                     textArr.push(texts)
                     textArr = [...new Set(textArr)]
@@ -1893,13 +1875,13 @@
                 // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
                 if(this.replaceLawType === 'DTQBBHBUSS'){
                     this.form.DTQBBHBUSS = textArr.join(',')
-                    this.form.standNum = textArr2.join(',')
                 }else if(this.replaceLawType === 'yybj'){
                     this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'cbbh'){
                     this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
-                }else if(this.replaceLawType === 'bfbdtbzh'){
+                }else if(this.replaceLawType === 'BDTQBBHBUSS'){
-                    this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',')
+                    this.form.BDTQBBHBUSS = textArr.join(',')
+                    this.form.standNum = textArr2.join(',')
                 }else {
                     this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
                 }
@@ -2498,12 +2480,13 @@
             },
             assemble(ids,names){
                 let list= new Array();
-                let idArray=ids.split(',');
+                if(ids && ids !== '' && names && names !== ''){
-                let nameArray=names.split(',');
+                    let idArray=ids.split(',');
-                for(let i=0; i<idArray.length; i++){
+                    let nameArray=names.split(',');
-                    list.push({id:idArray[i],name:nameArray[i]});
+                    for(let i=0; i<idArray.length; i++){
+                        list.push({id:idArray[i],name:nameArray[i]});
+                    }
                 }
-
                 return list;
             },
             getData() {

src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue

@@ -1075,13 +1075,6 @@
                     }
                 }
             },
-            'form.standStatus': {
-                handler (val) {
-                    if (val !== '' && val !== null && typeof (val) !== 'undefined') {
-                        this.getStandInfoByReviseStatus("1")
-                    }
-                }
-            },
             'form.issueTime': {
                 handler: function() {
                     if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){
@@ -1138,6 +1131,15 @@
                 let year = date.getFullYear();
                 if(this.form.standStatus === '2'){
                     this.form.id = ""
+                    this.FBGBUSSFileList = []
+                    this.LSBBBUSSFileList = []
+                    this.form.FBGBUSS = sessionStorage.getItem("FBGBUSSBF")
+                    this.form.FBGBUSSName = sessionStorage.getItem("FBGBUSSNameBF")
+                    this.form.LSBBBUSS = sessionStorage.getItem("LSBBBUSSBF")
+                    this.form.LSBBBUSSName = sessionStorage.getItem("LSBBBUSSNameBF")
+                    this.FBGBUSSFileList=this.assemble(sessionStorage.getItem("FBGBUSSBF"),sessionStorage.getItem("FBGBUSSNameBF"));
+                    this.LSBBBUSSFileList=this.assemble(sessionStorage.getItem("LSBBBUSSBF"),sessionStorage.getItem("LSBBBUSSNameBF"));
+                    this.formKey++
                     if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
                         this.$message.warning("请选择一条代替企标编号")
                         return
@@ -1148,7 +1150,22 @@
                         this.form.standYear = this.regDate(year)
                         this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
                     }
+                    this.formKey++
                 }else if(this.form.standStatus === '3' ){
+                    sessionStorage.removeItem("FBGBUSSBF")
+                    sessionStorage.removeItem("FBGBUSSNameBF")
+                    sessionStorage.removeItem("LSBBBUSSBF")
+                    sessionStorage.removeItem("LSBBBUSSNameBF")
+                    sessionStorage.setItem("FBGBUSSBF",this.form.FBGBUSS)
+                    sessionStorage.setItem("FBGBUSSNameBF",this.form.FBGBUSSName)
+                    sessionStorage.setItem("LSBBBUSSBF",this.form.LSBBBUSS)
+                    sessionStorage.setItem("LSBBBUSSNameBF",this.form.LSBBBUSSName)
+                    this.LSBBBUSSFileList=this.LSBBBUSSFileList.concat(this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName))
+                    this.form.LSBBBUSS = this.form.FBGBUSS
+                    this.form.LSBBBUSSName = this.form.FBGBUSSName
+                    this.FBGBUSSFileList= []
+                    this.FBGBUSS = ""
+                    this.FBGBUSSName = ""
                     if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
                         this.$message.warning("请选择一条代替企标编号")
                         return
@@ -1170,6 +1187,7 @@
                             this.form.id = item.id
                         })
                     }
+                    this.formKey++
                 }else if(this.form.standStatus === '1' ){
                     this.form.id = ""
                     if(type === '1'){
@@ -1185,13 +1203,23 @@
                         this.form.standNumber = standSn
                         this.form.standYear = year // 待带入立项标准
                         this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
+                        this.FBGBUSSFileList = []
+                        this.LSBBBUSSFileList = []
+                        this.form.FBGBUSS = sessionStorage.getItem("FBGBUSSBF")
+                        this.form.FBGBUSSName = sessionStorage.getItem("FBGBUSSNameBF")
+                        this.form.LSBBBUSS = sessionStorage.getItem("LSBBBUSSBF")
+                        this.form.LSBBBUSSName = sessionStorage.getItem("LSBBBUSSNameBF")
+                        this.FBGBUSSFileList=this.assemble(sessionStorage.getItem("FBGBUSSBF"),sessionStorage.getItem("FBGBUSSNameBF"));
+                        this.LSBBBUSSFileList=this.assemble(sessionStorage.getItem("LSBBBUSSBF"),sessionStorage.getItem("LSBBBUSSNameBF"));
                         if(type === '1'){
                             this.isSubmit = false
                             this.saveLoading = false
                         }
+                        this.formKey++
                     }, e => {
                     })
                 }
+
             },
             drawerCheckZRBM(data) {
                 let idList = ''
@@ -1939,7 +1967,6 @@
                     })
                 }
                 let textArr2 = []
-                this.form.selListRep2 = []
                 this.selectedListRep.map((item) => {
                     let texts = ''
                     if (item.standYear != null && item.standYear !== '') {
@@ -1947,16 +1974,6 @@
                     } else {
                         texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
                     }
-                    // 标准状态 修改 更新当前标准
-                    if(this.form.standStatus === '3'){
-                        this.form.standSort = item.standSort
-                        this.form.standName = item.standName
-                        this.form.standNumber = item.standNumber
-                        this.form.standYear = item.standYear
-                        this.form.standCode = texts
-                        this.form.id = item.id
-                    }
-                    this.form.selListRep2.push(item)
                     textArr2.push(item.standNumber)
                     textArr.push(texts)
                     textArr = [...new Set(textArr)]
@@ -1967,13 +1984,13 @@
                 // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
                 if(this.replaceLawType === 'DTQBBHBUSS'){
                     this.form.DTQBBHBUSS = textArr.join(',')
-                    this.form.standNum = textArr2.join(',')
                 }else if(this.replaceLawType === 'yybj'){
                     this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'cbbh'){
                     this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
-                }else if(this.replaceLawType === 'bfbdtbzh'){
+                }else if(this.replaceLawType === 'BDTQBBHBUSS'){
-                    this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',')
+                    this.form.BDTQBBHBUSS = textArr.join(',')
+                    this.form.standNum = textArr2.join(',')
                 }else {
                     this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
                 }

src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue

@@ -1154,13 +1154,6 @@
                     }
                 }
             },
-            'form.standStatus': {
-                handler (val) {
-                    if (val !== '' && val !== null && typeof (val) !== 'undefined') {
-                        this.getStandInfoByReviseStatus()
-                    }
-                }
-            },
             'form.issueTime': {
                 handler: function() {
                     if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){
@@ -1217,6 +1210,15 @@
                 let year = date.getFullYear();
                 if(this.form.standStatus === '2'){
                     this.form.id = ""
+                    this.FBGBUSSFileList = []
+                    this.LSBBBUSSFileList = []
+                    this.form.FBGBUSS = sessionStorage.getItem("FBGBUSSBF")
+                    this.form.FBGBUSSName = sessionStorage.getItem("FBGBUSSNameBF")
+                    this.form.LSBBBUSS = sessionStorage.getItem("LSBBBUSSBF")
+                    this.form.LSBBBUSSName = sessionStorage.getItem("LSBBBUSSNameBF")
+                    this.FBGBUSSFileList=this.assemble(sessionStorage.getItem("FBGBUSSBF"),sessionStorage.getItem("FBGBUSSNameBF"));
+                    this.LSBBBUSSFileList=this.assemble(sessionStorage.getItem("LSBBBUSSBF"),sessionStorage.getItem("LSBBBUSSNameBF"));
+                    this.formKey++
                     if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
                         this.$message.warning("请选择一条代替企标编号")
                         return
@@ -1227,7 +1229,22 @@
                         this.form.standYear = this.regDate(year)
                         this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
                     }
+                    this.formKey++
                 }else if(this.form.standStatus === '3' ){
+                    sessionStorage.removeItem("FBGBUSSBF")
+                    sessionStorage.removeItem("FBGBUSSNameBF")
+                    sessionStorage.removeItem("LSBBBUSSBF")
+                    sessionStorage.removeItem("LSBBBUSSNameBF")
+                    sessionStorage.setItem("FBGBUSSBF",this.form.FBGBUSS)
+                    sessionStorage.setItem("FBGBUSSNameBF",this.form.FBGBUSSName)
+                    sessionStorage.setItem("LSBBBUSSBF",this.form.LSBBBUSS)
+                    sessionStorage.setItem("LSBBBUSSNameBF",this.form.LSBBBUSSName)
+                    this.LSBBBUSSFileList=this.LSBBBUSSFileList.concat(this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName))
+                    this.form.LSBBBUSS = this.form.FBGBUSS
+                    this.form.LSBBBUSSName = this.form.FBGBUSSName
+                    this.FBGBUSSFileList= []
+                    this.FBGBUSS = ""
+                    this.FBGBUSSName = ""
                     if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
                         this.$message.warning("请选择一条代替企标编号")
                         return
@@ -1249,6 +1266,7 @@
                             this.form.id = item.id
                         })
                     }
+                    this.formKey++
                 }else if(this.form.standStatus === '1' ){
                     this.form.id = ""
                     if(type === '1'){
@@ -1264,13 +1282,23 @@
                         this.form.standNumber = standSn
                         this.form.standYear = year // 待带入立项标准
                         this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
+                        this.FBGBUSSFileList = []
+                        this.LSBBBUSSFileList = []
+                        this.form.FBGBUSS = sessionStorage.getItem("FBGBUSSBF")
+                        this.form.FBGBUSSName = sessionStorage.getItem("FBGBUSSNameBF")
+                        this.form.LSBBBUSS = sessionStorage.getItem("LSBBBUSSBF")
+                        this.form.LSBBBUSSName = sessionStorage.getItem("LSBBBUSSNameBF")
+                        this.FBGBUSSFileList=this.assemble(sessionStorage.getItem("FBGBUSSBF"),sessionStorage.getItem("FBGBUSSNameBF"));
+                        this.LSBBBUSSFileList=this.assemble(sessionStorage.getItem("LSBBBUSSBF"),sessionStorage.getItem("LSBBBUSSNameBF"));
                         if(type === '1'){
                             this.isSubmit = false
                             this.saveLoading = false
                         }
+                        this.formKey++
                     }, e => {
                     })
                 }
+
             },
             drawerCheckZRBM(data) {
                 let idList = ''
@@ -2030,7 +2058,6 @@
                     })
                 }
                 let textArr2 = []
-                this.form.selListRep2 = []
                 this.selectedListRep.map((item) => {
                     let texts = ''
                     if (item.standYear != null && item.standYear !== '') {
@@ -2038,16 +2065,6 @@
                     } else {
                         texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
                     }
-                    // 标准状态 修改 更新当前标准
-                    if(this.form.standStatus === '3'){
-                        this.form.standSort = item.standSort
-                        this.form.standName = item.standName
-                        this.form.standNumber = item.standNumber
-                        this.form.standYear = item.standYear
-                        this.form.standCode = texts
-                        this.form.id = item.id
-                    }
-                    this.form.selListRep2.push(item)
                     textArr2.push(item.standNumber)
                     textArr.push(texts)
                     textArr = [...new Set(textArr)]
@@ -2058,13 +2075,13 @@
                 // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
                 if(this.replaceLawType === 'DTQBBHBUSS'){
                     this.form.DTQBBHBUSS = textArr.join(',')
-                    this.form.standNum = textArr2.join(',')
                 }else if(this.replaceLawType === 'yybj'){
                     this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'cbbh'){
                     this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
-                }else if(this.replaceLawType === 'bfbdtbzh'){
+                }else if(this.replaceLawType === 'BDTQBBHBUSS'){
-                    this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',')
+                    this.form.BDTQBBHBUSS = textArr.join(',')
+                    this.form.standNum = textArr2.join(',')
                 }else {
                     this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
                 }

src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue

@@ -1075,13 +1075,6 @@
                     }
                 }
             },
-            'form.standStatus': {
-                handler (val) {
-                    if (val !== '' && val !== null && typeof (val) !== 'undefined') {
-                        this.getStandInfoByReviseStatus("1")
-                    }
-                }
-            },
             'form.issueTime': {
                 handler: function() {
                     if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){
@@ -1138,6 +1131,15 @@
                 let year = date.getFullYear();
                 if(this.form.standStatus === '2'){
                     this.form.id = ""
+                    this.FBGBUSSFileList = []
+                    this.LSBBBUSSFileList = []
+                    this.form.FBGBUSS = sessionStorage.getItem("FBGBUSSBF")
+                    this.form.FBGBUSSName = sessionStorage.getItem("FBGBUSSNameBF")
+                    this.form.LSBBBUSS = sessionStorage.getItem("LSBBBUSSBF")
+                    this.form.LSBBBUSSName = sessionStorage.getItem("LSBBBUSSNameBF")
+                    this.FBGBUSSFileList=this.assemble(sessionStorage.getItem("FBGBUSSBF"),sessionStorage.getItem("FBGBUSSNameBF"));
+                    this.LSBBBUSSFileList=this.assemble(sessionStorage.getItem("LSBBBUSSBF"),sessionStorage.getItem("LSBBBUSSNameBF"));
+                    this.formKey++
                     if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
                         this.$message.warning("请选择一条代替企标编号")
                         return
@@ -1148,7 +1150,22 @@
                         this.form.standYear = this.regDate(year)
                         this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
                     }
+                    this.formKey++
                 }else if(this.form.standStatus === '3' ){
+                    sessionStorage.removeItem("FBGBUSSBF")
+                    sessionStorage.removeItem("FBGBUSSNameBF")
+                    sessionStorage.removeItem("LSBBBUSSBF")
+                    sessionStorage.removeItem("LSBBBUSSNameBF")
+                    sessionStorage.setItem("FBGBUSSBF",this.form.FBGBUSS)
+                    sessionStorage.setItem("FBGBUSSNameBF",this.form.FBGBUSSName)
+                    sessionStorage.setItem("LSBBBUSSBF",this.form.LSBBBUSS)
+                    sessionStorage.setItem("LSBBBUSSNameBF",this.form.LSBBBUSSName)
+                    this.LSBBBUSSFileList=this.LSBBBUSSFileList.concat(this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName))
+                    this.form.LSBBBUSS = this.form.FBGBUSS
+                    this.form.LSBBBUSSName = this.form.FBGBUSSName
+                    this.FBGBUSSFileList= []
+                    this.FBGBUSS = ""
+                    this.FBGBUSSName = ""
                     if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
                         this.$message.warning("请选择一条代替企标编号")
                         return
@@ -1170,6 +1187,7 @@
                             this.form.id = item.id
                         })
                     }
+                    this.formKey++
                 }else if(this.form.standStatus === '1' ){
                     this.form.id = ""
                     if(type === '1'){
@@ -1185,13 +1203,23 @@
                         this.form.standNumber = standSn
                         this.form.standYear = year // 待带入立项标准
                         this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
+                        this.FBGBUSSFileList = []
+                        this.LSBBBUSSFileList = []
+                        this.form.FBGBUSS = sessionStorage.getItem("FBGBUSSBF")
+                        this.form.FBGBUSSName = sessionStorage.getItem("FBGBUSSNameBF")
+                        this.form.LSBBBUSS = sessionStorage.getItem("LSBBBUSSBF")
+                        this.form.LSBBBUSSName = sessionStorage.getItem("LSBBBUSSNameBF")
+                        this.FBGBUSSFileList=this.assemble(sessionStorage.getItem("FBGBUSSBF"),sessionStorage.getItem("FBGBUSSNameBF"));
+                        this.LSBBBUSSFileList=this.assemble(sessionStorage.getItem("LSBBBUSSBF"),sessionStorage.getItem("LSBBBUSSNameBF"));
                         if(type === '1'){
                             this.isSubmit = false
                             this.saveLoading = false
                         }
+                        this.formKey++
                     }, e => {
                     })
                 }
+
             },
             drawerCheckZRBM(data) {
                 let idList = ''
@@ -1939,7 +1967,6 @@
                     })
                 }
                 let textArr2 = []
-                this.form.selListRep2 = []
                 this.selectedListRep.map((item) => {
                     let texts = ''
                     if (item.standYear != null && item.standYear !== '') {
@@ -1947,16 +1974,6 @@
                     } else {
                         texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
                     }
-                    // 标准状态 修改 更新当前标准
-                    if(this.form.standStatus === '3'){
-                        this.form.standSort = item.standSort
-                        this.form.standName = item.standName
-                        this.form.standNumber = item.standNumber
-                        this.form.standYear = item.standYear
-                        this.form.standCode = texts
-                        this.form.id = item.id
-                    }
-                    this.form.selListRep2.push(item)
                     textArr2.push(item.standNumber)
                     textArr.push(texts)
                     textArr = [...new Set(textArr)]
@@ -1967,13 +1984,13 @@
                 // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
                 if(this.replaceLawType === 'DTQBBHBUSS'){
                     this.form.DTQBBHBUSS = textArr.join(',')
-                    this.form.standNum = textArr2.join(',')
                 }else if(this.replaceLawType === 'yybj'){
                     this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'cbbh'){
                     this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
-                }else if(this.replaceLawType === 'bfbdtbzh'){
+                }else if(this.replaceLawType === 'BDTQBBHBUSS'){
-                    this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',')
+                    this.form.BDTQBBHBUSS = textArr.join(',')
+                    this.form.standNum = textArr2.join(',')
                 }else {
                     this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
                 }

src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue

@@ -1154,13 +1154,6 @@
                     }
                 }
             },
-            'form.standStatus': {
-                handler (val) {
-                    if (val !== '' && val !== null && typeof (val) !== 'undefined') {
-                        this.getStandInfoByReviseStatus()
-                    }
-                }
-            },
             'form.issueTime': {
                 handler: function() {
                     if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){
@@ -1217,6 +1210,15 @@
                 let year = date.getFullYear();
                 if(this.form.standStatus === '2'){
                     this.form.id = ""
+                    this.FBGBUSSFileList = []
+                    this.LSBBBUSSFileList = []
+                    this.form.FBGBUSS = sessionStorage.getItem("FBGBUSSBF")
+                    this.form.FBGBUSSName = sessionStorage.getItem("FBGBUSSNameBF")
+                    this.form.LSBBBUSS = sessionStorage.getItem("LSBBBUSSBF")
+                    this.form.LSBBBUSSName = sessionStorage.getItem("LSBBBUSSNameBF")
+                    this.FBGBUSSFileList=this.assemble(sessionStorage.getItem("FBGBUSSBF"),sessionStorage.getItem("FBGBUSSNameBF"));
+                    this.LSBBBUSSFileList=this.assemble(sessionStorage.getItem("LSBBBUSSBF"),sessionStorage.getItem("LSBBBUSSNameBF"));
+                    this.formKey++
                     if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
                         this.$message.warning("请选择一条代替企标编号")
                         return
@@ -1227,7 +1229,22 @@
                         this.form.standYear = this.regDate(year)
                         this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
                     }
+                    this.formKey++
                 }else if(this.form.standStatus === '3' ){
+                    sessionStorage.removeItem("FBGBUSSBF")
+                    sessionStorage.removeItem("FBGBUSSNameBF")
+                    sessionStorage.removeItem("LSBBBUSSBF")
+                    sessionStorage.removeItem("LSBBBUSSNameBF")
+                    sessionStorage.setItem("FBGBUSSBF",this.form.FBGBUSS)
+                    sessionStorage.setItem("FBGBUSSNameBF",this.form.FBGBUSSName)
+                    sessionStorage.setItem("LSBBBUSSBF",this.form.LSBBBUSS)
+                    sessionStorage.setItem("LSBBBUSSNameBF",this.form.LSBBBUSSName)
+                    this.LSBBBUSSFileList=this.LSBBBUSSFileList.concat(this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName))
+                    this.form.LSBBBUSS = this.form.FBGBUSS
+                    this.form.LSBBBUSSName = this.form.FBGBUSSName
+                    this.FBGBUSSFileList= []
+                    this.FBGBUSS = ""
+                    this.FBGBUSSName = ""
                     if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
                         this.$message.warning("请选择一条代替企标编号")
                         return
@@ -1249,6 +1266,7 @@
                             this.form.id = item.id
                         })
                     }
+                    this.formKey++
                 }else if(this.form.standStatus === '1' ){
                     this.form.id = ""
                     if(type === '1'){
@@ -1264,13 +1282,23 @@
                         this.form.standNumber = standSn
                         this.form.standYear = year // 待带入立项标准
                         this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
+                        this.FBGBUSSFileList = []
+                        this.LSBBBUSSFileList = []
+                        this.form.FBGBUSS = sessionStorage.getItem("FBGBUSSBF")
+                        this.form.FBGBUSSName = sessionStorage.getItem("FBGBUSSNameBF")
+                        this.form.LSBBBUSS = sessionStorage.getItem("LSBBBUSSBF")
+                        this.form.LSBBBUSSName = sessionStorage.getItem("LSBBBUSSNameBF")
+                        this.FBGBUSSFileList=this.assemble(sessionStorage.getItem("FBGBUSSBF"),sessionStorage.getItem("FBGBUSSNameBF"));
+                        this.LSBBBUSSFileList=this.assemble(sessionStorage.getItem("LSBBBUSSBF"),sessionStorage.getItem("LSBBBUSSNameBF"));
                         if(type === '1'){
                             this.isSubmit = false
                             this.saveLoading = false
                         }
+                        this.formKey++
                     }, e => {
                     })
                 }
+
             },
             drawerCheckZRBM(data) {
                 let idList = ''
@@ -2030,7 +2058,6 @@
                     })
                 }
                 let textArr2 = []
-                this.form.selListRep2 = []
                 this.selectedListRep.map((item) => {
                     let texts = ''
                     if (item.standYear != null && item.standYear !== '') {
@@ -2038,16 +2065,6 @@
                     } else {
                         texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
                     }
-                    // 标准状态 修改 更新当前标准
-                    if(this.form.standStatus === '3'){
-                        this.form.standSort = item.standSort
-                        this.form.standName = item.standName
-                        this.form.standNumber = item.standNumber
-                        this.form.standYear = item.standYear
-                        this.form.standCode = texts
-                        this.form.id = item.id
-                    }
-                    this.form.selListRep2.push(item)
                     textArr2.push(item.standNumber)
                     textArr.push(texts)
                     textArr = [...new Set(textArr)]
@@ -2058,13 +2075,13 @@
                 // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
                 if(this.replaceLawType === 'DTQBBHBUSS'){
                     this.form.DTQBBHBUSS = textArr.join(',')
-                    this.form.standNum = textArr2.join(',')
                 }else if(this.replaceLawType === 'yybj'){
                     this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'cbbh'){
                     this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
-                }else if(this.replaceLawType === 'bfbdtbzh'){
+                }else if(this.replaceLawType === 'BDTQBBHBUSS'){
-                    this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',')
+                    this.form.BDTQBBHBUSS = textArr.join(',')
+                    this.form.standNum = textArr2.join(',')
                 }else {
                     this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
                 }

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

@@ -2,7 +2,7 @@
   <div class="qbzxdlxStep1">
     <ProcessHeader toggle>
       <template slot="proName">企标制修订立项计划流程</template>
-      <template slot="proNode">发起流程</template>
+      <template slot="proNode">起草</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -115,7 +115,7 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="责任人确认" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="立项确认" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="dockUserName" style="margin-bottom: 0">
                   <h4>责任人</h4>

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

@@ -2,7 +2,7 @@
   <div class="qbzxdlxStep2">
     <ProcessHeader toggle>
       <template slot="proName">企标制修订立项计划流程</template>
-      <template slot="proNode">发起流程</template>
+      <template slot="proNode">立项确认</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -2,7 +2,7 @@
   <div class="wfhxzgStep1">
     <ProcessHeader toggle>
       <template slot="proName">未符合项整改流程</template>
-      <template slot="proNode">发起流程</template>
+      <template slot="proNode">起草</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -73,7 +73,7 @@
             :model="roleForm"
             :rules="roleFormRules"
             class="label-input-form">
-            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="startUserName" style="margin-bottom: 0">
                   <h4>流程发起人</h4>
@@ -84,7 +84,7 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="下发标准法规工程师" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="审核" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="dockUserName" style="margin-bottom: 0">
                   <h4>标准法规工程师</h4>
@@ -96,7 +96,7 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="确认+选择责任人" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="合规排查(上传合规举证材料)" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="dockUserName" style="margin-bottom: 0">
                   <h4>确认+选择责任人</h4>
@@ -108,7 +108,7 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="上传佐证材料填选择写信息" placement="top" :color="roleForm.uploadUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="审定" placement="top" :color="roleForm.uploadUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="dockUserName" style="margin-bottom: 0">
                   <h4>负责人</h4>

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

@@ -2,7 +2,7 @@
   <div class="wfhxzgStep2">
     <ProcessHeader toggle>
       <template slot="proName">未符合项整改流程</template>
-      <template slot="proNode">分发负责人流程</template>
+      <template slot="proNode">审核</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -2,7 +2,7 @@
   <div class="wfhxzgStep3">
     <ProcessHeader toggle>
       <template slot="proName">未符合项整改流程</template>
-      <template slot="proNode">确认负责人流程</template>
+      <template slot="proNode">合规排查(上传合规举证材料)</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -2,7 +2,7 @@
   <div class="wfhxzgStep4">
     <ProcessHeader toggle>
       <template slot="proName">未符合项整改流程</template>
-      <template slot="proNode">负责人上传佐证</template>
+      <template slot="proNode">审定</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -2,7 +2,7 @@
   <div class="wfhxzgStep5">
     <ProcessHeader toggle>
       <template slot="proName">未符合项整改流程</template>
-      <template slot="proNode">分发负责人审核材料</template>
+      <template slot="proNode">批准</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -977,6 +977,17 @@ export default {
                 prcType: row.prcType
               }
             })
+          }else if(row.taskInfo === '整改节点'){
+            this.$router.push({
+              name: 'bzpgStep1',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }
           break
         //项目评估流程-项目