diff --git a/src/api/PurchasingCenter/CreateInquirySheet.js b/src/api/PurchasingCenter/CreateInquirySheet.js index 7b2f3d91..ea17dc07 100644 --- a/src/api/PurchasingCenter/CreateInquirySheet.js +++ b/src/api/PurchasingCenter/CreateInquirySheet.js @@ -114,14 +114,14 @@ export function searchSupplier(check1, value1, check2, value2, check3, value3, c }) } // 查询询价单 -export function searchCreateInquirySheet(pageCurrent, pageSize, check1, name, check2, num, id) { +export function searchCreateInquirySheet(pageCurrent, pageSize, check2, num, id) { return request({ url: '', method: 'post', data: { type: '1', name: '采购管理_询价单_查询数据', - param: `供应商名称_check=${check1}&供应商名称=${name}&询价单编号_check=${check2}&询价单编号=${num}&采购员流水号_check=1&采购员流水号=${id}`, + param: `询价单编号_check=${check2}&询价单编号=${num}&采购员流水号_check=1&采购员流水号=${id}`, Pagination: pageCurrent + '&' + pageSize } }) @@ -254,7 +254,7 @@ export function saveOrder(num1, num2, num3) { data: { type: '2', name: '采购管理_询价单明细_保存数据', - param: `询价单明细流水号组=${num1}&数量组=${num2}&备注组=${num3}` + param: `询价单明细流水号=${num1}&数量=${num2}&备注=${num3}` } }) } diff --git a/src/api/PurchasingCenter/CreatePurchaseContract.js b/src/api/PurchasingCenter/CreatePurchaseContract.js index 512900ca..9e36ac4b 100644 --- a/src/api/PurchasingCenter/CreatePurchaseContract.js +++ b/src/api/PurchasingCenter/CreatePurchaseContract.js @@ -24,14 +24,14 @@ export function initSupplier11(num) { }) } // 查询询价单列表 表1 -export function searchInquirySheet(check1, value1, check2, value2, check3, id, check4, supplier) { +export function searchInquirySheet(check2, value2, check3, id, check4, supplier) { return request({ url: '', method: 'post', data: { type: '1', name: '采购管理_询价单_查询数据', - param: `供应商名称_check=${check1}&供应商名称=${value1}&询价单编号_check=${check2}&询价单编号=${value2}&采购员流水号_check=${check3}&采购员流水号=${id}&供应商流水号_check=${check4}&供应商流水号=${supplier}` + param: `询价单编号_check=${check2}&询价单编号=${value2}&采购员流水号_check=${check3}&采购员流水号=${id}&供应商流水号_check=${check4}&供应商流水号=${supplier}` } }) } diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index ab4a225d..e966b67b 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -116,31 +116,42 @@ style="width: 100%;max-height: 500px;" height="500px" size="mini" - @selection-change="handleSelectionChange1"> + @selection-change="handleSelectionChange1" + @select="handleSelection"> - - - + + + + + + + + + + + + + + - - - - - - - - - + + + + + + @@ -232,10 +233,17 @@ :page-sizes="[10, 50, 100, 150]" :page-size="pageSize11" :total="total11" - style="display:inline-block;width:50%" - layout="total, sizes, prev, pager, next, jumper" + style="display:inline-block;width:50px" + layout="total" @size-change="handleSizeChange11" @current-change="handleCurrentChange11"/> + + 选入物料 + @@ -248,7 +256,7 @@ - + --> - 查询 + 查询 导出未询价单 + @selection-change="handleSelectionChange2" + @select="handleSelection1"> - - - + + + + + + + + + + + - - - - - - + + + + + +
@@ -400,10 +409,17 @@ :page-sizes="[10, 50, 100, 150]" :page-size="pageSize12" :total="total12" - style="display:inline-block;width:50%" - layout="total, sizes, prev, pager, next, jumper" + style="display:inline-block;width:50px" + layout="total" @size-change="handleSizeChange12" @current-change="handleCurrentChange12"/> + + 选入物料 +
@@ -592,39 +608,24 @@ - - + 查询 - - 选入物料 - 创建询价单 - - -

询价单

- 编辑 - 删除 - + icon="el-icon-circle-plus-outline" + size="mini" + style="margin-left: 10px" + @click="createInquirySheet">创建 + 编辑 + 删除 打印 导出 - - 保存 - - @@ -729,7 +730,7 @@ @@ -739,7 +740,7 @@ @@ -1180,11 +1181,11 @@ export default { tableData11: [], // 外购件列表 total11: 0, pageCurrent11: 1, - pageSize11: 100, + pageSize11: 1000, tableData12: [], // 基本件列表 total12: 0, pageCurrent12: 1, - pageSize12: 100, + pageSize12: 1000, tableData13: [], // 外购件列表 total13: 0, pageCurrent13: 1, @@ -1197,6 +1198,7 @@ export default { pageSize2: 10000, tableData3: [], // 询价单明细 dialogVisible1: false, + visible1: false, inquirySheetNum: '', // 询价单号 inquirySheetFlowNum: '', // 询价单流水号 form1: {}, @@ -1265,6 +1267,8 @@ export default { cancelNum: 0, machines1: [], machines2: [], + numbers: [], + numbers1: [], row1: '' } }, @@ -1312,6 +1316,30 @@ export default { this.searchTable11() }) }, + handleSelection(val, row) { + this.tableData11.forEach((item, i) => { + if (item.组件零件流水号 === row.组件零件流水号) { + console.log(this.numbers.indexOf(i), 234) + if (this.numbers.indexOf(i) === -1) { + this.numbers.push(i) + } else { + this.numbers.splice(this.numbers.indexOf(i), 1) + } + } + }) + }, + handleSelection1(val, row) { + this.tableData12.forEach((item, i) => { + if (item.组件零件基本件流水号 === row.组件零件基本件流水号) { + console.log(this.numbers1.indexOf(i), 234) + if (this.numbers1.indexOf(i) === -1) { + this.numbers1.push(i) + } else { + this.numbers1.splice(this.numbers1.indexOf(i), 1) + } + } + }) + }, timeChange1() { if (this.startTime) { timeChange1(this.startTime[0], this.startTime[1]) @@ -1689,20 +1717,9 @@ export default { // this.$message.info('已取消操作') // }) // }, - saveOrder() { // 保存询价单 - const orderNumGroup = [] - const numGroup = [] - const remarkGroup = [] - for (let i = 0; i < this.tableData3.length; i++) { - orderNumGroup.push(this.tableData3[i].询价单明细流水号) - numGroup.push(this.tableData3[i].数量) - remarkGroup.push(this.tableData3[i].备注) - } - saveOrder(orderNumGroup, numGroup, remarkGroup).then(response => { - if (response.data[0].result === '1') { - this.$message.success('保存成功') - } else { this.$message.error('保存失败') } - }) + saveOrder(row) { // 保存询价单 + console.log(row, 1111) + saveOrder(row.询价单明细流水号, row.数量, row.备注).then(response => {}) }, selectable(row, index) { // 控制某行是否可选 return (parseInt(row.询价状态编号) === 1 && parseInt(row.采购状态编号) < 3 && parseInt(row.是否确认) === 1) // 未询价&&未采购&&确认物料修改 @@ -1823,9 +1840,8 @@ export default { this.searchTable13() }, searchTable2() { // 查询询价单列表 - this.supplierName ? this.check3 = 1 : this.check3 = 0 this.inquirySheetNum ? this.check4 = 1 : this.check4 = 0 - searchCreateInquirySheet(this.pageCurrent2, this.pageSize2, this.check3, this.supplierName, this.check4, this.inquirySheetNum, this.id).then(response => { + searchCreateInquirySheet(this.pageCurrent2, this.pageSize2, this.check4, this.inquirySheetNum, this.id).then(response => { this.tableData2 = response.data.rows this.total2 = response.data.total }) @@ -2299,10 +2315,22 @@ export default { }) }, tableRowClassName({ row, rowIndex }) { - if (parseInt(row.是否确认) === 0) { - return 'MistyRose' - } - return '' + let color = '' + this.numbers.forEach((r, i) => { + if (rowIndex === r) { + color = 'MistyRose' + } + }) + return color + }, + tableRowClassName2({ row, rowIndex }) { + let color = '' + this.numbers1.forEach((r, i) => { + if (rowIndex === r) { + color = 'MistyRose' + } + }) + return color } } } @@ -2352,7 +2380,7 @@ export default { background: Tomato!important; } .el-table .MistyRose { - background: MistyRose!important; + background: #9BD7FC!important; } .el-table .gray { background: lightgray; diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue index b521a335..add4a19b 100644 --- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue +++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue @@ -38,8 +38,12 @@ active-value="含税" inactive-value="未税"/> + 快速修改价格 + 还原 + 折叠 + 展开其他说明 - + @@ -50,8 +54,6 @@ - 快速修改价格 - 还原 @@ -171,6 +173,7 @@ export default { inject: ['reload'], data() { return { + isShowN: false, supplierValue11: '', // 供应商查询条件 supplier11: [], quickChangePrice: true, @@ -255,7 +258,7 @@ export default { this.contractNumValue = '' this.tableData1 = [] if (this.supplierValue11) { this.asdasd = 1 } else { this.asdasd = 0 } - searchInquirySheet(0, 0, 0, 0, 1, this.id, this.asdasd, this.supplierValue11).then(response => { // 初始化询价单号 + searchInquirySheet(0, 0, 1, this.id, this.asdasd, this.supplierValue11).then(response => { // 初始化询价单号 this.contractNums = [] for (let i = 0; i < response.data.length; i++) { this.contractNums.push({ @@ -394,7 +397,7 @@ export default { this.account2 = res.data[0] ? res.data[0].帐号 : '' this.bank2 = res.data[0] ? res.data[0].开户行 : '' }) - searchInquirySheet(0, 0, 0, 0, 1, this.id, 0, 0).then(response => { // 初始化询价单号 + searchInquirySheet(0, 0, 1, this.id, 0, 0).then(response => { // 初始化询价单号 this.contractNums = [] for (let i = 0; i < response.data.length; i++) { this.contractNums.push({ @@ -430,7 +433,7 @@ export default { supplierChange() { let check this.supplierValue ? check = 1 : check = 0 - searchInquirySheet(0, 0, 0, 0, 1, this.id, check, this.supplierValue).then(response => { // 初始化询价单号 + searchInquirySheet(0, 0, 1, this.id, check, this.supplierValue).then(response => { // 初始化询价单号 this.contractNums = [] this.contractNumValue = '' for (let i = 0; i < response.data.length; i++) { diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue index 905993eb..eb36931a 100644 --- a/src/views/PurchasingCenter/OfflineContract/index.vue +++ b/src/views/PurchasingCenter/OfflineContract/index.vue @@ -165,7 +165,7 @@ - + 查询 - - - - + + + + - + - + - + - + - + @@ -100,6 +100,11 @@ {{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }} + + + - - - - - - + + + + + + + + + +