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

src/components/treeSelect/treeSelect.vue

@@ -17,12 +17,11 @@
 <template>
     <div>
         <div class="mask" v-show="isShowSelect" @click="isShowSelect = !isShowSelect"></div>
-        <el-popover placement="bottom-start" :width="width" trigger="manual"
+        <el-popover placement="bottom-start" :width="width" trigger="manual" :disabled="disabled"
                     v-model="isShowSelect" @hide="popoverHide">
             <el-tree class="common-tree" :style="style" ref="tree" :data="data" :props="defaultProps"
                      :show-checkbox="multiple"
                      :node-key="nodeKey"
-                     :disabled="disabled"
                      :check-strictly="checkStrictly"
                      default-expand-all
                      :expand-on-click-node="false"
@@ -110,6 +109,8 @@
                 checkedData: []
             };
         },
+        created(){
+        },
         mounted () {
             if (this.checkedKeys.length > 0) {
                 if (this.multiple) {

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

@@ -123,6 +123,7 @@
                                 </el-form-item>
                                 <el-form-item v-show="verifySarStandard" v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
                                     <tree-select
+                                            :key="key"
                                             width = "340"
                                             :data="standSystemOptions"
                                             :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
@@ -502,23 +503,26 @@
                                 <el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
                                     <tree-select
                                             width = "340"
+                                            :key="key1"
                                             :data="busVppsOptions"
-                                            :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys"
+                                            :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
-                                            :nodeKey="nodeKey" @popoverHide="popoverHideBusVs"></tree-select>
+                                            :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select>
                                 </el-form-item>
                                 <el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
                                     <tree-select
                                             width = "340"
+                                            :key="key2"
                                             :data="busVppsOptions"
-                                            :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys"
+                                            :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
-                                            :nodeKey="nodeKey" @popoverHide="popoverHideCarVs"></tree-select>
+                                            :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select>
                                 </el-form-item>
                                 <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
                                     <tree-select
+                                            :key="key3"
                                             width = "340"
                                             :data="modelOptions"
-                                            :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys"
+                                            :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
-                                            :nodeKey="nodeKey" @popoverHide="popoverHideModel"></tree-select>
+                                            :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
                                     <el-input
@@ -951,7 +955,7 @@
                 <div class="content">
                     <div class="standard-table-search">
                         <el-form :model="standardSearchForm" inline class="label-input-form search-area">
-                            <el-formItem label="标准来源" prop="standType" class="search-item" >
+                            <el-formItem label="标准来源" style="margin-right:-20px" prop="standType" class="search-item" >
                                 <el-select
                                         v-model="standardSearchForm.standType"
                                         placeholder="请选择标准来源">
@@ -959,7 +963,7 @@
                                     <el-option value="FOREIGN" label="国外标准库"></el-option>
                                 </el-select>
                             </el-formItem>
-                            <el-form-item label="标准类别" prop="standSort" class="search-item" >
+                            <el-form-item label="标准类别" style="margin-right:-20px" prop="standSort" class="search-item" >
                                 <el-select v-model="standardSearchForm.standSort" placeholder="请选择标准类别" filterable clearable>
                                     <el-option
                                             v-for="item in standSortOptions"
@@ -969,20 +973,20 @@
                                     ></el-option>
                                 </el-select>
                             </el-form-item>
-                            <el-form-item label="标准编号" prop="standNumber" class="search-item" >
+                            <el-form-item label="标准编号" style="margin-right:-20px" prop="standNumber" class="search-item" >
                                 <el-input
                                         v-model="standardSearchForm.standNumber"
                                         placeholder="请输入标准编号"
                                         clearable
                                         :maxlength="100"></el-input>
                             </el-form-item>
-                            <el-form-item label="中文名称" prop="standName" class="search-item" >
+                            <el-form-item label="中文名称" style="margin-right:-20px" prop="standName" class="search-item" >
                                 <el-input v-model="standardSearchForm.standName"
                                           placeholder="请输入标准名称"
                                           clearable
                                           :maxlength="500"></el-input>
                             </el-form-item>
-                            <el-form-item label="英文名称" prop="standEnName" class="search-item">
+                            <el-form-item label="英文名称" style="margin-right:-20px" prop="standEnName" class="search-item">
                                 <el-input
                                         v-model="standardSearchForm.standEnName"
                                         maxlength="1000"
@@ -1177,11 +1181,20 @@
                     children: 'children',
                     label: 'name'
                 },
+                key:1,
+                key1:2,
+                key2:3,
+                key3:4,
                 treeData: [], // 人员数据
                 modalShowFlag: false, // drawer开关
                 drawerTitle: '', //drawer标题
                 nodeKey: 'id',
                 defaultCheckedKeys: [],
+                nodeKeyCode: 'code',
+                nodeKeyModel: 'model',
+                defaultCheckedKeys1: [],
+                defaultCheckedKeys2: [],
+                defaultCheckedKeys3: [],
                 fileUrl: 'api/att/attFile/upload',
                 fileMadel: false,
                 fileType: '',
@@ -1479,6 +1492,13 @@
                             const json = Object.assign(bringData, bringData.attrInfoCaseMap);
                             this.form = JSON.parse(JSON.stringify(json))
                             this.defaultCheckedKeys = [this.form.standSystem];
+                            this.defaultCheckedKeys1 = [this.form.cycvppsbm];
+                            this.defaultCheckedKeys2 = [this.form.kccvppsbm];
+                            this.defaultCheckedKeys3 = [this.form.dybxh];
+                            this.key++
+                            this.key1++
+                            this.key2++
+                            this.key3++
                             this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
                             this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : ''
                             this.form.prcNum = this.prcNum
@@ -1486,6 +1506,9 @@
                             this.form['id'] = bringData.id
                             this.standardDrawer = false
                             this.verifySarStandard = true
+                            this.busVsFunc()
+                            this.modelFunc()
+                            this.$forceUpdate()
                         } else if (this.standardCheckedList.length > 1) {
                             this.$message.warning('最多可以带入一条标准信息')
                         } else {
@@ -1850,32 +1873,28 @@
                 this.fileType = type;
             },
             popoverHide (checkedIds, checkedData) {
-                console.log(checkedIds);
+                if(checkedData) {
-                console.log(checkedData);
+                    this.form.standSystem = checkedData.id
-                this.form.standSystem = checkedData.id
+                    this.form.standSystemName = checkedData.menuName
-                this.form.standSystemName = checkedData.menuName
+                }
-                console.log(this.sarStandardsInfoEO.standSystem);
             },
             popoverHideBusVs (checkedIds, checkedData) {
-                console.log(checkedIds);
+                if(checkedData){
-                console.log(checkedData);
+                    this.form.cycvppsbm = checkedData.code
-                this.form.cycvppsbm = checkedData.code
+                    this.form.cycvppscn = checkedData.chineseName
-                this.form.cycvppscn = checkedData.chineseName
+                }
-                console.log(this.sarStandardsInfoEO.standSystem);
             },
             popoverHideCarVs (checkedIds, checkedData) {
-                console.log(checkedIds);
+                if(checkedData){
-                console.log(checkedData);
+                    this.form.kccvppsbm = checkedData.code
-                this.form.kccvppsbm = checkedData.code
+                    this.form.kccvppscn = checkedData.chineseName
-                this.form.kccvppscn = checkedData.chineseName
+                }
-                console.log(this.sarStandardsInfoEO.standSystem);
             },
             popoverHideModel (checkedIds, checkedData) {
-                console.log(checkedIds);
+                if(checkedData){
-                console.log(checkedData);
+                    this.form.dybxh = checkedData.model
-                this.form.dybxh = checkedData.model
+                    this.form.dymc = checkedData.name
-                this.form.dymc = checkedData.name
+                }
-                console.log(this.sarStandardsInfoEO.standSystem);
             },
             closeDrawer() {
                 this.ListModel = false
@@ -1961,6 +1980,7 @@
                 this.$http.get('sarVppsTree/list', '', {
                     _this: this
                 }, res => {
+                    this.busVppsOptions = []
                     this.busVppsOptions = res.data
                 })
             },
@@ -1968,6 +1988,7 @@
                 this.$http.get('sarModelTree/list', '', {
                     _this: this
                 }, res => {
+                    this.modelOptions = []
                     this.modelOptions = res.data
                 })
             },

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

@@ -42,13 +42,12 @@
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
-                                    <el-date-picker
+                                    <el-input
                                             disabled
-                                            v-model="form.standYear"
+                                            v-model.number="form.standYear"
-                                            type="year"
+                                            placeholder="请输入标准标准年份"
-                                            placeholder="请选择标准年份"
+                                            clearable
-                                            value-format="yyyy">
+                                    ></el-input>
-                                    </el-date-picker>
                                 </el-form-item>
                                 <el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
                                     <el-input
@@ -120,11 +119,13 @@
                                     </el-radio-group>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
-                                    <el-input
+                                    <tree-select
-                                            disabled
+                                            :key="key"
-                                            v-model="form.standSystemName"
+                                            width = "340"
-                                            clearable
+                                                 :disabled="false"
-                                    ></el-input>
+                                                 :data="standSystemOptions"
+                                                 :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
+                                                 :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
                                    <el-input
@@ -325,22 +326,31 @@
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.cycvppsbm" placeholder="请选择乘用车VPPS编码" multiple disabled>
+                                    <tree-select
-                                        <el-option label="乘用车VPPS编码1" value="1"></el-option>
+                                            :key="key1"
-                                        <el-option label="乘用车VPPS编码2" value="2"></el-option>
+                                            :disabled="true"
-                                    </el-select>
+                                            width = "340"
+                                            :data="busVppsOptions"
+                                            :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
+                                            :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select>
                                 </el-form-item>
                                 <el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.kccvppsbm" placeholder="请选择卡车VPPS编码" multiple disabled>
+                                    <tree-select
-                                        <el-option label="卡车VPPS编码1" value="1"></el-option>
+                                            :key="key2"
-                                        <el-option label="卡车VPPS编码2" value="2"></el-option>
+                                            :disabled="true"
-                                    </el-select>
+                                            width = "340"
+                                            :data="busVppsOptions"
+                                            :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
+                                            :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select>
                                 </el-form-item>
                                 <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.dybxh" placeholder="请选择模块结构单元变型号" multiple disabled>
+                                    <tree-select
-                                        <el-option label="模块结构单元变型号1" value="1"></el-option>
+                                            :key="key3"
-                                        <el-option label="模块结构单元变型号2" value="2"></el-option>
+                                            width = "340"
-                                    </el-select>
+                                            :disabled="true"
+                                            :data="modelOptions"
+                                            :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
+                                            :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
                                     <el-input
@@ -774,6 +784,25 @@
                     prcName:'',
                     standType: '',
                 }, // 标准信息
+                nodeKeyCode: 'code',
+                nodeKeyModel: 'model',
+                key:1,
+                key1:2,
+                key2:3,
+                key3:4,
+                defaultCheckedKeys1: [],
+                defaultCheckedKeys2: [],
+                defaultCheckedKeys3: [],
+                defaultCodeProps: {
+                    children: 'children',
+                    label: 'code'
+                },
+                defaultModelProps: {
+                    children: 'children',
+                    label: 'model'
+                },
+                busVppsOptions: [], // 车系体系架构
+                modelOptions: [], // 模块体系架构
                 standSortOptions: [], // 标准类别
                 standNatureOptions: [], // 标准性质
                 standStateOptions: [], // 文本状态
@@ -811,10 +840,45 @@
       },
         methods: {
             popoverHide (checkedIds, checkedData) {
-                console.log(checkedIds);
+                if(checkedData) {
-                console.log(checkedData);
+                    this.form.standSystem = checkedData.id
-                this.form.standSystem = checkedData.id
+                    this.form.standSystemName = checkedData.menuName
-                console.log(this.sarStandardsInfoEO.standSystem);
+                }
+            },
+            popoverHideBusVs (checkedIds, checkedData) {
+                if(checkedData){
+                    this.form.cycvppsbm = checkedData.code
+                    this.form.cycvppscn = checkedData.chineseName
+                }
+            },
+            popoverHideCarVs (checkedIds, checkedData) {
+                if(checkedData){
+                    this.form.kccvppsbm = checkedData.code
+                    this.form.kccvppscn = checkedData.chineseName
+                }
+            },
+            popoverHideModel (checkedIds, checkedData) {
+                if(checkedData){
+                    this.form.dybxh = checkedData.model
+                    this.form.dymc = checkedData.name
+                }
+            },
+            busVsFunc(){
+                this.$http.get('sarVppsTree/list', '', {
+                    _this: this
+                }, res => {
+                    this.busVppsOptions = res.data
+                    this.key1++
+                    this.key2++
+                })
+            },
+            modelFunc(){
+                this.$http.get('sarModelTree/list', '', {
+                    _this: this
+                }, res => {
+                    this.modelOptions = res.data
+                    this.key3++
+                })
             },
           processTable () {
             this.$http.get('lawss/activiti/get_list_by_instance', {
@@ -848,8 +912,13 @@
             getFormFieldList (item) {
                 this.$nextTick(() => {
                     this.form = JSON.parse(JSON.stringify(item))
-                    this.defaultCheckedKeys = [this.form.standSystem];
+                    this.defaultCheckedKeys = [this.form.standSystem]
+                    console.log(this.defaultCheckedKeys)
+                    this.defaultCheckedKeys1 = [this.form.cycvppsbm]
+                    this.defaultCheckedKeys2 = [this.form.kccvppsbm]
+                    this.defaultCheckedKeys3 = [this.form.dybxh]
                     this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
+                    this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
@@ -886,7 +955,11 @@
                 }, res => {
                     console.log(res);
                     if (res.success) {
-                        this.processCreateStand(json)
+                        if(this.approvalOpinion === '1'){
+                            this.$message.warning("驳回成功")
+                        }else{
+                            this.processCreateStand(json)
+                        }
                     }
                 })
             },
@@ -913,6 +986,8 @@
                 })
             },
         },
+        created(){
+        },
         mounted () {
             this.getData()
           this.processTable()
@@ -931,7 +1006,10 @@
                 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
                 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
                 this.txlbOptions = res.data.TXLBCLASS // 体系类别
+                this.key++
             })
+            this.busVsFunc()
+            this.modelFunc()
         }
     }
 </script>

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

@@ -42,13 +42,12 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
-                  <el-date-picker
+                  <el-input
-                      disabled
+                          disabled
-                      v-model="form.standYear"
+                          v-model.number="form.standYear"
-                      type="year"
+                          placeholder="请输入标准标准年份"
-                      value-format="yyy"
+                          clearable
-                      placeholder="请选择标准年份">
+                  ></el-input>
-                  </el-date-picker>
                 </el-form-item>
                 <el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
                   <el-input
@@ -119,11 +118,13 @@
                   </el-radio-group>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
-                  <el-input
+                  <tree-select
-                          disabled
+                          :key="key"
-                          v-model="form.standSystemName"
+                          width = "340"
-                          clearable
+                          :disabled="true"
-                  ></el-input>
+                          :data="standSystemOptions"
+                          :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
+                          :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
                   <el-input
@@ -318,22 +319,31 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.cycvppsbm" placeholder="请选择乘用车VPPS编码" multiple disabled>
+                  <tree-select
-                    <el-option label="乘用车VPPS编码1" value="1"></el-option>
+                          :key="key1"
-                    <el-option label="乘用车VPPS编码2" value="2"></el-option>
+                          :disabled="true"
-                  </el-select>
+                          width = "340"
+                          :data="busVppsOptions"
+                          :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
+                          :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select>
                 </el-form-item>
                 <el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.kccvppsbm" placeholder="请选择卡车VPPS编码" multiple disabled>
+                  <tree-select
-                    <el-option label="卡车VPPS编码1" value="1"></el-option>
+                          :key="key2"
-                    <el-option label="卡车VPPS编码2" value="2"></el-option>
+                          :disabled="true"
-                  </el-select>
+                          width = "340"
+                          :data="busVppsOptions"
+                          :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
+                          :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select>
                 </el-form-item>
                 <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.dybxh" placeholder="请选择模块结构单元变型号" multiple disabled>
+                  <tree-select
-                    <el-option label="模块结构单元变型号1" value="1"></el-option>
+                          :key="key3"
-                    <el-option label="模块结构单元变型号2" value="2"></el-option>
+                          width = "340"
-                  </el-select>
+                          :disabled="true"
+                          :data="modelOptions"
+                          :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
+                          :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
                   <el-input
@@ -766,6 +776,25 @@ export default {
         prcName:'',
         standType: '',
       }, // 标准信息
+      nodeKeyCode: 'code',
+      nodeKeyModel: 'model',
+      key:1,
+      key1:2,
+      key2:3,
+      key3:4,
+      defaultCheckedKeys1: [],
+      defaultCheckedKeys2: [],
+      defaultCheckedKeys3: [],
+      defaultCodeProps: {
+        children: 'children',
+        label: 'code'
+      },
+      defaultModelProps: {
+        children: 'children',
+        label: 'model'
+      },
+      busVppsOptions: [], // 车系体系架构
+      modelOptions: [], // 模块体系架构
       standSortOptions: [], // 标准类别
       standNatureOptions: [], // 标准性质
       standStateOptions: [], // 文本状态
@@ -803,7 +832,45 @@ export default {
   },
   methods: {
     popoverHide (checkedIds, checkedData) {
-      this.form.standSystem = checkedData.id
+      if(checkedData) {
+        this.form.standSystem = checkedData.id
+        this.form.standSystemName = checkedData.menuName
+      }
+    },
+    popoverHideBusVs (checkedIds, checkedData) {
+      if(checkedData){
+        this.form.cycvppsbm = checkedData.code
+        this.form.cycvppscn = checkedData.chineseName
+      }
+    },
+    popoverHideCarVs (checkedIds, checkedData) {
+      if(checkedData){
+        this.form.kccvppsbm = checkedData.code
+        this.form.kccvppscn = checkedData.chineseName
+      }
+    },
+    popoverHideModel (checkedIds, checkedData) {
+      if(checkedData){
+        this.form.dybxh = checkedData.model
+        this.form.dymc = checkedData.name
+      }
+    },
+    busVsFunc(){
+      this.$http.get('sarVppsTree/list', '', {
+        _this: this
+      }, res => {
+        this.busVppsOptions = res.data
+        this.key1++
+        this.key2++
+      })
+    },
+    modelFunc(){
+      this.$http.get('sarModelTree/list', '', {
+        _this: this
+      }, res => {
+        this.modelOptions = res.data
+        this.key3++
+      })
     },
     processTable () {
       this.$http.get('lawss/activiti/get_list_by_instance', {
@@ -837,8 +904,12 @@ export default {
     getFormFieldList (item) {
       this.$nextTick(() => {
         this.form = JSON.parse(JSON.stringify(item))
-        this.defaultCheckedKeys = [this.form.standSystem];
+        this.defaultCheckedKeys = [this.form.standSystem]
+        this.defaultCheckedKeys1 = [this.form.cycvppsbm]
+        this.defaultCheckedKeys2 = [this.form.kccvppsbm]
+        this.defaultCheckedKeys3 = [this.form.dybxh]
         this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
+        this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
         this.form.prcNum = this.prcNum
         this.form.prcName = this.prcName
         this.form['id'] = item.id
@@ -905,7 +976,11 @@ export default {
       })
     },
   },
+  created(){
+    this.getData()
+  },
   mounted () {
+    this.getData()
     this.processTable()
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
       _this: this
@@ -914,7 +989,6 @@ export default {
       this.standNatureOptions = res.data.SARPROPERTY // 标准性质
       this.standStateOptions = res.data.WBZTCLASS // 文本状态
       this.standSystemOptions = res.data.BZTXCLASS // 标准体系
-      console.log(this.standSystemOptions)
       this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
       this.categoryOptions = res.data.NYLXCLASS // 能源类型
       this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
@@ -923,9 +997,10 @@ export default {
       this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
       this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
       this.txlbOptions = res.data.TXLBCLASS // 体系类别
-      this.getData()
+      this.key++
     })
-    this.$forceUpdate()
+    this.busVsFunc()
+    this.modelFunc()
   },
 }
 </script>

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

@@ -43,12 +43,11 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
-                  <el-date-picker
+                  <el-input
-                      v-model="form.standYear"
+                          v-model.number="form.standYear"
-                      type="year"
+                          placeholder="请输入标准标准年份"
-                      value-format="yyy"
+                          clearable
-                      placeholder="请选择标准年份">
+                  ></el-input>
-                  </el-date-picker>
                 </el-form-item>
                 <el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
                   <el-input
@@ -116,7 +115,9 @@
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
                   <tree-select v-if="treeStatus"
+                               :key="key"
                                width = "340"
+                               :disabled="false"
                           :data="standSystemOptions"
                           :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
                           :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>
@@ -487,22 +488,28 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.cycvppsbm" placeholder="请选择乘用车VPPS编码" multiple>
+                  <tree-select
-                    <el-option label="乘用车VPPS编码1" value="1"></el-option>
+                          :key="key1"
-                    <el-option label="乘用车VPPS编码2" value="2"></el-option>
+                          width = "340"
-                  </el-select>
+                          :data="busVppsOptions"
+                          :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
+                          :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select>
                 </el-form-item>
                 <el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.kccvppsbm" placeholder="请选择卡车VPPS编码" multiple>
+                  <tree-select
-                    <el-option label="卡车VPPS编码1" value="1"></el-option>
+                          :key="key2"
-                    <el-option label="卡车VPPS编码2" value="2"></el-option>
+                          width = "340"
-                  </el-select>
+                          :data="busVppsOptions"
+                          :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
+                          :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select>
                 </el-form-item>
                 <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.dybxh" placeholder="请选择模块结构单元变型号" multiple>
+                  <tree-select
-                    <el-option label="模块结构单元变型号1" value="1"></el-option>
+                          :key="key3"
-                    <el-option label="模块结构单元变型号2" value="2"></el-option>
+                          width = "340"
-                  </el-select>
+                          :data="modelOptions"
+                          :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
+                          :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
                   <el-input
@@ -566,18 +573,21 @@
                 </el-form-item>
                 <el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled">
                   <el-input
+                          disabled
                       v-model="form.cycvppscn"
                       clearable
                   ></el-input>
                 </el-form-item>
                 <el-form-item label="关联模块--卡车vpps中文名称" prop="kccvppscn" class="add-form-item form-item-disabled">
                   <el-input
+                          disabled
                       v-model="form.kccvppscn"
                       clearable
                   ></el-input>
                 </el-form-item>
                 <el-form-item label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
                   <el-input
+                          disabled
                       v-model="form.dymc"
                       clearable
                   ></el-input>
@@ -996,8 +1006,25 @@ export default {
         children: 'children',
         label: 'menuName'
       },
+      defaultCodeProps: {
+        children: 'children',
+        label: 'code'
+      },
+      defaultModelProps: {
+        children: 'children',
+        label: 'model'
+      },
       nodeKey: 'id',
       defaultCheckedKeys: [],
+      nodeKeyCode: 'code',
+      nodeKeyModel: 'model',
+      key:1,
+      key1:2,
+      key2:3,
+      key3:4,
+      defaultCheckedKeys1: [],
+      defaultCheckedKeys2: [],
+      defaultCheckedKeys3: [],
       treeStatus:false,
       fileUrl: 'api/att/attFile/upload',
       fileMadel: false,
@@ -1140,6 +1167,8 @@ export default {
       standNatureOptions: [], // 标准性质
       standStateOptions: [], // 文本状态
       standSystemOptions: [], // 标准体系
+      busVppsOptions: [], // 车系体系架构
+      modelOptions: [], // 模块体系架构
       applyArcticOptions: [], // 适用车型
       categoryOptions: [], // 能源类型
       applyAuthOptions: [], // 适用认证
@@ -1172,6 +1201,23 @@ export default {
     },
   },
   methods: {
+    busVsFunc(){
+      this.$http.get('sarVppsTree/list', '', {
+        _this: this
+      }, res => {
+        this.busVppsOptions = res.data
+        this.key1++
+        this.key2++
+      })
+    },
+    modelFunc(){
+      this.$http.get('sarModelTree/list', '', {
+        _this: this
+      }, res => {
+        this.modelOptions = res.data
+        this.key3++
+      })
+    },
     // 代替政策号 请求数据
     getReplaceLawsNumRowFirst () {
       if (this.sarBussionessLawsEO.replaceLawsNum !== null && this.sarBussionessLawsEO.replaceLawsNum !== '') {
@@ -1408,10 +1454,28 @@ export default {
       this.fileType = type;
     },
     popoverHide (checkedIds, checkedData) {
-      console.log(checkedIds);
+      if(checkedData) {
-      console.log(checkedData);
+        this.form.standSystem = checkedData.id
-      this.form.standSystem = checkedData.id
+        this.form.standSystemName = checkedData.menuName
-      this.form.standSystemName = checkedData.menuName
+      }
+    },
+    popoverHideBusVs (checkedIds, checkedData) {
+      if(checkedData){
+        this.form.cycvppsbm = checkedData.code
+        this.form.cycvppscn = checkedData.chineseName
+      }
+    },
+    popoverHideCarVs (checkedIds, checkedData) {
+      if(checkedData){
+        this.form.kccvppsbm = checkedData.code
+        this.form.kccvppscn = checkedData.chineseName
+      }
+    },
+    popoverHideModel (checkedIds, checkedData) {
+      if(checkedData){
+        this.form.dybxh = checkedData.model
+        this.form.dymc = checkedData.name
+      }
     },
     processTable () {
       this.$http.get('lawss/activiti/get_list_by_instance', {
@@ -1446,7 +1510,11 @@ export default {
       this.$nextTick(() => {
         this.form = JSON.parse(JSON.stringify(item))
         this.defaultCheckedKeys = [this.form.standSystem];
+        this.defaultCheckedKeys1 = [this.form.cycvppsbm];
+        this.defaultCheckedKeys2 = [this.form.kccvppsbm];
+        this.defaultCheckedKeys3 = [this.form.dybxh];
         this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
+        this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
         this.form.prcNum = this.prcNum
         this.form.prcName = this.prcName
         this.form['id'] = item.id
@@ -1521,7 +1589,6 @@ export default {
   },
   mounted () {
     this.processTable()
-    this.getData()
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
       _this: this
     }, res => {
@@ -1538,7 +1605,10 @@ export default {
       this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
       this.txlbOptions = res.data.TXLBCLASS // 体系类别
       this.treeStatus = true
+      this.key++
     })
+    this.busVsFunc()
+    this.modelFunc()
   },
   watch:{
     form(val){

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -304,7 +304,7 @@
               <el-col :span="24" :key="index">
                 <div class="divider-line">{{ displayLocation.label }}</div>
               </el-col>
-              <template v-if="index === 0" >
+              <template v-if="displayLocation.label === '基础信息'" >
                   <el-form-item label="标准类别" prop="standSort" label-width="150px" class="add-form-item">
                       <el-select v-model="sarStandardsInfoEO.standSort" filterable>
                           <el-option
@@ -368,14 +368,14 @@
                           </el-option>
                       </el-select>
                   </el-form-item>
-                  <custom-date-pick-with-text2
+                  <custom-date-pick
                           :config="{
                 attrName: '发布日期',
                 attrField: 'issueTime'
               }"
                           v-model="sarStandardsInfoEO.issueTime"
                           :disabled="formdisableflag"
-                  ></custom-date-pick-with-text2>
+                  ></custom-date-pick>
                   <!--</el-form-item>-->
                   <el-form-item
                           prop="isRelateAccess"
@@ -419,12 +419,12 @@
                   ></custom-SVPPS>
                 </template>
                 <template v-else-if="field.attrField === 'XCXSSRQ' || field.attrField === 'ZCCSSRQ'">
-                  <custom-date-pick-with-text
+                  <custom-date-pick
                     :key="field.attrField"
                     :config="field"
                     v-model="sarStandardsInfoEO[field.attrField]"
                     :disabled="formdisableflag"
-                  ></custom-date-pick-with-text>
+                  ></custom-date-pick>
                 </template>
                 <template v-else-if="field.attrType === 'DATE_PIC_OPTS'">
                   <custom-date-pick-group
@@ -443,16 +443,84 @@
                       :disabled="formdisableflag"
                     ></custom-input-for-standards>
                   </template>
-                  <!-- 被代替标准编号 废弃-->
+                  <template v-else-if="field.attrField === 'CYCVPPSBM'">
-                  <template v-else>
+                      <el-form-item
-                    <custom-input
+                              prop="CYCVPPSBM"
-                      :key="field.attrField"
+                              label-width="150px"
-                      :config="field"
+                              class="add-form-item"
-                      v-if="field.attrField !== 'BDTBZBH'"
+                        >
-                      v-model="sarStandardsInfoEO[field.attrField]"
+                          <template slot="label">乘用车VPPS编码</template>
-                      :disabled="formdisableflag"
+                          <tree-select
-                    ></custom-input>
+                                  :disabled="false"
-                  </template>
+                                  width = "340"
+                                  :data="busVppsOptions"
+                                  :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
+                                  :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select>
+                      </el-form-item>
+                    </template>
+                    <template v-else-if="field.attrField === 'KCCVPPSBM'">
+                        <el-form-item
+                                prop="KCCVPPSBM"
+                                label-width="150px"
+                                class="add-form-item"
+                        >
+                            <template slot="label">卡车VPPS编码</template>
+                            <tree-select
+                                    :disabled="false"
+                                    width = "340"
+                                    :data="busVppsOptions"
+                                    :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
+                                    :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select>
+                        </el-form-item>
+                       </template>
+                       <template v-else-if="field.attrField === 'DYBXH'">
+                        <el-form-item
+                                prop="DYBXH"
+                                label-width="150px"
+                                class="add-form-item"
+                        >
+                            <template slot="label">模块结构单元变型号</template>
+                            <tree-select
+                                    width = "340"
+                                    :disabled="false"
+                                    :data="modelOptions"
+                                    :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
+                                    :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select>
+                        </el-form-item>
+                    </template>
+                    <template v-else-if="field.attrField === 'CYCVPPSCN'">
+                        <el-form-item label="关联模块--乘用车vpps中文名称" label-width="150px" prop="cycvppscn" class="add-form-item">
+                            <el-input
+                                    v-model="sarStandardsInfoEO.CYCVPPSCN" disabled
+                                    clearable
+                            ></el-input>
+                        </el-form-item>
+                    </template>
+                    <template v-else-if="field.attrField === 'KCCVPPSCN'">
+                        <el-form-item label="关联模块--卡车vpps中文名称" label-width="150px" prop="kccvppscn" class="add-form-item">
+                            <el-input
+                                    v-model="sarStandardsInfoEO.KCCVPPSCN" disabled
+                                    clearable
+                            ></el-input>
+                        </el-form-item>
+                    </template>
+                    <template v-else-if="field.attrField === 'DYMC'">
+                        <el-form-item label="模块结构单元名称" label-width="150px" prop="dymc" class="add-form-item">
+                            <el-input
+                                    v-model="sarStandardsInfoEO.DYMC" disabled
+                                    clearable
+                            ></el-input>
+                        </el-form-item>
+                    </template>
+                    <template v-else>
+                        <custom-input
+                                :key="field.attrField"
+                                :config="field"
+                                v-if="field.attrField !== 'BDTBZBH'"
+                                v-model="sarStandardsInfoEO[field.attrField]"
+                                :disabled="formdisableflag"
+                        ></custom-input>
+                    </template>
                 </template>
 
                 <template v-else-if="field.attrType === 'INPUT_NUM'">
@@ -486,7 +554,7 @@
                     :config="field"
                     v-model="sarStandardsInfoEO[field.attrField]"
                     :disabled="formdisableflag"
-                  ></custom-textarea>
+                  >1</custom-textarea>
                 </template>
                 <template v-else-if="field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.selVal === 'ROLELIST'">
                   <template v-if="field.attrField === 'XMPGJS'">
@@ -1089,6 +1157,8 @@ export default {
         label: 'menuName'
       },
       nodeKey: 'id',
+      nodeKeyCode: 'code',
+      nodeKeyModel: 'model',
       defaultCheckedKeys: [],
       exportLoading : false,
       visibleOrgTable: false,
@@ -1183,6 +1253,19 @@ export default {
         standSort: '',
         standNumber: ''
       },
+        defaultCheckedKeys1: [],
+        defaultCheckedKeys2: [],
+        defaultCheckedKeys3: [],
+        defaultCodeProps: {
+            children: 'children',
+            label: 'code'
+        },
+        defaultModelProps: {
+            children: 'children',
+            label: 'model'
+        },
+        busVppsOptions: [], // 车系体系架构
+        modelOptions: [], // 模块体系架构
       searching: false,
       stahndinfoList: [],
       tableFlag: '',
@@ -1286,7 +1369,14 @@ export default {
         upReplaceNumFlag: 0, // 记录是否修改了代替政策编号
         upNumFlag: 0,
         orgName: '', // 部门名称
-        registerPutTime: '' // 注册登记车实施日期
+        registerPutTime: '', // 注册登记车实施日期
+          CYCVPPSBM: '',
+          CYCVPPSCN: '',
+          KCCVPPSBM: '',
+          KCCVPPSCN: '',
+          DYBXH: '',
+          DYMC: '',
+
       }, // 标准新增过程中用到的对象
       standClass: [], // 标准类别
       sarStandardsInfoEO: {
@@ -1654,6 +1744,38 @@ export default {
     }
   },
   methods: {
+      popoverHideBusVs (checkedIds, checkedData) {
+          this.sarStandardsInfoEO.CYCVPPSBM = checkedData.code
+          this.sarStandardsInfoEO.CYCVPPSCN = checkedData.chineseName
+          console.log(checkedData)
+          console.log(this.sarStandardsInfoEO.CYCVPPSBM)
+          console.log(this.sarStandardsInfoEO.CYCVPPSCN)
+          this.$forceUpdate()
+      },
+      popoverHideCarVs (checkedIds, checkedData) {
+          this.sarStandardsInfoEO.KCCVPPSBM = checkedData.code
+          this.sarStandardsInfoEO.KCCVPPSCN = checkedData.chineseName
+          this.$forceUpdate()
+      },
+      popoverHideModel (checkedIds, checkedData) {
+          this.sarStandardsInfoEO.DYBXH = checkedData.model
+          this.sarStandardsInfoEO.DYMC = checkedData.name
+          this.$forceUpdate()
+      },
+      busVsFunc(){
+          this.$http.get('sarVppsTree/list', '', {
+              _this: this
+          }, res => {
+              this.busVppsOptions = res.data
+          })
+      },
+      modelFunc(){
+          this.$http.get('sarModelTree/list', '', {
+              _this: this
+          }, res => {
+              this.modelOptions = res.data
+          })
+      },
       popoverHide (checkedIds, checkedData) {
           this.sarStandardsInfoEO.standSystem = checkedData.id
       },
@@ -1892,9 +2014,10 @@ export default {
           const [displayLocation] = values
           const formFieldList = this.formFieldList
           this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
-            console.log(this.sarStandardsInfoEO)
+          if(this.sarStandardsInfoEO.standSystem){
-            this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
+              this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
-            this.sarStandardsInfoEO.standSort = item.standSort
+          }
+          this.sarStandardsInfoEO.standSort = item.standSort
           if (this.sarStandardsInfoEO.putTime != null && this.sarStandardsInfoEO.putTime !== '') {
             this.sarStandardsInfoEO.putTime = this.sarStandardsInfoEO.putTime.replace(new RegExp(/-/gm), '/')
             this.sarStandardsInfoEO.putTime = new Date(this.sarStandardsInfoEO.putTime)
@@ -1916,6 +2039,15 @@ export default {
               if (value && field.attrType === 'DATE_PICKER') {
                 value = this.$moment(value).format('YYYY-MM-DD')
               }
+              if(field.attrField === 'CYCVPPSBM'){
+                    this.defaultCheckedKeys1 = [value]
+              }
+              if(field.attrField === 'KCCVPPSBM'){
+                    this.defaultCheckedKeys2 = [value]
+              }
+              if(field.attrField === 'DYBXH'){
+                    this.defaultCheckedKeys3 = [value]
+              }
               field['value'] = value
               // 追加用户名称和部门名称和SVPPS名称
               if (field.selVal === 'ROLELIST' || field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.attrField === 'SVPPS' || field.attrField === 'XMPGJS') {
@@ -3915,6 +4047,8 @@ export default {
     // 加载动态表单数据
     this.getAddFormFieldList()
     this.getDept()
+    this.busVsFunc()
+    this.modelFunc()
   },
   destroyed () {
     this.allSelectOptions = {}