diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 1d3f00ea0..5262fcd56 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -15,10 +15,10 @@

- -

标准分解单 @@ -607,12 +622,12 @@
{{ !child.value || child.value === 'null' ? '-' : child.value }} {{ child.value || '-' }}

标准分解单 @@ -709,12 +728,6 @@
-
-
- {{ item.showAll ? '收起' : '更多' }} - -
-
@@ -725,12 +738,12 @@
@@ -739,10 +752,10 @@ @@ -756,10 +769,10 @@
+ v-model="standItemSearch.XCXSSRQ" + type="date" + value-format="yyyy-MM-dd" + placeholder="新车实施日期">
@@ -767,28 +780,28 @@
+ v-model="standItemSearch.ZCCSSRQ" + type="date" + value-format="yyyy-MM-dd" + placeholder="在产车实施日期">
+ :loading="searching" + type="primary" + size="mini" + class="common-button-primary" + @click="searchSarStandItems"> 查询 + class="common-button-default" + @click="clearAllSearch" + size="mini"> 清空 @@ -802,60 +815,61 @@ 导出 关联条款 编辑 + size="mini" + type="primary" + class="common-button-primary" + @click="editResolveList" + >编辑 +
+ @select="select" + @selection-change="selectAllStand"> + show-overflow-tooltip + prop="comparedWithPrevious" + label="基于上一版本差异" + width="170"> + prop="xccssrq" + label="新车型实施日期(文本)" + width="180"> + prop="zccssrq" + label="在产车实施日期(文本)" + width="170"> - - - - + + + + + prop="dutyEngineer" + label="责任工程师" + width="100"> + show-overflow-tooltip + label="符合性状态" + width="100"> + show-overflow-tooltip + prop="complianceState" + label="合规性分析" + width="100"> @@ -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 ( this.roleForm.qcUserId.length > 0) { - this.nodeList2 = this.roleForm.qcUserId.split(',') + if(type === 'bussUser2'){ + if ( this.roleForm.bussUser2.length > 0) { + this.nodeList2 = this.roleForm.bussUser2.split(',') } - }else if(type === 'hqUserId'){ - if ( this.roleForm.hqUserId.length > 0) { - this.nodeList2 = this.roleForm.hqUserId.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) { @@ -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 }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index b509579d8..81327f6f9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -19,7 +19,7 @@ label-width="210px" >
- + >
@@ -553,11 +553,11 @@