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

rev:界面功能优化

Browse Source
This commit is contained in:
zhangzq
2024-09-09 08:53:03 +08:00
parent 6a05279611
commit bee9748294
15 changed files with 280 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

224
wms_pro/qd/src/views/wms/stor_manage/warehouse/pick/TaskDialog.vue
View File

@@ -9,45 +9,52 @@
@close="close"
>
<el-row :gutter="20">
<el-row :gutter="20">
<el-col :span="20" style="border: 1px solid white">
<span />
</el-col>
<el-col :span="4">
<span>
<el-button icon="el-icon-check" size="mini" type="primary" @click="savePickTask">保存</el-button>
<el-button icon="el-icon-check" size="mini" type="primary" @click="savePickTask">保存</el-button>
<el-button icon="el-icon-close" size="mini" type="info" @click="closeDialog">关闭</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" size="mini" label-width="100px" label-suffix=":">
<el-form
ref="form"
style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
:inline="true"
:model="form"
size="mini"
label-width="100px"
label-suffix=":"
>
<el-form-item label="单据编号" prop="code">
<el-input v-model="form.code" disabled placeholder="系统生成" clearable style="width: 210px"/>
<el-input v-model="form.code" disabled placeholder="系统生成" clearable style="width: 210px" />
</el-form-item>
<el-form-item label="单据类型" prop="form_type">
<el-input v-model="form.form_type" disabled clearable style="width: 210px"/>
<el-input v-model="form.form_type" disabled clearable style="width: 210px" />
</el-form-item>
<el-form-item label="业务单据类型" prop="source_form_type">
<el-input v-model="form.biz_code" disabled clearable style="width: 210px"/>
<el-input v-model="form.biz_code" disabled clearable style="width: 210px" />
</el-form-item>
<el-form-item label="业务单据id" prop="source_form_id">
<el-input v-model="form.biz_code" disabled clearable style="width: 210px"/>
<el-input v-model="form.biz_code" disabled clearable style="width: 210px" />
</el-form-item>
<el-form-item label="业务单据时间" prop="source_form_date">
<!-- <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px"-->
<!-- value-format="yyyy-MM-dd" :disabled="true"/>-->
<el-input v-model="form.biz_date" disabled clearable style="width: 210px"/>
<el-input v-model="form.biz_date" disabled clearable style="width: 210px" />
</el-form-item>
<el-form-item label="批次" prop="pcsn">
<el-input v-model="form.pcsn" disabled clearable style="width: 210px"/>
<el-input v-model="form.pcsn" disabled clearable style="width: 210px" />
</el-form-item>
<el-form-item label="物料数量" prop="qty">
<el-input v-model="form.qty" disabled clearable style="width: 210px"/>
<el-input v-model="form.qty" disabled clearable style="width: 210px" />
</el-form-item>
<el-form-item label="载具编号" prop="vehicle_code">
<el-input v-model="form.vehicle_code" disabled clearable style="width: 210px"/>
<el-input v-model="form.vehicle_code" disabled clearable style="width: 210px" />
</el-form-item>
<el-form-item label="单据状态" prop="status">
<el-select
@@ -70,12 +77,12 @@
<el-form-item label="创建时间" prop="create_time">
<!-- <el-date-picker v-model="form.create_time" type="date" placeholder="选择日期" style="width: 210px"-->
<!-- value-format="yyyy-MM-dd" :disabled="true"/>-->
<el-input v-model="form.create_time" disabled clearable style="width: 210px"/>
<el-input v-model="form.create_time" disabled clearable style="width: 210px" />
</el-form-item>
<template v-for="(col,index) in cols">
<el-form-item label="col.lable" prop="bill_code">
<label slot="label">{{ col.lable }}:</label>
<el-input disabled v-model="form.form_data[col.value]" :value="col.value" clearable style="width: 210px"/>
<el-input v-model="form.form_data[col.value]" disabled :value="col.value" clearable style="width: 210px" />
</el-form-item>
</template>
</el-form>
@@ -92,20 +99,26 @@
size="mini"
border
:highlight-current-row="true"
@current-change="handleDtlCurrentChange"
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
@current-change="handleDtlCurrentChange"
>
<el-table-column prop="form_type" label="单据类型" show-overflow-tooltip width="120"/>
<el-table-column prop="material_id" label="物料id" show-overflow-tooltip width="120"/>
<el-table-column prop="material_name" label="物料名称" show-overflow-tooltip width="120"/>
<el-table-column prop="material_spec" label="物料规格" show-overflow-tooltip width="120"/>
<el-table-column prop="pcsn" label="批次" show-overflow-tooltip width="120"/>
<el-table-column prop="qty" label="物料数量" show-overflow-tooltip/>
<el-table-column prop="assign_qty" label="拣选数量" show-overflow-tooltip width="120"/>
<el-table-column prop="form_type" label="单据类型" show-overflow-tooltip width="120" />
<el-table-column prop="material_id" label="物料id" show-overflow-tooltip width="120" />
<el-table-column prop="material_name" label="物料名称" show-overflow-tooltip width="120" />
<el-table-column prop="material_spec" label="物料规格" show-overflow-tooltip width="120" />
<el-table-column prop="pcsn" label="批次" show-overflow-tooltip width="120" />
<el-table-column prop="qty" label="物料数量" show-overflow-tooltip />
<el-table-column prop="assign_qty" label="拣选数量" show-overflow-tooltip width="120" />
<el-table-column show-overflow-tooltip prop="unit_id" label="单位" width="120">
<template slot-scope="scope">
<el-select disabled v-model="tableDtl[scope.$index].unit_id"
class="filter-item" placeholder="单位" size="small" style="width: 90px">
<el-select
v-model="tableDtl[scope.$index].unit_id"
disabled
class="filter-item"
placeholder="单位"
size="small"
style="width: 90px"
>
<el-option
v-for="item in unitDict"
:key="item.value"
@@ -115,29 +128,34 @@
</el-select>
</template>
</el-table-column>
<el-table-column prop="vehicle_code" label="拣选载具" show-overflow-tooltip width="120"/>
<el-table-column prop="vehicle_code" label="拣选载具" show-overflow-tooltip width="120" />
<el-table-column prop="status" label="单据状态" show-overflow-tooltip width="120">
<template slot-scope="scope">
{{ statusEnum.label.FORM_STATUS[scope.row.status] }}
</template>
</el-table-column>
<el-table-column prop="source_form_id" label="业务单据id" show-overflow-tooltip width="120"/>
<el-table-column prop="source_form_type" label="业务单据类型" show-overflow-tooltip width="120"/>
<el-table-column prop="source_form_date" label="业务单据时间" show-overflow-tooltip width="130"/>
<el-table-column prop="parent_id" label="父单据数据id" show-overflow-tooltip width="120"/>
<el-table-column width="130" show-overflow-tooltip v-for="(item, index) in dtlCols" :key="item.value"
:label="item.lable">
<el-table-column prop="source_form_id" label="业务单据id" show-overflow-tooltip width="120" />
<el-table-column prop="source_form_type" label="业务单据类型" show-overflow-tooltip width="120" />
<el-table-column prop="source_form_date" label="业务单据时间" show-overflow-tooltip width="130" />
<el-table-column prop="parent_id" label="父单据数据id" show-overflow-tooltip width="120" />
<el-table-column
v-for="(item, index) in dtlCols"
:key="item.value"
width="130"
show-overflow-tooltip
:label="item.lable"
>
<template slot-scope="scope">{{ scope.row.form_data[item.value] }}</template>
</el-table-column>
<el-table-column prop="create_time" label="创建时间"/>
<el-table-column prop="proc_inst_id" label="对应流程实例id" show-overflow-tooltip width="120"/>
<el-table-column prop="create_time" label="创建时间" />
<el-table-column prop="proc_inst_id" label="对应流程实例id" show-overflow-tooltip width="120" />
</el-table>
</el-card>
<div class="crud-opts2">
<span class="role-span">作业明细</span>
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="right"/>
<slot name="right" />
<el-button
slot="left"
class="filter-item"
@@ -162,18 +180,23 @@
:highlight-current-row="true"
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column prop="material_name" label="物料名称" show-overflow-tooltip width="120"/>
<el-table-column prop="material_spec" label="物料规格" show-overflow-tooltip width="120"/>
<el-table-column prop="pcsn" label="批次" show-overflow-tooltip width="90"/>
<el-table-column prop="qty" label="物料数量" show-overflow-tooltip width="150">
<el-table-column prop="material_name" label="物料名称" show-overflow-tooltip width="120" />
<el-table-column prop="material_spec" label="物料规格" show-overflow-tooltip width="120" />
<el-table-column prop="pcsn" label="批次" show-overflow-tooltip width="90" />
<el-table-column prop="qty" label="物料数量" show-overflow-tooltip width="150">
<template slot-scope="scope">
<el-input-number v-model="tabledis[scope.$index].qty" clearable style="width: 120px"/>
<el-input-number v-model="tabledis[scope.$index].qty" clearable style="width: 120px" />
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="unit_id" label="单位" width="120">
<template slot-scope="scope">
<el-select v-model="tabledis[scope.$index].unit_id"
class="filter-item" placeholder="单位" size="small" style="width: 90px">
<el-select
v-model="tabledis[scope.$index].unit_id"
class="filter-item"
placeholder="单位"
size="small"
style="width: 90px"
>
<el-option
v-for="item in unitDict"
:key="item.value"
@@ -183,22 +206,29 @@
</el-select>
</template>
</el-table-column>
<el-table-column prop="vehicle_code" label="周转载具" show-overflow-tooltip width="120" >
<el-table-column prop="vehicle_code" label="周转载具" show-overflow-tooltip width="120">
<template slot-scope="scope">
<el-input v-model="tabledis[scope.$index].vehicle_code" clearable />
</template>
</el-table-column>
<el-table-column width="130" show-overflow-tooltip v-for="(item, index) in disCols" :key="item.value"
:label="item.lable">
<el-table-column
v-for="(item, index) in disCols"
:key="item.value"
width="130"
show-overflow-tooltip
:label="item.lable"
>
<template slot-scope="scope">
<el-switch v-if="item.value == 'is_move'"
<el-switch
v-if="item.value == 'is_move'"
v-model="tabledis[scope.$index].form_data[item.value]"
active-color="#409EFF"
inactive-color="#F56C6C"
:active-value=true
:inactive-valu=false
active-value="true"
inactive-valu="false"
/>
<el-select v-if="item.value == 'task_type'"
<el-select
v-if="item.value == 'task_type'"
v-model="tabledis[scope.$index].form_data[item.value]"
clearable
size="mini"
@@ -214,13 +244,14 @@
:value="item.value"
/>
</el-select>
<el-select v-if="item.value == 'outbound'"
v-model="tabledis[scope.$index].form_data[item.value]"
clearable
size="mini"
placeholder="出库口"
class="filter-item"
style="width: 120px"
<el-select
v-if="item.value == 'outbound'"
v-model="tabledis[scope.$index].form_data[item.value]"
clearable
size="mini"
placeholder="出库口"
class="filter-item"
style="width: 120px"
>
<el-option
v-for="item in outboundList"
@@ -229,14 +260,18 @@
:value="item.value"
/>
</el-select>
<el-input v-if="item.value == 'end_struct_code'" v-model="tabledis[scope.$index].form_data[item.value]" />
<el-input v-if="item.value == 'pick_vehicle'" disabled v-model="tabledis[scope.$index].form_data[item.value]" />
<el-input v-if="item.value == 'point_code'" v-model="tabledis[scope.$index].form_data[item.value]" />
<el-input v-if="item.value == 'end_struct_code'" v-model="tabledis[scope.$index].form_data[item.value]" />
<el-input v-if="item.value == 'pick_vehicle'" v-model="tabledis[scope.$index].form_data[item.value]" disabled />
<el-input v-if="item.value == 'point_code'" v-model="tabledis[scope.$index].form_data[item.value]" />
<!-- <el-input v-if="item.value == 'stor_code'" v-model="tabledis[scope.$index].form_data[item.value]" />-->
<span v-if="item.value == 'stor_code'">
{{ tableEnum.label.st_ivt_bsrealstorattr[tabledis[scope.$index].form_data[item.value]] }}
</span>
</template>
</el-table-column>
<el-table-column align="center" label="操作" fixed="right">
<el-table-column align="center" label="操作" fixed="right">
<template scope="scope">
<el-button type="danger" size="mini" icon="el-icon-delete" @click="subRow(scope.$index)">删除</el-button>
<el-button type="danger" size="mini" icon="el-icon-delete" @click="subRow(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -249,18 +284,17 @@
<script>
import CRUD, { crud } from '@crud/crud'
import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
import crudFormData, {inDecision} from "./formData";
import pick from "./pick";
import crudFormData, { inDecision } from './formData'
import pick from './pick'
import measureunit from '@/views/wms/base_manage/measure/measureunit'
export default {
name: 'TaskDialog',
components: { },
mixins: [crud()],
dicts: ['IO_BILL_STATUS', 'VEHICLE_OVER_TYPE', 'PCS_SAL_TYPE'],
statusEnums: [ 'IOBILL_TYPE_OUT','FORM_STATUS' ],
tableEnums: [ 'st_ivt_bsrealstorattr#stor_name#stor_code' ],
statusEnums: ['IOBILL_TYPE_OUT', 'FORM_STATUS'],
tableEnums: ['st_ivt_bsrealstorattr#stor_name#stor_code'],
props: {
dialogShow: {
type: Boolean,
@@ -289,14 +323,14 @@ export default {
tableDtl: [],
tabledis: [],
vehicledis: [],
vehicleform:{},
un_assign_qty:0,
vehicleform: {},
un_assign_qty: 0,
currentDtl: null,
PickTaskType:[
{"label":"拣选回库","value":"13"},{"label":"拣选出库","value":"23"}
PickTaskType: [
{ 'label': '拣选回库', 'value': '13' }, { 'label': '拣选出库', 'value': '23' }
],
outboundList:[
{"label":"一楼出库口","value":"1101"},{"label":"二楼出库口","value":"2114"}
outboundList: [
{ 'label': '一楼出库口', 'value': '1101' }, { 'label': '二楼出库口', 'value': '2114' }
],
form: {},
rules: {}
@@ -313,39 +347,39 @@ export default {
setForm(row) {
this.dialogVisible = true
this.form = row
let dtl_form_type = this.form.children[0].form_type;
const dtl_form_type = this.form.children[0].form_type
formstruc.getHeader(this.form.form_type).then(res => {
this.cols = res
})
formstruc.getHeader(dtl_form_type).then(res => {
this.dtlCols = res
})
formstruc.getHeader("Picking_Task").then(res => {
formstruc.getHeader('Picking_Task').then(res => {
this.disCols = res
res.forEach(a => {
this.$set(this.disFormData, a.value, '')
})
}),
measureunit.getSelect().then(res => {
this.unitDict = res.content
})
measureunit.getSelect().then(res => {
this.unitDict = res.content
})
this.queryTableDtl(row.id)
},
addPickTask(){
let dis_assign_qty = 0;
this.tabledis.forEach(a=>{
dis_assign_qty = dis_assign_qty+a.qty
addPickTask() {
let dis_assign_qty = 0
this.tabledis.forEach(a => {
dis_assign_qty = dis_assign_qty + a.qty
})
if (!this.currentDtl) {
this.crud.notify('请先选择一条分配明细！', CRUD.NOTIFICATION_TYPE.INFO)
return
}
let dtl = {};
const dtl = {}
dtl.material_id = this.currentDtl.material_id
dtl.material_name = this.currentDtl.material_name
dtl.material_spec = this.currentDtl.material_spec
dtl.material_pcsn = this.currentDtl.material_pcsn
dtl.qty = this.currentDtl.assign_qty-dis_assign_qty
dtl.qty = this.currentDtl.assign_qty - dis_assign_qty
dtl.pcsn = this.currentDtl.pcsn
dtl.unit_id = this.currentDtl.unit_id
dtl.form_type = 'Picking_Task'
@@ -356,10 +390,12 @@ export default {
dtl.form_data = JSON.parse(JSON.stringify(this.disFormData))
dtl.form_data.pick_vehicle = this.currentDtl.vehicle_code
dtl.form_data.point_code = this.form.form_data.point_code
dtl.form_data.stor_code = this.form.form_data.stor_code
dtl.form_data.is_move = 'true'
this.tabledis.push(dtl)
},
subRow(index){
this.tabledis.splice(this.tabledis.indexOf(index),1)
subRow(index) {
this.tabledis.splice(this.tabledis.indexOf(index), 1)
},
handleDtlCurrentChange(current) {
if (current !== null) {
@@ -371,15 +407,15 @@ export default {
this.currentDtl = {}
}
},
changeTaskType(index,taskType) {
if (taskType == "13"){
let dis_assign_qty = 0;
this.tabledis.forEach(a=>{
dis_assign_qty = dis_assign_qty+a.qty
changeTaskType(index, taskType) {
if (taskType == '13') {
let dis_assign_qty = 0
this.tabledis.forEach(a => {
dis_assign_qty = dis_assign_qty + a.qty
})
this.tabledis[index].qty = this.currentDtl.qty-dis_assign_qty
this.tabledis[index].qty = this.currentDtl.qty - dis_assign_qty
}
if (taskType == "23"){
if (taskType == '23') {
this.tabledis[index].qty = this.currentDtl.assign_qty
}
},
@@ -405,14 +441,14 @@ export default {
})
}
},
closeDialog(){
closeDialog() {
this.$emit('AddChanged')
this.dialogVisible = false
this.tabledis = []
this.tableDtl = []
},
savePickMst(){
pick.updateStatus({"status":"13","id":this.form.id})
savePickMst() {
pick.updateStatus({ 'status': '13', 'id': this.form.id })
this.closeDialog()
},
close() {

180
wms_pro/qd/src/views/wms/stor_manage/warehouse/pick/ViewDialog.vue
View File

@@ -8,33 +8,40 @@
@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="100px" label-suffix=":">
<el-form
ref="form"
style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
:inline="true"
:model="form"
size="mini"
label-width="100px"
label-suffix=":"
>
<el-form-item label="单据编号" prop="code">
<el-input v-model="form.code" disabled placeholder="系统生成" clearable style="width: 210px"/>
<el-input v-model="form.code" disabled placeholder="系统生成" clearable style="width: 210px" />
</el-form-item>
<el-form-item label="单据类型" prop="form_type">
<el-input v-model="form.form_type" disabled clearable style="width: 210px"/>
<el-input v-model="form.form_type" disabled clearable style="width: 210px" />
</el-form-item>
<el-form-item label="业务单据类型" prop="source_form_type">
<el-input v-model="form.biz_code" disabled clearable style="width: 210px"/>
<el-input v-model="form.biz_code" disabled clearable style="width: 210px" />
</el-form-item>
<el-form-item label="业务单据id" prop="source_form_id">
<el-input v-model="form.biz_code" disabled clearable style="width: 210px"/>
<el-input v-model="form.biz_code" disabled clearable style="width: 210px" />
</el-form-item>
<el-form-item label="业务单据时间" prop="source_form_date">
<!-- <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px"-->
<!-- value-format="yyyy-MM-dd" :disabled="true"/>-->
<el-input v-model="form.biz_date" disabled clearable style="width: 210px"/>
<el-input v-model="form.biz_date" disabled clearable style="width: 210px" />
</el-form-item>
<el-form-item label="批次" prop="pcsn">
<el-input v-model="form.pcsn" disabled clearable style="width: 210px"/>
<el-input v-model="form.pcsn" disabled clearable style="width: 210px" />
</el-form-item>
<el-form-item label="物料数量" prop="qty">
<el-input v-model="form.qty" disabled clearable style="width: 210px"/>
<el-input v-model="form.qty" disabled clearable style="width: 210px" />
</el-form-item>
<el-form-item label="载具编号" prop="vehicle_code">
<el-input v-model="form.vehicle_code" disabled clearable style="width: 210px"/>
<el-input v-model="form.vehicle_code" disabled clearable style="width: 210px" />
</el-form-item>
<el-form-item label="单据状态" prop="status">
<el-select
@@ -52,17 +59,17 @@
:value="item.value"
/>
</el-select>
<!-- <el-input v-model="form.status" disabled clearable style="width: 210px"/>-->
<!-- <el-input v-model="form.status" disabled clearable style="width: 210px"/>-->
</el-form-item>
<el-form-item label="创建时间" prop="create_time">
<!-- <el-date-picker v-model="form.create_time" type="date" placeholder="选择日期" style="width: 210px"-->
<!-- value-format="yyyy-MM-dd" :disabled="true"/>-->
<el-input v-model="form.create_time" disabled clearable style="width: 210px"/>
<el-input v-model="form.create_time" disabled clearable style="width: 210px" />
</el-form-item>
<template v-for="(col,index) in cols">
<el-form-item label="col.lable" prop="bill_code">
<label slot="label">{{ col.lable }}:</label>
<el-input disabled v-model="form.form_data[col.value]" :value="col.value" clearable style="width: 210px"/>
<el-input v-model="form.form_data[col.value]" disabled :value="col.value" clearable style="width: 210px" />
</el-form-item>
</template>
</el-form>
@@ -82,14 +89,14 @@
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
@current-change="handleDtlCurrentChange"
>
<el-table-column prop="form_type" label="单据类型" show-overflow-tooltip width="120"/>
<el-table-column prop="material_id" label="物料id" show-overflow-tooltip width="120"/>
<el-table-column prop="material_name" label="物料名称" show-overflow-tooltip width="120"/>
<el-table-column prop="material_spec" label="物料规格" show-overflow-tooltip width="120"/>
<el-table-column prop="pcsn" label="批次" show-overflow-tooltip width="120"/>
<el-table-column prop="qty" label="物料数量" show-overflow-tooltip/>
<el-table-column prop="assign_qty" label="拣选数量" show-overflow-tooltip/>
<el-table-column prop="vehicle_code" label="拣选载具" show-overflow-tooltip width="120"/>
<el-table-column prop="form_type" label="单据类型" show-overflow-tooltip width="120" />
<el-table-column prop="material_id" label="物料id" show-overflow-tooltip width="120" />
<el-table-column prop="material_name" label="物料名称" show-overflow-tooltip width="120" />
<el-table-column prop="material_spec" label="物料规格" show-overflow-tooltip width="120" />
<el-table-column prop="pcsn" label="批次" show-overflow-tooltip width="120" />
<el-table-column prop="qty" label="物料数量" show-overflow-tooltip />
<el-table-column prop="assign_qty" label="拣选数量" show-overflow-tooltip />
<el-table-column prop="vehicle_code" label="拣选载具" show-overflow-tooltip width="120" />
<el-table-column prop="status" label="单据状态" show-overflow-tooltip width="120">
<template slot-scope="scope">
<template v-for="item in formStatus">
@@ -97,16 +104,21 @@
</template>
</template>
</el-table-column>
<el-table-column prop="source_form_id" label="业务单据id" show-overflow-tooltip width="120"/>
<el-table-column prop="source_form_type" label="业务单据类型" show-overflow-tooltip width="120"/>
<el-table-column prop="source_form_date" label="业务单据时间" show-overflow-tooltip width="130"/>
<el-table-column prop="parent_id" label="父单据数据id" show-overflow-tooltip width="120"/>
<el-table-column width="130" show-overflow-tooltip v-for="(item, index) in dtlCols" :key="item.value"
:label="item.lable">
<el-table-column prop="source_form_id" label="业务单据id" show-overflow-tooltip width="120" />
<el-table-column prop="source_form_type" label="业务单据类型" show-overflow-tooltip width="120" />
<el-table-column prop="source_form_date" label="业务单据时间" show-overflow-tooltip width="130" />
<el-table-column prop="parent_id" label="父单据数据id" show-overflow-tooltip width="120" />
<el-table-column
v-for="(item, index) in dtlCols"
:key="item.value"
width="130"
show-overflow-tooltip
:label="item.lable"
>
<template slot-scope="scope">{{ scope.row.form_data[item.value] }}</template>
</el-table-column>
<el-table-column prop="create_time" label="创建时间"/>
<el-table-column prop="proc_inst_id" label="对应流程实例id" show-overflow-tooltip width="120"/>
<el-table-column prop="create_time" label="创建时间" />
<el-table-column prop="proc_inst_id" label="对应流程实例id" show-overflow-tooltip width="120" />
</el-table>
</el-card>
<div class="crud-opts2">
@@ -124,42 +136,44 @@
:highlight-current-row="true"
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column prop="material_name" label="物料名称" show-overflow-tooltip width="120"/>
<el-table-column prop="material_spec" label="物料规格" show-overflow-tooltip width="120"/>
<el-table-column prop="pcsn" label="批次" show-overflow-tooltip width="90"/>
<el-table-column prop="qty" label="物料数量" show-overflow-tooltip width="150"/>
<el-table-column prop="material_name" label="物料名称" show-overflow-tooltip width="120" />
<el-table-column prop="material_spec" label="物料规格" show-overflow-tooltip width="120" />
<el-table-column prop="pcsn" label="批次" show-overflow-tooltip width="90" />
<el-table-column prop="qty" label="物料数量" show-overflow-tooltip width="150" />
<el-table-column show-overflow-tooltip prop="unit_id" label="单位" width="120">
<template slot-scope="scope">
<el-select disabled v-model="tabledis[scope.$index].unit_id"
class="filter-item" placeholder="单位" size="small" style="width: 90px">
<el-option
v-for="item in unitDict"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
{{ tableEnum.label.bm_measure_unit[scope.row.unit_id] }}
</template>
</el-table-column>
<el-table-column disabled prop="vehicle_code" label="周转载具" show-overflow-tooltip width="120" />
<el-table-column show-overflow-tooltip v-for="(item, index) in disCols" :key="item.value"
:label="item.lable">
<el-table-column
v-for="(item, index) in disCols"
:key="item.value"
show-overflow-tooltip
:label="item.lable"
>
<template slot-scope="scope">
<el-switch disabled v-if="item.value == 'is_artificial'"
v-model="tabledis[scope.$index].form_data[item.value]"
active-color="#409EFF"
inactive-color="#F56C6C"
:active-value=true
:inactive-valu=false
<el-switch
v-if="item.value == 'is_move'"
v-model="tabledis[scope.$index].form_data[item.value]"
disabled
active-color="#409EFF"
inactive-color="#F56C6C"
active-value="true"
inactive-valu="false"
/>
<el-select disabled v-if="item.value == 'task_type'"
v-model="tabledis[scope.$index].form_data[item.value]"
clearable
size="mini"
placeholder="任务类型"
class="filter-item"
style="width: 120px"
@change="changeTaskType(scope.$index,tabledis[scope.$index].form_data[item.value])"
<span v-if="item.value == 'stor_code'">
{{ tableEnum.label.st_ivt_bsrealstorattr[tabledis[scope.$index].form_data[item.value]] }}
</span>
<el-select
v-if="item.value == 'task_type'"
v-model="tabledis[scope.$index].form_data[item.value]"
disabled
clearable
size="mini"
placeholder="任务类型"
class="filter-item"
style="width: 120px"
>
<el-option
v-for="item in PickTaskType"
@@ -168,13 +182,15 @@
:value="item.value"
/>
</el-select>
<el-select disabled v-if="item.value == 'outbound'"
v-model="tabledis[scope.$index].form_data[item.value]"
clearable
size="mini"
placeholder="出库口"
class="filter-item"
style="width: 120px"
<el-select
v-if="item.value == 'outbound'"
v-model="tabledis[scope.$index].form_data[item.value]"
disabled
clearable
size="mini"
placeholder="出库口"
class="filter-item"
style="width: 120px"
>
<el-option
v-for="item in outboundList"
@@ -183,25 +199,31 @@
:value="item.value"
/>
</el-select>
<el-input
v-if="item.value == 'point_code'"
v-model="tabledis[scope.$index].form_data[item.value]"
disabled
/>
</template>
</el-table-column>
</el-table>
</el-card>
</el-dialog>
</template>
</template>
<script>
import {crud} from '@crud/crud'
import crudFormData, {getSonFormData} from './formData'
import { crud } from '@crud/crud'
import crudFormData, { getSonFormData } from './formData'
import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
export default {
name: 'ViewDialog',
components: {formstruc},
components: { formstruc },
mixins: [crud()],
dicts: ['ST_INV_CP_IN_TYPE', 'product_area', 'IO_BILL_STATUS', 'status', 'SCH_TASK_TYPE_DTL', 'PCS_SAL_TYPE'],
tableEnums: ['st_ivt_bsrealstorattr#stor_name#stor_code', 'bm_measure_unit#unit_name#unit_id'],
props: {
dialogShow: {
type: Boolean,
@@ -225,11 +247,11 @@ export default {
currentdtl: null,
currentDis: {},
form: {},
PickTaskType:[
{"label":"拣选回库","value":"13"},{"label":"拣选出库","value":"23"}
PickTaskType: [
{ 'label': '拣选回库', 'value': '13' }, { 'label': '拣选出库', 'value': '23' }
],
outboundList:[
{"label":"一楼出库口","value":"1101"},{"label":"二楼出库口","value":"2114"}
outboundList: [
{ 'label': '一楼出库口', 'value': '1101' }, { 'label': '二楼出库口', 'value': '2114' }
],
formStatus: [
{
@@ -266,17 +288,17 @@ export default {
setForm(row) {
this.dialogVisible = true
this.form = row
let dtl_form_type = this.form.children[0].form_type;
const dtl_form_type = this.form.children[0].form_type
formstruc.getHeader(this.form.form_type).then(res => {
this.cols = res
})
formstruc.getHeader(dtl_form_type).then(res => {
this.dtlCols = res
})
formstruc.getHeader("Picking_Task").then(res => {
formstruc.getHeader('Picking_Task').then(res => {
this.disCols = res
res.forEach(a => {
this.disFormData[a.value,'']
this.disFormData[a.value, '']
})
}),
this.queryTableDtl(row.id)
@@ -321,9 +343,9 @@ export default {
})
},
queryTableDis(id) {
crudFormData.getSonFormData(id).then(res => {
this.tabledis = res
})
crudFormData.getSonFormData(id).then(res => {
this.tabledis = res
})
},
formatStatus(row) {
return this.dict.label.status[row.status]