wilson
/
rongxing-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

11月份问题清单 2022年12月2日 sxm

master
[li_she] 3 years ago
parent
e063a4fa06
commit
6752fe62bf
6 changed files with 1509 additions and 1396 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/api/schedule/order_schedule.js
  2. 218
      src/views/modules/schedule/order_schedule.vue
  3. 67
      src/views/modules/schedule/order_schedule_expand.vue
  4. 44
      src/views/modules/shopOrder/productionOrderScheduling/searchProductionDispatchList.vue
  5. 13
      src/views/modules/shopOrder/shopOrder/common/tool_add_and_edit.vue
  6. 16
      src/views/modules/shopOrder/shopOrder/shopOrder.vue

3
src/api/schedule/order_schedule.js
View File

@ -38,3 +38,6 @@ export const refreshScheduleByRouting = data => createAPI('scheduling/refreshSch
//派工单按照日历
export const refreshScheduleByCalendar = data => createAPI('scheduling/refreshScheduleByCalendar', 'POST', data)
// 产能汇总
export const sumProductionCapacity = data => createAPI('schedule/sumProductionCapacity', 'POST', data)

218
src/views/modules/schedule/order_schedule.vue
View File

@ -5,22 +5,27 @@
<legend>{{ buttons.menuButton }}</legend>
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
<el-form-item :label="''" style="margin-left: 30px;">
<el-button class="customer-bun-min" type="primary" @click="refreshPageTables" style="margin-left: 10px; margin-bottom: 5px;">{{buttons.refreshButton}}</el-button>
</el-form-item>
<el-form-item :label="''">
<el-button class="customer-bun-min" :disabled = "authEdit" type="primary" @click="moveUpScheduleBun" style="margin-left: 10px; margin-bottom: 5px;">{{buttons.moveUp}}</el-button>
<el-button class="customer-bun-min" type="primary" @click="refreshPageTables"
style="margin-left: 10px; margin-bottom: 5px;">{{ buttons.refreshButton }}
</el-button>
</el-form-item>
<el-form-item :label="''">
<el-button class="customer-bun-min" :disabled = "authEdit" type="primary" @click="moveDownScheduleBun" style="margin-left: 10px; margin-bottom: 5px;">{{buttons.moveDown}}</el-button>
<el-button class="customer-bun-min" :disabled="authEdit" type="primary" @click="moveUpScheduleBun"
style="margin-left: 10px; margin-bottom: 5px;">{{ buttons.moveUp }}
</el-button>
</el-form-item>
<el-form-item :label="''">
<el-button v-if="showDefault" @click="saveMultiLanguage()" type="primary">多语言设置</el-button>
<el-button class="customer-bun-min" :disabled="authEdit" type="primary" @click="moveDownScheduleBun"
style="margin-left: 10px; margin-bottom: 5px;">{{ buttons.moveDown }}
</el-button>
</el-form-item>
</el-form>
</fieldset>
<!-- 排序规则 -->
<fieldset class="customer-field" style="margin-left: 640px; margin-top: -41px; width: 135px;">
<legend>{{labels.sortNo}}</legend><br>
<legend>{{ labels.sortNo }}</legend>
<br>
<el-form :inline="true" style="margin-top: -10px; margin-bottom: 10px;" label-position="top" label-width="100px">
<el-form-item :label="''" style="margin-bottom: 10px;">
<el-radio-group v-model="pageData.sortField">
@ -80,7 +85,8 @@
</el-date-picker>
</el-form-item>
<el-form-item :label="''" style="margin-top: -10px;">
<el-checkbox v-model="pageData.specifiedTime" true-label="Y" false-label="N" style="margin-top: 28px; margin-right: -20px;" ></el-checkbox>
<el-checkbox v-model="pageData.specifiedTime" true-label="Y" false-label="N"
style="margin-top: 28px; margin-right: -20px;"></el-checkbox>
<el-time-picker
format="HH:mm"
arrow-control
@ -99,7 +105,8 @@
</el-form-item>
<el-form-item>
<span slot="label" style="" @click="getBaseList(88)"><a herf="#">{{ labels.resourceId }}</a></span>
<el-input v-model="pageData.resourceId" @blur="getCurrentWorkCenterNoByResourceId" style="width: 120px"></el-input>
<el-input v-model="pageData.resourceId" @blur="getCurrentWorkCenterNoByResourceId"
style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label=labels.workCenterNo>
<el-input v-model="pageData.workCenterNo" readonly="readonly" style="width: 120px"></el-input>
@ -130,7 +137,9 @@
</el-input>
</el-form-item>
<el-form-item :label="''" style="text-align: center; margin-top: 15px; margin-bottom: 9px;">
<el-button type="primary" :disabled = "authAdd" @click="addWaitScheduleBun" style="margin-left: 30px; margin-top: 10px; margin-bottom: 15px;">{{buttons.insertWaitOrder}}</el-button>
<el-button type="primary" :disabled="authAdd" @click="addWaitScheduleBun"
style="margin-left: 30px; margin-top: 10px; margin-bottom: 15px;">{{ buttons.insertWaitOrder }}
</el-button>
</el-form-item>
</el-form>
</fieldset>
@ -174,30 +183,47 @@
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item class="customer-li" command="生产工单"
:disabled="primaryMenuButton.shopOrderFlag">{{buttons.shopOrder}}</el-dropdown-item>
:disabled="primaryMenuButton.shopOrderFlag">{{ buttons.shopOrder }}
</el-dropdown-item>
<el-dropdown-item class="customer-li" command="工作日历"
:disabled="primaryMenuButton.workCalendarOutFlag">{{buttons.workCalendar}}</el-dropdown-item>
:disabled="primaryMenuButton.workCalendarOutFlag">{{ buttons.workCalendar }}
</el-dropdown-item>
<hr width="95%"/>
<el-dropdown-item class="customer-li" command="批量维护工作日历"
:disabled="primaryMenuButton.batchWorkCalendarFlag">{{buttons.batchWorkCalendar}}</el-dropdown-item>
:disabled="primaryMenuButton.batchWorkCalendarFlag">{{ buttons.batchWorkCalendar }}
</el-dropdown-item>
<hr width="95%"/>
<el-dropdown-item class="customer-li" command="分批排产"
:disabled="primaryMenuButton.splitScheduleFlag">{{buttons.splitScheduleOrder}}</el-dropdown-item>
:disabled="primaryMenuButton.splitScheduleFlag">{{ buttons.splitScheduleOrder }}
</el-dropdown-item>
<hr width="95%"/>
<el-dropdown-item class="customer-li" command="重新排产"
:disabled="primaryMenuButton.reScheduleOrderFlag">{{buttons.reScheduleOrder}}</el-dropdown-item>
:disabled="primaryMenuButton.reScheduleOrderFlag">{{ buttons.reScheduleOrder }}
</el-dropdown-item>
<hr width="95%"/>
<el-dropdown-item class="customer-li" command="更改工艺路线"
:disabled="primaryMenuButton.updateProductRouting">{{buttons.changeRouting}}</el-dropdown-item>
:disabled="primaryMenuButton.updateProductRouting">{{ buttons.changeRouting }}
</el-dropdown-item>
<el-dropdown-item class="customer-li" command="更改工艺路线版本"
:disabled="primaryMenuButton.updateProductRouting">{{buttons.changeRoutingRev}}</el-dropdown-item>
:disabled="primaryMenuButton.updateProductRouting">{{ buttons.changeRoutingRev }}
</el-dropdown-item>
<hr width="95%"/>
<el-dropdown-item class="customer-li" command="查看物料库存"
:disabled="primaryMenuButton.partStockFlag">{{buttons.viewPartStock}}</el-dropdown-item>
:disabled="primaryMenuButton.partStockFlag">{{ buttons.viewPartStock }}
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button @click="userSetting('5303Order')" type="primary">{{ buttons.settingTable }}</el-button>
<el-button v-if="showDefault" @click="saveColumnList('5303Order')" type="primary">{{ buttons.defaultTable }}</el-button>
<el-button v-if="showDefault" @click="saveColumnList('5303Order')" type="primary">{{
buttons.defaultTable
}}
</el-button>
<el-link style="margin-left: 30px;color: #0000cc" :underline="false">
{{ '加工中心: ' + pageData.workCenterNo }}
</el-link>
<el-link style="margin-left: 10px;color: #0000cc" :underline="false">
{{ '总产能需求: ' + sumProductionCapacity }}
</el-link>
</el-form>
<el-table
:height="height - 50"
@ -239,27 +265,39 @@
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item class="customer-li" command="生产工单"
:disabled="detailMenuButton.shopOrderFlag">{{buttons.shopOrder}}</el-dropdown-item>
:disabled="detailMenuButton.shopOrderFlag">{{ buttons.shopOrder }}
</el-dropdown-item>
<el-dropdown-item class="customer-li" command="工作日历"
:disabled="detailMenuButton.workCalendarOutFlag">{{buttons.workCalendar}}</el-dropdown-item>
:disabled="detailMenuButton.workCalendarOutFlag">{{ buttons.workCalendar }}
</el-dropdown-item>
<hr width="95%"/>
<el-dropdown-item class="customer-li" command="更改等待时间"
:disabled="detailMenuButton.changeWaitTimeFlag">{{buttons.updateWaitTimes}}</el-dropdown-item>
:disabled="detailMenuButton.changeWaitTimeFlag">{{ buttons.updateWaitTimes }}
</el-dropdown-item>
<el-dropdown-item class="customer-li" command="根据工艺路线调整"
:disabled="detailMenuButton.changeScheduleByRoutingFlag">{{buttons.baseRoutingUpdate}}</el-dropdown-item>
:disabled="detailMenuButton.changeScheduleByRoutingFlag">{{ buttons.baseRoutingUpdate }}
</el-dropdown-item>
<hr width="95%"/>
<el-dropdown-item class="customer-li" command="根据工作日历调整"
:disabled="detailMenuButton.changeScheduleByRoutingFlag">{{buttons.baseCalendarUpdate}}</el-dropdown-item>
:disabled="detailMenuButton.changeScheduleByRoutingFlag">{{ buttons.baseCalendarUpdate }}
</el-dropdown-item>
<hr width="95%"/>
<el-dropdown-item class="customer-li" command="查看物料库存"
:disabled="detailMenuButton.partStockFlag">{{buttons.viewPartStock}}</el-dropdown-item>
:disabled="detailMenuButton.partStockFlag">{{ buttons.viewPartStock }}
</el-dropdown-item>
<hr width="95%"/>
<!-- <el-dropdown-item class="customer-li" command="copyShopOrder"-->
<!-- :disabled="this.currentSchedlingRow?false:true">{{ '复制派工单' }}-->
<!-- </el-dropdown-item>-->
<!-- <el-dropdown-item class="customer-li" command="insertShopOrder"-->
<!-- :disabled="this.currentSchedlingRow?false:true">{{ '插入派工单' }}-->
<!-- </el-dropdown-item>-->
</el-dropdown-menu>
</el-dropdown>
<el-button @click="userSetting('5303Schedule')" type="primary">{{ buttons.settingTable }}</el-button>
<el-button v-if="showDefault" @click="saveColumnList('5303Schedule')" type="primary">{{ buttons.defaultTable }}</el-button>
</el-form>
<el-table class="schedule-table"
:height="height + 50"
:height="height + 25"
:data="orderScheduleList"
border
highlight-current-row
@ -372,6 +410,7 @@ import {
updateScheduleWaitTimes,
refreshScheduleByRouting,
refreshScheduleByCalendar,
sumProductionCapacity
} from '@/api/schedule/order_schedule.js'
import {
@ -392,6 +431,7 @@ import {
export default {
data() {
return {
sumProductionCapacity: 0,
height: 200,
authEdit: false,
authAdd: false,
@ -413,6 +453,8 @@ export default {
currentRoutingRow: {},
currentSchedlingRow: {},
selectList: [],
copyShopOrder: {},
insertShopOrder: {},
pageData: {
site: this.$store.state.user.site,
username: this.$store.state.user.name,
@ -2322,8 +2364,8 @@ export default {
getResourceShiftData() {
let queryData = {
site: this.$store.state.user.site,
workCenterNo: this.pageData.workCenterNo,
resourceId: this.pageData.resourceId,
workCenterNo: this.pageData.workCenterNo.trim(),
resourceId: this.pageData.resourceId.trim(),
scheduleDate: this.pageData.scheduleDate
}
getResourceRestList(queryData).then(({data}) => {
@ -2341,7 +2383,14 @@ export default {
this.currentRoutingRow = null;
})
},
// 加工中心产能汇总
getSumProductionCapacity() {
sumProductionCapacity(this.pageData).then(({data}) => {
if (data && data.code == 0) {
this.sumProductionCapacity = data.data.toFixed(2)
}
})
},
/*获取派工单的信息*/
getOrderScheduleList() {
getOrderScheduleList(this.pageData).then(({data}) => {
@ -2363,6 +2412,7 @@ export default {
this.getResourceShiftData();
this.getShopOrderList();
this.getOrderScheduleList();
this.getSumProductionCapacity()
},
/*列表方法的回调*/
@ -2419,8 +2469,10 @@ export default {
//this.$message.error('请选择工单!');
//return false;
}
let tempData = {'site': this.pageData.site, 'calendarId': this.pageData.calendarId,
'calendarDesc': this.pageData.calendarDesc, 'scheduledDate': this.pageData.scheduleDate};
let tempData = {
'site': this.pageData.site, 'calendarId': this.pageData.calendarId,
'calendarDesc': this.pageData.calendarDesc, 'scheduledDate': this.pageData.scheduleDate
};
//打开组件 需要的数据 展示需要的数据
this.$nextTick(() => {
this.showWorkCalendarOut = true;
@ -2436,8 +2488,10 @@ export default {
//this.$message.error('请选择工单!');
//return false;
}
let tempData = {'site': this.pageData.site, 'calendarId': this.pageData.calendarId,
'calendarDesc': this.pageData.calendarDesc, 'scheduledDate': this.pageData.scheduleDate};
let tempData = {
'site': this.pageData.site, 'calendarId': this.pageData.calendarId,
'calendarDesc': this.pageData.calendarDesc, 'scheduledDate': this.pageData.scheduleDate
};
//打开组件 需要的数据 展示需要的数据
this.$nextTick(() => {
this.showBatchWorkCalendar = true;
@ -2488,7 +2542,12 @@ export default {
this.$message.error(this.labels.pleaseSelectOrder);
return false;
}
let tempData = {'site': this.pageData.site, 'orderNo': this.currentRoutingRow.orderNo,'partNo': this.currentRoutingRow.partNo,'partDesc': this.currentRoutingRow.partDesc};
let tempData = {
'site': this.pageData.site,
'orderNo': this.currentRoutingRow.orderNo,
'partNo': this.currentRoutingRow.partNo,
'partDesc': this.currentRoutingRow.partDesc
};
//打开组件 需要的数据 展示需要的数据
this.$nextTick(() => {
this.updateProductRouting = true;
@ -2503,7 +2562,11 @@ export default {
this.$message.error(this.labels.pleaseSelectOrder);
return false;
}
let tempData = {'site': this.pageData.site, 'orderNo': this.currentRoutingRow.orderNo,'partNo': this.currentRoutingRow.partNo};
let tempData = {
'site': this.pageData.site,
'orderNo': this.currentRoutingRow.orderNo,
'partNo': this.currentRoutingRow.partNo
};
//打开组件 需要的数据 展示需要的数据
this.$nextTick(() => {
this.updateRoutingRev = true;
@ -2541,8 +2604,10 @@ export default {
this.$message.error(this.labels.pleaseSelectSchedule);
return false;
}
let tempData = {'site': this.pageData.site, 'calendarId': this.pageData.calendarId,
'calendarDesc': this.pageData.calendarDesc, 'scheduledDate': this.pageData.scheduleDate};
let tempData = {
'site': this.pageData.site, 'calendarId': this.pageData.calendarId,
'calendarDesc': this.pageData.calendarDesc, 'scheduledDate': this.pageData.scheduleDate
};
//打开组件 需要的数据 展示需要的数据
this.$nextTick(() => {
this.showWorkCalendarOut = true;
@ -2561,9 +2626,11 @@ export default {
let waitTimes = parseFloat(this.currentSchedlingRow.timeRequired) * 60;
//等待时间取整
waitTimes = parseInt(waitTimes);
let tempData = {'site': this.pageData.site, 'orderNo': this.currentSchedlingRow.orderNo,
let tempData = {
'site': this.pageData.site, 'orderNo': this.currentSchedlingRow.orderNo,
'itemNo': this.currentSchedlingRow.itemNo, 'seqNo': this.currentSchedlingRow.seqNo,
'waitTimes': waitTimes};
'waitTimes': waitTimes
};
//打开组件 需要的数据 展示需要的数据
this.$nextTick(() => {
this.showChangeWaitTime = true;
@ -2605,9 +2672,29 @@ export default {
this.showPartStockFlag = true;
this.$refs.comPartStock.init(tempData);
})
}else if(menuName == 'copyShopOrder'){
// 复制订单
this.copyShopOrder = JSON.parse(JSON.stringify(this.currentSchedlingRow))
}else if(menuName == 'insertShopOrder'){
// 插入订单
this.insertShopOrder = JSON.parse(JSON.stringify(this.currentSchedlingRow))
}
},
// 复制订单操作
copyShopOrder(){
},
// 插入订单操作
insertShopOrder(){
if (!this.copyShopOrder){
this.$message.warning('请复制派工单,再执行插入派工单操作!')
return;
}
if (this.copyShopOrder){
this.$message.warning('请复制派工单,再执行插入派工单操作!')
return;
}
},
/*打开分批排产*/
openSplitScheduleModal() {
let routingRow = this.currentRoutingRow;
@ -2645,7 +2732,6 @@ export default {
},
/*设置工艺的行*/
setCurrentRoutingRow(row, column, event) {
this.currentRoutingRow = row;
@ -2857,10 +2943,12 @@ export default {
return false;
}
//请求的参数
let requestData = {'site': this.pageData.site,
'workCenterNo': this.pageData.workCenterNo,
'resourceId': this.pageData.resourceId,
'scheduleSeqNo': scheduleRow.scheduledSeqNo};
let requestData = {
'site': this.pageData.site,
'workCenterNo': this.pageData.workCenterNo.trim(),
'resourceId': this.pageData.resourceId.trim(),
'scheduleSeqNo': scheduleRow.scheduledSeqNo
};
//请求处理当前的参数
moveUpSchedule(requestData).then(({data}) => {
if (data.code != 200) {
@ -2890,10 +2978,12 @@ export default {
return false;
}
//请求的参数
let requestData = {'site': this.pageData.site,
'workCenterNo': this.pageData.workCenterNo,
'resourceId': this.pageData.resourceId,
'scheduleSeqNo': scheduleRow.scheduledSeqNo};
let requestData = {
'site': this.pageData.site,
'workCenterNo': this.pageData.workCenterNo.trim(),
'resourceId': this.pageData.resourceId.trim(),
'scheduleSeqNo': scheduleRow.scheduledSeqNo
};
//请求处理当前的参数
moveDownSchedule(requestData).then(({data}) => {
if (data.code != 200) {
@ -2974,9 +3064,11 @@ export default {
/*调整等待派工单的等待时间*/
changeScheduleWaitTimes(tempData) {
//修改当前等待派工单的等待时间
let requestData = {'site': tempData.site, 'orderNo': tempData.orderNo, 'itemNo': tempData.itemNo,
'seqNo': tempData.seqNo, 'waitTimes': tempData.waitTimes, 'workCenterNo': this.pageData.workCenterNo,
'resourceId': this.pageData.resourceId, 'scheduleSeqNo': this.currentSchedlingRow.scheduledSeqNo};
let requestData = {
'site': tempData.site, 'orderNo': tempData.orderNo, 'itemNo': tempData.itemNo,
'seqNo': tempData.seqNo, 'waitTimes': tempData.waitTimes, 'workCenterNo': this.pageData.workCenterNo.trim(),
'resourceId': this.pageData.resourceId.trim(), 'scheduleSeqNo': this.currentSchedlingRow.scheduledSeqNo
};
updateScheduleWaitTimes(requestData).then(({data}) => {
if (data.code != 200) {
this.$message.error(data.msg);
@ -2991,9 +3083,11 @@ export default {
/*根据工艺路线调整派工单*/
changeScheduleByRouting(tempData) {
//修改当前等待派工单的等待时间
let requestData = {'site': tempData.site, 'orderNo': tempData.orderNo, 'itemNo': tempData.itemNo,
'seqNo': tempData.seqNo, 'workCenterNo': this.pageData.workCenterNo,
'resourceId': this.pageData.resourceId, 'scheduleSeqNo': this.currentSchedlingRow.scheduledSeqNo};
let requestData = {
'site': tempData.site, 'orderNo': tempData.orderNo, 'itemNo': tempData.itemNo,
'seqNo': tempData.seqNo, 'workCenterNo': this.pageData.workCenterNo.trim(),
'resourceId': this.pageData.resourceId.trim(), 'scheduleSeqNo': this.currentSchedlingRow.scheduledSeqNo
};
refreshScheduleByRouting(requestData).then(({data}) => {
if (data.code != 200) {
this.$message.error(data.msg);
@ -3021,9 +3115,11 @@ export default {
/*根据日历调整派工单*/
changeScheduleByCalendar(tempData) {
//修改当前等待派工单的等待时间
let requestData = {'site': tempData.site, 'orderNo': tempData.orderNo, 'itemNo': tempData.itemNo,
'seqNo': tempData.seqNo, 'workCenterNo': this.pageData.workCenterNo,
'resourceId': this.pageData.resourceId, 'scheduleSeqNo': this.currentSchedlingRow.scheduledSeqNo};
let requestData = {
'site': tempData.site, 'orderNo': tempData.orderNo, 'itemNo': tempData.itemNo,
'seqNo': tempData.seqNo, 'workCenterNo': this.pageData.workCenterNo.trim(),
'resourceId': this.pageData.resourceId.trim(), 'scheduleSeqNo': this.currentSchedlingRow.scheduledSeqNo
};
refreshScheduleByCalendar(requestData).then(({data}) => {
if (data.code != 200) {
this.$message.error(data.msg);
@ -3240,6 +3336,7 @@ export default {
.customer-card .el-form-item__content {
margin-top: -15px;
}
.customer-card .el-form-item {
height: 22px;
}
@ -3252,11 +3349,13 @@ export default {
div.el-time-width {
width: 110px !important;
}
/* 全局时间右边框*/
.customer-css input.el-input__inner {
height: 22px !important;
padding-right: 0px !important;
}
/* 控制el-card标签的数据*/
div.customer-el-card {
margin-left: 110px;
@ -3264,6 +3363,7 @@ div.customer-el-card {
height: 20px;
width: 60px;
}
/* 颜色控制 */
div.customer-el-card-pink {
background: #2fff00;
@ -3298,6 +3398,7 @@ div.customer-el-card-blue {
width: 80px;
text-align: center;
}
/*当前按钮的通用样式*/
.customer-css .el-button--medium {
padding: 5px 5px;
@ -3342,6 +3443,7 @@ div.customer-el-card-blue {
.el-input /deep/ .el-icon-time {
display: none;
}
/*控制上下间距*/
hr {
margin-top: 0px;

67
src/views/modules/schedule/order_schedule_expand.vue
View File

@ -76,7 +76,8 @@
style="margin-left: 10px; margin-bottom: 5px;">{{ buttons.refreshButton }}
</el-button>
<el-button :disabled="dataListSelections.length <= 0" type="primary" @click="scheduleBatchDialog()"
style="margin-left: 10px; margin-bottom: 5px;">{{ buttons.scheduleBatch }}
style="margin-left: 10px; margin-bottom: 5px;">
{{ buttons.scheduleBatch ? buttons.scheduleBatch : '批量排产' }}
</el-button>
</el-form-item>
</el-form-item>
@ -137,8 +138,8 @@
<template slot-scope="scope">
<span v-if="!item.columnHidden && item.columnProp == 'resourceList'">
<el-select class="table-select-input" v-model="scope.row.resourceId">
<el-option v-for="(item,index) in scope.row.resourceList.split(';')" :key="index"
:value="item.split(':')[0]" :label="item.split(':')[1]">
<el-option v-for="(item,index) in scope.row.resourceList" :key="index"
:value="item.resourceId" :label="item.resourceDesc">
</el-option>
</el-select>
</span>
@ -1322,40 +1323,7 @@ export default {
}
})
},
/**
* this.$confirm(data.msg, '提示', {
* confirmButtonText: this.labels.confirmLabel,
* celButtonText: this.labels.cancelLabel,
* type: 'warning'
* }).then(() => {
* newItemList = []
* for (let i = 0; i < this.dataListSelections.length; i++) {
* let item = this.dataListSelections[i]
* let newItem = {
* checkFlag: false,
* itemNo: item.itemNo,
* orderNo: item.orderNo,
* qtyToSchedule: item.scheduledQty,
* resourceId: item.resourceId,
* scheduleDate: this.scheduleDate,
* scheduleTime: this.scheduleTime,
* scheduledQty: item.qtyToSchedule,
* site: item.site,
* specifiedTime: this.specifiedTime,
* username: this.$store.state.user.name,
* workCenterNo: item.workCenterNo
* }
* newItemList.push(newItem)
* }
* batchScheduleOrderWithExpand(newItemList).then(({data}) => {
* if (data.code == 200) {
* this.$message.success(data.msg)
* } else if (data.code == 500) {
* this.$message.error(data.msg)
* }
* })
* });
*/
// scheduleBatchDialog
scheduleBatchDialog() {
if (this.dataListSelections.find(item => item.resourceId == '' || item.resourceId == null)) {
@ -1376,7 +1344,30 @@ export default {
/*获取工单信息*/
getShopOrderList() {
getShopOrderList(this.pageData).then(({data}) => {
this.shopOrderList = data.rows;
if (this.pageData.resourceId) {
this.shopOrderList = data.rows.map(item => {
item.resourceId = this.pageData.resourceId
item.resourceList = item.resourceList.split(';').map(resItem => {
let newItem = {
resourceId: resItem.split(':')[0],
resourceDesc: resItem.split(':')[1]
}
return newItem;
})
return item;
})
} else {
this.shopOrderList = data.rows.map(item => {
item.resourceList = item.resourceList.split(';').map(resItem => {
let newItem = {
resourceId: resItem.split(':')[0],
resourceDesc: resItem.split(':')[1]
}
return newItem;
})
return item;
})
}
//清空已经选好的行数据
this.currentRoutingRow = null;
})

44
src/views/modules/shopOrder/productionOrderScheduling/searchProductionDispatchList.vue
View File

@ -69,9 +69,12 @@
<el-form-item>
<span slot="label" style="" @click="getBaseList(18)"><a herf="#">工厂编码：</a></span>
<el-input v-model="searchData.site" style="width: 80px"></el-input>
<el-checkbox style="margin-left: 2px;margin-top: 0px" v-model="searchData.checked">仅显示当前排产的派工单</el-checkbox>
<el-checkbox style="margin-left: 2px;margin-top: 0px" v-model="searchData.checked">仅显示当前排产的派工单
</el-checkbox>
<el-button @click="getData()" type="primary" style="margin-left: 100px;margin-top: 0px">{{ '查询' }}</el-button>
<el-button @click="warnCancelScheduleConfirm" type="primary" style="margin-left: 30px; margin-top: 0px; margin-right: 20px;">{{'取消排产'}}</el-button>
<el-button @click="warnCancelScheduleConfirm" type="primary"
style="margin-left: 30px; margin-top: 0px; margin-right: 20px;">{{ '取消排产' }}
</el-button>
<download-excel
:fields="fields()"
:data="exportData"
@ -145,19 +148,6 @@
} from "@/api/shopOrder/shopOrder.js"
export default {
//查询-生产派工单
name: "searchProductionDispatchList",
watch: {
searchData: {
deep: true,
handler: function (newV, oldV) {
this.searchData.partNo = this.searchData.partNo.toUpperCase()
this.searchData.sResourceID = this.searchData.sResourceID.toUpperCase()
this.searchData.orderNo = this.searchData.orderNo.toUpperCase()
this.searchData.workCenterNo = this.searchData.workCenterNo.toUpperCase()
}
}
},
data() {
return {
tagNo: '',
@ -961,11 +951,35 @@
Chooselist,
column,/*动态列*/
},
watch: {
searchData: {
deep: true,
handler: function (newV, oldV) {
this.searchData.partNo = this.searchData.partNo.toUpperCase()
this.searchData.sResourceID = this.searchData.sResourceID.toUpperCase()
this.searchData.orderNo = this.searchData.orderNo.toUpperCase()
this.searchData.workCenterNo = this.searchData.workCenterNo.toUpperCase()
}
},
$route: {
handler: function (val, oldVal) {
this.$router.onReady(() => {
if (this.$route.query.orderNo) {
this.searchData.orderNo = this.$route.query.orderNo,
this.getData()
}
})
},
// 深度观察监听
deep: true
},
},
mounted() {
this.$nextTick(() => {
this.height = window.innerHeight - 180;
})
},
methods: {
getBaseData(val) {
if (this.tagNo === 24) {

13
src/views/modules/shopOrder/shopOrder/common/tool_add_and_edit.vue
View File

@ -5,7 +5,7 @@
@close="closeDialog"
width="390px"
class="sxm"
:title="titleCon"
:title="titile"
:close-on-click-modal="false"
:visible.sync="visible">
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
@ -130,7 +130,9 @@
objectType: 'button'
},
labels: {
titleCon: '工具信息维护',
titleCon: '工具新增',
titleEdit: '工具信息维护',
titleCopy: '复制工具信息',
itemNo: '工序号：',
itemDesc: '工序名称：',
toolId: '工具编码：',
@ -159,16 +161,17 @@
this.oriToolId = selectRow.toolId;
} else if (operationType === 2){
this.operationFlag = true;
this.selectRow.itemNo = '';
} else {
this.operationFlag = false;
}
//设置标题
if(operationType === 0){
this.titile = '新增工具信息';
this.titile = this.labels.titleCon
}else if(operationType === 1){
this.titile = '编辑工具信息';
this.titile = this.labels.titleEdit
}else if(operationType === 2){
this.titile = '复制工具信息';
this.titile = this.labels.titleCopy
}
//查询当前工单的工序信息
this.searchShopOrderSoRouting();

16
src/views/modules/shopOrder/shopOrder/shopOrder.vue
View File

@ -35,14 +35,16 @@
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
<el-dropdown trigger="click" style="margin-top: 3px" class="customer-dropdown" @command="handleCommand">
<el-button type="primary" :disabled="authEdit">
{{ buttons.orderPrimaryMenu }}<i class="el-icon-arrow-down el-icon--right"></i>
{{ buttons.orderPrimaryMenu?buttons.orderPrimaryMenu:'主菜单' }}<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item class="customer-li" command="orderToScheduling"><span>{{
buttons.orderToScheduling
buttons.orderToScheduling?buttons.orderToScheduling: '查看派工单信息'
}}</span>
</el-dropdown-item>
<el-dropdown-item class="customer-li" command="changeRouting"><span>{{ buttons.changeRouting }}</span>
<el-dropdown-item class="customer-li" command="changeRouting"><span>{{
buttons.changeRouting ? buttons.changeRouting :'变更工艺路线'
}}</span>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
@ -264,10 +266,8 @@
{{ buttons.routingPrimaryMenu }}<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item class="customer-li" command="0"><span>{{ buttons.routingMenu }}</span>
<el-dropdown-item class="customer-li" command="routingMenu"><span>{{ buttons.routingMenu }}</span>
</el-dropdown-item>
</el-dropdown-menu>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item class="customer-li" command="routingResource"><span>{{ buttons.resources }}</span>
</el-dropdown-item>
</el-dropdown-menu>
@ -304,7 +304,7 @@
</el-col>
</el-row>
</el-tab-pane>
<el-tab-pane :label=labels.toolLabel name="forth">
<el-tab-pane :label="labels.toolLabel?labels.toolLabel:'工具'" name="forth">
<el-row>
<el-col :span="24">
<download-excel
@ -1979,7 +1979,7 @@ export default {
// 选中菜单出发
handleCommand(command) {
switch (command) {
case '0':
case 'routingMenu':
// 工序操作
this.getRouting()
break;

Write Preview
Loading…
Cancel
Save