From 13bf0656702d51c9b29775ad16dc381be848effa Mon Sep 17 00:00:00 2001 From: chenjianan Date: Mon, 17 Jun 2019 08:52:02 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E8=80=85?= 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 5e84b952..f760d53a 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -92,9 +92,9 @@ {{ scope.row.机床图号 }} - + @@ -275,9 +275,9 @@ {{ scope.row.机床图号 }} - + From bf8fab65a16e516dd5395c2423cf51cdd5ce92fd Mon Sep 17 00:00:00 2001 From: chenjianan Date: Mon, 17 Jun 2019 09:41:39 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Inventory/PurchaseInRecord/index.vue | 76 +++++++------ .../Inventory/PurchaseOutRecord/index.vue | 102 ++++++++++-------- 2 files changed, 105 insertions(+), 73 deletions(-) diff --git a/src/views/Inventory/PurchaseInRecord/index.vue b/src/views/Inventory/PurchaseInRecord/index.vue index 94c52eb5..a938735b 100644 --- a/src/views/Inventory/PurchaseInRecord/index.vue +++ b/src/views/Inventory/PurchaseInRecord/index.vue @@ -2,37 +2,51 @@
- 项目名称: - - - - 机床图号: - - - - 组号: - - - - 名称: - - 规格: - - 图号或型号: - - 查询 + + + 项目名称: + + + + + + 机床图号: + + + + + + 组           号: + + + + + + + + 名       称: + + + + 规       格: + + + 图号或型号: + + 查询 +

采购合同件

diff --git a/src/views/Inventory/PurchaseOutRecord/index.vue b/src/views/Inventory/PurchaseOutRecord/index.vue index 3a1ab531..0cd5290b 100644 --- a/src/views/Inventory/PurchaseOutRecord/index.vue +++ b/src/views/Inventory/PurchaseOutRecord/index.vue @@ -2,48 +2,66 @@
- 项目名称: - - - - 机床图号: - - - - 组号: - - - - 名称: - - 规格: - - 图号或型号: - - 出库时间: - - 查询 + + + 项目名称: + + + + + + 机床图号: + + + + + + 组           号: + + + + + + + + 名       称: + + + + 规       格: + + + + 图号或型号: + + + + + 出库时间: + + 查询 +
From 654efe806af4eca8ebac2dc0cf1dca13ca04f1a4 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Mon, 17 Jun 2019 09:44:11 +0800 Subject: [PATCH 03/15] request --- src/utils/request.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/request.js b/src/utils/request.js index 4646e1be..39e0294c 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -22,7 +22,7 @@ export const ServerIP = `http://192.168.1.231:8411/webpage/file/` export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFileMachine.ashx` // 机床总图 发布时改成0.231 const service = axios.create({ - baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) From fa90fb98f2d0f0cdae0a2de82d8022160bc304c9 Mon Sep 17 00:00:00 2001 From: caoxinyu Date: Mon, 17 Jun 2019 18:00:27 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MarketingCenter/DeliveryApplication.js | 167 +++ .../DeliveryApplication/index.vue | 1168 +++++++++++++++++ 2 files changed, 1335 insertions(+) create mode 100644 src/api/MarketingCenter/DeliveryApplication.js create mode 100644 src/views/MarketingCenter/DeliveryApplication/index.vue diff --git a/src/api/MarketingCenter/DeliveryApplication.js b/src/api/MarketingCenter/DeliveryApplication.js new file mode 100644 index 00000000..49a982ba --- /dev/null +++ b/src/api/MarketingCenter/DeliveryApplication.js @@ -0,0 +1,167 @@ +import request from '@/utils/request' + +export function InvoiceAdd() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '发货管理_发货申请_发货单_新增', + param: '制单人=' + arguments[0] + '&发货单流水号=0=int=output' + } + }) +} +export function InvoiceDelete() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '发货管理_发货申请_发货单_删除', + param: '发货单流水号=' + arguments[0] + } + }) +} +export function InvoiceSelectPush() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '发货管理_发货申请_发货单_下拉框数据_查询', + param: '查询条件=' + arguments[0] + } + }) +} +export function PickSelectPush() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '发货管理_发货申请_发货单_货品_查询', + param: '查询类别=' + arguments[0] + '\\&查询条件=' + arguments[1] + } + }) +} +export function SelectMachine() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '发货管理_发货申请_发货单_机床_查询', + param: '机床图号=' + arguments[0] + } + }) +} +export function SelectAssembly() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '发货管理_发货申请_发货单_组件_查询', + param: '组号=' + arguments[0] + } + }) +} +export function SelectPart() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '发货管理_发货申请_发货单_零件_查询', + param: '零件图号=' + arguments[0] + } + }) +} +export function SelectMateriel() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '发货管理_发货申请_发货单_物料_查询', + param: '物料名称=' + arguments[0] + } + }) +} +export function InvoiceFeach() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '发货管理_发货申请_发货单数据_查询', + param: '发货单流水号=' + arguments[0] + } + }) +} +export function InvoiceSave() { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '发货管理_发货申请_发货单_保存', + param: '发货单流水号=' + arguments[0] + '\\&收货单位=' + arguments[1] + '\\&收货地址=' + arguments[2] + '\\&收货人员=' + arguments[3] + '\\&联系电话=' + arguments[4] + '\\&注意事项=' + arguments[5] + '\\&发货单名称=' + arguments[6] + } + }) +} +export function InvoiceExamine() { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '发货管理_发货申请_发货单_审核', + param: '发货单流水号=' + arguments[0] + '&审核人=' + arguments[1] + } + }) +} +export function InvoiceAbandoningTrial() { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '发货管理_发货申请_发货单_弃审', + param: '发货单流水号=' + arguments[0] + } + }) +} +export function DetailsFeach() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '发货管理_发货申请_发货单明细_查询', + param: '发货单流水号=' + arguments[0] + } + }) +} +export function InvoiceDetailsSave() { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '发货管理_发货申请_发货单_发货单明细_循环增加', + param: '货品类别组=' + arguments[0] + '\\&货品编号组=' + arguments[1] + '\\&货品名称组=' + arguments[2] + '\\&货品规格组=' + arguments[3] + '\\&货品型号组=' + arguments[4] + '\\&设计者组=' + arguments[5] + '\\&数量组=' + arguments[6] + '\\&发货单流水号=' + arguments[7] + } + }) +} +export function InvoiceListSearch() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '发货管理_发货申请_发货单_发货单列表_查询', + param: '发货单名=' + arguments[0] + '\\&发货单号=' + arguments[1] + '\\&收货单位=' + arguments[2] + '\\&车辆牌号=' + arguments[3] + '\\&司机姓名=' + arguments[4] + '\\&司机电话=' + arguments[5] + '\\&制单人=' + arguments[6] + '\\&核准人=' + arguments[7] + '\\&执行人=' + arguments[8] + '\\&开始制单日期=' + arguments[9] + '\\&结束制单日期=' + arguments[10] + '\\&开始核准日期=' + arguments[11] + '\\&结束核准日期=' + arguments[12] + '\\&开始发货日期=' + arguments[13] + '\\&结束发货日期=' + arguments[14] + '\\&发货单名_check=' + arguments[15] + '\\&发货单号_check=' + arguments[16] + '\\&收货单位_check=' + arguments[17] + '\\&车辆牌号_check=' + arguments[18] + '\\&司机姓名_check=' + arguments[19] + '\\&司机电话_check=' + arguments[20] + '\\&制单人_check=' + arguments[21] + '\\&核准人_check=' + arguments[22] + '\\&执行人_check=' + arguments[23] + '\\&开始制单日期_check=' + arguments[24] + '\\&结束制单日期_check=' + arguments[25] + '\\&开始核准日期_check=' + arguments[26] + '\\&结束核准日期_check=' + arguments[27] + '\\&开始发货日期_check=' + arguments[28] + '\\&结束发货日期_check=' + arguments[29] + } + }) +} diff --git a/src/views/MarketingCenter/DeliveryApplication/index.vue b/src/views/MarketingCenter/DeliveryApplication/index.vue new file mode 100644 index 00000000..0ad26f8a --- /dev/null +++ b/src/views/MarketingCenter/DeliveryApplication/index.vue @@ -0,0 +1,1168 @@ + + + + + + From 8ae1ef35d112c08187f9453c44050922e77ab04a Mon Sep 17 00:00:00 2001 From: caoxinyu Date: Mon, 17 Jun 2019 18:15:16 +0800 Subject: [PATCH 05/15] bugfix --- .../DeliveryApplication/index.vue | 50 ++++++++++--------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/src/views/MarketingCenter/DeliveryApplication/index.vue b/src/views/MarketingCenter/DeliveryApplication/index.vue index 0ad26f8a..ba794946 100644 --- a/src/views/MarketingCenter/DeliveryApplication/index.vue +++ b/src/views/MarketingCenter/DeliveryApplication/index.vue @@ -25,14 +25,16 @@ - 制单人： - {{ isMaker }} - - 核准人： - {{ isExamine }} - - 发货执行人： - {{ isDelive }} +
+ 制单人： + {{ isMaker }} + + 核准人： + {{ isExamine }} + + 发货执行人： + {{ isDelive }} +
@@ -187,7 +189,7 @@ 发货单号： 收货地址： @@ -246,21 +248,21 @@ 车辆牌号： 司机姓名： 司机电话： @@ -273,8 +275,7 @@ style="width: 100%" height="300" border - size="mini" - @row-click="fetchTableData2"> + size="mini"> + + + - + - + @@ -578,7 +587,7 @@ @@ -597,6 +606,7 @@ import { mapGetters } from 'vuex' export default { data() { return { + input_Record: '', disabled: true, disabledAdd: false, // 增加按钮启用状态 disabledEdit: true, // 编辑按钮启用状态 @@ -780,6 +790,7 @@ export default { if (this.invoiceNum !== '' && this.invoiceNum !== null) { InvoiceFeach(this.invoiceNum).then(response => { if (response.data.length !== 0) { + this.input_Record = response.data[0].备注 this.input_Adress = response.data[0].收货地址 this.input_People = response.data[0].收货人员 this.input_Mobile = response.data[0].联系电话 @@ -927,11 +938,11 @@ export default { type: 'warning' }).then(() => { InvoiceAbandoningTrial(this.invoiceNum).then(response => { - if (response.data[0].result === '1') { + if (response.data[0].弃审是否成功 === '成功') { this.$message.success('放弃核准成功！') this.function_InvoiceFeach() } else { - this.$message.error('放弃核准失败') + this.$message.error('放弃核准失败,可能原因是装配部门已经确认发货,如需调整请联系装配部门打回！') } }) }) diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index c9e6c520..e8da85f2 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -1,23 +1,126 @@