From 1210d5c10991c9f843a1770364a30fbfd3c5a5d8 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 13 一月 2026 13:17:45 +0800
Subject: [PATCH] 1.外购下单：标签打印功能调整 2.人员：培训计划导入导出添加【培训大类】字段 3.业务管理：报检新增【物料属性】字段选择，其余页面添加【物料属性】查询条件以及数据回显 4.标准库：布局优化，左侧选择树支持横向拖拽动态调整宽度
---
src/views/business/rawMaterialInspection/index.vue | 73 +++++++++++++++++++++++++++++++++---
1 files changed, 66 insertions(+), 7 deletions(-)
diff --git a/src/views/business/rawMaterialInspection/index.vue b/src/views/business/rawMaterialInspection/index.vue
index b7dc406..ff2a13d 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>
@@ -264,9 +274,20 @@
</el-table>
</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>
- </span>
+ <el-button @click="resetOrderSplitData()" :disabled="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>
</template>
@@ -301,12 +322,17 @@
data() {
// 杩欓噷瀛樻斁鏁版嵁
return {
+ materialPropVisible:false,
declareBatchObj:{
- orderType:''
+ orderType:'',
+ materialProp:''
},
declareObjBatchRules:{
orderType: [
{ required: true, message: '璇烽�夋嫨閿�鍞鍗曞垎绫�', trigger: 'change' }
+ ],
+ materialProp: [
+ { required: true, message: '璇烽�夋嫨鐗╂枡灞炴��', trigger: 'change' }
],
},
confirmSplitOrderLoading: false,
@@ -580,6 +606,7 @@
buyUnitMeas: '', // 鍗曚綅
isExpire: '', // 鍗曚綅
orderType: null, // 閿�鍞鍗曞垎绫�
+ materialProp: null, // 鐗╂枡灞炴��
},
componentData: { // 琛ㄦ牸鏁版嵁
updateBatchNo: null,
@@ -629,6 +656,9 @@
orderType: [
{ required: true, message: '璇烽�夋嫨閿�鍞鍗曞垎绫�', trigger: 'change' }
],
+ materialProp: [
+ { required: true, message: '璇烽�夋嫨鐗╂枡灞炴��', trigger: 'change' }
+ ],
},
tabList: [
{
@@ -664,11 +694,13 @@
outLoading: false,
upLoading: false,
orderTypeList: [],
+ materialPropList: [],
}
},
mounted() {
this.refreshTable()
this.getOrderTypeList()
+ this.getMaterialPropList()
},
// 鏂规硶闆嗗悎
methods: {
@@ -676,6 +708,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)
@@ -691,16 +733,31 @@
this.refreshTable()
})
},
+ //纭鎷嗗垎璁㈠崟鍓嶏紝閫夋嫨璁㈠崟鐨勭墿鏂欏睘鎬�
+ beforeConfirmSplitOrder(){
+ console.log(this.declareObj.materialProp)
+ if(!this.declareObj.materialProp){
+ this.materialPropVisible = true
+ }else{
+ this.confirmSplitOrder()
+ }
+ },
confirmSplitOrder(){
if(this.orderSplitDetailData.length===0){
this.$message.error('璇峰厛瀵煎叆鎷嗗垎鏁版嵁')
return
}
+ 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 +1002,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 +1062,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