diff --git a/src/views/modules/auth/authInfo.vue b/src/views/modules/auth/authInfo.vue index bbcd197..82307a3 100644 --- a/src/views/modules/auth/authInfo.vue +++ b/src/views/modules/auth/authInfo.vue @@ -80,6 +80,7 @@ 草稿 下达 已报价 + 已驳回 {{ scope.row.status }} 草稿 - 下达 - 已报价 + 下达 + 已报价 + 已驳回 + {{ scope.row.status }} @@ -1468,6 +1470,8 @@ export default { this.modalData.actAuthorizator = row.userName this.modalData.remark = row.authHistRemark this.modalData.actAuthorizeDate = row.strActAuthorizeDate + this.modalData.orderRef1 = row.rfqNo + this.modalData.orderRef2 = row.buNo if (val === "Y") { if (row.lastStepFlag === 'Y') { this.modalData.approveResult = "已审批" diff --git a/src/views/modules/auth/authQuote.vue b/src/views/modules/auth/authQuote.vue index 23367fb..11dc55b 100644 --- a/src/views/modules/auth/authQuote.vue +++ b/src/views/modules/auth/authQuote.vue @@ -80,7 +80,7 @@ @@ -126,33 +127,64 @@ layout="total, sizes, prev, pager, next, jumper"> - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + +
+ {{'关闭'}} +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -246,18 +278,15 @@ export default { DictDataSelect, Chooselist }, - props:{ - height:{ - type:Number, - default:200 - } - }, + data() { return { + height: 200, userBuList: [], copyPriceCheckDetail:{}, loading:false, attributeDialog:true, + quoteRuleDetailModalFlag: false, activeName: 'quotationInformation', priceCheckRule: { associatedPartNo:[{required: true, message: ' ', trigger: 'change'},], @@ -727,10 +756,9 @@ export default { inquiryPartItemModalFlag: false, } }, - mounted() { + mounted () { this.$nextTick(() => { - /*第二个表格高度的动态调整*/ - this.height = window.innerHeight - 210; + this.height = window.innerHeight - 558 }) }, created() { @@ -794,7 +822,7 @@ export default { */ tabClick(tab, event) { // 刷新列表数据 - this.refreshCurrentTabTable() + // this.refreshCurrentTabTable() }, // ======== 列表操作方法 ======== @@ -815,14 +843,14 @@ export default { if (row) { this.quoteCurrentRow = JSON.parse(JSON.stringify(row)) //刷新当前页表 - this.refreshCurrentTabTable() + // this.refreshCurrentTabTable() } }, /** * 刷新页签的table数据 */ - refreshCurrentTabTable() { - }, + // refreshCurrentTabTable() { + // }, // ======== 列表数据刷新方法 ======== /** @@ -993,9 +1021,9 @@ export default { this.modalData.orderRef1 = row.quoteVersionNo if (val === "Y") { if (row.lastStepFlag === 'Y') { - this.modalData.approveResult = "已审批" + this.modalData.approveResult = "全部审批" } else { - this.modalData.approveResult = "已审批" + this.modalData.approveResult = "部分审批" } } else if (val === "N") { this.modalData.approveResult = "未通过" @@ -1111,6 +1139,9 @@ export default { } this.modalFlag = false }, + closeQuoteRuleDetailDataDialog() { + this.quoteRuleDetailModalFlag = false + }, rowStyle({row}) { if (this.quoteCurrentRow.id === row.id) { return {'background-color': '#E8F7F6', cursor: 'pointer'}; @@ -1243,3 +1274,10 @@ div.table-el-date /deep/ input.el-input__inner{ } + + diff --git a/src/views/modules/inquiry/inquiryTechnicalMaterialsNoBuilt.vue b/src/views/modules/inquiry/inquiryTechnicalMaterialsNoBuilt.vue index f09c6a4..eebb534 100644 --- a/src/views/modules/inquiry/inquiryTechnicalMaterialsNoBuilt.vue +++ b/src/views/modules/inquiry/inquiryTechnicalMaterialsNoBuilt.vue @@ -320,17 +320,25 @@ + :close-on-click-modal="false" top="10%" :visible.sync="inquiryPartModalFlag" width="526px"> - - - - - + + 产品编码 + + 产品编码 + - - + + + + + - - + + {{ '产品编码为' + ' ' + '*' + }}
 @@ -349,6 +358,10 @@ + + + @@ -509,6 +522,15 @@ export default { } }, watch: { + noFlag: { + handler: function (newV, oldV) { + if (this.noFlag === 'Y') { + this.inquiryPartModalData.partNo = '*' + } else { + this.inquiryPartModalData.partNo = '' + } + } + }, searchData: { deep: true, handler: function (newV, oldV) { @@ -544,6 +566,7 @@ export default { copyPriceCheckDetail:{}, loading:false, attributeDialog:true, + noFlag:'Y', priceCheckRule: { associatedPartNo:[{required: true, message: ' ', trigger: 'change'},], materialRequired:[{required: true, message: ' ', trigger: 'change'},], @@ -2139,6 +2162,10 @@ export default { conSql = " and b.site = '" + this.$store.state.user.site + "'" } } + if (val === 2005) { + strVal = this.inquiryPartModalData.partNo ? this.inquiryPartModalData.partNo : '' + conSql = " and a.site = '" + this.$store.state.user.site + "'" + } this.$refs.baseList.init(val, strVal, conSql) }) }, @@ -2190,6 +2217,10 @@ export default { this.modalData.requesterName = val.user_display } } + if (this.tagNo === 2005) { + this.inquiryPartModalData.partNo = val.part_no + this.inquiryPartModalData.partDesc = val.part_desc + } }, // ======== 询价产品相关方法 ======== @@ -2223,7 +2254,7 @@ export default { buNo: this.inquiryCurrentRow.buNo, buDesc: this.inquiryCurrentRow.buDesc, rfqId: this.inquiryCurrentRow.id, - partNo: '', + partNo: '*', partDesc: '', inquiryQty: '', umId: '', @@ -2240,6 +2271,13 @@ export default { async saveInquiryPartData() { await this.modelBlur(220) await this.umIdBlur(510) + if (this.noFlag === 'N'){ + await this.partNoBlur(2005) + } + if (this.inquiryPartModalData.partNo === '' || this.inquiryPartModalData.partNo == null) { + this.$message.warning('请输入产品编码！') + return + } if (this.inquiryPartModalData.partDesc === '' || this.inquiryPartModalData.partDesc == null) { this.$message.warning('请输入产品描述！') return @@ -2522,6 +2560,37 @@ export default { } }, + async partNoBlur(tagNo) { + if (this.inquiryPartModalData.partNo != null && this.inquiryPartModalData.partNo !== '') { + let tempData = { + tagno: tagNo, + conditionSql: " and a.part_no = '" + this.inquiryPartModalData.partNo + "'" + + " and a.site = '" + this.inquiryPartModalData.bu.split('_')[0] + "'" + }; + + // 返回 Promise + return verifyData(tempData).then(({ data }) => { + if (data && data.code === 0) { + if (data.baseListData.length > 0) { + this.inquiryPartModalData.partDesc = data.baseListData[0].part_desc; + } else { + this.inquiryPartModalData.partDesc = ''; + } + } else { + this.$message.warning(data.msg); + this.inquiryPartModalData.partDesc = ''; + } + }).catch(error => { + console.error(error); + this.$message.error('校验失败，请重试'); + this.inquiryPartModalData.partDesc = ''; + }); + } else { + this.inquiryPartModalData.partDesc = ''; + return Promise.resolve(); // 如果 umId 为空，直接返回 resolved Promise + } + }, + // ======== 导出相关方法 ======== /** * 导出excel @@ -2686,6 +2755,7 @@ export default { remark: '', createBy: '' } + this.noFlag = 'Y' this.inquiryPartModalFlag = false }, rowStyle({row}) { diff --git a/src/views/modules/part/quicklyCreateBom.vue b/src/views/modules/part/quicklyCreateBom.vue index 95928d1..df483ee 100644 --- a/src/views/modules/part/quicklyCreateBom.vue +++ b/src/views/modules/part/quicklyCreateBom.vue @@ -357,7 +357,6 @@ export default { }) }, activated() { - console.log(this.$route.query.data) if (this.$route.query.data) { this.searchData = this.$route.query.data this.searchData.partDesc = this.$route.query.data.testPartDesc diff --git a/src/views/modules/quote/detail/quoteDetail.vue b/src/views/modules/quote/detail/quoteDetail.vue index 59fd86c..3e9e1f6 100644 --- a/src/views/modules/quote/detail/quoteDetail.vue +++ b/src/views/modules/quote/detail/quoteDetail.vue @@ -29,10 +29,6 @@ export default { type:Object, required:true }, - height:{ - type:[Number,String], - default:300 - }, authFlag:{ type:Boolean, default:false @@ -47,6 +43,7 @@ export default { }, data(){ return{ + height: 300, quoteDetail:{ id:null, partNo:'', @@ -127,7 +124,7 @@ export default { sortLv: 0, status: true, fixed: '', - columnWidth: 120 + columnWidth: 90 }, { userId: this.$store.state.user.name, @@ -145,7 +142,7 @@ export default { sortLv: 0, status: true, fixed: '', - columnWidth: 320 + columnWidth: 170 }, { userId: this.$store.state.user.name, @@ -181,7 +178,7 @@ export default { sortLv: 0, status: true, fixed: '', - columnWidth: 100 + columnWidth: 80 }, { userId: this.$store.state.user.name, @@ -199,7 +196,7 @@ export default { sortLv: 0, status: true, fixed: '', - columnWidth: 130 + columnWidth: 80 }, { userId: this.$store.state.user.name, @@ -217,7 +214,7 @@ export default { sortLv: 0, status: true, fixed: '', - columnWidth: 120 + columnWidth: 80 }, { userId: this.$store.state.user.name, @@ -235,7 +232,7 @@ export default { sortLv: 0, status: true, fixed: '', - columnWidth: 120 + columnWidth: 80 }, { userId: this.$store.state.user.name, @@ -253,7 +250,7 @@ export default { sortLv: 0, status: true, fixed: '', - columnWidth: 120 + columnWidth: 80 } ,{ userId: this.$store.state.user.name, @@ -271,7 +268,7 @@ export default { sortLv: 0, status: true, fixed: '', - columnWidth: 140 + columnWidth: 90 }, { userId: this.$store.state.user.name, @@ -289,7 +286,7 @@ export default { sortLv: 0, status: true, fixed: '', - columnWidth: 140 + columnWidth: 70 }, { userId: this.$store.state.user.name, @@ -307,7 +304,7 @@ export default { sortLv: 0, status: true, fixed: '', - columnWidth: 260 + columnWidth: 130 }, { userId: this.$store.state.user.name, @@ -325,7 +322,7 @@ export default { sortLv: 0, status: true, fixed: '', - columnWidth: 260 + columnWidth: 130 }, { userId: this.$store.state.user.name, @@ -343,7 +340,7 @@ export default { sortLv: 0, status: true, fixed: '', - columnWidth: 260 + columnWidth: 130 }, { userId: this.$store.state.user.name, @@ -361,7 +358,7 @@ export default { sortLv: 0, status: true, fixed: '', - columnWidth: 260 + columnWidth: 130 }, { userId: this.$store.state.user.name, @@ -379,7 +376,7 @@ export default { sortLv: 0, status: true, fixed: '', - columnWidth: 200 + columnWidth: 70 }, ], partVisible:false, @@ -494,7 +491,11 @@ export default { this.queryLoading = true; queryQuoteDetail(params).then(({data})=>{ if (data && data.code === 0){ - this.dataList = data.rows + if (this.authFlag){ + this.dataList = data.rows1 + } else { + this.dataList = data.rows + } }else { this.$message.warning(data.msg); } @@ -656,6 +657,13 @@ export default { this.quoteDetail.profitRate = this.quote.markup this.quoteDetail.quoteProfitRate = this.quote.markup this.handleQueryQuoteDetail(); + }, + mounted () { + if (!this.authFlag){ + this.$nextTick(() => { + this.height = window.innerHeight - 150 + }) + } } } @@ -665,7 +673,8 @@ export default { - + · - + + +