From cadc1cd661db470b622a14f13df4cfa0be90852e Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Fri, 6 May 2022 14:19:17 +0800
Subject: [PATCH] =?UTF-8?q?0505=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/production/dailyPlan.vue    | 22 +++--------
 .../modules/production/search_schedule.vue    | 37 +++++++++++++++++--
 2 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/src/views/modules/production/dailyPlan.vue b/src/views/modules/production/dailyPlan.vue
index 77d5814..05f3da5 100644
--- a/src/views/modules/production/dailyPlan.vue
+++ b/src/views/modules/production/dailyPlan.vue
@@ -27,23 +27,11 @@
         <el-form-item label="产品编码">
           <el-input v-model="searchData.partNo" style="width: 120px"></el-input>
         </el-form-item>
-        <el-form-item label="录入日期">
-          <el-date-picker
-            style="width: 120px"
-            v-model="searchData.date3"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期">
-          </el-date-picker>
+        <el-form-item label="产成品名称">
+          <el-input v-model="searchData.partDesc" style="width: 120px"></el-input>
         </el-form-item>
-        <el-form-item label="至">
-          <el-date-picker
-            style="width: 120px"
-            v-model="searchData.date4"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期">
-          </el-date-picker>
+        <el-form-item label="客户名称">
+          <el-input v-model="searchData.customerName" style="width: 120px"></el-input>
         </el-form-item>
       </el-form>
     </fieldset>
@@ -816,6 +804,7 @@
           partNo: '',
           date3: '',
           date4: '',
+          partDesc:'',
           sortField: 'order by needDate',
           scheduleDate: new Date(),
           site: this.$store.state.user.site,
@@ -823,6 +812,7 @@
           resourceId: '',
           shiftNo: '',
           itemNo: '',
+          customerName:'',
         },
         schedulingModalData: {
           orderNo: '',
diff --git a/src/views/modules/production/search_schedule.vue b/src/views/modules/production/search_schedule.vue
index 9760c05..b102d70 100644
--- a/src/views/modules/production/search_schedule.vue
+++ b/src/views/modules/production/search_schedule.vue
@@ -32,6 +32,9 @@
       <el-form-item :label="'生产订单号:'">
         <el-input v-model="searchData.orderNo" style="width: 120px" ></el-input>
       </el-form-item>
+      <el-form-item label="客户名称">
+        <el-input v-model="searchData.customerName" style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item :label="''" style="margin-left: -5px;">
         <el-checkbox style="margin-top: 20px;" true-label="Y" false-label="N" v-model="searchData.closedFlag">显示已关闭计划
         </el-checkbox>
@@ -383,6 +386,24 @@
             status: true,
             fixed: false
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 5302,
+            serialNumber: '5302ProduceCustomerName',
+            tableId: "5302Produce",
+            tableName: "待生产工单",
+            columnProp: "customerName",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "客户名称",
+            columnWidth: 180,
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: false
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 5302,
@@ -788,6 +809,7 @@
           date2:'',
           orderNo:'',
           closedFlag:'',
+          customerName:'',
         },
         rowData:'',
       }
@@ -905,11 +927,20 @@
         })
       },
       routingRowClassName2 ({row, rowIndex}) {
-
+        let date = new Date()
+        let planDate = new Date(row.planFinishTime.replace('-', '/'))
         //判断当前行颜色参数
-        if (row.printFlag == "Y") {
-          return 'customer-row-2';
+        if (row.closedFlag == 'Y' && row.qtyReported >= row.qtyRequired) {
+          return 'customer-row-1'
+        } else if (row.closedFlag == 'Y' && row.qtyReported < row.qtyRequired) {
+          return 'customer-row-2'
+        } else if (planDate < date) {
+          return 'customer-row-3'
         }
+        //判断当前行颜色参数
+        // if (row.printFlag == "Y") {
+        //   return 'customer-row-2';
+        // }
       },
     }