diff --git a/src/icons/svg/OutsourcingTaskQuery.svg b/src/icons/svg/OutsourcingTaskQuery.svg
new file mode 100644
index 00000000..fc3107f5
--- /dev/null
+++ b/src/icons/svg/OutsourcingTaskQuery.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/utils/request.js b/src/utils/request.js
index 9f7e021d..1af64819 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -14,8 +14,13 @@ const service = axios.create({
// baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
- baseURL: `http://192.168.0.104:8411/submit/MESCommonBase.ashx`,
+
+ baseURL: `http://192.168.0.105:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
+
+ // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
+ // baseURL: `http://192.168.137.85:8411/submit/MESCommonBase.ashx`, // 李鑫
+
// baseURL: `http://192.168.1.112:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})
diff --git a/src/views/MarketingCenter/DeliveryManagement/index.vue b/src/views/MarketingCenter/DeliveryManagement/index.vue
index fad2122d..446578e3 100644
--- a/src/views/MarketingCenter/DeliveryManagement/index.vue
+++ b/src/views/MarketingCenter/DeliveryManagement/index.vue
@@ -1046,6 +1046,7 @@ export default {
this.form3.数量 = ''
if (response.data[0].result === '1') {
this.searchCargoBoxDetailed()
+ this.searchPackingListDetails()
searchParts(this.code).then(response => {
this.tableData4 = response.data
})
diff --git a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue
index 5595bd25..999b803b 100644
--- a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue
+++ b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue
@@ -281,6 +281,7 @@ export default {
this.tableData = []
if (this.radio === 1) {
searchPartNum1(this.check_entryNameValue, this.entryNameValue, this.check_toolNumValue, this.toolNumValue, this.check_NumValue, this.NumValue, this.check_partName, this.partName, 0, this.pageCurrent2, this.pageSize2).then(response => {
+ console.log(response.data)
this.tableData2 = response.data.rows
this.total2 = response.data.total
}).then(() => {
diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue
index f0e7284f..6da8b560 100644
--- a/src/views/Outsourcing/PreorderAssociation/index.vue
+++ b/src/views/Outsourcing/PreorderAssociation/index.vue
@@ -85,9 +85,16 @@
type="index"
align="center"
width="50"/>
+
+
+ 未加工
+ 已完成
+ 停产
+
+
- 选择
+ 选择
@@ -235,6 +242,7 @@ export default {
this.checkBox = []
this.tableData2 = []
searchTable2(row.工艺计划流水号).then(response => {
+ console.log(response.data)
this.num1 = row.工艺计划流水号
if (response.data.length === 0) {
this.loading0 = false