From 89b4efaa589a818f82713dc598674710f1d60594 Mon Sep 17 00:00:00 2001
From: beyond <931414026@qq.com>
Date: Wed, 22 May 2019 13:19:19 +0800
Subject: [PATCH] cccc
---
src/api/BasicSettings.js | 6 ++++++
src/views/BasicSettings/ApprovalProcess.vue | 4 +++-
src/views/CheckReport/AddCheckReport.vue | 4 ++++
src/views/ProduceTask/AddProduceTask.vue | 4 ++++
src/views/SaleOrder/AddSaleOrder.vue | 16 +++++++++++++++-
5 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/src/api/BasicSettings.js b/src/api/BasicSettings.js
index 7f411697..a8cd1298 100644
--- a/src/api/BasicSettings.js
+++ b/src/api/BasicSettings.js
@@ -369,6 +369,12 @@ export function searchProcess(query) {
if (query.is_effective !== '' && query.is_effective !== null && query.is_effective !== undefined) {
params.append('is_effective', query.is_effective) // 你要传给后台的参数值 key/value
}
+ if (query.repositoryId !== '' && query.repositoryId !== null && query.repositoryId !== undefined) {
+ params.append('repositoryId', query.repositoryId) // 你要传给后台的参数值 key/value
+ }
+ if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) {
+ params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value
+ }
params.append('pagesize', query.pagesize) // 你要传给后台的参数值 key/value
params.append('pagenum', query.pagenum) // 你要传给后台的参数值 key/value
return request({
diff --git a/src/views/BasicSettings/ApprovalProcess.vue b/src/views/BasicSettings/ApprovalProcess.vue
index 624ad68f..ceb22ec5 100644
--- a/src/views/BasicSettings/ApprovalProcess.vue
+++ b/src/views/BasicSettings/ApprovalProcess.vue
@@ -131,7 +131,9 @@ export default {
// 审批流程列表查询加展示参数
getemplist: {
pagenum: 1,
- pagesize: 10
+ pagesize: 10,
+ repositoryId: this.$store.getters.repositoryId,
+ regionIds: this.$store.getters.regionId
},
// 传给组件的数据
personalForm: {},
diff --git a/src/views/CheckReport/AddCheckReport.vue b/src/views/CheckReport/AddCheckReport.vue
index ae5e8506..01140bef 100644
--- a/src/views/CheckReport/AddCheckReport.vue
+++ b/src/views/CheckReport/AddCheckReport.vue
@@ -494,6 +494,7 @@ export default {
// 源单为质检申请单时返回数据
report(val) {
console.log(val)
+ this.personalForm.sourceSerialNumber = val.id
this.personalForm.productCode = val.productCode
this.personalForm.productName = val.productName
this.personalForm.unit = val.unit
@@ -507,6 +508,7 @@ export default {
// 源单为采购到货单时返回数据
report2(val) {
console.log(val)
+ this.sourceSerialNumber = val.id
this.personalForm.productCode = val.productCode
this.personalForm.productName = val.productName
this.personalForm.unit = val.unit
@@ -516,6 +518,7 @@ export default {
// 源单为采购到货单时返回数据
report3(val) {
console.log(val)
+ this.sourceSerialNumber = val.id
this.personalForm.productCode = val.productCode
this.personalForm.productName = val.productName
this.personalForm.unit = val.unit
@@ -523,6 +526,7 @@ export default {
this.typeId = val.productType
},
mater(val) {
+ this.sourceSerialNumber = val.id
this.personalForm.productCode = val.code
this.personalForm.productName = val.productName
this.personalForm.unit = val.produceMeasurement
diff --git a/src/views/ProduceTask/AddProduceTask.vue b/src/views/ProduceTask/AddProduceTask.vue
index db3d9410..6b20f701 100644
--- a/src/views/ProduceTask/AddProduceTask.vue
+++ b/src/views/ProduceTask/AddProduceTask.vue
@@ -246,6 +246,10 @@ export default {
this.addpro = false
this.addsouce = true
this.$refs.editable.clear()
+ } else if (this.personalForm.sourceType === '3') {
+ this.addsouce = false
+ this.addpro = true
+ this.$refs.editable.clear()
}
},
// 无来源添加商品
diff --git a/src/views/SaleOrder/AddSaleOrder.vue b/src/views/SaleOrder/AddSaleOrder.vue
index 394b4d30..767f5a95 100644
--- a/src/views/SaleOrder/AddSaleOrder.vue
+++ b/src/views/SaleOrder/AddSaleOrder.vue
@@ -12,6 +12,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -438,7 +451,8 @@ export default {
backMoney: '0.00',
sendType: '2',
currency: '1',
- transDate: null
+ transDate: null,
+ sourceType: '1'
},
// 销售订单规则数据
personalrules: {