feat: There is no way the,

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

@@ -7,7 +7,7 @@
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
-            <el-select v-model="form.standSort" filterable clearable>
+            <el-select v-model="form.standSort" filterable clearable :disabled="form.standStatus && form.standStatus === '3'">
               <el-option
                       v-for="item in standSortOptions"
                       placeholder="请选择企标类别"
@@ -18,7 +18,7 @@
             </el-select>
           </el-form-item>
           <el-form-item v-show="fbNode" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
-            <el-datePicker v-model="form.issueTime" :disabled="disabledState"
+            <el-datePicker v-model="form.issueTime"
                            :editable="false"
             ></el-datePicker>
           </el-form-item>
@@ -29,6 +29,13 @@
                     clearable
             ></el-input>
           </el-form-item>
+          <el-form-item label="企标备案日期" prop="BARQ" class="add-form-item form-item-disabled">
+            <el-datePicker v-model="form.BARQ"
+                           :editable="false"
+                           placeholder="请选择企标备案日期"
+                           value-format="yyyy-MM-dd"
+            ></el-datePicker>
+          </el-form-item>
           <!--                                <el-form-item  label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
           <!--                                    <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="请选择文本状态">-->
           <!--                                        <el-option-->
@@ -93,6 +100,16 @@
                     clearable
             ></el-input>
           </el-form-item>
+          <el-form-item label="标准状态" v-show="fbNode" prop="standStatus" class="add-form-item form-item-disabled">
+            <el-select v-model="form.standStatus" filterable clearable>
+              <el-option
+                      v-for="item in opinionsStand"
+                      :key="item.value"
+                      :value="item.value"
+                      :label="item.label"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <!--        <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">-->
           <!--          <el-datePicker v-model="form.issueTime"-->
           <!--                         :editable="false"-->
@@ -172,16 +189,16 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
+          <el-form-item label="修改单" prop="XGDName" class="add-form-item form-item-disabled">
             <el-input
                     disabled
                     style="display: none;"
-                    v-model="form.BZSMBUSSName"
+                    v-model="form.XGDName"
                     clearable
             ></el-input>
             <div style="display: flex;justify-content: space-between">
               <div style="width: 80%;">
-                <div v-for="(item,index) in BZSMBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+                <div v-for="(item,index) in XGDFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
                   <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
                   <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
@@ -194,7 +211,7 @@
                         class="common-button-primary"
                         size="mini"
                         style="margin-left: 10px; margin-top: 11px; float: right;"
-                        @click="fileUpload('BZSMBUSS')">
+                        @click="fileUpload('XGD')">
                   <i class="el-icon-upload"></i>
                 </el-button>
               </div>
@@ -341,70 +358,6 @@
                     @click="selectLaws('DTQBBHBUSS'),config.attrName = '代替企标编号'"
             >{{'手动查找'}}</el-button>
           </el-form-item>
-          <el-form-item label="采用标准" prop="CYBZ" class="add-form-item form-item-disabled">
-            <el-input
-                    v-model="form.CYBZ"
-                    placeholder="请输入采用标准"
-                    clearable
-            ></el-input>
-            <el-button
-                    type="primary"
-                    class="common-button-primary"
-                    size="mini"
-                    style="position:absolute;top: 10px;right: 0;"
-                    @click="selectLaws('CYBZ'),config.attrName = '采用标准'"
-            >{{'手动查找'}}</el-button>
-          </el-form-item>
-          <el-form-item label="引用标准" prop="YYBZ" class="add-form-item form-item-disabled">
-            <el-input
-                    v-model="form.YYBZ"
-                    placeholder="请输入引用标准"
-                    clearable
-            ></el-input>
-            <el-button
-                    type="primary"
-                    class="common-button-primary"
-                    size="mini"
-                    style="position:absolute;top: 10px;right: 0;"
-                    @click="selectLaws('YYBZ'),config.attrName = '引用标准'"
-            >{{'手动查找'}}</el-button>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <!--                                <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">-->
-          <!--                                  <el-input-->
-          <!--                                      v-model="form.BDTWJHLAWS"-->
-          <!--                                      placeholder="请输入被代替企标编号"-->
-          <!--                                      clearable-->
-          <!--                                  ></el-input>-->
-          <!--                                  <el-button-->
-          <!--                                      type="primary"-->
-          <!--                                      class="common-button-primary"-->
-          <!--                                      size="mini"-->
-          <!--                                      style="position:absolute;top: 10px;right: 0;"-->
-          <!--                                      @click="selectLaws('bfbdtbzh'),config.attrName = '被代替企标编号'"-->
-          <!--                                  >{{'手动查找'}}</el-button>-->
-          <!--                                </el-form-item>-->
-          <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
-            <el-input
-                    v-model="form.XCSJBUSS"
-                    placeholder=""
-                    clearable
-                    :disabled="true"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">
-            <el-select v-model="form.CBCD" filterable clearable
-                       placeholder="请先选择采标程度"
-            >
-              <el-option
-                      v-for="item in cbcdOptions"
-                      :key="item.value"
-                      :value="item.value"
-                      :label="item.label"
-              ></el-option>
-            </el-select>
-          </el-form-item>
           <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
             <el-input
                     disabled
@@ -433,6 +386,70 @@
               </div>
             </div>
           </el-form-item>
+<!--          <el-form-item label="采用标准" prop="CYBZ" class="add-form-item form-item-disabled">-->
+<!--            <el-input-->
+<!--                    v-model="form.CYBZ"-->
+<!--                    placeholder="请输入采用标准"-->
+<!--                    clearable-->
+<!--            ></el-input>-->
+<!--            <el-button-->
+<!--                    type="primary"-->
+<!--                    class="common-button-primary"-->
+<!--                    size="mini"-->
+<!--                    style="position:absolute;top: 10px;right: 0;"-->
+<!--                    @click="selectLaws('CYBZ'),config.attrName = '采用标准'"-->
+<!--            >{{'手动查找'}}</el-button>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="引用标准" prop="YYBZ" class="add-form-item form-item-disabled">-->
+<!--            <el-input-->
+<!--                    v-model="form.YYBZ"-->
+<!--                    placeholder="请输入引用标准"-->
+<!--                    clearable-->
+<!--            ></el-input>-->
+<!--            <el-button-->
+<!--                    type="primary"-->
+<!--                    class="common-button-primary"-->
+<!--                    size="mini"-->
+<!--                    style="position:absolute;top: 10px;right: 0;"-->
+<!--                    @click="selectLaws('YYBZ'),config.attrName = '引用标准'"-->
+<!--            >{{'手动查找'}}</el-button>-->
+<!--          </el-form-item>-->
+        </el-col>
+        <el-col :span="12">
+          <!--                                <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">-->
+          <!--                                  <el-input-->
+          <!--                                      v-model="form.BDTWJHLAWS"-->
+          <!--                                      placeholder="请输入被代替企标编号"-->
+          <!--                                      clearable-->
+          <!--                                  ></el-input>-->
+          <!--                                  <el-button-->
+          <!--                                      type="primary"-->
+          <!--                                      class="common-button-primary"-->
+          <!--                                      size="mini"-->
+          <!--                                      style="position:absolute;top: 10px;right: 0;"-->
+          <!--                                      @click="selectLaws('bfbdtbzh'),config.attrName = '被代替企标编号'"-->
+          <!--                                  >{{'手动查找'}}</el-button>-->
+          <!--                                </el-form-item>-->
+          <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
+            <el-input
+                    v-model="form.XCSJBUSS"
+                    placeholder=""
+                    clearable
+                    :disabled="true"
+            ></el-input>
+          </el-form-item>
+<!--          <el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">-->
+<!--            <el-select v-model="form.CBCD" filterable clearable-->
+<!--                       placeholder="请先选择采标程度"-->
+<!--            >-->
+<!--              <el-option-->
+<!--                      v-for="item in cbcdOptions"-->
+<!--                      :key="item.value"-->
+<!--                      :value="item.value"-->
+<!--                      :label="item.label"-->
+<!--              ></el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
         </el-col>
       </el-row>
     </div>
@@ -607,6 +624,10 @@
         type: Array,
         required: false
       },
+      XGDFileListSub: {
+        type: Array,
+        required: false
+      },
       madelSubListSub: {
         type: Array,
         required: false
@@ -638,6 +659,11 @@
     },
     data () {
       return {
+        opinionsStand:[
+          {value: '1',label: '制定'},
+          {value: '2',label: '修订'},
+          {value: '3',label: '修改'},
+        ],
         fileId:'',
         dialogVisible: false,
         config: {
@@ -673,6 +699,7 @@
         QTWJBUSSFileList: [],
         GLWJBUSSFileList: [],
         summaryFileList: [],
+        XGDFileList: [],
         madelSubList: [],
         countryOptions:[],//国家地区
         standSortOptions: [], // 标准类别
@@ -798,11 +825,13 @@
           case 'madelSub':
             this.fileList=this.madelSubList
             break;
+          case 'XGD':
+            this.fileList=this.XGDFileList
+            break;
           default : ;
         }
         this.fileMadel = true;
-        console.log(this.madelSubList)
+        this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.XGDFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel,this.fileList,fileType,this.madelSubList);
-        this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel,this.fileList,fileType,this.madelSubList);
       },
       filePreview(){
         this.$preview(this.fileId)
@@ -822,7 +851,7 @@
         }
         if (type === 'down') {
           if (attId) {
-            window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+            window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
           } else {
             this.$message.warning('文件不存在,下载失败')
           }
@@ -859,9 +888,8 @@
     },
     mounted () {
       this.form = this.formSub,
-              console.log(this.form)
       this.FBGBUSSFileList= this.FBGBUSSFileListSub,
-              this.BZSMBUSSFileList= this.BZSMBUSSFileListSub,
+      this.XGDFileList= this.XGDFileListSub,
       this.LSBBBUSSFileList= this.LSBBBUSSFileListSub,
       this.QTWJBUSSFileList= this.QTWJBUSSFileListSub,
       this.GLWJBUSSFileList= this.GLWJBUSSFileListSub,
@@ -905,7 +933,7 @@
       form: {
         handler: function (val) {
           if(val){
-            this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel,this.fileList,'',this.madelSubList);
+            this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.XGDFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel,this.fileList,'',this.madelSubList);
           }
         },
         deep: true //对象的深度验证

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

@@ -22,6 +22,10 @@
                     clearable
             ></el-input>
           </el-form-item>
+          <el-form-item label="企标备案日期" prop="BARQ" class="add-form-item form-item-disabled">
+            <el-datePicker v-model="form.BARQ" :disabled="disabledState"
+                           :editable="false"></el-datePicker>
+          </el-form-item>
           <!--                            <el-form-item  label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
           <!--                                <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="" :disabled="disabledState">-->
           <!--                                    <el-option-->
@@ -119,8 +123,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
+          <el-form-item label="修改单" prop="XGDName" class="add-form-item form-item-disabled">
-            <div v-if="BZSMBUSSFileList.length > 0" v-for="(item,index) in BZSMBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+            <div v-if="XGDFileList.length > 0" v-for="(item,index) in XGDFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
               <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
@@ -444,6 +448,10 @@
         type: Array,
         required: true
       },
+      XGDFileList: {
+        type: Array,
+        required: true
+      },
       QTWJBUSSFileList: {
         type: Array,
         required: true

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

@@ -42,6 +42,13 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
+                                <el-form-item v-show="verifySarStandard" label="企标备案日期" prop="BARQ" class="add-form-item form-item-disabled">
+                                    <el-datePicker v-model="form.BARQ"
+                                                   :editable="false"
+                                                   placeholder="请选择企标备案日期"
+                                                   value-format="yyyy-MM-dd"
+                                    ></el-datePicker>
+                                </el-form-item>
 <!--                                <el-form-item  label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
 <!--                                    <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="请选择文本状态">-->
 <!--                                        <el-option-->
@@ -179,16 +186,16 @@
                               </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="修改单" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
+                                <el-form-item label="修改单" prop="XGDName" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
                                             style="display: none;"
-                                            v-model="form.BZSMBUSSName"
+                                            v-model="form.XGDName"
                                             clearable
                                     ></el-input>
                                     <div style="display: flex;justify-content: space-between">
                                         <div style="width: 80%;">
-                                            <div v-for="(item,index) in BZSMBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
+                                            <div v-for="(item,index) in XGDFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
                                         </div>
                                         <div style="width: 20%;">
                                             <el-button
@@ -196,7 +203,7 @@
                                                     class="common-button-primary"
                                                     size="mini"
                                                     style="margin-left: 10px; margin-top: 11px; float: right;"
-                                                    @click="fileUpload('BZSMBUSS')">
+                                                    @click="fileUpload('XGD')">
                                                 <i class="el-icon-upload"></i>
                                             </el-button>
                                         </div>
@@ -1097,6 +1104,7 @@
               fileList: [],
               FBGBUSSFileList: [],
               BZSMBUSSFileList: [],
+              XGDFileList: [],
               LSBBBUSSFileList: [],
               QTWJBUSSFileList: [],
               GLWJBUSSFileList: [],
@@ -1233,6 +1241,9 @@
                     modelData:[],
                     modelDataNameVerify:[],
                     modelDataZrUserVerify:[],
+                    BARQ: '',
+                    XGD: '',
+                    XGDName: '',
                     // 基础信息
                     country:[],
                     // 基础信息
@@ -1770,6 +1781,7 @@
                       this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
                       this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
                       this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
+                      this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
                       this.roleForm = mes.roleForm
                       this.commentText = mes.commentText
                   })
@@ -1797,6 +1809,9 @@
                     // 基础信息
                     standCode: '',
                     standYear: '',
+                    BARQ: '',
+                    XGD: '',
+                    XGDName: '',
                     textStatusBuss: '',
                     issueTime: '',
                     putTime: '',
@@ -2415,6 +2430,9 @@
                       case 'GLWJBUSS':
                         this.GLWJBUSSFileList = fileList
                         break;
+                      case 'XGD' :
+                        this.XGDFileList = fileList
+                        break;
                     default : ;
                   }
                   this.$message({
@@ -2446,6 +2464,9 @@
                 case 'GLWJBUSS':
                   this.fileList=this.GLWJBUSSFileList
                   break;
+                case 'XGD':
+                  this.fileList=this.XGDFileList
+                  break;
                 default : ;
               }
               this.fileMadel = true;
@@ -2469,6 +2490,9 @@
                 case 'GLWJBUSS':
                     this.GLWJBUSSFileList = fileList
                     break;
+                case 'XGD':
+                    this.XGDFileList = fileList
+                    break;
               default : ;
             }
           },
@@ -2567,6 +2591,9 @@
             this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.response.data.id).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.XGDName=this.XGDFileList.map(item => item.name).join(",")
+
           },
             // 删除方法
         deletedId(data, ids) {

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

@@ -26,7 +26,9 @@
                         :QTWJBUSSFileList = "QTWJBUSSFileList"
                         :GLWJBUSSFileList = "GLWJBUSSFileList"
                         :disabledState = "disabledState"
-                        :verifySarStandard = "verifySarStandard"></formList>
+                        :verifySarStandard = "verifySarStandard"
+                        :opinionsShow = "true"
+                ></formList>
                 <div>
                     <el-collapse accordion v-model="activeName">
                         <el-collapse-item title="审批意见" name = "1">
@@ -656,7 +658,7 @@
                 GLWJBUSSFileList: [],
                 caFileList: [],
                 FBGBJBDFileList: [],
-                xgdFileList: [],
+                XGDFileList: [],
                 ZCWBLAWSFileList: [],
                 GCWBLAWSFileList: [],
                 JDWJLAWSFileList: [],
@@ -789,6 +791,9 @@
                     modelData:[],
                     modelDataNameVerify:[],
                     modelDataZrUserVerify:[],
+                    BARQ: '',
+                    XGD: '',
+                    XGDName: '',
                     // 基础信息
                     country:[],
                     // 基础信息
@@ -2304,6 +2309,7 @@
                                 this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
                                 this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
                                 this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
+                                this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName);
                             }
                         }).catch(e => {
                         })

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

@@ -25,8 +25,11 @@
                         :BZSMBUSSFileList = "BZSMBUSSFileList"
                         :QTWJBUSSFileList = "QTWJBUSSFileList"
                         :GLWJBUSSFileList = "GLWJBUSSFileList"
+                        :XGDFileList = "XGDFileList"
                         :disabledState = "disabledState"
-                        :verifySarStandard = "verifySarStandard"></formList>
+                        :verifySarStandard = "verifySarStandard"
+                        :opinionsShow = "true"
+                ></formList>
                 <div>
                     <el-collapse accordion v-model="activeName">
                         <el-collapse-item title="审批意见" name = "1">
@@ -656,7 +659,7 @@
                 GLWJBUSSFileList: [],
                 caFileList: [],
                 FBGBJBDFileList: [],
-                xgdFileList: [],
+                XGDFileList: [],
                 ZCWBLAWSFileList: [],
                 GCWBLAWSFileList: [],
                 JDWJLAWSFileList: [],
@@ -789,6 +792,9 @@
                     modelData:[],
                     modelDataNameVerify:[],
                     modelDataZrUserVerify:[],
+                    BARQ: '',
+                    XGD: '',
+                    XGDName: '',
                     // 基础信息
                     country:[],
                     // 基础信息
@@ -2304,6 +2310,7 @@
                                 this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
                                 this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
                                 this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
+                                this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName);
                             }
                         }).catch(e => {
                         })

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

@@ -26,7 +26,9 @@
                         :QTWJBUSSFileList = "QTWJBUSSFileList"
                         :GLWJBUSSFileList = "GLWJBUSSFileList"
                         :disabledState = "disabledState"
-                        :verifySarStandard = "verifySarStandard"></formList>
+                        :verifySarStandard = "verifySarStandard"
+                        :opinionsShow = "true"
+                ></formList>
                 <div>
                     <el-collapse accordion v-model="activeName">
                         <el-collapse-item title="审批意见" name = "1">
@@ -656,7 +658,7 @@
                 GLWJBUSSFileList: [],
                 caFileList: [],
                 FBGBJBDFileList: [],
-                xgdFileList: [],
+                XGDFileList: [],
                 ZCWBLAWSFileList: [],
                 GCWBLAWSFileList: [],
                 JDWJLAWSFileList: [],
@@ -789,6 +791,9 @@
                     modelData:[],
                     modelDataNameVerify:[],
                     modelDataZrUserVerify:[],
+                    BARQ: '',
+                    XGD: '',
+                    XGDName: '',
                     // 基础信息
                     country:[],
                     // 基础信息
@@ -2304,6 +2309,7 @@
                                 this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
                                 this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
                                 this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
+                                this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName);
                             }
                         }).catch(e => {
                         })

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

@@ -26,8 +26,7 @@
                         :BZSMBUSSFileListSub = "BZSMBUSSFileList"
                         :QTWJBUSSFileListSub = "QTWJBUSSFileList"
                         :GLWJBUSSFileListSub = "GLWJBUSSFileList"
-                        :summaryFileListSub = "summaryFileList"
+                        :XGDFileListSub = "XGDFileList"
-                        :madelSubListSub = "madelSubList"
                         :disabledState = "disabledState"
                         :verifySarStandard = "verifySarStandard"
                         :fileMadelSub = "fileMadel"
@@ -672,10 +671,10 @@
                 QTWJBUSSFileList: [],
                 GLWJBUSSFileList: [],
                 summaryFileList: [],
+                XGDFileList: [],
                 madelSubList: [],
                 caFileList: [],
                 FBGBJBDFileList: [],
-                xgdFileList: [],
                 ZCWBLAWSFileList: [],
                 GCWBLAWSFileList: [],
                 JDWJLAWSFileList: [],
@@ -808,6 +807,7 @@
                 countryArr:'',
                 commentCycleDate:'',
                 form: {
+                    standStatus:'', // 标准状态
                     planId:'',
                     planStatus:'',
                     reviseStatus:'',
@@ -819,6 +819,9 @@
                     summaryFileName:'',
                     madelSub:'',
                     madelSubName:'',
+                    BARQ: '',
+                    XGD: '',
+                    XGDName: '',
                     country:[],
                     // 基础信息
                     standSort: '',
@@ -977,6 +980,9 @@
                     textStatusBuss: [
                         { required: true, message: '请选择文本状态', trigger: 'change' }
                     ],
+                    standStatus: [
+                        { required: true, message: '请选择标准状态', trigger: 'change' }
+                    ],
                     issueTime: [
                         { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
@@ -1065,6 +1071,14 @@
                     }
                 }
             },
+            'form.standStatus': {
+                handler (val) {
+                    if (val !== '' && val !== null && typeof (val) !== 'undefined') {
+                        console.log(val)
+                        this.getStandInfoByReviseStatus()
+                    }
+                }
+            },
             filterText(val) {
                 this.$refs.tree.filter(val);
             },
@@ -1137,7 +1151,7 @@
                 this.form = form
                 this.FBGBUSSFileList = list1
                 this.LSBBBUSSFileList = list2
-                this.BZSMBUSSFileList = list3
+                this.XGDFileList = list3
                 this.QTWJBUSSFileList = list4
                 this.GLWJBUSSFileList = list5
                 this.madelSubList = list6
@@ -1348,14 +1362,14 @@
                         let mes = JSON.parse(res.mes)
                         mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
                         this.form = mes.form
+                        this.getStandInfoByReviseStatus()
                         this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
                         this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
                         this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
                         this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
                         this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
                         this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
-                        this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
+                        this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
-                        this.madelSubList=this.assemble(this.form.madelSub,this.form.madelSubName);
                         this.roleForm = mes.roleForm
                         this.commentText = mes.commentText
                         this.formKey++
@@ -1381,6 +1395,9 @@
                     standEnName: data.standEnName ? data.standEnName : '', // 英文名称
                     standName: data.standName ? data.standName : '', // 中文名称
                     signFlag: data.signFlag ? data.signFlag : '1', // 是否需要会签
+                    BARQ: '',
+                    XGD: '',
+                    XGDName: '',
                     // 基础信息
                     standCode: '',
                     standYear: '',
@@ -1826,12 +1843,14 @@
                         type: 'warning'
                     })
                 }
-                if (this.selectedListRep.length + textArr.length > 20) {
+                if (this.selectedListRep.length + textArr.length > 1) {
                     return this.$message({
-                        message: '标准最多选择20项',
+                        message: '标准最多选择1项',
                         type: 'warning'
                     })
                 }
+                let textArr2 = []
+                if(this.selectedListRep.length === 1){
                     this.selectedListRep.map((item) => {
                         let texts = ''
                         if (item.standYear != null && item.standYear !== '') {
@@ -1839,14 +1858,40 @@
                         } else {
                             texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
                         }
+                        // 标准状态 修改 更新当前标准
+                        if(this.form.standStatus === '3'){
+                            this.form.standSort = item.standSort
+                            this.form.standNumber = item.standNumber
+                            this.form.standYear = item.standYear
+                            this.form.standCode = texts
+                            this.form.id = item.id
+                        }
+                        textArr2.push(item.standNumber)
                         textArr.push(texts)
                         textArr = [...new Set(textArr)]
+                        textArr2 = [...new Set(textArr2)]
                         this.replaceLawsNumModel = false
                     })
+                }else {
+                    this.selectedListRep.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
+                        }
+                        textArr2.push(item.standNumber)
+                        textArr.push(texts)
+                        textArr = [...new Set(textArr)]
+                        textArr2 = [...new Set(textArr2)]
+                        this.replaceLawsNumModel = false
+                    })
+                }
                 // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
                 // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
-                if(this.replaceLawType === 'dtbjh'){
+                if(this.replaceLawType === 'DTQBBHBUSS'){
-                    this.form.dtbjh = this.form.dtbjh ? this.form.dtbjh + ',' + textArr.join(',') : textArr.join(',')
+                    this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
+                    this.form.standNum = this.form.standNum ? this.form.standNum + ',' + textArr2.join(',') : 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'){
@@ -2024,6 +2069,10 @@
                             this.madelSubList = this.madelSubList.filter ( item => item.response === undefined);
                             this.madelSubList.push(fileObj)
                             break;
+                        case 'XGD':
+                            this.XGDFileList = this.XGDFileList.filter ( item => item.response === undefined);
+                            this.XGDFileList.push(fileObj)
+                            break;
                         default : ;
                     }
                     this.formKey++
@@ -2066,6 +2115,9 @@
                     case 'madelSub':
                         this.fileList=this.madelSubList
                         break;
+                    case 'XGD':
+                        this.fileList=this.XGDFileList
+                        break;
                     default : ;
                 }
                 this.fileMadel = true;
@@ -2094,6 +2146,9 @@
                     case 'madelSub':
                         this.madelSubList = fileList
                         break;
+                    case 'XGD':
+                        this.XGDFileList = fileList
+                        break;
                     default : ;
                 }
             },
@@ -2235,11 +2290,8 @@
                 this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",")
                 this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",")
 
-                this.form.summaryFile=this.summaryFileList.map(item => item.id).join(",")
+                this.form.XGD=this.XGDFileList.map(item => item.id).join(",")
-                this.form.summaryFileName=this.summaryFileList.map(item => item.name).join(",")
+                this.form.XGDName=this.XGDFileList.map(item => item.name).join(",")
-
-                this.form.madelSub=this.madelSubList.map(item => item.id).join(",")
-                this.form.madelSubName=this.madelSubList.map(item => item.name).join(",")
 
             },
             // 删除方法
@@ -2327,7 +2379,13 @@
                 // } else if (val === '') {
                 //     this.form.country = []
                 // }
+                if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
+                    this.$message.warning("请选择一条代替企标编号")
+                    return
+                }
                 this.fileInfoHandle()
+                this.$refs['form'].validate((valid) => {
+                        if (valid) {
                             this.$refs['formTongGuo'].validate((valid) => {
                                 if (valid) {
                                     this.isSubmit = true
@@ -2360,6 +2418,8 @@
                                         }
                                     })
                                 }})
+                        }
+                })
             },
             /**
              * @description: 流程入库
@@ -2421,7 +2481,6 @@
                     this.form.prcName = this.prcName
                     this.form.issueTime = this.dateFormatter()
                     this.form['id'] = item.id
-                    this.getStandInfoByReviseStatus()
                     this.formKey++
                 })
             },
@@ -2450,15 +2509,13 @@
                                     dateArr[1] = processForm.commentCycleEnd
                                     this.commentCycleDate = dateArr
                                 }
-
                                 this.getFormFieldList(processForm)
                                 this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
                                 this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
                                 this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
                                 this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
                                 this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
-                                this.summaryFileList=this.assemble(processForm.summaryFile,processForm.summaryFileName);
+                                this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName);
-                                this.madelSubList=this.assemble(processForm.madelSub,processForm.madelSubName);
                                 this.formKey++
                             }
                         }).catch(e => {
@@ -2489,11 +2546,47 @@
             getStandInfoByReviseStatus() {
                 let date = new Date();
                 let year = date.getFullYear();
-                if(this.form.reviseStatus === '2'){
+                if(this.form.standStatus === '2'){
+                    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
+                    }
+                    if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== 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 )
+                    }
+                    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 = ""
+                    this.formKey++
+                    if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
+                        this.$message.warning("请选择一条代替企标编号")
+                        return
+                    }
                 }else {
                     this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_'+this.form.reviseStatus}, {
                         _this: this
@@ -2504,6 +2597,15 @@
                         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"));
+                        this.formKey++
                     }, e => {
                     })
                 }

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

@@ -23,6 +23,7 @@
                         :FBGBUSSFileList = "FBGBUSSFileList"
                         :LSBBBUSSFileList = "LSBBBUSSFileList"
                         :BZSMBUSSFileList = "BZSMBUSSFileList"
+                        :XGDFileList = "XGDFileList"
                         :QTWJBUSSFileList = "QTWJBUSSFileList"
                         :GLWJBUSSFileList = "GLWJBUSSFileList"
                         :disabledState = "disabledState"
@@ -654,6 +655,7 @@
                 LSBBBUSSFileList: [],
                 QTWJBUSSFileList: [],
                 GLWJBUSSFileList: [],
+                XGDFileList: [],
                 caFileList: [],
                 FBGBJBDFileList: [],
                 xgdFileList: [],
@@ -792,6 +794,9 @@
                     modelDataZrUserVerify:[],
                     footFile:'',
                     footFileName:'',
+                    BARQ: '',
+                    XGD: '',
+                    XGDName: '',
                     // 基础信息
                     country:[],
                     // 基础信息
@@ -1239,6 +1244,7 @@
                         this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
                         this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
                         this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
+                        this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
                         this.roleForm = mes.roleForm
                         this.commentText = mes.commentText
                     })
@@ -1872,6 +1878,9 @@
                             this.footFileList = fileList
                             this.uploadFileStatus = this.footFileList !== undefined ? (this.footFileList.length <= 0) : true
                             break;
+                        case 'XGD':
+                            this.XGDFileList = fileList
+                            break;
                         default : ;
                     }
                     this.$message({
@@ -1910,6 +1919,9 @@
                     case 'footFile':
                         this.fileList=this.footFileList
                         break;
+                    case 'XGD':
+                        this.fileList=this.XGDFileList
+                        break;
                     default : ;
                 }
                 this.fileMadel = true;
@@ -1933,6 +1945,9 @@
                     case 'GLWJBUSS':
                         this.GLWJBUSSFileList = fileList
                         break;
+                    case 'XGD':
+                        this.XGDFileList = fileList
+                        break;
                     case 'footFile':
                         this.footFileList = fileList
                         this.uploadFileStatus = this.footFileList !== undefined ? (this.footFileList.length <= 0) : true
@@ -2132,6 +2147,9 @@
                 this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.response.data.id).join(",")
                 this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",")
 
+                this.form.XGD=this.XGDileList.map(item => item.response.data.id).join(",")
+                this.form.XGDName=this.XGDileList.map(item => item.name).join(",")
+
             },
             // 删除方法
             deletedId(data, ids) {
@@ -2353,6 +2371,7 @@
                                 this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
                                 this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
                                 this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
+                                this.XGDileList=this.assemble(processForm.XGD,processForm.XGDName);
                                 this.uploadFileStatus = this.footFileList !== undefined ? (this.footFileList.length <= 0) : true
                             }
                         }).catch(e => {

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

@@ -26,6 +26,7 @@
                     :BZSMBUSSFileListSub = "BZSMBUSSFileList"
                     :QTWJBUSSFileListSub = "QTWJBUSSFileList"
                     :GLWJBUSSFileListSub = "GLWJBUSSFileList"
+                    :XGDFileListSub = "XGDFileList"
                     :disabledState = "disabledState"
                     :verifySarStandard = "verifySarStandard"
                     :fileMadelSub = "fileMadel"
@@ -715,9 +716,9 @@
                 LSBBBUSSFileList: [],
                 QTWJBUSSFileList: [],
                 GLWJBUSSFileList: [],
+                XGDFileList: [],
                 caFileList: [],
                 FBGBJBDFileList: [],
-                xgdFileList: [],
                 ZCWBLAWSFileList: [],
                 GCWBLAWSFileList: [],
                 JDWJLAWSFileList: [],
@@ -856,6 +857,9 @@
                     modelDataZrUserVerify:[],
                     footFile:'',
                     footFileName:'',
+                    BARQ: '',
+                    XGD: '',
+                    XGDName: '',
                     // 基础信息
                     country:[],
                     // 基础信息
@@ -1129,11 +1133,11 @@
                 this.replaceLawType = replaceLawType
                 this.getReplaceLawsNumRow()
             },
-            formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType) {
+            formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType,list6) {
                 this.form = form
                 this.FBGBUSSFileList = list1
                 this.LSBBBUSSFileList = list2
-                this.BZSMBUSSFileList = list3
+                this.XGDFileList = list3
                 this.QTWJBUSSFileList = list4
                 this.GLWJBUSSFileList = list5
                 if(fileMadel){
@@ -1360,6 +1364,7 @@
                         this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
                         this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
                         this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
+                        this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
                         this.roleForm = mes.roleForm
                         this.commentText = mes.commentText
                         this.formKey++
@@ -1385,6 +1390,9 @@
                     standEnName: data.standEnName ? data.standEnName : '', // 英文名称
                     standName: data.standName ? data.standName : '', // 中文名称
                     signFlag: data.signFlag ? data.signFlag : '1', // 是否需要会签
+                    BARQ: '',
+                    XGD: '',
+                    XGDName: '',
                     // 基础信息
                     standCode: '',
                     standYear: '',
@@ -2028,6 +2036,10 @@
                             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.formKey++
@@ -2064,6 +2076,9 @@
                     case 'GLWJBUSS':
                         this.fileList=this.GLWJBUSSFileList
                         break;
+                    case 'XGD':
+                        this.fileList=this.XGDFileList
+                        break;
                     default : ;
                 }
                 this.fileMadel = true;
@@ -2088,6 +2103,9 @@
                     case 'GLWJBUSS':
                         this.GLWJBUSSFileList = fileList
                         break;
+                    case 'XGD':
+                        this.XGDFileList = fileList
+                        break;
                     default : ;
                 }
                 this.formKey++
@@ -2279,6 +2297,9 @@
                 this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",")
                 this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",")
 
+                this.form.XGD=this.XGDFileList.map(item => item.id).join(",")
+                this.form.XGDName=this.XGDFileList.map(item => item.name).join(",")
+
             },
             // 删除方法
             deletedId(data, ids) {
@@ -2487,9 +2508,9 @@
                                 this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
                                 this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
                                 this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
-                                console.log(this.LSBBBUSSFileList)
                                 this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
                                 this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
+                                this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName);
                                 this.formKey++
                             }
                         }).catch(e => {

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

@@ -23,6 +23,7 @@
                         :FBGBUSSFileList = "FBGBUSSFileList"
                         :LSBBBUSSFileList = "LSBBBUSSFileList"
                         :BZSMBUSSFileList = "BZSMBUSSFileList"
+                        :XGDFileList = "XGDFileList"
                         :QTWJBUSSFileList = "QTWJBUSSFileList"
                         :GLWJBUSSFileList = "GLWJBUSSFileList"
                         :disabledState = "disabledState"
@@ -651,6 +652,7 @@
                 fileList: [],
                 FBGBUSSFileList: [],
                 BZSMBUSSFileList: [],
+                XGDFileList: [],
                 LSBBBUSSFileList: [],
                 QTWJBUSSFileList: [],
                 GLWJBUSSFileList: [],
@@ -796,6 +798,9 @@
                     standCode: '',
                     standYear: '',
                     standName: '',
+                    BARQ: '',
+                    XGD: '',
+                    XGDName: '',
                     standEnName: '',
                     textStatusBuss: '',
                     issueTime: '',
@@ -2304,6 +2309,7 @@
                                 this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
                                 this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
                                 this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
+                                this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName);
                             }
                         }).catch(e => {
                         })

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

@@ -24,6 +24,7 @@
                         :FBGBUSSFileList = "FBGBUSSFileList"
                         :LSBBBUSSFileList = "LSBBBUSSFileList"
                         :BZSMBUSSFileList = "BZSMBUSSFileList"
+                        :XGDFileList = "XGDFileList"
                         :QTWJBUSSFileList = "QTWJBUSSFileList"
                         :GLWJBUSSFileList = "GLWJBUSSFileList"
                         :disabledState = "disabledState"
@@ -748,6 +749,7 @@
                 summaryList: [],
                 FBGBUSSFileList: [],
                 BZSMBUSSFileList: [],
+                XGDFileList: [],
                 LSBBBUSSFileList: [],
                 QTWJBUSSFileList: [],
                 GLWJBUSSFileList: [],
@@ -890,6 +892,9 @@
                     modelData:[],
                     modelDataNameVerify:[],
                     modelDataZrUserVerify:[],
+                    BARQ: '',
+                    XGD: '',
+                    XGDName: '',
                     // 基础信息
                     country:[],
                     // 基础信息
@@ -2591,6 +2596,7 @@
                                 this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
                                 this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
                                 this.summaryList=this.assemble(processForm.summary,processForm.summaryName);
+                                this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName);
                             }
                         }).catch(e => {
                         })

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

@@ -26,6 +26,7 @@
                         :BZSMBUSSFileListSub = "BZSMBUSSFileList"
                         :QTWJBUSSFileListSub = "QTWJBUSSFileList"
                         :GLWJBUSSFileListSub = "GLWJBUSSFileList"
+                        :XGDFileListSub = "XGDFileList"
                         :disabledState = "disabledState"
                         :verifySarStandard = "verifySarStandard"
                         :fileMadelSub = "fileMadel"
@@ -785,9 +786,9 @@
                 LSBBBUSSFileList: [],
                 QTWJBUSSFileList: [],
                 GLWJBUSSFileList: [],
+                XGDFileList: [],
                 caFileList: [],
                 FBGBJBDFileList: [],
-                xgdFileList: [],
                 ZCWBLAWSFileList: [],
                 GCWBLAWSFileList: [],
                 JDWJLAWSFileList: [],
@@ -927,6 +928,9 @@
                     opinionsAdopted:'',  // 汇总意见是否采纳
                     footFile:'',
                     footFileName:'',
+                    BARQ: '',
+                    XGD: '',
+                    XGDName: '',
                     // 基础信息
                     country:[],
                     // 基础信息
@@ -1091,7 +1095,8 @@
                 userType:'', // 选择用户ID判断
                 opinionsAdoptedOptions:[
                     {value: '1',label: '采纳'},
-                    {value: '2',label: '不采纳'},
+                    {value: '2',label: '部分采纳'},
+                    {value: '3',label: '不采纳'},
                 ],
                 countryOptions:[],//国家地区
                 standSortOptions: [], // 标准类别
@@ -1223,7 +1228,7 @@
                 this.form = form
                 this.FBGBUSSFileList = list1
                 this.LSBBBUSSFileList = list2
-                this.BZSMBUSSFileList = list3
+                this.XGDFileList = list3
                 this.QTWJBUSSFileList = list4
                 this.GLWJBUSSFileList = list5
                 if(fileMadel){
@@ -1450,6 +1455,7 @@
                         this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
                         this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
                         this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
+                        this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
                         this.roleForm = mes.roleForm
                         this.commentText = mes.commentText
                         this.formKey++
@@ -1475,6 +1481,9 @@
                     standEnName: data.standEnName ? data.standEnName : '', // 英文名称
                     standName: data.standName ? data.standName : '', // 中文名称
                     signFlag: data.signFlag ? data.signFlag : '1', // 是否需要会签
+                    BARQ: '',
+                    XGD: '',
+                    XGDName: '',
                     // 基础信息
                     standCode: '',
                     standYear: '',
@@ -2118,6 +2127,10 @@
                             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.formKey++
@@ -2154,6 +2167,9 @@
                     case 'GLWJBUSS':
                         this.fileList=this.GLWJBUSSFileList
                         break;
+                    case 'XGDFileList':
+                        this.fileList=this.XGDFileList
+                        break;
                     default : ;
                 }
                 this.fileMadel = true;
@@ -2178,6 +2194,9 @@
                     case 'GLWJBUSS':
                         this.GLWJBUSSFileList = fileList
                         break;
+                    case 'XGD':
+                        this.XGDFileList = fileList
+                        break;
                     default : ;
                 }
                 this.formKey++
@@ -2353,7 +2372,6 @@
             fileInfoHandle(){
 
                 //拼接文件名和id 提交到流程Activity
-                console.log(this.FBGBUSSFileList)
                 this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id).join(",")
                 this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",")
 
@@ -2369,6 +2387,9 @@
                 this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",")
                 this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",")
 
+                this.form.XGD=this.XGDFileList.map(item => item.id).join(",")
+                this.form.XGDName=this.XGDFileList.map(item => item.name).join(",")
+
             },
             // 删除方法
             deletedId(data, ids) {
@@ -2579,6 +2600,7 @@
                                 this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
                                 this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
                                 this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
+                                this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName);
                                 this.formKey++
                             }
                         }).catch(e => {

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

@@ -25,6 +25,7 @@
                         :LSBBBUSSFileList = "LSBBBUSSFileList"
                         :BZSMBUSSFileList = "BZSMBUSSFileList"
                         :QTWJBUSSFileList = "QTWJBUSSFileList"
+                        :XGDFileList = "XGDFileList"
                         :GLWJBUSSFileList = "GLWJBUSSFileList"
                         :disabledState = "disabledState"
                         :verifySarStandard = "verifySarStandard"
@@ -675,9 +676,9 @@
                 LSBBBUSSFileList: [],
                 QTWJBUSSFileList: [],
                 GLWJBUSSFileList: [],
+                XGDFileList: [],
                 caFileList: [],
                 FBGBJBDFileList: [],
-                xgdFileList: [],
                 ZCWBLAWSFileList: [],
                 GCWBLAWSFileList: [],
                 JDWJLAWSFileList: [],
@@ -811,71 +812,11 @@
                     modelData:[],
                     modelDataNameVerify:[],
                     modelDataZrUserVerify:[],
+                    BARQ: '',
+                    XGD: '',
+                    XGDName: '',
                     // 基础信息
                     country:[],
-                    textStatus: '', // 文本状态
-                    standInData: '0', // 标准类型
-                    standNumber: '', // 标准编号
-                    standNature: '', // 标准性质
-                    signFlag: '1', // 是否需要会签
-                    standSystem: '',// 标准体系
-                    standSystemName: '',// 标准体系名称
-                    gxhbq: '', // 标签
-                    // 实施日期
-                    ssrq: '', // 实施日期(标准文本)
-                    xcxssrq: '', // 新车型实施日期(标准文本)
-                    zccssrq: '', // 在产车实施日期(标准文本)
-                    ssrqgj: '', // 实施日期(国际)
-                    xcxssrqgj: '', // 新车型实施日期(国际)
-                    zccssrqgj: '', // 在产车实施日期(国际)
-                    // 文本信息
-                    ca: '', // 草案
-                    FBGBJBD: '', // 发布稿
-                    xgd: '', // 修改单
-                    bpg: '', // 报批稿
-                    ssg: '', // 送审稿
-                    zqyjg: '', // 征求意见稿
-                    jdwj: '', // 解读文件
-                    zbjbd: '', // 增补件
-                    kwj: '', // 勘 误件
-                    caName: '', // 草案
-                    fbgbjbdName: '', // 发布稿
-                    xgdName: '', // 修改单
-                    bpgName: '', // 报批稿
-                    ssgName: '', // 送审稿
-                    zqyjgName: '', // 征求意见稿
-                    jdwjName: '', // 解读文件
-                    zbjbdName: '', // 增补件
-                    kwjName: '', // 勘误件
-                    glwjName: '', // 关联文件
-                    // 适用范围
-                    txlb: '', // 体系类别
-                    gkdw: '', // 归口管理部门
-                    qcdw: [], // 起草单位
-                    wssmr: [], // 我司署名人
-                    cysd: '', // 我司参与深度
-                    cllx: [], // 适用车型
-                    nylx: [],// 能源类型
-                    sycpx: [],// 适用产品线
-                    syrz: [], // 适用认证
-                    zrbm: [], // 责任部门
-                    zrgcs: [], // 责任工程师
-                    cycvppsbm: '', // 关联模块--乘用车VPPS编码
-                    cycvppscn: '', // 关联模块--乘用车vpps中文名称
-                    kccvppsbm: '', // 关联模块--卡车VPPS编码
-                    kccvppscn: '', // 关联模块--卡车vpps中文名称
-                    dybxh: '', // 模块结构单元变型号
-                    dymc: '', // 模块结构单元名称
-                    // 关联信息
-                    dtbjh: '', // 代替标准号
-                    cbbh: '', // 采标编号
-                    cbcd: '', // 采标程度
-                    yybj: '', // 引用标准
-                    bfbdtbzh: '', // 部分代替标准号
-                    byybj: '', // 被引用标准
-                    glwj: '', // 关联文件
-                    xglc: '', // 相关流程
-                    chjl: '', // 参会记录
                     // 基础信息
                     standSort: '',
                     standCode: '',
@@ -1407,6 +1348,7 @@
                         this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
                         this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
                         this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
+                        this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
                         this.roleForm = mes.roleForm
                         this.commentText = mes.commentText
                     })
@@ -2492,6 +2434,7 @@
                                 this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
                                 this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
                                 this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
+                                this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName);
                             }
                         }).catch(e => {
                         })

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

@@ -25,8 +25,11 @@
                         :BZSMBUSSFileList = "BZSMBUSSFileList"
                         :QTWJBUSSFileList = "QTWJBUSSFileList"
                         :GLWJBUSSFileList = "GLWJBUSSFileList"
+                        :XGDFileList = "XGDFileList"
                         :disabledState = "disabledState"
-                        :verifySarStandard = "verifySarStandard"></formList>
+                        :verifySarStandard = "verifySarStandard"
+                        :opinionsShow = "true"
+                ></formList>
                 <div>
                     <el-collapse accordion v-model="activeName">
                         <el-collapse-item title="审批意见" name = "1">
@@ -654,9 +657,9 @@
                 LSBBBUSSFileList: [],
                 QTWJBUSSFileList: [],
                 GLWJBUSSFileList: [],
+                XGDFileList: [],
                 caFileList: [],
                 FBGBJBDFileList: [],
-                xgdFileList: [],
                 ZCWBLAWSFileList: [],
                 GCWBLAWSFileList: [],
                 JDWJLAWSFileList: [],
@@ -789,6 +792,9 @@
                     modelData:[],
                     modelDataNameVerify:[],
                     modelDataZrUserVerify:[],
+                    BARQ: '',
+                    XGD: '',
+                    XGDName: '',
                     // 基础信息
                     country:[],
                     // 基础信息
@@ -2304,6 +2310,7 @@
                                 this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
                                 this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
                                 this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
+                                this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName);
                             }
                         }).catch(e => {
                         })

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

@@ -25,8 +25,11 @@
                         :BZSMBUSSFileList = "BZSMBUSSFileList"
                         :QTWJBUSSFileList = "QTWJBUSSFileList"
                         :GLWJBUSSFileList = "GLWJBUSSFileList"
+                        :XGDFileList = "XGDFileList"
                         :disabledState = "disabledState"
-                        :verifySarStandard = "verifySarStandard"></formList>
+                        :verifySarStandard = "verifySarStandard"
+                        :opinionsShow = "true"
+                ></formList>
                 <div>
                     <el-collapse accordion v-model="activeName">
                         <el-collapse-item title="审批意见" name = "1">
@@ -654,9 +657,9 @@
                 LSBBBUSSFileList: [],
                 QTWJBUSSFileList: [],
                 GLWJBUSSFileList: [],
+                XGDFileList: [],
                 caFileList: [],
                 FBGBJBDFileList: [],
-                xgdFileList: [],
                 ZCWBLAWSFileList: [],
                 GCWBLAWSFileList: [],
                 JDWJLAWSFileList: [],
@@ -789,6 +792,9 @@
                     modelData:[],
                     modelDataNameVerify:[],
                     modelDataZrUserVerify:[],
+                    BARQ: '',
+                    XGD: '',
+                    XGDName: '',
                     // 基础信息
                     country:[],
                     // 基础信息
@@ -2304,6 +2310,7 @@
                                 this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
                                 this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
                                 this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
+                                this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName);
                             }
                         }).catch(e => {
                         })

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

@@ -26,6 +26,7 @@
                         :BZSMBUSSFileListSub = "BZSMBUSSFileList"
                         :QTWJBUSSFileListSub = "QTWJBUSSFileList"
                         :GLWJBUSSFileListSub = "GLWJBUSSFileList"
+                        :XGDFileListSub = "XGDFileList"
                         :disabledState = "disabledState"
                         :verifySarStandard = "verifySarStandard"
                         :fileMadelSub = "fileMadel"
@@ -600,6 +601,7 @@
     </el-drawer>
     <!-- 组件树-->
     <tree-select-new
+            :key="key"
             :multiple=false
             :lazy=false
             :modalShowFlag="modalShowFlag1"
@@ -714,6 +716,7 @@
                 LSBBBUSSFileList: [],
                 QTWJBUSSFileList: [],
                 GLWJBUSSFileList: [],
+                XGDFileList: [],
                 caFileList: [],
                 FBGBJBDFileList: [],
                 xgdFileList: [],
@@ -855,6 +858,9 @@
                     modelDataZrUserVerify:[],
                     footFile:'',
                     footFileName:'',
+                    BARQ: '',
+                    XGD: '',
+                    XGDName: '',
                     // 基础信息
                     country:[],
                     // 基础信息
@@ -1128,11 +1134,11 @@
                 this.replaceLawType = replaceLawType
                 this.getReplaceLawsNumRow()
             },
-            formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType) {
+            formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType,list6) {
                 this.form = form
                 this.FBGBUSSFileList = list1
                 this.LSBBBUSSFileList = list2
-                this.BZSMBUSSFileList = list3
+                this.XGDFileList = list3
                 this.QTWJBUSSFileList = list4
                 this.GLWJBUSSFileList = list5
                 if(fileMadel){
@@ -1293,6 +1299,13 @@
                     this.form.QCRBUSS=nameList;
                     this.formKey++
                 }
+
+                if(data && data.length > 0){
+                    const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
+                    const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
+                    this.form.QCDWID = institutionIdList
+                    this.form.QCDW = institutionNameList
+                }
             },
             checkedRole (data) {
                 if (this.type === 0) {
@@ -1352,6 +1365,7 @@
                         this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
                         this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
                         this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
+                        this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
                         this.roleForm = mes.roleForm
                         this.commentText = mes.commentText
                         this.formKey++
@@ -1377,6 +1391,9 @@
                     standEnName: data.standEnName ? data.standEnName : '', // 英文名称
                     standName: data.standName ? data.standName : '', // 中文名称
                     signFlag: data.signFlag ? data.signFlag : '1', // 是否需要会签
+                    BARQ: '',
+                    XGD: '',
+                    XGDName: '',
                     // 基础信息
                     standCode: '',
                     standYear: '',
@@ -1922,11 +1939,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined);
+                // this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined);
-                if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){
+                // if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){
-                    this.$message.error('文件限制只可上传一个')
+                //     this.$message.error('文件限制只可上传一个')
-                    return false
+                //     return false
-                }
+                // }
                 if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
@@ -2020,6 +2037,10 @@
                             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.formKey++
@@ -2056,6 +2077,9 @@
                     case 'GLWJBUSS':
                         this.fileList=this.GLWJBUSSFileList
                         break;
+                    case 'XGD':
+                        this.fileList=this.XGDFileList
+                        break;
                     default : ;
                 }
                 this.fileMadel = true;
@@ -2080,6 +2104,9 @@
                     case 'GLWJBUSS':
                         this.GLWJBUSSFileList = fileList
                         break;
+                    case 'XGD':
+                        this.XGDFileList = fileList
+                        break;
                     default : ;
                 }
                 this.formKey++
@@ -2271,6 +2298,9 @@
                 this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",")
                 this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",")
 
+                this.form.XGD=this.XGDFileList.map(item => item.id).join(",")
+                this.form.XGDName=this.XGDFileList.map(item => item.name).join(",")
+
             },
             // 删除方法
             deletedId(data, ids) {
@@ -2479,9 +2509,9 @@
                                 this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
                                 this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
                                 this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
-                                console.log(this.LSBBBUSSFileList)
                                 this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
                                 this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
+                                this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName);
                                 this.formKey++
                             }
                         }).catch(e => {

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

@@ -26,6 +26,7 @@
                         :BZSMBUSSFileListSub = "BZSMBUSSFileList"
                         :QTWJBUSSFileListSub = "QTWJBUSSFileList"
                         :GLWJBUSSFileListSub = "GLWJBUSSFileList"
+                        :XGDFileListSub = "XGDFileList"
                         :disabledState = "disabledState"
                         :verifySarStandard = "verifySarStandard"
                         :fileMadelSub = "fileMadel"
@@ -34,6 +35,10 @@
                         @formSelectLawsCancel = "formSelectLawsCancel"
                         @formChoiceZRRListCancel = "formChoiceZRRListCancel"
                         @formChoiceQCDW = "formChoiceQCDW"
+                        @formChoiceZRR1 = "formChoiceZRR1"
+                        @formChoiceZRR2 = "formChoiceZRR2"
+                        @formChoiceZRR3 = "formChoiceZRR3"
+                        @formChoiceZRR4 = "formChoiceZRR4"
                 />
                 <ProcessTitle>
                     <template slot="title">意见信息</template>
@@ -46,59 +51,96 @@
                                 style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:auto;border-bottom: 1px solid #EBEEF5;"
                                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
                                         fontWeight: 'bold', height: '48px'}"
-                                @selection-change="handleSelectionChange"
                                 row-key="id"
                                 :data="form.infoList"
                                 border
                                 default-expand-all>
                             <el-table-column
                                     label="序号"
-                                    min-width="15%"
+                                    min-width="5%"
                                     align="center">
                                 <template slot-scope="scope">
                                     {{scope.$index + 1}}
                                 </template>
                             </el-table-column>
                             <el-table-column
-                                    prop="userName"
+                                    prop="modelNum"
-                                    label="会签人"
+                                    label="条款号"
+                                    min-width="8%"
+                                    align="center"
+                            >
+                            </el-table-column>
+                            <el-table-column
+                                    prop="modelUpdBefore"
+                                    label="修改前"
+                                    align="center"
+                                    min-width="20%">
+                                <!--              <template slot-scope="scope">-->
+                                <!--                  <el-form-item-->
+                                <!--                          style="margin-left: 0;margin-bottom:0;"-->
+                                <!--                  >-->
+                                <!--                      <el-input v-model="scope.row.modelUpdBefore" :title="scope.row.modelUpdBefore" :disabled="scope.row.disabled"  placeholder="请维护章节修改前内容" @blur="modelNameFunc1(scope.row)"/>-->
+                                <!--                  </el-form-item>-->
+                                <!--              </template>-->
+                            </el-table-column>
+                            <el-table-column
+                                    prop="modelUpdAfter"
+                                    label="修改后"
+                                    align="center"
+                                    min-width="20%">
+                                <!--              <template slot-scope="scope">-->
+                                <!--                  <el-form-item-->
+                                <!--                          style="margin-left: 0;margin-bottom:0;"-->
+                                <!--                  >-->
+                                <!--                      <el-input v-model="scope.row.modelUpdAfter" :title="scope.row.modelUpdAfter" :disabled="scope.row.disabled"  placeholder="请维护章节修改后内容" @blur="modelNameFunc2(scope.row)"/>-->
+                                <!--                  </el-form-item>-->
+                                <!--              </template>-->
+                            </el-table-column>
+                            <el-table-column
+                                    prop="modelContent"
+                                    label="修改理由"
+                                    align="center"
+                                    min-width="20%">
+                                <!--              <template slot-scope="scope">-->
+                                <!--                  <el-form-item-->
+                                <!--                          style="margin-left: 0;margin-bottom:0;"-->
+                                <!--                  >-->
+                                <!--                      <el-input v-model="scope.row.modelContent" :disabled="scope.row.disabled"  placeholder="请填写修改理由"/>-->
+                                <!--                  </el-form-item>-->
+                                <!--              </template>-->
+                            </el-table-column>
+                            <el-table-column
+                                    prop="zrDeptIdName"
+                                    label="提出部门"
                                     align="center"
                                     min-width="15%">
+                                <!--                                <template slot-scope="scope">-->
+                                <!--                                    <el-form-item-->
+                                <!--                                            style="margin-left: 0;margin-bottom:0;"-->
+                                <!--                                    >-->
+                                <!--                                        <el-input v-model="scope.row.zrDeptIdName" disabled  placeholder="请选择提出人自动带入部门"/>-->
+                                <!--                                    </el-form-item>-->
+                                <!--                                </template>-->
                             </el-table-column>
                             <el-table-column
-                                    prop="commentText"
+                                    prop="zrUserIdName"
-                                    label="会签意见"
+                                    label="责任人"
-                                    min-width="35%"
+                                    min-width="15%"
                                     align="center">
-                            </el-table-column>
+                                <!--                                <template slot-scope="scope">-->
-                            <el-table-column
+                                <!--                                    <el-form-item-->
-                                    prop="commentText"
+                                <!--                                            style="margin-left: 0;margin-bottom:0;"-->
-                                    label="会签意见文件"
+                                <!--                                    >-->
-                                    min-width="35%"
+                                <!--                                        <el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" disabled />-->
-                                    align="left">
+                                <!--                                    </el-form-item>-->
-                                <template slot-scope="scope">
+                                <!--                                </template>-->
-                                    <el-form-item
-                                            style="margin-left: 0;margin-bottom:0;"
-                                    >
-                                        <div  v-if="scope.row.summaryList.length>0" v-for="(value,index)  in scope.row.summaryList" :title="value.name" :key="index" style="margin-left: -210px;cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                            <!-- {{ value.name }} -->
-                                            {{value.name | ellipsis}}
-                                        </div>
-                                        <div v-else>
-                                            - -
-                                        </div>
-                                    </el-form-item>
-                                </template>
                             </el-table-column>
                             <el-table-column
                                     label="意见是否采纳"
                                     min-width="15%"
                                     align="center">
                                 <template slot-scope="scope">
-                                    <el-form-item
+                                    <el-select v-model="scope.row.opinionsAdopted" filterable clearable :disabled="disabledState">
-                                            style="margin-left: 0;margin-bottom:0;"
-                                    >
-                                        <el-select style="margin-left: -223px;" v-model="scope.row.opinionsAdopted" filterable clearable>
                                         <el-option
                                                 v-for="item in opinionsAdoptedOptions"
                                                 :key="item.value"
@@ -106,7 +148,15 @@
                                                 :label="item.label"
                                         ></el-option>
                                     </el-select>
-                                    </el-form-item>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                                    prop="opinionsAdoptedCont"
+                                    label="采纳理由"
+                                    align="center"
+                                    min-width="15%">
+                                <template slot-scope="scope">
+                                    <el-input v-model="scope.row.opinionsAdoptedCont" clearable  placeholder="请填写采纳理由"/>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -621,6 +671,7 @@
     </el-drawer>
     <!-- 组件树-->
     <tree-select-new
+            :key="key"
             :multiple=false
             :lazy=false
             :modalShowFlag="modalShowFlag1"
@@ -735,9 +786,9 @@
                 LSBBBUSSFileList: [],
                 QTWJBUSSFileList: [],
                 GLWJBUSSFileList: [],
+                XGDFileList: [],
                 caFileList: [],
                 FBGBJBDFileList: [],
-                xgdFileList: [],
                 ZCWBLAWSFileList: [],
                 GCWBLAWSFileList: [],
                 JDWJLAWSFileList: [],
@@ -877,6 +928,9 @@
                     opinionsAdopted:'',  // 汇总意见是否采纳
                     footFile:'',
                     footFileName:'',
+                    BARQ: '',
+                    XGD: '',
+                    XGDName: '',
                     // 基础信息
                     country:[],
                     // 基础信息
@@ -1149,6 +1203,18 @@
             formChoiceQCDW(type, title, id){
                 this.choiceQCDW(type, title, id)
             },
+            formChoiceZRR1(type, title, id){
+                this.choiceZRR1(type, title, id)
+            },
+            formChoiceZRR2(type,title,id,flag){
+                this.choiceZRR2(type,title,id,flag)
+            },
+            formChoiceZRR3(type, title, id){
+                this.choiceZRR3(type, title, id)
+            },
+            formChoiceZRR4(type, title, id){
+                this.choiceZRR4(type, title, id)
+            },
             formChoiceZRRListCancel(type, title, id){
                 this.choiceZRRList(type, title, id)
             },
@@ -1161,7 +1227,7 @@
                 this.form = form
                 this.FBGBUSSFileList = list1
                 this.LSBBBUSSFileList = list2
-                this.BZSMBUSSFileList = list3
+                this.XGDFileList = list3
                 this.QTWJBUSSFileList = list4
                 this.GLWJBUSSFileList = list5
                 if(fileMadel){
@@ -1322,6 +1388,13 @@
                     this.form.QCRBUSS=nameList;
                     this.formKey++
                 }
+
+                if(data && data.length > 0){
+                    const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
+                    const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
+                    this.form.QCDWID = institutionIdList
+                    this.form.QCDW = institutionNameList
+                }
             },
             checkedRole (data) {
                 if (this.type === 0) {
@@ -1381,6 +1454,7 @@
                         this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
                         this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
                         this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
+                        this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
                         this.roleForm = mes.roleForm
                         this.commentText = mes.commentText
                         this.formKey++
@@ -1406,6 +1480,9 @@
                     standEnName: data.standEnName ? data.standEnName : '', // 英文名称
                     standName: data.standName ? data.standName : '', // 中文名称
                     signFlag: data.signFlag ? data.signFlag : '1', // 是否需要会签
+                    BARQ: '',
+                    XGD: '',
+                    XGDName: '',
                     // 基础信息
                     standCode: '',
                     standYear: '',
@@ -1951,11 +2028,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined);
+                // this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined);
-                if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){
+                // if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){
-                    this.$message.error('文件限制只可上传一个')
+                //     this.$message.error('文件限制只可上传一个')
-                    return false
+                //     return false
-                }
+                // }
                 if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
@@ -2049,6 +2126,10 @@
                             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.formKey++
@@ -2085,6 +2166,9 @@
                     case 'GLWJBUSS':
                         this.fileList=this.GLWJBUSSFileList
                         break;
+                    case 'XGDFileList':
+                        this.fileList=this.XGDFileList
+                        break;
                     default : ;
                 }
                 this.fileMadel = true;
@@ -2109,6 +2193,9 @@
                     case 'GLWJBUSS':
                         this.GLWJBUSSFileList = fileList
                         break;
+                    case 'XGD':
+                        this.XGDFileList = fileList
+                        break;
                     default : ;
                 }
                 this.formKey++
@@ -2284,7 +2371,6 @@
             fileInfoHandle(){
 
                 //拼接文件名和id 提交到流程Activity
-                console.log(this.FBGBUSSFileList)
                 this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id).join(",")
                 this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",")
 
@@ -2300,6 +2386,9 @@
                 this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",")
                 this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",")
 
+                this.form.XGD=this.XGDFileList.map(item => item.id).join(",")
+                this.form.XGDName=this.XGDFileList.map(item => item.name).join(",")
+
             },
             // 删除方法
             deletedId(data, ids) {
@@ -2508,9 +2597,9 @@
                                 this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
                                 this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
                                 this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
-                                console.log(this.LSBBBUSSFileList)
                                 this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
                                 this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
+                                this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName);
                                 this.formKey++
                             }
                         }).catch(e => {

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

@@ -327,7 +327,10 @@
   <div class="prc-content-border"  v-show="verifySarStandard">
     <el-row :gutter="24">
       <el-col :span="12">
-        <el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled">
+        <el-form-item
+          label="代替企标编号"
+          prop="DTQBBHBUSS"
+          class="add-form-item form-item-disabled">
           <el-input
                   v-model="form.DTQBBHBUSS"
                   placeholder="请输入代替标准号"
@@ -871,7 +874,7 @@ export default {
       }
         if (type === 'down') {
             if (attId) {
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+              window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
             } else {
                 this.$message.warning('文件不存在,下载失败')
             }