From b1115e333631505e45916e0e173ed0de10247c97 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Mon, 30 Jan 2023 11:48:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=88=A4=E6=96=AD=202023?=
 =?UTF-8?q?=E5=B9=B41=E6=9C=8830=E6=97=A5=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/calendar.vue           |  7 ++---
 .../shopOrder/common/routingAddAndEdit.vue    |  2 +-
 .../yieldReport/com_produce_report_normal.vue | 28 +++++++++----------
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/views/modules/base/calendar.vue b/src/views/modules/base/calendar.vue
index cebbe32..e8ef05b 100644
--- a/src/views/modules/base/calendar.vue
+++ b/src/views/modules/base/calendar.vue
@@ -165,7 +165,7 @@
         <el-form-item :label="labels.calendarDesc4">
           <el-input v-model="maintainCalendarSearchData.calendarDesc" style="width: 130px"></el-input>
         </el-form-item>
-        <el-form-item :label="labels.startDate">
+        <el-form-item :label="labels.startDate|| '日期'">
           <el-date-picker
             style="width: 130px"
             v-model="maintainCalendarSearchData.startDate"
@@ -175,7 +175,7 @@
           -
           <el-date-picker
             style="width: 130px"
-            v-model="maintainCalendarSearchData.endDate"
+            v-model="maintainCalendarSearchData.endDate "
             value-format="yyyy-MM-dd"
             :placeholder="labels.chooseDate">
           </el-date-picker>
@@ -535,8 +535,7 @@ export default {
         warning:'批量维护工作日历天数为 [1-31] 天，且开始日期不能晚于结束日期!',
         endWaring:'结束时间不能在开始时间之前',
         timeWaring:'时间不得相差10天！',
-
-
+        startDate: '日期'
       },
       buttons:{
         search:'查询',
diff --git a/src/views/modules/shopOrder/shopOrder/common/routingAddAndEdit.vue b/src/views/modules/shopOrder/shopOrder/common/routingAddAndEdit.vue
index 33b5f49..465636d 100644
--- a/src/views/modules/shopOrder/shopOrder/common/routingAddAndEdit.vue
+++ b/src/views/modules/shopOrder/shopOrder/common/routingAddAndEdit.vue
@@ -287,7 +287,7 @@
           this.$message.warning('计划开工时间不能为空!')
           return
         }
-        if (this.selectRow.planFinishTime>this.selectRow.planStartTime){
+        if (this.selectRow.planFinishTime<this.selectRow.planStartTime){
           this.$message.warning('计划开工时间不能早于计划完工时间!')
           return
         }
diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index 95c52ef..892c31f 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -112,18 +112,18 @@
                 border
                 v-loading="dataListLoading"
                 style="width: 100%;">
-<!--                <el-table-column-->
-<!--                  fixed="left"-->
-<!--                  header-align="center"-->
-<!--                  align="center"-->
-<!--                  width="80"-->
-<!--                  :label=labels.rollListOperation>-->
-<!--                  <template slot-scope="scope">-->
-<!--                    <a class="customer-a" @click="deleteSfdcTimeHist(scope.row)">{{-->
-<!--                        labels.deleteSfdcTime || '删除'-->
-<!--                      }}</a>-->
-<!--                  </template>-->
-<!--                </el-table-column>-->
+                <el-table-column
+                  fixed="left"
+                  header-align="center"
+                  align="center"
+                  width="80"
+                  :label=labels.rollListOperation>
+                  <template slot-scope="scope">
+                    <a class="customer-a" @click="deleteSfdcTimeHist(scope.row)">{{
+                        labels.deleteSfdcTime || '删除'
+                      }}</a>
+                  </template>
+                </el-table-column>
                 <el-table-column
                   v-for="(item,index) in columnTimeArray" :key="index"
                   :sortable="item.columnSortable"
@@ -3796,7 +3796,7 @@ export default {
         this.sfdcMaterialList = data.rows;
       });
     },
-    //刷新派工单的下机卷的记录
+    //刷新派工单 的下机卷的记录
     getSfdcRollOpsList() {
       getSfdcRollOpsByCon(this.searchData).then(({data}) => {
         this.sfdcRollOpsList = data.rows;
@@ -3809,7 +3809,7 @@ export default {
       });
     },
 
-    //刷新派工单的下机卷的记录
+    //刷新派工单 的下机卷的记录
     getSfdcRollList() {
       getSfdcRollByCon(this.searchData).then(({data}) => {
         this.sfdcRollList = data.rows;