From 643e3379b59eb24d37d1709b8b260f902375f8f4 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Mon, 30 Sep 2019 09:25:46 +0800
Subject: [PATCH 1/2] a
---
src/icons/svg/ProcurementInquiry.svg | 1 +
src/utils/request.js | 2 +-
src/views/ManufacturingCenter/InventoryQuery/index.vue | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
create mode 100644 src/icons/svg/ProcurementInquiry.svg
diff --git a/src/icons/svg/ProcurementInquiry.svg b/src/icons/svg/ProcurementInquiry.svg
new file mode 100644
index 00000000..60fcb677
--- /dev/null
+++ b/src/icons/svg/ProcurementInquiry.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/utils/request.js b/src/utils/request.js
index 400de537..92890169 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -23,7 +23,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://localhost:8005/submit/MESCommonBase.ashx`,
+ baseURL: `http://192.168.0.102:8005/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})
export default service
diff --git a/src/views/ManufacturingCenter/InventoryQuery/index.vue b/src/views/ManufacturingCenter/InventoryQuery/index.vue
index c325af8e..4d24e170 100644
--- a/src/views/ManufacturingCenter/InventoryQuery/index.vue
+++ b/src/views/ManufacturingCenter/InventoryQuery/index.vue
@@ -12,7 +12,7 @@
查询
-
+
{{ scope.row.物料名称 }}
From f78dfa9952cc38ecc432b748e385db0386d65c8e Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Mon, 30 Sep 2019 11:02:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=87=87=E8=B4=AD?=
=?UTF-8?q?=E5=90=88=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CreatePurchaseContract.js | 18 ++++++++++++----
.../CreatePurchaseContract/index.vue | 21 +++++++++++++------
2 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/src/api/PurchasingCenter/CreatePurchaseContract.js b/src/api/PurchasingCenter/CreatePurchaseContract.js
index 06fb7d44..67c36d98 100644
--- a/src/api/PurchasingCenter/CreatePurchaseContract.js
+++ b/src/api/PurchasingCenter/CreatePurchaseContract.js
@@ -1,18 +1,28 @@
import request from '@/utils/request'
// 初始化供应商
-export function initSupplier(num) {
+export function initSupplier() {
return request({
url: '',
method: 'post',
data: {
type: '3',
- name: `SELECT distinct 供应商流水号,供应商名称
-FROM 采购管理_询价单_视图
-where not EXISTS (select * from 采购管理_采购合同_采购部 where 是否启用 = 1 and 是否未通过 is null and 询价单编号 = 采购合同编号) and 采购员流水号 = ${num}`
+ name: `SELECT distinct * from 采购管理_供应商`
}
})
}
+// export function initSupplier(num) {
+// return request({
+// url: '',
+// method: 'post',
+// data: {
+// type: '3',
+// name: `SELECT distinct 供应商流水号,供应商名称
+// FROM 采购管理_询价单_视图
+// where not EXISTS (select * from 采购管理_采购合同_采购部 where 是否启用 = 1 and 是否未通过 is null and 询价单编号 = 采购合同编号) and 采购员流水号 = ${num}`
+// }
+// })
+// }
// 查询询价单列表 表1
export function searchInquirySheet(check1, value1, check2, value2, check3, id, check4, supplier) {
return request({
diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
index 0aa4a8b8..0dc669b0 100644
--- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
+++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
@@ -4,10 +4,10 @@
-
-
+
+
@@ -15,10 +15,11 @@
-
-
+
+
+
@@ -370,6 +371,7 @@ export default {
},
fetchData() {
initSupplier(this.id).then(res => {
+ // this.id
this.supplier = []
for (let i = 0; i < res.data.length; i++) {
this.supplier.push({
@@ -446,6 +448,13 @@ export default {
}
})
},
+ supplierChange9745() {
+ for (let i = 0; i < this.supplier.length; i++) {
+ if (this.supplier[i].value === this.supplierValue) {
+ this.supplierName = this.supplier[i].label
+ }
+ }
+ },
contractChange() { // 选择合同select
searchContractHeader(this.contractNumValue).then(response => {
this.deliveryDate = response.data[0].交货日期