From f9d1ac78b245cb672342e96cf0e905b812352651 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 21 三月 2025 11:23:24 +0800
Subject: [PATCH] 原材料下单-检验标准未回显
---
src/views/business/materialOrder/customsInspection.vue | 75 +++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 32 deletions(-)
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index 07b4342..86ba8bd 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -142,10 +142,10 @@
</el-form>
</div>
<div>
- <div style="display: flex;justify-content: space-between;">
+ <div style="display: flex;justify-content: space-between;background-color: #F5F7FB;margin-bottom: 6px">
<div v-if="active==1">
<el-form :inline="true" :model="addObj1" label-width="90px">
- <el-form-item label="鏍峰搧鍨嬪彿:" style="margin-bottom: 6px">
+ <el-form-item label="鏍峰搧鍨嬪彿:" style="margin-bottom: 6px;margin-top: 6px">
<el-select v-model="model" :placeholder="active>1 ? '' : '璇疯緭鍏�'"
allow-create clearable default-first-option filterable
size="small"
@@ -154,7 +154,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="妫�楠屾爣鍑�:">
+ <el-form-item label="妫�楠屾爣鍑�:" style="margin-bottom: 6px;margin-top: 6px">
<el-select v-model="standardMethodListId" :loading="methodLoad"
:placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable size="small"
@change="changeStandardMethodListId" @focus="methodFocus">
@@ -164,7 +164,7 @@
</el-form-item>
</el-form>
</div>
- <div style="margin-top: 3px">
+ <div style="margin-bottom: 6px;margin-top: 6px">
<el-button v-show="active==1" :disabled="sampleList.length === 2" size="small" type="primary" @click="handleSplitCountNum">鎷嗗垎</el-button>
</div>
</div>
@@ -652,11 +652,9 @@
this.customsInspection = this.$route.query.customsInspection
this.getInfo();
},
- getInfo() {
- this.getUserNowList() // 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
- this.selectStandardMethods() // 鑾峰彇妫�楠屾爣鍑嗕笅鎷夋鏁版嵁
- this.getInfo() // 鑾峰彇鏁版嵁
- },
+ // getInfo() {
+ // this.getInfo() // 鑾峰彇鏁版嵁
+ // },
methods: {
save1 () {
if (this.bsm1DiaList.length > 0) {
@@ -697,6 +695,8 @@
},
// 鑾峰彇鏁版嵁
getInfo () {
+ this.getUserNowList() // 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
+ this.selectStandardMethods() // 鑾峰彇妫�楠屾爣鍑嗕笅鎷夋鏁版嵁
if (this.active == 2) {
let orderId = ''
if (!this.customsInspection.enterOrderId && this.customsInspection.quarterOrderId) {
@@ -747,8 +747,10 @@
notificationRawOrder({ifsInventoryId:this.customsInspection.id}).then(res => {
if (res.code === 200) {
if (res.data === 1) {
- this.dialogVisible2 = true
- this.dialogMessage2 = '褰撳墠鎵规鐨勬牱鍝佸凡妫�楠岃繃, 鍙互鍏嶆'
+ if (this.orderType != 1) {
+ this.dialogVisible2 = true
+ this.dialogMessage2 = '褰撳墠鎵规鐨勬牱鍝佸凡妫�楠岃繃, 鍙互鍏嶆'
+ }
} else if (res.data === 2) {
this.dialogVisible2 = true
this.dialogMessage2 = '褰撳墠鎵规鐨勬牱鍝佸凡瓒�20鍚�, 闇�瑕佸绾у娆℃楠�'
@@ -757,28 +759,32 @@
})
// 鎶ユ娴佺▼
selectStandardTreeListByPartNo({partNo:this.customsInspection.partNo}).then(res => {
- 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)
- if (this.orderType == 1) {
- this.$set(this.addObj, 'orderType', 'Quarterly inspection')
+ if (res.data !== null) {
+ 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)
+ 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() // 鍘熸潗鏂欐ā鏉垮垪琛ㄦ煡璇�
+ } else {
+ this.dialogVisible = true
+ this.dialogMessage = res.message
}
- 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
+
})
}
},
@@ -1048,6 +1054,9 @@
this.addObj.model = (trees[4] == undefined ? null : trees[4])
this.addObj.ifsInventoryId = this.customsInspection.id
this.saveLoad = true
+ if (this.addObj.createTime) {
+ delete this.addObj.createTime
+ }
addInsOrder({
insOrder: this.addObj,
sampleList: sampleList.map(a => {
@@ -1888,5 +1897,7 @@
background-color: #ffffff;
}
-
+>>>.warning-row {
+ color: #1890FF;
+}
</style>
--
Gitblit v1.9.3