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/copperOrder.vue | 10 +---
src/views/business/materialOrder/customsInspection.vue | 46 ++++++++++++-----------
src/views/business/materialOrder/index.vue | 36 ++++++++++++-----
3 files changed, 52 insertions(+), 40 deletions(-)
diff --git a/src/views/business/materialOrder/copperOrder.vue b/src/views/business/materialOrder/copperOrder.vue
index 07ecb07..18783ad 100644
--- a/src/views/business/materialOrder/copperOrder.vue
+++ b/src/views/business/materialOrder/copperOrder.vue
@@ -99,7 +99,7 @@
</el-col>
<el-col :span="6">
<el-form-item class="addObj-form-item" label="澶囨敞:">
- <el-input v-model="addObj.remark" :autosize="{ minRows: 2, maxRows: 2}" :placeholder="active>1 ? '' : '璇疯緭鍏�'" :readonly="active>1" clearable
+ <el-input v-model="addObj.remark" :autosize="{ minRows: 2, maxRows: 2}" :placeholder="active>1 ? '' : '璇疯緭鍏�'" :disabled="active>1" clearable
size="small" type="textarea"></el-input>
</el-form-item>
</el-col>
@@ -423,15 +423,10 @@
export default {
components: {},
dicts: ['check_type', 'urgency_level'],
- props: {
- currentId: {
- type: Number,
- default: () => 0
- }
- },
data() {
return {
active: '',
+ currentId: '',
sampleSelectionList: [],//鏍峰搧琛ㄦ牸閫変腑鏁版嵁
editTable:[],
noNeedCheckLoad: false, // 鍏嶆鎸夐挳loading
@@ -620,6 +615,7 @@
},
mounted() {
this.active = this.$route.query.active
+ this.currentId = this.$route.query.currentId
this.getUserNowInfo()
this.selectStandardTreeList()
this.selectStandardMethods()
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index 415f92c..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>
@@ -434,10 +434,15 @@
import {
addExemptionOrder,
addInsOrder,
- addRawMaterOrderTemplate, delRawMaterOrderTemplate,
+ addRawMaterOrderTemplate,
+ delRawMaterOrderTemplate,
getInsOrder,
getUserNow,
- notificationRawOrder, selectRawMaterOrderTemplateById, selectStandardMethodEnum, selectStandardProductList,
+ notificationRawOrder,
+ selectRawMaterOrderTemplateById,
+ selectsStandardMethodByFLSSM,
+ selectStandardMethodEnum,
+ selectStandardProductList,
selectStandardTreeListByPartNo
} from "@/api/business/rawMaterialOrder";
@@ -446,10 +451,6 @@
dicts: ['check_type', 'urgency_level'],
components: {},
props: {
- currentId: {
- type: Number,
- default: () => 0
- },
isReport: {
type: Number,
default: () => null
@@ -460,6 +461,7 @@
customsInspection: {},
orderType: '',
active: 0,
+ currentId: 0,
editTable:[], // 鍖洪棿鐗规畩鍊煎～鍐�
template: null,
saveLoad: false, // 淇濆瓨鎸夐挳loading
@@ -637,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() // 鑾峰彇妫�楠屾爣鍑嗕笅鎷夋鏁版嵁
@@ -746,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) {
@@ -1585,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)
})
diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue
index 45c4936..f6b5af4 100644
--- a/src/views/business/materialOrder/index.vue
+++ b/src/views/business/materialOrder/index.vue
@@ -273,10 +273,22 @@
tableLoading1: false,
column1: [
{ label: '鎵瑰彿', prop: 'updateBatchNo' },
- { label: '濮旀墭缂栧彿', prop: 'entrustCode' },
+ {
+ label: '濮旀墭缂栧彿',
+ prop: 'entrustCode',
+ width: "160px",
+ dataType: "link",
+ linkMethod: "changeEntrustCode",
+ },
{ label: '闆朵欢鍙�', prop: 'partNo' },
{ label: '闆朵欢鎻忚堪', prop: 'partDesc' },
- { label: '鏍峰搧鍚嶇О', prop: 'sampleName' },
+ {
+ label: '鏍峰搧鍚嶇О',
+ prop: 'sampleName',
+ width: "160px",
+ dataType: "link",
+ linkMethod: "selectAllByOne",
+ },
{ label: '鏍峰搧鍨嬪彿', prop: 'sampleModel' },
{ label: '妫�楠屼汉', prop: 'userName' },
{ label: '涓嬪彂鏃堕棿', prop: 'sendTime' },
@@ -904,6 +916,16 @@
this.$router.push({ path: "/materialOrder/customsInspection", query: { orderType: 1, customsInspection: row, active: 1 } });
}
},
+ // 鐐瑰嚮鏍峰搧鍚嶇О鏌ョ湅璇︽儏
+ selectAllByOne(row) {
+ if (row.isCopper == 1) {
+ this.currentId = row.enterOrderId
+ this.$router.push({ path: "/materialOrder/copperOrder", query: { customsInspection: row, active: 2, currentId: this.currentId } });
+ } else {
+ this.currentId = row.insOrderId
+ this.$router.push({ path: "/materialOrder/customsInspection", query: { customsInspection: row, active: 2, currentId: this.currentId } });
+ }
+ },
// 鎵撳紑鍏嶆寮规
exemption(row) {
this.exemptionVisible = true
@@ -1007,15 +1029,6 @@
}).catch(() => { })
}
},
- // 鐐瑰嚮鏍峰搧鍚嶇О鏌ョ湅璇︽儏
- selectAllByOne(row) {
- this.currentId = row.insOrderId
- if (row.isCopper == 1) {
- this.currentId = row.enterOrderId
- }
- this.customsInspection = row
- this.active = 2;
- },
// 鏁版嵁鏌ョ湅
handleDataLook(row) {
this.dataLookInfo = row
@@ -1085,6 +1098,7 @@
this.entrustCodeVisible = false
this.$message.success('淇敼鎴愬姛')
}
+ this.refreshTable()
this.submitCodeLoading = false
})
} catch (e) {
--
Gitblit v1.9.3