update: 国内、海外标准新增模块单元新字段

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -584,18 +584,7 @@
                                 @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"></el-input>
                     </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>
-                      <el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号"
-                                clearable
-                                @click.native="choiceZRR4('dybxh', '模块结构单元', sarStandardsInfoEO.dybxh)"></el-input>
-                    </el-form-item>
-                  </template>
                   <template v-else-if="field.attrField === 'CYCVPPSCN'">
                     <el-form-item title="关联模块--乘用车VPPS中文名称" label="关联模块--乘用车VPPS中文名称" label-width="150px"
                                   prop="cycvppscn" class="add-form-item">
@@ -630,8 +619,20 @@
                       ></el-input>
                     </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>
+                      <el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号(卡车)"
+                                clearable
+                                @click.native="choiceZRR4('TRUCK', '模块结构单元', sarStandardsInfoEO.dybxh)"></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-form-item label="模块结构单元名称(卡车)" label-width="150px" prop="dymc" class="add-form-item">
                       <el-input
                         v-if="sarStandardsInfoEO.DYBXH === '' || sarStandardsInfoEO.DYBXH === undefined"
                         v-model="sarStandardsInfoEO.DYMC = ''"
@@ -646,6 +647,34 @@
                       ></el-input>
                     </el-form-item>
                   </template>
+                  <template v-else-if="field.attrField === 'DYBXHCAR'">
+                    <el-form-item
+                            prop="DYBXHCAR"
+                            label-width="150px"
+                            class="add-form-item"
+                    >
+                      <template slot="label">模块结构单元变型号(乘用车)</template>
+                      <el-input v-model="sarStandardsInfoEO.DYBXHCAR" placeholder="选择模块结构单元变型号(乘用车)"
+                                clearable
+                                @click.native="choiceZRR5('CAR', '模块结构单元(乘用车)', sarStandardsInfoEO.dybxhcar)"></el-input>
+                    </el-form-item>
+                  </template>
+                  <template v-else-if="field.attrField === 'DYMCCAR'">
+                    <el-form-item label="模块结构单元名称(乘用车)" label-width="150px" prop="dymccar" class="add-form-item">
+                      <el-input
+                              v-if="sarStandardsInfoEO.DYBXHCAR === '' || sarStandardsInfoEO.DYBXHCAR === undefined"
+                              v-model="sarStandardsInfoEO.DYMCCAR = ''"
+                              disabled
+                              clearable
+                      ></el-input>
+                      <el-input
+                              v-else
+                              v-model="sarStandardsInfoEO.DYMCCAR"
+                              disabled
+                              clearable
+                      ></el-input>
+                    </el-form-item>
+                  </template>
                   <template v-else-if="field.attrField === 'BBFDTBZ' || field.attrField === 'BYYBJ'">
                     <custom-input
                       :config="field"
@@ -1287,10 +1316,24 @@
         :modalShowFlag="modalShowFlag4"
         :drawerTitle="drawerTitle"
         :url="url"
+        :type="modelType"
         :urlChild="urlChild"
         :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
         :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"
         @popoverHideCancel="popoverHideModelCancel()"></tree-select-module>
+      <tree-select-module
+              width="500"
+              :lazy=true
+              :multiple=true
+              :check-strictly=true
+              :modalShowFlag="modalShowFlag5"
+              :drawerTitle="drawerTitle"
+              :url="url"
+              :type="modelType"
+              :urlChild="urlChild"
+              :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys4"
+              :nodeKey="nodeKeyModel" @popoverHide="popoverCarHideModel"
+              @popoverHideCancel="popoverCarHideModelCancel()"></tree-select-module>
       <!--      导入失败-->
       <el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
         <p slot="title" style="color:#f60">
@@ -2148,8 +2191,10 @@ export default {
       modalShowFlag2: false, // drawer开关
       modalShowFlag3: false, // drawer开关
       modalShowFlag4: false, // drawer开关
+      modalShowFlag5: false,
       url: '',
       urlChild: '',
+      modelType: 'TRUCK',
       drawerTitle: '', //drawer标题
       nodeKey: 'id',
       nodeKeyCode: 'code',
@@ -2252,6 +2297,7 @@ export default {
       defaultCheckedKeys1: [],
       defaultCheckedKeys2: [],
       defaultCheckedKeys3: [],
+      defaultCheckedKeys4: [],
       defaultCodeProps: {
         children: 'children',
         label: 'code'
@@ -2438,6 +2484,8 @@ export default {
         KCCVPPSCN: '',
         DYBXH: '',
         DYMC: '',
+        DYBXHCAR: '',
+        DYMCCAR: '',
         CYSD: '',
         CLLX: '',
         NYLX: '',
@@ -2577,6 +2625,8 @@ export default {
         KCCVPPSCN: '',
         DYBXH: '',
         DYMC: '',
+        DYBXHCAR: '',
+        DYMCCAR: '',
         CYSD: '',
         CLLX: '',
         NYLX: '',
@@ -3053,7 +3103,17 @@ export default {
       this.modalShowFlag4 = true
       this.url = ''
       this.urlChild = ''
-      this.url = "sarModelTree/list"
+      this.modelType = type
+      this.url = "sarModelTree/listByType"
+      this.urlChild = "sarModelTree/childByList"
+    },
+    choiceZRR5(type, title, id) {
+      this.drawerTitle = title
+      this.modalShowFlag5 = true
+      this.url = ''
+      this.urlChild = ''
+      this.modelType = type
+      this.url = "sarModelTree/listByType"
       this.urlChild = "sarModelTree/childByList"
     },
     popoverHideQuery(ids, attrField) {
@@ -3122,6 +3182,22 @@ export default {
     popoverHideModelCancel() {
       this.modalShowFlag4 = false
     },
+    popoverCarHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
+      if (checkedData && checkedData.length != 0) {
+        if (checkedData.length > 0) {
+          this.sarStandardsInfoEO.DYBXHCAR = checkedData.map(item => item.model).join(",")
+          this.sarStandardsInfoEO.DYMCCAR = checkedData.map(item => item.name).join(",")
+        } else {
+          this.sarStandardsInfoEO.DYBXHCAR = checkedData.model
+          this.sarStandardsInfoEO.DYMCCAR = checkedData.name
+        }
+        this.modalShowFlag5 = false
+      }
+      this.$forceUpdate()
+    },
+    popoverCarHideModelCancel() {
+      this.modalShowFlag5 = false
+    },
     busVsFunc() {
       this.$http.get('sarVppsTree/list', '', {
         _this: this

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -1083,16 +1083,6 @@
                       <el-input v-model="sarStandardsInfoEO.KCCVPPSBM" placeholder="选择卡车VPPS编码" clearable @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"></el-input>
                     </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>
-                      <el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号" clearable @click.native="choiceZRR4('dybxh', '模块结构单元', sarStandardsInfoEO.dybxh)"></el-input>
-                    </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
@@ -1111,8 +1101,20 @@
                       ></el-input>
                     </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>
+                      <el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号(卡车)"
+                                clearable
+                                @click.native="choiceZRR4('TRUCK', '模块结构单元(卡车)', sarStandardsInfoEO.dybxh)"></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-form-item label="模块结构单元名称(卡车)" label-width="150px" prop="DYMC" class="add-form-item">
                       <el-input
                         v-model="sarStandardsInfoEO.DYMC"
                         disabled
@@ -1120,6 +1122,34 @@
                       ></el-input>
                     </el-form-item>
                   </template>
+                  <template v-else-if="field.attrField === 'DYBXHCAR'">
+                    <el-form-item
+                            prop="DYBXHCAR"
+                            label-width="150px"
+                            class="add-form-item"
+                    >
+                      <template slot="label">模块结构单元变型号(乘用车)</template>
+                      <el-input v-model="sarStandardsInfoEO.DYBXHCAR" placeholder="选择模块结构单元变型号(乘用车)"
+                                clearable
+                                @click.native="choiceZRR5('CAR', '模块结构单元(乘用车)', sarStandardsInfoEO.dybxhcar)"></el-input>
+                    </el-form-item>
+                  </template>
+                  <template v-else-if="field.attrField === 'DYMCCAR'">
+                    <el-form-item label="模块结构单元名称(乘用车)" label-width="150px" prop="DYMCCAR" class="add-form-item">
+                      <el-input
+                              v-if="sarStandardsInfoEO.DYBXHCAR === '' || sarStandardsInfoEO.DYBXHCAR === undefined"
+                              v-model="sarStandardsInfoEO.DYMCCAR = ''"
+                              disabled
+                              clearable
+                      ></el-input>
+                      <el-input
+                              v-else
+                              v-model="sarStandardsInfoEO.DYMCCAR"
+                              disabled
+                              clearable
+                      ></el-input>
+                    </el-form-item>
+                  </template>
                   <template v-else>
                     <custom-input
                       :config="field"
@@ -1676,11 +1706,26 @@
         :modalShowFlag="modalShowFlag4"
         :drawerTitle="drawerTitle"
         :url="url"
+        :type="modelType"
         :urlChild="urlChild"
         :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
         :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"
         @popoverHideCancel="popoverHideModelCancel()">
       </tree-select-module>
+      <tree-select-module
+              width="500"
+              :lazy=true
+              :multiple=true
+              :check-strictly=true
+              :modalShowFlag="modalShowFlag5"
+              :drawerTitle="drawerTitle"
+              :url="url"
+              :type="modelType"
+              :urlChild="urlChild"
+              :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys4"
+              :nodeKey="nodeKeyModel" @popoverHide="popoverCarHideModel"
+              @popoverHideCancel="popoverCarHideModelCancel()">
+      </tree-select-module>
       <!-- 导入失败 -->
       <el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
         <p slot="title" style="color:#f60">
@@ -1816,14 +1861,17 @@ export default {
       modalShowFlag2: false, // drawer开关
       modalShowFlag3: false, // drawer开关
       modalShowFlag4: false, // drawer开关
+      modalShowFlag5: false,
       url: '',
       urlChild: '',
+      modelType: 'TRUCK',
       drawerTitle: '', //drawer标题
       nodeKey: 'id',
       defaultCheckedKeys: [],
       defaultCheckedKeys1: [],
       defaultCheckedKeys2: [],
       defaultCheckedKeys3: [],
+      defaultCheckedKeys4: [],
       defaultCodeProps: {
         children: 'children',
         label: 'code'
@@ -2168,6 +2216,8 @@ export default {
         KCCVPPSCN: '',
         DYBXH: '',
         DYMC: '',
+        DYBXHCAR: '',
+        DYMCCAR: '',
         CYSD: '',
         CLLX: '',
         NYLX: '',
@@ -2593,7 +2643,17 @@ export default {
       this.modalShowFlag4 = true
       this.url = ''
       this.urlChild = ''
-      this.url = "sarModelTree/list"
+      this.modelType = type
+      this.url = "sarModelTree/listByType"
+      this.urlChild = "sarModelTree/childByList"
+    },
+    choiceZRR5(type, title, id) {
+      this.drawerTitle = title
+      this.modalShowFlag5 = true
+      this.url = ''
+      this.urlChild = ''
+      this.modelType = type
+      this.url = "sarModelTree/listByType"
       this.urlChild = "sarModelTree/childByList"
     },
     popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
@@ -2642,6 +2702,22 @@ export default {
     }, popoverHideModelCancel() {
       this.modalShowFlag4 = false
     },
+    popoverCarHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
+      if (checkedData && checkedData.length != 0) {
+        if (checkedData.length > 0) {
+          this.sarStandardsInfoEO.DYBXHCAR = checkedData.map(item => item.model).join(",")
+          this.sarStandardsInfoEO.DYMCCAR = checkedData.map(item => item.name).join(",")
+        } else {
+          this.sarStandardsInfoEO.DYBXHCAR = checkedData.model
+          this.sarStandardsInfoEO.DYMCCAR = checkedData.name
+        }
+        this.modalShowFlag5 = false
+      }
+      this.$forceUpdate()
+    },
+    popoverCarHideModelCancel() {
+      this.modalShowFlag5 = false
+    },
     // 将文本状态的id与name对应
     setMap(data) {
       data.forEach(item => {