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

src/api/schedule/order_schedule.js

@@ -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)

src/views/modules/schedule/order_schedule_expand.vue

@@ -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>
@@ -1316,46 +1317,13 @@ export default {
           this.scheduleVisible = false
           this.getShopOrderList()
         } else if (data.code == 201) {
-          this.$message.warning(data.msg.substring(0,data.msg.indexOf(','))+"!")
+          this.$message.warning(data.msg.substring(0, data.msg.indexOf(',')) + "!")
         } else if (data.code == 500) {
           this.$message.error(data.msg)
         }
       })
     },
-    /**
-     *     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;
       })

src/views/modules/shopOrder/shopOrder/common/tool_add_and_edit.vue

@@ -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();

src/views/modules/shopOrder/shopOrder/shopOrder.vue

@@ -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;