From 52e26dfc83e7a8d22de9bdd19440bd7b1177001a Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 14 Nov 2022 18:24:20 +0800
Subject: [PATCH] =?UTF-8?q?0412=20=E6=96=B0=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/board/nextWeekShipmentBoard.vue |  1 +
 src/views/modules/production/closeSchedule.vue    |  5 +++--
 .../modules/production/scheduleForShopOrder.vue   | 15 +++++++--------
 .../modules/production/soscheduleRouting.vue      |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/views/modules/board/nextWeekShipmentBoard.vue b/src/views/modules/board/nextWeekShipmentBoard.vue
index 444c4a8..b3a062c 100644
--- a/src/views/modules/board/nextWeekShipmentBoard.vue
+++ b/src/views/modules/board/nextWeekShipmentBoard.vue
@@ -189,6 +189,7 @@
 //           // 判断元素是否滚动到底部(可视高度+距离顶部=整个高度)
 //           if (divData.clientHeight + divData.scrollTop +1>= divData.scrollHeight) {
 //             // 重置table距离顶部距离
+
 //
 //               divData.scrollTop = 0
 //
diff --git a/src/views/modules/production/closeSchedule.vue b/src/views/modules/production/closeSchedule.vue
index bcf448b..30f14e1 100644
--- a/src/views/modules/production/closeSchedule.vue
+++ b/src/views/modules/production/closeSchedule.vue
@@ -101,8 +101,9 @@
         min-width="160"
         label="操作">
         <template slot-scope="scope" class="foo_container">
-          <a type="text" size="small" @click="circulation(scope.row)">流转</a>
-          <a type="text" size="small" @click="closeSchedule(scope.row)">关闭派工单</a>
+          <a v-if="scope.row.circulationSeqNo===null"  type="text" size="small" @click="circulation(scope.row)">流转</a>
+          <a v-if="scope.row.circulationSeqNo===null"  type="text" size="small" @click="closeSchedule(scope.row)">关闭派工单</a>
+          <a v-if="scope.row.circulationSeqNo!=null" type="text" size="small" >派工单已流转</a>
         </template>
       </el-table-column>
       <el-table-column
diff --git a/src/views/modules/production/scheduleForShopOrder.vue b/src/views/modules/production/scheduleForShopOrder.vue
index 3c360e8..9231637 100644
--- a/src/views/modules/production/scheduleForShopOrder.vue
+++ b/src/views/modules/production/scheduleForShopOrder.vue
@@ -90,13 +90,13 @@
             <el-option label="已派工完" value="ROUND(ISNULL(SL.scheduledQty,0),3) >=ROUND(a.LotSize,3)"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="'订单类型：'">
-          <el-select filterable v-model="searchData.eLevels" style="width: 120px">
-            <el-option label="全部" value=""></el-option>
-            <el-option label="混炼订单" value=2 ></el-option>
-            <el-option label="产成品订单" value=0></el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item :label="'订单类型：'">-->
+<!--          <el-select filterable v-model="searchData.eLevels" style="width: 120px">-->
+<!--            <el-option label="全部" value=""></el-option>-->
+<!--            <el-option label="混炼订单" value=2 ></el-option>-->
+<!--            <el-option label="产成品订单" value=0></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item :label="' '">
           <el-button @click="search()" style="margin-left: 24px" type="primary">查询</el-button>
           <download-excel
@@ -506,7 +506,6 @@
           site: this.$store.state.user.site,
           planStatus: 'ROUND(a.LotSize,3) >ROUND(ISNULL(SL.scheduledQty,0),3)',
           itemNo:'',
-          eLevels:'',
         },
         schedulingModalData: {
           orderNo: '',
diff --git a/src/views/modules/production/soscheduleRouting.vue b/src/views/modules/production/soscheduleRouting.vue
index 3b66902..e6e3bdd 100644
--- a/src/views/modules/production/soscheduleRouting.vue
+++ b/src/views/modules/production/soscheduleRouting.vue
@@ -102,7 +102,7 @@
         label="操作">
         <template slot-scope="scope" class="foo_container">
           <a type="text" size="small" @click="toPrint(scope.row)">打印</a>
-          <a type="text" size="small" @click="cancelJob(scope.row)">取消派工单</a>
+          <a v-if="scope.row.circulationSeqNo!=null" type="text" size="small" @click="cancelJob(scope.row)">取消派工单</a>
           <a type="text" size="small" @click="printPartCard(scope.row)">物料标识卡</a>
         </template>
       </el-table-column>