From 1739cb5e190319b79be43c9fcfa0945cd3320d5e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 28 三月 2025 17:36:49 +0800
Subject: [PATCH] 下单页面-缓存清空再提交
---
src/views/business/materialOrder/copperOrder.vue | 60 ++++++++++++-----------------
src/views/business/materialOrder/customsInspection.vue | 25 ++++++++----
src/views/business/productOrder/components/add.vue | 30 +++++++++------
3 files changed, 59 insertions(+), 56 deletions(-)
diff --git a/src/views/business/materialOrder/copperOrder.vue b/src/views/business/materialOrder/copperOrder.vue
index 442fcad..e15e00f 100644
--- a/src/views/business/materialOrder/copperOrder.vue
+++ b/src/views/business/materialOrder/copperOrder.vue
@@ -439,15 +439,16 @@
custom: null,
company: null,
userId: null,
+ companyId: '',
type: '0', // 绱ф�ョ▼搴�
code: null,
remark: null, // 澶囨敞
mating: 0,
sample: null, // 鏍峰搧鍚嶇О
appointed: '', // 绾﹀畾鏃堕棿
- buyUnitMeas: '', // 鍗曚綅
- updateBatchNo: '', // 鎵规鍙�
- partDetail: '', // 瑙勬牸鍨嬪彿
+ buyUnitMeas: null, // 鍗曚綅
+ updateBatchNo: null, // 鎵规鍙�
+ partDetail: null, // 瑙勬牸鍨嬪彿
declareDate: '', // 鍒拌揣鏃堕棿
factory: null,
laboratory: null,
@@ -460,8 +461,8 @@
processing: 1,
isLeave: 0,
orderType: '杩涘巶妫�楠�', // 妫�楠岀被鍨�
- supplierName: '', // 鏉愭枡鍘傚
- qtyArrived: '', // 鍒拌揣鏁伴噺
+ supplierName: null, // 鏉愭枡鍘傚
+ qtyArrived: null, // 鍒拌揣鏁伴噺
},
sample: {
sampleCode: null,
@@ -555,7 +556,7 @@
{ required: true, message: '璇峰～鍐欒鏍煎瀷鍙�', trigger: 'blur' }
],
declareDate: [
- { required: true, message: '璇峰～鍐欏埌璐ф椂闂�', trigger: 'blur' }
+ { required: true, message: '璇峰～鍐欏埌璐ф椂闂�', trigger: 'change' }
]
},
noNeedCheckDia: false,
@@ -583,23 +584,6 @@
}
}
},
- productListSelected: {
- deep: true,
- handler(val) {
- if(val.length>0){
- for(let i =0 ; i< val.length; i++){
- if(val[i].inspectionItem.includes('鏉惧绠�')){
- this.inspectionItemST = 1
- break;
- }else{
- this.inspectionItemST = 0
- }
- }
- }else{
- this.inspectionItemST = 0
- }
- }
- },
sampleList: {
deep: true,
handler(val) {
@@ -621,6 +605,12 @@
this.getInfoRow();
},
activated() {
+ this.$refs.addObj.resetFields()
+ this.addObj.createTime = ''
+ this.addObj.id = ''
+ this.addObj.updateTime = ''
+ this.sampleList = []
+ this.productList = []
this.active = this.$route.query.active
this.currentId = this.$route.query.currentId
this.getInfoRow();
@@ -747,10 +737,10 @@
this.addObj = {
...res.data.insOrder
}
- this.addObj.qtyArrived = res.data.insOrderTemplate.qtyArrived
- this.addObj.buyUnitMeas = res.data.insOrderTemplate.buyUnitMeas
- this.addObj.updateBatchNo = res.data.insOrderTemplate.updateBatchNo
- this.addObj.supplierName = res.data.insOrderTemplate.supplierName
+ this.$set(this.addObj, 'qtyArrived', res.data.insOrderTemplate.qtyArrived)
+ this.$set(this.addObj, 'buyUnitMeas', res.data.insOrderTemplate.buyUnitMeas)
+ this.$set(this.addObj, 'updateBatchNo', res.data.insOrderTemplate.updateBatchNo)
+ this.$set(this.addObj, 'supplierName', res.data.insOrderTemplate.supplierName)
this.addObj.type = String(this.addObj.type)
this.sampleList = this.HaveJson(res.data.sampleProduct);
this.getProNum()
@@ -1188,9 +1178,9 @@
this.addObj.code = selects.code
this.addObj.phone = selects.phone
this.addObj.companyId = selects.departId
- if(this.active==1){
- this.selectInsOrderTemplateInfo()
- }
+ // if(this.active==1){
+ // this.selectInsOrderTemplateInfo()
+ // }
})
},
getProNum() {
@@ -1465,11 +1455,11 @@
}
return 'warning-row';
},
- selectInsOrderTemplateInfo() {
- selectInsOrderTemplate({company: this.addObj.company}).then(res => {
- this.templates = res.data
- })
- },
+ // selectInsOrderTemplateInfo() {
+ // selectInsOrderTemplate({company: this.addObj.company}).then(res => {
+ // this.templates = res.data
+ // })
+ // },
methodChange(val, row) {
if (val === null || val === '') return
if (this.sampleList.length > 1) {
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index 86ba8bd..3a45a3b 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -32,17 +32,17 @@
<el-form ref="addObj" :inline="true" :model="addObj" :rules="addObjRules" label-width="90px">
<el-row>
<el-col :span="6">
- <el-form-item class="addObj-form-item" label="閲囪喘璁㈠崟鍙�:">
+ <el-form-item class="addObj-form-item" label="閲囪喘璁㈠崟鍙�:" prop="orderNo">
<el-input v-model="addObj.orderNo" class="addObj-info" clearable disabled placeholder="" size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item class="addObj-form-item" label="濮旀墭鍗曚綅:">
+ <el-form-item class="addObj-form-item" label="濮旀墭鍗曚綅:" prop="company">
<el-input v-model="addObj.company" class="addObj-info" clearable disabled placeholder="" size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item class="addObj-form-item" label="鎺ユ敹鏃堕棿:">
+ <el-form-item class="addObj-form-item" label="鎺ユ敹鏃堕棿:" prop="receiverDate">
<el-date-picker
v-model="addObj.receiverDate"
disabled
@@ -55,29 +55,29 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item class="addObj-form-item" label="闆朵欢鍙�:">
+ <el-form-item class="addObj-form-item" label="闆朵欢鍙�:" prop="partNo">
<el-input v-model="addObj.partNo" class="addObj-info" clearable disabled placeholder="" size="small"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item class="addObj-form-item" label="鏍峰搧鍚嶇О:">
+ <el-form-item class="addObj-form-item" label="鏍峰搧鍚嶇О:" prop="sample">
<el-input v-model="addObj.sample" class="addObj-info" clearable disabled placeholder="" size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item class="addObj-form-item" label="鏍峰搧鎬绘暟:">
+ <el-form-item class="addObj-form-item" label="鏍峰搧鎬绘暟:" prop="qtyArrived">
<el-input v-model="addObj.qtyArrived" class="addObj-info" clearable disabled placeholder="" size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item class="addObj-form-item" label="鎶ユ浜�:">
+ <el-form-item class="addObj-form-item" label="鎶ユ浜�:" prop="declareUser">
<el-input v-model="addObj.declareUser" class="addObj-info" clearable disabled size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item class="addObj-form-item" label="鎵规鍙�:">
+ <el-form-item class="addObj-form-item" label="鎵规鍙�:" prop="updateBatchNo">
<el-input v-model="addObj.updateBatchNo" class="addObj-info" clearable disabled size="small"></el-input>
</el-form-item>
</el-col>
@@ -133,7 +133,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item class="addObj-form-item" label="澶囨敞:">
+ <el-form-item class="addObj-form-item" label="澶囨敞:" prop="remark">
<el-input v-model="addObj.remark" :autosize="{ minRows: 2, maxRows: 2}" :disabled="active>1" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
size="small" type="textarea"></el-input>
</el-form-item>
@@ -609,6 +609,7 @@
watch: {
sampleList() {
this.addObj.method = null
+ this.productList = []
},
productList: {
deep: true,
@@ -645,6 +646,12 @@
this.getInfo();
},
activated() {
+ this.$refs.addObj.resetFields()
+ this.addObj.createTime = ''
+ this.addObj.id = ''
+ this.addObj.updateTime = ''
+ this.sampleList = []
+ this.productList = []
this.active = this.$route.query.active
this.orderType = this.$route.query.orderType
this.currentId = this.$route.query.currentId
diff --git a/src/views/business/productOrder/components/add.vue b/src/views/business/productOrder/components/add.vue
index 307633f..7b0ad3c 100644
--- a/src/views/business/productOrder/components/add.vue
+++ b/src/views/business/productOrder/components/add.vue
@@ -41,7 +41,7 @@
<el-form ref="addObj" :inline="true" :model="addObj" :rules="addObjRules" label-width="108px" label-position="right">
<el-row>
<el-col :span="6">
- <el-form-item label="濮旀墭缂栧彿:">
+ <el-form-item label="濮旀墭缂栧彿:" prop="entrustCode">
<el-input v-model="addObj.entrustCode" clearable disabled placeholder="绯荤粺鐢熸垚" size="small"></el-input>
</el-form-item>
</el-col>
@@ -53,7 +53,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鍒跺崟浜�:">
+ <el-form-item label="鍒跺崟浜�:" prop="custom">
<el-input v-model="addObj.custom" disabled size="small" clearable></el-input>
</el-form-item>
</el-col>
@@ -117,7 +117,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鎶ュ憡鍙戦�佹柟寮�:">
+ <el-form-item label="鎶ュ憡鍙戦�佹柟寮�:" prop="send">
<el-radio-group v-model="addObj.send" :disabled="active>1&&tabIndex!=4" size="mini">
<el-radio :label="1" border style="margin-right: 0">鑷彇</el-radio>
<el-radio :label="0" border>鍏朵粬</el-radio>
@@ -127,7 +127,7 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="鏍峰搧澶勭悊鏂瑰紡:">
+ <el-form-item label="鏍峰搧澶勭悊鏂瑰紡:" prop="processing">
<el-radio-group v-model="addObj.processing" :disabled="active>1&&tabIndex!=4" size="mini" style="display: flex; flex-direction: column;">
<el-radio :label="0" border style="margin-right: 0">濮旀墭鍗曚綅鍙栧洖</el-radio>
<el-radio :label="1" border>瀹為獙瀹ゅ鐞�</el-radio>
@@ -147,7 +147,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鏄惁鐣欐牱:">
+ <el-form-item label="鏄惁鐣欐牱:" prop="isLeave">
<el-radio-group v-model="addObj.isLeave" border :disabled="active>1&&tabIndex!=4" size="mini">
<el-radio :label="0" border style="margin-right: 0">涓嶇暀鏍�</el-radio>
<el-radio :label="1" border>鐣欐牱</el-radio>
@@ -157,23 +157,23 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="濮旀墭浜�:">
+ <el-form-item label="濮旀墭浜�:" prop="prepareUser">
<el-input v-model="addObj.prepareUser" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="濮旀墭浜鸿嫳鏂�:">
+ <el-form-item label="濮旀墭浜鸿嫳鏂�:" prop="prepareUserEn">
<el-input v-model="addObj.prepareUserEn" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="澶囨敞:">
+ <el-form-item label="澶囨敞:" prop="remark">
<el-input v-model="addObj.remark" :autosize="{ minRows: 2, maxRows: 2}" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
size="small" style="width: 100%" type="textarea"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="澶囨敞鑻辨枃:">
+ <el-form-item label="澶囨敞鑻辨枃:" prop="remarkEn">
<el-input v-model="addObj.remarkEn" :autosize="{ minRows: 2, maxRows: 2}" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
size="small" type="textarea"></el-input>
</el-form-item>
@@ -181,19 +181,19 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="鏍峰搧鍚嶇О:">
+ <el-form-item label="鏍峰搧鍚嶇О:" prop="sampleView">
<el-input v-model="addObj.sampleView" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鏍峰搧鍚嶇О鑻辨枃:">
+ <el-form-item label="鏍峰搧鍚嶇О鑻辨枃:" prop="sampleViewEn">
<el-input v-model="addObj.sampleViewEn" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="濮旀墭浜哄伐鍙�:">
+ <el-form-item label="濮旀墭浜哄伐鍙�:" prop="prepareCode">
<el-input v-model="addObj.prepareCode" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
size="small"></el-input>
</el-form-item>
@@ -844,6 +844,12 @@
this.getInfo()
},
activated() {
+ this.$refs.addObj.resetFields()
+ this.addObj.createTime = ''
+ this.addObj.id = ''
+ this.addObj.updateTime = ''
+ this.sampleList = []
+ this.productList = []
this.active = this.$route.query.active
this.tabIndex = this.$route.query.tabIndex
this.currentId = this.$route.query.currentId
--
Gitblit v1.9.3