修改
This commit is contained in:
@@ -147,7 +147,7 @@
|
|||||||
@selection-change="crud.selectionChangeHandler"
|
@selection-change="crud.selectionChangeHandler"
|
||||||
>
|
>
|
||||||
<el-table-column type="selection" width="50" />
|
<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 prop="task_code" label="任务编码" />
|
||||||
<el-table-column v-if="false" prop="task_type" label="任务类型" />
|
<el-table-column v-if="false" prop="task_type" label="任务类型" />
|
||||||
<el-table-column prop="task_type_name" label="任务类型" />
|
<el-table-column prop="task_type_name" label="任务类型" />
|
||||||
@@ -205,7 +205,7 @@
|
|||||||
<!-- 组件-->
|
<!-- 组件-->
|
||||||
<component
|
<component
|
||||||
:is="currentComponent"
|
:is="currentComponent"
|
||||||
:task-uuid="taskdtl_id"
|
:task-uuid="task_id"
|
||||||
:dialog-visible="viewDialogVisible"
|
:dialog-visible="viewDialogVisible"
|
||||||
/>
|
/>
|
||||||
<span slot="footer" class="dialog-footer">
|
<span slot="footer" class="dialog-footer">
|
||||||
@@ -234,8 +234,8 @@ export default {
|
|||||||
return CRUD({
|
return CRUD({
|
||||||
title: '任务',
|
title: '任务',
|
||||||
url: 'api/task',
|
url: 'api/task',
|
||||||
idField: 'taskdtl_id',
|
idField: 'task_id',
|
||||||
sort: 'taskdtl_id,desc',
|
sort: 'task_id,desc',
|
||||||
crudMethod: { ...crudTask },
|
crudMethod: { ...crudTask },
|
||||||
query: {
|
query: {
|
||||||
task_code:'',vehicle_code:'',start_point_code:'',next_point_code:'',task_type:'',taskdtl_type:'',finished_type:'',task_status:""
|
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 {
|
return {
|
||||||
viewDialogVisible: false,
|
viewDialogVisible: false,
|
||||||
fullscreen: false,
|
fullscreen: false,
|
||||||
taskdtl_id: '',
|
task_id: '',
|
||||||
currentComponent: '',
|
currentComponent: '',
|
||||||
openParam: {},
|
openParam: {},
|
||||||
create_time: [],
|
create_time: [],
|
||||||
@@ -336,7 +336,7 @@ export default {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
const data = {
|
const data = {
|
||||||
taskdtl_id: command.row.taskdtl_id,
|
task_id: command.row.task_id,
|
||||||
method_name: method_name
|
method_name: method_name
|
||||||
}
|
}
|
||||||
crudTask.operation(data).then(res => {
|
crudTask.operation(data).then(res => {
|
||||||
@@ -347,7 +347,7 @@ export default {
|
|||||||
})
|
})
|
||||||
},
|
},
|
||||||
view(row) {
|
view(row) {
|
||||||
this.taskdtl_id = row.taskdtl_id
|
this.task_id = row.task_id
|
||||||
switch (row.task_type) {
|
switch (row.task_type) {
|
||||||
case '01':// 入库
|
case '01':// 入库
|
||||||
this.fullscreen = true
|
this.fullscreen = true
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
label-width="80px"
|
label-width="80px"
|
||||||
label-suffix=":"
|
label-suffix=":"
|
||||||
>
|
>
|
||||||
<el-form-item label="到货日期">
|
<el-form-item label="统计日期">
|
||||||
<date-range-picker v-model="query.createTime" class="date-item"/>
|
<date-range-picker v-model="query.createTime" class="date-item"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<rrOperation/>
|
<rrOperation/>
|
||||||
@@ -30,9 +30,10 @@
|
|||||||
style="width: 100%;"
|
style="width: 100%;"
|
||||||
@selection-change="crud.selectionChangeHandler"
|
@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">
|
<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>
|
</template>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|
||||||
@@ -45,9 +46,10 @@
|
|||||||
style="width: 100%;"
|
style="width: 100%;"
|
||||||
@selection-change="crud.selectionChangeHandler"
|
@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">
|
<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>
|
</template>
|
||||||
</el-table>
|
</el-table>
|
||||||
<!--分页组件-->
|
<!--分页组件-->
|
||||||
|
|||||||
Reference in New Issue
Block a user