diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss index 2993825..1ef764d 100644 --- a/src/assets/scss/global.scss +++ b/src/assets/scss/global.scss @@ -314,6 +314,39 @@ input.el-input__inner{ line-height: 20px; } +.el-input-number{ + width: 100%; +} + +.el-input-number .el-input__inner { + text-align: right; + padding-right: 15px !important; + padding-left: 0 !important; +} + +.el-input-number--medium .el-input-number__decrease, .el-input-number--medium .el-input-number__increase{ + width: 18px; + height: 18px; + font-size: 14px; + line-height: 1.5; +} +.el-input-number--mini{ + line-height: 20px +} +.el-input-number--mini .el-input-number__decrease, .el-input-number--mini .el-input-number__increase{ + width: 18px; + height: 18px; + font-size: 14px; + line-height: 1.5; +} + + .el-input .el-input--medium{ + line-height: 20px; +} + .el-input-number .el-input--medium{ + line-height: 20px; +} + // sxm 模态框 2021-12-22 .el-dialog__header { diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue index b6dbf7f..3898bfc 100644 --- a/src/views/modules/proofing/requestForProofing.vue +++ b/src/views/modules/proofing/requestForProofing.vue @@ -192,7 +192,7 @@ - + diff --git a/src/views/modules/quotation/priceCheckProperties.vue b/src/views/modules/quotation/priceCheckProperties.vue index 9e818f9..b2dc13c 100644 --- a/src/views/modules/quotation/priceCheckProperties.vue +++ b/src/views/modules/quotation/priceCheckProperties.vue @@ -90,41 +90,42 @@ export default { status: true, fixed: '', columnWidth:80, - },{ - userId: this.$store.state.user.name, - functionId: 100002001, - serialNumber: '100002001TableMinValue', - tableId: "100002001Table", - tableName: "属性表", - columnProp: 'minValue', - headerAlign: "center", - align: "center", - columnLabel: '最小值', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth:80, - },{ - userId: this.$store.state.user.name, - functionId: 100002001, - serialNumber: '100002001TableMaxValue', - tableId: "100002001Table", - tableName: "属性表", - columnProp: 'maxValue', - headerAlign: "center", - align: "center", - columnLabel: '最大值', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth:80, }, + // { + // userId: this.$store.state.user.name, + // functionId: 100002001, + // serialNumber: '100002001TableMinValue', + // tableId: "100002001Table", + // tableName: "属性表", + // columnProp: 'minValue', + // headerAlign: "center", + // align: "center", + // columnLabel: '最小值', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // columnWidth:80, + // },{ + // userId: this.$store.state.user.name, + // functionId: 100002001, + // serialNumber: '100002001TableMaxValue', + // tableId: "100002001Table", + // tableName: "属性表", + // columnProp: 'maxValue', + // headerAlign: "center", + // align: "center", + // columnLabel: '最大值', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // columnWidth:80, + // }, { userId: this.$store.state.user.name, functionId: 100002001, @@ -161,23 +162,23 @@ export default { // fixed: '', // columnWidth:120, // }, - { - userId: this.$store.state.user.name, - functionId: 100002001, - serialNumber: '100002001TableDefaultValue', - tableId: "100002001Table", - tableName: "属性表", - columnProp: 'defaultValue', - headerAlign: "center", - align: "right", - columnLabel: '参照值', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - }, + // { + // userId: this.$store.state.user.name, + // functionId: 100002001, + // serialNumber: '100002001TableDefaultValue', + // tableId: "100002001Table", + // tableName: "属性表", + // columnProp: 'defaultValue', + // headerAlign: "center", + // align: "right", + // columnLabel: '参照值', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // }, ], searchDataList:[], } diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue index 477814d..4dadd66 100644 --- a/src/views/modules/quotation/requestForQuote.vue +++ b/src/views/modules/quotation/requestForQuote.vue @@ -11,7 +11,7 @@ - + @@ -211,7 +211,7 @@ - 跟单员 + 采购专员 @@ -239,13 +239,13 @@ - + - + @@ -257,6 +257,25 @@ + + + + + + + + + + + + + + + + + + + @@ -458,6 +477,8 @@ @row-dblclick="projectClickRow"> + + @@ -1524,7 +1545,7 @@ export default { columnProp: 'trackerName', headerAlign: 'center', align: 'left', - columnLabel: '跟单员', + columnLabel: '采购专员', columnHidden: false, columnImage: false, columnSortable: false, @@ -2322,6 +2343,8 @@ export default { quoteType: '', projectId: '', projectName: '', + finalCustomerId: '', + finalCustomerName: '', tracker: '', trackerName: '', quoter: '', @@ -2367,6 +2390,8 @@ export default { customerDesc: row.customerDesc, projectId: row.projectId, projectName: row.projectName, + finalCustomerId: row.finalCustomerId, + finalCustomerName: row.finalCustomerName, tracker: row.tracker, trackerName: row.trackerName, quoter: row.quoter, @@ -2391,7 +2416,8 @@ export default { confirmBy: row.confirmBy, confirmInformation: row.confirmInformation, quotationResultStatus: row.quotationResultStatus, - updateBy: this.$store.state.user.name + updateBy: this.$store.state.user.name, + quotationAmount:row.quotationAmount } this.priceCheckDetail = row.priceCheckDetail this.modalDisableFlag = true @@ -2466,11 +2492,11 @@ export default { return } if (this.modalData.tracker === '' || this.modalData.tracker == null) { - this.$message.warning('请选择跟单员编码！') + this.$message.warning('请选择采购专员编码！') return } if (this.modalData.trackerName === '' || this.modalData.trackerName == null) { - this.$message.warning('请选择跟单员名称！') + this.$message.warning('请选择采购专员名称！') return } if (this.modalData.projectId === '' || this.modalData.projectId == null) { @@ -3292,6 +3318,8 @@ export default { projectClickRow(row) { this.modalData.projectId = row.projectId this.modalData.projectName = row.projectName + this.modalData.finalCustomerId = row.finalCustomerId + this.modalData.finalCustomerName = row.finalCustomerName this.getProjectPartList() this.chooseProjectListFlag = false }, diff --git a/src/views/modules/quotation/sellForQuotation.vue b/src/views/modules/quotation/sellForQuotation.vue index e069123..d631155 100644 --- a/src/views/modules/quotation/sellForQuotation.vue +++ b/src/views/modules/quotation/sellForQuotation.vue @@ -7,7 +7,7 @@ - + @@ -135,7 +135,7 @@ + @close="closeInsertDialog" :close-on-click-modal="false" v-drag :visible.sync="insertDiaLogFlag" width="32vw"> @@ -182,6 +182,18 @@ + + + + + + + + + + + + @@ -212,10 +224,10 @@ - - + + 跟单员 + herf="#">采购专员 @@ -281,13 +293,15 @@ - + + + 关闭 @@ -323,6 +337,8 @@ @row-click="projectClickRow"> + + @@ -365,7 +381,7 @@ export default { site: this.$store.state.user.site,// 工厂编号 customerNo: "", // 客户编码 customer: "", // 客户名称 - tracker: "", // 跟单员 + tracker: "", // 采购专员 quotationStatus: "", //状态 projectId: "", // 项目编码 projectName: "", // 项目名称 @@ -517,7 +533,7 @@ export default { columnProp: 'trackerName', headerAlign: 'center', align: 'left', - columnLabel: '跟单员', + columnLabel: '采购专员', columnHidden: false, columnImage: false, columnSortable: false, @@ -621,10 +637,10 @@ export default { versionCode: "001", projectId: "",//项目编码 projectName: "",//项目名称 - tracker: "",//跟单员 + tracker: "",//采购专员 quoter: "",//销售编号 quoterName: "",//报价专员 - trackerName: "",//跟单员 + trackerName: "",//采购专员 currency: "",//货币 quotationStatus: "草稿",//状态 remark: "",//备注 @@ -645,7 +661,7 @@ export default { {label: "projectId", value: "项目编码"}, {label: "projectName", value: "项目名称"}, {label: "quoterName", value: "报价专员"}, - {label: "trackerName", value: "跟单员"}, + {label: "trackerName", value: "采购专员"}, {label: "currency", value: "货币"}, {label: "quotationStatus", value: "状态"}, {label: "remark", value: "备注"}, @@ -731,6 +747,8 @@ export default { projectClickRow(row) { this.insertData.projectId = row.projectId this.insertData.projectName = row.projectName + this.insertData.finalCustomerId = row.finalCustomerId + this.insertData.finalCustomerName = row.finalCustomerName this.chooseProjectListFlag = false }, // 查询 @@ -865,10 +883,10 @@ export default { versionCode: "001", projectId: "",//项目编码 projectName: "",//项目名称 - tracker: "",//跟单员 + tracker: "",//采购专员 quoter: "",//销售编号 quoterName: "",//报价专员 - trackerName: "",//跟单员 + trackerName: "",//采购专员 currency: "",//货币 quotationStatus: "草稿",//状态 remark: "",//备注 @@ -885,7 +903,7 @@ export default { this.insertData.quoter = ""; this.insertData.quoterName = ""; }, - // 跟单员输入框清除事件 + // 采购专员输入框清除事件 clearTracker() { this.insertData.tracker = ""; this.insertData.trackerName = ""; @@ -903,10 +921,10 @@ export default { versionCode: "001", projectId: "",//项目编码 projectName: "",//项目名称 - tracker: "",//跟单员 + tracker: "",//采购专员 quoter: "",//销售编号 quoterName: "",//报价专员 - trackerName: "",//跟单员 + trackerName: "",//采购专员 currency: "",//货币 quotationStatus: "草稿",//状态 remark: "",//备注 @@ -1035,7 +1053,9 @@ export default { this.insertData.customerName = row.customerDesc;//客户名称 this.insertData.projectId = row.projectId;//项目编码 this.insertData.projectName = row.projectName;//项目名称 - this.insertData.tracker = row.tracker;//跟单员 + this.insertData.finalCustomerId = row.finalCustomerId; + this.insertData.finalCustomerName = row.finalCustomerName; + this.insertData.tracker = row.tracker;//采购专员 this.insertData.trackerName = row.trackerName; this.insertData.quoter = row.quoter;//销售编号 this.insertData.quoterName = row.quoterName;//销售编号 @@ -1103,10 +1123,10 @@ export default { versionCode: "001", projectId: "",//项目编码 projectName: "",//项目名称 - tracker: "",//跟单员 + tracker: "",//采购专员 quoter: "",//销售编号 quoterName: "",//报价专员 - trackerName: "",//跟单员 + trackerName: "",//采购专员 currency: "",//货币 quotationStatus: "草稿",//状态 remark: "",//备注 diff --git a/src/views/modules/test/file/testFile.vue b/src/views/modules/test/file/testFile.vue index 2ff764c..b12bad4 100644 --- a/src/views/modules/test/file/testFile.vue +++ b/src/views/modules/test/file/testFile.vue @@ -1,6 +1,6 @@