Merge branch 'develop' into FOTON

src/components/CustomFormComponents/DatePickerGroup.vue

@@ -144,7 +144,7 @@ export default {
   },
   watch: {
     value (val) {
-      this.tagList = val !== '' && val !== null ? val.split(',') : []
+      this.tagList = val !== '' && val !== null && val !== undefined? val.split(',') : []
       // 把日期的时分秒去掉
       this.tagList=this.tagList.map((item)=>item.substring(0,10))
     },

src/pages/details/otherStandardDetails/index.vue

@@ -266,10 +266,9 @@
                     <p class="half"><label style=" margin-right: 150px;">发布日期</label><span>{{
                         sarStandardsInfoEO.issueTime || '-'
                       }}</span></p>
-<!--                    <p class="half"><label style=" margin-right: 150px;">标准性质</label><span>{{-->
+                    <p class="half"><label style=" margin-right: 150px;">标准性质</label><span>{{
-<!--                        standMap[sarStandardsInfoEO.standNature] || '-'-->
+                        standMap[sarStandardsInfoEO.standNature] || '-'
-<!--                      }}</span></p>-->
+                      }}</span></p>
-
                     <p class="half" v-if="saveStandType === 'INLAND_STAND'"><label
                         style=" margin-right: 150px;">标准体系</label><span>{{
                         sarStandardsInfoEO.standSystem || '-'
@@ -1315,7 +1314,7 @@
             }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 14px" title="解读内容">解读内容</label>
+          <label class="see-drawer-name" style="font-size: 14px" title="核心技术要求">核心技术要求</label>
           <span class="see-drawer-val" style="font-size: 12px"
                 :title="standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''">
             {{

src/pages/localTool/standardWarning.vue

@@ -184,7 +184,7 @@
                 </el-table-column>
                 <el-table-column prop="applyType" label="适用车型" align="center">
                 </el-table-column>
-                <el-table-column label="操作" width="100" align="center" v-if="isShowBtn" fixed="right">
+                 <!-- <el-table-column label="操作" width="100" align="center" v-if="isShowBtn" fixed="right">
                     <template slot-scope="scope">
                       <el-button
                           size="mini"
@@ -192,7 +192,7 @@
                           @click="cancelWarning(scope.$index, scope.row)">取消预警
                       </el-button>
                     </template>
-                </el-table-column>
+                  </el-table-column>-->
               </el-table>
               <pagination
                   style="position: static;"

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue

@@ -111,7 +111,7 @@
             <ProcessTitle>
               <template slot="title">选择人员</template>
             </ProcessTitle>
-            <el-form-item class="add-form-item" label="入会人员:">
+            <el-form-item class="add-form-item" label="入会人员:" prop="comityOpRoleId">
               <el-input v-model="rh_pageData.comityOpRoleId" style="display: none;"></el-input>
               <el-input
                 placeholder="请选择入会成员"
@@ -243,7 +243,9 @@ export default {
   data() {
     return {
       active: '1', // 默认显示
-      rh_rules: {},
+      rh_rules: {
+        comityOpRoleId: [{required: true, message: "请选择入会人员", trigger: ['blur', 'change']}]
+      },
       rh_pageData: {
         comityFileNum: '',
         comityFileName: '',

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue

@@ -107,7 +107,7 @@
             <ProcessTitle>
               <template slot="title">选择人员</template>
             </ProcessTitle>
-            <el-form-item class="add-form-item" label="参会人员:">
+            <el-form-item class="add-form-item" label="参会人员:" prop="meetingInRoleId">
               <el-input v-model="ch_pageData.meetingInRoleId" style="display: none;"></el-input>
               <el-input
                 placeholder="请选择参会人员"
@@ -239,7 +239,9 @@ export default {
 
       acceptShow: false,
       ch_pageData: {},
-      ch_rules: {},
+      ch_rules: {
+        meetingInRoleId: [{required: true, message: "请选择参会人员", trigger: ['blur', 'change']}]
+      },
       nodeList: [],
       commentText: '',
 

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

@@ -622,7 +622,7 @@
                         complianceState: row.complianceState, // 合规性分析
                         newData: row.newData, // 新车型实施日期
                         onlineData: row.onlineData, // 在产车实施日期
-                        applyArctic: row.applyArctic, // 适用车型
+                        applyArctic: typeof (row.applyArctic) === 'string' ? JSON.parse(row.applyArctic) : row.applyArctic, // 适用车型
                         itemsId: row.itemsId,
                         itemsId2: row.itemsId2
                     }

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

@@ -1,5 +1,5 @@
 <template>
-<form>
+  <form>
     <ProcessTitle>
       <template slot="title">基础信息</template>
     </ProcessTitle>
@@ -82,11 +82,11 @@
                     clearable
             ></el-input>
           </el-form-item>
-        <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
+          <!--        <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">-->
-          <el-datePicker v-model="form.issueTime"
+          <!--          <el-datePicker v-model="form.issueTime"-->
-                         :editable="false"
+          <!--                         :editable="false"-->
-                         placeholder="请选择发布日期"></el-datePicker>
+          <!--                         placeholder="请选择发布日期"></el-datePicker>-->
-        </el-form-item>
+          <!--        </el-form-item>-->
           <!--                                <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">-->
           <!--                                    <el-datePicker v-model="form.FZRQBUSS"-->
           <!--                                                   :editable="false"-->
@@ -229,9 +229,9 @@
         <el-col :span="12">
           <el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
             <el-input
-                  clearable
                     v-model="form.QCDW"
                     placeholder="选择起草部门"
+                    readonly="readonly"
                     @click.native="choiceQCDW('QCDWId', '起草部门', form.QCDW)">
             </el-input>
           </el-form-item>
@@ -254,19 +254,25 @@
               ></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="关联模块--乘用车VPPS中文名称" title="关联模块--乘用车VPPS中文名称" class="add-form-item form-item-disabled">
+            <el-input v-model="form.CYCVPPSBMBUSS" readonly="readonly" placeholder="选择VPPS编码" @click.native="choiceZRR2('car', '乘用车VPPS编码', form.CYCVPPSBMBUSS,true)"></el-input>
+          </el-form-item>
+          <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
+            <el-input v-model="form.KCVPPSBMBUSS" readonly="readonly" placeholder="选择VPPS编码" @click.native="choiceZRR3('struck', '卡车VPPS编码', form.KCVPPSBMBUSS,false)"></el-input>
+          </el-form-item>
+          <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">
+            <el-input v-model="form.DYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxhbuss', '模块结构单元', form.DYBXHBUSS,false)"></el-input>
+          </el-form-item>
           <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
             <el-input v-model="form.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', form.TXLBBUSS)"></el-input>
           </el-form-item>
-        <el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
-          <el-input v-model="form.VPPSBMBUSS" placeholder="选择VPPS编码" @click.native="choiceZRR2('VPPSBMBUSS', 'VPPS编码', form.VPPSBMBUSS,false)"></el-input>
-        </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
             <el-input
                     v-model="form.QCRBUSS"
                     placeholder="选择起草人"
-                  clearable
+                    readonly="readonly"
                     @click.native="choiceZRRList('QCRBUSS', '选择起草人', form.QCRBUSS)">
             </el-input>
           </el-form-item>
@@ -292,8 +298,14 @@
               ></el-option>
             </el-select>
           </el-form-item>
-        <el-form-item label="模块中文名称" prop="VPPSCNBUSS" class="add-form-item form-item-disabled">
+          <el-form-item label="关联模块--乘用车vpps中文名称" prop="CYCVPPSCNBUSS" class="add-form-item form-item-disabled">
-          <el-input v-model="form.VPPSCNBUSS" placeholder="请输入模块中文名称" clearable :disabled="true"></el-input>
+            <el-input v-model="form.CYCVPPSCNBUSS" placeholder="请输入模块中文名称" clearable :disabled="true"></el-input>
+          </el-form-item>
+          <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
+            <el-input v-model="form.KCVPPSCNBUSS" placeholder="关联模块--卡车VPPS编码" clearable :disabled="true"></el-input>
+          </el-form-item>
+          <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+            <el-input v-model="form.DYMCBUSS" placeholder="模块结构单元名称" clearable :disabled="true"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -373,15 +385,15 @@
         </el-col>
       </el-row>
     </div>
-</form>
+  </form>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+  import { mapGetters } from 'vuex'
-import ProcessTitle from '../../../components/ProcessTitle'
+  import ProcessTitle from '../../../components/ProcessTitle'
 
 
-export default {
+  export default {
     name: 'formEditList',
     components: {
       ProcessTitle,
@@ -502,6 +514,22 @@ export default {
       ...mapGetters(['userInfo'])
     },
     methods: {
+      choiceZRR1(type, title, id) {
+        this.$emit('formChoiceZRR1',type,title,id)
+      },
+
+      choiceZRR2(type, title, id,flag) {
+        this.$emit('formChoiceZRR2',type,title,id,flag)
+      },
+
+      choiceZRR3(type, title, id) {
+        this.$emit('formChoiceZRR3',type,title,id)
+      },
+
+      choiceZRR4(type, title, id) {
+        this.$emit('formChoiceZRR4',type,title,id)
+      },
+
       choiceQCDW(type, title, id) {
         this.$emit('formChoiceQCDW',type,title,id)
       },
@@ -667,7 +695,7 @@ export default {
         deep: true //对象的深度验证
       },
     }
-}
+  }
 </script>
 
 <style scoped>

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

@@ -1,5 +1,5 @@
 <template>
-<form>
+  <form>
     <ProcessTitle>
       <template slot="title">基础信息</template>
     </ProcessTitle>
@@ -32,10 +32,6 @@
           <!--                                    ></el-option>-->
           <!--                                </el-select>-->
           <!--                            </el-form-item>-->
-        <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
-          <el-datePicker v-model="form.putTime" :disabled="disabledState"
-                         :editable="false"></el-datePicker>
-        </el-form-item>
           <!--                            <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">-->
           <!--                                <el-datePicker v-model="form.FSRQBUSS"-->
           <!--                                               :editable="false"-->
@@ -68,15 +64,19 @@
                     clearable
             ></el-input>
           </el-form-item>
+          <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
+            <el-datePicker v-model="form.putTime" :disabled="disabledState"
+                           :editable="false"></el-datePicker>
+          </el-form-item>
           <!--                            <el-form-item v-show="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">-->
           <!--                                <el-input v-model="form.standYear" :disabled="disabledState"-->
           <!--                                          clearable></el-input>-->
           <!--                            </el-form-item>-->
-        <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
+          <!--        <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">-->
-          <el-datePicker v-model="form.issueTime" :disabled="disabledState"
+          <!--          <el-datePicker v-model="form.issueTime" :disabled="disabledState"-->
-                         :editable="false"
+          <!--                         :editable="false"-->
-          ></el-datePicker>
+          <!--          ></el-datePicker>-->
-        </el-form-item>
+          <!--        </el-form-item>-->
           <!--                            <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">-->
           <!--                                <el-datePicker v-model="form.FZRQBUSS" :disabled="disabledState"-->
           <!--                                               :editable="false"-->
@@ -159,12 +159,18 @@
               ></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="关联模块--乘用车VPPS中文名称" title="关联模块--乘用车VPPS中文名称" class="add-form-item form-item-disabled">
+            <el-input v-model="form.CYCVPPSBMBUSS"  :disabled="disabledState"></el-input>
+          </el-form-item>
+          <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
+            <el-input v-model="form.KCVPPSBMBUSS"  :disabled="disabledState"></el-input>
+          </el-form-item>
+          <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">
+            <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>
+          </el-form-item>
           <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
             <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
           </el-form-item>
-        <el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
-          <el-input v-model="form.VPPSBMBUSS"  :disabled="disabledState"></el-input>
-        </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
@@ -190,8 +196,14 @@
               ></el-option>
             </el-select>
           </el-form-item>
-        <el-form-item label="模块中文名称" prop="VPPSCNBUSS" class="add-form-item form-item-disabled">
+          <el-form-item label="关联模块--乘用车vpps中文名称" prop="CYCVPPSCNBUSS" class="add-form-item form-item-disabled">
-          <el-input v-model="form.VPPSCNBUSS" clearable :disabled="true"></el-input>
+            <el-input v-model="form.CYCVPPSCNBUSS" clearable :disabled="true"></el-input>
+          </el-form-item>
+          <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
+            <el-input v-model="form.KCVPPSCNBUSS" clearable :disabled="true"></el-input>
+          </el-form-item>
+          <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+            <el-input v-model="form.DYMCBUSS" clearable :disabled="true"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -219,12 +231,12 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-<!--        <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">-->
+          <!--        <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">-->
-<!--          <el-input-->
+          <!--          <el-input-->
-<!--                  v-model="form.BDTWJHLAWS" :disabled="disabledState"-->
+          <!--                  v-model="form.BDTWJHLAWS" :disabled="disabledState"-->
-<!--                  clearable-->
+          <!--                  clearable-->
-<!--          ></el-input>-->
+          <!--          ></el-input>-->
-<!--        </el-form-item>-->
+          <!--        </el-form-item>-->
           <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
             <el-input
                     v-model="form.XCSJBUSS"
@@ -239,10 +251,64 @@
       <template slot="title">意见信息</template>
     </ProcessTitle>
     <div class="prc-content-border" v-show="opinionsShow">
-        <el-row :gutter="24">
+      <el-table
-            <el-col :span="12">
+              ref="selection"
-                <el-form-item label="汇总意见是否采纳" prop="opinionsAdopted" class="add-form-item form-item-disabled">
+              tooltip-effect="dark"
-                    <el-select v-model="form.opinionsAdopted" filterable clearable :disabled="disabledState">
+              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'}"
+              row-key="id"
+              :data="form.infoList"
+              border
+              default-expand-all>
+        <el-table-column
+                label="序号"
+                min-width="15%"
+                align="center">
+          <template slot-scope="scope">
+            {{scope.$index + 1}}
+          </template>
+        </el-table-column>
+        <el-table-column
+                prop="userName"
+                label="会签人"
+                align="center"
+                min-width="15%">
+        </el-table-column>
+        <el-table-column
+                prop="commentText"
+                label="会签意见"
+                min-width="35%"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="commentText"
+                label="会签意见文件"
+                min-width="35%"
+                align="left">
+          <template slot-scope="scope">
+            <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
+                    style="margin-left: 0;margin-bottom:0;"
+            >
+              <el-select style="margin-left: -223px;" v-model="scope.row.opinionsAdopted" filterable clearable :disabled="disabledState">
                 <el-option
                         v-for="item in opinionsAdoptedOptions"
                         :key="item.value"
@@ -251,18 +317,32 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            </el-col>
+          </template>
-        </el-row>
+        </el-table-column>
+      </el-table>
+<!--      <el-row :gutter="24">-->
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="汇总评审意见文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">-->
+<!--            <div  v-if="summaryFileList.length>0" v-for="(value,index)  in this.summaryFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
+<!--              &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
+<!--              {{value.name}}-->
+<!--            </div>-->
+<!--            <div v-else>-->
+<!--              - - -->
+<!--            </div>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+<!--      </el-row>-->
     </div>
-</form>
+  </form>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+  import { mapGetters } from 'vuex'
-import ProcessTitle from '../../../components/ProcessTitle'
+  import ProcessTitle from '../../../components/ProcessTitle'
 
 
-export default {
+  export default {
     name: 'formList',
     components: {
       ProcessTitle,
@@ -292,6 +372,10 @@ export default {
         type: Array,
         required: true
       },
+      summaryFileList: {
+        type: Array,
+        required: false
+      },
       disabledState: {
         type: Boolean,
         default: false
@@ -305,6 +389,15 @@ export default {
         default: false
       },
     },
+    filters: {
+      ellipsis (value) {
+        if (!value) return ''
+        if (value.length > 35) {
+          return value.slice(0,35) + '...'
+        }
+        return value
+      }
+    },
     data () {
       return {
         opinionsAdoptedOptions:[
@@ -351,7 +444,7 @@ export default {
     methods: {
       downloadFile (data) {
         //文件id中出现了','字符,去除掉
-      window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+        window.open('/api/att/attFile/downloadFileForSar?fileId=' + data.id)
       },
       setMap(data){
         data.forEach(item => {
@@ -410,7 +503,7 @@ export default {
       this.busVsFunc()
       this.modelFunc()
     }
-}
+  }
 </script>
 
 <style scoped>

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

@@ -0,0 +1,517 @@
+<template>
+<form>
+  <ProcessTitle>
+    <template slot="title">基础信息</template>
+  </ProcessTitle>
+  <div class="prc-content-border">
+    <el-row :gutter="24">
+      <el-col :span="12">
+        <el-form-item label="企业标准号" prop="standCode" class="add-form-item form-item-disabled">
+          <el-input
+                  v-model="form.standCode" :disabled="disabledState"
+                  clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
+          <el-input
+                  v-model="form.standName" :disabled="disabledState"
+                  clearable
+          ></el-input>
+        </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-->
+        <!--                                            v-for="item in standStateOptions"-->
+        <!--                                            :key="item.value"-->
+        <!--                                            :value="item.value"-->
+        <!--                                            :label="item.label"-->
+        <!--                                    ></el-option>-->
+        <!--                                </el-select>-->
+        <!--                            </el-form-item>-->
+        <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
+          <el-datePicker v-model="form.putTime" :disabled="disabledState"
+                         :editable="false"></el-datePicker>
+        </el-form-item>
+        <!--                            <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">-->
+        <!--                                <el-datePicker v-model="form.FSRQBUSS"-->
+        <!--                                               :editable="false"-->
+        <!--                                               :disabled="true"-->
+        <!--                                               value-format="yyyy-MM-dd"-->
+        <!--                                               clearable></el-datePicker>-->
+        <!--                            </el-form-item>-->
+      </el-col>
+      <el-col :span="12">
+        <!--                              <el-form-item label="国家/地区" prop="country" class="add-form-item form-item-disabled">-->
+        <!--                                <el-select :popper-append-to-body="false" v-model="form.country" multiple  placeholder="国家/地区">-->
+        <!--                                  <el-option-->
+        <!--                                      v-for="item in countryOptions"-->
+        <!--                                      placeholder="请选择"-->
+        <!--                                      :key="item.value"-->
+        <!--                                      :value="item.value"-->
+        <!--                                      :label="item.label"-->
+        <!--                                  ></el-option>-->
+        <!--                                </el-select>-->
+        <!--                              </el-form-item>-->
+        <!--                            <el-form-item label="企标编号" prop="standNumber" class="add-form-item form-item-disabled">-->
+        <!--                                <el-input-->
+        <!--                                        v-model="form.standNumber" :disabled="disabledState"-->
+        <!--                                        clearable-->
+        <!--                                ></el-input>-->
+        <!--                            </el-form-item>-->
+        <el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
+          <el-select v-model="form.standSort" filterable clearable placeholder="" :disabled="disabledState" style="appearance: none">
+            <el-option
+                    v-for="item in standSortOptions"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
+          <el-input
+                  v-model="form.standEnName" :disabled="disabledState"
+                  clearable
+          ></el-input>
+        </el-form-item>
+        <!--                            <el-form-item v-show="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">-->
+        <!--                                <el-input v-model="form.standYear" :disabled="disabledState"-->
+        <!--                                          clearable></el-input>-->
+        <!--                            </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" :disabled="disabledState"
+                         :editable="false"
+          ></el-datePicker>
+        </el-form-item>
+        <!--                            <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">-->
+        <!--                                <el-datePicker v-model="form.FZRQBUSS" :disabled="disabledState"-->
+        <!--                                               :editable="false"-->
+        <!--                                               value-format="yyyy-MM-dd"-->
+        <!--                                               clearable></el-datePicker>-->
+        <!--                            </el-form-item>-->
+      </el-col>
+    </el-row>
+  </div>
+  <ProcessTitle v-show="verifySarStandard">
+    <template slot="title">过程稿件</template>
+  </ProcessTitle>
+  <div class="prc-content-border"  v-show="verifySarStandard">
+    <el-row :gutter="24">
+      <el-col :span="12">
+        <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
+          <div  v-if="FBGBUSSFileList.length>0" v-for="(value,index)  in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
+            <!-- {{ value.name }} -->
+            {{value.name}}
+          </div>
+          <div v-else>
+            - -
+          </div>
+        </el-form-item>
+        <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
+          <div  v-if="LSBBBUSSFileList.length>0" v-for="(value,index)  in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
+            <!-- {{ value.name }} -->
+            {{value.name}}
+          </div>
+          <div v-else>
+            - -
+          </div>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
+          <div  v-if="BZSMBUSSFileList.length>0" v-for="(value,index)  in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
+            <!-- {{ value.name }} -->
+            {{value.name}}
+          </div>
+          <div v-else>
+            - -
+          </div>
+        </el-form-item>
+        <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
+          <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
+            <!-- {{ value.name }} -->
+            {{value.name}}
+          </div>
+          <div v-else>
+            - -
+          </div>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </div>
+  <ProcessTitle v-show="verifySarStandard">
+    <template slot="title">适用范围</template>
+  </ProcessTitle>
+  <div class="prc-content-border"  v-show="verifySarStandard">
+    <el-row :gutter="24">
+      <el-col :span="12">
+        <el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
+          <el-input v-model="form.QCDW"  :disabled="disabledState" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="文件上传人员" prop="WJSCRYBUSSName" class="add-form-item form-item-disabled">
+          <el-input
+                  v-model="form.WJSCRYBUSSName"
+                  :disabled="true"
+                  clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="能源类型" prop="NYLXCLASS" class="add-form-item form-item-disabled">
+          <el-select :popper-append-to-body="false" v-model="form.NYLXCLASS" placeholder="" :disabled="disabledState" multiple>
+            <el-option
+                    v-for="item in categoryOptions"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
+          <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="关联模块--乘用车VPPS中文名称" title="关联模块--乘用车VPPS中文名称" class="add-form-item form-item-disabled">
+          <el-input v-model="form.CYCVPPSBMBUSS"  :disabled="disabledState"></el-input>
+        </el-form-item>
+        <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
+          <el-input v-model="form.KCVPPSBMBUSS"  :disabled="disabledState"></el-input>
+        </el-form-item>
+        <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">
+          <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
+          <el-input v-model="form.QCRBUSS"  :disabled="disabledState" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled">
+          <el-select :popper-append-to-body="false" v-model="form.SYCXCLASS" placeholder="" :disabled="disabledState" multiple>
+            <el-option
+                    v-for="item in applyArcticOptions"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="适用产品线" prop="SYCPXCLASS" class="add-form-item form-item-disabled">
+          <el-select :popper-append-to-body="false" v-model="form.SYCPXCLASS" placeholder="" :disabled="disabledState"  multiple>
+            <el-option
+                    v-for="item in sycpxOptions"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="关联模块--乘用车vpps中文名称" prop="CYCVPPSCNBUSS" class="add-form-item form-item-disabled">
+          <el-input v-model="form.CYCVPPSCNBUSS" clearable :disabled="true"></el-input>
+        </el-form-item>
+        <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
+          <el-input v-model="form.KCVPPSCNBUSS" clearable :disabled="true"></el-input>
+        </el-form-item>
+        <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+          <el-input v-model="form.DYMCBUSS" clearable :disabled="true"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </div>
+  <ProcessTitle v-show="verifySarStandard">
+    <template slot="title">关联信息</template>
+  </ProcessTitle>
+  <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-input
+                  v-model="form.DTQBBHBUSS" :disabled="disabledState"
+                  clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
+          <div  v-if="GLWJBUSSFileList.length>0" v-for="(value,index)  in this.GLWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
+            <!-- {{ value.name }} -->
+            {{value.name}}
+          </div>
+          <div v-else>
+            - -
+          </div>
+        </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" :disabled="disabledState"-->
+<!--                  clearable-->
+<!--          ></el-input>-->
+<!--        </el-form-item>-->
+        <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
+          <el-input
+                  v-model="form.XCSJBUSS"
+                  clearable
+                  :disabled="true"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </div>
+    <ProcessTitle v-show="opinionsShow">
+        <template slot="title">意见信息</template>
+    </ProcessTitle>
+  <div class="prc-content-border" v-show="opinionsShow">
+    <el-table
+            ref="selection"
+            tooltip-effect="dark"
+            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'}"
+            row-key="id"
+            :data="form.infoList"
+            border
+            default-expand-all>
+      <el-table-column
+              label="序号"
+              min-width="15%"
+              align="center">
+        <template slot-scope="scope">
+          {{scope.$index + 1}}
+        </template>
+      </el-table-column>
+      <el-table-column
+              prop="userName"
+              label="会签人"
+              align="center"
+              min-width="15%">
+      </el-table-column>
+      <el-table-column
+              prop="commentText"
+              label="会签意见"
+              min-width="35%"
+              align="center">
+      </el-table-column>
+      <el-table-column
+              prop="commentText"
+              label="会签意见文件"
+              min-width="35%"
+              align="left">
+        <template slot-scope="scope">
+          <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
+                  style="margin-left: 0;margin-bottom:0;"
+          >
+            <el-select style="margin-left: -223px;" v-model="scope.row.opinionsAdopted" filterable clearable :disabled="disabledState">
+              <el-option
+                      v-for="item in opinionsAdoptedOptions"
+                      :key="item.value"
+                      :value="item.value"
+                      :label="item.label"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-row :gutter="24">
+      <el-col :span="12">
+        <el-form-item label="汇总评审意见文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
+          <div  v-if="summaryFileList.length>0" v-for="(value,index)  in this.summaryFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
+            <!-- {{ value.name }} -->
+            {{value.name}}
+          </div>
+          <div v-else>
+            - -
+          </div>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </div>
+</form>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ProcessTitle from '../../../components/ProcessTitle'
+
+
+export default {
+  name: 'formListIn',
+  components: {
+    ProcessTitle,
+  },
+  filters: {
+    ellipsis (value) {
+      if (!value) return ''
+      if (value.length > 35) {
+        return value.slice(0,35) + '...'
+      }
+      return value
+    }
+  },
+  props: {
+    form: {
+      type: Object,
+      required: true
+    },
+    FBGBUSSFileList: {
+      type: Array,
+      required: true
+    },
+    LSBBBUSSFileList: {
+      type: Array,
+      required: true
+    },
+    BZSMBUSSFileList: {
+      type: Array,
+      required: true
+    },
+    QTWJBUSSFileList: {
+      type: Array,
+      required: true
+    },
+    GLWJBUSSFileList: {
+      type: Array,
+      required: true
+    },
+    summaryFileList: {
+      type: Array,
+      required: false
+    },
+    disabledState: {
+      type: Boolean,
+      default: false
+    },
+    verifySarStandard: {
+      type: Boolean,
+      default: false
+    },
+    opinionsShow: {
+      type: Boolean,
+      default: false
+    },
+  },
+  data () {
+    return {
+      opinionsAdoptedOptions:[
+            {value: '1',label: '采纳'},
+            {value: '2',label: '不采纳'},
+      ],
+      countryOptions:[],//国家地区
+      standSortOptions: [], // 标准类别
+      standNatureOptions: [], // 标准性质
+      standStateOptions: [], // 文本状态
+      standSystemOptions: [], // 标准体系
+      busVppsOptions: [], // 车系体系架构
+      busVppsChildOptions: [], // 车系体系架构子集合
+      modelOptions: [], // 模块体系架构
+      modelChildOptions: [], // 模块体系架构子集合
+      applyArcticOptions: [], // 适用车型
+      gkglbmOptions: [], // 归口管理部门
+      categoryOptions: [], // 能源类型
+      applyAuthOptions: [], // 适用认证
+      cysdOptions: [], // 我司参与深度
+      cbcdOptions: [], // 采标程度
+      wssmrOptions: [], // 我司署名人
+      sycpxOptions: [], // 适用产品线
+      zrbmOptions: [], // 责任部门
+      zrgcsOptions: [], // 责任工程师
+      qcdwOption: [], // 起草单位
+      txlbOptions: [], // 体系类别
+      standSortConfigOptions: [], // 标准类别下拉框
+      adoptExtentOptions: [], // 采标程度下拉框
+      emergyKindOptions: [], // 能源种类下拉框
+      categoryConfigOptions: [], // 所属类别下拉框
+      assemClassOptions: [], // 总成分类下拉框
+      qcdwOptions:[],//起草单位下拉框
+      qcrOptions:[],//起草人下拉框
+      nylxOptions:[],//能源类型下拉框
+      syrzOptions:[],//适用认证下拉框
+      data: [], // 标准列表数据
+      ListForm: {}, // 新增数据
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
+  methods: {
+    downloadFile (data) {
+      //文件id中出现了','字符,去除掉
+      window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+    },
+    setMap(data){
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label)
+      })
+
+    },
+    busVsFunc(){
+      this.$http.get('sarVppsTree/list', '', {
+        _this: this
+      }, res => {
+        this.busVppsOptions = []
+        this.busVppsOptions = res.data
+      })
+    },
+    modelFunc(){
+      this.$http.get('sarModelTree/list', '', {
+        _this: this
+      }, res => {
+        this.modelOptions = []
+        this.modelOptions = res.data
+      })
+    },
+  },
+  mounted () {
+    this.$http.get('sys/dictype/getDicTypeListCode', '', {
+      _this: this
+    }, res => {
+      this.countryOptions = res.data.COUNTRY
+      this.applyCountryOptions = res.data.COUNTRY
+      this.regionOptions = res.data.REGION // 区域
+      this.standStateOptions = res.data.BUSSSTATE
+      this.energyKindOptions = res.data.ENERGYTYPES
+      this.standGeneraOptions = res.data.BUSSBIGCLASS
+      this.standSubclassOptions = res.data.BUSSFINECLASS
+      this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
+      this.standNatureOptions = res.data.SARPROPERTY // 标准性质
+      this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
+      this.standSystemOptions = res.data.TXLBBUSS // 标准体系
+      this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
+      this.categoryOptions = res.data.NYLXCLASS // 能源类型
+      this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
+      this.cysdOptions = res.data.WSCYSD // 我司参与深度
+      this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+      this.txlbOptions = res.data.TXLBCLASS // 体系类别
+      this.qcdwOptions = res.data.QCDW // 起草单位
+      this.qcrOptions = res.data.QCRBUSS // 起草人
+      this.nylxOptions = res.data.NYLXCLASS // 能源类型
+      this.syrzOptions = res.data.SYRZCLASS // 适用认证
+      this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+      this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+      this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
+      this.setMap(this.standStateOptions)
+    })
+    this.busVsFunc()
+    this.modelFunc()
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -58,13 +58,6 @@
 <!--                                              placeholder="请输入标准年份"-->
 <!--                                              clearable></el-input>-->
 <!--                                </el-form-item>-->
-                                <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
-                                    <el-datePicker v-model="form.putTime"
-                                                   :editable="false"
-                                                   placeholder="请选择企标实施日期"
-                                                   value-format="yyyy-MM-dd"
-                                    ></el-datePicker>
-                                </el-form-item>
 <!--                                <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">-->
 <!--                                    <el-datePicker v-model="form.FSRQBUSS"-->
 <!--                                                   :editable="false"-->
@@ -109,11 +102,18 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
+                                <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
-                                    <el-datePicker v-model="form.issueTime"
+                                    <el-datePicker v-model="form.putTime"
                                                    :editable="false"
-                                                   placeholder="请选择发布日期"></el-datePicker>
+                                                   placeholder="请选择企标实施日期"
+                                                   value-format="yyyy-MM-dd"
+                                    ></el-datePicker>
                                 </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"-->
+<!--                                                   placeholder="请选择发布日期"></el-datePicker>-->
+<!--                                </el-form-item>-->
 <!--                                <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">-->
 <!--                                    <el-datePicker v-model="form.FZRQBUSS"-->
 <!--                                                   :editable="false"-->
@@ -262,19 +262,25 @@
                                         ></el-option>
                                     </el-select>
                                 </el-form-item>
+                                <el-form-item label="关联模块--乘用车VPPS中文名称" title="关联模块--乘用车VPPS中文名称" class="add-form-item form-item-disabled">
+                                    <el-input v-model="form.CYCVPPSBMBUSS" readonly="readonly" placeholder="选择VPPS编码" @click.native="choiceZRR2('car', '乘用车VPPS编码', form.CYCVPPSBMBUSS,true)"></el-input>
+                                </el-form-item>
+                                <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
+                                    <el-input v-model="form.KCVPPSBMBUSS" readonly="readonly" placeholder="选择VPPS编码" @click.native="choiceZRR3('struck', '卡车VPPS编码', form.KCVPPSBMBUSS,false)"></el-input>
+                                </el-form-item>
+                                <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">
+                                    <el-input v-model="form.DYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxhbuss', '模块结构单元', form.DYBXHBUSS,false)"></el-input>
+                                </el-form-item>
                                 <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
                                     <el-input v-model="form.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', form.TXLBBUSS)"></el-input>
                                 </el-form-item>
-                                <el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
-                                    <el-input v-model="form.VPPSBMBUSS" placeholder="选择VPPS编码" @click.native="choiceZRR2('VPPSBMBUSS', 'VPPS编码', form.VPPSBMBUSS,false)"></el-input>
-                                </el-form-item>
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
                                     <el-input
                                         v-model="form.QCRBUSS"
+                                        readonly="readonly"
                                         placeholder="选择起草人"
-                                        clearable
                                         @click.native="choiceZRRList('QCRBUSS', '选择起草人', form.QCRBUSS)">
                                     </el-input>
                                 </el-form-item>
@@ -300,8 +306,14 @@
                                         ></el-option>
                                     </el-select>
                                 </el-form-item>
-                                <el-form-item label="模块中文名称" prop="VPPSCNBUSS" class="add-form-item form-item-disabled">
+                                <el-form-item label="关联模块--乘用车vpps中文名称" prop="CYCVPPSCNBUSS" class="add-form-item form-item-disabled">
-                                    <el-input v-model="form.VPPSCNBUSS" placeholder="请输入模块中文名称" clearable :disabled="true"></el-input>
+                                    <el-input v-model="form.CYCVPPSCNBUSS" placeholder="请输入模块中文名称" clearable :disabled="true"></el-input>
+                                </el-form-item>
+                                <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
+                                    <el-input v-model="form.KCVPPSCNBUSS" placeholder="关联模块--卡车VPPS编码" clearable :disabled="true"></el-input>
+                                </el-form-item>
+                                <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+                                    <el-input v-model="form.DYMCBUSS" placeholder="模块结构单元名称" clearable :disabled="true"></el-input>
                                 </el-form-item>
                             </el-col>
                         </el-row>
@@ -478,7 +490,7 @@
                                     <el-form-item prop="bussUser2Name" style="margin-bottom: 0">
                                         <h4>其他起草人</h4>
                                         <div style="margin-top: 10px;width: 300px;">
-                                            <el-input v-model="roleForm.bussUser2Name" readonly="readonly" clearable placeholder="其他起草人" @click.native="choiceZRRList('bussUser2', '选择其他起草人', roleForm.bussUser2)"></el-input>
+                                            <el-input v-model="roleForm.bussUser2Name" readonly="readonly" placeholder="其他起草人" @click.native="choiceZRRList('bussUser2', '选择其他起草人', roleForm.bussUser2)"></el-input>
                                         </div>
                                     </el-form-item>
                                 </el-card>
@@ -971,10 +983,37 @@
             :check-strictly=true
             :modalShowFlag="modalShowFlag2"
             :drawerTitle="drawerTitle"
+            :type="type"
             :url="url"
             :urlChild="urlChild"
             :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
-                :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
+            :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"
+            @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
+    <tree-select-new
+            width="500"
+            :lazy=true
+            :multiple=true
+            :check-strictly=true
+            :modalShowFlag="modalShowFlag3"
+            :drawerTitle="drawerTitle"
+            :url="url"
+            :type="'truck'"
+            :urlChild="urlChild"
+            :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
+            :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"
+            @popoverHideCancel="popoverHideCarVsCancel()"></tree-select-new>
+    <tree-select-module
+            width="500"
+            :lazy=true
+            :multiple=true
+            :check-strictly=true
+            :modalShowFlag="modalShowFlag4"
+            :drawerTitle="drawerTitle"
+            :url="url"
+            :urlChild="urlChild"
+            :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
+            :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"
+            @popoverHideCancel="popoverHideModelCancel()"></tree-select-module>
     </div>
 </template>
 
@@ -986,6 +1025,8 @@
     import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
+    import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
+
     let Base64 = require('js-base64').Base64;
 
     export default {
@@ -995,7 +1036,8 @@
             ProcessFooter,
             ProcessTitle,
             TreeSelect,
-            TreeSelectNew
+            TreeSelectNew,
+            treeSelectModule
         },
         data () {
             const validateZrUserIdName = (rule, value, callback) => {
@@ -1225,6 +1267,12 @@
                     TXLBBUSS: '',
                     VPPSBMBUSS: '',
                     VPPSCNBUSS: '',
+                    KCVPPSBMBUSS: '',
+                    KCVPPSCNBUSS: '',
+                    CYCVPPSBMBUSS: '',
+                    CYCVPPSCNBUSS: '',
+                    DYBXHBUSS: '',
+                    DYMCBUSS: '',
                     // 关联信息
                     DTQBBHBUSS: '',
                     BDTQBBHBUSS: '',
@@ -1433,6 +1481,64 @@
           },
         },
         methods: {
+            popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+                if (checkedData && checkedData.length != 0) {
+                    if (checkedData.length > 0) {
+                        this.form.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
+                        this.form.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
+                    } else {
+                        this.form.CYCVPPSBMBUSS = checkedData.code
+                        this.form.CYCVPPSCNBUSS = checkedData.chineseName
+                    }
+                }else {
+                    this.form.CYCVPPSBMBUSS = ''
+                    this.form.CYCVPPSCNBUSS = ''
+                }
+                this.modalShowFlag2 = false
+                this.$forceUpdate()
+            },
+            popoverHideBusVsCancel(){
+                this.modalShowFlag2 = false
+            },
+            popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+                if (checkedData && checkedData.length != 0) {
+                    if (checkedData.length > 0) {
+                        this.form.KCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
+                        this.form.KCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
+                    } else {
+                        this.form.KCVPPSBMBUSS = checkedData.code
+                        this.form.KCVPPSCNBUSS = checkedData.chineseName
+                    }
+                }else {
+                    this.form.KCVPPSBMBUSS = ''
+                    this.form.KCVPPSCNBUSS = ''
+                }
+                this.modalShowFlag3 = false
+                this.$forceUpdate()
+            },
+            popoverHideCarVsCancel(){
+                this.modalShowFlag3 = false
+            },
+            popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
+                console.log(checkedData)
+                if (checkedData && checkedData.length != 0) {
+                    if (checkedData.length > 0) {
+                        this.form.DYBXHBUSS = checkedData.map(item => item.model).join(",")
+                        this.form.DYMCBUSS = checkedData.map(item => item.name).join(",")
+                    } else {
+                        this.form.DYBXHBUSS = checkedData.model
+                        this.form.DYMCBUSS = checkedData.name
+                    }
+                }else {
+                    this.form.DYBXHBUSS = ''
+                    this.form.DYMCBUSS = ''
+                }
+                this.modalShowFlag4 = false
+                this.$forceUpdate()
+            },
+            popoverHideModelCancel(){
+                this.modalShowFlag4 = false
+            },
             modelProp(row,index){
                 console.log(row)
                 console.log(index)
@@ -1950,13 +2056,13 @@
             },
             choiceZRRList (type, title, id) {
                 this.nodeList2 = []
-                if(type === 'qcUserId'){
+                if(type === 'bussUser2'){
-                    if ( this.roleForm.qcUserId.length > 0) {
+                    if ( this.roleForm.bussUser2.length > 0) {
-                        this.nodeList2 = this.roleForm.qcUserId.split(',')
+                        this.nodeList2 = this.roleForm.bussUser2.split(',')
                     }
-                }else if(type === 'hqUserId'){
+                }else if(type === 'bussUser5'){
-                    if ( this.roleForm.hqUserId.length > 0) {
+                    if ( this.roleForm.bussUser5.length > 0) {
-                        this.nodeList2 = this.roleForm.hqUserId.split(',')
+                        this.nodeList2 = this.roleForm.bussUser5.split(',')
                     }
                 }else if(type === 'QCRBUSS'){
                     if ( this.form.QCRBUSSID.length > 0) {
@@ -2027,14 +2133,15 @@
                 this.modalShowFlag1 = true
                 this.key++
             },
-            choiceZRR2 (type, title, id) {
+            choiceZRR2 (type, title, id,flag) {
                 this.drawerTitle = title
                 this.modalShowFlag2 = true
+                this.multipleFlag2 = flag
                 this.url = ''
                 this.urlChild = ''
+                this.type = type
                 this.url="sarVppsTree/list"
                 this.urlChild="sarVppsTree/childByList"
-                this.key1++
             },
             choiceZRR3 (type, title, id) {
                 this.drawerTitle = title
@@ -2043,7 +2150,6 @@
                 this.urlChild = ''
                 this.url="sarVppsTree/list"
                 this.urlChild="sarVppsTree/childByList"
-                this.key2++
             },
             choiceZRR4 (type, title, id) {
                 this.drawerTitle = title
@@ -2052,7 +2158,6 @@
                 this.urlChild = ''
                 this.url="sarModelTree/list"
                 this.urlChild="sarModelTree/childByList"
-                this.key3++
             },
             getTree () {
                 this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
@@ -2372,19 +2477,6 @@
                 this.form.QCDWID = idList
 
             },
-            popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData) {
-                    if(checkedData.length > 0){
-                        this.form.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
-                        this.form.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
-                    }else {
-                        this.form.VPPSBMBUSS = checkedData.code
-                        this.form.VPPSCNBUSS = checkedData.chineseName
-                    }
-                }
-                this.modalShowFlag2 = false
-                this.$forceUpdate()
-            },
             popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
                 if(checkedData) {
                     if(checkedData.length > 0){
@@ -2399,54 +2491,6 @@
             popoverHideCancel(){
               this.modalShowFlag1  = false
             },
-            popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData && checkedData.length != 0) {
-                    if(checkedData.length > 0 && checkedData.length != 0){
-                        this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
-                        this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
-                    }else {
-                        this.form.cycvppsbm = checkedData.code
-                        this.form.cycvppscn = checkedData.chineseName
-                    }
-                    this.modalShowFlag2 = false
-                }
-
-            },
-            popoverHideBusVsCancel(){
-              this.modalShowFlag2 = false
-            },
-            popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData && checkedData.length != 0) {
-                    if(checkedData.length > 0){
-                        this.form.kccvppsbm = checkedData.map(item => item.code).join(",")
-                        this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",")
-                    }else {
-                        this.form.kccvppsbm = checkedData.code
-                        this.form.kccvppscn = checkedData.chineseName
-                    }
-                    this.modalShowFlag3 = false
-
-                }
-            },
-            popoverHideCarVsCancel(){
-                this.modalShowFlag3 = false
-            },
-            popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData && checkedData.length != 0) {
-                    if(checkedData.length > 0){
-                        this.form.dybxh = checkedData.map(item => item.model).join(",")
-                        this.form.dymc = checkedData.map(item => item.name).join(",")
-                    }else {
-                        this.form.dybxh = checkedData.model
-                        this.form.dymc = checkedData.name
-                    }
-                        this.modalShowFlag4 = false
-                }
-
-            },
-               popoverHideModelCancel(){
-                this.modalShowFlag4 = false
-            },
             closeDrawer() {
                 this.ListModel = false
             },

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

@@ -2225,7 +2225,6 @@
                             this.form.footFileName=this.footFileList.map(item => item.name).join(",")
                             this.isSubmit = true
                             this.saveLoading = true
-                            // 会签意见存储
                             const infoList = []
                             const info = {}
                             info.footFile = this.form.footFile

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

@@ -1650,8 +1650,20 @@
                 }
             },
             choiceZRRList (type, title, id) {
-                this.nodeList = []
+                this.nodeList2 = []
-                this.nodeList.push(id)
+                if(type === 'bussUser2'){
+                    if ( this.roleForm.bussUser2.length > 0) {
+                        this.nodeList2 = this.roleForm.bussUser2.split(',')
+                    }
+                }else if(type === 'bussUser5'){
+                    if ( this.roleForm.bussUser5.length > 0) {
+                        this.nodeList2 = this.roleForm.bussUser5.split(',')
+                    }
+                }else if(type === 'QCRBUSS'){
+                    if ( this.form.QCRBUSSID.length > 0) {
+                        this.nodeList2 = this.form.QCRBUSSID.split(',')
+                    }
+                }
                 this.userType = type
                 this.drawerTitle = title
                 this.modalShowRoleFlag = true

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

@@ -31,11 +31,47 @@
                 <div>
                     <el-collapse accordion v-model="activeName">
                         <el-collapse-item title="会签意见" name = "1">
-                            <div style="margin: 10px 0;">
+                            <div style="margin: 0;">
                                 <el-form
                                         ref="formTongGuo"
                                         :model="formTongGuo"
                                         :rules="rules">
+                                    <!--                    <el-form-item-->
+                                    <!--                        prop="approvalOpinion"-->
+                                    <!--                    >-->
+                                    <!--                      <el-select @change="getRule" v-model="formTongGuo.approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">-->
+                                    <!--                        <el-option label="驳回" value="1"></el-option>-->
+                                    <!--                        <el-option label="通过" value="0"></el-option>-->
+                                    <!--                      </el-select>-->
+                                    <!--                    </el-form-item>-->
+                                    <el-form-item label="会签意见文件" prop="summaryName" class="add-form-item form-item-disabled">
+                                        <el-input
+                                                disabled
+                                                style="display: none;"
+                                                v-model="form.summaryName"
+                                                clearable
+                                        ></el-input>
+                                        <div style="display: flex;justify-content: left;margin-top: 5px;padding-left: 20px;">
+                                            <div style="width: 30%;">
+                                                <div v-for="(item,index) in summaryList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+                                                    <span style="width: 80%;" @click="handleFilePreview2(item,'preview')">{{ item.name }}</span>
+                                                    <span style="width: 20%;margin-left: 15px;">
+                                                    <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview2(item,'down')"></el-button>
+                                                </span>
+                                                </div>
+                                            </div>
+                                            <div style="width: 20%;">
+                                                <el-button
+                                                        type="primary"
+                                                        class="common-button-primary"
+                                                        size="mini"
+                                                        style="margin-top: 6px; float: left;"
+                                                        @click="fileUpload('summary')">
+                                                    <i class="el-icon-upload"></i>
+                                                </el-button>
+                                            </div>
+                                        </div>
+                                    </el-form-item>
                                     <el-form-item
                                             prop="commentText"
                                     >
@@ -659,6 +695,7 @@
                 prcName: this.$route.query.prcName,
                 detailData: [],
                 fileList: [],
+                summaryList: [],
                 FBGBUSSFileList: [],
                 BZSMBUSSFileList: [],
                 LSBBBUSSFileList: [],
@@ -1335,6 +1372,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.summaryList=this.assemble(mes.summary,mes.summaryName);
                         this.roleForm = mes.roleForm
                         this.commentText = mes.commentText
                     })
@@ -1958,22 +1996,33 @@
                 //   this.fileList = fileList.splice(0, 1)
                 // }
                 if (response.ok) {
-
+                    const fileObj = {}
+                    fileObj.id = file.response.data.id
+                    fileObj.name = file.response.data.name
                     switch (this.fileType){
                         case 'FBGBUSS':
-                            this.FBGBUSSFileList = fileList
+                            this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined);
+                            this.FBGBUSSFileList.push(fileObj)
                             break;
                         case 'BZSMBUSS' :
-                            this.BZSMBUSSFileList = fileList
+                            this.BZSMBUSSFileList = this.BZSMBUSSFileList.filter ( item => item.response === undefined);
+                            this.BZSMBUSSFileList.push(fileObj)
                             break;
                         case 'LSBBBUSS':
-                            this.LSBBBUSSFileList = fileList
+                            this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
+                            this.LSBBBUSSFileList.push(fileObj)
                             break;
                         case 'GLWJLAWS':
-                            this.QTWJBUSSFileList = fileList
+                            this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
+                            this.GLWJLAWSFileList.push(fileObj)
                             break;
                         case 'GLWJBUSS':
-                            this.GLWJBUSSFileList = fileList
+                            this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
+                            this.GLWJBUSSFileList.push(fileObj)
+                            break;
+                        case 'summary':
+                            this.summaryList = this.summaryList.filter ( item => item.response === undefined);
+                            this.summaryList.push(fileObj)
                             break;
                         default : ;
                     }
@@ -2010,6 +2059,9 @@
                     case 'GLWJBUSS':
                         this.fileList=this.GLWJBUSSFileList
                         break;
+                    case 'summary':
+                        this.fileList=this.summaryList
+                        break;
                     default : ;
                 }
                 this.fileMadel = true;
@@ -2033,6 +2085,9 @@
                     case 'GLWJBUSS':
                         this.GLWJBUSSFileList = fileList
                         break;
+                    case 'summary':
+                        this.summaryList = fileList
+                        break;
                     default : ;
                 }
             },
@@ -2134,6 +2189,8 @@
                 // if(item.country !== undefined && item.country !== null){
                 //   this.sarStandardsInfoEO.country = item.country.split(",");
                 // }
+                this.summary=this.summaryList.map(item => item.id).join(",")
+                this.summaryName=this.summaryList.map(item => item.name).join(",")
 
                 this.saveLoading = true
                 let _formData = new FormData()
@@ -2266,14 +2323,22 @@
                                 if (valid) {
                                     this.isSubmit = true
                                     this.saveLoading = true
+
+                                    this.summary=this.summaryList.map(item => item.id).join(",")
+                                    this.summaryName=this.summaryList.map(item => item.name).join(",")
+
                                     this.form.commentText = this.formTongGuo.commentText
                                     this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                                     // 会签意见存储
                                     const infoList = []
+                                    const maryList=this.assemble(this.summary,this.summaryName);
                                     const info = {}
                                     info.userId = this.userId
                                     info.userName = this.userName
                                     info.commentText = this.formTongGuo.commentText
+                                    info.summary = this.summary
+                                    info.summaryName = this.summaryName
+                                    info.summaryList = maryList
                                     infoList.push(info)
                                     this.form.infoList = infoList
                                     const json = JSON.stringify(this.form);
@@ -2397,6 +2462,8 @@
                                 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.summaryList=this.assemble(processForm.summary,processForm.summaryName);
+
                             }
                         }).catch(e => {
                         })

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

@@ -1655,8 +1655,20 @@
                 }
             },
             choiceZRRList (type, title, id) {
-                this.nodeList = []
+                this.nodeList2 = []
-                this.nodeList.push(id)
+                if(type === 'bussUser2'){
+                    if ( this.roleForm.bussUser2.length > 0) {
+                        this.nodeList2 = this.roleForm.bussUser2.split(',')
+                    }
+                }else if(type === 'bussUser5'){
+                    if ( this.roleForm.bussUser5.length > 0) {
+                        this.nodeList2 = this.roleForm.bussUser5.split(',')
+                    }
+                }else if(type === 'QCRBUSS'){
+                    if ( this.form.QCRBUSSID.length > 0) {
+                        this.nodeList2 = this.form.QCRBUSSID.split(',')
+                    }
+                }
                 this.userType = type
                 this.drawerTitle = title
                 this.modalShowRoleFlag = true

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

@@ -2335,7 +2335,7 @@
                     let year = date.getFullYear();
                     this.form.standSn = standSn
                     this.form.standNumber = standSn
-                    this.form.standYear = year + ' X'
+                    this.form.standYear = this.form.reviseStatus === '1' ? year : (year + ' X') // 待带入立项标准
                     this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
                 }, e => {
                 })

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue

@@ -12,7 +12,7 @@
         ></el-input>
       </el-form-item>
       <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-        <el-select v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
+        <el-select v-model="qbfsForm.bussSort"  filterable placeholder="请选择企标类别" style="width: 100%;">
           <el-option
             v-for="(item, index) in standSortOptions"
             :key="index"

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue

@@ -54,7 +54,7 @@
               ></el-input>
             </el-form-item>
             <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-              <el-select v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
+              <el-select v-model="qbfsForm.bussSort"  filterable placeholder="请选择企标类别" style="width: 100%;">
                 <el-option
                   v-for="(item, index) in standSortOptions"
                   :key="index"

src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue

@@ -15,65 +15,42 @@
         </ProcessTitle>
         <div class="content_form">
           <el-form class="label-input-form" ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="90px">
-            <el-row :gutter="24">
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="会议名称:">
                   {{ ch_pageData.meetingName || '-' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="主办单位:">
                   {{ ch_pageData.primaryUnit || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="协会名称:">
-                  {{ ch_pageData.associaName || '-' }}
+                  <span
+                    v-for="item in ch_pageData.associaOptionsOne"
+                    :key="item.id"
+                    v-if="item.id === ch_pageData.associaName">
+                    {{ item.name || '-'}}
+                  </span>
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="会议时间:">
                   {{ ch_pageData.meetingStartTime || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="会议地点:">
                   {{ ch_pageData.meetingPlace || '-' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="费用标准:">
                   {{ ch_pageData.feeStand || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="费用列支:">
                   {{ ch_pageData.feeKind || '-' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
                   <span v-if="uploadFileLength < 1">{{ '-' }}</span>
                   <span v-for="item in ch_pageData.fileTextList" :key="item.id" @click="previews(item.id)">
                     {{ item.name }} {{ ';' }}
                    </span>
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="类别:">
                   <span v-if="ch_pageData.sort === '1'">计划内</span>
                   <span v-else>计划外</span>
                 </el-form-item>
-              </el-col>
-            </el-row>
             <el-form-item class="add-form-item" label-width="0px">
               <el-table
                     class="meeting_table"
@@ -91,7 +68,7 @@
             <ProcessTitle>
               <template slot="title">选择人员</template>
             </ProcessTitle>
-            <el-form-item class="add-form-item" label="入会人员:">
+            <el-form-item class="add-form-item" label="参会人员:" prop="meetingInRoleId">
               <el-input v-model="ch_pageData.meetingInRoleId" style="display: none;"></el-input>
               <el-input
                 placeholder="请选择参会人员"
@@ -170,7 +147,9 @@ export default {
         fillLeader: '',
         fillFile: '',
       },
-      ch_rules: {},
+      ch_rules: {
+        meetingInRoleId: [{required: true, message: "请选择参会人员", trigger: ['blur', 'change']}]
+      },
       nodeList: [],
       modalshowflag: false,
       commentText: '',
@@ -314,6 +293,9 @@ export default {
   .prc-content-border {
     overflow: auto;
   }
+  /deep/.el-form-item__content {
+    margin-top: 5px;
+  }
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }

src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue

@@ -15,65 +15,42 @@
         </ProcessTitle>
         <div class="content_form">
           <el-form class="label-input-form" ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="90px">
-            <el-row :gutter="24">
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="会议名称:">
                   {{ ch_pageData.meetingName || '-' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="主办单位:">
                   {{ ch_pageData.primaryUnit || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="协会名称:">
-                  {{ ch_pageData.associaName || '-' }}
+                  <span
+                    v-for="item in ch_pageData.associaOptionsOne"
+                    :key="item.id"
+                    v-if="item.id === ch_pageData.associaName">
+                    {{ item.name || '-'}}
+                  </span>
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="会议时间:">
                   {{ ch_pageData.meetingStartTime || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="会议地点:">
                   {{ ch_pageData.meetingPlace || '-' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="费用标准:">
                   {{ ch_pageData.feeStand || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="费用列支:">
                   {{ ch_pageData.feeKind || '-' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
                   <span v-if="uploadFileLength < 1">{{ '-' }}</span>
                   <span v-for="item in ch_pageData.fileTextList" :key="item.id" @click="previews(item.id)">
                     {{ item.name }} {{ ';' }}
                    </span>
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="类别:">
                   <span v-if="ch_pageData.sort === '1'">计划内</span>
                   <span v-else>计划外</span>
                 </el-form-item>
-              </el-col>
-            </el-row>
             <el-form-item class="add-form-item" label="议题:">
               <el-table
                 class="meeting_table"
@@ -285,6 +262,9 @@ export default {
   .prc-content-border {
     overflow: auto;
   }
+  /deep/.el-form-item__content {
+    margin-top: 5px;
+  }
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }

src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue

@@ -17,65 +17,42 @@
         </ProcessTitle>
         <div class="content_form">
           <el-form class="label-input-form" ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="90px">
-            <el-row :gutter="24">
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="会议名称:">
                   {{ ch_pageData.meetingName || '-' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="主办单位:">
                   {{ ch_pageData.primaryUnit || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="协会名称:">
-                  {{ ch_pageData.associaName || '-' }}
+                 <span
+                   v-for="item in ch_pageData.associaOptionsOne"
+                   :key="item.id"
+                   v-if="item.id === ch_pageData.associaName">
+                    {{ item.name || '-'}}
+                  </span>
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="会议时间:">
                   {{ ch_pageData.meetingStartTime || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="会议地点:">
                   {{ ch_pageData.meetingPlace || '-' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="费用标准:">
                   {{ ch_pageData.feeStand || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="费用列支:">
                   {{ ch_pageData.feeKind || '-' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="上传附件:" prop="uploadFile">
                   <span v-if="uploadFileLength < 1">{{ '-' }}</span>
                   <span v-for="item in ch_pageData.fileTextList" :key="item.id" @click="previews(item.id)">
                     {{ item.name }} {{ ';' }}
                    </span>
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="24">
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="类别:">
                   <span v-if="ch_pageData.sort === '1'">计划内</span>
                   <span v-else>计划外</span>
                 </el-form-item>
-              </el-col>
-            </el-row>
             <el-form-item class="add-form-item" label="议题:">
               <el-table
                 class="meeting_table"
@@ -348,6 +325,9 @@ export default {
   .prc-content-border {
     overflow: auto;
   }
+  /deep/.el-form-item__content {
+    margin-top: 5px;
+  }
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }

src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue

@@ -15,64 +15,41 @@
         </ProcessTitle>
         <div class="content_form">
           <el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" label-width="90px" :rules="rh_rules">
-            <el-row>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="协会名称:">
-                  {{ rh_pageData.comityName || '-' }}
+                  <span
+                    v-for="item in rh_pageData.comityOptionsOne"
+                    :key="item.id"
+                    v-if="item.id === rh_pageData.comityName">
+                    {{ item.name || '-'}}
+                  </span>
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="协会状态:" prop="comityState">
                   {{ rh_pageData.comityState || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="入会性质:" prop="comityKind">
                   {{ rh_pageData.comityKind || '-' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="资质:">
                   {{ rh_pageData.comityMake.makeQualification || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="成员:">
                   {{ rh_pageData.comityMake.makeRole || '' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="费用估计:">
                   {{ rh_pageData.comityMake.makeCost || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="职责:">
                   {{ rh_pageData.comityMake.makeDuties || '-' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="任期:">
                   {{ rh_pageData.comityMake.makeTime || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
                 <el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
                   <span v-if="infoSourcesLength === 0">{{ '-' }}</span>
                   <span v-for="item in rh_pageData.infoSources" :key="item.id" @click="previews(item.id)">
                     {{ item.name }} {{ ';' }}
                    </span>
                 </el-form-item>
-              </el-col>
-            </el-row>
             <el-form-item class="add-form-item" label="工作方向:" prop="workPath">
               <el-input v-model="rh_pageData.workPath" type="textarea" readonly style="width: 50%;height: auto"></el-input>
             </el-form-item>
@@ -95,7 +72,7 @@
             <ProcessTitle>
               <template slot="title">选择人员</template>
             </ProcessTitle>
-            <el-form-item class="add-form-item" label="入会人员:">
+            <el-form-item class="add-form-item" label="入会人员:" prop="comityOpRoleId">
               <el-input v-model="rh_pageData.comityOpRoleId" style="display: none;"></el-input>
               <el-input
                 placeholder="请选择入会成员"
@@ -182,7 +159,9 @@ export default {
         comityOpRole: '',
         comityInRoleId: '',
       },
-      roleForm: {},
+      roleForm: {
+        comityOpRoleId: [{required: true, message: "请选择入会人员", trigger: ['blur', 'change']}]
+      },
       commentText: '',
       roleShowflag: false,
       nodeList: [],
@@ -324,6 +303,9 @@ export default {
   .prc-content-border {
     overflow: auto;
   }
+  /deep/.el-form-item__content {
+    margin-top: 5px;
+  }
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }

src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue

@@ -15,64 +15,41 @@
         </ProcessTitle>
         <div class="content_form">
           <el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" label-width="90px" :rules="rh_rules">
-            <el-row>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="协会名称:">
-                  {{ rh_pageData.comityName || '-' }}
+                  <span
+                    v-for="item in rh_pageData.comityOptionsOne"
+                    :key="item.id"
+                    v-if="item.id === rh_pageData.comityName">
+                    {{ item.name || '-'}}
+                  </span>
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="协会状态:" prop="comityState">
                   {{ rh_pageData.comityState || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="入会性质:" prop="comityKind">
                   {{ rh_pageData.comityKind || '-' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="资质:">
                   {{ rh_pageData.comityMake.makeQualification || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="成员:">
                   {{ rh_pageData.comityMake.makeRole || '' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="费用估计:">
                   {{ rh_pageData.comityMake.makeCost || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="职责:">
                   {{ rh_pageData.comityMake.makeDuties || '-' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="任期:">
                   {{ rh_pageData.comityMake.makeTime || '-' }}
                 </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
                 <el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
                   <span v-if="infoSourcesLength === 0">{{ '-' }}</span>
                   <span v-for="item in rh_pageData.infoSources" :key="item.id" @click="previews(item.id)">
                     {{ item.name }} {{ ';' }}
                    </span>
                 </el-form-item>
-              </el-col>
-            </el-row>
             <el-form-item class="add-form-item" label="工作方向:" prop="workPath">
               <el-input v-model="rh_pageData.workPath" type="textarea" :disabled="true" style="width: 50%;height: auto"></el-input>
             </el-form-item>
@@ -327,6 +304,9 @@ export default {
   .prc-content-border {
     overflow: auto;
   }
+  /deep/.el-form-item__content {
+    margin-top: 5px;
+  }
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }

src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue

@@ -17,64 +17,45 @@
         </ProcessTitle>
         <div class="content_form">
           <el-form class="label-input-form" ref="rh_pageData" :model="rh_pageData" label-width="90px" :rules="rh_rules">
-            <el-row>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="协会名称:">
-                  {{ rh_pageData.comityName || '-' }}
+                  <span
+                    v-for="item in rh_pageData.comityOptionsOne"
+                    :key="item.id"
+                    v-if="item.id === rh_pageData.comityName">
+                    {{ item.name || '-'}}
+                  </span>
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="协会状态:" prop="comityState">
                   {{ rh_pageData.comityState || '-' }}
                 </el-form-item>
-              </el-col>
+
-            </el-row>
-            <el-row>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="入会性质:" prop="comityKind">
                   {{ rh_pageData.comityKind || '-' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="资质:">
                   {{ rh_pageData.comityMake.makeQualification || '-' }}
                 </el-form-item>
-              </el-col>
+
-            </el-row>
-            <el-row>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="成员:">
                   {{ rh_pageData.comityMake.makeRole || '' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="费用估计:">
                   {{ rh_pageData.comityMake.makeCost || '-' }}
                 </el-form-item>
-              </el-col>
+
-            </el-row>
-            <el-row>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="职责:">
                   {{ rh_pageData.comityMake.makeDuties || '-' }}
                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
                 <el-form-item class="add-form-item" label="任期:">
                   {{ rh_pageData.comityMake.makeTime || '-' }}
                 </el-form-item>
-              </el-col>
+
-            </el-row>
-            <el-row>
-              <el-col :span="24">
                 <el-form-item class="add-form-item" label="信息来源:" prop="infoSources">
                   <span v-if="infoSourcesLength < 1">{{ '-' }}</span>
                   <span v-for="item in rh_pageData.infoSources" :key="item.id" @click="previews(item.id)">
                     {{ item.name }} {{ ';' }}
                    </span>
                 </el-form-item>
-              </el-col>
-            </el-row>
             <el-form-item class="add-form-item" label="工作方向:" prop="workPath">
               <el-input v-model="rh_pageData.workPath" readonly type="textarea" style="width: 50%;height: auto"></el-input>
             </el-form-item>
@@ -340,6 +321,9 @@ export default {
   .prc-content-border {
     overflow: auto;
   }
+  /deep/.el-form-item__content {
+    margin-top: 5px;
+  }
   /deep/.prc-content-border .el-form-item__content {
     width: 270px;
   }

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

@@ -15,22 +15,26 @@
           ref="qbkwForm"
           :model="form"
           class="label-input-form"
-          label-width="210px"
+          label-width="180px"
         >
           <ProcessTitle>
             <template slot="title">基础信息</template>
           </ProcessTitle>
           <div class="prc-content-border">
-            <el-row :gutter="24">
-              <el-col :span="12">
             <el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled">
               <el-radio-group v-model="form.standInData" disabled>
                 <el-radio label="0">国内标准入库</el-radio>
                 <el-radio label="1">海外标准入库</el-radio>
               </el-radio-group>
             </el-form-item>
-
+            <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
-
+              <el-input
+                disabled
+                v-model="form.standNumber"
+                placeholder="请输入标准编号"
+                clearable
+              ></el-input>
+            </el-form-item>
             <el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
               <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple disabled>
                 <el-option
@@ -84,16 +88,7 @@
                 <el-radio label="2">否</el-radio>
               </el-radio-group>
             </el-form-item>
-              </el-col>
+
-              <el-col :span="12">
-                <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
-                  <el-input
-                    disabled
-                    v-model="form.standNumber"
-                    placeholder="请输入标准编号"
-                    clearable
-                  ></el-input>
-                </el-form-item>
             <el-form-item v-show="form.standInData === '0'" label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
               <el-select v-model="form.standNature" placeholder="请选择标准性质" disabled>
                 <el-option
@@ -142,50 +137,36 @@
                 clearable
               ></el-input>
             </el-form-item>
-              </el-col>
-            </el-row>
           </div>
           <ProcessTitle>
             <template slot="title">实施日期</template>
           </ProcessTitle>
           <div class="prc-content-border">
-            <el-row :gutter="24">
-              <el-col :span="12">
             <cus-tom-data-picker-group
-                  :key="'ssrq'"
               :config="{attrName:'实施日期(标准文本)',attrField:'ssrq'}"
               v-model="form.ssrq"
               :disabled="true"
             ></cus-tom-data-picker-group>
             <cus-tom-data-picker-group
-                  :key="'zccssrq'"
               :config="{attrName:'在产车实施日期(标准文本)',attrField:'zccssrq'}"
               v-model="form.zccssrq"
               :disabled="true"
             ></cus-tom-data-picker-group>
-              </el-col>
-              <el-col :span="12">
             <cus-tom-data-picker-group
-                  :key="'zccssrq'"
               :config="{attrName:'新车型实施日期(标准文本)',attrField:'xcxssrq'}"
               v-model="form.xcxssrq"
               :disabled="true"
             ></cus-tom-data-picker-group>
-              </el-col>
-            </el-row>
           </div>
           <ProcessTitle>
             <template slot="title">文本信息</template>
           </ProcessTitle>
           <div class="prc-content-border">
 
-
-            <el-row :gutter="24">
-              <el-col :span="12">
             <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
               <div v-if="xgdFileMap.length>0" v-for="(value,index)  in this.xgdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('xgd',value.id)">
                 <!-- {{ value.name }} -->
-                    {{value.name}}
+                {{ value.name }}
               </div>
               <div v-else>
                 - -
@@ -193,7 +174,7 @@
             </el-form-item>
             <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
               <div v-if="fbgbjbdFileMap.length>0" v-for="(value,index)  in this.fbgbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('fbgbjbd',value.id)">
-                    {{value.name}}
+                {{ value.name }}
               </div>
               <div v-else>
                 - -
@@ -201,7 +182,7 @@
             </el-form-item>
             <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
               <div v-if="zbjbdFileMap.length>0" v-for="(value,index)  in this.zbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd',value.id)">
-                    {{value.name}}
+                {{ value.name }}
               </div>
               <div v-else>
                 - -
@@ -209,7 +190,7 @@
             </el-form-item>
             <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
               <div v-if="ssgFileMap.length>0" v-for="(value,index)  in this.ssgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg',value.id)">
-                    {{value.name}}
+                {{ value.name }}
               </div>
               <div v-else>
                 - -
@@ -217,17 +198,16 @@
             </el-form-item>
             <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
               <div v-if="caFileMap.length>0" v-for="(value,index)  in this.caFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca',value.id)">
-                    {{value.name}}
+                {{ value.name }}
               </div>
               <div v-else>
                 - -
               </div>
             </el-form-item>
-              </el-col>
+
-              <el-col :span="12">
             <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
               <div v-if="kwjFileMap.length>0" v-for="(value,index)  in this.kwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj',value.id)">
-                    {{value.name}}
+                {{ value.name }}
               </div>
               <div v-else>
                 - -
@@ -237,7 +217,7 @@
             <el-form-item v-if="form.standInData === '0'" label="相关文件" prop="jdwjName" class="add-form-item form-item-disabled">
               <!--          ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
               <div v-if="jdwjFileMap.length>0" v-for="(value,index)  in this.jdwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj',value.id)">
-                    {{value.name}}
+                {{ value.name }}
               </div>
               <div v-else>
                 - -
@@ -245,7 +225,7 @@
             </el-form-item>
             <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
               <div v-if="bpgFileMap.length>0" v-for="(value,index)  in this.bpgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg',value.id)">
-                    {{value.name}}
+                {{ value.name }}
               </div>
               <div v-else>
                 - -
@@ -253,21 +233,17 @@
             </el-form-item>
             <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
               <div v-if="zqyjgFileMap.length>0" v-for="(value,index)  in this.zqyjgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg',value.id)">
-                    {{value.name}}
+                {{ value.name }}
               </div>
               <div v-else>
                 - -
               </div>
             </el-form-item>
-              </el-col>
-            </el-row>
           </div>
           <ProcessTitle>
             <template slot="title">适用范围</template>
           </ProcessTitle>
           <div class="prc-content-border">
-            <el-row :gutter="24">
-              <el-col :span="12">
             <!-- <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
                <el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple disabled>
                  <el-option
@@ -301,15 +277,36 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-                <el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
+            <el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" label-width="190px" class="add-form-item form-item-disabled">
               <el-input v-model="form.cycvppsbm" disabled></el-input>
             </el-form-item>
             <el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
               <el-input v-model="form.kccvppsbm" disabled></el-input>
             </el-form-item>
+            <el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" label-width="210px" class="add-form-item form-item-disabled">
+              <el-input
+                v-model="form.cycvppscn"
+                disabled
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="关联模块--卡车vpps中文名称" prop="kccvppscn" label-width="210px" class="add-form-item form-item-disabled">
+              <el-input
+                v-model="form.kccvppscn"
+                disabled
+                clearable
+              ></el-input>
+            </el-form-item>
             <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
               <el-input v-model="form.dybxh" disabled></el-input>
             </el-form-item>
+            <el-form-item label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
+              <el-input
+                v-model="form.dymc"
+                disabled
+                clearable
+              ></el-input>
+            </el-form-item>
             <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
               <el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门" disabled>
                 <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
@@ -337,8 +334,6 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-              </el-col>
-              <el-col :span="12">
             <el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
               <el-select v-model="form.sycpx" placeholder="请选择适用产品线" multiple disabled>
                 <el-option
@@ -372,38 +367,17 @@
                  ></el-option>
                </el-select>
              </el-form-item>-->
-                <el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled">
-                  <el-input
-                    v-model="form.cycvppscn"
-                    disabled
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="关联模块--卡车vpps中文名称" prop="kccvppscn" class="add-form-item form-item-disabled">
-                  <el-input
-                    v-model="form.kccvppscn"
-                    disabled
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
-                  <el-input
-                    v-model="form.dymc"
-                    disabled
-                    clearable
-                  ></el-input>
-                </el-form-item>
             <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
-                  <span>{{form.wssmr}}</span>
+              <span>{{ form.wssmr }}</span>
-                  <!--                                    <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>-->
+              <!--<el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>
-                  <!--                                        <el-option-->
+                <el-option
-                  <!--                                                v-for="item in wssmrOptions"-->
+                  v-for="item in wssmrOptions"
-                  <!--                                                placeholder="请选择"-->
+                  placeholder="请选择"
-                  <!--                                                :key="item.value"-->
+                  :key="item.value"
-                  <!--                                                :value="item.value"-->
+                  :value="item.value"
-                  <!--                                                :label="item.label"-->
+                  :label="item.label"
-                  <!--                                        ></el-option>-->
+                ></el-option>
-                  <!--                                    </el-select>-->
+              </el-select>-->
             </el-form-item>
             <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
               <el-select v-model="form.cysd" placeholder="请选择我司参与深度" disabled>
@@ -416,15 +390,11 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-              </el-col>
-            </el-row>
           </div>
           <ProcessTitle>
             <template slot="title">关联信息</template>
           </ProcessTitle>
           <div class="prc-content-border">
-            <el-row :gutter="24">
-              <el-col :span="12">
             <el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
               <el-input
                 disabled
@@ -440,14 +410,12 @@
             </el-form-item>
             <el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
               <div v-if="glwjFileMap.length>0" v-for="(value,index)  in this.glwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj',value.id)">
-                    {{value.name}}
+                {{ value.name }}
               </div>
               <div v-else>
                 - -
               </div>
             </el-form-item>
-              </el-col>
-              <el-col :span="12">
             <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
               <el-input
                 disabled
@@ -472,27 +440,17 @@
                 clearable
               ></el-input>
             </el-form-item>
-              </el-col>
-            </el-row>
           </div>
         </el-form>
       </div>
       <div>
         <el-collapse accordion v-model="activeName">
-          <el-collapse-item title="审批意见" name = "1">
+          <el-collapse-item title="审批意见" name="1">
             <div style="margin: 10px 0;">
               <el-form
                 ref="formTongGuo"
                 :model="formTongGuo"
                 :rules="rules">
-                <!--                    <el-form-item-->
-                <!--                        prop="approvalOpinion"-->
-                <!--                    >-->
-                <!--                      <el-select @change="getRule" v-model="formTongGuo.approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">-->
-                <!--                        <el-option label="驳回" value="1"></el-option>-->
-                <!--                        <el-option label="通过" value="0"></el-option>-->
-                <!--                      </el-select>-->
-                <!--                    </el-form-item>-->
                 <el-form-item
                   prop="commentText"
                 >
@@ -544,14 +502,19 @@
 import ProcessHeaderPhone from '../../components/ProcessHeaderPhone'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process'
+import {inboundLiaisonDetail, processCreateStand, changeAssigneeNew} from 'api/process'
 import TreeSelect from '@/components/treeSelect/treeSelect.vue';
 import CusTomDataPickerGroup
   from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
+import Vue from 'vue';
+import { Form } from 'vant';
+import { Field } from 'vant';
 
+Vue.use(Form);
+Vue.use(Field);
 export default {
   name: "phoneBzrkStep2",
-  data () {
+  data() {
     return {
       xgdFileMap: [],
       fbgbjbdFileMap: [],
@@ -568,7 +531,7 @@ export default {
       drawerModal: false,
       drawerTitle: '',
       nodeList: [],
-      selectPeople:'',
+      selectPeople: '',
       xgdFileId: '',
       fbgbjbdFileId: '',
       bpgFileId: '',
@@ -578,16 +541,16 @@ export default {
       kwjFileId: '',
       glwjFileId: '',
       caFileId: '',
-      zbjbdFileId:'',
+      zbjbdFileId: '',
       rules: {
-        commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
+        commentText: [{required: true, message: '请输入意见', trigger: 'blur'}],
-        approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }]
+        approvalOpinion: [{required: true, message: '请选择审批意见', trigger: 'change'}]
       },
-      activeName:'1',
+      activeName: '1',
       // 当前流程类型(1待办/2已办)
       processType: 1,
       detailData: [],
-      userId:this.$store.getters.userInfo.userId,
+      userId: this.$store.getters.userInfo.userId,
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
       formTongGuo: {
@@ -677,17 +640,17 @@ export default {
         xglc: '', // 相关流程
         chjl: '', // 参会记录
         //流程信息
-        prcNum:'',
+        prcNum: '',
-        commentText:'',
+        commentText: '',
-        prcName:'',
+        prcName: '',
         standType: '',
       }, // 标准信息
       nodeKeyCode: 'code',
       nodeKeyModel: 'model',
-      key:1,
+      key: 1,
-      key1:2,
+      key1: 2,
-      key2:3,
+      key2: 3,
-      key3:4,
+      key3: 4,
       defaultCheckedKeys1: [],
       defaultCheckedKeys2: [],
       defaultCheckedKeys3: [],
@@ -699,7 +662,7 @@ export default {
         children: 'children',
         label: 'model'
       },
-      countryOptions:[],//国家地区
+      countryOptions: [],//国家地区
       busVppsOptions: [], // 车系体系架构
       modelOptions: [], // 模块体系架构
       standSortOptions: [], // 标准类别
@@ -726,8 +689,8 @@ export default {
       user4: '',
       user5: '',
       // 流程路由信息
-      prcNum : this.$route.query.prcNum,
+      prcNum: this.$route.query.prcNum,
-      prcName : this.$route.query.prcName,
+      prcName: this.$route.query.prcName,
     }
   },
   components: {
@@ -738,11 +701,11 @@ export default {
     TreeSelect
   },
   methods: {
-    checkedRole (data) {
+    checkedRole(data) {
       this.assigneeNewLoading = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
-        userId:this.$store.getters.userInfo.userId, // 委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
         assignee: data[0].id, // 被委托人
         pId: this.$route.query.prcId, // 流程实例
       }).then(res => {
@@ -752,82 +715,82 @@ export default {
           this.$message.success('调整成功')
           this.processNum()
           this.queryProcess()
-          this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+          this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
         } else {
           this.$message.warning(res.message)
         }
       })
     },
-    downloadFile (fileType) {
+    downloadFile(fileType) {
       //文件id中出现了','字符,去除掉
-      if(fileType === 'fbgbjbd'){
+      if (fileType === 'fbgbjbd') {
-        if(this.fbgbjbdFileId.search(',')){
+        if (this.fbgbjbdFileId.search(',')) {
-          this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",","");
+          this.fbgbjbdFileId = this.fbgbjbdFileId.replace(",", "");
         }
         let attId = this.fbgbjbdFileId
         this.$preview(attId)
-      }else if(fileType === 'xgd'){
+      } else if (fileType === 'xgd') {
         let attId = this.xgdFileId
         this.$preview(attId)
-      }else if(fileType === 'bpg'){
+      } else if (fileType === 'bpg') {
         let attId = this.bpgFileId
         this.$preview(attId)
-      }else if(fileType === 'ssg'){
+      } else if (fileType === 'ssg') {
         let attId = this.ssgFileId
         this.$preview(attId)
-      }else if(fileType === 'zqyjg'){
+      } else if (fileType === 'zqyjg') {
         let attId = this.zqyjgFileId
         this.$preview(attId)
-      }else if(fileType === 'jdwj'){
+      } else if (fileType === 'jdwj') {
         let attId = this.jdwjFileId
         this.$preview(attId)
-      }else if(fileType === 'kwj'){
+      } else if (fileType === 'kwj') {
         let attId = this.kwjFileId
         this.$preview(attId)
-      }else if(fileType === 'glwj'){
+      } else if (fileType === 'glwj') {
         let attId = this.glwjFileId
         this.$preview(attId)
-      }else if(fileType === 'ca'){
+      } else if (fileType === 'ca') {
         let attId = this.caFileId
         this.$preview(attId)
-      }else if(fileType === 'zbjbd'){
+      } else if (fileType === 'zbjbd') {
         let attId = this.zbjbdFileId
         this.$preview(attId)
       }
     },
-    getRule(){
+    getRule() {
       if (this.formTongGuo.approvalOpinion === 0) {
         this.rules.commentText[0].required = false;
         this.$refs.formTongGuo.clearValidate('commentText')
-      }else {
+      } else {
         this.rules.commentText[0].required = true;
       }
     },
-    popoverHide (checkedIds, checkedData) {
+    popoverHide(checkedIds, checkedData) {
-      if(checkedData) {
+      if (checkedData) {
         this.form.standSystem = checkedData.id
         this.form.standSystemName = checkedData.menuName
       }
     },
-    popoverHideBusVs (checkedIds, checkedData) {
+    popoverHideBusVs(checkedIds, checkedData) {
-      if(checkedData){
+      if (checkedData) {
         this.form.cycvppsbm = checkedData.code
         this.form.cycvppscn = checkedData.chineseName
       }
     },
-    popoverHideCarVs (checkedIds, checkedData) {
+    popoverHideCarVs(checkedIds, checkedData) {
-      if(checkedData){
+      if (checkedData) {
         this.form.kccvppsbm = checkedData.code
         this.form.kccvppscn = checkedData.chineseName
       }
     },
-    popoverHideModel (checkedIds, checkedData) {
+    popoverHideModel(checkedIds, checkedData) {
-      if(checkedData){
+      if (checkedData) {
         this.form.dybxh = checkedData.model
         this.form.dymc = checkedData.name
       }
     },
-    busVsFunc(){
+    busVsFunc() {
       this.$http.get('sarVppsTree/list', '', {
         _this: this
       }, res => {
@@ -836,7 +799,7 @@ export default {
         this.key2++
       })
     },
-    modelFunc(){
+    modelFunc() {
       this.$http.get('sarModelTree/list', '', {
         _this: this
       }, res => {
@@ -844,7 +807,7 @@ export default {
         this.key3++
       })
     },
-    processTable () {
+    processTable() {
       this.$http.get('lawss/activiti/get_list_by_instance', {
         prcNum: this.$route.query.prcNum,
         sortWord: this.shunxu ? this.paixu : '',
@@ -854,20 +817,21 @@ export default {
         _this: this
       }, res => {
         this.detailData = res
-      }, e => {})
+      }, e => {
+      })
     },
-    assemble(ids,names){
+    assemble(ids, names) {
-      let list= new Array();
+      let list = new Array();
       let idArray = []
       let nameArray = []
-      if(ids.length > 0) {
+      if (ids.length > 0) {
-        idArray=ids.split(',');
+        idArray = ids.split(',');
       }
       if (names.length > 0) {
         nameArray = names.split(',');
       }
-      for(var i=0;i<idArray.length;i++) {
+      for (var i = 0; i < idArray.length; i++) {
-        list.push({id:idArray[i],name:nameArray[i]});
+        list.push({id: idArray[i], name: nameArray[i]});
       }
 
       return list;
@@ -892,25 +856,25 @@ export default {
             this.zbjbdFileId = processForm.zbjbd
             this.getFormFieldList(processForm)
 
-            this.xgdFileMap=this.assemble(processForm.xgd,processForm.xgdName);
+            this.xgdFileMap = this.assemble(processForm.xgd, processForm.xgdName);
 
-            this.fbgbjbdFileMap=this.assemble(processForm.fbgbjbd,processForm.fbgbjbdName);
+            this.fbgbjbdFileMap = this.assemble(processForm.fbgbjbd, processForm.fbgbjbdName);
             // fbgbjbdFileMap: {},
-            this.bpgFileMap=this.assemble(processForm.bpg,processForm.bpgName);
+            this.bpgFileMap = this.assemble(processForm.bpg, processForm.bpgName);
             // bpgFileMap: {},
-            this.ssgFileMap=this.assemble(processForm.ssg,processForm.ssgName);
+            this.ssgFileMap = this.assemble(processForm.ssg, processForm.ssgName);
             // ssgFileMap: {},
-            this.zqyjgFileMap=this.assemble(processForm.zqyjg,processForm.zqyjgName);
+            this.zqyjgFileMap = this.assemble(processForm.zqyjg, processForm.zqyjgName);
             // zqyjgFileMap: {},
-            this.jdwjFileMap=this.assemble(processForm.jdwj,processForm.jdwjName);
+            this.jdwjFileMap = this.assemble(processForm.jdwj, processForm.jdwjName);
             // jdwjFileMap: {},
-            this.kwjFileMap=this.assemble(processForm.kwj,processForm.kwjName);
+            this.kwjFileMap = this.assemble(processForm.kwj, processForm.kwjName);
             // kwjFileMap: {},
-            this.glwjFileMap=this.assemble(processForm.glwj,processForm.glwjName);
+            this.glwjFileMap = this.assemble(processForm.glwj, processForm.glwjName);
             // glwjFileMap: {},
-            this.caFileMap=this.assemble(processForm.ca,processForm.caName);
+            this.caFileMap = this.assemble(processForm.ca, processForm.caName);
             // caFileMap: {},
-            this.zbjbdFileMap=this.assemble(processForm.zbjbd,processForm.zbjbdName);
+            this.zbjbdFileMap = this.assemble(processForm.zbjbd, processForm.zbjbdName);
             // zbjbdFileMap: {},
 
           }
@@ -921,17 +885,18 @@ export default {
     /**
      * @description: 动态表单读取
      */
-    getFormFieldList (item) {
+    getFormFieldList(item) {
       this.$nextTick(() => {
         this.form = JSON.parse(JSON.stringify(item))
+/*        console.log(this.form)
         this.defaultCheckedKeys = [this.form.standSystem]
         this.defaultCheckedKeys1 = [this.form.cycvppsbm]
         this.defaultCheckedKeys2 = [this.form.kccvppsbm]
-        this.defaultCheckedKeys3 = [this.form.dybxh]
+        this.defaultCheckedKeys3 = [this.form.dybxh]*/
         this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
         this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
-        if( this.form.country !== undefined &&   this.form.country !== null &&   this.form.country !== ''){
+        if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') {
-          this.form.country=this.form.country.split(",");
+          this.form.country = this.form.country.split(",");
         }
         this.form.prcNum = this.prcNum
         this.form.prcName = this.prcName
@@ -959,18 +924,19 @@ export default {
       this.drawerModal = true
       this.drawerTitle = '转办处理人'
     },
-    handleSave() {},
+    handleSave() {
-    handle1(){
+    },
+    handle1() {
       this.formTongGuo.approvalOpinion = 1
       this.handleSubmit()
     },
-    handle2(){
+    handle2() {
       this.formTongGuo.approvalOpinion = 0
       this.handleSubmit()
     },
     handleSubmit() {
       this.getRule()
-      const val= this.form.country;
+      const val = this.form.country;
       if (val !== '' && val !== null && typeof (val) !== 'undefined') {
         if (val instanceof Array) {
           this.form.country = val.join(",");
@@ -988,26 +954,27 @@ export default {
           const json = JSON.stringify(this.form);
           this.$http.post('lawss/activiti/completeTask', {
             taskIds: this.taskIds,
-            userId : this.userId,
+            userId: this.userId,
             json: json
           }, {
             _this: this
           }, res => {
             if (res.success) {
-              console.log("this.formTongGuo.approvalOpinion",this.formTongGuo.approvalOpinion);
+              console.log("this.formTongGuo.approvalOpinion", this.formTongGuo.approvalOpinion);
-              if(this.formTongGuo.approvalOpinion == '1'){
+              if (this.formTongGuo.approvalOpinion == '1') {
                 console.log("shibai");
                 this.$message.warning("驳回成功")
                 this.isSubmit = false
                 // 流程提交之后，应该流转至待办任务页面
-                this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
-              }else{
+              } else {
                 console.log("hello");
                 this.processCreateStand(json)
               }
             }
           })
-        }})
+        }
+      })
     },
 
     /**
@@ -1034,15 +1001,15 @@ export default {
       })
     },
   },
-  created(){
+  created() {
   },
-  mounted () {
+  mounted() {
     this.getData()
     this.processTable()
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
       _this: this
     }, res => {
-      this.countryOptions=res.data.COUNTRY//国家地区
+      this.countryOptions = res.data.COUNTRY//国家地区
       this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
       this.standNatureOptions = res.data.SARPROPERTY // 标准性质
       this.standStateOptions = res.data.WBZTCLASS // 文本状态
@@ -1069,30 +1036,37 @@ export default {
 
 <style lang="less" scoped>
 @import '~@/assets/styles/phone';
+
 .bzrkStep2 {
-  /deep/.el-drawer__container {
+  /deep/.el-select .el-input .el-select__caret {
+    font-size: 0;
+  }
+  /deep/.prc-content-border {
+    width: 600px;
+  }
+  /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;
       padding: 0 20px 0;
     }
   }
-  /deep/.van-dialog__content {
+
+  /deep/ .van-dialog__content {
     min-height: 300px;
     padding: 10px;
   }
-  .prc-content-border {
+
-    overflow: auto;
+
-  }
+
-  /deep/.prc-content-border .el-form-item__content {
-    width: 270px;
-  }
   position: relative;
   height: 100%;
+
   .content {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     overflow: auto;
+
     .tableTitle {
       margin-bottom: 10px;
       height: 30px;
@@ -1100,6 +1074,7 @@ export default {
       position: relative;
       font-size: 13px;
       font-weight: bold;
+
       .tableButton {
         position: absolute;
         right: 0;

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -307,6 +307,11 @@
                 <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
+            <el-table-column
+              prop="replaceStandNum"
+              width="150"
+              label="代替标准号">
+            </el-table-column>
             <el-table-column fixed="right"
                              v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681')>0"
                              label="收藏" align="center" width="50px"
@@ -5136,97 +5141,6 @@ export default {
         })
       }
     },
-    /**
-     * 获取新增弹框的表单
-     */
-    getAddFormFieldList(isEdit) {
-      this.$http.get('lawss/sarStandAttrDetails/list', {}, {
-            _this: this
-          },
-          res => {
-            if (res.ok) {
-              const {data = {}} = res
-              this.formFieldListData = data['INLAND_STAND'] || []
-              // 追加高级查询动态下拉框数据s
-              this.twoOptions = [
-                {
-                  label: '标准类别',
-                  value: 'stand_sort',
-                  type: 'SEL_OPTION',
-                  disabled: false
-                },
-                {
-                  label: '文本状态',
-                  value: 'stand_state_show',
-                  type: 'SEL_OPTION',
-                  disabled: false
-                },
-                // {
-                //   label: '适用区域',
-                //   value: 'country',
-                //   type: 'SEL_OPTION',
-                //   disabled: false
-                // },
-                {
-                  label: '重要度',
-                  value: 'is_relate_access',
-                  type: 'SEL_OPTION',
-                  disabled: false
-                },
-                {
-                  label: '标准编号',
-                  value: 'stand_number',
-                  type: 'INPUT',
-                  disabled: false
-                },
-                {
-                  label: '标准年份',
-                  value: 'stand_year',
-                  type: 'INPUT',
-                  disabled: false
-                },
-                {
-                  label: '中文名称',
-                  value: 'stand_name',
-                  type: 'INPUT',
-                  disabled: false
-                },
-                {
-                  label: '英文名称',
-                  value: 'stand_en_name',
-                  type: 'INPUT',
-                  disabled: false
-                },
-                {
-                  label: '发布日期',
-                  value: 'issue_time',
-                  type: 'DATE_PIC_OPTS',
-                  disabled: false
-                },
-                {
-                  label: '文本说明',
-                  value: 'synopsis',
-                  type: 'INPUT',
-                  disabled: false
-                }
-              ]
-              this.formFieldListData.map(item => {
-                if (item.attrType !== 'FILE' && item.attrField !== 'ZRLX') {
-                  this.twoOptions.push({
-                    value: item.attrField,
-                    label: item.attrName,
-                    selVal: item.selVal,
-                    type: item.attrType,
-                    disabled: false,
-                    __wx__: item
-                  })
-                }
-              })
-              // this.resolveFormFieldList()
-            }
-          }, e => {
-          })
-    },
     /**
      * 展示位置
      */
@@ -5718,7 +5632,6 @@ export default {
     // 加载所有的部门
     this.getOrgTreeSource()
     // 加载动态表单数据
-    this.getAddFormFieldList()
     this.getDept()
     this.busVsFunc()
     this.modelFunc()

src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup.vue

@@ -4,7 +4,7 @@
   <el-form-item
     :label="config.attrName"
     :prop="config.attrField"
-    label-width="150px"
+    label-width="180px"
     class="add-form-item"
     :class="{'form-item-disabled': disabled}"
   >
@@ -12,7 +12,7 @@
       v-show="false"
       :value="value"
       :placeholder="placeholder"
-      clearable
+      :disabled="disabled"
     ></el-input>
     <div class="date-picker-group">
       <template v-for="(tag, index) in tagList">
@@ -20,7 +20,7 @@
           <div class="tag-wrap" v-if="tagAnimateList.includes(tag)" :key="index">
             <el-tag
               size="small"
-              closable
+              :closable="!disabled"
               @close="handleRemoveTag(index)">{{ tag }}</el-tag>
           </div>
         </transition>
@@ -122,7 +122,7 @@ export default {
   },
   watch: {
     value (val) {
-      this.tagList = val !== '' && val !== null ? val.split(',') : []
+      this.tagList = val !== '' && val !== null && val !== undefined ? val.split(',') : []
     },
     tagList: {
       handler (val) {

src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue

@@ -155,8 +155,9 @@
                                             align="center"
                                             width="150">
                                         <template slot-scope="scope">
-                                            <el-input v-model="scope.row.netId" style="display: none;"></el-input>
+                                            <el-input :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.name"></el-input>
-                                            <el-input :disabled="DrawerType === 'see'" readonly style="margin: 10px 0;" @click.native="checkRole('选择联络人', scope.$index, scope.row.netId)" v-model="scope.row.name"></el-input>
+<!--                                            <el-input v-model="scope.row.netId" style="display: none;"></el-input>-->
+<!--                                            <el-input :disabled="DrawerType === 'see'" readonly style="margin: 10px 0;" @click.native="checkRole('选择联络人', scope.$index, scope.row.netId)" v-model="scope.row.name"></el-input>-->
                                         </template>
                                     </el-table-column>
                                     <el-table-column
@@ -164,7 +165,8 @@
                                             prop="unit"
                                             align="center">
                                         <template slot-scope="scope">
-                                            <el-input style="margin: 10px 0;" disabled v-model="scope.row.unit"></el-input>
+<!--                                            <el-input style="margin: 10px 0;" disabled v-model="scope.row.unit"></el-input>-->
+                                            <el-input :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.unit"></el-input>
                                         </template>
                                     </el-table-column>
                                     <el-table-column
@@ -1434,8 +1436,8 @@
                     pName: row.name,
                     name: row.name,
                     number: row.number,
-                    changeTime: row.changeTime,
+                    changeTime: row.changeTime || '',
-                    mark: row.mark,
+                    mark: row.mark || '',
                     standerArea: row.standerArea,
                     itemType: row.level === '1' ? '标委会' : (row.level === '2' ? '分标委' : (row.level === '3' ? '工作组' : '标准'))
                 }
@@ -1488,8 +1490,8 @@
                     pName: row.name,
                     name: row.name,
                     number: row.number,
-                    changeTime: row.changeTime,
+                    changeTime: row.changeTime || '',
-                    mark: row.mark,
+                    mark: row.mark || '',
                     standerArea: row.standerArea,
                     itemType: row.level === '1' ? '标委会' : (row.level === '2' ? '分标委' : (row.level === '3' ? '工作组' : '标准'))
                 }
@@ -1580,6 +1582,7 @@
                             this.addForm.wgMeetingInfos.forEach(item => {
                                 item.joinfile = JSON.stringify(item.joinfile)
                             })
+                            console.log(this.addForm);
                             this.$http.postData('wg_work_group/updateData', this.addForm, {
                                 _this: this
                             }, res => {

src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue

@@ -155,8 +155,9 @@
                                                 align="center"
                                                 width="150">
                                             <template slot-scope="scope">
-                                                <el-input v-model="scope.row.netId" style="display: none;"></el-input>
+                                                <el-input :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.name"></el-input>
-                                                <el-input :disabled="DrawerType === 'see'" readonly style="margin: 10px 0;" @click.native="checkRole('选择联络人', scope.$index, scope.row.netId)" v-model="scope.row.name"></el-input>
+<!--                                                <el-input v-model="scope.row.netId" style="display: none;"></el-input>-->
+<!--                                                <el-input :disabled="DrawerType === 'see'" readonly style="margin: 10px 0;" @click.native="checkRole('选择联络人', scope.$index, scope.row.netId)" v-model="scope.row.name"></el-input>-->
                                             </template>
                                         </el-table-column>
                                         <el-table-column
@@ -164,7 +165,7 @@
                                                 prop="unit"
                                                 align="center">
                                             <template slot-scope="scope">
-                                                <el-input style="margin: 10px 0;" disabled v-model="scope.row.unit"></el-input>
+                                                <el-input :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.unit"></el-input>
                                             </template>
                                         </el-table-column>
                                         <el-table-column