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-22 16:15:12 +08:00
parent 918e9b71c9
commit b971459824
12 changed files with 97 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,7 +137,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="入库日期">
<el-input v-model="form.date_of_FG_inbound" style="width: 300px;" />
<el-input v-model="form.date_of_fg_inbound" style="width: 300px;" />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -221,12 +221,12 @@
<el-row>
<el-col :span="12">
<el-form-item label="是否重打外包装标签">
<el-input v-model="form.isRePrintPackageBoxLabel" style="width: 300px;" />
<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-input v-model="form.isunpackbox" style="width: 300px;" />
</el-form-item>
</el-col>
</el-row>
@@ -259,7 +259,7 @@
<el-table-column prop="customer_description" label="客户名称" :min-width="flexWidth('customer_description',crud.data,'客户名称')" />
<el-table-column v-if="false" 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 prop="date_of_FG_inbound" label="入库日期" :min-width="flexWidth('date_of_FG_inbound',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,'产品规格(幅宽)')" />
@@ -285,8 +285,8 @@
{{ dict.label.sub_package_relation[scope.row.status] }}
</template>
</el-table-column>
<el-table-column prop="isRePrintPackageBoxLabel" label="是否需要重打外包装标签" :min-width="flexWidth('isRePrintPackageBoxLabel',crud.data,'是否需要重打外包装标签')" />
<el-table-column prop="isUnPackBox" label="是否需要拆包重打子卷标签" :min-width="flexWidth('isUnPackBox',crud.data,'是否需要拆包重打子卷标签')" />
<el-table-column prop="isreprintpackageboxlabel" label="是否需要重打外包装标签" :min-width="flexWidth('isreprintpackageboxlabel',crud.data,'是否需要重打外包装标签')" />
<el-table-column prop="isunpackbox" label="是否需要拆包重打子卷标签" :min-width="flexWidth('isunpackbox',crud.data,'是否需要拆包重打子卷标签')" />
<el-table-column v-permission="[]" label="操作" align="center" fixed="right" min-width="120">
<template slot-scope="scope">
<udOperation
@@ -310,7 +310,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, box_type: null, sap_pcsn: 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'],

6
lms/nladmin-ui/src/views/wms/st/inStor/change/AddDialog.vue
View File

@@ -211,7 +211,7 @@
<span v-show="scope.row.edit">{{ scope.row.demand_date }}</span>
</template>
</el-table-column>
<el-table-column key="21" width="150" show-overflow-tooltip prop="date_of_FG_inbound" label="制作日期-新">
<el-table-column key="24" width="150" show-overflow-tooltip prop="date_of_FG_inbound" label="制作日期-新">
<template scope="scope">
<el-input v-show="!scope.row.edit" v-model="scope.row.date_of_FG_inbound" class="input-with-select">
</el-input>
@@ -342,7 +342,7 @@ export default {
this.$emit('AddChanged')
},
[CRUD.HOOK.afterToEdit]() {
handmovestor.getOutBillDtl({ 'moveinv_id': this.form.moveinv_id }).then(res => {
handmovestor.getOutBillDtl({ 'changeinv_id': this.form.changeinv_id }).then(res => {
this.form.tableData = res
// 将明细变成不可编辑
for (let i = 0; i < this.form.tableData.length; i++) {
@@ -354,7 +354,7 @@ export default {
},
[CRUD.HOOK.afterToView]() {
debugger
handmovestor.getOutBillDtl({ 'moveinv_id': this.form.moveinv_id }).then(res => {
handmovestor.getOutBillDtl({ 'changeinv_id': this.form.changeinv_id }).then(res => {
this.form.tableData = res
// 将明细变成不可编辑
for (let i = 0; i < this.form.tableData.length; i++) {

2
lms/nladmin-ui/src/views/wms/st/inStor/change/index.vue
View File

@@ -193,7 +193,7 @@ export default {
name: 'Change',
components: { AddDialog, crudOperation, rrOperation, udOperation, pagination },
cruds() {
return CRUD({ title: '库存变更', idField: 'moveinv_id', url: 'api/change', crudMethod: { ...change },
return CRUD({ title: '库存变更', idField: 'changeinv_id', url: 'api/change', crudMethod: { ...change },
optShow: {
add: true,
edit: false,

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

@@ -202,7 +202,7 @@
<el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
<el-table-column show-overflow-tooltip prop="point_code" label="入库点" align="center" />
<el-table-column show-overflow-tooltip prop="struct_code" label="货位" align="center" />
<el-table-column align="center" label="操作" width="190" fixed="right">
<!--<el-table-column align="center" label="操作" width="190" fixed="right">
<template slot-scope="scope">
<el-popover v-model="scope.row.pop" placement="top" width="180" trigger="manual">
<p>{{ '是否确认删除桶明细？' }}</p>
@@ -213,7 +213,7 @@
<el-button slot="reference" :disabled="scope.row.struct_code !== '' && scope.row.struct_code" type="danger" icon="el-icon-delete" size="mini" @click="toDelete(scope.row)" />
</el-popover>
</template>
</el-table-column>
</el-table-column>-->
</el-table>
</el-card>