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

优化

Browse Source
This commit is contained in:
zds
2022-11-22 20:01:47 +08:00
parent dc910c9a35
commit ac9b5a8835
10 changed files with 123 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mes/qd/src/views/wms/pdm/produce/mouthtask/AddDialog.vue
View File

@@ -4,6 +4,7 @@
:visible.sync="dialogVisible"
:show-close="false"
@close="close"
@open="open"
>
<span slot="title" class="dialog-footer">
<div class="crud-opts2">
@@ -173,11 +174,13 @@ export default {
workorder.getDepts().then(res => {
this.Depts = res
})
producetask.getDevices().then(res => {
this.Devices = res
})
},
methods: {
open() {
producetask.getDevices({ product_series_id: this.form.product_series}).then(res => {
this.Devices = res
})
},
close() {
this.$emit('update:dialogShow', false)
this.form = {}
@@ -185,7 +188,6 @@ export default {
},
submit() {
producetask.submit3(this.form).then(res => {
debugger
this.$emit('update:dialogShow', false)
this.form = {}
this.$emit('AddChanged')

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

@@ -50,8 +50,8 @@
</el-form-item>
<el-form-item label="任务类型">
<el-select
filterable
v-model="query.task_type"
filterable
style="width: 180px"
placeholder="任务类型"
class="filter-item"
@@ -67,8 +67,8 @@
</el-form-item>
<el-form-item label="任务明细">
<el-select
filterable
v-model="query.taskdtl_type"
filterable
style="width: 180px"
placeholder="任务类型"
class="filter-item"
@@ -112,10 +112,9 @@
</el-select>
</el-form-item>
<el-form-item label="任务状态">
<el-select
v-model="query.task_status"
v-model="query.status"
multiple
style="width: 400px"
placeholder="任务状态"
@@ -150,24 +149,20 @@
<el-table-column v-if="false" prop="taskdtl_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="任务类型" />
<el-table-column prop="task_type_name" label="任务类型" />
<el-table-column v-if="false" prop="taskdtl_type" label="任务明细" />
<el-table-column prop="taskdtl_type_name" label="任务明细" />
<el-table-column v-if="false" prop="task_status" label="任务状态" />
<el-table-column prop="task_status_name" label="任务状态" width="95px" :formatter="formatTaskStatusName" />
<!--
<el-table-column v-if="false" prop="finished_type" label="完成方式" />
-->
<!-- <el-table-column prop="finished_type_name" label="完成方式" :formatter="formatFinishTypeName"/>-->
<el-table-column prop="start_area_name" label="起始区域" width="95" show-overflow-tooltip />
<el-table-column prop="start_point_code" label="起点编码" width="85" />
<el-table-column prop="start_point_name" label="起点名称" width="105" show-overflow-tooltip/>
<el-table-column prop="start_point_name" label="起点名称" width="105" show-overflow-tooltip />
<el-table-column prop="next_area_name" label="下一区域" width="95" show-overflow-tooltip />
<el-table-column prop="next_point_code" label="下一点编码" width="85" />
<el-table-column prop="next_point_name" label="下一点名称" width="105" show-overflow-tooltip/>
<el-table-column prop="next_point_name" label="下一点名称" width="105" show-overflow-tooltip />
<el-table-column prop="vehicle_code" label="载具编码" />
<el-table-column prop="remark" label="备注" width="120" show-overflow-tooltip />
<el-table-column prop="update_by" label="修改者" v-if="false"/>
<el-table-column v-if="false" prop="update_by" label="修改者" />
<el-table-column prop="create_time" label="创建时间" width="135" />
<el-table-column prop="update_time" label="修改时间" width="135" />
<el-table-column
@@ -184,10 +179,6 @@
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'a')">完成</el-dropdown-item>
<!-- <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'b')">取消</el-dropdown-item>-->
<!-- <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'c')">拉回</el-dropdown-item>-->
<!-- <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'d')">重发</el-dropdown-item>-->
<!-- <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'e')">详情</el-dropdown-item>-->
</el-dropdown-menu>
</el-dropdown>
</template>
@@ -238,7 +229,7 @@ export default {
sort: 'taskdtl_id,desc',
crudMethod: { ...crudTask },
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: '', status:''
},
optShow: {
add: false,
@@ -257,9 +248,11 @@ export default {
currentComponent: '',
openParam: {},
create_time: [],
task_status: [],
taskStatusList: [],
taskTypeList: [],
finishTypeList: [],
flag1: true,
permission: {
},
@@ -276,16 +269,34 @@ export default {
crudTask.getFinishType().then(data => {
this.finishTypeList = data
})
this.crud.query.task_status = ['-1']
this.crud.query.status = ['11']
this.crud.query.task_status = '11'
this.crud.toQuery()
},
methods: {
[CRUD.HOOK.beforeRefresh]() {
if (this.flag1) {
this.crud.query.status = ['11']
this.crud.query.task_status = '11'
this.flag1 = false
}
},
hand(value) {
this.crud.toQuery()
},
handTaskStatus(value) {
var str1 = ''
if (value) {
this.query.task_status = this.task_status.toString()
for (const item of value) {
if (str1 === '') {
str1 = item
} else {
str1 = str1 + ',' + item
}
}
this.query.task_status = str1
} else {
this.query.task_status = ''
}
this.crud.toQuery()
},