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/productionOrderScheduling/searchProductionDispatchList.vue

@@ -51,27 +51,30 @@
       </el-form-item>
     </el-form>
     <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
-      <el-form-item >
+      <el-form-item>
         <span slot="label" style="" @click="getBaseList(24)"><a herf="#">加工中心编码：</a></span>
         <el-input v-model="searchData.workCenterNo" style="width: 130px"></el-input>
       </el-form-item>
-      <el-form-item >
+      <el-form-item>
         <span slot="label" style="" @click="getBaseList(88)"><a herf="#">机台编号：</a></span>
         <el-input v-model="searchData.sResourceID" style="width: 130px"></el-input>
       </el-form-item>
-      <el-form-item >
+      <el-form-item>
         <span slot="label" style="" @click="getBaseList(5)"><a herf="#">产成品编码：</a></span>
         <el-input v-model="searchData.partNo" style="width: 130px"></el-input>
       </el-form-item>
       <el-form-item :label="'生产订单号：'">
         <el-input v-model="searchData.orderNo" style="width: 130px"></el-input>
       </el-form-item>
-      <el-form-item >
+      <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-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-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>
         <download-excel
           :fields="fields()"
           :data="exportData"
@@ -111,7 +114,7 @@
         :width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
-          <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
+          <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
           <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
                                              style="width: 100px; height: 80px"/></span>
         </template>
@@ -126,53 +129,40 @@
 </template>
 
 <script>
-  import Chooselist from '@/views/modules/common/Chooselist';
-  import column from '@/views/modules/common/column';/*动态表头*/
+import Chooselist from '@/views/modules/common/Chooselist';
+import column from '@/views/modules/common/column';/*动态表头*/
 
-  /*动态表头*/
-  import {
+/*动态表头*/
+import {
   saveTableDefaultList,
   getTableDefaultListLanguage,
   getTableUserListLanguage,
   removerDefault,
   removerUser
-  } from "@/api/table.js";
+} from "@/api/table.js";
 
 
-  import {
+import {
   searchProductionDispatchList,
   cancelScheduleWithScheduleQuery,
-  } from "@/api/shopOrder/shopOrder.js"
+} 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()
-        }
-      }
-    },
+export default {
   data() {
     return {
-        tagNo:'',
+      tagNo: '',
       showDefault: false,
       visible: false,
       // 导出 start
       exportData: [],
-        exportName: "生产派工单"+this.dayjs().format('YYYYMMDDHHmmss'),
+      exportName: "生产派工单" + this.dayjs().format('YYYYMMDDHHmmss'),
       exportHeader: ["生产派工单"],
       exportFooter: [],
       // 导出 end
       height: 200,
-        modelFlag:false,
-        modelInputFlag:true,
-        selectList:[],
+      modelFlag: false,
+      modelInputFlag: true,
+      selectList: [],
       scheduleRow: {},
       pageData: {
         site: this.$store.state.user.site,
@@ -187,21 +177,21 @@
         planStartTime: '',
       },
       searchData: {
-          site:'',
-          orderNo:this.$route.query.orderNo,
+        site: '',
+        orderNo: this.$route.query.orderNo,
         checked: true,
-          partNo:'',
-          sResourceID:'',
-          workCenterNo:'',
-          date1:'',
-          date2:'',
-          date3:'',
-          date4:'',
-          date5:'',
-          date6:'',
-          user:this.$store.state.user.name
-        },
-        dataList:[],
+        partNo: '',
+        sResourceID: '',
+        workCenterNo: '',
+        date1: '',
+        date2: '',
+        date3: '',
+        date4: '',
+        date5: '',
+        date6: '',
+        user: this.$store.state.user.name
+      },
+      dataList: [],
       dataListLoading: false,
       buttons: {
         settingLanguageList: '按语言设置',
@@ -939,7 +929,7 @@
           columnWidth: 100
         }
       ],
-        queryTable:{
+      queryTable: {
         userId: this.$store.state.user.name,
         functionId: this.$route.meta.menuId,
         tableId: "6023Table",
@@ -961,48 +951,72 @@
     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){
+    getBaseData(val) {
+      if (this.tagNo === 24) {
         this.searchData.workCenterNo = val.WorkCenterNo
       }
-        if (this.tagNo === 88){
+      if (this.tagNo === 88) {
         this.searchData.sResourceID = val.ResourceID
       }
-        if (this.tagNo === 5){
+      if (this.tagNo === 5) {
         this.searchData.partNo = val.PartNo
       }
-        if (this.tagNo === 18){
+      if (this.tagNo === 18) {
         this.searchData.site = val.Site
       }
     },
     // 获取基础数据列表
-      getBaseList(val){
+    getBaseList(val) {
       this.tagNo = val
       this.$nextTick(() => {
         let strVal = "";
-          if (val === 24){
+        if (val === 24) {
           strVal = this.searchData.workCenterNo
         }
-          if (val === 88){
+        if (val === 88) {
           strVal = this.searchData.sResourceID
         }
-          if (val === 5){
+        if (val === 5) {
           strVal = this.searchData.partNo
         }
-          if (val === 18){
+        if (val === 18) {
           strVal = this.searchData.site
         }
-          this.$refs.baseList.init(val,strVal)
+        this.$refs.baseList.init(val, strVal)
       })
     },
 
-      getData(){
+    getData() {
       searchProductionDispatchList(this.searchData).then(({data}) => {
         this.dataList = data.rows
       });
@@ -1043,17 +1057,17 @@
     },
 
     /*当前值发生变化的时候修改*/
-      currentSchedulingRow(row, oldRow){
+    currentSchedulingRow(row, oldRow) {
       //判断是否是获取焦点的事件
-        if(row){
+      if (row) {
         this.scheduleRow = JSON.parse(JSON.stringify(row));
       }
     },
 
     /*提示取消派工单*/
-      warnCancelScheduleConfirm(row, $event, column){
+    warnCancelScheduleConfirm(row, $event, column) {
       //先判断是否已经选好了行要操作
-        if(!this.scheduleRow){
+      if (!this.scheduleRow) {
         this.$message.warning('请先选择派工单!');
         return false;
       }
@@ -1062,14 +1076,14 @@
         confirmButtonText: '确认',
         celButtonText: '取消',
         type: 'warning'
-        }).then(() =>{
+      }).then(() => {
         //执行创建新卷的操作
         this.cancelScheduleBun();
       });
     },
 
     /*取消派工单的操作*/
-      cancelScheduleBun(){
+    cancelScheduleBun() {
       //设置参数
       this.pageData.orderNo = this.scheduleRow.orderNo;
       this.pageData.itemNo = this.scheduleRow.itemNo;
@@ -1082,9 +1096,9 @@
       this.pageData.planStartTime = this.scheduleRow.planStartTime;
       //取消排产
       cancelScheduleWithScheduleQuery(this.pageData).then(({data}) => {
-          if(data.code == 500){
+        if (data.code == 500) {
           this.$message.error(data.msg);
-          }else{
+        } else {
           this.$message.success(data.msg);
           //刷新排产的数据
           this.getData();
@@ -1184,11 +1198,11 @@
     this.getTableUserColumn();
 
   }
-  }
+}
 </script>
 
-<style >
-  .el-textarea__inner {
+<style>
+.el-textarea__inner {
   padding: 5px 5px;
-  }
+}
 </style>

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;