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

rev:仓库管理页面优化

Browse Source
This commit is contained in:
zhangzq
2024-07-15 09:05:53 +08:00
parent e0c508de34
commit d95d590ec2
83 changed files with 742 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wms_pro/qd/src/views/monitor/eslog/view/index.vue
View File

@@ -323,8 +323,8 @@ export default {
this.total = res.total
// 清空
this.logs = []
for (const j in res.records) { // 用push的方式将所有日志数组添加进去
this.logs.push(res.records[j])
for (const j in res.page) { // 用push的方式将所有日志数组添加进去
this.logs.push(res.page[j])
}
})
},

1
wms_pro/qd/src/views/wms/base_manage/struct/index.vue
View File

@@ -242,7 +242,6 @@
<el-table-column prop="w" label="宽度" show-overflow-tooltip />
<el-table-column prop="h" label="高度" show-overflow-tooltip />
<el-table-column prop="l" label="深度" show-overflow-tooltip />
<el-table-column prop="remark" label="承受重量" show-overflow-tooltip />
<el-table-column prop="remark" label="备注" show-overflow-tooltip />
<el-table-column
v-permission="['admin','structattr:edit','structattr:del']"

65
wms_pro/qd/src/views/wms/dispatch_manage/point/index.vue
View File

@@ -79,72 +79,12 @@
@change="hand"
/>
</el-form-item>
<el-form-item label="是否启用">
<el-switch
v-model="query.is_used"
active-value="0"
inactive-value="1"
active-color="#C0CCDA"
inactive-color="#409EFF"
@change="hand"
/>
</el-form-item>
<rrOperation/>
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
v-if="crud.query.is_used == 0"
slot="right"
class="filter-item"
size="mini"
type="primary"
icon="el-icon-circle-check"
:disabled="crud.selections.length === 0"
@click="changeUsed(crud.selections, 1)"
>
启用
</el-button>
<el-button
v-if="crud.query.is_used == 1"
slot="right"
class="filter-item"
size="mini"
type="primary"
icon="el-icon-circle-close"
:disabled="crud.selections.length === 0"
@click="changeUsed(crud.selections, 0)"
>
禁用
</el-button>
<el-button
v-if="crud.query.lock_type == 0"
slot="right"
class="filter-item"
size="mini"
type="danger"
icon="el-icon-circle-check"
:disabled="crud.selections.length === 0"
@click="changeLock(crud.selections, 1)"
>
锁定
</el-button>
<el-button
v-if="crud.query.lock_type == 1"
slot="right"
class="filter-item"
size="mini"
type="danger"
icon="el-icon-circle-close"
:disabled="crud.selections.length === 0"
@click="changeLock(crud.selections, 0)"
>
解锁
</el-button>
</crudOperation>
<crudOperation :permission="permission"/>
<!--表单组件-->
<el-dialog
:close-on-click-modal="false"
@@ -202,6 +142,9 @@
/>
</el-select>
</el-form-item>
<el-form-item label="是否启用" prop="is_used">
<el-switch v-model="form.is_used" active-value="1" inactive-value="0" />
</el-form-item>
<el-form-item v-show="pointTypesDialogList.length > 0" label="点位类型" prop="device_point_type">
<el-select
v-model="form.point_type"

2
wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue
View File

@@ -291,7 +291,7 @@ export default {
return
}
const data = {
taskCode: row.task_code,
task_code: row.task_code,
status: status
}
crudSchBaseTask.operation(data).then(res => {

7
wms_pro/qd/src/views/wms/flow_manage/act/execution/curdExecution.js
View File

@@ -88,6 +88,12 @@ export function flowConfirm(inst_id) {
method: 'get'
})
}
export function errorFinish(inst_id) {
return request({
url: 'api/bpmnExecution/errorFinish/' + inst_id,
method: 'get'
})
}
export function queryHisActivityId(proc_inst_id) {
return request({
@@ -109,5 +115,6 @@ export default {
getDtl,
changeActive,
flowConfirm,
errorFinish,
queryHisActivityId
}

13
wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue
View File

@@ -145,7 +145,7 @@
v-permission="['admin','actDeModel:edit','actDeModel:del']"
fixed="right"
label="操作"
width="210px"
width="280px"
align="center"
>
<template slot-scope="scope">
@@ -171,8 +171,9 @@
>确定
</el-button>
</div>
<el-button slot="reference" type="text" icon="el-icon-video-play" size="mini" @click="showPopover">触发
</el-button>
<el-button slot="reference" type="text" icon="el-icon-video-play" size="mini" @click="showPopover">触发</el-button>
<el-button slot="reference" type="text" icon="el-icon-video-play" size="mini" @click="errorFinish(scope.row.proc_inst_id)">异常完成</el-button>
</el-popover>
<el-button slot="right" type="text" icon="el-icon-thumb" size="mini" @click="viewClick(scope.row)">预览
</el-button>
@@ -273,6 +274,12 @@ export default {
showPopover() {
// this.popoverVisible = true;
},
errorFinish(proc_inst_id) {
curdExecution.errorFinish(proc_inst_id).then(res => {
this.crud.notify('异常结束流程成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
},
cancelFlow(scope) {
scope._self.$refs[`popover-${scope.$index}`].doClose()
},

10
wms_pro/qd/src/views/wms/md_manage/group_dick/index.vue
View File

@@ -34,7 +34,7 @@
style="width: 200px"
>
<el-option
v-for="item in dict.FORM_STATUS"
v-for="item in statusEnum.FORM_STATUS"
:key="item.id"
:label="item.label"
:value="item.value"
@@ -78,7 +78,7 @@
<el-form-item label="状态" prop="status">
<el-select v-model="editForm.status" placeholder="" style="width: 120px">
<el-option
v-for="item in dict.FORM_STATUS"
v-for="item in statusEnum.FORM_STATUS"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -102,7 +102,7 @@
</el-table-column>
<el-table-column prop="status" label="状态">
<template slot-scope="scope">
{{ dict.label.FORM_STATUS[scope.row.status] }}
{{ statusEnum.label.FORM_STATUS[scope.row.status] }}
</template>
</el-table-column>
<el-table-column prop="vehicle_code" label="托盘" show-overflow-tooltip/>
@@ -153,8 +153,8 @@ const defaultForm = {
form_data: {}
}
export default {
name: 'DeliveryOrder',
dicts: ['PCS_DELIVER_TYPE', 'FORM_STATUS'],
name: 'groupDick',
statusEnums: ['FORM_STATUS'],
components: { ViewDialog, AddDialog, crudbucketrecord, formstruc, pagination, crudOperation, rrOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {

36
wms_pro/qd/src/views/wms/stor_manage/out/AddDialog.vue
View File

@@ -55,7 +55,22 @@
<template v-for="(col,index) in cols">
<el-form-item label="col.lable" prop="bill_code">
<label slot="label">{{col.lable}}:</label>
<el-input v-model="form.form_data[col.value]" :value="col.value" clearable style="width: 150px" />
<el-select v-if="col.value == 'product_area'"
v-model="form.form_data[col.value]"
clearable
size="mini"
placeholder="车间"
class="filter-item"
style="width: 120px"
>
<el-option
v-for="item in statusEnum.PRODUCT_AREA"
:key="item.key"
:label="item.label"
:value="item.value"
/>
</el-select>
<el-input v-if="col.value != 'product_area'" v-model="form.form_data[col.value]" :value="col.value" clearable style="width: 150px" />
</el-form-item>
</template>
<el-form-item label="备注" prop="remark">
@@ -153,7 +168,22 @@
</el-table-column>
<el-table-column v-for="(item, index) in dtlCols" :key="item.value" :label="item.lable" width="160">
<template scope="scope">
<el-input v-model="tableData[scope.$index].form_data[item.value]" class="input-with-select" />
<el-select v-if="item.value == 'product_area'"
v-model="tableData[scope.$index].form_data[item.value]"
clearable
size="mini"
placeholder="车间"
class="filter-item"
style="width: 120px"
>
<el-option
v-for="item in statusEnum.PRODUCT_AREA"
:key="item.key"
:label="item.label"
:value="item.value"
/>
</el-select>
<el-input v-if="item.value != 'product_area'" disabled v-model="tableData[scope.$index].form_data[item.value]" class="input-with-select" />
</template>
</el-table-column>
@@ -219,7 +249,7 @@ export default {
name: 'AddDialog',
components: { formstruc, MaterDialog,measureunit, FormDialog },
mixins: [crud(), form(defaultForm)],
statusEnums: [ 'FORM_STATUS', 'IOBILL_TYPE_OUT' ],
statusEnums: [ 'FORM_STATUS', 'IOBILL_TYPE_OUT', 'PRODUCT_AREA' ],
tableEnums: [ 'st_ivt_bsrealstorattr#stor_name#stor_code' ],
props: {
dialogShow: {

14
wms_pro/qd/src/views/wms/stor_manage/out/index.vue
View File

@@ -106,9 +106,9 @@
:disabled="confirm_flag"
icon="el-icon-check"
size="mini"
@click="confirm"
@click="cancelMst"
>
强制确认
强制取消
</el-button>
</crudOperation>
<!--表格渲染-->
@@ -292,6 +292,16 @@ export default {
this.crud.toQuery()
})
},
cancelMst() {
if (!this.currentRow) {
this.crud.notify('请选择一条单据', CRUD.NOTIFICATION_TYPE.INFO)
return
}
crudProductOut.cancelMst(this.currentRow.id ).then(res => {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
},
handleCurrentChange(currentRow) {
if (currentRow === null) {
this.dis_flag = true

8
wms_pro/qd/src/views/wms/stor_manage/out/storinvout.js
View File

@@ -66,6 +66,13 @@ export function taskOpen(data) {
data
})
}
export function cancelMst(id) {
return request({
url: "/api/stIvtIostorinvOut/cancelMst/" + id,
method: 'get'
})
}
export default {
add,
edit,
@@ -75,5 +82,6 @@ export default {
outDecision,
cancelDecision,
divDis,
cancelMst,
taskOpen,
}

1
wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/AddDialog.vue
View File

@@ -278,6 +278,7 @@ export default {
data.stor_name = row.stor_name
data.struct_code = row.struct_code
data.vehicle_code = row.vehicle_code
data.vehicle_id = row.vehicle_id
data.material_spec = row.material_spec
data.material_name = row.material_name
data.material_id = row.material_id

3
wms_pro/qd/src/views/wms/stor_manage/warehouse/checkStorage/ViewDialog.vue
View File

@@ -199,7 +199,7 @@ export default {
{"label":"拣选回库","value":"13"},{"label":"拣选出库","value":"23"}
],
outboundList:[
{"label":"一楼出库口","value":"1101"},{"label":"二楼出库口","value":"2114"}
{"label":"一楼出库口","value":"1101"},{"label":"二楼出库口","value":"2114"},{"label":"三楼出库口","value":"3204"}
],
}
@@ -242,7 +242,6 @@ export default {
this.dialogVisible = false
},
handleDtlCurrentChange(current) {
debugger
if (current !== null) {
this.currentdtl = current
this.queryTableDis(this.currentdtl)

2
wms_pro/qd/src/views/wms/stor_manage/warehouse/move/AddDialog.vue
View File

@@ -92,6 +92,7 @@
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column show-overflow-tooltip prop="stor_name" label="仓库" />
<el-table-column show-overflow-tooltip prop="vehicle_code" label="载具编码" />
<el-table-column show-overflow-tooltip prop="vehicle_id" label="载具组盘id" width="160" />
<el-table-column show-overflow-tooltip prop="material_spec" label="物料规格" />
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" />
<el-table-column show-overflow-tooltip prop="pcsn" label="批次" />
@@ -301,6 +302,7 @@ export default {
data.stor_name = row.stor_name
data.start_struct_code = row.struct_code
data.vehicle_code = row.vehicle_code
data.vehicle_id = row.vehicle_id
data.material_spec = row.material_spec
data.material_name = row.material_name
data.material_id = row.material_id

1
wms_pro/qd/src/views/wms/stor_manage/warehouse/move/ViewDialog.vue
View File

@@ -226,7 +226,6 @@ export default {
this.dialogVisible = false
},
handleDtlCurrentChange(current) {
debugger
if (current !== null) {
this.currentdtl = current
this.queryTableDis(this.currentdtl)

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

@@ -230,6 +230,8 @@
/>
</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]" />
</template>
</el-table-column>
<el-table-column align="center" label="操作" fixed="right">
@@ -352,6 +354,8 @@ export default {
dtl.source_form_date = this.currentDtl.create_time
dtl.parent_id = this.currentDtl.id
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
this.tabledis.push(dtl)
},
subRow(index){

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

@@ -297,7 +297,6 @@ export default {
return this.dict.label.work_status[row.work_status]
},
handleDtlCurrentChange(current) {
debugger
if (current !== null) {
this.currentdtl = current
this.queryTableDis(this.currentdtl.id)

12
wms_pro/qd/src/views/wms/stor_manage/warehouse/pick/index.vue
View File

@@ -115,12 +115,12 @@
</template>
</el-table-column>
<el-table-column prop="vehicle_code" label="载具编号" show-overflow-tooltip width="120" />
<el-table-column prop="qty" label="物料数量" show-overflow-tooltip />
<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="unit_id" label="单位" show-overflow-tooltip width="120" />
<!-- <el-table-column prop="qty" label="物料数量" show-overflow-tooltip />-->
<!-- <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="unit_id" label="单位" show-overflow-tooltip width="120" />-->
<el-table-column prop="biz_code" label="业务单据编码" show-overflow-tooltip width="120" />
<el-table-column prop="biz_date" label="业务单据时间" show-overflow-tooltip width="130" />
<el-table-column prop="parent_id" label="父单据数据id" show-overflow-tooltip width="120" />