|
|
|
@ -57,7 +57,6 @@ |
|
|
|
<template slot-scope="scope"> |
|
|
|
<a type="text" @click="openEditDialog(scope.row)">修改</a> |
|
|
|
<a type="text" @click="openAssignDialog(scope.row)" :disabled="!scope.row.orderNo">分配人员</a> |
|
|
|
<a type="text" @click="openReportDialog(scope.row)" :disabled="scope.row.status === '已完成'">节点报工</a> |
|
|
|
<a type="text" @click="finishOrder(scope.row)" :disabled="scope.row.status === '已完成'">完工</a> |
|
|
|
<a type="text" style="color:#F56C6C" @click="deleteOrder(scope.row)">删除</a> |
|
|
|
</template> |
|
|
|
@ -75,7 +74,7 @@ |
|
|
|
style="margin-top: 20px; text-align: right"> |
|
|
|
</el-pagination> |
|
|
|
|
|
|
|
<el-dialog :title="saveHeaderData.orderNo ? '修改改造项目订单' : '新增改造项目订单'" :visible.sync="setUp.reviewFlag" width="700px" :close-on-click-modal="false" v-drag> |
|
|
|
<el-dialog :title="saveHeaderData.orderNo ? '修改改造项目订单' : '新增改造项目订单'" :visible.sync="setUp.reviewFlag" width="550px" :close-on-click-modal="false" v-drag> |
|
|
|
<el-form |
|
|
|
ref="editForm" |
|
|
|
:model="saveHeaderData" |
|
|
|
@ -93,15 +92,34 @@ |
|
|
|
<el-col :span="12"><el-form-item label="计划发货日期"><el-date-picker v-model="saveHeaderData.planDeliveryDate" type="date" value-format="yyyy-MM-dd" style="width: 100%"></el-date-picker></el-form-item></el-col> |
|
|
|
<el-col :span="12"><el-form-item label="状态"><el-select v-model="saveHeaderData.status" style="width: 100%"><el-option label="已排产" value="已排产"></el-option><el-option label="进行中" value="进行中"></el-option><el-option label="已完成" value="已完成"></el-option></el-select></el-form-item></el-col> |
|
|
|
</el-row> |
|
|
|
<el-form-item label="人员分配策略"> |
|
|
|
<el-switch |
|
|
|
v-model="saveHeaderData.autoAssignAllUsers" |
|
|
|
:active-value="true" |
|
|
|
:inactive-value="false" |
|
|
|
active-text="创建后默认分配对应角色全部人员" |
|
|
|
inactive-text="手动分配人员"> |
|
|
|
</el-switch> |
|
|
|
</el-form-item> |
|
|
|
<el-row :gutter="20"> |
|
|
|
<el-col :span="12"> |
|
|
|
<el-form-item> |
|
|
|
<template slot="label"> |
|
|
|
人员分配策略 |
|
|
|
<el-tooltip effect="dark" placement="top"> |
|
|
|
<div slot="content"> |
|
|
|
默认分配：创建订单后，系统会按节点角色自动分配该角色下全部人员。<br> |
|
|
|
手动分配：创建订单后不自动分配，需要在“分配人员”里手工选择负责人。 |
|
|
|
</div> |
|
|
|
<i class="el-icon-question" style="margin-left:6px;color:#909399;cursor:pointer;"></i> |
|
|
|
</el-tooltip> |
|
|
|
</template> |
|
|
|
<el-radio-group v-model="saveHeaderData.autoAssignAllUsers"> |
|
|
|
<el-radio :label="true">默认分配</el-radio> |
|
|
|
<el-radio :label="false">手动分配</el-radio> |
|
|
|
</el-radio-group> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="12"> |
|
|
|
<el-form-item label="节点报工模式"> |
|
|
|
<el-radio-group v-model="saveHeaderData.nodeReportMode"> |
|
|
|
<el-radio label="PARALLEL">并行</el-radio> |
|
|
|
<el-radio label="SEQUENTIAL">按顺序</el-radio> |
|
|
|
</el-radio-group> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
</el-row> |
|
|
|
<el-form-item label="特殊要求"><el-input v-model="saveHeaderData.specialRequirement" type="textarea" :rows="3"></el-input></el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-footer style="height: 40px; margin-top: 50px; text-align: center"> |
|
|
|
@ -191,7 +209,7 @@ export default { |
|
|
|
const done = list.filter(item => item.status === '已完成').length |
|
|
|
const currentNode = (list.find(item => item.status !== '已完成') || {}).nodeName || '全部完成' |
|
|
|
const assigneeSummary = list.filter(item => item.assigneeUserName).map(item => `${item.nodeName}:${item.assigneeUserName}`).join('；') |
|
|
|
return { ...row, autoAssignAllUsers: !!row.autoAssignAllUsers, nodeList: list, nodeDoneCount: done, nodeTotalCount: list.length, currentNode: row.currentNode || currentNode, assigneeSummary: assigneeSummary || '-' } |
|
|
|
return { ...row, autoAssignAllUsers: !!row.autoAssignAllUsers, nodeReportMode: row.nodeReportMode || 'PARALLEL', nodeList: list, nodeDoneCount: done, nodeTotalCount: list.length, currentNode: row.currentNode || currentNode, assigneeSummary: assigneeSummary || '-' } |
|
|
|
}, |
|
|
|
loadMockData() { |
|
|
|
this.dataList = [ |
|
|
|
@ -201,7 +219,8 @@ export default { |
|
|
|
modelNo: 'LC-REN-630', |
|
|
|
color: '钛金灰', |
|
|
|
floorCount: 10, |
|
|
|
autoAssignAllUsers: false, |
|
|
|
autoAssignAllUsers: true, |
|
|
|
nodeReportMode: 'PARALLEL', |
|
|
|
specialRequirement: '井道尺寸受限，需优化导轨方案', |
|
|
|
planDeliveryDate: '2026-04-28', |
|
|
|
status: '进行中', |
|
|
|
@ -219,7 +238,8 @@ export default { |
|
|
|
modelNo: 'LC-REN-800', |
|
|
|
color: '深空黑', |
|
|
|
floorCount: 14, |
|
|
|
autoAssignAllUsers: false, |
|
|
|
autoAssignAllUsers: true, |
|
|
|
nodeReportMode: 'PARALLEL', |
|
|
|
specialRequirement: '兼容旧楼层召唤系统', |
|
|
|
planDeliveryDate: '2026-05-06', |
|
|
|
status: '已排产', |
|
|
|
@ -239,7 +259,7 @@ export default { |
|
|
|
this.getDataList('Y') |
|
|
|
}, |
|
|
|
openEditDialog(row) { |
|
|
|
this.saveHeaderData = row ? { ...row, autoAssignAllUsers: !!row.autoAssignAllUsers } : { orderNo: '', projectNo: '', modelNo: '', color: '', floorCount: 1, specialRequirement: '', planDeliveryDate: '', status: '已排产', autoAssignAllUsers: false, nodeList: [] } |
|
|
|
this.saveHeaderData = row ? { ...row, autoAssignAllUsers: !!row.autoAssignAllUsers, nodeReportMode: row.nodeReportMode || 'PARALLEL' } : { orderNo: '', projectNo: '', modelNo: '', color: '', floorCount: 1, specialRequirement: '', planDeliveryDate: '', status: '已排产', autoAssignAllUsers: true, nodeReportMode: 'PARALLEL', nodeList: [] } |
|
|
|
this.setUp.reviewFlag = true |
|
|
|
}, |
|
|
|
saveOrder() { |
|
|
|
|
