From 22a916ca233bd8253a49c5288aa01db42920c156 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Thu, 17 Oct 2019 14:53:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E5=90=88=E5=90=8C=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 4 ++-- .../CreateInquirySheet/index.vue | 20 ++++++++++++++----- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index da3f9d7b..56ffd77d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -16,8 +16,8 @@ export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoic export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx` export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx` -export const url = `http://192.168.0.110:8002/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 -export const ExcelDownLoad = 'http://192.168.0.110:8002/submit/downloadFile.ashx' // 导出excel +export const url = `http://192.168.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 +export const ExcelDownLoad = 'http://192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel // 技术中心程序发布时要更改下面所有的IP到0段 export const ServerIP = `http://192.168.1.231:8411/webpage/file/` diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index 6cfa1094..5c583e5d 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -34,7 +34,7 @@ - + @@ -1077,7 +1077,15 @@ export default { this.searchUnBuyPartNumber() this.initDirection() }, + mounted() { + setTimeout(() => { + this.Jump() + }, 500) + }, methods: { + Jump() { + window.location.hash = '#Jump' + }, tiaozheng1() { if (this.标准件和外购件流水号.length !== 0) { if (this.PersonValue) { @@ -1142,8 +1150,9 @@ export default { }) }, clickCard1(project, machine) { - var hight = this.$refs.height1.offsetHeight - document.documentElement.scrollTop = hight + 140 + window.location.hash = '#asd' + // var hight = this.$refs.height1.offsetHeight + // document.documentElement.scrollTop = hight + 140 this.projectValue = project this.machine = [] this.machineValue = '' @@ -1164,8 +1173,9 @@ export default { }) }, clickCard2(project, machine) { - var hight = this.$refs.height1.offsetHeight - document.documentElement.scrollTop = hight + 140 + window.location.hash = '#asd' + // var hight = this.$refs.height1.offsetHeight + // document.documentElement.scrollTop = hight + 140 this.projectValue = project this.machine = [] this.machineValue = '' From 6f073bf36b64ebdfe8c81773c18e820626739f34 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Thu, 17 Oct 2019 15:17:05 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=AF=A2=E4=BB=B7?= =?UTF-8?q?=E5=8D=95=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 6 +++--- .../CreateInquirySheet/index.vue | 21 +++++++++++++++---- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 56ffd77d..7218f9b2 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -16,8 +16,8 @@ export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoic export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx` export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx` -export const url = `http://192.168.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 -export const ExcelDownLoad = 'http://192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel +export const url = `http://192.168.0.110:8002/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 +export const ExcelDownLoad = 'http://192.168.0.110:8002/submit/downloadFile.ashx' // 导出excel // 技术中心程序发布时要更改下面所有的IP到0段 export const ServerIP = `http://192.168.1.231:8411/webpage/file/` @@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index 5c583e5d..a13838cf 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -34,7 +34,7 @@ - + @@ -1068,6 +1068,19 @@ export default { 'id' // 人员编号 ]) }, + watch: { + // 如果路由有变化，会再次执行该方法 + '$route': { + handler(route) { + const _this = this + if (route.name === 'CreateInquirySheet') { + setTimeout(() => { + _this.Jump() + }, 1200) + } + } + } + }, created() { this.getPerson() this.fetchData() @@ -1084,7 +1097,7 @@ export default { }, methods: { Jump() { - window.location.hash = '#Jump' + window.location.hash = '#PurchasingCenter/CreateInquirySheet' }, tiaozheng1() { if (this.标准件和外购件流水号.length !== 0) { @@ -1150,7 +1163,7 @@ export default { }) }, clickCard1(project, machine) { - window.location.hash = '#asd' + window.location.hash = '#PurchasingCenter/CreateInquirySheet' // var hight = this.$refs.height1.offsetHeight // document.documentElement.scrollTop = hight + 140 this.projectValue = project @@ -1173,7 +1186,7 @@ export default { }) }, clickCard2(project, machine) { - window.location.hash = '#asd' + window.location.hash = '#PurchasingCenter/CreateInquirySheet' // var hight = this.$refs.height1.offsetHeight // document.documentElement.scrollTop = hight + 140 this.projectValue = project From 1f336d7026d2fc4cee2d7f9037e4d20705706199 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Thu, 17 Oct 2019 16:40:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=AF=A2=E4=BB=B7?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchasingCenter/CreateInquirySheet.js | 4 +-- src/utils/request.js | 6 ++-- .../CreateInquirySheet/index.vue | 31 ++++++++++++++++--- 3 files changed, 31 insertions(+), 10 deletions(-) diff --git a/src/api/PurchasingCenter/CreateInquirySheet.js b/src/api/PurchasingCenter/CreateInquirySheet.js index 80ae3e6b..a3efe934 100644 --- a/src/api/PurchasingCenter/CreateInquirySheet.js +++ b/src/api/PurchasingCenter/CreateInquirySheet.js @@ -76,14 +76,14 @@ export function getExport2(num) { }) } // 查询分配后的标准件和外购件 -export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val7) { +export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val7, val8, val9, val10) { return request({ url: '', method: 'post', data: { type: '1', name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存', - param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&零件类型=${val7}`, + param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&零件类型=${val7}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/utils/request.js b/src/utils/request.js index 7218f9b2..56ffd77d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -16,8 +16,8 @@ export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoic export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx` export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx` -export const url = `http://192.168.0.110:8002/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 -export const ExcelDownLoad = 'http://192.168.0.110:8002/submit/downloadFile.ashx' // 导出excel +export const url = `http://192.168.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 +export const ExcelDownLoad = 'http://192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel // 技术中心程序发布时要更改下面所有的IP到0段 export const ServerIP = `http://192.168.1.231:8411/webpage/file/` @@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index a13838cf..3d1175d8 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -72,11 +72,29 @@ 物料变更: - + 物料规格: 物料型号: + + + 开始时间: + + 结束时间: + 查询 导出未询价物料清单 @@ -90,7 +108,7 @@ 确定 - 调整采购任务 + 调整采购任务 @@ -291,7 +309,7 @@ 确定 - 调整采购任务 + 调整采购任务 @@ -895,6 +913,8 @@ export default { name: '', // 创建询价单 data() { return { + startTime: '', + endTime: '', 标准件和外购件流水号: [], 基本件流水号: [], visible: false, @@ -1488,14 +1508,15 @@ export default { return row['供货商'].trim() === value }, searchTable11() { // 查询外购件列表 - let check1, check2, check3, check4, check5, check6 + let check1, check2, check3, check4, check5, check6, check7 this.materialName ? check1 = 1 : check1 = 0 this.materialSpec ? check2 = 1 : check2 = 0 this.materialModel ? check3 = 1 : check3 = 0 this.projectValue ? check4 = 1 : check4 = 0 this.machineValue ? check5 = 1 : check5 = 0 this.groupValue ? check6 = 1 : check6 = 0 - searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, 2).then(response => { + this.startTime && this.endTime ? check7 = 1 : check7 = 0 + searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, 2, check7, this.startTime, this.endTime).then(response => { this.tableData11 = response.data.rows this.total11 = response.data.total const remark = [] From 5f791ce47546d345adfbeb2952118d907a6e1190 Mon Sep 17 00:00:00 2001 From: bryan sun Date: Thu, 17 Oct 2019 18:09:52 +0800 Subject: [PATCH 4/4] a --- .../CreateWarehousePurchasing.js | 88 ++++ .../AssemblyQualityInspection/index.vue | 12 +- .../index.vue | 32 +- .../Inventory/CreatePickingList/index.vue | 54 +- src/views/Inventory/InventoryCheck/index.vue | 12 +- src/views/Inventory/MaterialOut/index.vue | 12 +- src/views/Inventory/OfflinePartOut/index.vue | 8 +- .../Inventory/OfflinePartsStorage/index.vue | 20 +- .../Inventory/PurchaseInRecord/index.vue | 24 +- .../Inventory/PurchasePartsStorage/index.vue | 20 +- .../CreateWarehousePurchasing/index.vue | 469 ++++++++++++++++++ .../InventoryQuery/index.vue | 10 +- .../Outsourcing/OutsourcingQCSearch/index.vue | 4 +- .../ArrivalStateSearch/index.vue | 8 +- .../BacklogGoodsAnalysis/index.vue | 16 +- .../InvoiceSettlementApplication/index.vue | 8 +- .../OfflineContract/index.vue | 26 +- .../OfflineContractRequestFund/index.vue | 6 +- .../PurchasingCenter/PayStateSearch/index.vue | 32 +- .../PurchaseContractRequestFund/index.vue | 14 +- .../PurchaseContractSearch/index.vue | 10 +- .../PurchaseSituationSearch/index.vue | 42 +- .../PurchaseTaskAllocate/index.vue | 52 +- .../PurchasingCenter/SetPayPlan/index.vue | 6 +- 24 files changed, 789 insertions(+), 196 deletions(-) create mode 100644 src/api/ManufacturingCenter/CreateWarehousePurchasing.js create mode 100644 src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue diff --git a/src/api/ManufacturingCenter/CreateWarehousePurchasing.js b/src/api/ManufacturingCenter/CreateWarehousePurchasing.js new file mode 100644 index 00000000..7194f0ca --- /dev/null +++ b/src/api/ManufacturingCenter/CreateWarehousePurchasing.js @@ -0,0 +1,88 @@ +import request from '@/utils/request' + +// 查询库存数 +export function searchInventoryNum(pageCurrent, pageSize, check1, val1, check2, val2, check3, val3, check4, state1, state2) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_离线合同_物料余量_查询数据', + param: `物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&库存状态_check=${check4}&库存状态=${state1}&采购状态=${state2}`, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 新增采购明细单 +export function submitaddpurchasingdetailsform(name, applicant) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_仓库采购_表单_新增', + param: `表单名称=${name}&申请人=${applicant}` + } + }) +} +// 查询采购明细单 +export function searchpurchasingDetailsForm(pageCurrent, pageSize, name) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_仓库采购_表单_查询', + param: `表单名称=${name}`, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 查询采购表单 +export function confirmEditpurchasingDetailsForm(name, id) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_仓库采购_表单_编辑', + param: `表单名称=${name}&id=${id}` + } + }) +} +// 查询采购表单 +export function openDeletepurchasingDetailsForm(id) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_仓库采购_表单_删除', + param: `id=${id}` + } + }) +} +// 选入物料信息 +export function addmateriel(formNumber, materielGroup) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_仓库采购_表单明细_增加数据', + param: `表单编号=${formNumber}&物料流水号组=${materielGroup}` + } + }) +} +// 查询采购明细 +export function searchtable2(formNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_仓库采购_表单明细_增加数据', + param: `表单编号=${formNumber}` + } + }) +} diff --git a/src/views/Assembly/AssemblyQualityInspection/index.vue b/src/views/Assembly/AssemblyQualityInspection/index.vue index ccc0d7d8..44c6d4ca 100644 --- a/src/views/Assembly/AssemblyQualityInspection/index.vue +++ b/src/views/Assembly/AssemblyQualityInspection/index.vue @@ -41,34 +41,34 @@ - + - + - + - + - + - + diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue index f619d519..431b6412 100644 --- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue +++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue @@ -256,27 +256,27 @@

正在加工零件列表

- + - + - + - + - + @@ -286,17 +286,17 @@ {{ scope.row.批次数量 }} - + - + - + @@ -326,27 +326,27 @@

待加工零件列表

- + - + - + - + - + @@ -356,17 +356,17 @@ {{ scope.row.批次数量 }} - + - + - + diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue index 7c7a2d3a..323db2a9 100644 --- a/src/views/Inventory/CreatePickingList/index.vue +++ b/src/views/Inventory/CreatePickingList/index.vue @@ -27,27 +27,27 @@ - + - + - + + date - + - + @@ -83,27 +83,27 @@ - + - + - + - + - + @@ -134,27 +134,27 @@ - + - + - + - + - + @@ -203,7 +203,7 @@ - + @@ -213,17 +213,17 @@ {{ scope.row.操作日期.split(' ')[0] }} - + - + - + - + - + - + @@ -62,22 +62,22 @@ - + - + - + - + diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue index b4561956..231d1dbc 100644 --- a/src/views/Inventory/OfflinePartOut/index.vue +++ b/src/views/Inventory/OfflinePartOut/index.vue @@ -15,22 +15,22 @@ - + - + - + - + diff --git a/src/views/Inventory/OfflinePartsStorage/index.vue b/src/views/Inventory/OfflinePartsStorage/index.vue index 18a1089f..477fc245 100644 --- a/src/views/Inventory/OfflinePartsStorage/index.vue +++ b/src/views/Inventory/OfflinePartsStorage/index.vue @@ -22,19 +22,19 @@ - + - + - + @@ -264,7 +264,17 @@ export default { this.supplierName = '' this.contractNumber = '' } - this.table1 = res.data + // this.table1 = res.data + res.data.map(v => { + this.table1.push({ + 离线合同编号: v.离线合同编号, + 物料名称: v.物料名称, + 规格型号: v.物料规格 + v.物料型号, + 数量: v.数量, + 到货数量: v.到货数量, + 本次到货数量: v.本次到货数量 + }) + }) this.oldVal1 = '' }, // 多选 diff --git a/src/views/Inventory/PurchaseInRecord/index.vue b/src/views/Inventory/PurchaseInRecord/index.vue index a38cd6ee..5c096ba6 100644 --- a/src/views/Inventory/PurchaseInRecord/index.vue +++ b/src/views/Inventory/PurchaseInRecord/index.vue @@ -48,19 +48,19 @@ 查询 -

采购合同件

+

采购合同入库

- + - + - + @@ -70,12 +70,12 @@ {{ scope.row.入库数量 }} - + - + @@ -92,19 +92,19 @@ @size-change="handleSizeChange1" @current-change="handleCurrentChange1"/> -

离线合同件

+

离线合同入库

- + - + - + @@ -114,12 +114,12 @@ {{ scope.row.入库数量 }} - + - + diff --git a/src/views/Inventory/PurchasePartsStorage/index.vue b/src/views/Inventory/PurchasePartsStorage/index.vue index 46c9373a..7989198a 100644 --- a/src/views/Inventory/PurchasePartsStorage/index.vue +++ b/src/views/Inventory/PurchasePartsStorage/index.vue @@ -30,19 +30,19 @@ - + - + - + @@ -317,7 +317,17 @@ export default { this.$set(v, '本次到货数量', v.数量 - v.到货数量) return v }) - this.table1 = res.data + // this.table1 = res.data + res.data.map(v => { + this.table1.push({ + 合同编号: v.合同编号, + 物料名称: v.物料名称, + 规格型号: v.物料规格 + v.物料型号, + 数量: v.数量, + 到货数量: v.到货数量, + 本次到货数量: v.本次到货数量 + }) + }) } else if (this.TypeValue === 3) { if (this.contractValue) { this.contractValue_check = 1 } else { this.contractValue_check = 0 } const param = { diff --git a/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue b/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue new file mode 100644 index 00000000..a9fcd084 --- /dev/null +++ b/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue @@ -0,0 +1,469 @@ + + + + + diff --git a/src/views/ManufacturingCenter/InventoryQuery/index.vue b/src/views/ManufacturingCenter/InventoryQuery/index.vue index 4d24e170..facb157f 100644 --- a/src/views/ManufacturingCenter/InventoryQuery/index.vue +++ b/src/views/ManufacturingCenter/InventoryQuery/index.vue @@ -13,27 +13,27 @@ - + - + - + - + - + diff --git a/src/views/Outsourcing/OutsourcingQCSearch/index.vue b/src/views/Outsourcing/OutsourcingQCSearch/index.vue index b3d648f8..80c1f1bc 100644 --- a/src/views/Outsourcing/OutsourcingQCSearch/index.vue +++ b/src/views/Outsourcing/OutsourcingQCSearch/index.vue @@ -8,12 +8,12 @@ 查询 - + - + diff --git a/src/views/PurchasingCenter/ArrivalStateSearch/index.vue b/src/views/PurchasingCenter/ArrivalStateSearch/index.vue index 6f34a521..992ad58d 100644 --- a/src/views/PurchasingCenter/ArrivalStateSearch/index.vue +++ b/src/views/PurchasingCenter/ArrivalStateSearch/index.vue @@ -31,7 +31,7 @@ height="400px" size="mini" @row-click="searchTable2"> - + @@ -41,17 +41,17 @@ {{ scope.row.采购合同名称 }} - + - + - + diff --git a/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue b/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue index 01510b03..062a27e9 100644 --- a/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue +++ b/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue @@ -14,22 +14,22 @@

采购件列表

- + - + - + - + @@ -83,22 +83,22 @@

滞货件列表

- + - + - + - + diff --git a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue index a256aeef..37992640 100644 --- a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue +++ b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue @@ -41,12 +41,12 @@ - + - + @@ -56,12 +56,12 @@ {{ scope.row.发票金额 }} - + - + diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue index 3039db15..925dc19d 100644 --- a/src/views/PurchasingCenter/OfflineContract/index.vue +++ b/src/views/PurchasingCenter/OfflineContract/index.vue @@ -48,29 +48,29 @@ size="mini" @selection-change="handleSelectionChange1"> - + - + - + - + - + @@ -80,22 +80,22 @@ {{ scope.row.物料类别 }} - + - + - + - + @@ -302,7 +302,7 @@ 全部到货 - + @@ -312,17 +312,17 @@ {{ scope.row.离线合同名称 }} - + - + - + diff --git a/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue b/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue index 6c98f5ff..c5205a53 100644 --- a/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue +++ b/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue @@ -33,17 +33,17 @@

请款表

- + - + - + diff --git a/src/views/PurchasingCenter/PayStateSearch/index.vue b/src/views/PurchasingCenter/PayStateSearch/index.vue index 3026cfb7..5e01d065 100644 --- a/src/views/PurchasingCenter/PayStateSearch/index.vue +++ b/src/views/PurchasingCenter/PayStateSearch/index.vue @@ -54,7 +54,7 @@ - + @@ -64,32 +64,32 @@ {{ scope.row.采购合同名称 }} - + - + - + - + - + - + - + @@ -120,19 +120,19 @@ {{ scope.row.采购合同名称 }} - + - + - + - + diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue index 8f3231a6..25c1c42e 100644 --- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue +++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue @@ -39,7 +39,7 @@ - + - + - + - + @@ -67,12 +67,12 @@ {{ scope.row.物料型号 }} - + - + @@ -97,7 +97,7 @@ {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || scope.row.离线到货数量 || '—' }} - + @@ -127,7 +127,7 @@ - + - + - + - + @@ -155,12 +155,12 @@ {{ scope.row.物料型号 }} - + - + @@ -185,7 +185,7 @@ {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || scope.row.离线到货数量 || '—' }} - + @@ -215,7 +215,7 @@ - + - + - + - + @@ -243,7 +243,7 @@ {{ scope.row.零件图号 }} - + @@ -253,7 +253,7 @@ {{ scope.row.材料 }} - + @@ -278,7 +278,7 @@ {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || '—' }} - + diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue index 1edcb51b..76b2257f 100644 --- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue +++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue @@ -137,7 +137,7 @@ - + - + - + @@ -160,27 +160,27 @@ {{ scope.row.组号 }} - + - + - + - + - + @@ -195,7 +195,7 @@ {{ scope.row.备注 }} - + @@ -354,7 +354,7 @@ - + - + - + @@ -377,27 +377,27 @@ {{ scope.row.组号 }} - + - + - + - + - + @@ -412,7 +412,7 @@ {{ scope.row.备注 }} - + @@ -545,7 +545,7 @@ - + - + - + - + - + - + - + @@ -598,7 +598,7 @@ {{ scope.row.备注 }} - + diff --git a/src/views/PurchasingCenter/SetPayPlan/index.vue b/src/views/PurchasingCenter/SetPayPlan/index.vue index f50827f9..fbc8d73e 100644 --- a/src/views/PurchasingCenter/SetPayPlan/index.vue +++ b/src/views/PurchasingCenter/SetPayPlan/index.vue @@ -70,17 +70,17 @@ - + - + - +