增加乘用车vpps编码 模块变型号 企标类别字段

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -610,16 +610,63 @@
                             <el-input v-model="sarBussionessStandEO.TXLBBUSS" placeholder="选择体系类别" @click.native="choiceZRR1('TXLBBUSS', '体系类别', sarBussionessStandEO.TXLBBUSS)"></el-input>
                         </el-form-item>
                     </template>
-                    <template v-else-if="field.attrField === 'VPPSBMBUSS'">
+                    <template v-else-if="field.attrField === 'CYCVPPSBMBUSS'">
                         <el-form-item
-                                prop="VPPSBMBUSS"
+                                prop="CYCVPPSBMBUSS"
                                 label-width="150px"
                                 class="add-form-item"
                         >
-                            <template slot="label">关联模块--VPPS编码</template>
+                            <template slot="label">关联模块--乘用车VPPS编码</template>
-                            <el-input v-model="sarBussionessStandEO.VPPSBMBUSS" placeholder="选择VPPS编码" @click.native="choiceZRR2('VPPSBMBUSS', 'VPPS编码', sarBussionessStandEO.VPPSBMBUSS,true)"></el-input>
+                            <el-input v-model="sarBussionessStandEO.CYCVPPSBMBUSS" placeholder="选择VPPS编码" @click.native="choiceZRR2('car', '乘用车VPPS编码', sarBussionessStandEO.KCVPPSBMBUSS,true)"></el-input>
                         </el-form-item>
                     </template>
+                  <template v-else-if="field.attrField === 'CYCVPPSCNBUSS'">
+                    <el-form-item title="关联模块--乘用车vpps中文名称" label="关联模块--乘用车vpps中文名称" label-width="150px"
+                                  prop="CYCVPPSCNBUSS" class="add-form-item">
+                      <el-input
+                        v-model="sarBussionessStandEO.CYCVPPSCNBUSS" disabled
+                        clearable
+                      ></el-input>
+                    </el-form-item>
+                  </template>
+                    <template v-else-if="field.attrField === 'KCVPPSBMBUSS'">
+                      <el-form-item
+                        prop="KCVPPSBMBUSS"
+                        label-width="150px"
+                        class="add-form-item"
+                      >
+                        <template slot="label">关联模块--卡车VPPS编码</template>
+                        <el-input v-model="sarBussionessStandEO.KCVPPSBMBUSS" placeholder="选择VPPS编码" @click.native="choiceZRR3('struck', '卡车VPPS编码', sarBussionessStandEO.KCVPPSBMBUSS,true)"></el-input>
+                      </el-form-item>
+                    </template>
+                    <template v-else-if="field.attrField === 'KCVPPSCNBUSS'">
+                      <el-form-item title="关联模块--乘用车vpps中文名称" label="关联模块--乘用车vpps中文名称" label-width="150px"
+                                    prop="KCVPPSCNBUSS" class="add-form-item">
+                        <el-input
+                          v-model="sarBussionessStandEO.KCVPPSCNBUSS" disabled
+                          clearable
+                        ></el-input>
+                      </el-form-item>
+                  </template>
+                  <template v-else-if="field.attrField === 'DYBXHBUSS'">
+                    <el-form-item
+                      prop="DYBXHBUSS"
+                      label-width="150px"
+                      class="add-form-item"
+                    >
+                      <template slot="label">模块结构单元变型号</template>
+                      <el-input v-model="sarBussionessStandEO.DYBXHBUSS" placeholder="选择模块结构单元变型号"
+                                @click.native="choiceZRR4('dybxhbuss', '模块结构单元', sarBussionessStandEO.dybxh)"></el-input>
+                    </el-form-item>
+                  </template>
+                  <template v-else-if="field.attrField === 'DYMCBUSS'">
+                    <el-form-item label="模块结构单元名称" label-width="150px" prop="DYMCBUSS" class="add-form-item">
+                      <el-input
+                        v-model="sarBussionessStandEO.DYMCBUSS" disabled
+                        clearable
+                      ></el-input>
+                    </el-form-item>
+                  </template>
                     <template v-else-if="field.attrField === 'VPPSCNBUSS'">
                         <el-form-item title="关联模块--中文名称" label="关联模块--中文名称" label-width="150px" prop="VPPSCNBUSS" class="add-form-item">
                             <el-input
@@ -1298,11 +1345,38 @@
               :multiple="multipleFlag2"
               :check-strictly=true
               :modalShowFlag="modalShowFlag2"
-              :drawerTitle="drawerTitle"
+              :drawerTitle="drawerTitle2"
+              :type="type"
               :url="url"
               :urlChild="urlChild"
               :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
-              :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></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="drawerTitle3"
+      :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="drawerTitle4"
+      :url="url"
+      :urlChild="urlChild"
+      :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
+      :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"
+      @popoverHideCancel="popoverHideModelCancel()"></tree-select-module>
   </div>
 </template>
 
@@ -1320,6 +1394,7 @@ import CustomSVPPS from '@/components/CustomFormComponents/SVPPS'
 import TreeSelect from '@/components/treeSelect/treeSelect.vue';
 import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
 import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
+import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
 
 import {mapGetters} from 'vuex'
 import store from "@/store";
@@ -1338,6 +1413,7 @@ export default {
     CustomSVPPS,
     TreeSelect,
     TreeSelectNew,
+    treeSelectModule,
     ProcessTitle
   },
   props: {
@@ -1496,6 +1572,12 @@ export default {
       sarBussionessStandEO: {
         TXLBBUSS:'',
         VPPSBMBUSS:'',
+        KCVPPSBMBUSS: '',
+        KCVPPSCNBUSS: '',
+        DYBXHBUSS: '',
+        DYMCBUSS: '',
+        CYCVPPSBMBUSS: '',
+        CYCVPPSCNBUSS: '',
         VPPSCNBUSS:'',
         regionShow: '亚洲',
         region: '2T8PFTSYE7',
@@ -1880,6 +1962,12 @@ export default {
           SYCPXCLASS:'',
           TXLBBUSS:'',
           VPPSBMBUSS:'',
+        KCVPPSBMBUSS: '',
+        KCVPPSCNBUSS: '',
+        CYCVPPSBMBUSS: '',
+        CYCVPPSCNBUSS: '',
+        DYBXHBUSS: '',
+        DYMCBUSS: '',
           VPPSCNBUSS:'',
         // 关联信息
           DTQBBHBUSS:'',
@@ -1965,6 +2053,9 @@ export default {
         syrzOptions:[],//适用认证下拉框
         gkglbmOptions:[],//归口管理部门下拉框
       drawerTitle: '',
+      drawerTitle3: '',
+      drawerTitle4: '',
+      drawerTitle2: '',
       modalShowRoleFlag: false,
       nodeList: [],
       nodeList2: [],
@@ -2023,6 +2114,7 @@ export default {
       modalShowFlag2: false, // drawer开关
       modalShowFlag3: false, // drawer开关
       modalShowFlag4: false, // drawer开关
+      type: '',
       url:'',
       urlChild:'',
     }
@@ -2085,27 +2177,56 @@ export default {
           return [year, month, day].join('-') + " " + [hour, minute, second].join(':');//格式为：YY-MM-DD hh:mm:ss（当前时间）
       },
       popoverHideQuery(ids,attrField){
-          console.log(ids)
-          console.log("-----------------------------")
-          console.log(attrField)
       },
+    popoverHideBusVsCancel() {
+      this.modalShowFlag2 = false
+    },
       popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-          if(checkedData) {
+        if (checkedData && checkedData.length != 0) {
-              if(checkedData.length > 0){
+          if (checkedData.length > 0) {
-                  this.sarBussionessStandEO.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
+            this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
-                  this.sarBussionessStandEO.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
+            this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
-                  this.sarBussionessSearch.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
+          } else {
-                  this.sarBussionessSearch.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
+            this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.code
-              }else {
+            this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.chineseName
-                  this.sarBussionessStandEO.VPPSBMBUSS = checkedData.code
-                  this.sarBussionessStandEO.VPPSCNBUSS = checkedData.chineseName
-                  this.sarBussionessSearch.VPPSBMBUSS = checkedData.code
-                  this.sarBussionessSearch.VPPSCNBUSS = checkedData.chineseName
-              }
           }
           this.modalShowFlag2 = false
+        }
           this.$forceUpdate()
       },
+    popoverHideCarVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
+      if (checkedData && checkedData.length != 0) {
+        if (checkedData.length > 0) {
+          this.sarBussionessStandEO.KCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
+          this.sarBussionessStandEO.KCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
+        } else {
+          this.sarBussionessStandEO.KCVPPSBMBUSS = checkedData.code
+          this.sarBussionessStandEO.KCVPPSCNBUSS = checkedData.chineseName
+        }
+        this.modalShowFlag3 = false
+      }
+
+      this.$forceUpdate()
+    },
+    popoverHideCarVsCancel() {
+      this.modalShowFlag3 = false
+    },
+    popoverHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
+      if (checkedData && checkedData.length != 0) {
+        if (checkedData.length > 0) {
+          this.sarBussionessStandEO.DYBXHBUSS = checkedData.map(item => item.model).join(",")
+          this.sarBussionessStandEO.DYMCBUSS = checkedData.map(item => item.name).join(",")
+        } else {
+          this.sarBussionessStandEO.DYBXHBUSS = checkedData.model
+          this.sarBussionessStandEO.DYMCBUSS = checkedData.name
+        }
+        this.modalShowFlag4 = false
+      }
+      this.$forceUpdate()
+    },
+    popoverHideModelCancel() {
+      this.modalShowFlag4 = false
+    },
       popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
           if(checkedData) {
               if(checkedData.length > 0){
@@ -2120,14 +2241,31 @@ export default {
           this.$forceUpdate()
       },
       choiceZRR2 (type, title, id,multFlag) {
-          this.drawerTitle = title
+          this.drawerTitle2 = title
           this.modalShowFlag2 = true
           this.multipleFlag2 = multFlag
           this.url = ''
           this.urlChild = ''
+          this.type = type
           this.url="sarVppsTree/list"
           this.urlChild="sarVppsTree/childByList"
       },
+    choiceZRR3(type, title, id) {
+      this.drawerTitle3 = title
+      this.modalShowFlag3 = true
+      this.url = ''
+      this.urlChild = ''
+      this.url = "sarVppsTree/list"
+      this.urlChild = "sarVppsTree/childByList"
+    },
+    choiceZRR4(type, title, id) {
+      this.drawerTitle4 = title
+      this.modalShowFlag4 = true
+      this.url = ''
+      this.urlChild = ''
+      this.url = "sarModelTree/list"
+      this.urlChild = "sarModelTree/childByList"
+    },
       choiceZRR1 (type, title, id) {
           this.drawerTitle1 = title
           this.modalShowFlag1 = true
@@ -2883,7 +3021,6 @@ export default {
                         })
                     })
                     this.dynamicFormField = displayLocation
-                  console.log('2805',this.dynamicFormField)
                     this.loading = false
                 })
                 this.sarBussionessStandEO = JSON.parse(JSON.stringify(item))
@@ -2935,7 +3072,6 @@ export default {
       $('#deptBtn2').click()
     },
     choiceQCR (type, title, id) {
-      console.log('2077',title)
       this.nodeList = []
       this.nodeList.push(id)
       this.userType = type
@@ -2943,7 +3079,6 @@ export default {
       this.modalShowRoleFlag = true
     },
     checkedRole2 (data) {
-      console.log('1712',this.drawerTitle)
       let idList = ''
       let nameList = ''
       data.forEach( item => {
@@ -2966,8 +3101,6 @@ export default {
       this.modalshowflagZRBM = true
     },
     drawerCheckZRBM(data) {
-
-      console.log("5389", data);
       let idList = ''
       let nameList = ''
       data.forEach(item => {
@@ -3001,7 +3134,6 @@ export default {
             if (flag) {
               // 时间格式修改
               let nowstandinfo = JSON.parse(JSON.stringify(this.sarBussionessStandEO))
-              console.log(nowstandinfo)
               if (nowstandinfo.issueTime != null && nowstandinfo.issueTime !== '') {
                 nowstandinfo.issueTime = this.$dateFormat(this.sarBussionessStandEO.issueTime, 'yyyy-MM-dd hh:mm:ss')
               }
@@ -3018,7 +3150,6 @@ export default {
               }
               // 处理动态表单的时间和下拉框格式
               const formFieldList = this.formFieldList
-              console.log(this.formFieldList)
               const sarStandAttrObj = {}
               formFieldList.forEach((item) => {
                 const value = nowstandinfo[item.attrField]
@@ -3713,8 +3844,6 @@ export default {
         }
         this.standinfoList = []
         this.standinfoList = res.data.list
-          console.log(this.standinfoList)
-          console.log(res.data.list)
         this.total = res.data.count
         if ((this.standinfoList.length === 0 || this.standinfoList === []) && this.sarBussionessSearch.page !== 1) {
           this.pageChange(1)
@@ -3826,7 +3955,6 @@ export default {
           }
         })
       } else if (this.ocrList.length === 1 && type === '2'){
-        console.log('4228',this.ocrList)
         this.selectStandardPro(this.ocrList[0], 'edit')
       }
     },
@@ -3983,7 +4111,6 @@ export default {
         }, {
           _this: this
         }, res => {
-          console.log('getAreaList',res.data)
           this.showRegionOptions = res.data || []
           resolve(res.data || [])
         }, e => {
@@ -4073,7 +4200,10 @@ export default {
             rule.push({ required: true, message: `${item.attrName}不能为空`, trigger: 'change' })
           }
         }
-        if (item.attrLen && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS') {
+        if (item.attrLen && item.attrType === 'INPUT_STR' && item.attrField === 'DTQBBHBUSS') {
+          rule.push({type: 'string', max: 500, message: '代替企标编号不能超过500个字符', trigger: 'change'})
+        }
+        if (item.attrLen && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS'&& item.attrType !== 'INPUT_STR') {
           rule.push({type: 'string', max: item.attrLen, message: `${item.attrName}不能超过${item.attrLen}个字符`, trigger: 'change'})
         }
         if (rule.length > 0) {
@@ -4084,6 +4214,7 @@ export default {
       // this.rules = rules
       this.$set(this, 'sarBussionessStandRules', rules)
 
+
       setTimeout(() => {
         this.reloadAddForm = true
       }, 1000)
@@ -4140,7 +4271,6 @@ export default {
         }
           this.stahndinfoList = []
           this.stahndinfoList = res.data.list
-          console.log(this.stahndinfoList)
         this.total = res.data.count
         if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.sarBussionessSearch.page !== 1) {
           this.pageChange(1)
@@ -4292,7 +4422,6 @@ export default {
                   day = "0" + day;
                 }
                 const FSRQBUSS = year + "-" + month + "-" + day;
-                console.log(FSRQBUSS,"FSRQBUSS");
                 this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS
 
               }
@@ -4332,7 +4461,7 @@ export default {
       this.energyKindOptions = res.data.ENERGYTYPES
       this.standGeneraOptions = res.data.BUSSBIGCLASS
       this.standSubclassOptions = res.data.BUSSFINECLASS
-        this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
+        this.standSortOptions = res.data.BUSSSTANDCLASS // 企业标准类别
         this.standNatureOptions = res.data.SARPROPERTY // 标准性质
         this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
         this.standSystemOptions = res.data.TXLBBUSS // 标准体系