From 9d70d2a3e0360db996eea0f1fa40d82d61c5e259 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Sat, 17 Nov 2018 09:55:51 +0800 Subject: [PATCH 01/68] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=AF=A2=E4=BB=B7?= =?UTF-8?q?=E5=8D=95=EF=BC=9A=E5=88=9B=E5=BB=BA=E5=8D=95=E6=8D=AE=E7=9A=84?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=BC=B9=E6=A1=86=E5=BC=B9=E5=87=BA?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/PurchasingCenter/CreateInquirySheet/index.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index e831bde9..893556f5 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -318,9 +318,7 @@ - - - +
From b369087c656b4b88ea10c85bb139bf747ea13644 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Sat, 17 Nov 2018 10:21:12 +0800 Subject: [PATCH 02/68] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E5=90=88=E5=90=8C=EF=BC=9Areload=E5=88=B7=E6=96=B0=E9=A1=B5?= =?UTF-8?q?=EF=BC=9Breadonly=E5=90=88=E5=90=8C=E6=80=BB=E9=A2=9D=EF=BC=9B?= =?UTF-8?q?=E9=99=90=E5=88=B6=E8=A7=84=E5=AE=9A=E5=88=B0=E8=B4=A7=E6=97=B6?= =?UTF-8?q?=E9=97=B4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 22 +++++++++++++++++-- .../PurchasingCenter/CreateContract/index.vue | 10 ++++----- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/src/App.vue b/src/App.vue index 721d3a32..cb46977e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,11 +1,29 @@ diff --git a/src/views/PurchasingCenter/CreateContract/index.vue b/src/views/PurchasingCenter/CreateContract/index.vue index 8edbfa7b..5c85a1a3 100644 --- a/src/views/PurchasingCenter/CreateContract/index.vue +++ b/src/views/PurchasingCenter/CreateContract/index.vue @@ -186,7 +186,7 @@ style="margin-top:10px" @click="calculateContractSum">计算合同总额 合同总额: - + @@ -237,10 +237,10 @@ export default { searchView: '', fileList: [], minDate: null, - endDateOpt: { // 为了让规定到货时间早于物料计划到货时间 + endDateOpt: { // 禁用大于规定到货日期和小于当前日期 disabledDate: (time) => { if (this.minDate) { - return time.getTime() > this.minDate + return time.getTime() > this.minDate || time.getTime() < new Date() } } }, @@ -262,8 +262,8 @@ export default { payTime5Value: '', // 付款时间 payTime6Value: '', // 付款时间 freight: '', // 运费 - taxRate: '', // 税率 - currencyValue: '', // 币种 + taxRate: '0.17', // 税率 + currencyValue: 1, // 币种 currency: [ { label: '人民币', From fd568c195fd4304bd33c37ed478ab5410a8f5dec Mon Sep 17 00:00:00 2001 From: chenjianan Date: Sat, 17 Nov 2018 10:43:41 +0800 Subject: [PATCH 03/68] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=AF=A2=E4=BB=B7?= =?UTF-8?q?=E5=8D=95=EF=BC=9A=E5=8F=96=E6=B6=88=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/PurchasingCenter/CreateInquirySheet/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index 893556f5..db2979f5 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -322,17 +322,16 @@
+ 取消 确定 确定
@@ -340,7 +339,7 @@ 物料名称： - 查询 + 查询 - + @@ -93,7 +89,7 @@ - + - + @@ -142,7 +138,6 @@ 取消请款 @@ -217,15 +212,10 @@ - - - - + @@ -257,170 +247,23 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 查询 - 确定 - 清空 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- 确定 -
-
+ + diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue index a5e4c68d..aa1b7500 100644 --- a/src/views/ManufacturingCenter/GroupMatching/index.vue +++ b/src/views/ManufacturingCenter/GroupMatching/index.vue @@ -19,9 +19,9 @@ :value="item.value"/> 机床号: - + 组号: - + 年: - 提交 +
+ 提交 +
@@ -202,7 +204,9 @@ @size-change="handleSizeChange3" @current-change="handleCurrentChange3"/> - 提交 +
+ 提交 +
diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue index 39201f1e..f1babfd4 100644 --- a/src/views/ManufacturingCenter/PartAssignment/index.vue +++ b/src/views/ManufacturingCenter/PartAssignment/index.vue @@ -299,7 +299,7 @@ style="width:200px"/> - + { + for (let i = 0; i < response.data.length; i++) { + console.log(response.data[i].请购时间) + if (response.data[i].请购时间 !== '') { + response.data[i].请购时间 = (response.data[i].请购时间).split(' ')[0] + } + } this.tableData4 = response.data }) }, diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue index b2ff8692..4cefe297 100644 --- a/src/views/ManufacturingCenter/StatusQuery/index.vue +++ b/src/views/ManufacturingCenter/StatusQuery/index.vue @@ -20,9 +20,9 @@ :value="item.value"/> 机床号: - + 组号: - + 零件号:
@@ -187,7 +187,9 @@ @size-change="handleSizeChange1" @current-change="handleCurrentChange1"/> - 提交 +
+ 提交 +
@@ -234,7 +236,9 @@ @size-change="handleSizeChange3" @current-change="handleCurrentChange3"/> - 提交 +
+ 提交 +
diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue index a6f5bd35..42603b0d 100644 --- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue +++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue @@ -253,6 +253,7 @@ export default { this.form.设备型号 = row.设备型号 this.form.设备性能指标 = row.设备性能指标 this.form.设备加工能力 = row.设备加工能力工时 + this.form.设备加工工艺 = parseInt(row.工艺属性代码) this.form.班次类型 = row.班次类型 this.form.设备工时系数 = row.设备工时系数 this.form.整改工时系数 = row.整改工时比例 diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue index 0de8e68f..3eae8017 100644 --- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue +++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue @@ -21,7 +21,7 @@ - + diff --git a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue index 3d44e5e4..7d490c17 100644 --- a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue +++ b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue @@ -23,7 +23,7 @@ 采购员: - + 供应商: 合同号: - + 采购员: - + 供应商: @@ -152,7 +152,7 @@ start-placeholder="开始日期" end-placeholder="结束日期"/> 合同号: - + 采购员: - + 供应商: From 299d06af442a139c8ad508e28fa2e74913a5c02f Mon Sep 17 00:00:00 2001 From: chenjianan Date: Sat, 17 Nov 2018 16:42:38 +0800 Subject: [PATCH 09/68] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=98=BE=E7=A4=BA=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchasingCenter/PurchaseContractSearch/index.vue | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue index 41ae3ce3..e5a43e72 100644 --- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue +++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue @@ -239,11 +239,8 @@ export default { created() { this.fetchData() }, - mounted() { - this.useqrcode() - }, methods: { - useqrcode() { + useqrcode(contractNum) { const opts = { errorCorrectionLevel: 'H', type: 'image/jpeg', @@ -251,7 +248,8 @@ export default { quality: 0.3 } } - QRCode.toDataURL('知道这是啥吗你就扫', opts, function(err, url) { + const str = 'http://192.168.1.109:8022/searchContract.html?contractNum=' + contractNum + QRCode.toDataURL(str, opts, function(err, url) { if (err) throw err const img = document.getElementById('img') img.src = url @@ -260,7 +258,6 @@ export default { searchPic() { // 读取图片时，查找合同流水号，获取其下所有图片id，根据拼接成的路径，查询图片显示出来。 searchFile(this.contract).then(response => { - console.log(response.data) if (response.data.length !== 0) { this.searchView = 'http://localhost:8022/Img/' + response.data[0].文件名 } else { @@ -335,6 +332,7 @@ export default { this.searchTable1() }, searchTable2(row) { + this.useqrcode(row.采购合同流水号) this.textarea = row.合同文本 this.supplier = row.供应商名称 this.contract = row.采购合同编号 From 36cec28ab612e950b5b9be59f14f6a79b44269f9 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Mon, 19 Nov 2018 08:50:29 +0800 Subject: [PATCH 10/68] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=9A=E6=94=B9IP=EF=BC=9B=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E9=A2=84=E7=AE=97=E6=9F=A5=E8=AF=A2=EF=BC=9A=E5=8E=BB?= =?UTF-8?q?=E6=97=B6=E5=88=86=E7=A7=92=EF=BC=8C=E6=96=B0=E5=A2=9E=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E6=9C=AA=E8=AE=BE=E7=BD=AE=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/PurchasingCenter/PurchaseBudgetSearch/index.vue | 4 ++-- src/views/PurchasingCenter/PurchaseContractSearch/index.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/PurchasingCenter/PurchaseBudgetSearch/index.vue b/src/views/PurchasingCenter/PurchaseBudgetSearch/index.vue index f59a41b0..ef1d60c1 100644 --- a/src/views/PurchasingCenter/PurchaseBudgetSearch/index.vue +++ b/src/views/PurchasingCenter/PurchaseBudgetSearch/index.vue @@ -43,7 +43,7 @@ @@ -175,7 +175,7 @@ diff --git a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue index e5a43e72..2a033176 100644 --- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue +++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue @@ -248,7 +248,7 @@ export default { quality: 0.3 } } - const str = 'http://192.168.1.109:8022/searchContract.html?contractNum=' + contractNum + const str = 'http://192.168.1.111:8022/searchContract.html?contractNum=' + contractNum QRCode.toDataURL(str, opts, function(err, url) { if (err) throw err const img = document.getElementById('img') From 305186058e51e654e109b227bcd3e0f9fbca47bb Mon Sep 17 00:00:00 2001 From: liushuai Date: Mon, 19 Nov 2018 09:50:08 +0800 Subject: [PATCH 11/68] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PrintingAssemblyProcessCard/index.vue | 4 ++-- .../GroupMatching/index.vue | 22 +------------------ .../ManufacturingCenter/StatusQuery/index.vue | 19 +--------------- .../DepartmentBuyerRequestFund/index.vue | 5 ++--- .../ProcurementContractApproval/index.vue | 2 +- .../ProcurementContractEnquiry/index.vue | 2 +- .../PurchaseContractChange/index.vue | 8 +++---- 7 files changed, 12 insertions(+), 50 deletions(-) diff --git a/src/views/Assembly/PrintingAssemblyProcessCard/index.vue b/src/views/Assembly/PrintingAssemblyProcessCard/index.vue index 08164f7a..cb92e4b8 100644 --- a/src/views/Assembly/PrintingAssemblyProcessCard/index.vue +++ b/src/views/Assembly/PrintingAssemblyProcessCard/index.vue @@ -99,8 +99,8 @@ {{ list.工艺内容及装配具体要求 }} {{ list.质检 }} {{ list.工时 }} - {{ list.完成情况 }} - {{ list.检验情况 }} + {{ list.装配员 }} + {{ list.检验员 }} {{ list.备注 }} diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue index aa1b7500..5058e5b8 100644 --- a/src/views/ManufacturingCenter/GroupMatching/index.vue +++ b/src/views/ManufacturingCenter/GroupMatching/index.vue @@ -4,13 +4,11 @@ 项目名称: { for (let i = 0; i < response.data.length; i++) { - this.list.push({ + this.entryName.push({ label: response.data[i].项目名称, value: response.data[i].项目流水号 }) } }) }, - remoteMethod(query) { - if (query !== '') { - setTimeout(() => { - this.entryName = this.list.filter(item => { - if (item.label !== null) { - return item.label.toLowerCase() - .indexOf(query.toLowerCase()) > -1 - } - }) - }, 1000) - } else { - this.entryName = [] - } - }, empty() { this.machineToolNumber = '' this.groupNumber = '' diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue index 4cefe297..7182108a 100644 --- a/src/views/ManufacturingCenter/StatusQuery/index.vue +++ b/src/views/ManufacturingCenter/StatusQuery/index.vue @@ -5,13 +5,11 @@ 项目名称: { for (let i = 0; i < response.data.length; i++) { - this.list.push({ + this.entryName.push({ label: response.data[i].项目名称, value: response.data[i].项目流水号 }) } }) }, - remoteMethod(query) { - if (query !== '') { - setTimeout(() => { - this.entryName = this.list.filter(item => { - return item.label.toLowerCase() - .indexOf(query.toLowerCase()) > -1 - }) - }, 1000) - } else { - this.entryName = [] - } - }, empty() { this.machineToolNumber = '' this.groupNumber = '' diff --git a/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue b/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue index ffedafcf..ab86dbdb 100644 --- a/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue +++ b/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue @@ -22,11 +22,10 @@ 采购员: 供应商: diff --git a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue index 7d490c17..c2cfd8f3 100644 --- a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue +++ b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue @@ -23,7 +23,7 @@ 采购员: - + 供应商: 采购员: - + 供应商: 审批情况: diff --git a/src/views/WorkshopProcurement/PurchaseContractChange/index.vue b/src/views/WorkshopProcurement/PurchaseContractChange/index.vue index 875a0525..3cc52b00 100644 --- a/src/views/WorkshopProcurement/PurchaseContractChange/index.vue +++ b/src/views/WorkshopProcurement/PurchaseContractChange/index.vue @@ -6,7 +6,7 @@ 时间段: 采购员: - + 供应商: @@ -144,7 +144,7 @@ 时间段: 采购员: - + 供应商: From fd63e551f4c77a330f49b5f1a413f4c13559c07a Mon Sep 17 00:00:00 2001 From: lixin Date: Mon, 19 Nov 2018 10:07:11 +0800 Subject: [PATCH 12/68] lx --- src/views/Inventory/PickingList/index.vue | 71 ++++++++++++++--------- 1 file changed, 42 insertions(+), 29 deletions(-) diff --git a/src/views/Inventory/PickingList/index.vue b/src/views/Inventory/PickingList/index.vue index 2ab5ffb1..91df82e9 100644 --- a/src/views/Inventory/PickingList/index.vue +++ b/src/views/Inventory/PickingList/index.vue @@ -23,8 +23,8 @@ {{ scope.row.领料单编号 }} - - @@ -114,7 +117,7 @@ @@ -130,6 +133,7 @@ export default { name: '', // 项目总价查询 data() { return { + warningValue: 3, check1: 0, check2: 0, contractNumValue: '', @@ -169,6 +173,7 @@ export default { }) }, searchTable1() { + this.warningValue ? this.warningValue : this.warningValue = 1 this.arrival = [] // 规定到货时间数组 this.now = new Date() this.contractNumValue ? this.check1 = 1 : this.check1 = 0 @@ -177,13 +182,13 @@ export default { for (let i = 0; i < response.data.rows.length; i++) { this.arrival.push(new Date(response.data.rows[i].规定到货时间)) if (parseInt(response.data.rows[i].合同物料到货总数) === parseInt(response.data.rows[i].合同物料采购总数)) { - this.judge[i] = 1 - } else if (parseInt(response.data.rows[i].合同物料到货总数) !== parseInt(response.data.rows[i].合同物料采购总数) && (this.now - this.arrival[i]) > 0 && (this.now - this.arrival[i]) < 86400000) { - this.judge[i] = 2 - } else if (parseInt(response.data.rows[i].合同物料到货总数) !== parseInt(response.data.rows[i].合同物料采购总数) && (this.now - this.arrival[i]) > 86400000) { - this.judge[i] = 3 - } else if (parseInt(response.data.rows[i].合同物料到货总数) !== parseInt(response.data.rows[i].合同物料采购总数) && (this.now - this.arrival[i]) < 0) { - this.judge[i] = 4 + this.judge[i] = 1 // 全部到货 + } else if (parseInt(response.data.rows[i].合同物料到货总数) !== parseInt(response.data.rows[i].合同物料采购总数) && (this.arrival[i] - this.now) > 0 && (this.arrival[i] - this.now) < (86400000 * this.warningValue)) { + this.judge[i] = 2 // 即将拖期 + } else if (parseInt(response.data.rows[i].合同物料到货总数) !== parseInt(response.data.rows[i].合同物料采购总数) && (this.arrival[i] - this.now) < 0) { + this.judge[i] = 3 // 已拖期 + } else if (parseInt(response.data.rows[i].合同物料到货总数) !== parseInt(response.data.rows[i].合同物料采购总数) && (this.arrival[i] - this.now) > (86400000 * this.warningValue)) { + this.judge[i] = 4 // 进度正常 } } this.tableData1 = response.data.rows From be947a241c70861f52ef2c54e56e6c7b9e6f8e0c Mon Sep 17 00:00:00 2001 From: chenjianan Date: Mon, 19 Nov 2018 11:35:57 +0800 Subject: [PATCH 14/68] =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E5=90=88=E5=90=8C?= =?UTF-8?q?=EF=BC=9A=E6=8C=89=E9=92=AE=E7=A6=81=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchasingCenter/OfflineContract/index.vue | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue index d4af1840..1eedaf7a 100644 --- a/src/views/PurchasingCenter/OfflineContract/index.vue +++ b/src/views/PurchasingCenter/OfflineContract/index.vue @@ -233,7 +233,7 @@ @@ -243,7 +243,7 @@ - 生成离线合同 + 生成离线合同 @@ -963,9 +963,11 @@ export default { } } this.paramRow = row - searchContractDemo(this.paramRow.合同模板流水号).then(response => { - this.textArea = response.data[0].合同模板内容.replace('stipulateArrivalTime', this.stipulateArrivalTime).replace('payMethodName', this.payMethodName) - }) + if (!this.disable) { + searchContractDemo(this.paramRow.合同模板流水号).then(response => { + this.textArea = response.data[0].合同模板内容.replace('stipulateArrivalTime', this.stipulateArrivalTime).replace('payMethodName', this.payMethodName) + }) + } }, payMethodChange() { // 付款方式改变 for (let i = 0; i < this.payMethod.length; i++) { From 59e74eb1a123cde693c1a17d9ff79e4d344ceb99 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Mon, 19 Nov 2018 13:33:23 +0800 Subject: [PATCH 15/68] 11-19 --- .../ManufacturingCenter/ProcessPlanning.js | 2 +- src/api/PurchasingCenter/qrcodeGeneration.js | 0 .../ProcessPlanning/index.vue | 266 +++++++++++++----- .../ProcessTaskAssignment/index.vue | 14 +- .../ProcessingStatus/index.vue | 13 +- .../ProductionCapacityBalance/index.vue | 2 +- .../ManufacturingCenter/StatusQuery/index.vue | 19 +- .../qrcodeGeneration/index.vue | 54 ++++ 8 files changed, 292 insertions(+), 78 deletions(-) create mode 100644 src/api/PurchasingCenter/qrcodeGeneration.js create mode 100644 src/views/PurchasingCenter/qrcodeGeneration/index.vue diff --git a/src/api/ManufacturingCenter/ProcessPlanning.js b/src/api/ManufacturingCenter/ProcessPlanning.js index 81d9727f..9fb095b0 100644 --- a/src/api/ManufacturingCenter/ProcessPlanning.js +++ b/src/api/ManufacturingCenter/ProcessPlanning.js @@ -174,7 +174,7 @@ export function initPerson() { data: { type: '1', name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', - param: '考核部门编号=10=int' + param: '考核部门编号=17' } }) } diff --git a/src/api/PurchasingCenter/qrcodeGeneration.js b/src/api/PurchasingCenter/qrcodeGeneration.js new file mode 100644 index 00000000..e69de29b diff --git a/src/views/ManufacturingCenter/ProcessPlanning/index.vue b/src/views/ManufacturingCenter/ProcessPlanning/index.vue index bf114849..3c8d9abe 100644 --- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue +++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue @@ -14,7 +14,12 @@ 已编制 工艺员: - + 零件号: - + - 查询 - 在制零件工艺调整 - 切换编辑模式 + 查询 + + 在制零件工艺调整 + + 切换编辑模式 +
种类: @@ -66,15 +81,26 @@ 计算公差 - 复制并保存 + 复制并保存 + 粘贴 - 典艺 - 完艺 - 删除 - 保存 + 典艺 + + 完艺 + + 删除 + + 保存 + - +