From 86e60a01fdac6af35759d4c05d3271cf3d9807b2 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 21 二月 2025 11:58:51 +0800
Subject: [PATCH] 成品下单、原材料下单联调
---
src/api/business/productOrder.js | 8 ++++
src/views/business/materialOrder/customsInspection.vue | 56 ++++++++++++++-------------
src/views/business/productOrder/components/printDialog.vue | 8 +---
src/api/business/rawMaterialOrder.js | 8 ++++
src/views/business/productOrder/components/add.vue | 13 ++----
src/api/structural/capability.js | 2
src/views/business/materialOrder/index.vue | 6 --
7 files changed, 54 insertions(+), 47 deletions(-)
diff --git a/src/api/business/productOrder.js b/src/api/business/productOrder.js
index c6aa047..8ae703b 100644
--- a/src/api/business/productOrder.js
+++ b/src/api/business/productOrder.js
@@ -89,3 +89,11 @@
params: query
})
}
+// 鏌ヨ鎴愬搧鏍囩鎵撳嵃淇℃伅
+export function labelOrderPrinting(query) {
+ return request({
+ url: '/insOrder/labelOrderPrinting',
+ method: 'post',
+ data: query
+ })
+}
diff --git a/src/api/business/rawMaterialOrder.js b/src/api/business/rawMaterialOrder.js
index ee21873..6076b50 100644
--- a/src/api/business/rawMaterialOrder.js
+++ b/src/api/business/rawMaterialOrder.js
@@ -95,6 +95,14 @@
params: query
})
}
+// 鍘熸潗鏂欐ā鏉垮垪琛ㄦ煡璇�
+export function selectRawMaterOrderTemplate(query) {
+ return request({
+ url: '/rawMaterialOrder/selectRawMaterOrderTemplate',
+ method: 'get',
+ params: query
+ })
+}
// 鍘熸潗鏂欐柊澧炴ā鏉�
export function addRawMaterOrderTemplate(query) {
return request({
diff --git a/src/api/structural/capability.js b/src/api/structural/capability.js
index e3f3dd5..7dc11ab 100644
--- a/src/api/structural/capability.js
+++ b/src/api/structural/capability.js
@@ -28,7 +28,7 @@
export function delItemParameter(query) {
return request({
url: '/capacityScope/delItemParameter',
- method: 'get',
+ method: 'delete',
params: query
})
}
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index e964e6b..0135441 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -97,7 +97,7 @@
</el-col>
<el-col :span="6">
<el-form-item class="addObj-form-item" label="妫�楠岀被鍒�:" prop="orderType">
- <el-select v-model="addObj.orderType" :disabled="active>1 || orderType===1" clearable size="small" style="width: 100%">
+ <el-select v-model="addObj.orderType" :disabled="active>1 || orderType==1" clearable size="small" style="width: 100%">
<el-option v-for="a in dict.type.check_type" :key="a.value" :label="a.label" :value="a.value"></el-option>
</el-select>
</el-form-item>
@@ -438,7 +438,7 @@
delRawMaterOrderTemplate,
getInsOrder,
getUserNow,
- notificationRawOrder,
+ notificationRawOrder, selectRawMaterOrderTemplate,
selectRawMaterOrderTemplateById,
selectsStandardMethodByFLSSM,
selectStandardMethodEnum,
@@ -641,10 +641,9 @@
this.orderType = this.$route.query.orderType
this.currentId = this.$route.query.currentId
this.customsInspection = this.$route.query.customsInspection
- // this.getUserNowList() // 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
+ this.getUserNowList() // 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
this.selectStandardMethods() // 鑾峰彇妫�楠屾爣鍑嗕笅鎷夋鏁版嵁
this.getInfo() // 鑾峰彇鏁版嵁
-
},
methods: {
save1 () {
@@ -686,7 +685,7 @@
},
// 鑾峰彇鏁版嵁
getInfo () {
- if (this.active === 2) {
+ if (this.active == 2) {
let orderId = ''
if (!this.customsInspection.enterOrderId && this.customsInspection.quarterOrderId) {
this.isShowTab = false
@@ -746,28 +745,26 @@
})
// 鎶ユ娴佺▼
selectStandardTreeListByPartNo({partNo:this.customsInspection.partNo}).then(res => {
- if (res.code === 200) {
- this.addObj.sample = res.data.label
- this.codeLevel = res.data.code
- console.log('this.customsInspection---', this.customsInspection)
- this.addObj.qtyArrived = this.customsInspection.qtyArrived
- this.addObj.partNo = this.customsInspection.partNo
- this.addObj.partDetail = this.customsInspection.partDesc || ''
- this.addObj.receiverDate = this.customsInspection.receiverDate
- this.addObj.orderNo = this.customsInspection.orderNo
- this.addObj.declareUser = this.customsInspection.declareUser
- this.addObj.testQuantity = this.customsInspection.testQuantity || ''
- this.addObj.buyUnitMeas = this.customsInspection.buyUnitMeas
- this.addObj.updateBatchNo = this.customsInspection.updateBatchNo
- if (this.orderType === 1) {
- this.addObj.orderType = 'Quarterly inspection'
- }
- const str = res.data.treeName.split('-')
- this.selectTreeTem = str.join(' - ')
- this.selectTree = str.join(' - ')
- this.addListInfo(this.codeLevel, res.data) // 鍘熸潗鏂欐牱鍝佹槸鍥哄畾鐨勶紝灏遍粯璁よ祴鍊间竴鏉℃暟鎹紝鍙媶鍒�
- this.selectInsOrderTemplate() // 鍘熸潗鏂欐ā鏉垮垪琛ㄦ煡璇�
+ this.addObj.sample = res.data.label
+ this.codeLevel = res.data.code
+ this.$set(this.addObj, 'qtyArrived', this.customsInspection.qtyArrived)
+ this.$set(this.addObj, 'partNo', this.customsInspection.partNo)
+ this.$set(this.addObj, 'receiverDate', this.customsInspection.receiverDate)
+ this.$set(this.addObj, 'orderNo', this.customsInspection.orderNo)
+ this.$set(this.addObj, 'declareUser', this.customsInspection.declareUser)
+ this.$set(this.addObj, 'testQuantity', this.customsInspection.testQuantity)
+ this.$set(this.addObj, 'buyUnitMeas', this.customsInspection.buyUnitMeas)
+ this.$set(this.addObj, 'updateBatchNo', this.customsInspection.updateBatchNo)
+ this.$set(this.addObj, 'partDetail', this.customsInspection.partDesc)
+ console.log('this.orderType----', this.orderType)
+ if (this.orderType == 1) {
+ this.$set(this.addObj, 'orderType', 'Quarterly inspection')
}
+ const str = res.data.treeName.split('-')
+ this.selectTreeTem = str.join(' - ')
+ this.selectTree = str.join(' - ')
+ this.addListInfo(this.codeLevel, res.data) // 鍘熸潗鏂欐牱鍝佹槸鍥哄畾鐨勶紝灏遍粯璁よ祴鍊间竴鏉℃暟鎹紝鍙媶鍒�
+ this.selectInsOrderTemplate() // 鍘熸潗鏂欐ā鏉垮垪琛ㄦ煡璇�
}).catch(err => {
this.dialogVisible = true
this.dialogMessage = err.message
@@ -828,7 +825,7 @@
},
// 鏌ヨ妯℃澘鍒楄〃
selectInsOrderTemplate() {
- selectStandardTreeListByPartNo({partNo:this.addObj.partNo}).then(res => {
+ selectRawMaterOrderTemplate({partNo:this.addObj.partNo}).then(res => {
this.templates = res.data
})
},
@@ -1048,6 +1045,11 @@
addInsOrder({
insOrder: this.addObj,
sampleList: sampleList.map(a => {
+ if (a.insProduct.length > 0) {
+ a.insProduct.forEach(c => {
+ delete c.id
+ })
+ }
if (a.modelNum) {
// 鏍规嵁x鍙峰垽鏂瀷鍙峰弬鏁颁笌鏍峰搧鍨嬪彿鐨勬嫾鎺ヤ綅缃�
// 渚嬪脳4锛屽氨涓�500ML脳4锛�4脳锛屽氨涓�4脳500ML
diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue
index f6b5af4..45fa7dc 100644
--- a/src/views/business/materialOrder/index.vue
+++ b/src/views/business/materialOrder/index.vue
@@ -910,11 +910,7 @@
},
// 瀛ｅ害妫�楠屼笅鍗�
playOrderSec(row) {
- if (typeof row !== "object") {
- this.$router.push({ path: "/materialOrder/customsInspection", query: { active: row } });
- } else {
- this.$router.push({ path: "/materialOrder/customsInspection", query: { orderType: 1, customsInspection: row, active: 1 } });
- }
+ this.$router.push({ path: "/materialOrder/customsInspection", query: { orderType: 1, customsInspection: row, active: 1 } });
},
// 鐐瑰嚮鏍峰搧鍚嶇О鏌ョ湅璇︽儏
selectAllByOne(row) {
diff --git a/src/views/business/productOrder/components/add.vue b/src/views/business/productOrder/components/add.vue
index 4a13829..62c5d87 100644
--- a/src/views/business/productOrder/components/add.vue
+++ b/src/views/business/productOrder/components/add.vue
@@ -547,7 +547,7 @@
selectStandardTreeList2
} from "@/api/business/rawMaterialOrder";
import {
- addInsOrder, delInsOrderTemplate,
+ addInsOrder, addInsOrderTemplate, delInsOrderTemplate,
getQuarterOnOrder,
selectOrderManDay,
updateInsOrder,
@@ -1634,17 +1634,14 @@
sampleList: this.sampleList,
selectTree:this.selectTree
})
- }, {
- headers: {
- 'Content-Type': 'application/json'
- }
}).then(res => {
- if (res.code == 201) return
this.templateLoading = false;
this.templateDia = false;
this.$message.success('淇濆瓨鎴愬姛')
this.selectInsOrderTemplate()
this.templateName = ''
+ }).catch(e => {
+ this.templateLoading = false;
})
} else {
this.$message.error('璇峰～鍐欐ā鏉垮悕绉�')
@@ -1947,7 +1944,7 @@
},
// 杈呭姪绾胯姱閰嶇疆
openAuxiliaryCore () {
- if (this.active === 1) {
+ if (this.active == 1) {
if (this.sampleIds.length === 0) {
this.$message.error("鏈�夋嫨鏍峰搧")
} else if (this.sampleIds.length === 1) {
@@ -1975,7 +1972,7 @@
}
},
openCableConfig() {
- if (this.active === 1) {
+ if (this.active == 1) {
if (this.sampleIds.length === 0) {
this.$message.error("鏈�夋嫨鏍峰搧")
} else if (this.sampleIds.length === 1) {
diff --git a/src/views/business/productOrder/components/printDialog.vue b/src/views/business/productOrder/components/printDialog.vue
index e031081..589d674 100644
--- a/src/views/business/productOrder/components/printDialog.vue
+++ b/src/views/business/productOrder/components/printDialog.vue
@@ -123,6 +123,7 @@
<script>
import PrintJS from "print-js";
+import {labelOrderPrinting} from "@/api/business/productOrder";
export default {
name: "printDialog",
@@ -157,13 +158,8 @@
selection.map(m => {
ids.push(m.id)
})
- this.$axios.post(this.$api.insOrder.labelOrderPrinting, {
+ labelOrderPrinting({
ids: ids
- }, {
- headers: {
- 'Content-Type': 'application/json'
- },
- noQs: true
}).then(res => {
if (res.code === 200 && res.data.length > 0) {
res.data.forEach(item => {
--
Gitblit v1.9.3