DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复表单禁用状态和加载逻辑问题

Browse Source 
修复发货表单字段的禁用状态逻辑，移除多余的readonly属性
调整取消分卷操作的加载状态处理，确保在finally中重置状态
优化钢卷选择器组件，增加切边和包装筛选及显示列
将结算方式输入框改为下拉选择框，提升用户体验
This commit is contained in:
砂糖
2026-01-29 15:04:06 +08:00
parent b7a171b599
commit a9fb6d51b1
5 changed files with 53 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
klp-ui/src/views/wms/coil/do/ship.vue
View File

@@ -46,7 +46,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="班组" prop="team">
<el-select v-model="form.team" placeholder="请选择班组" style="width: 100%" :disabled="readonly">
<el-select v-model="form.team" placeholder="请选择班组" style="width: 100%">
<el-option key="甲" label="甲" value="甲" />
<el-option key="乙" label="乙" value="乙" />
</el-select>
@@ -77,25 +77,25 @@
<el-row>
<el-col :span="12">
<el-form-item label="质量状态" prop="qualityStatus">
<el-input v-model="form.qualityStatus" placeholder="请输入质量状态" :disabled="readonly">
<el-input v-model="form.qualityStatus" placeholder="请输入质量状态">
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="切边要求" prop="trimmingRequirement">
<el-input v-model="form.trimmingRequirement" placeholder="请输入切边要求" :disabled="readonly">
<el-input v-model="form.trimmingRequirement" placeholder="请输入切边要求">
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="打包状态" prop="packingStatus">
<el-input v-model="form.packingStatus" placeholder="请输入打包状态" :disabled="readonly">
<el-input v-model="form.packingStatus" placeholder="请输入打包状态">
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="包装要求" prop="packagingRequirement">
<el-input v-model="form.packagingRequirement" placeholder="请输入包装要求" :disabled="readonly">
<el-input v-model="form.packagingRequirement" placeholder="请输入包装要求">
</el-input>
</el-form-item>
</el-col>

5
klp-ui/src/views/wms/coil/panels/do.vue
View File

@@ -768,10 +768,11 @@ export default {
this.buttonLoading = true
cancelSpecialSplit(row.actionId).then(response => {
this.$message.success('取消分卷成功')
this.stepSpilt.loading = false
this.buttonLoading = false
this.getPendingAction() // 刷新待操作列表
this.getStepSplitList()
}).finally(() => {
this.stepSpilt.loading = false
this.buttonLoading = false
})
})
},

15
klp-ui/src/views/wms/delivery/components/detailTable.vue
View File

@@ -7,7 +7,7 @@
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
</el-col>
<el-col :span="1.5">
<coil-selector :use-trigger="true" multiple @confirm="handleBatchAdd"
<coil-selector dialogWidth="1200px" :use-trigger="true" multiple @confirm="handleBatchAdd"
:filters="{ selectType: 'product', status: 0, excludeBound: true, orderBy: true }" :orderBy="true">
<el-button type="primary" plain icon="el-icon-plus" size="mini">批量新增</el-button>
</coil-selector>
@@ -54,7 +54,7 @@
<el-form ref="form" :model="form" label-width="80px">
<el-form-item label="发货钢卷" prop="coilId">
<div style="display: flex; gap: 10px;">
<coil-selector v-model="form.coilId" :use-trigger="true"
<coil-selector dialogWidth="1200px" v-model="form.coilId" :use-trigger="true"
:filters="{ selectType: 'product', status: 0, excludeBound: true, orderBy: true }" @select="handleSelect"
:orderBy="true" />
<el-checkbox v-model="autoFillForm" label="自动填写表单信息" />
@@ -67,20 +67,23 @@
</el-select>
</el-form-item>
<el-form-item label="切边" prop="edgeType">
<el-select v-model="form.edgeType" placeholder="请选择切边" style="width: 100%">
<el-select v-model="form.edgeType" placeholder="请选择切边" clearable style="width: 100%">
<el-option label="净边料" value="净边料" />
<el-option label="毛边料" value="毛边料" />
</el-select>
</el-form-item>
<el-form-item label="包装" prop="packaging">
<el-select v-model="form.packaging" placeholder="请选择包装" style="width: 100%">
<el-select v-model="form.packaging" placeholder="请选择包装" clearable style="width: 100%">
<el-option label="裸包" value="裸包" />
<el-option label="普包" value="普包" />
<el-option label="简包" value="简包" />
</el-select>
</el-form-item>
<el-form-item label="结算方式" prop="settlementType">
<el-input v-model="form.settlementType" placeholder="请输入结算方式" />
<el-select v-model="form.settlementType" placeholder="请选择结算方式" style="width: 100%">
<el-option label="磅重结算" value="磅重结算" />
<el-option label="卷重结算" value="卷重结算" />
</el-select>
</el-form-item>
<el-form-item label="原料厂家" prop="rawMaterialFactory">
<el-input v-model="form.rawMaterialFactory" placeholder="请输入原料厂家" />
@@ -139,7 +142,7 @@ export default {
waybillId: {
handler(newVal, oldVal) {
// if (newVal) {
this.getList();
this.getList();
// }
},
immediate: true

2
klp-ui/src/views/wms/delivery/waybill/index.vue
View File

@@ -118,7 +118,7 @@
<script>
import { listDeliveryWaybill, getDeliveryWaybill, delDeliveryWaybill, addDeliveryWaybill, updateDeliveryWaybill, updateDeliveryWaybillStatus } from "@/api/wms/deliveryWaybill";
import { listDeliveryPlan, listSelectableCoils } from "@/api/wms/deliveryPlan"; // 导入发货计划API
import { listSelectableCoils } from "@/api/wms/deliveryPlan"; // 导入发货计划API
import { listCoilByIds } from "@/api/wms/coil";
import { listDeliveryWaybillDetail } from "@/api/wms/deliveryWaybillDetail";
import MemoInput from "@/components/MemoInput";