From 0f18c4e3a4943dd27e2eeb381e3c00e46218077b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 19 二月 2025 17:54:47 +0800
Subject: [PATCH] 铜材料下单-联调
---
src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue | 4
src/views/business/materialOrder/copperOrder.vue | 52 ++++++-----------
src/views/business/materialOrder/customsInspection.vue | 77 ++++++++++++-------------
src/api/business/rawMaterialOrder.js | 4
src/router/index.js | 16 +++-
src/views/business/materialOrder/index.vue | 20 +++---
6 files changed, 81 insertions(+), 92 deletions(-)
diff --git a/src/api/business/rawMaterialOrder.js b/src/api/business/rawMaterialOrder.js
index c463090..ee21873 100644
--- a/src/api/business/rawMaterialOrder.js
+++ b/src/api/business/rawMaterialOrder.js
@@ -44,7 +44,7 @@
// 鑾峰彇褰撳墠鐧诲綍鐨勫鎴蜂俊鎭�
export function getUserNow(query) {
return request({
- url: '/user/getUserNow',
+ url: '/system/newUser/getUserNow',
method: 'get',
})
}
@@ -138,7 +138,7 @@
// 閾滃崟涓濅笅鍗�
export function addRawCopperOrder(query) {
return request({
- url: '/insOrder/addRawCopperOrder',
+ url: '/rawMaterialOrder/addRawCopperOrder',
method: 'post',
data: query
})
diff --git a/src/router/index.js b/src/router/index.js
index 0795a32..298860f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -100,12 +100,18 @@
permissions: ["business:order"],
children: [
{
+ // 鍘熸潗鏂欎笅鍗�
+ path: 'customsInspection',
+ component: () => import('@/views/business/materialOrder/customsInspection'),
+ name: 'customsInspection',
+ meta: { title: '鍘熸潗鏂欎笅鍗曡鎯�', activeMenu: '/business/materialOrder' }
+ },
+ {
// 閾滄潗鏂欎笅鍗�
- path: "customsInspection",
- component: () =>
- import("@/views/business/materialOrder/customsInspection"),
- name: "customsInspection",
- meta: { title: "閾滄潗鏂欎笅鍗�", activeMenu: "/business/materialOrder" },
+ path: 'copperOrder',
+ component: () => import('@/views/business/materialOrder/copperOrder'),
+ name: 'copperOrder',
+ meta: { title: '閾滄潗鏂欎笅鍗�', activeMenu: '/business/materialOrder' }
},
],
},
diff --git a/src/views/business/materialOrder/copperOrder.vue b/src/views/business/materialOrder/copperOrder.vue
index ad0d97d..467bc40 100644
--- a/src/views/business/materialOrder/copperOrder.vue
+++ b/src/views/business/materialOrder/copperOrder.vue
@@ -515,8 +515,6 @@
bsm2: false,
bsm2Val: null,
bsm2Dia: false,
- bsm2Val2: [],
- bsm2Val3: [],
bsmRow3: null,
bsm3Val: null,
bsm3Dia: false,
@@ -649,7 +647,6 @@
item.quantity = 1
})
this.count++
- this.computationalPairing(this.sampleList.length)
},
noNeedCheck () {
this.$refs['addObj'].validate((valid) => {
@@ -902,10 +899,6 @@
this.$message.error('璇烽�夋嫨妫�楠屾爣鍑�')
return
}
- // if (!this.sampleList.every(m => m.quantity)) {
- // this.$message.error('璇烽�夋嫨寰呮椤规暟閲�')
- // return
- // }
const sampleList = this.HaveJson(this.sampleList)
sampleList.forEach(item => {
item.quantity = 1
@@ -1148,25 +1141,27 @@
saveMethod(sampleList){
this.saveLoad = true
addRawCopperOrder({
- str: JSON.stringify({
- insOrder: this.addObj,
- list: JSON.stringify(sampleList.map(a => {
- if (a.modelNum) {
- const index = a.modelNum.indexOf('脳')
- if (index === 0) {
- a.model = a.model + a.modelNum
- } else if (index === -1) {
- a.model = a.model + '-' + a.modelNum
- } else {
- a.model = a.modelNum + a.model
- }
+ copperInsOrder: this.addObj,
+ sampleList: sampleList.map(a => {
+ if (a.insProduct.length > 0) {
+ a.insProduct.forEach(c => {
+ delete c.id
+ })
+ }
+ if (a.modelNum) {
+ const index = a.modelNum.indexOf('脳')
+ if (index === 0) {
+ a.model = a.model + a.modelNum
+ } else if (index === -1) {
+ a.model = a.model + '-' + a.modelNum
} else {
- a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ? '' : ('-' + a.modelNum))
+ a.model = a.modelNum + a.model
}
- a.insProduct = a.insProduct.filter(b=>b.state === 1)
- return a
- })),
- pairing: JSON.stringify(this.bsm2Val2)
+ } else {
+ a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ? '' : ('-' + a.modelNum))
+ }
+ a.insProduct = a.insProduct.filter(b=>b.state === 1)
+ return a
})
}).then(res => {
this.saveLoad = false
@@ -1333,8 +1328,6 @@
this.sampleList.push(this.HaveJson(this.sample))
// this.count++
}
- this.computationalPairing(this.sampleList.length)
- this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
},
selectSample(val) {
this.sampleIds = []
@@ -1463,13 +1456,6 @@
}
backtrack([], nums);
return result;
- },
- computationalPairing(n) {
- const nums = [];
- for (let i = 1; i <= n; i++) {
- nums.push(i);
- }
- this.bsm2Val3 = this.HaveJson(this.permute(nums))
},
tableRowClassName({row, rowIndex}) {
if (row.state === 0) {
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index 4f9902b..f54eec2 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -432,6 +432,7 @@
<script>
import {
+ addExemptionOrder,
addInsOrder,
addRawMaterOrderTemplate, delRawMaterOrderTemplate,
getInsOrder,
@@ -995,28 +996,26 @@
this.addObj.ifsInventoryId = this.customsInspection.id
this.noNeedCheckLoad = true
addExemptionOrder({
- str: JSON.stringify({
- insOrder: this.addObj,
- list: JSON.stringify(sampleList.map(a => {
- if (a.modelNum) {
- // 鏍规嵁x鍙峰垽鏂瀷鍙峰弬鏁颁笌鏍峰搧鍨嬪彿鐨勬嫾鎺ヤ綅缃�
- // 渚嬪脳4锛屽氨涓�500ML脳4锛�4脳锛屽氨涓�4脳500ML
- const index = a.modelNum.indexOf('脳')
- if (index === 0) {
- a.model = a.model + a.modelNum
- } else if (index === -1) {
- a.model = a.model + '-' + a.modelNum
- } else {
- a.model = a.modelNum + a.model
- }
+ insOrder: this.addObj,
+ list: sampleList.map(a => {
+ if (a.modelNum) {
+ // 鏍规嵁x鍙峰垽鏂瀷鍙峰弬鏁颁笌鏍峰搧鍨嬪彿鐨勬嫾鎺ヤ綅缃�
+ // 渚嬪脳4锛屽氨涓�500ML脳4锛�4脳锛屽氨涓�4脳500ML
+ const index = a.modelNum.indexOf('脳')
+ if (index === 0) {
+ a.model = a.model + a.modelNum
+ } else if (index === -1) {
+ a.model = a.model + '-' + a.modelNum
} else {
- a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ? '' : ('-' + a.modelNum))
+ a.model = a.modelNum + a.model
}
- a.insProduct = a.insProduct.filter(b=>b.state === 1)
- return a
- })),
- pairing: JSON.stringify(pairing)
- })
+ } else {
+ a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ? '' : ('-' + a.modelNum))
+ }
+ a.insProduct = a.insProduct.filter(b=>b.state === 1)
+ return a
+ }),
+ pairing: pairing
}).then(res => {
this.noNeedCheckLoad = false
if (res.code == 201) return
@@ -1046,28 +1045,26 @@
this.addObj.ifsInventoryId = this.customsInspection.id
this.saveLoad = true
addInsOrder({
- str: JSON.stringify({
- insOrder: this.addObj,
- list: JSON.stringify(sampleList.map(a => {
- if (a.modelNum) {
- // 鏍规嵁x鍙峰垽鏂瀷鍙峰弬鏁颁笌鏍峰搧鍨嬪彿鐨勬嫾鎺ヤ綅缃�
- // 渚嬪脳4锛屽氨涓�500ML脳4锛�4脳锛屽氨涓�4脳500ML
- const index = a.modelNum.indexOf('脳')
- if (index === 0) {
- a.model = a.model + a.modelNum
- } else if (index === -1) {
- a.model = a.model + '-' + a.modelNum
- } else {
- a.model = a.modelNum + a.model
- }
+ insOrder: this.addObj,
+ list: sampleList.map(a => {
+ if (a.modelNum) {
+ // 鏍规嵁x鍙峰垽鏂瀷鍙峰弬鏁颁笌鏍峰搧鍨嬪彿鐨勬嫾鎺ヤ綅缃�
+ // 渚嬪脳4锛屽氨涓�500ML脳4锛�4脳锛屽氨涓�4脳500ML
+ const index = a.modelNum.indexOf('脳')
+ if (index === 0) {
+ a.model = a.model + a.modelNum
+ } else if (index === -1) {
+ a.model = a.model + '-' + a.modelNum
} else {
- a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ? '' : ('-' + a.modelNum))
+ a.model = a.modelNum + a.model
}
- a.insProduct = a.insProduct.filter(b=>b.state === 1)
- return a
- })),
- pairing: JSON.stringify(pairing)
- })
+ } else {
+ a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ? '' : ('-' + a.modelNum))
+ }
+ a.insProduct = a.insProduct.filter(b=>b.state === 1)
+ return a
+ }),
+ pairing: pairing
}).then(res => {
this.saveLoad = false
if (res.code == 201) return
diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue
index e59e5f2..e0b3b07 100644
--- a/src/views/business/materialOrder/index.vue
+++ b/src/views/business/materialOrder/index.vue
@@ -237,14 +237,14 @@
if (params == 1) {
return '杩囨湡鐗╂枡'
} else {
- return ''
+ return null
}
},
formatType: (params) => {
if (params == 1) {
return 'info'
} else {
- return ''
+ return null
}
}
},
@@ -306,14 +306,14 @@
if (params == 1) {
return '杩囨湡鐗╂枡'
} else {
- return ''
+ return null
}
},
formatType: (params) => {
if (params == 1) {
return 'info'
} else {
- return ''
+ return null
}
}
},
@@ -381,14 +381,14 @@
if (params == 1) {
return '杩囨湡鐗╂枡'
} else {
- return ''
+ return null
}
},
formatType: (params) => {
if (params == 1) {
return 'info'
} else {
- return ''
+ return null
}
}
},
@@ -494,14 +494,14 @@
if (params == 1) {
return '杩囨湡鐗╂枡'
} else {
- return ''
+ return null
}
},
formatType: (params) => {
if (params == 1) {
return 'info'
} else {
- return ''
+ return null
}
}
},
@@ -560,14 +560,14 @@
if (params == 1) {
return '杩囨湡鐗╂枡'
} else {
- return ''
+ return null
}
},
formatType: (params) => {
if (params == 1) {
return 'info'
} else {
- return ''
+ return null
}
}
},
diff --git a/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue b/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
index 81c4baa..3eb9521 100644
--- a/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
+++ b/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
@@ -63,7 +63,7 @@
} else if (params == 3) {
return '涓嶅垽瀹�'
} else {
- return ''
+ return null
}
},
formatType: (params) => {
@@ -74,7 +74,7 @@
} else if (params == 3) {
return ''
} else {
- return ''
+ return null
}
}
},
--
Gitblit v1.9.3