root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:包装关系修改不变更状态

Browse Source
This commit is contained in:
zhouz
2025-07-24 13:39:34 +08:00
parent c7492a6cd7
commit aed0bdc2d7
2 changed files with 124 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
View File

@@ -189,19 +189,22 @@
<el-row>
<el-col :span="12">
<el-form-item label="木箱唯一码" prop="package_box_sn">
<el-input v-model="form.package_box_sn" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
<el-input v-model="form.package_box_sn" :disabled="crud.status.edit > 0 && form.status !== '0'"
style="width: 300px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="箱内子卷数量">
<el-input v-model="form.quanlity_in_box" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
<el-input v-model="form.quanlity_in_box" :disabled="crud.status.edit > 0 && form.status !== '0'"
style="width: 300px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="木箱自身重量">
<el-input v-model="form.box_weight" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
<el-input v-model="form.box_weight" :disabled="crud.status.edit > 0 && form.status !== '0'"
style="width: 300px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -213,120 +216,140 @@
<el-row>
<el-col :span="12">
<el-form-item label="客户编码" prop="customer_name">
<el-input v-model="form.customer_name" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
<el-input v-model="form.customer_name" :disabled="crud.status.edit > 0 && form.status !== '0'"
style="width: 300px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="客户名称" prop="customer_description">
<el-input v-model="form.customer_description" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
<el-input v-model="form.customer_description" :disabled="crud.status.edit > 0 && form.status !== '0'"
style="width: 300px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="产品编码" prop="product_name">
<el-input v-model="form.product_name" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
<el-input v-model="form.product_name" :disabled="crud.status.edit > 0 && form.status !== '0'"
style="width: 300px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="产品描述" prop="product_description">
<el-input v-model="form.product_description" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
<el-input v-model="form.product_description" :disabled="crud.status.edit > 0 && form.status !== '0'"
style="width: 300px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="业务日期">
<el-input v-model="form.date_of_fg_inbound" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
<el-input v-model="form.date_of_fg_inbound" :disabled="crud.status.edit > 0 && form.status !== '0'"
style="width: 300px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="子卷号" prop="container_name">
<el-input v-model="form.container_name" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
<el-input v-model="form.container_name" :disabled="crud.status.edit > 0 && form.status !== '0'"
style="width: 300px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="产品规格(幅宽)" prop="width">
<el-input v-model="form.width" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
<el-input v-model="form.width" :disabled="crud.status.edit > 0 && form.status !== '0'"
style="width: 300px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="产品厚度" prop="thickness">
<el-input v-model="form.thickness" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
<el-input v-model="form.thickness" :disabled="crud.status.edit > 0 && form.status !== '0'"
style="width: 300px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="单位面积质量" prop="mass_per_unit_area">
<el-input v-model="form.mass_per_unit_area" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
<el-input v-model="form.mass_per_unit_area" :disabled="crud.status.edit > 0 && form.status !== '0'"
style="width: 300px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="净重" prop="net_weight">
<el-input v-model="form.net_weight" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
<el-input v-model="form.net_weight" :disabled="crud.status.edit > 0 && form.status !== '0'"
style="width: 300px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="长度" prop="length">
<el-input v-model="form.length" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
<el-input v-model="form.length" :disabled="crud.status.edit > 0 && form.status !== '0'"
style="width: 300px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="制造完成日期" prop="date_of_production">
<el-input v-model="form.date_of_production" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
<el-input v-model="form.date_of_production" :disabled="crud.status.edit > 0 && form.status !== '0'"
style="width: 300px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="计划外分切的子卷" prop="is_un_plan_production">
<el-input v-model="form.is_un_plan_production" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
<el-input v-model="form.is_un_plan_production" :disabled="crud.status.edit > 0 && form.status !== '0'"
style="width: 300px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="子卷的物性值1">
<el-input v-model="form.un_plan_product_property1" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
<el-input v-model="form.un_plan_product_property1"
:disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="子卷的物性值2">
<el-input v-model="form.un_plan_product_property2" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
<el-input v-model="form.un_plan_product_property2"
:disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="子卷的物性值3">
<el-input v-model="form.un_plan_product_property3" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
<el-input v-model="form.un_plan_product_property3"
:disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="木箱料号">
<el-input v-model="form.box_type" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
<el-input v-model="form.box_type" :disabled="crud.status.edit > 0 && form.status !== '0'"
style="width: 300px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="SAP批次" prop="sap_pcsn">
<el-input v-model="form.sap_pcsn" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
<el-input v-model="form.sap_pcsn" :disabled="crud.status.edit > 0 && form.status !== '0'"
style="width: 300px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="是否重打外包装标签">
<el-input v-model="form.isreprintpackageboxlabel" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
<el-input v-model="form.isreprintpackageboxlabel"
:disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否拆包重打子卷标签">
<el-input v-model="form.isunpackbox" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
<el-input v-model="form.isunpackbox" :disabled="crud.status.edit > 0 && form.status !== '0'"
style="width: 300px;"/>
</el-form-item>
</el-col>
</el-row>
@@ -371,33 +394,38 @@
</el-col>
<el-col :span="12">
<el-form-item label="销售订单及行号" prop="sale_order_name">
<el-input v-model="form.sale_order_name" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
<el-input v-model="form.sale_order_name" :disabled="crud.status.edit > 0 && form.status !== '0'"
style="width: 300px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="物料主数据厚度" prop="thickness_request">
<el-input v-model="form.thickness_request" :disabled="crud.status.edit > 0 && form.status !== '0'" :controls="false" style="width: 300px;" />
<el-input v-model="form.thickness_request" :disabled="crud.status.edit > 0 && form.status !== '0'"
:controls="false" style="width: 300px;"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="要求幅宽" prop="width_standard">
<el-input v-model="form.width_standard" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
<el-input v-model="form.width_standard" :disabled="crud.status.edit > 0 && form.status !== '0'"
style="width: 300px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="保质期">
<el-input v-model="form.quality_guaran_period" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
<el-input v-model="form.quality_guaran_period" :disabled="crud.status.edit > 0 && form.status !== '0'"
style="width: 300px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="备注">
<el-input v-model="form.remark" type="textarea" :rows="2" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 750px;" />
<el-input v-model="form.remark" type="textarea" :rows="2"
:disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 750px;"/>
</el-form-item>
</el-col>
</el-row>
@@ -429,7 +457,8 @@
label="箱内子卷数量"
:min-width="flexWidth('quanlity_in_box',crud.data,'箱内子卷数量')"
/>
<el-table-column prop="customer_name" label="客户编码" :min-width="flexWidth('customer_name',crud.data,'客户编码')" />
<el-table-column prop="customer_name" label="客户编码"
:min-width="flexWidth('customer_name',crud.data,'客户编码')"/>
<el-table-column
prop="customer_description"
label="客户名称"
@@ -446,15 +475,19 @@
label="子卷号"
:min-width="flexWidth('container_name',crud.data,'子卷号')"
/>
<el-table-column prop="product_name" label="产品编码" :min-width="flexWidth('product_name',crud.data,'产品描述')" />
<el-table-column prop="product_name" label="产品编码"
:min-width="flexWidth('product_name',crud.data,'产品描述')"/>
<el-table-column
prop="product_description"
label="产品描述"
:min-width="flexWidth('product_description',crud.data,'产品描述')"
/>
<el-table-column sortable prop="sap_pcsn" label="sap批次" :min-width="flexWidth('sap_pcsn',crud.data,'SAP批次')" />
<el-table-column prop="width" label="产品规格(幅宽)" :min-width="flexWidth('width',crud.data,'产品规格(幅宽)')" />
<el-table-column prop="width_standard" :formatter="crud.formatNum0" label="客户要求幅宽" :min-width="flexWidth('width_standard',crud.data,'客户要求幅宽')" />
<el-table-column sortable prop="sap_pcsn" label="sap批次"
:min-width="flexWidth('sap_pcsn',crud.data,'SAP批次')"/>
<el-table-column prop="width" label="产品规格(幅宽)"
:min-width="flexWidth('width',crud.data,'产品规格(幅宽)')"/>
<el-table-column prop="width_standard" :formatter="crud.formatNum0" label="客户要求幅宽"
:min-width="flexWidth('width_standard',crud.data,'客户要求幅宽')"/>
<el-table-column prop="thickness" label="产品厚度" :min-width="flexWidth('thickness',crud.data,'产品厚度')"/>
<el-table-column
prop="mass_per_unit_area"
@@ -533,9 +566,12 @@
<el-table-column prop="box_length" label="长" :min-width="flexWidth('box_length',crud.data,'长')"/>
<el-table-column prop="box_width" label="宽" :min-width="flexWidth('box_width',crud.data,'宽')"/>
<el-table-column prop="box_high" label="高" :min-width="flexWidth('box_high',crud.data,'高')"/>
<el-table-column prop="demand_limit" label="客户需求抗拉下限" :min-width="flexWidth('demand_limit',crud.data,'客户需求抗拉下限')" />
<el-table-column prop="standard_limit" label="内控标准抗拉下限" :min-width="flexWidth('standard_limit',crud.data,'内控标准抗拉下限')" />
<el-table-column prop="actual_value" label="生产实际抗拉值" :min-width="flexWidth('actual_value',crud.data,'生产实际抗拉值')" />
<el-table-column prop="demand_limit" label="客户需求抗拉下限"
:min-width="flexWidth('demand_limit',crud.data,'客户需求抗拉下限')"/>
<el-table-column prop="standard_limit" label="内控标准抗拉下限"
:min-width="flexWidth('standard_limit',crud.data,'内控标准抗拉下限')"/>
<el-table-column prop="actual_value" label="生产实际抗拉值"
:min-width="flexWidth('actual_value',crud.data,'生产实际抗拉值')"/>
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')"/>
<el-table-column prop="vbeln" label="来源交货单" :min-width="flexWidth('vbeln',crud.data,'来源交货单')"/>
<el-table-column prop="posnr" label="来源交货单行" :min-width="flexWidth('posnr',crud.data,'来源交货单行')"/>
@@ -563,7 +599,8 @@
</template>
</el-table-column>
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')"/>
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column prop="create_time" label="创建时间"
:min-width="flexWidth('create_time',crud.data,'创建时间')"/>
<el-table-column
v-permission="['admin','sub:edit','sub:del']"
label="操作"
@@ -739,6 +776,10 @@ export default {
[CRUD.HOOK.beforeRefresh]() {
return true
},
[CRUD.HOOK.beforeSubmit](row) {
this.$delete(row.form, 'status')
return true
},
initQuery() {
const end = new Date()
const start = new Date()

4
lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
View File

@@ -183,8 +183,8 @@
<el-checkbox v-if="mstrow.stor_id !== '1582991156504039455'" v-model="checked">是否异常出库</el-checkbox>
</el-form-item>
<el-form-item label="超期发货:" prop="is_overdue">
<el-radio v-model="rowmst.is_overdue" label="1" :disabled="rowmst.bill_status === '40'" @change="updataIsOverdue">不发超期</el-radio>
<el-radio v-model="rowmst.is_overdue" label="0" :disabled="rowmst.bill_status === '40'" @change="updataIsOverdue">发超期</el-radio>
<el-radio v-model="rowmst.is_overdue" label="0" :disabled="rowmst.bill_status === '40'" @change="updataIsOverdue">不发超期</el-radio>
<el-radio v-model="rowmst.is_overdue" label="1" :disabled="rowmst.bill_status === '40'" @change="updataIsOverdue">发超期</el-radio>
</el-form-item>
<!--<el-form-item label="超期数量:" prop="assign_qty" v-if="rowmst.is_overdue === '1'">
<el-input-number