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

代码更新

Browse Source
This commit is contained in:
liuxy
2022-10-20 21:17:12 +08:00
parent 42e40b2f48 a161a8982d
commit 60eca3bb79
13 changed files with 244 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/qd/src/views/wms/pa/workloadstat/index.vue
View File

@@ -97,7 +97,7 @@ export default {
add: false,
edit: false,
del: false,
download: false,
download: true,
reset: true
}
})

2
mes/qd/src/views/wms/pdm/produce/mouthtask/index.vue
View File

@@ -160,7 +160,7 @@
<el-table-column prop="plan_org_name" label="申报单位" width="100" />
<el-table-column prop="device_name" label="关键设备" width="100" />
<el-table-column prop="plan_finish_date" label="交货日期" width="90" />
<el-table-column prop="old_mark" label="牌号" />
<el-table-column prop="old_mark" min-width="100" label="牌号" />
<el-table-column prop="material_code" label="物料编码" min-width="150"/>
<el-table-column :formatter="seriesFormat" min-width="80" prop="product_series" label="系列" />
<el-table-column prop="product_type_name" label="生产方式" />

2
mes/qd/src/views/wms/pdm/produce/producetask/index.vue
View File

@@ -174,7 +174,7 @@
<el-table-column prop="plan_month" label="计划月份" />
<el-table-column prop="plan_finish_date" label="交货日期" width="90" />
<el-table-column prop="material_code" label="物料编码" min-width="150"/>
<el-table-column prop="old_mark" label="牌号" />
<el-table-column prop="old_mark" min-width="100" label="牌号" />
<el-table-column prop="product_type_name" label="生产方式" />
<el-table-column prop="product_weight" label="需求重量" :formatter="crud.formatNum3"/>
<el-table-column prop="fact_weight" label="生产重量" :formatter="crud.formatNum3" width="150" align="center">

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

@@ -226,6 +226,7 @@
size="mini"
:data="crud.data"
style="width: 100%;"
:max-height="590"
:highlight-current-row="true"
@selection-change="mySelectionChange"
>
@@ -308,7 +309,12 @@ export default {
name: 'workorder',
components: { ChangeDialog, ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination },
cruds() {
return CRUD({ title: '工令', idField: 'workorder_id', url: 'api/workorder', crudMethod: { ...workorder },
return CRUD({ title: '工令',
props: {
// 每页数据条数
size: 20
},
idField: 'workorder_id', url: 'api/workorder', crudMethod: { ...workorder },
optShow: {
add: true,
edit: false,

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

@@ -147,7 +147,7 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="50" />
<el-table-column v-if="false" prop="taskdtl_id" label="任务标识" />
<el-table-column v-if="false" prop="task_id" label="任务标识" />
<el-table-column prop="task_code" label="任务编码" />
<el-table-column v-if="false" prop="task_type" label="任务类型" />
<el-table-column prop="task_type_name" label="任务类型" />
@@ -205,7 +205,7 @@
<!-- 组件-->
<component
:is="currentComponent"
:task-uuid="taskdtl_id"
:task-uuid="task_id"
:dialog-visible="viewDialogVisible"
/>
<span slot="footer" class="dialog-footer">
@@ -234,8 +234,8 @@ export default {
return CRUD({
title: '任务',
url: 'api/task',
idField: 'taskdtl_id',
sort: 'taskdtl_id,desc',
idField: 'task_id',
sort: 'task_id,desc',
crudMethod: { ...crudTask },
query: {
task_code:'',vehicle_code:'',start_point_code:'',next_point_code:'',task_type:'',taskdtl_type:'',finished_type:'',task_status:""
@@ -253,7 +253,7 @@ export default {
return {
viewDialogVisible: false,
fullscreen: false,
taskdtl_id: '',
task_id: '',
currentComponent: '',
openParam: {},
create_time: [],
@@ -336,7 +336,7 @@ export default {
return
}
const data = {
taskdtl_id: command.row.taskdtl_id,
task_id: command.row.task_id,
method_name: method_name
}
crudTask.operation(data).then(res => {
@@ -347,7 +347,7 @@ export default {
})
},
view(row) {
this.taskdtl_id = row.taskdtl_id
this.task_id = row.task_id
switch (row.task_type) {
case '01':// 入库
this.fullscreen = true

35
mes/qd/src/views/wms/statistics/materPlan/index.vue
View File

@@ -11,9 +11,26 @@
label-width="80px"
label-suffix=":"
>
<el-form-item label="到货日期">
<el-form-item label="统计日期">
<date-range-picker v-model="query.createTime" class="date-item"/>
</el-form-item>
<el-form-item label="所属组织">
<el-select
v-model="query.org_id"
clearable
size="mini"
placeholder="所属组织"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in Depts"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<rrOperation/>
</el-form>
</div>
@@ -30,9 +47,10 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="index" label="序号" width="100" align="center"/>
<el-table-column type="index" label="序号" width="100" align="center" fixed/>
<template v-for="(col,index) in cols">
<el-table-column v-if="col" :prop="col.prop" :label="col.label" width="120px" show-overflow-tooltip/>
<el-table-column v-if="col.prop !== '1'" :prop="col.prop" :label="col.label" width="120px" show-overflow-tooltip/>
<el-table-column v-if="col.prop === '1'" :prop="col.prop" :label="col.label" width="120px" show-overflow-tooltip fixed/>
</template>
</el-table>
@@ -45,9 +63,10 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="index" label="序号" width="100" align="center"/>
<el-table-column type="index" label="序号" width="100" align="center" fixed/>
<template v-for="(col,index) in cols2">
<el-table-column v-if="col" :prop="col.prop" :label="col.label" width="120px" show-overflow-tooltip/>
<el-table-column v-if="!col.option" :prop="col.prop" :label="col.label" width="120px" show-overflow-tooltip/>
<el-table-column v-if="col.option" :prop="col.prop" :label="col.label" width="120px" show-overflow-tooltip fixed/>
</template>
</el-table>
<!--分页组件-->
@@ -67,6 +86,7 @@ import crudInspectionsheetmst from '@/api/wms/ql/inspectionsheetmst'
import { download } from '@/api/data'
import { downloadFile } from '@/utils'
import Date from '@/utils/datetime'
import workorder from '@/api/wms/pdm/workorder'
const start = new Date()
export default {
@@ -96,6 +116,7 @@ export default {
cols: [],
cols2: [],
dtlList: [],
Depts: [],
statusList: [],
permission: {},
rules: {}
@@ -104,7 +125,9 @@ export default {
beforeCreate() {
},
created() {
workorder.getDepts().then(res => {
this.Depts = res
})
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据

2
mes/qd/src/views/wms/statistics/powderOrderQuery/index.vue
View File

@@ -131,7 +131,7 @@ export default {
add: false,
edit: false,
del: false,
download: false,
download: true,
reset: true
}
})