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 | 122 ++++++++++++++++++++++++----------------
1 files changed, 73 insertions(+), 49 deletions(-)
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index 0f6f2c4..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>
@@ -172,6 +172,7 @@
<el-table ref="sampleTable" :data="sampleList"
class="el-table sampleTable"
highlight-current-row
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
max-height="400px"
tooltip-effect="dark"
@selection-change="selectSample" @row-click="rowClick">
@@ -235,7 +236,7 @@
</el-table-column>
<el-table-column align="center" label="寰呮椤规暟閲�" prop="quantity" width="105">
<template slot-scope="scope">
- <el-select v-model="scope.row.quantity" :disabled="active>1|| scope.$index !== 0 || sampleList.length > 1" clearable
+ <el-select v-model="scope.row.quantity" disabled clearable
size="small">
<el-option v-for="item in quantityList" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
@@ -247,6 +248,7 @@
class="el-table"
max-height="400px"
style="margin-bottom: 10px;"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
tooltip-effect="dark"
@select="selectOne"
@selection-change="selectProduct"
@@ -354,6 +356,7 @@
</span>
</el-dialog>
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
:show-close="false" :visible.sync="bsm3Dia"
title="鍖洪棿鍊煎～鍐�" width="800px">
<el-table :data="editTable" height="80vh" style="width: 100%">
@@ -388,7 +391,7 @@
width="32%">
<span>{{ dialogMessage }}</span>
<span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="goBack()">纭� 瀹�</el-button>
+ <el-button type="primary" @click="dialogVisible= false,closeOpenPage()">纭� 瀹�</el-button>
</span>
</el-dialog>
<el-dialog
@@ -451,10 +454,6 @@
dicts: ['check_type', 'urgency_level'],
components: {},
props: {
- isReport: {
- type: Number,
- default: () => null
- }
},
data() {
return {
@@ -462,6 +461,7 @@
orderType: '',
active: 0,
currentId: 0,
+ isReport: '',
editTable:[], // 鍖洪棿鐗规畩鍊煎～鍐�
template: null,
saveLoad: false, // 淇濆瓨鎸夐挳loading
@@ -636,15 +636,25 @@
this.standardMethodListId = null
}
},
- mounted() {
+ created() {
this.active = this.$route.query.active
this.orderType = this.$route.query.orderType
this.currentId = this.$route.query.currentId
+ this.isReport = this.$route.query.isReport
this.customsInspection = this.$route.query.customsInspection
- this.getUserNowList() // 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
- this.selectStandardMethods() // 鑾峰彇妫�楠屾爣鍑嗕笅鎷夋鏁版嵁
- this.getInfo() // 鑾峰彇鏁版嵁
+ this.getInfo();
},
+ activated() {
+ this.active = this.$route.query.active
+ this.orderType = this.$route.query.orderType
+ this.currentId = this.$route.query.currentId
+ this.isReport = this.$route.query.isReport
+ this.customsInspection = this.$route.query.customsInspection
+ this.getInfo();
+ },
+ // getInfo() {
+ // this.getInfo() // 鑾峰彇鏁版嵁
+ // },
methods: {
save1 () {
if (this.bsm1DiaList.length > 0) {
@@ -685,6 +695,8 @@
},
// 鑾峰彇鏁版嵁
getInfo () {
+ this.getUserNowList() // 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
+ this.selectStandardMethods() // 鑾峰彇妫�楠屾爣鍑嗕笅鎷夋鏁版嵁
if (this.active == 2) {
let orderId = ''
if (!this.customsInspection.enterOrderId && this.customsInspection.quarterOrderId) {
@@ -698,7 +710,7 @@
orderId = this.dataIndex === 0 ? this.customsInspection.enterOrderId : this.customsInspection.quarterOrderId
} else if (!this.customsInspection.enterOrderId && !this.customsInspection.quarterOrderId) {
this.isShowTab = false
- orderId = this.isReport === 1 ? this.customsInspection.insOrderId : this.customsInspection.id
+ orderId = this.isReport == 1 ? this.customsInspection.insOrderId : this.customsInspection.id
}
// 鏌ョ湅
// 璇锋眰鎺ュ彛锛屽洖鏄炬暟鎹�
@@ -735,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鍚�, 闇�瑕佸绾у娆℃楠�'
@@ -745,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
+
})
}
},
@@ -895,10 +913,6 @@
this.$message.error('璇烽�夋嫨妫�楠屾爣鍑�')
return
}
- if (!this.sampleList.every(m => m.quantity)) {
- this.$message.error('璇烽�夋嫨寰呮椤规暟閲�')
- return
- }
const sampleList = this.HaveJson(this.sampleList)
sampleList.forEach(item => {
item.insProduct = this.productList
@@ -1016,10 +1030,9 @@
}),
}).then(res => {
this.noNeedCheckLoad = false
- if (res.code == 201) return
this.noNeedCheckDia = false
this.$message.success('宸叉彁浜�')
- this.goBack()
+ this.closeOpenPage()
}).catch(e=>{
this.noNeedCheckLoad = false
})
@@ -1041,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 => {
@@ -1068,10 +1084,9 @@
}),
}).then(res => {
this.saveLoad = false
- if (res.code == 201) return
this.$message.success('宸叉彁浜�')
this.bsm3Dia = false;
- this.goBack()
+ this.closeOpenPage()
}).catch(e=>{
this.saveLoad = false
})
@@ -1834,9 +1849,16 @@
return row[property] === value;
},
goBack () {
- const obj = { path: "/business/materialOrder" };
- this.$tab.closeOpenPage(obj);
- }
+ if (this.active == 1) {
+ this.$router.go(-1)
+ } else {
+ this.closeOpenPage()
+ }
+ },
+ closeOpenPage() {
+ this.$router.go(-1)
+ this.$tab.closeOpenPage()
+ },
}
}
</script>
@@ -1875,5 +1897,7 @@
background-color: #ffffff;
}
-
+>>>.warning-row {
+ color: #1890FF;
+}
</style>
--
Gitblit v1.9.3