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

rev:修改结构

Browse Source
This commit is contained in:
zhangzhiqiang
2023-04-23 14:04:45 +08:00
parent d4a63d1619
commit 1ee9d7362b
41 changed files with 338 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/qd/src/views/wms/basedata/pdm/workProcedure/index.vue
View File

@@ -52,7 +52,7 @@
<el-form-item v-if="false" label="工序标识" prop="workprocedure_id">
<el-input v-model="form.workprocedure_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="生产区域" prop="product_area">
<el-form-item label="生产车间" prop="product_area">
<el-select
v-model="form.product_area"
placeholder=""

21
mes/qd/src/views/wms/cacheline/position/index.vue
View File

@@ -9,7 +9,7 @@
label-width="90px"
label-suffix=":"
>
<el-form-item label="生产区域">
<el-form-item label="生产车间">
<el-select
v-model="query.product_area"
filterable
@@ -44,9 +44,10 @@
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="710px">
width="710px"
>
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="120px">
<el-form-item label="生产区域" prop="product_area">
<el-form-item label="生产车间" prop="product_area">
<el-select
v-model="form.product_area"
placeholder=""
@@ -61,7 +62,7 @@
</el-select>
</el-form-item>
<el-form-item label="缓存线位置编码" prop="position_code">
<el-input v-model="form.position_code" style="width: 200px;" :disabled="crud.status.edit == 1"/>
<el-input v-model="form.position_code" style="width: 200px;" :disabled="crud.status.edit == 1" />
</el-form-item>
<el-form-item label="缓存线位置名字" prop="position_name">
<el-input v-model="form.position_name" style="width: 200px;" />
@@ -152,16 +153,16 @@
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="position_code" label="位置编码" width="120"/>
<el-table-column prop="position_code" label="位置编码" width="120" />
<el-table-column prop="cacheline_code" label="缓存线编码" />
<el-table-column prop="position_name" label="名字" width="120"/>
<el-table-column prop="position_name" label="名字" width="120" />
<el-table-column prop="cache_line_no" label="缓存线编号" />
<el-table-column prop="layer_num" label="层数" />
<el-table-column prop="positionorder_no" label="顺序号" />
<el-table-column prop="priority_layer_no" label="优先层顺序" />
<el-table-column prop="order_no" label="料箱展示顺序号" width="120"/>
<el-table-column prop="order_no" label="料箱展示顺序号" width="120" />
<el-table-column prop="vehicle_code" label="载具编码" />
<el-table-column prop="product_area" label="生产区域" />
<el-table-column prop="product_area" label="生产车间" />
<el-table-column prop="is_empty" label="是否空位">
<template slot-scope="scop">
{{ scop.row.is_empty == 1 ? "是" : "否" }}
@@ -259,7 +260,7 @@ export default {
{ required: true, message: '料箱展示顺序号不能为空', trigger: 'blur' }
],
product_area: [
{ required: true, message: '生产区域不能为空', trigger: 'blur' }
{ required: true, message: '生产车间不能为空', trigger: 'blur' }
],
is_empty: [
{ required: true, message: '是否空位不能为空', trigger: 'blur' }
@@ -273,7 +274,7 @@ export default {
is_delete: [
{ required: true, message: '是否删除不能为空', trigger: 'blur' }
]
} }
}}
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据

6
mes/qd/src/views/wms/cacheline/vehicle/index.vue
View File

@@ -26,7 +26,7 @@
<el-form-item label="是否打印" prop="is_print">
<el-input v-model="form.is_print" style="width: 370px;" />
</el-form-item>
<el-form-item label="生产区域" prop="product_area">
<el-form-item label="生产车间" prop="product_area">
<el-input v-model="form.product_area" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否可用" prop="is_active">
@@ -49,7 +49,7 @@
<el-table-column prop="print_num" label="打印次数" />
<el-table-column prop="is_print" label="是否打印" />
<el-table-column prop="print_time" label="打印时间" />
<el-table-column prop="product_area" label="生产区域" />
<el-table-column prop="product_area" label="生产车间" />
<el-table-column prop="is_active" label="是否可用" />
<el-table-column prop="is_delete" label="是否删除" />
<el-table-column prop="create_name" label="创建人" />
@@ -105,7 +105,7 @@ export default {
{ required: true, message: '是否打印不能为空', trigger: 'blur' }
],
product_area: [
{ required: true, message: '生产区域不能为空', trigger: 'blur' }
{ required: true, message: '生产车间不能为空', trigger: 'blur' }
],
is_active: [
{ required: true, message: '是否可用不能为空', trigger: 'blur' }

6
mes/qd/src/views/wms/mps/produce/ViewDialog.vue
View File

@@ -110,8 +110,8 @@
</el-form-item>
<el-form-item label="产品系列">
<treeselect
disabled
v-model="form.product_series"
disabled
:options="classes3"
:auto-load-root-options="false"
:load-options="loadChildNodes"
@@ -164,8 +164,8 @@
<el-table-column prop="device_code" label="设备编码" align="center" />
<el-table-column prop="workorder_code" label="工单编号" />
<el-table-column prop="shift_type_scode" label="班次类型" />
<el-table-column prop="product_area" label="生产区域" />
<el-table-column prop="device_name" label="设备名称" align="center" min-width="200" show-overflow-tooltip/>
<el-table-column prop="product_area" label="生产车间" />
<el-table-column prop="device_name" label="设备名称" align="center" min-width="200" show-overflow-tooltip />
<el-table-column prop="dq_init_qty" label="电气期初数量" />
<el-table-column prop="person_init_qty" label="人员期初数量" />
<el-table-column prop="dq_report_qty" label="电气报工数量" />

8
mes/qd/src/views/wms/mps/produce/index.vue
View File

@@ -10,7 +10,7 @@
label-width="90px"
label-suffix=":"
>
<el-form-item label="生产区域">
<el-form-item label="生产车间">
<el-select
v-model="query.product_area"
clearable
@@ -197,7 +197,7 @@
width="1200px"
>
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="160px">
<el-form-item label="生产区域" prop="product_area">
<el-form-item label="生产车间" prop="product_area">
<el-select
v-model="form.product_area"
placeholder=""
@@ -360,8 +360,8 @@
{{ dict.label.PDM_BI_SHIFTTYPE[scope.row.shift_type_scode] }}
</template>
</el-table-column>
<!-- <el-table-column prop="workprocedure_code" label="工序编码" />-->
<el-table-column prop="product_area" label="生产区域" />
<!-- <el-table-column prop="workprocedure_code" label="工序编码" />-->
<el-table-column prop="product_area" label="生产车间" />
<el-table-column prop="plan_qty" label="计划数量" />
<el-table-column prop="real_qty" label="实际数量" />
<el-table-column prop="person_name" label="生产人员" />

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

@@ -10,7 +10,7 @@
label-width="90px"
label-suffix=":"
>
<el-form-item label="生产区域">
<el-form-item label="生产车间">
<el-select
v-model="query.product_area"
clearable
@@ -80,9 +80,10 @@
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="1200px">
width="1200px"
>
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="160px">
<el-form-item label="生产区域" prop="product_area">
<el-form-item label="生产车间" prop="product_area">
<el-select
v-model="form.product_area"
placeholder=""
@@ -162,27 +163,27 @@
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<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="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="device_code2" label="设备编码2" />
<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,'设备产品仓上限数')"/>
<el-table-column prop="outlowerlimit_qty" label="设备产品仓下限数" :min-width="flexWidth('outlowerlimit_qty',crud.data,'设备产品仓下限数')"/>
<el-table-column prop="deviceinitinstor_qty" label="设备初始来料仓数" :min-width="flexWidth('deviceinitinstor_qty',crud.data,'设备初始来料仓数')"/>
<el-table-column prop="deviceinstor_qty" label="设备实时来料仓数" :min-width="flexWidth('deviceinstor_qty',crud.data,'设备实时来料仓数')"/>
<el-table-column prop="deviceoutstor_qty" label="设备实时产品仓数" :min-width="flexWidth('deviceoutstor_qty',crud.data,'设备实时产品仓数')"/>
<el-table-column prop="is_artificial" label="是否人工" >
<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,'设备产品仓上限数')" />
<el-table-column prop="outlowerlimit_qty" label="设备产品仓下限数" :min-width="flexWidth('outlowerlimit_qty',crud.data,'设备产品仓下限数')" />
<el-table-column prop="deviceinitinstor_qty" label="设备初始来料仓数" :min-width="flexWidth('deviceinitinstor_qty',crud.data,'设备初始来料仓数')" />
<el-table-column prop="deviceinstor_qty" label="设备实时来料仓数" :min-width="flexWidth('deviceinstor_qty',crud.data,'设备实时来料仓数')" />
<el-table-column prop="deviceoutstor_qty" label="设备实时产品仓数" :min-width="flexWidth('deviceoutstor_qty',crud.data,'设备实时产品仓数')" />
<el-table-column prop="is_artificial" label="是否人工">
<template slot-scope="scope">
{{scope.row.is_artificial=='1'?'是':'否'}}
{{ scope.row.is_artificial=='1'?'是':'否' }}
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" width="120px" show-overflow-tooltip/>
<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="创建时间" width="120px" show-overflow-tooltip />
<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="修改时间" width="120px" show-overflow-tooltip />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -276,7 +277,7 @@ export default {
{ required: true, message: '设备名称不能为空', trigger: 'blur' }
],
product_area: [
{ required: true, message: '生产区域不能为空', trigger: 'blur' }
{ required: true, message: '生产车间不能为空', trigger: 'blur' }
],
inupperlimit_qty: [
{ required: true, message: '设备来料仓上限数不能为空', trigger: 'blur' }
@@ -321,7 +322,6 @@ export default {
return is_used === '1'
},
changeEnabled(data, val) {
this.$confirm('此操作将 "' + this.dict.label.is_used[val] + '" ' + data.device_code + ', 是否继续？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',

3
mes/qd/src/views/wms/pub/StructDialog.vue
View File

@@ -50,7 +50,7 @@
<el-table-column prop="point_code" label="点位编码" />
<el-table-column prop="point_name" label="点位名称" />
<el-table-column prop="region_name" label="区域名称" />
<el-table-column prop="product_area" label="生产区域" />
<el-table-column prop="product_area" label="生产车间" />
</el-table>
<!--分页组件-->
<pagination />
@@ -116,7 +116,6 @@ export default {
},
sectProp: {
handler(newValue, oldValue) {
this.sect = newValue
}
}

5
mes/qd/src/views/wms/sch/point/index.vue
View File

@@ -10,7 +10,7 @@
label-width="90px"
label-suffix=":"
>
<el-form-item label="生产区域">
<el-form-item label="生产车间">
<el-select
v-model="query.product_area"
clearable
@@ -219,7 +219,7 @@
width="540px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
<el-form-item label="生产区域" prop="product_area">
<el-form-item label="生产车间" prop="product_area">
<el-select
v-model="form.product_area"
placeholder=""
@@ -632,7 +632,6 @@ export default {
})
},
toView(row) {
if (row) {
this.$refs.viewDialog.setParentData(row)
}

8
mes/qd/src/views/wms/sch/region/index.vue
View File

@@ -10,7 +10,7 @@
label-width="90px"
label-suffix=":"
>
<el-form-item label="生产区域">
<el-form-item label="生产车间">
<el-select
v-model="query.product_area"
clearable
@@ -50,7 +50,7 @@
width="550px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="生产区域" prop="product_area">
<el-form-item label="生产车间" prop="product_area">
<el-select
v-model="form.product_area"
placeholder=""
@@ -110,10 +110,10 @@
>
<el-table-column prop="region_code" label="区域编码" :min-width="flexWidth('region_code',crud.data,'区域编码')" />
<el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',crud.data,'区域名称')" />
<el-table-column prop="product_area" label="生产区域" :min-width="flexWidth('product_area',crud.data,'生产区域')" />
<el-table-column prop="product_area" label="生产车间" :min-width="flexWidth('product_area',crud.data,'生产车间')" />
<el-table-column prop="merge" label="是否合并任务" :min-width="flexWidth('merge',crud.data,'是否合并任务')">
<template slot-scope="scope">
{{scope.row.merge ? '是' : '否'}}
{{ scope.row.merge ? '是' : '否' }}
</template>
</el-table-column>
<el-table-column prop="point_type_explain" label="点位类型说明" :min-width="flexWidth('point_type_explain',crud.data,'点位类型说明')" />

26
mes/qd/src/views/wms/sch/task/index.vue
View File

@@ -10,7 +10,7 @@
label-width="80px"
label-suffix=":"
>
<el-form-item label="生产区域">
<el-form-item label="生产车间">
<el-select
v-model="query.product_area"
clearable
@@ -56,15 +56,15 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<!-- <el-form-item label="任务类型">-->
<!-- <treeselect-->
<!-- v-model="query.task_type"-->
<!-- :load-options="loadChildNodes"-->
<!-- :options="classes1"-->
<!-- style="width: 180px"-->
<!-- placeholder="请选择"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="任务类型">-->
<!-- <treeselect-->
<!-- v-model="query.task_type"-->
<!-- :load-options="loadChildNodes"-->
<!-- :options="classes1"-->
<!-- style="width: 180px"-->
<!-- placeholder="请选择"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="任务类型">
<el-select
v-model="query.task_type"
@@ -158,7 +158,7 @@
</el-table-column>
<el-table-column prop="task_name" label="任务类型" min-width="120" show-overflow-tooltip />
<el-table-column v-if="false" prop="task_status" label="任务状态" />
<el-table-column prop="product_area" label="生产区域" />
<el-table-column prop="product_area" label="生产车间" />
<el-table-column prop="task_status_name" label="任务状态" width="120px" :formatter="formatTaskStatusName" />
<el-table-column prop="vehicle_type" label="载具类型" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
@@ -171,8 +171,8 @@
<el-table-column prop="point2_region_name" label="终点区域" min-width="120" show-overflow-tooltip />
<el-table-column prop="point_code3" label="返回点" min-width="100" show-overflow-tooltip />
<el-table-column prop="point3_region_name" label="返回点区域" min-width="120" show-overflow-tooltip />
<!-- <el-table-column prop="point_code4" label="点位4" min-width="100" show-overflow-tooltip />-->
<!-- <el-table-column prop="point4_region_name" label="点位4区域" min-width="120" show-overflow-tooltip />-->
<!-- <el-table-column prop="point_code4" label="点位4" min-width="100" show-overflow-tooltip />-->
<!-- <el-table-column prop="point4_region_name" label="点位4区域" min-width="120" show-overflow-tooltip />-->
<el-table-column prop="vehicle_code" label="载具编码1" min-width="100" show-overflow-tooltip />
<el-table-column prop="vehicle_code2" label="载具编码2" min-width="100" show-overflow-tooltip />
<el-table-column prop="remark" label="提示" width="120" show-overflow-tooltip />

17
mes/qd/src/views/wms/st/productIn/AddDialog.vue
View File

@@ -27,7 +27,7 @@
<el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
</el-form-item>
<el-form-item label="仓库" prop="product_code">
<label slot="label">生产区域:</label>
<label slot="label">生产车间:</label>
<el-select
v-model="form.product_code"
clearable
@@ -43,17 +43,16 @@
/>
</el-select>
</el-form-item>
<el-form-item label="业务类型" prop="bill_type">
<el-form-item label="业务类型">
<el-select
v-model="form.bill_code"
v-model="form.bill_type"
clearable
placeholder="业务类型"
style="width: 210px"
size="mini"
placeholder="业务类型3"
class="filter-item"
:disabled="crud.status.view > 0"
>
<el-option
v-for="item in dict.bill_type"
v-for="item in dict.ST_INV_IN_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -201,7 +200,7 @@ export default {
name: 'AddDialog',
components: { MaterDtl },
mixins: [crud(), form(defaultForm)],
dicts: ['IO_BILL_STATUS', 'ST_QUALITY_SCODE', 'bill_type', 'product_area'],
dicts: ['IO_BILL_STATUS', 'ST_INV_IN_TYPE', 'ST_QUALITY_SCODE', 'bill_type', 'product_area'],
props: {
dialogShow: {
type: Boolean,
@@ -222,7 +221,7 @@ export default {
billtypelist: [],
rules: {
product_code: [
{ required: true, message: '生产区域不能为空', trigger: 'blur' }
{ required: true, message: '生产车间不能为空', trigger: 'blur' }
],
bill_type: [
{ required: true, message: '业务类型不能为空', trigger: 'blur' }

30
mes/qd/src/views/wms/st/productIn/DivDialog.vue
View File

@@ -14,7 +14,7 @@
<span class="el-dialog__title2">入库分配</span>
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left"/>
<slot name="left" />
<el-button slot="left" type="info" @click="dialogVisible = false">关闭</el-button>
</span>
</div>
@@ -99,7 +99,7 @@
</div>
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left"/>
<slot name="left" />
<el-button
slot="left"
class="filter-item"
@@ -171,12 +171,30 @@
/>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="overstruct_type" label="载具超限" align="center">
<template slot-scope="scope">
<el-select
v-model="form.tableMater[scope.$index].overstruct_type"
clearable
placeholder="请选择"
class="filter-item"
style="width: 100px;"
>
<el-option
v-for="item in dict.MD_OVERSTRUCT_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</template>
</el-table-column>
<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>
</el-card>
<StructDiv ref="child" :stor-id="storId" :dialog-show.sync="structShow" :sect-prop="sectProp" @tableChanged="tableChanged"/>
<StructDiv ref="child" :stor-id="storId" :dialog-show.sync="structShow" :sect-prop="sectProp" @tableChanged="tableChanged" />
</el-dialog>
</template>
@@ -191,7 +209,7 @@ export default {
name: 'DivDialog',
components: { StructDiv },
mixins: [crud()],
dicts: ['IO_BILL_STATUS'],
dicts: ['IO_BILL_STATUS', 'MD_OVERSTRUCT_TYPE'],
props: {
dialogShow: {
type: Boolean,
@@ -356,8 +374,8 @@ export default {
this.crud.notify('请先选择一条分配明细！', CRUD.NOTIFICATION_TYPE.INFO)
return
}
if (this.dis_row.storagevehicle_code === '') {
this.crud.notify('载具号不能为空', CRUD.NOTIFICATION_TYPE.INFO)
if (this.dis_row.overstruct_type === '') {
this.crud.notify('载具超限不能为空', CRUD.NOTIFICATION_TYPE.INFO)
return
}
crudProductIn.confirmvehicle(this.dis_row).then(res => {

3
mes/qd/src/views/wms/st/productIn/ViewDialog.vue
View File

@@ -13,7 +13,7 @@
<label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
<el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
</el-form-item>
<el-form-item label="生产区域">
<el-form-item label="生产车间">
<el-select
v-model="form.product_code"
clearable
@@ -241,7 +241,6 @@ export default {
queryTableDdis() {
if (this.currentdtl !== null) {
crudProductIn.getDisTask({ 'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id }).then(res => {
this.tabledis = res
}).catch(() => {
this.tabledis = []

6
mes/qd/src/views/wms/st/productIn/index.vue
View File

@@ -21,7 +21,7 @@
/>
</el-form-item>
<el-form-item label="生产区域">
<el-form-item label="生产车间">
<el-select
v-model="query.product_code"
clearable
@@ -135,8 +135,8 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip :formatter="stateFormat" prop="bill_status" label="单据状态" />
<el-table-column prop="product_name" label="生产区域" width="130" show-overflow-tooltip />
<el-table-column show-overflow-tooltip prop="bill_type" min-width="120" label="业务类型" :formatter="bill_typeFormat"/>
<el-table-column prop="product_name" label="生产车间" width="130" show-overflow-tooltip />
<el-table-column show-overflow-tooltip prop="bill_type" min-width="120" label="业务类型" :formatter="bill_typeFormat" />
<el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="业务日期" />
<el-table-column label="明细数" align="center" prop="detail_count" />
<el-table-column label="总重量" align="center" prop="total_qty">

23
mes/qd/src/views/wms/st/productOut/AddDialog.vue
View File

@@ -25,12 +25,12 @@
<label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
<el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
</el-form-item>
<el-form-item label="生产区域" prop="product_code">
<label slot="label">生产区域:</label>
<el-form-item label="生产车间" prop="product_code">
<label slot="label">生产车间:</label>
<el-select
v-model="form.product_code"
clearable
placeholder="生产区域"
placeholder="生产车间"
class="filter-item"
style="width: 210px"
:disabled="crud.status.view > 0"
@@ -118,7 +118,7 @@
>
添加物料
</el-button>
<!-- <el-button
<!-- <el-button
slot="left"
class="filter-item"
type="primary"
@@ -141,7 +141,7 @@
>
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="190" align="center">
<!-- <template scope="scope">
<!-- <template scope="scope">
<el-input v-show="!scope.row.edit" v-model="scope.row.material_code" disabled class="input-with-select">
<el-button slot="append" icon="el-icon-search" @click="queryMater(scope.$index, scope.row)" />
</el-input>
@@ -151,7 +151,7 @@
<el-table-column prop="material_name" label="物料名称" align="center" min-width="150px" show-overflow-tooltip />
<el-table-column prop="material_spec" label="物料规格" align="center" min-width="150px" show-overflow-tooltip />
<el-table-column show-overflow-tooltip prop="pcsn" label="订单号" width="150px" align="center">
<!-- <template scope="scope">
<!-- <template scope="scope">
<el-input v-show="!scope.row.edit" v-model="scope.row.pcsn" size="mini" />
<span v-show="scope.row.edit">{{ scope.row.pcsn }}</span>
</template>-->
@@ -159,11 +159,11 @@
<el-table-column prop="plan_qty" label="出库重量" width="150" align="center">
<template scope="scope">
<el-input-number v-model="scope.row.plan_qty" :precision="3" :controls="false" :min="1" style="width: 120px" />
<!-- <span v-show="scope.row.edit">{{ scope.row.plan_qty }}</span>-->
<!-- <span v-show="scope.row.edit">{{ scope.row.plan_qty }}</span>-->
</template>
</el-table-column>
<el-table-column prop="qty_unit_name" label="单位" align="center" />
<!-- <el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center">
<!-- <el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center">
<template scope="scope">
<el-input v-model="scope.row.remark" size="mini" />
<span>{{ scope.row.remark }}</span>
@@ -229,7 +229,7 @@ export default {
storId: null,
rules: {
product_code: [
{ required: true, message: '生产区域不能为空', trigger: 'blur' }
{ required: true, message: '生产车间不能为空', trigger: 'blur' }
],
bill_type: [
{ required: true, message: '业务类型不能为空', trigger: 'blur' }
@@ -266,7 +266,7 @@ export default {
productOut.getOutBillDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
this.form.tableData = res
// 将明细变成不可编辑
/* for (let i = 0; i < this.form.tableData.length; i++) {
/* for (let i = 0; i < this.form.tableData.length; i++) {
const row = this.form.tableData[i]
row.edit = false
this.form.tableData.splice(i, 1, row)
@@ -309,7 +309,7 @@ export default {
return
}
if (this.form.product_code === '') {
this.crud.notify('请选择生产区域！', CRUD.NOTIFICATION_TYPE.INFO)
this.crud.notify('请选择生产车间！', CRUD.NOTIFICATION_TYPE.INFO)
return
}
this.storId = this.form.product_code
@@ -317,7 +317,6 @@ export default {
},
tableChanged5(rows) {
rows.forEach((item) => {
if (this.form.tableData.length !== 0) {
this.flagnow = false
for (let i = 0; i < this.form.tableData.length; i++) {

8
mes/qd/src/views/wms/st/productOut/DivDialog.vue
View File

@@ -23,7 +23,7 @@
<span class="role-span">出库明细</span>
<div class="crud-opts-form">
<el-form ref="form" :inline="true" :model="form" size="mini">
<el-form-item label="生产区域" prop="gender2">
<el-form-item label="生产车间" prop="gender2">
<el-cascader
placeholder="请选择"
:options="sects"
@@ -81,7 +81,7 @@
>
自动取消
</el-button>
<!-- <el-button
<!-- <el-button
slot="left"
class="filter-item"
type="primary"
@@ -150,7 +150,7 @@
disabled
/>
</el-form-item>
<!-- <el-form-item label="出库点" prop="point_code">
<!-- <el-form-item label="出库点" prop="point_code">
<el-select
v-model="form2.point_code"
clearable
@@ -171,7 +171,7 @@
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<!-- <el-button
<!-- <el-button
slot="left"
class="filter-item"
:loading="loadingSetPoint"

2
mes/qd/src/views/wms/st/productOut/ViewDialog.vue
View File

@@ -13,7 +13,7 @@
<label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
<el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
</el-form-item>
<el-form-item label="生产区域">
<el-form-item label="生产车间">
<el-select
v-model="form.product_code"
clearable

5
mes/qd/src/views/wms/st/productOut/index.vue
View File

@@ -20,7 +20,7 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="生产区域">
<el-form-item label="生产车间">
<el-select
v-model="query.product_code"
clearable
@@ -144,7 +144,7 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip :formatter="stateFormat" width="80" prop="bill_status" label="单据状态" />
<el-table-column show-overflow-tooltip prop="product_code" label="生产区域" width="80" />
<el-table-column show-overflow-tooltip prop="product_code" label="生产车间" width="80" />
<el-table-column show-overflow-tooltip prop="bill_type" :formatter="bill_typeFormat" label="业务类型" />
<el-table-column show-overflow-tooltip width="100" prop="biz_date" label="业务日期" />
<el-table-column show-overflow-tooltip label="明细数" align="center" prop="detail_count" width="60" />
@@ -293,7 +293,6 @@ export default {
},
divOpen() {
productOut.getOutBillDtl({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {
this.openParam = res
this.storId = this.currentRow.product_code
this.divShow = true

4
mes/qd/src/views/wms/st/semiProductIn/AddDialog.vue
View File

@@ -27,7 +27,7 @@
<el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
</el-form-item>
<el-form-item label="仓库" prop="product_code">
<label slot="label">生产区域:</label>
<label slot="label">生产车间:</label>
<el-select
v-model="form.product_code"
clearable
@@ -222,7 +222,7 @@ export default {
billtypelist: [],
rules: {
product_code: [
{ required: true, message: '生产区域不能为空', trigger: 'blur' }
{ required: true, message: '生产车间不能为空', trigger: 'blur' }
],
bill_type: [
{ required: true, message: '业务类型不能为空', trigger: 'blur' }

2
mes/qd/src/views/wms/st/semiProductIn/ViewDialog.vue
View File

@@ -13,7 +13,7 @@
<label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
<el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
</el-form-item>
<el-form-item label="生产区域">
<el-form-item label="生产车间">
<el-select
v-model="form.product_code"
clearable

8
mes/qd/src/views/wms/st/semiProductIn/index.vue
View File

@@ -21,7 +21,7 @@
/>
</el-form-item>
<el-form-item label="生产区域">
<el-form-item label="生产车间">
<el-select
v-model="query.product_code"
clearable
@@ -135,8 +135,8 @@
</template>fileinput_name
</el-table-column>
<el-table-column show-overflow-tooltip :formatter="stateFormat" prop="bill_status" label="单据状态" />
<el-table-column prop="product_name" label="生产区域" width="130" show-overflow-tooltip />
<el-table-column show-overflow-tooltip prop="bill_type" min-width="120" label="业务类型" :formatter="bill_typeFormat"/>
<el-table-column prop="product_name" label="生产车间" width="130" show-overflow-tooltip />
<el-table-column show-overflow-tooltip prop="bill_type" min-width="120" label="业务类型" :formatter="bill_typeFormat" />
<el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="业务日期" />
<el-table-column label="明细数" align="center" prop="detail_count" />
<el-table-column label="总重量" align="center" prop="total_qty">
@@ -206,7 +206,7 @@ export default {
return {
height: document.documentElement.clientHeight - 180 + 'px;',
permission: {},
product_code:'A1',
product_code: 'A1',
dis_flag: true,
confirm_flag: true,
disShow: false,

22
mes/qd/src/views/wms/st/semiProductOut/AddDialog.vue
View File

@@ -25,12 +25,12 @@
<label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
<el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
</el-form-item>
<el-form-item label="生产区域" prop="product_code">
<label slot="label">生产区域:</label>
<el-form-item label="生产车间" prop="product_code">
<label slot="label">生产车间:</label>
<el-select
v-model="form.product_code"
clearable
placeholder="生产区域"
placeholder="生产车间"
class="filter-item"
style="width: 210px"
:disabled="crud.status.view > 0"
@@ -118,7 +118,7 @@
>
添加物料
</el-button>
<!-- <el-button
<!-- <el-button
slot="left"
class="filter-item"
type="primary"
@@ -141,7 +141,7 @@
>
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="190" align="center">
<!-- <template scope="scope">
<!-- <template scope="scope">
<el-input v-show="!scope.row.edit" v-model="scope.row.material_code" disabled class="input-with-select">
<el-button slot="append" icon="el-icon-search" @click="queryMater(scope.$index, scope.row)" />
</el-input>
@@ -151,7 +151,7 @@
<el-table-column prop="material_name" label="物料名称" align="center" min-width="150px" show-overflow-tooltip />
<el-table-column prop="material_spec" label="物料规格" align="center" min-width="150px" show-overflow-tooltip />
<el-table-column show-overflow-tooltip prop="pcsn" label="订单号" width="150px" align="center">
<!-- <template scope="scope">
<!-- <template scope="scope">
<el-input v-show="!scope.row.edit" v-model="scope.row.pcsn" size="mini" />
<span v-show="scope.row.edit">{{ scope.row.pcsn }}</span>
</template>-->
@@ -159,11 +159,11 @@
<el-table-column prop="plan_qty" label="出库重量" width="150" align="center">
<template scope="scope">
<el-input-number v-model="scope.row.plan_qty" :precision="3" :controls="false" :min="1" style="width: 120px" />
<!-- <span v-show="scope.row.edit">{{ scope.row.plan_qty }}</span>-->
<!-- <span v-show="scope.row.edit">{{ scope.row.plan_qty }}</span>-->
</template>
</el-table-column>
<el-table-column prop="qty_unit_name" label="单位" align="center" />
<!-- <el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center">
<!-- <el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center">
<template scope="scope">
<el-input v-model="scope.row.remark" size="mini" />
<span>{{ scope.row.remark }}</span>
@@ -227,7 +227,7 @@ export default {
storId: null,
rules: {
product_code: [
{ required: true, message: '生产区域不能为空', trigger: 'blur' }
{ required: true, message: '生产车间不能为空', trigger: 'blur' }
],
bill_type: [
{ required: true, message: '业务类型不能为空', trigger: 'blur' }
@@ -264,7 +264,7 @@ export default {
semiSemiProductOut.getOutBillDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
this.form.tableData = res
// 将明细变成不可编辑
/* for (let i = 0; i < this.form.tableData.length; i++) {
/* for (let i = 0; i < this.form.tableData.length; i++) {
const row = this.form.tableData[i]
row.edit = false
this.form.tableData.splice(i, 1, row)
@@ -307,7 +307,7 @@ export default {
return
}
if (this.form.product_code === '') {
this.crud.notify('请选择生产区域！', CRUD.NOTIFICATION_TYPE.INFO)
this.crud.notify('请选择生产车间！', CRUD.NOTIFICATION_TYPE.INFO)
return
}
this.storId = this.form.product_code

8
mes/qd/src/views/wms/st/semiProductOut/DivDialog.vue
View File

@@ -23,7 +23,7 @@
<span class="role-span">出库明细</span>
<div class="crud-opts-form">
<el-form ref="form" :inline="true" :model="form" size="mini">
<el-form-item label="生产区域" prop="gender2">
<el-form-item label="生产车间" prop="gender2">
<el-cascader
placeholder="请选择"
:options="sects"
@@ -81,7 +81,7 @@
>
自动取消
</el-button>
<!-- <el-button
<!-- <el-button
slot="left"
class="filter-item"
type="primary"
@@ -150,7 +150,7 @@
disabled
/>
</el-form-item>
<!-- <el-form-item label="出库点" prop="point_code">
<!-- <el-form-item label="出库点" prop="point_code">
<el-select
v-model="form2.point_code"
clearable
@@ -171,7 +171,7 @@
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<!-- <el-button
<!-- <el-button
slot="left"
class="filter-item"
:loading="loadingSetPoint"

2
mes/qd/src/views/wms/st/semiProductOut/ViewDialog.vue
View File

@@ -13,7 +13,7 @@
<label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
<el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
</el-form-item>
<el-form-item label="生产区域">
<el-form-item label="生产车间">
<el-select
v-model="form.product_code"
clearable

4
mes/qd/src/views/wms/st/semiProductOut/index.vue
View File

@@ -20,7 +20,7 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="生产区域">
<el-form-item label="生产车间">
<el-select
v-model="query.product_code"
clearable
@@ -144,7 +144,7 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip :formatter="stateFormat" width="80" prop="bill_status" label="单据状态" />
<el-table-column show-overflow-tooltip prop="product_code" label="生产区域" width="80" />
<el-table-column show-overflow-tooltip prop="product_code" label="生产车间" width="80" />
<el-table-column show-overflow-tooltip prop="bill_type" :formatter="bill_typeFormat" label="业务类型" />
<el-table-column show-overflow-tooltip width="100" prop="biz_date" label="业务日期" />
<el-table-column show-overflow-tooltip label="明细数" align="center" prop="detail_count" width="60" />