From e103d1f1b82017c58c2acb154ab3c680322a9454 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 20 二月 2025 17:49:26 +0800
Subject: [PATCH] 成品下单、原材料下单联调
---
src/views/business/materialOrder/customsInspection.vue | 128 ++++++++++++++++++++----------------------
1 files changed, 60 insertions(+), 68 deletions(-)
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index 63eb53f..e964e6b 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -98,7 +98,7 @@
<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-option v-for="(a, ai) in dict.type.check_type" :key="ai" :label="a.label" :value="a.value"></el-option>
+ <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>
</el-col>
@@ -114,7 +114,7 @@
<el-col :span="6">
<el-form-item class="addObj-form-item" label="绱ф�ョ▼搴�:" placeholder="璇烽�夋嫨" prop="type">
<el-select v-model="addObj.type" :disabled="active>1" class="addObj-info" clearable size="small" style="width: 100%">
- <el-option v-for="(a, ai) in dict.type.urgency_level" :key="ai" :label="a.label" :value="a.value"></el-option>
+ <el-option v-for="a in dict.type.urgency_level" :key="a.value" :label="a.label" :value="a.value"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -431,27 +431,26 @@
</template>
<script>
-import ValueTable from "@/components/Table/value-table.vue";
import {
+ addExemptionOrder,
addInsOrder,
- addRawMaterOrderTemplate, delRawMaterOrderTemplate,
+ addRawMaterOrderTemplate,
+ delRawMaterOrderTemplate,
getInsOrder,
getUserNow,
- notificationRawOrder, selectRawMaterOrderTemplateById, selectStandardMethodEnum, selectStandardProductList,
+ notificationRawOrder,
+ selectRawMaterOrderTemplateById,
+ selectsStandardMethodByFLSSM,
+ selectStandardMethodEnum,
+ selectStandardProductList,
selectStandardTreeListByPartNo
} from "@/api/business/rawMaterialOrder";
export default {
name: "CustomsInspection",
dicts: ['check_type', 'urgency_level'],
- components: {
- ValueTable,
- },
+ components: {},
props: {
- currentId: {
- type: Number,
- default: () => 0
- },
isReport: {
type: Number,
default: () => null
@@ -462,6 +461,7 @@
customsInspection: {},
orderType: '',
active: 0,
+ currentId: 0,
editTable:[], // 鍖洪棿鐗规畩鍊煎～鍐�
template: null,
saveLoad: false, // 淇濆瓨鎸夐挳loading
@@ -639,6 +639,7 @@
mounted() {
this.active = this.$route.query.active
this.orderType = this.$route.query.orderType
+ this.currentId = this.$route.query.currentId
this.customsInspection = this.$route.query.customsInspection
// this.getUserNowList() // 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
this.selectStandardMethods() // 鑾峰彇妫�楠屾爣鍑嗕笅鎷夋鏁版嵁
@@ -748,13 +749,14 @@
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.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.testQuantity = this.customsInspection.testQuantity || ''
this.addObj.buyUnitMeas = this.customsInspection.buyUnitMeas
this.addObj.updateBatchNo = this.customsInspection.updateBatchNo
if (this.orderType === 1) {
@@ -980,7 +982,6 @@
item.insProduct = this.productList
})
this.getTotal(sampleList)
- const pairing = []
let trees = this.selectTree.split(" - ")
if (trees.length < 3) {
this.$message.error('鏈�夋嫨瀵硅薄')
@@ -998,28 +999,25 @@
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,
+ sampleList: 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
+ }),
}).then(res => {
this.noNeedCheckLoad = false
if (res.code == 201) return
@@ -1031,7 +1029,6 @@
})
},
saveMethod(sampleList){
- const pairing = []
let trees = this.selectTree.split(" - ")
if (trees.length < 3) {
this.$message.error('鏈�夋嫨瀵硅薄')
@@ -1049,28 +1046,25 @@
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,
+ sampleList: 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
+ }),
}).then(res => {
this.saveLoad = false
if (res.code == 201) return
@@ -1595,19 +1589,17 @@
ifsInventoryId: this.customsInspection.id
}).then(res => {
this.getProductLoad = false
- if (res.code === 200) {
- res.data.forEach(a => {
- a.state = 0
+ res.data.forEach(a => {
+ a.state = 0
+ })
+ this.productList = this.HaveJson(res.data)
+ this.productList0 = JSON.parse(JSON.stringify(this.productList))
+ this.$refs.sampleTable.setCurrentRow(row)
+ setTimeout(() => {
+ this.productList.forEach(a => {
+ if (a.state == 1) this.toggleSelection(a)
})
- this.productList = this.HaveJson(res.data)
- this.productList0 = JSON.parse(JSON.stringify(this.productList))
- this.$refs.sampleTable.setCurrentRow(row)
- setTimeout(() => {
- this.productList.forEach(a => {
- if (a.state == 1) this.toggleSelection(a)
- })
- }, 200)
- }
+ }, 200)
}).catch(err => {
console.log('err-',err)
})
--
Gitblit v1.9.3