From dc465f555569d898f35d9913d40806a5617cfc50 Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Fri, 27 May 2022 16:41:05 +0800
Subject: [PATCH] =?UTF-8?q?2022-05-27=20=E5=BE=85=E6=8A=A5=E5=B7=A5?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=20=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/common/com_part_stock.vue   | 15 +++++++++
 src/views/modules/schedule/order_schedule.vue |  1 +
 .../modules/yieldReport/produce_order.vue     | 32 ++++++++++++++++++-
 3 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/common/com_part_stock.vue b/src/views/modules/common/com_part_stock.vue
index fdca8bd..9f92246 100644
--- a/src/views/modules/common/com_part_stock.vue
+++ b/src/views/modules/common/com_part_stock.vue
@@ -28,6 +28,7 @@
           <fieldset class="customer-fieldset" style="width: 730px; padding: 5px 0px">
             <el-table height="200px"
               :data="partStockList"
+                      :cell-style="customerCellStyle" :cell-class-name="customerCellClassName"
               border
               v-loading="dataListLoading"
               style="width: 100%; margin-top: -5px;">
@@ -261,6 +262,20 @@ export default {
       this.$emit('update:visible', false);
     },
 
+    /*添加定制的css类*/
+    customerCellClassName({row, column, rowIndex, columnIndex}) {
+      if(column.property == 'onOrder'){
+        return 'customer-number-cell';
+      }
+    },
+
+    /*添加定制的cess样式*/
+    customerCellStyle({row, column, rowIndex, columnIndex}) {
+      if(column.property == 'onOrder'){
+        return 'padding: 0px 0px;';
+      }
+    },
+
     //刷新当前卷的时间数据
     refreshPageTable(){
       getOrderPartStockedQty(this.pageData).then(({data}) => {
diff --git a/src/views/modules/schedule/order_schedule.vue b/src/views/modules/schedule/order_schedule.vue
index 1bafc93..3a308d2 100644
--- a/src/views/modules/schedule/order_schedule.vue
+++ b/src/views/modules/schedule/order_schedule.vue
@@ -48,6 +48,7 @@
         <el-date-picker class="el-time-width"
                         style=""
                         v-model="pageData.needTime1"
+                        format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" placeholder="">
         </el-date-picker>
       </el-form-item>
diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue
index 023a460..f5889c6 100644
--- a/src/views/modules/yieldReport/produce_order.vue
+++ b/src/views/modules/yieldReport/produce_order.vue
@@ -107,6 +107,8 @@
             <el-dropdown-item class="customer-li" command="8" :disabled="menuButton.canceledCostRollUpFlagButton">
               取消生产已排料
             </el-dropdown-item>
+            <el-dropdown-item class="customer-li"  command="查看物料库存"
+                              :disabled="menuButton.partStockFlag">查看物料库存</el-dropdown-item>
             <hr width="95%"/>
             <el-dropdown-item class="customer-li" command="9" :disabled="menuButton.manualFlagButton">刀模已发
             </el-dropdown-item>
@@ -192,6 +194,11 @@
     <!-- 换包装   -->
     <changePackaging :close-on-click-modal="false"
                      :visible.sync="changePackagingFlag" ref="changePackaging"></changePackaging>
+
+    <!-- 物料库存查询 -->
+    <comPartStock ref="comPartStock" :close-on-click-modal="false"
+                  :visible.sync="showPartStockFlag">
+    </comPartStock>
   </div>
 </template>
 
@@ -220,7 +227,9 @@ import fqcSplitRollReport from "./otherReport/fqc_split_roll_report";/*结束派
 import changePackaging from "./otherReport/change_packaging";/*结束派工的组件*/
 import createRecheck from './com_create_recheck'
 import Com_split_schedule from "../schedule/com_split_schedule";
-import comSplitOrderReport from './com_split_order_report';/*分切报工*/
+import comSplitOrderReport from './com_split_order_report';
+import comPartStock from "../common/com_part_stock";/*展示物料库存的组件*/
+/*分切报工*/
 
 export default {
   data() {
@@ -235,6 +244,7 @@ export default {
       fqcRollShowReportFlag: false,
       showFinishScheduleFlag: false,
       changePackagingFlag: false,
+      showPartStockFlag: false,
       searchData: {
         site: this.$store.state.user.site,
         resourceId: '',
@@ -1088,6 +1098,7 @@ export default {
         canceledRepairSOFlagButton: false,
         canceledAllPrdButton: false,
         createRecheckButton: false,
+        partStockFlag: true,/*查看物料库存*/
       }
     }
   },
@@ -1102,6 +1113,7 @@ export default {
     fqcSplitRollReport, /*FQC分卷*/
     createRecheck,/*创建重检派工单*/
     changePackaging, /*换包装*/
+    comPartStock,/*展示物料库存的组件*/
 
   },
   mounted() {
@@ -1144,6 +1156,7 @@ export default {
           }
           this.menuButton.canceledAllPrdButton = false
           this.menuButton.createRecheckButton = false
+          this.menuButton.partStockFlag = false;
           // 判断是否具有该页面权限
           let menList = JSON.parse(sessionStorage.getItem('dynamicMenuRoutes') || '[]').filter(item => item.path == 'shopOrder-shopOrder/shopOrder')
           if (menList.length > 0) {
@@ -1317,6 +1330,23 @@ export default {
           }
         })
       }
+
+      if('查看物料库存' === val){
+        //判断是否选择好了工单
+        if(this.currentRow == null || this.currentRow == {}){
+          //重置按钮
+          this.menuButton.partStockFlag = true;
+          //返回错误
+          this.$message.error('请选择派工单!');
+          return false;
+        }
+        let tempData = {'site': this.currentRow.site, 'orderNo': this.currentRow.orderNo};
+        //打开组件  需要的数据 展示需要的数据
+        this.$nextTick(() => {
+          this.showPartStockFlag = true;
+          this.$refs.comPartStock.init(tempData);
+        })
+      }
       // 关闭
       if ('1' == val) {
         //调用提示的方法