From 4b13a0803641b462775e217c3058be3dff836bff Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 24 十二月 2025 14:10:54 +0800
Subject: [PATCH] 销售订单报检区分物料属性
---
src/views/business/rawMaterialInspection/index.vue | 65 ++++++++++++++++++++++++++++----
1 files changed, 57 insertions(+), 8 deletions(-)
diff --git a/src/views/business/rawMaterialInspection/index.vue b/src/views/business/rawMaterialInspection/index.vue
index 8d25540..fd89c15 100644
--- a/src/views/business/rawMaterialInspection/index.vue
+++ b/src/views/business/rawMaterialInspection/index.vue
@@ -97,6 +97,11 @@
<el-option v-for="(item,index) in orderTypeList" :value="item.dictValue" :label="item.dictLabel" :key="index"></el-option>
</el-select>
</el-form-item>
+ <el-form-item class="declareObj-form-item" label="鐗╂枡灞炴�э細" prop="materialProp">
+ <el-select v-model="declareBatchObj.materialProp" clearable size="small">
+ <el-option v-for="(item,index) in materialPropList" :value="item.dictValue" :label="item.dictLabel" :key="index"></el-option>
+ </el-select>
+ </el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-row>
@@ -157,6 +162,11 @@
<el-form-item class="declareObj-form-item" label="閿�鍞鍗曞垎绫伙細" prop="orderType">
<el-select v-model="declareObj.orderType" clearable size="small">
<el-option v-for="(item,index) in orderTypeList" :value="item.dictValue" :label="item.dictLabel" :key="index"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item class="declareObj-form-item" label="鐗╂枡灞炴�э細" prop="materialProp">
+ <el-select v-model="declareObj.materialProp" clearable size="small">
+ <el-option v-for="(item,index) in materialPropList" :value="item.dictValue" :label="item.dictLabel" :key="index"></el-option>
</el-select>
</el-form-item>
</el-form>
@@ -220,9 +230,6 @@
<el-row>
<el-col :span="12">
<el-checkbox v-model="pushToMes"><span style="font-weight: bold">鍚屾鍒癕ES</span></el-checkbox>
-<!-- <el-select v-model="splitOrderType" clearable size="mini" placeholder="璇烽�夋嫨閿�鍞鍗曞垎绫�">-->
-<!-- <el-option v-for="(item,index) in orderTypeList" :value="item.dictValue" :label="item.dictLabel" :key="index"></el-option>-->
-<!-- </el-select>-->
</el-col>
<el-col :span="12">
<div style="width:100%;text-align: right;margin-bottom:5px">
@@ -268,7 +275,18 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="resetOrderSplitData()" :disabled="confirmSplitOrderLoading">鍙� 娑�</el-button>
- <el-button type="primary" @click="confirmSplitOrder()" :loading="confirmSplitOrderLoading">纭� 瀹�</el-button>
+ <el-button type="primary" @click="beforeConfirmSplitOrder()" :loading="confirmSplitOrderLoading">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ <el-dialog
+ title="閫夋嫨鐗╂枡灞炴��"
+ :visible.sync="materialPropVisible"
+ width="15%">
+ <el-select placeholder="璇烽�夋嫨鐗╂枡灞炴��" v-model="declareObj.materialProp" clearable size="small">
+ <el-option v-for="(item,index) in materialPropList" :value="item.dictValue" :label="item.dictLabel" :key="index"></el-option>
+ </el-select>
+ <span slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="confirmSplitOrder">纭� 瀹�</el-button>
</span>
</el-dialog>
</div>
@@ -304,9 +322,11 @@
data() {
// 杩欓噷瀛樻斁鏁版嵁
return {
+ materialPropVisible:false,
splitOrderType: null,
declareBatchObj:{
- orderType:''
+ orderType:'',
+ materialProp:''
},
declareObjBatchRules:{
orderType: [
@@ -584,6 +604,7 @@
buyUnitMeas: '', // 鍗曚綅
isExpire: '', // 鍗曚綅
orderType: null, // 閿�鍞鍗曞垎绫�
+ materialProp: null, // 鐗╂枡灞炴��
},
componentData: { // 琛ㄦ牸鏁版嵁
updateBatchNo: null,
@@ -668,11 +689,13 @@
outLoading: false,
upLoading: false,
orderTypeList: [],
+ materialPropList: [],
}
},
mounted() {
this.refreshTable()
this.getOrderTypeList()
+ this.getMaterialPropList()
},
// 鏂规硶闆嗗悎
methods: {
@@ -680,6 +703,16 @@
getDicts('inspection_type').then(res=>{
if(res.code === 200){
this.orderTypeList = res.data
+ }
+ }).catch(error=>{
+ console.error(error)
+ })
+ },
+ //鑾峰彇鐗╂枡灞炴�у瓧鍏搁」
+ getMaterialPropList(){
+ getDicts('material_prop_type').then(res=>{
+ if(res.code === 200){
+ this.materialPropList = res.data
}
}).catch(error=>{
console.error(error)
@@ -695,12 +728,26 @@
this.refreshTable()
})
},
+ //纭鎷嗗垎璁㈠崟鍓嶏紝閫夋嫨璁㈠崟鐨勭墿鏂欏睘鎬�
+ beforeConfirmSplitOrder(){
+ if(!this.declareObj.materialProp){
+ this.materialPropVisible = true
+ }else{
+ this.confirmSplitOrder()
+ }
+ },
confirmSplitOrder(){
+ if(!this.declareObj.materialProp){
+ this.$message.warning("璇烽�夋嫨鐗╂枡灞炴��")
+ return
+ }
+ this.materialPropVisible = false
this.confirmSplitOrderLoading = true
let requestData = {
ifsId: this.declareObj.id,
splitDetailList: this.orderSplitDetailData,
- pushToMes: this.pushToMes
+ pushToMes: this.pushToMes,
+ materialProp: this.declareObj.materialProp
}
confirmSplitOrder(requestData).then(res=>{
if(res.code===200 && res.data){
@@ -945,7 +992,8 @@
this.declareDialogSVisible = true
inspectionReport({
ids: ids,
- orderType: this.declareBatchObj.orderType
+ orderType: this.declareBatchObj.orderType,
+ materialProp: this.declareBatchObj.materialProp
}).then(res => {
if (res.code === 200) {
this.declareDialogSVisible = false
@@ -1004,7 +1052,8 @@
inspectionReportOne({
id: this.declareObj.id,
updateBatchNo: this.declareObj.updateBatchNo,
- orderType: this.declareObj.orderType
+ orderType: this.declareObj.orderType,
+ materialProp: this.declareObj.materialProp
}).then(res => {
if (res.code === 200) {
this.declareDialogVisible = false
--
Gitblit v1.9.3