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

Merge branch 'master' of http://121.40.234.130:8899/root/hl_one

Browse Source
This commit is contained in:
zhouz
2023-07-03 08:58:41 +08:00
parent 3603386c81 3b4485f945
commit ec0fd6cd53
50 changed files with 1391 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mes/qd/src/views/wms/pcs/saleorder/index.vue
View File

@@ -114,7 +114,7 @@
</template>
</el-table-column>
<el-table-column prop="material_code" label="物料编码" />
<el-table-column prop="material_name" label="物料名称" min-width="100" show-overflow-tooltip/>
<el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')"/>
<el-table-column prop="status" label="状态">
<template slot-scope="scope">
{{ dict.label.PCS_SALE_STATUS[scope.row.status] }}
@@ -122,14 +122,14 @@
</el-table-column>
<el-table-column prop="sale_qty" label="销售数量" />
<el-table-column prop="produce_seq" label="生产顺序" />
<el-table-column prop="cust_code" label="客户编码" min-width="100" show-overflow-tooltip/>
<el-table-column prop="cust_name" label="客户名称" min-width="100" show-overflow-tooltip/>
<el-table-column prop="cust_code" label="客户编码" :min-width="flexWidth('cust_code',crud.data,'客户编码')"/>
<el-table-column prop="cust_name" label="客户名称" :min-width="flexWidth('cust_name',crud.data,'cust_name')"/>
<el-table-column prop="unit_name" label="计量单位" show-overflow-tooltip min-width="150" />
<el-table-column prop="plandeliver_date" label="计划交期" min-width="100" show-overflow-tooltip/>
<el-table-column prop="remark" label="备注" show-overflow-tooltip min-width="200"/>
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" min-width="120" show-overflow-tooltip/>
<el-table-column prop="update_time" label="修改时间" min-width="120" show-overflow-tooltip/>
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')"/>
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')"/>
<!-- <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation

6
mes/qd/src/views/wms/pdm/device/index.vue
View File

@@ -180,7 +180,7 @@
<el-table-column prop="device_code" label="设备编码" width="100px" show-overflow-tooltip />
<el-table-column prop="device_name" label="设备名称" :min-width="flexWidth('device_name',crud.data,'设备名称')" />
<el-table-column prop="product_area" label="生产车间" />
<el-table-column prop="spec" label="生产物料规格" />
<el-table-column prop="spec" label="生产物料规格" :min-width="flexWidth('spec',crud.data,'生产物料规格')"/>
<el-table-column prop="inupperlimit_qty" label="设备来料仓上限数" :min-width="flexWidth('inupperlimit_qty',crud.data,'设备来料仓上限数')" />
<el-table-column prop="inlowerlimit_qty" label="设备来料仓下限数" :min-width="flexWidth('inlowerlimit_qty',crud.data,'设备来料仓下限数')" />
<el-table-column prop="outupperlimit_qty" label="设备产品仓上限数" :min-width="flexWidth('outupperlimit_qty',crud.data,'设备产品仓上限数')" />
@@ -192,9 +192,9 @@
<el-table-column prop="is_used" :formatter="formatBoolean" label="是否启用"></el-table-column>
<el-table-column prop="remark" label="备注" width="120px" show-overflow-tooltip />
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" width="120px" show-overflow-tooltip />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column prop="update_name" label="修改人" />
<el-table-column prop="update_time" label="修改时间" width="120px" show-overflow-tooltip />
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation

5
mes/qd/src/views/wms/storage_manage/product/productIn/AddDialog.vue
View File

@@ -39,7 +39,7 @@
class="filter-item"
>
<el-option
v-for="item in dict.ST_INV_IN_TYPE"
v-for="item in dict.ST_INV_CP_IN_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -253,7 +253,7 @@ export default {
name: 'AddDialog',
components: { MaterDtl, AddDtl },
mixins: [crud(), form(defaultForm)],
dicts: ['IO_BILL_STATUS', 'ST_INV_IN_TYPE', 'ST_QUALITY_SCODE', 'bill_type', 'product_area', 'PCS_SAL_TYPE'],
dicts: ['IO_BILL_STATUS', 'ST_INV_CP_IN_TYPE', 'ST_QUALITY_SCODE', 'bill_type', 'product_area', 'PCS_SAL_TYPE'],
props: {
dialogShow: {
type: Boolean,
@@ -392,6 +392,7 @@ export default {
data.base_bill_type = row.sale_type
data.base_bill_code = row.sale_code
data.base_bill_table = row.seq_no
data.unit_weight = row.unit_weight
data.edit = true
this.form.tableData.splice(-1, 0, data)
this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(data.plan_qty)

4
mes/qd/src/views/wms/storage_manage/product/productIn/ViewDialog.vue
View File

@@ -46,7 +46,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_IN_TYPE"
v-for="item in dict.ST_INV_CP_IN_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -163,7 +163,7 @@ export default {
name: 'ViewDialog',
components: { },
mixins: [crud()],
dicts: ['ST_INV_IN_TYPE', 'product_area', 'IO_BILL_STATUS', 'task_status', 'SCH_TASK_TYPE_DTL', 'PCS_SAL_TYPE'],
dicts: ['ST_INV_CP_IN_TYPE', 'product_area', 'IO_BILL_STATUS', 'task_status', 'SCH_TASK_TYPE_DTL', 'PCS_SAL_TYPE'],
props: {
dialogShow: {
type: Boolean,

8
mes/qd/src/views/wms/storage_manage/product/productIn/index.vue
View File

@@ -40,7 +40,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_IN_TYPE"
v-for="item in dict.ST_INV_CP_IN_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -59,7 +59,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_IN_TYPE"
v-for="item in dict.ST_INV_CP_IN_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -257,7 +257,7 @@ export default {
},
mixins: [presenter(), header(), crud()],
// 数据字典
dicts: ['IO_BILL_STATUS', 'ST_INV_IN_TYPE', 'product_area'],
dicts: ['IO_BILL_STATUS', 'ST_INV_CP_IN_TYPE', 'product_area'],
data() {
return {
height: document.documentElement.clientHeight - 180 + 'px;',
@@ -344,7 +344,7 @@ export default {
}
},
bill_typeFormat(row, column) {
return this.dict.label.ST_INV_IN_TYPE[row.bill_type]
return this.dict.label.ST_INV_CP_IN_TYPE[row.bill_type]
},
toView(row) {
this.mstrow = row

4
mes/qd/src/views/wms/storage_manage/product/productOut/AddDialog.vue
View File

@@ -39,7 +39,7 @@
class="filter-item"
>
<el-option
v-for="item in dict.ST_INV_OUT_TYPE"
v-for="item in dict.ST_INV_CP_OUT_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -235,7 +235,7 @@ export default {
name: 'AddDialog',
components: { MaterDtl, AddDtl, AddIvt },
mixins: [crud(), form(defaultForm)],
dicts: ['IO_BILL_STATUS', 'ST_INV_OUT_TYPE', 'ST_QUALITY_SCODE', 'bill_type', 'product_area'],
dicts: ['IO_BILL_STATUS', 'ST_INV_CP_OUT_TYPE', 'ST_QUALITY_SCODE', 'bill_type', 'product_area'],
props: {
dialogShow: {
type: Boolean,

4
mes/qd/src/views/wms/storage_manage/product/productOut/ViewDialog.vue
View File

@@ -44,7 +44,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_OUT_TYPE"
v-for="item in dict.ST_INV_CP_OUT_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -159,7 +159,7 @@ export default {
name: 'ViewDialog',
components: { },
mixins: [crud()],
dicts: ['ST_INV_OUT_TYPE', 'product_area', 'IO_BILL_STATUS','task_status', 'SCH_TASK_TYPE_DTL', 'PCS_DELIVER_TYPE'],
dicts: ['ST_INV_CP_OUT_TYPE', 'product_area', 'IO_BILL_STATUS','task_status', 'SCH_TASK_TYPE_DTL', 'PCS_DELIVER_TYPE'],
props: {
dialogShow: {
type: Boolean,

6
mes/qd/src/views/wms/storage_manage/product/productOut/index.vue
View File

@@ -84,7 +84,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_OUT_TYPE"
v-for="item in dict.ST_INV_CP_OUT_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -230,7 +230,7 @@ export default {
},
mixins: [presenter(), header(), crud()],
// 数据字典
dicts: ['IO_BILL_STATUS', 'ST_INV_OUT_TYPE', 'product_area'],
dicts: ['IO_BILL_STATUS', 'ST_INV_CP_OUT_TYPE', 'product_area'],
data() {
return {
height: document.documentElement.clientHeight - 180 + 'px;',
@@ -324,7 +324,7 @@ export default {
return this.dict.label.IO_BILL_STATUS[row.bill_status]
},
bill_typeFormat(row) {
return this.dict.label.ST_INV_OUT_TYPE[row.bill_type]
return this.dict.label.ST_INV_CP_OUT_TYPE[row.bill_type]
},
handleCurrentChange(current) {
if (current === null) {

4
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/AddDialog.vue
View File

@@ -95,7 +95,7 @@
:disabled="crud.status.view > 0"
>
<el-option
v-for="item in dict.ST_INV_OUT_TYPE"
v-for="item in dict.ST_INV_BCP_OUT_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -226,7 +226,7 @@ export default {
name: 'AddDialog',
components: { MaterDtl },
mixins: [crud(), form(defaultForm)],
dicts: ['IO_BILL_STATUS', 'ST_QUALITY_SCODE', 'ST_INV_OUT_TYPE', 'product_area'],
dicts: ['IO_BILL_STATUS', 'ST_QUALITY_SCODE', 'ST_INV_BCP_OUT_TYPE', 'product_area'],
cruds() {
return CRUD({ title: '入库新增', crudMethod: { ...crudsemiproductOut }})
},

4
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/ViewDialog.vue
View File

@@ -51,7 +51,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_IN_TYPE"
v-for="item in dict.ST_INV_BCP_OUT_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -139,7 +139,7 @@ export default {
name: 'ViewDialog',
components: { },
mixins: [crud()],
dicts: ['ST_INV_IN_TYPE', 'product_area', 'IO_BILL_STATUS', 'task_status'],
dicts: ['ST_INV_BCP_OUT_TYPE', 'product_area', 'IO_BILL_STATUS', 'task_status'],
props: {
dialogShow: {
type: Boolean,

6
mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/index.vue
View File

@@ -40,7 +40,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_OUT_TYPE"
v-for="item in dict.ST_INV_BCP_OUT_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -219,7 +219,7 @@ export default {
},
mixins: [presenter(), header(), crud()],
// 数据字典
dicts: ['IO_BILL_STATUS', 'bill_type', 'product_area', 'ST_INV_OUT_TYPE', 'ST_INV_CREATE'],
dicts: ['IO_BILL_STATUS', 'bill_type', 'product_area', 'ST_INV_BCP_OUT_TYPE', 'ST_INV_CREATE'],
data() {
return {
height: document.documentElement.clientHeight - 180 + 'px;',
@@ -299,7 +299,7 @@ export default {
}
},
bill_typeFormat(row, column) {
return this.dict.label.ST_INV_OUT_TYPE[row.bill_type]
return this.dict.label.ST_INV_BCP_OUT_TYPE[row.bill_type]
},
toView(row) {
this.mstrow = row