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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	mes/qd/src/views/wms/st/productOut/ViewDialog.vue
#	mes/qd/src/views/wms/st/semiProductIn/AddDialog.vue
#	mes/qd/src/views/wms/st/semiProductOut/AddDialog.vue
This commit is contained in:
baoge
2023-04-27 10:16:16 +08:00
parent b762ec097a 34bca47651
commit a351d652a0
109 changed files with 2270 additions and 1109 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="电气报工数量" />

10
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="生产人员" />
@@ -754,7 +754,7 @@ export default {
var orders = []
console.log(rows)
rows.forEach((item) => {
orders.push(item.workprocedure_id)
orders.push(item.workorder_id)
})
crudProduceshiftorder.submits(orders).then(res => {
this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS)

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
}
}

142
mes/qd/src/views/wms/ql/inspection/index.vue Normal file
View File

@@ -0,0 +1,142 @@
<template>
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<label class="el-form-item-label">模糊搜索</label>
<el-input v-model="query.blurry" clearable placeholder="项点名称" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
<rrOperation :crud="crud" />
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， 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="475px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px">
<el-form-item label="项点名称" prop="name">
<el-input v-model="form.name" style="width: 250px;" />
</el-form-item>
<el-form-item label="标准值">
<el-input v-model="form.standard" style="width: 250px;" />
</el-form-item>
<el-form-item label="项点类型" prop="inspectionType">
<el-select
v-model="form.inspectionType"
placeholder=""
style="width: 250px"
>
<el-option
v-for="item in dict.INSPECTION_POINT_TYPE"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" :rows="3" type="textarea" style="width: 250px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
</el-dialog>
<!--表格渲染-->
<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="inspectionCode" label="项点编码" />
<el-table-column prop="name" label="项点名称" />
<el-table-column prop="standard" label="标准值">
<template slot-scope="scope">
{{ is_or_no(scope.row.standard, scope.row.inspectionType) }}
</template>
</el-table-column>
<el-table-column prop="inspectionType" label="项点类型">
<template slot-scope="scope">
{{ dict.label.INSPECTION_POINT_TYPE[scope.row.inspectionType] }}
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
</div>
</div>
</template>
<script>
import crudInspection from '@/views/wms/ql/inspection/inspectionpoint'
import CRUD, { presenter, header, form, crud } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
const defaultForm = { inspectionType: '1', inspectionId: null, inspectionCode: null, name: null, standard: null, remark: null }
export default {
name: 'InspectionPoint',
dicts: ['INSPECTION_POINT_TYPE'],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({ title: '质检项点', url: 'api/mdQlInspectionpoint', idField: 'inspectionId', sort: 'id,desc',
optShow: {
add: true,
edit: true,
del: true,
reset: true,
download: false
},
crudMethod: { ...crudInspection }})
},
data() {
return {
permission: {
},
rules: {
inspectionCode: [
{ required: true, message: '项点编码不能为空', trigger: 'blur' }
],
name: [
{ required: true, message: '项点名称不能为空', trigger: 'blur' }
],
inspectionType: [
{ required: true, message: '项点类型不能为空', trigger: 'blur' }
]
},
queryTypeOptions: [
{ key: 'inspection_code', display_name: '项点编码' }
]
}
},
methods: {
is_or_no(val, type) {
if (type === '01' && val === '1') {
return '是'
} else if (type === '01' && val === '0') {
return '否'
} else {
return val
}
},
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
}
}
}
</script>
<style scoped>
</style>

27
mes/qd/src/views/wms/ql/inspection/inspectionpoint.js Normal file
View File

@@ -0,0 +1,27 @@
import request from '@/utils/request'
export function add(data) {
return request({
url: '/api/mdQlInspectionpoint/create',
method: 'post',
data
})
}
export function del(ids) {
return request({
url: '/api/mdQlInspectionpoint/delete',
method: 'post',
data: ids
})
}
export function edit(data) {
return request({
url: '/api/mdQlInspectionpoint/update',
method: 'post',
data
})
}
export default { add, edit, del }

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"

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

@@ -1,28 +1,69 @@
<template>
<el-dialog append-to-body title="出库单详情" :visible.sync="dialogVisible" destroy-on-close fullscreen @close="close"
@open="open">
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form"
size="mini" label-width="85px" label-suffix=":">
<el-dialog
append-to-body
title="出库单详情"
:visible.sync="dialogVisible"
destroy-on-close
fullscreen
@close="close"
@open="open"
>
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="85px" label-suffix=":">
<el-form-item label="单据号" prop="bill_code">
<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-select v-model="form.product_code" clearable size="mini" placeholder="全部" :disabled="true" class="filter-item"
@change="crud.toQuery">
<el-option v-for="item in dict.product_area" :key="item.value" :label="item.label" :value="item.value" />
<el-form-item label="生产车间">
<el-select
v-model="form.product_code"
clearable
size="mini"
placeholder="全部"
:disabled="true"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.product_area"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="业务类型" prop="bill_type">
<el-select v-model="form.bill_type" clearable filterable size="mini" placeholder="业务类型" class="filter-item"
disabled>
<el-option v-for="item in dict.bill_type" :key="item.value" :label="item.label" :value="item.value" />
<el-select
v-model="form.bill_type"
clearable
filterable
size="mini"
placeholder="业务类型"
class="filter-item"
disabled
>
<el-option
v-for="item in dict.bill_type"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="单据状态" prop="bill_status">
<el-select v-model="form.bill_status" clearable style="width: 210px" placeholder="单据状态" class="filter-item"
disabled>
<el-option v-for="item in dict.io_bill_status" :key="item.id" :label="item.label" :value="item.value" />
<el-select
v-model="form.bill_status"
clearable
style="width: 210px"
placeholder="单据状态"
class="filter-item"
disabled
>
<el-option
v-for="item in dict.io_bill_status"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="明细数" prop="detail_count">
@@ -31,12 +72,17 @@
</el-form-item>
<el-form-item label="总重量" prop="total_qty">
<label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
<el-input-number v-model="form.total_qty" :controls="false" :precision="3" :min="0" disabled
style="width: 210px" />
<el-input-number
v-model="form.total_qty"
:controls="false"
:precision="3"
:min="0"
disabled
style="width: 210px"
/>
</el-form-item>
<el-form-item label="业务日期" prop="biz_date">
<el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px"
value-format="yyyy-MM-dd" :disabled="true" />
<el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="true" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
@@ -46,11 +92,19 @@
<div class="crud-opts2">
<span class="role-span2">出库明细</span>
</div>
<el-card class="box-card" shadow="never" :body-style="{ padding: '0' }">
<el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
<!--表格渲染-->
<el-table ref="table" :data="tableDtl" style="width: 100%;" max-height="300" size="mini" border
:highlight-current-row="true" :header-cell-style="{ background: '#f5f7fa', color: '#606266' }"
@current-change="handleDtlCurrentChange">
<el-table
ref="table"
:data="tableDtl"
style="width: 100%;"
max-height="300"
size="mini"
border
:highlight-current-row="true"
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
@current-change="handleDtlCurrentChange"
>
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column :formatter="bill_statusFormat" prop="bill_status" label="状态" />
<el-table-column min-width="140" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
@@ -67,11 +121,19 @@
<div class="crud-opts2">
<span class="role-span">作业明细</span>
</div>
<el-card class="box-card" shadow="never" :body-style="{ padding: '0' }">
<el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
<!--表格渲染-->
<el-table ref="table2" :data="tabledis" style="width: 100%;" max-height="300" size="mini" border
:highlight-current-row="true" :header-cell-style="{ background: '#f5f7fa', color: '#606266' }"
@current-change="handleDisCurrentChange">
<el-table
ref="table2"
:data="tabledis"
style="width: 100%;"
max-height="300"
size="mini"
border
:highlight-current-row="true"
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
@current-change="handleDisCurrentChange"
>
<el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
@@ -93,7 +155,7 @@ import crudProductIn from '@/views/wms/st/productIn/productin'
export default {
name: 'ViewDialog',
components: {},
components: { },
mixins: [crud()],
dicts: ['io_bill_status', 'work_status', 'task_status', 'SCH_TASK_TYPE_DTL', 'bill_type', 'product_area'],
props: {
@@ -105,7 +167,7 @@ export default {
type: Object
}
},
data () {
data() {
return {
dialogVisible: false,
tableDtl: [],
@@ -118,26 +180,26 @@ export default {
},
watch: {
dialogShow: {
handler (newValue) {
handler(newValue) {
this.dialogVisible = newValue
}
},
rowmst: {
handler (newValue) {
handler(newValue) {
this.form = newValue
}
}
},
created () {
created() {
crudProductIn.queryStor().then(res => {
this.storlist = res
})
},
methods: {
open () {
open() {
this.queryTableDtl()
},
close () {
close() {
this.$emit('update:dialogShow', false)
this.currentDis = {}
this.currentdtl = null
@@ -145,19 +207,19 @@ export default {
this.tabledis = []
this.$emit('AddChanged')
},
bill_statusFormat (row) {
bill_statusFormat(row) {
return this.dict.label.io_bill_status[row.bill_status]
},
taskdtl_typeFormat (row) {
taskdtl_typeFormat(row) {
return this.dict.label.SCH_TASK_TYPE_DTL[row.taskdtl_type]
},
task_statusFormat (row) {
task_statusFormat(row) {
return this.dict.label.task_status[row.task_status]
},
work_statusFormat (row) {
work_statusFormat(row) {
return this.dict.label.work_status[row.work_status]
},
handleDtlCurrentChange (current) {
handleDtlCurrentChange(current) {
if (current !== null) {
this.tabledis = []
this.currentdtl = current
@@ -167,22 +229,22 @@ export default {
this.currentdtl = {}
}
},
invtypeFormat (row, column) {
invtypeFormat(row, column) {
for (const item of this.billtypelist) {
if (item.code === row.source_bill_type) {
return item.name
}
}
},
handleDisCurrentChange (current) {
handleDisCurrentChange(current) {
this.currentDis = current
},
queryTableDtl () {
queryTableDtl() {
productOut.getOutBillDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
this.tableDtl = res
})
},
queryTableDdis () {
queryTableDdis() {
if (this.currentdtl !== null) {
productOut.getOutBillDis({ 'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id }).then(res => {
this.tabledis = res
@@ -205,15 +267,15 @@ export default {
.crud-opts2 .el-dialog__title2 {
line-height: 24px;
font-size: 20px;
color: #303133;
font-size:20px;
color:#303133;
}
.crud-opts2 .role-span2 {
padding: 0px 0px 20px 0px;
}
.crud-opts2 {
padding: 10px 0px 0px 50px;
}
</style>

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

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

@@ -15,47 +15,19 @@
</el-col>
<el-col :span="4">
<span>
<el-button
icon="el-icon-check"
size="mini"
:loading="crud.cu === 2"
type="primary"
@click="crud.submitCU"
>保存</el-button
>
<el-button
icon="el-icon-close"
size="mini"
type="info"
@click="crud.cancelCU"
>关闭</el-button
>
<el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="crud.submitCU">保存</el-button>
<el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
</span>
</el-col>
</el-row>
<el-form
ref="form"
style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
:inline="true"
:model="form"
:rules="rules"
size="mini"
label-width="85px"
label-suffix=":"
>
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="85px" label-suffix=":">
<el-form-item label="单据号" prop="bill_code">
<label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
<el-input
v-model="form.bill_code"
disabled
placeholder="系统生成"
clearable
style="width: 210px"
/>
<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
@@ -107,12 +79,7 @@
</el-form-item>
<el-form-item label="明细数" prop="detail_count">
<label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
<el-input
v-model="form.detail_count"
size="mini"
disabled
style="width: 210px"
/>
<el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="总重量" prop="total_qty">
<label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
@@ -126,26 +93,11 @@
/>
</el-form-item>
<el-form-item label="业务日期" prop="biz_date">
<el-date-picker
v-model="form.biz_date"
type="date"
placeholder="选择日期"
style="width: 210px"
value-format="yyyy-MM-dd"
:disabled="crud.status.view > 0"
/>
<el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="crud.status.view > 0" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<label slot="label"
>备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label
>
<el-input
v-model="form.remark"
style="width: 380px;"
rows="2"
type="textarea"
:disabled="crud.status.view > 0"
/>
<label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
<el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
</el-form-item>
</el-form>
@@ -165,6 +117,7 @@
添加物料
</el-button>
</span>
</div>
<!--表格渲染-->
<el-table
@@ -172,25 +125,13 @@
:data="form.tableData"
style="width: 100%;"
border
:header-cell-style="{ background: '#f5f7fa', color: '#606266' }"
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column
show-overflow-tooltip
prop="material_code"
label="物料编码"
/>
<el-table-column
show-overflow-tooltip
prop="material_name"
label="物料名称"
/>
<el-table-column
show-overflow-tooltip
prop="material_spec"
label="物料规格"
/>
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" />
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" />
<el-table-column show-overflow-tooltip prop="material_spec" label="物料规格" />
<el-table-column show-overflow-tooltip prop="pcsn" label="订单号">
<template slot-scope="scope">
<el-input
@@ -215,13 +156,7 @@
/>
</template>
</el-table-column>
<el-table-column
v-if="crud.status.cu > 0"
align="center"
label="操作"
width="170"
fixed="right"
>
<el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="170" fixed="right">
<template scope="scope">
<el-button
type="danger"
@@ -240,32 +175,33 @@
:mater-opt-code="materType"
@setMaterValue="tableChanged"
/>
</el-dialog>
</template>
<script>
import CRUD, { crud, form } from "@crud/crud";
import crudSemiProductIn from "@/api/wms/st/in/semiProductIn";
import MaterDtl from "@/views/wms/pub/MaterDialog";
import CRUD, { crud, form } from '@crud/crud'
import crudSemiProductIn from '@/api/wms/st/in/semiProductIn'
import MaterDtl from '@/views/wms/pub/MaterDialog'
const defaultForm = {
bill_code: "",
product_code: "A1",
bill_status: "10",
total_qty: "0",
detail_count: "0",
bill_type: "",
remark: "",
bill_code: '',
product_code: 'A1',
bill_status: '10',
total_qty: '0',
detail_count: '0',
bill_type: '',
remark: '',
biz_date: new Date(),
create_mode: "",
create_mode: '',
tableData: []
};
}
export default {
name: "AddDialog",
name: 'AddDialog',
components: { MaterDtl },
mixins: [crud(), form(defaultForm)],
dicts: ["IO_BILL_STATUS", "ST_QUALITY_SCODE", "bill_type", "product_area"],
dicts: ['IO_BILL_STATUS', 'ST_QUALITY_SCODE', 'bill_type', 'product_area'],
props: {
dialogShow: {
type: Boolean,
@@ -281,130 +217,121 @@ export default {
materShow: false,
dtlShow: false,
opendtlParam: null,
materType: "03", // 关键成品
materType: '03', // 关键成品
storlist: [],
billtypelist: [],
rules: {
product_code: [
{ required: true, message: "生产区域不能为空", trigger: "blur" }
{ required: true, message: '生产车间不能为空', trigger: 'blur' }
],
bill_type: [
{ required: true, message: "业务类型不能为空", trigger: "blur" }
{ required: true, message: '业务类型不能为空', trigger: 'blur' }
],
biz_date: [
{ required: true, message: "业务日期不能为空", trigger: "blur" }
{ required: true, message: '业务日期不能为空', trigger: 'blur' }
]
}
};
}
},
watch: {
dialogShow: {
handler(newValue, oldValue) {
this.dialogVisible = newValue;
this.dialogVisible = newValue
}
}
},
methods: {
open() {
crudSemiProductIn.queryStor().then(res => {
this.storlist = res;
});
this.storlist = res
})
},
close() {
this.$emit("AddChanged");
this.$emit('AddChanged')
},
[CRUD.HOOK.afterToEdit]() {
// 获取入库单明细
crudSemiProductIn
.getIODtl({ bill_code: this.form.bill_code })
.then(res => {
this.form.tableData = res;
// 将明细变成不可编辑
for (let i = 0; i < this.form.tableData.length; i++) {
const row = this.form.tableData[i];
this.form.tableData.splice(i, 1, row);
}
});
crudSemiProductIn.getIODtl({ 'bill_code': this.form.bill_code }).then(res => {
this.form.tableData = res
// 将明细变成不可编辑
for (let i = 0; i < this.form.tableData.length; i++) {
const row = this.form.tableData[i]
this.form.tableData.splice(i, 1, row)
}
})
},
[CRUD.HOOK.afterToView]() {
crudSemiProductIn
.getIODtl({ bill_code: this.form.bill_code })
.then(res => {
this.form.tableData = res;
// 将明细变成不可编辑
for (let i = 0; i < this.form.tableData.length; i++) {
const row = this.form.tableData[i];
this.form.tableData.splice(i, 1, row);
}
});
crudSemiProductIn.getIODtl({ 'bill_code': this.form.bill_code }).then(res => {
this.form.tableData = res
// 将明细变成不可编辑
for (let i = 0; i < this.form.tableData.length; i++) {
const row = this.form.tableData[i]
this.form.tableData.splice(i, 1, row)
}
})
},
[CRUD.HOOK.beforeSubmit]() {
// 提交前校验
if (this.form.tableData.length === 0) {
this.crud.notify("请至少选择一条明细", CRUD.NOTIFICATION_TYPE.INFO);
return false;
this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
for (let i = 0; i < this.form.tableData.length; i++) {
const row = this.form.tableData[i];
const row = this.form.tableData[i]
if (!row.pcsn || !row.plan_qty) {
this.crud.notify("订单号、数量不能为空", CRUD.NOTIFICATION_TYPE.INFO);
return false;
this.crud.notify('订单号、数量不能为空', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
}
},
deleteRow(index, rows) {
const material_code = rows[index].material_code;
let len = rows.length;
const material_code = rows[index].material_code
let len = rows.length
while (len--) {
const obj = rows[len];
const obj = rows[len]
if (material_code === obj.material_code) {
const index = rows.indexOf(obj);
if (index > -1) {
// 移除找到的指定元素
this.form.total_qty =
parseFloat(this.form.total_qty) -
parseFloat(rows[index].plan_qty);
rows.splice(index, 1);
this.form.detail_count = this.form.tableData.length;
const index = rows.indexOf(obj)
if (index > -1) { // 移除找到的指定元素
this.form.total_qty = parseFloat(this.form.total_qty) - parseFloat(rows[index].plan_qty)
rows.splice(index, 1)
this.form.detail_count = this.form.tableData.length
}
}
}
},
tableChanged(rows) {
// 对新增的行进行校验不能存在相同物料批次
rows.forEach(item => {
let same_mater = true;
this.form.tableData.forEach(row => {
rows.forEach((item) => {
let same_mater = true
this.form.tableData.forEach((row) => {
if (row.material_code === item.material_code) {
same_mater = false;
same_mater = false
}
});
})
if (same_mater) {
item.quality_scode = "01";
item.ivt_level = "01";
item.is_active = "1";
item.plan_qty = "1";
this.form.total_qty =
parseFloat(this.form.total_qty) + parseFloat(item.plan_qty);
this.form.tableData.splice(-1, 0, item);
item.quality_scode = '01'
item.ivt_level = '01'
item.is_active = '1'
item.plan_qty = '1'
this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
this.form.tableData.splice(-1, 0, item)
}
});
this.form.detail_count = this.form.tableData.length;
})
this.form.detail_count = this.form.tableData.length
},
insertEvent(row) {
this.materShow = true;
this.materShow = true
},
changeQty() {
this.form.total_qty = 0;
this.form.tableData.forEach(item => {
this.form.total_qty =
parseFloat(this.form.total_qty) + parseFloat(item.plan_qty);
});
this.form.total_qty = 0
this.form.tableData.forEach((item) => {
this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
})
}
}
};
}
</script>
<style>

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,

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

@@ -1,6 +1,6 @@
<template>
<el-dialog
title="出库单新增"
title="出库单编辑"
append-to-body
fullscreen
:before-close="crud.cancelCU"
@@ -14,50 +14,23 @@
</el-col>
<el-col :span="4">
<span>
<el-button
icon="el-icon-check"
size="mini"
:loading="crud.cu === 2"
type="primary"
@click="crud.submitCU"
>保存</el-button
>
<el-button
icon="el-icon-close"
size="mini"
type="info"
@click="crud.cancelCU"
>关闭</el-button
>
<el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="crud.submitCU">保存</el-button>
<el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
</span>
</el-col>
</el-row>
<el-form
ref="form"
style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
:inline="true"
:model="form"
:rules="rules"
size="mini"
label-width="85px"
label-suffix=":"
>
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="85px" label-suffix=":">
<el-form-item label="单据号" prop="bill_code">
<label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
<el-input
v-model="form.bill_code"
disabled
placeholder="系统生成"
clearable
style="width: 210px"
/>
<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="生产车间"
class="filter-item"
style="width: 210px"
:disabled="crud.status.view > 0"
@@ -107,12 +80,7 @@
</el-form-item>
<el-form-item label="明细数" prop="detail_count">
<label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
<el-input
v-model="form.detail_count"
size="mini"
disabled
style="width: 210px"
/>
<el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="总重量" prop="total_qty">
<label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
@@ -126,32 +94,18 @@
/>
</el-form-item>
<el-form-item label="业务日期" prop="biz_date">
<el-date-picker
v-model="form.biz_date"
type="date"
placeholder="选择日期"
style="width: 210px"
value-format="yyyy-MM-dd"
:disabled="crud.status.view > 0"
/>
<el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="crud.status.view > 0" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<label slot="label"
>备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label
>
<el-input
v-model="form.remark"
style="width: 380px;"
rows="2"
type="textarea"
:disabled="crud.status.view > 0"
/>
<label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
<el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
</el-form-item>
</el-form>
<div class="crud-opts2">
<span class="role-span">出库明细</span>
<span v-if="crud.status.cu > 0" class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<el-button
@@ -175,6 +129,7 @@
新增一行
</el-button>-->
</span>
</div>
<!--表格渲染-->
<el-table
@@ -182,63 +137,28 @@
:data="form.tableData"
style="width: 100%;"
border
:header-cell-style="{ background: '#f5f7fa', color: '#606266' }"
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<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">
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="190" align="center">
<!-- <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>
<span v-show="scope.row.edit">{{ scope.row.material_code }}</span>
</template>
</template>-->
</el-table-column>
<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"
>
<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">
<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>-->
</el-table-column>
<el-table-column
prop="plan_qty"
label="出库重量"
width="150"
align="center"
>
<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"
/>
<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>-->
</template>
</el-table-column>
@@ -249,61 +169,40 @@
<span>{{ scope.row.remark }}</span>
</template>
</el-table-column>-->
<el-table-column
v-if="crud.status.cu > 0"
align="center"
label="操作"
width="160"
fixed="right"
>
<el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="160" fixed="right">
<template scope="scope">
<el-button
type="danger"
class="filter-item"
size="mini"
icon="el-icon-delete"
@click.native.prevent="deleteRow(scope.$index, form.tableData)"
/>
<el-button type="danger" class="filter-item" size="mini" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.$index, form.tableData)" />
</template>
</el-table-column>
</el-table>
<AddDtl
:dialog-show.sync="dtlShow"
:stor-id="storId"
@tableChanged="tableChanged5"
/>
<MaterDialog
:dialog-show.sync="materShow"
:mater-opt-code.sync="materType"
@setMaterValue="setMaterValue"
/>
<AddDtl :dialog-show.sync="dtlShow" :stor-id="storId" @tableChanged="tableChanged5" />
<MaterDialog :dialog-show.sync="materShow" :mater-opt-code.sync="materType" @setMaterValue="setMaterValue" />
</el-dialog>
</template>
<script>
import CRUD, { crud, form } from "@crud/crud";
import AddDtl from "@/views/wms/st/semiProductOut/AddDtl";
import MaterDialog from "@/views/wms/pub/MaterDialog";
import crudSemiProductIn from "@/api/wms/st/out/semiProductOut";
import CRUD, { crud, form } from '@crud/crud'
import AddDtl from '@/views/wms/st/semiProductOut/AddDtl'
import MaterDialog from '@/views/wms/pub/MaterDialog'
import crudSemiProductIn from '@/api/wms/st/out/semiProductOut'
const defaultForm = {
bill_code: "",
stor_id: "",
stor_code: "",
stor_name: "",
product_code:"A1",
bill_status: "10",
total_qty: "0",
detail_count: "0",
bill_type: "",
remark: "",
bill_code: '',
stor_id: '',
stor_code: '',
stor_name: '',
bill_status: '10',
total_qty: '0',
detail_count: '0',
bill_type: '',
remark: '',
biz_date: new Date(),
out_stor_id: "",
create_mode: "",
out_stor_id: '',
create_mode: '',
tableData: []
};
}
export default {
name: "AddDialog",
name: 'AddDialog',
components: { AddDtl, MaterDialog },
mixins: [crud(), form(defaultForm)],
props: {
@@ -312,182 +211,161 @@ export default {
default: false
}
},
dicts: ["IO_BILL_STATUS", "bill_type", "product_area"],
dicts: ['IO_BILL_STATUS', 'bill_type', 'product_area'],
data() {
return {
dialogVisible: false,
dtlShow: false,
materType: "",
materType: '',
materShow: false,
flagnow: false,
nowrow: {},
nowindex: "",
nowindex: '',
storlist: [],
inStorList: [],
invtypelist: [],
storId: null,
rules: {
product_code: [
{ required: true, message: "生产区域不能为空", trigger: "blur" }
{ required: true, message: '生产车间不能为空', trigger: 'blur' }
],
bill_type: [
{ required: true, message: "业务类型不能为空", trigger: "blur" }
{ required: true, message: '业务类型不能为空', trigger: 'blur' }
],
biz_date: [
{ required: true, message: "业务日期不能为空", trigger: "blur" }
{ required: true, message: '业务日期不能为空', trigger: 'blur' }
]
}
};
}
},
watch: {
dialogShow: {
handler(newValue) {
this.dialogVisible = newValue;
this.dialogVisible = newValue
}
}
},
methods: {
open() {
crudSemiProductIn.queryStor().then(res => {
this.storlist = res;
});
this.storlist = res
})
},
close() {
this.$emit("AddChanged");
this.$emit('AddChanged')
},
[CRUD.HOOK.beforeSubmit]() {
if (this.form.tableData.length === 0) {
this.crud.notify("请至少选择一条明细", CRUD.NOTIFICATION_TYPE.INFO);
return false;
this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
},
[CRUD.HOOK.afterToEdit]() {
semiSemiProductOut
.getOutBillDtl({ iostorinv_id: this.form.iostorinv_id })
.then(res => {
this.form.tableData = res;
// 将明细变成不可编辑
/* for (let i = 0; i < this.form.tableData.length; i++) {
semiSemiProductOut.getOutBillDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
this.form.tableData = res
// 将明细变成不可编辑
/* 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)
}*/
});
})
},
[CRUD.HOOK.afterToView]() {
semiSemiProductOut
.getOutBillDtl({ iostorinv_id: this.form.iostorinv_id })
.then(res => {
this.form.tableData = res;
// 将明细变成不可编辑
for (let i = 0; i < this.form.tableData.length; i++) {
const row = this.form.tableData[i];
row.edit = true;
this.form.tableData.splice(i, 1, row);
}
});
semiSemiProductOut.getOutBillDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
this.form.tableData = res
// 将明细变成不可编辑
for (let i = 0; i < this.form.tableData.length; i++) {
const row = this.form.tableData[i]
row.edit = true
this.form.tableData.splice(i, 1, row)
}
})
},
invtypeFormat(row, column) {
return this.dict.label.bill_type[row.source_bill_type];
return this.dict.label.bill_type[row.source_bill_type]
},
storChange(row) {
this.storlist.forEach(item => {
this.storlist.forEach((item) => {
if (item.product_code === row) {
this.form.product_code = item.product_code;
this.form.product_code = item.product_code
}
});
})
},
async queryMater(index, row) {
if (this.form.bill_type === "") {
this.crud.notify("请选择业务类型！", CRUD.NOTIFICATION_TYPE.INFO);
return;
if (this.form.bill_type === '') {
this.crud.notify('请选择业务类型！', CRUD.NOTIFICATION_TYPE.INFO)
return
}
this.materShow = true;
this.nowindex = index;
this.nowrow = row;
this.materShow = true
this.nowindex = index
this.nowrow = row
},
queryDtl(index, row) {
if (this.form.bill_type === "") {
this.crud.notify("请选择业务类型！", CRUD.NOTIFICATION_TYPE.INFO);
return;
if (this.form.bill_type === '') {
this.crud.notify('请选择业务类型！', CRUD.NOTIFICATION_TYPE.INFO)
return
}
if (this.form.product_code === "") {
this.crud.notify("请选择生产区域！", CRUD.NOTIFICATION_TYPE.INFO);
return;
if (this.form.product_code === '') {
this.crud.notify('请选择生产车间！', CRUD.NOTIFICATION_TYPE.INFO)
return
}
this.storId = this.form.product_code;
this.dtlShow = true;
this.storId = this.form.product_code
this.dtlShow = true
},
tableChanged5(rows) {
rows.forEach(item => {
debugger;
rows.forEach((item) => {
debugger
if (this.form.tableData.length !== 0) {
this.flagnow = false;
this.flagnow = false
for (let i = 0; i < this.form.tableData.length; i++) {
if (
this.form.tableData[i].material_id === item.material_id &&
this.form.tableData[i].pcsn === item.pcsn
) {
this.flagnow = true;
if (this.form.tableData[i].material_id === item.material_id && this.form.tableData[i].pcsn === item.pcsn) {
this.flagnow = true
}
}
if (!this.flagnow) {
item.edit = true;
this.form.tableData.splice(-1, 0, item);
this.form.total_qty =
parseFloat(this.form.total_qty) + parseFloat(item.plan_qty);
item.edit = true
this.form.tableData.splice(-1, 0, item)
this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
}
} else {
item.edit = true;
this.form.tableData.splice(-1, 0, item);
this.form.total_qty =
parseFloat(this.form.total_qty) + parseFloat(item.plan_qty);
item.edit = true
this.form.tableData.splice(-1, 0, item)
this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
}
});
this.form.detail_count = this.form.tableData.length;
})
this.form.detail_count = this.form.tableData.length
},
setMaterValue(row) {
for (let i = 0; i < this.form.tableData.length; i++) {
if (this.form.tableData[i].material_id === row.material_id) {
this.crud.notify("不允许添加相同物料！");
return false;
this.crud.notify('不允许添加相同物料！')
return false
}
}
this.nowrow.material_id = row.material_id;
this.nowrow.material_code = row.material_code;
this.nowrow.material_name = row.material_name;
this.nowrow.qty_unit_id = row.base_unit_id;
this.nowrow.qty_unit_name = row.unit_name;
this.nowrow.plan_qty = "1";
this.nowrow.edit = false;
this.form.tableData.splice(this.nowindex, 1, this.nowrow); // 通过splice 替换数据 触发视图更新
this.nowrow.material_id = row.material_id
this.nowrow.material_code = row.material_code
this.nowrow.material_name = row.material_name
this.nowrow.qty_unit_id = row.base_unit_id
this.nowrow.qty_unit_name = row.unit_name
this.nowrow.plan_qty = '1'
this.nowrow.edit = false
this.form.tableData.splice(this.nowindex, 1, this.nowrow) // 通过splice 替换数据 触发视图更新
},
async insertdtl() {
if (this.form.bill_type === "") {
this.crud.notify("请选择业务类型！", CRUD.NOTIFICATION_TYPE.INFO);
return;
if (this.form.bill_type === '') {
this.crud.notify('请选择业务类型！', CRUD.NOTIFICATION_TYPE.INFO)
return
}
this.form.tableData.push({
material_id: "",
material_code: "",
material_name: "",
pcsn: "",
quality_scode: "00",
plan_qty: "1",
qty_unit_name: "",
qty_unit_id: "",
remark: "",
edit: false
});
this.form.detail_count = this.form.tableData.length;
this.form.tableData.push({ material_id: '', material_code: '', material_name: '', pcsn: '', quality_scode: '00', plan_qty: '1', qty_unit_name: '', qty_unit_id: '', remark: '', edit: false })
this.form.detail_count = this.form.tableData.length
},
deleteRow(index, rows) {
this.form.total_qty =
parseFloat(this.form.total_qty) - parseFloat(rows[index].plan_qty);
rows.splice(index, 1);
this.form.total_qty = parseFloat(this.form.total_qty) - parseFloat(rows[index].plan_qty)
rows.splice(index, 1)
}
}
};
}
</script>
<style>
@@ -501,7 +379,7 @@ export default {
margin-left: auto;
padding: 4px 4px;
}
.input-with-select {
.input-with-select {
background-color: #fff;
}
</style>

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" />