Commit d1bf8d7a authored by 沈翠玲's avatar 沈翠玲

生产排产增加已发外协

parent 3f2a35f6
...@@ -101,6 +101,15 @@ export function getProcessInfo(query) { ...@@ -101,6 +101,15 @@ export function getProcessInfo(query) {
}); });
} }
// 查询任务工作单元列表
export function postAssistMark(query) {
return request({
url: "mobile/pro/protask/assistMark",
method: "post",
data: query,
});
}
// 默认工作中心查询 // 默认工作中心查询
export function getdefaultWorkCenterList() { export function getdefaultWorkCenterList() {
// workshopId workCenterId = workstationId workstationName workunitId workunitName // workshopId workCenterId = workstationId workstationName workunitId workunitName
...@@ -126,3 +135,10 @@ export function openTaskWorkunit(id) { ...@@ -126,3 +135,10 @@ export function openTaskWorkunit(id) {
}); });
} }
// 获取字典
export function getDictAssistMark(id) {
return request({
url: "/mes/pro/taskWorkunit/getDictList/assistMark",
method: "get"
});
}
...@@ -122,7 +122,16 @@ ...@@ -122,7 +122,16 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="已发外协" prop="assistMark">
<el-select v-model="queryParams.assistMark" placeholder="请选择已发外协" clearable>
<el-option
v-for="dict in AssistMarkDicts"
:key="dict.dictValue"
:label="dict.dictKey"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
...@@ -244,6 +253,11 @@ ...@@ -244,6 +253,11 @@
<el-table-column label="已完成数量" align="center" prop="quantityQualify" /> <el-table-column label="已完成数量" align="center" prop="quantityQualify" />
<el-table-column label="委外已收货数量" align="center" prop="quantityAssistFinish" /> <el-table-column label="委外已收货数量" align="center" prop="quantityAssistFinish" />
<el-table-column label="委外待收货数量" align="center" prop="quantityAssist" /> <el-table-column label="委外待收货数量" align="center" prop="quantityAssist" />
<el-table-column label="已发外协" align="center" prop="assistMark">
<template slot-scope="{ row }">
<el-checkbox v-model="row.assistMark" label="" size="large" true-label="1" false-label="0" @change="changeAssistMark(row)" />
</template>
</el-table-column>
<el-table-column label="编排人员" align="center" prop="arrangeUsername" /> <el-table-column label="编排人员" align="center" prop="arrangeUsername" />
<!-- <el-table-column label="工单编码" align="center" prop="workorderCode" /> --> <!-- <el-table-column label="工单编码" align="center" prop="workorderCode" /> -->
<el-table-column <el-table-column
...@@ -647,6 +661,8 @@ import { ...@@ -647,6 +661,8 @@ import {
getworkshopList, getworkshopList,
getworkstationList, getworkstationList,
gettaskWorkunitList, gettaskWorkunitList,
getDictAssistMark,
postAssistMark,
getdefaultWorkCenterList} from '@/api/mes/pro/scheduleList' getdefaultWorkCenterList} from '@/api/mes/pro/scheduleList'
import {putProtaskSplit, splitWorkstation, deleteTask, unschedule, updateProTaskWorkunitApi} from '@/api/mes/pro/protask' import {putProtaskSplit, splitWorkstation, deleteTask, unschedule, updateProTaskWorkunitApi} from '@/api/mes/pro/protask'
import BrandSelect from "@/components/TmTool/index.vue"; import BrandSelect from "@/components/TmTool/index.vue";
...@@ -709,6 +725,7 @@ export default { ...@@ -709,6 +725,7 @@ export default {
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
selectedRows: [], selectedRows: [],
AssistMarkDicts: [],
workstationId: null, workstationId: null,
// 查询参数 // 查询参数
queryParams: { queryParams: {
...@@ -719,6 +736,7 @@ export default { ...@@ -719,6 +736,7 @@ export default {
arrangeUsername: null, arrangeUsername: null,
workorderCodes: null, workorderCodes: null,
processName: null, processName: null,
assistMark: null,
statusArr: ['PREPARE'], statusArr: ['PREPARE'],
scheduleStartDate: null, scheduleStartDate: null,
scheduleEndDate: null, scheduleEndDate: null,
...@@ -780,6 +798,13 @@ export default { ...@@ -780,6 +798,13 @@ export default {
this.isOrder = true this.isOrder = true
this.arrangCodeVisible = true this.arrangCodeVisible = true
}, },
changeAssistMark(row) {
postAssistMark({task_workunit_id: row.taskWorkunitId, assist_mark: row.assistMark}).then(res => {
if (res.code === 200) {
this.getList();
}
})
},
handleSubmitJobAssignment() { handleSubmitJobAssignment() {
if(!this.Assignform.quantity || this.Assignform.quantity === 0) return this.$modal.msgError("分派任务数量不可为0") if(!this.Assignform.quantity || this.Assignform.quantity === 0) return this.$modal.msgError("分派任务数量不可为0")
if(!this.AssignList || this.AssignList.length === 0) return this.$modal.msgError("请先点击检查按钮,检查数据") if(!this.AssignList || this.AssignList.length === 0) return this.$modal.msgError("请先点击检查按钮,检查数据")
...@@ -832,6 +857,9 @@ export default { ...@@ -832,6 +857,9 @@ export default {
} }
this.getList(); this.getList();
}); });
getDictAssistMark().then(res => {
this.AssistMarkDicts = res.data || []
})
}, },
async hanldeGetworkshopList() { async hanldeGetworkshopList() {
const response = await getworkshopList() const response = await getworkshopList()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment