From 361ff6843d9428fc1db94ffaefdeac49b90fc209 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Wed, 28 Nov 2018 10:15:58 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=EF=BC=9A=E5=AE=A1=E6=89=B9=E6=98=AF=E5=90=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseContractApproval/index.vue | 100 ++++++++---------- 1 file changed, 46 insertions(+), 54 deletions(-) diff --git a/src/views/PurchasingCenter/PurchaseContractApproval/index.vue b/src/views/PurchasingCenter/PurchaseContractApproval/index.vue index e15dbcf4..e4971c40 100644 --- a/src/views/PurchasingCenter/PurchaseContractApproval/index.vue +++ b/src/views/PurchasingCenter/PurchaseContractApproval/index.vue @@ -99,60 +99,58 @@ - -
- - +
+ +
+ + + + + + + + + + + + + + + + +
GAOJING产品销售合同
需方江苏高精机电装备有限公司合同编号{{ contract }}
供方{{ supplier }}签订地点江苏盐城
+
一、 产品名称、型号、数量、单价、品牌：
+ + + + + + + + + + + + + - - + + - - - - + + - - - - - - -
物料名称物料规格物料型号发货天数数量单价总价
GAOJING产品销售合同运费：{{ freight }}
需方江苏高精机电装备有限公司合同编号{{ contract }}总价: (人民币){{ RMB }}(含0.17增值税) {{ TotalAmount }}
供方{{ supplier }}签订地点江苏盐城
-
一、 产品名称、型号、数量、单价、品牌：
- - - - - - - - - - - - - - - - - - - - - - -
物料名称物料规格物料型号发货天数数量单价总价
运费：{{ freight }}
总价: (人民币){{ RMB }}(含0.17增值税) {{ TotalAmount }}
-
- -
- + + +
+ +
- + - + - +
@@ -213,7 +211,6 @@ export default { label: '否' } ], - disabled: true, form2: { 审批是否通过: 1, 未通过原因: '' @@ -277,11 +274,6 @@ export default { this.dialogVisible3 = true this.ProcurementContractNum = row.采购合同流水号 }, - selectChange() { - if (this.form2.审批是否通过 === 2) { - this.disabled = false - } - }, submitApproval(formName) { this.$refs[formName].validate((valid) => { if (valid) { From 9aa0a7faa5217af8fe672cb5095281f82f54bf62 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Wed, 28 Nov 2018 10:21:32 +0800 Subject: [PATCH 2/9] =?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=E5=B1=85=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseContractSearch/index.vue | 96 +++++++++---------- 1 file changed, 47 insertions(+), 49 deletions(-) diff --git a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue index c5e902bc..96637d74 100644 --- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue +++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue @@ -120,59 +120,57 @@
- -
- 二维码：
- -
-
- - +
+ 二维码：
+ +
+
+ +
+ + + + + + + + + + + + + + + + +
GAOJING产品销售合同
需方江苏高精机电装备有限公司合同编号{{ contract }}
供方{{ supplier }}签订地点江苏盐城
+
一、 产品名称、型号、数量、单价、品牌：
+ + + + + + + + + + + + + - - + + - - - - + + - - - - - - -
物料名称物料规格物料型号发货天数数量单价总价
GAOJING产品销售合同运费：{{ freight }}
需方江苏高精机电装备有限公司合同编号{{ contract }}总价: (人民币){{ RMB }}(含0.17增值税) {{ TotalAmount }}
供方{{ supplier }}签订地点江苏盐城
-
一、 产品名称、型号、数量、单价、品牌：
- - - - - - - - - - - - - - - - - - - - - - -
物料名称物料规格物料型号发货天数数量单价总价
运费：{{ freight }}
总价: (人民币){{ RMB }}(含0.17增值税) {{ TotalAmount }}
-
- -
- + + +
+ +
From d723de3922d44191c6841e488c34d5fa739a6ae0 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Wed, 28 Nov 2018 10:29:24 +0800 Subject: [PATCH 3/9] =?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=E4=BA=8C=E7=BB=B4=E7=A0=81url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/PurchasingCenter/PurchaseContractSearch/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue index 96637d74..3c214440 100644 --- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue +++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue @@ -246,7 +246,8 @@ export default { quality: 0.3 } } - const str = 'http://192.168.1.111:8022/searchContract.html?contractNum=' + contractNum + // const str = 'http://192.168.1.111:8022/searchContract.html?contractNum=' + contractNum + const str = 'http://192.168.1.111:8080/#/ContractInquiry/index?id=' + contractNum QRCode.toDataURL(str, opts, function(err, url) { if (err) throw err const img = document.getElementById('img') From 739fdd22da20b6a72d091a377be4b881605e9d87 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Wed, 28 Nov 2018 10:47:05 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E5=90=88=E5=90=8C?= =?UTF-8?q?=E8=AF=B7=E6=AC=BE=EF=BC=9A=E5=8F=96=E6=B6=88=E8=AF=B7=E6=AC=BE?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E7=A6=81=E7=94=A8=E6=9D=A1=E4=BB=B6=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E6=9C=AA=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=E6=89=8D?= =?UTF-8?q?=E5=8F=AF=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/PurchasingCenter/OfflineContractRequestFund/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue b/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue index d61faca9..75d13874 100644 --- a/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue +++ b/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue @@ -95,7 +95,7 @@ 查看详情 - 取消请款 + 取消请款 From 52741c03d7162e96e4cc22bcf5e84d33840878e1 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Wed, 28 Nov 2018 10:57:02 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E9=A2=86=E7=94=A8=E6=A0=B8=E7=AE=97?= =?UTF-8?q?=EF=BC=9A=E5=8E=BB=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/PurchasingCenter/ReceiveCheck.js | 5 ++-- .../PurchasingCenter/ReceiveCheck/index.vue | 28 ++++--------------- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/src/api/PurchasingCenter/ReceiveCheck.js b/src/api/PurchasingCenter/ReceiveCheck.js index 8fe18b05..7491a60d 100644 --- a/src/api/PurchasingCenter/ReceiveCheck.js +++ b/src/api/PurchasingCenter/ReceiveCheck.js @@ -12,15 +12,14 @@ export function initProject() { }) } // 初始化项目金额统计表 -export function searchReceiveCheck(pageCurrent, pageSize, check, num) { +export function searchReceiveCheck(check, num) { return request({ url: '', method: 'post', data: { type: '1', name: '采购管理_领用核算_查询数据', - param: `项目流水号_check=${check}&项目流水号=${num}`, - Pagination: pageCurrent + '&' + pageSize + param: `项目流水号_check=${check}&项目流水号=${num}` } }) } diff --git a/src/views/PurchasingCenter/ReceiveCheck/index.vue b/src/views/PurchasingCenter/ReceiveCheck/index.vue index ac1e1caf..26c348a6 100644 --- a/src/views/PurchasingCenter/ReceiveCheck/index.vue +++ b/src/views/PurchasingCenter/ReceiveCheck/index.vue @@ -19,8 +19,10 @@ height="440" size="mini" show-summary - highlight-current-row + stripe border> + + -
- -
@@ -111,20 +103,10 @@ export default { if (!this.projectValue) { this.$message.error('请选择项目') } else { - searchReceiveCheck(this.pageCurrent, this.pageSize, 1, this.projectValue).then(response => { - this.tableData1 = response.data.rows - this.total = response.data.total + searchReceiveCheck(1, this.projectValue).then(response => { + this.tableData1 = response.data }) } - }, - handleSizeChange(val) { - this.pageSize = val - this.pageCurrent = 1 - this.searchProject() - }, - handleCurrentChange(val) { - this.pageCurrent = val - this.searchProject() } } } From 8be156014d24f29933cf653ef60ce89699f93ee7 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Wed, 28 Nov 2018 10:59:45 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=80=BB=E4=BB=B7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=9A=E6=96=91=E9=A9=AC=E7=BA=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchasingCenter/ProjectTotalSearch/index.vue | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/views/PurchasingCenter/ProjectTotalSearch/index.vue b/src/views/PurchasingCenter/ProjectTotalSearch/index.vue index 7bbf7971..15426cde 100644 --- a/src/views/PurchasingCenter/ProjectTotalSearch/index.vue +++ b/src/views/PurchasingCenter/ProjectTotalSearch/index.vue @@ -18,7 +18,9 @@ - + + + - - - + + +