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

问题修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-11-16 15:10:43 +08:00
parent 052a2fa7e6
commit 17e30cb952
13 changed files with 218 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,80 +5,164 @@
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="木箱唯一码">
<el-input v-model="form.package_box_SN" style="width: 370px;" />
</el-form-item>
<el-form-item label="箱内子卷数量">
<el-input v-model="form.quanlity_in_box" style="width: 370px;" />
</el-form-item>
<el-form-item label="木箱自身重量">
<el-input v-model="form.box_weight" style="width: 370px;" />
</el-form-item>
<el-form-item label="保质期">
<el-input v-model="form.quality_guaran_period" style="width: 370px;" />
</el-form-item>
<el-form-item label="销售订单及行号">
<el-input v-model="form.sale_order_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="客户名称" prop="customer_description">
<el-input v-model="form.customer_description" style="width: 370px;" />
</el-form-item>
<el-form-item label="产品编码" prop="product_name">
<el-input v-model="form.product_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="产品描述" prop="product_description">
<el-input v-model="form.product_description" style="width: 370px;" />
</el-form-item>
<el-form-item label="入库日期">
<el-input v-model="form.date_of_FG_inbound" style="width: 370px;" />
</el-form-item>
<el-form-item label="子卷号" prop="container_name">
<el-input v-model="form.container_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="产品规格(幅宽)" prop="width">
<el-input v-model="form.width" style="width: 370px;" />
</el-form-item>
<el-form-item label="产品厚度" prop="thickness">
<el-input v-model="form.thickness" style="width: 370px;" />
</el-form-item>
<el-form-item label="单位面积质量" prop="mass_per_unit_area">
<el-input v-model="form.mass_per_unit_area" style="width: 370px;" />
</el-form-item>
<el-form-item label="净重" prop="net_weight">
<el-input v-model="form.net_weight" style="width: 370px;" />
</el-form-item>
<el-form-item label="长度" prop="length">
<el-input v-model="form.length" style="width: 370px;" />
</el-form-item>
<el-form-item label="制造完成日期" prop="date_of_production">
<el-input v-model="form.date_of_production" style="width: 370px;" />
</el-form-item>
<el-form-item label="计划外分切的子卷" prop="is_un_plan_production">
<el-input v-model="form.is_un_plan_production" style="width: 370px;" />
</el-form-item>
<el-form-item label="子卷的物性值1">
<el-input v-model="form.un_plan_product_property1" style="width: 370px;" />
</el-form-item>
<el-form-item label="子卷的物性值2">
<el-input v-model="form.un_plan_product_property2" style="width: 370px;" />
</el-form-item>
<el-form-item label="子卷的物性值3">
<el-input v-model="form.un_plan_product_property3" style="width: 370px;" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-input v-model="form.status" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否需要重打外包装标签">
<el-input v-model="form.isRePrintPackageBoxLabel" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否需要拆包重打子卷标签">
<el-input v-model="form.isUnPackBox" style="width: 370px;" />
</el-form-item>
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="1000px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="160px">
<el-row>
<el-col :span="12">
<el-form-item label="木箱唯一码">
<el-input v-model="form.package_box_sn" style="width: 300px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="箱内子卷数量">
<el-input v-model="form.quanlity_in_box" 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" style="width: 300px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="保质期">
<el-input v-model="form.quality_guaran_period" style="width: 300px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="客户编码" prop="customer_name">
<el-input v-model="form.customer_name" 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" 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" 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" 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" 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" 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" style="width: 300px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="产品厚度" prop="thickness">
<el-input v-model="form.thickness" 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" 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" 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" 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" 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" 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" 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" 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" 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" style="width: 300px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="SAP批次">
<el-input v-model="form.sap_pcsn" 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" style="width: 300px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否拆包重打子卷标签">
<el-input v-model="form.isUnPackBox" 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.sale_order_name" style="width: 300px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 300px;" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
@@ -98,6 +182,7 @@
<el-table-column prop="product_description" label="产品描述" :min-width="flexWidth('product_description',crud.data,'产品描述')"/>
<el-table-column prop="date_of_FG_inbound" label="入库日期" :min-width="flexWidth('date_of_FG_inbound',crud.data,'入库日期')" />
<el-table-column prop="container_name" label="子卷号" :min-width="flexWidth('container_name',crud.data,'子卷号')" />
<el-table-column 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="thickness" label="产品厚度" :min-width="flexWidth('thickness',crud.data,'产品厚度')" />
<el-table-column prop="mass_per_unit_area" label="单位面积质量" :formatter="crud.formatNum3" :min-width="flexWidth('mass_per_unit_area',crud.data,'单位面积质量')" />
@@ -109,6 +194,7 @@
{{ dict.label.IS_OR_NOT[scope.row.is_un_plan_production] }}
</template>
</el-table-column>
<el-table-column prop="box_type" label="木箱料号" :min-width="flexWidth('box_type',crud.data,'木箱料号')" />
<el-table-column prop="un_plan_product_property1" label="子卷的物性值1" :min-width="flexWidth('un_plan_product_property1',crud.data,'子卷的物性值1')" />
<el-table-column prop="un_plan_product_property2" label="子卷的物性值2" :min-width="flexWidth('un_plan_product_property2',crud.data,'子卷的物性值2')" />
<el-table-column prop="un_plan_product_property3" label="子卷的物性值3" :min-width="flexWidth('un_plan_product_property3',crud.data,'子卷的物性值3')" />
@@ -145,7 +231,7 @@ import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
const defaultForm = { workorder_id: null, package_box_SN: null, quanlity_in_box: null, box_weight: null, quality_guaran_period: null, sale_order_name: null, customer_name: null, customer_description: null, product_name: null, product_description: null, date_of_FG_inbound: null, container_name: null, width: null, thickness: null, mass_per_unit_area: null, net_weight: null, length: null, date_of_production: null, is_un_plan_production: null, un_plan_product_property1: null, un_plan_product_property2: null, un_plan_product_property3: null, remark: null, create_id: null, create_name: null, create_time: null, status: null, isRePrintPackageBoxLabel: null, isUnPackBox: null }
const defaultForm = { workorder_id: null, package_box_sn: null, quanlity_in_box: null, box_weight: null, quality_guaran_period: null, sale_order_name: null, customer_name: null, customer_description: null, product_name: null, product_description: null, date_of_FG_inbound: null, container_name: null, width: null, thickness: null, mass_per_unit_area: null, net_weight: null, length: null, date_of_production: null, is_un_plan_production: null, un_plan_product_property1: null, un_plan_product_property2: null, un_plan_product_property3: null, box_type: null, sap_pcsn: null, remark: null, create_id: null, create_name: null, create_time: null, status: null, isRePrintPackageBoxLabel: null, isUnPackBox: null }
export default {
name: 'Subpackagerelation',
dicts: ['sub_package_relation', 'IS_OR_NOT'],

12
lms/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue
View File

@@ -114,22 +114,10 @@
type="primary"
icon="el-icon-plus"
size="mini"
:disabled="bill_btn"
@click="insertEvent()"
>
添加箱号物料
</el-button>
<el-button
slot="left"
class="filter-item"
type="warning"
icon="el-icon-check"
size="mini"
:disabled="mater_btn"
@click="insertdtl()"
>
新增一行
</el-button>
</span>
</div>

1
lms/nladmin-ui/src/views/wms/st/inbill/index.vue
View File

@@ -241,7 +241,6 @@ export default {
return CRUD({
title: '',
optShow: { add: true, reset: true },
query: { bill_type: '0001' },
idField: 'iostorinv_id',
url: '/api/in/rawAssist',
crudMethod: { ...rawAssist }