From fa7942e618e1bf2c73b50c54664ef5076eee444b Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 25 Mar 2024 19:38:20 +0800
Subject: [PATCH] 1

---
 src/views/modules/production/dailyPlan.vue    |  6 ++-
 .../modules/schedule/scheduleForSOTask.vue    | 43 +++++++++++++++----
 2 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/production/dailyPlan.vue b/src/views/modules/production/dailyPlan.vue
index e7bd946..a6f2aa4 100644
--- a/src/views/modules/production/dailyPlan.vue
+++ b/src/views/modules/production/dailyPlan.vue
@@ -133,6 +133,7 @@
         header-align="center"
         align="left"
         min-width="60"
+        sortable
         label="物料编码">
       </el-table-column>
       <el-table-column
@@ -140,6 +141,7 @@
         header-align="center"
         align="left"
         min-width="200"
+        sortable
         label="物料名称">
       </el-table-column>
       <el-table-column
@@ -154,6 +156,7 @@
         header-align="center"
         align="left"
         min-width="50"
+        sortable
         label="计划开工日期">
       </el-table-column>
       <el-table-column
@@ -161,6 +164,7 @@
         header-align="center"
         align="left"
         min-width="50"
+        sortable
         label="要求完工日期">
       </el-table-column>
       <el-table-column
@@ -296,8 +300,8 @@
         </el-form-item>
       </el-form>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
-        <el-button type="primary" v-if="scheduledingDataFlag3" @click="planSaveOn()">保存并继续</el-button>
         <el-button type="primary" @click="planSave()">保存</el-button>
+        <el-button type="primary" v-if="scheduledingDataFlag3" @click="planSaveOn()">保存并继续</el-button>
         <el-button type="primary" @click="schedulingModalFlag = false">取消</el-button>
       </el-footer>
     </el-dialog>
diff --git a/src/views/modules/schedule/scheduleForSOTask.vue b/src/views/modules/schedule/scheduleForSOTask.vue
index fa0727b..8d24bd1 100644
--- a/src/views/modules/schedule/scheduleForSOTask.vue
+++ b/src/views/modules/schedule/scheduleForSOTask.vue
@@ -126,6 +126,7 @@
         header-align="center"
         align="left"
         min-width="160"
+        sortable
         label="工序名称">
       </el-table-column>
       <el-table-column
@@ -133,6 +134,7 @@
         header-align="center"
         align="left"
         min-width="120"
+        sortable
         label="物料编码">
       </el-table-column>
       <el-table-column
@@ -140,6 +142,7 @@
         header-align="center"
         align="left"
         min-width="200"
+        sortable
         label="物料名称">
       </el-table-column>
       <el-table-column
@@ -154,15 +157,17 @@
         header-align="center"
         align="left"
         min-width="100"
+        sortable
         label="加工中心名称">
       </el-table-column>
-<!--      <el-table-column-->
-<!--        prop="equipment"-->
-<!--        header-align="center"-->
-<!--        align="left"-->
-<!--        min-width="80"-->
-<!--        label="设备类型">-->
-<!--      </el-table-column>-->
+      <el-table-column
+        prop="planTypeDesc"
+        header-align="center"
+        align="left"
+        min-width="80"
+        sortable
+        label="计划方式">
+      </el-table-column>
       <el-table-column
         prop="status"
         header-align="center"
@@ -183,6 +188,7 @@
         align="left"
         sortable
         width="130"
+        sortable
         label="ERP要求完工日期">
       </el-table-column>
       <el-table-column
@@ -206,6 +212,13 @@
         min-width="80"
         label="已派工数量">
       </el-table-column>
+      <el-table-column
+        prop="soremark"
+        header-align="center"
+        align="right"
+        min-width="160"
+        label="生产订单备注">
+      </el-table-column>
 <!--      <el-table-column-->
 <!--        prop="qtyReported"-->
 <!--        header-align="center"-->
@@ -309,12 +322,22 @@
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="计划方式:">
+          <el-input v-model="schedulingModalData.planTypeDesc" disabled style="width: 150px"></el-input>
+        </el-form-item>
         <el-form-item label="派工备注:">
-          <el-input v-model="schedulingModalData.remark"  style="width: 656px"></el-input>
+          <el-input v-model="schedulingModalData.remark"  style="width: 500px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="erp生产订单备注:">
+          <el-input type="textarea"  :rows="2" resize='none' maxlength="10000" v-model="schedulingModalData.soremark" disabled style="width: 656px;height: 40px"></el-input>
         </el-form-item>
       </el-form>
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 30px;">
       <el-button type="primary" @click="addPlans()" style="margin-left: 10px;">添加</el-button>
       <el-button type="primary" @click="saveSchedule()">保存</el-button>
+      </el-form>
       <div class="rq ">
         <el-table
           height="200"
@@ -513,6 +536,8 @@
           operatorId:'',
           efficiency:'',
           partPlanQty:'',
+          planTypeDesc:'',
+          soremark:'',
         },
         scheduledModalFlag: false,
         availableResourceList: [],
@@ -605,6 +630,8 @@
           shiftNo: '',
           sumQty: 0,
           operatorId: '',
+          soremark:row.soremark,
+          planTypeDesc:row.planTypeDesc,
         }
 
         this.schedulingModalTableData = []