From cf9c9afb38e1749b55ca6c3f58539b3cd7ff8019 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Tue, 23 Jul 2024 17:51:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plan/order/index.vue                |  4 +--
 src/views/plan/workorder/index.vue            | 26 ++++++++++---------
 .../quality/qcIncome/checkProjectType.vue     |  8 ++++++
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/views/plan/order/index.vue b/src/views/plan/order/index.vue
index 3bc91713..0482e07d 100644
--- a/src/views/plan/order/index.vue
+++ b/src/views/plan/order/index.vue
@@ -116,14 +116,14 @@
         >导出
         </el-button>
       </el-col>
-      <!--
+
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-guide" size="mini"
         @click="handleAutoSplit"
         :disabled="single"
         v-hasPermi="['mes:pro:order:edit']">辅助排产
         </el-button>
-      </el-col>-->
+      </el-col>
 
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue
index ad680147..f72479ce 100644
--- a/src/views/plan/workorder/index.vue
+++ b/src/views/plan/workorder/index.vue
@@ -251,7 +251,7 @@
     <el-dialog
       title="工单信息"
       :visible.sync="printDialogVisible"
-      width="1450px"
+      width="1000px"
     >
       <div id="printFrom" class="my-print-box">
 
@@ -285,11 +285,11 @@
             <el-table-column
               prop="workorderCode"
               label="生产工单"
-              width="150">
+              width="130">
             </el-table-column>
             <el-table-column
               prop="workorderCodeSap"
-              width="150"
+              width="100" :formatter="orderCodeFormate"
               label="生产订单">
             </el-table-column>
             <el-table-column
@@ -298,37 +298,39 @@
               width="180">
             </el-table-column>
             <el-table-column
-              prop="unit"
+              prop="unit" width="50"
               label="单位">
             </el-table-column>
+            <!--
             <el-table-column
-              prop="quantityProduced"
+              prop="quantityProduced" width="80"
               label="已生产数量">
-            </el-table-column>
+            </el-table-column>-->
             <el-table-column
-              prop="quantitySplit"
+              prop="quantitySplit" width="80"
               label="拆分数量">
             </el-table-column>
             <el-table-column
-              prop="routeCode"
+              prop="routeCode" width="90"
               label="工艺编码">
             </el-table-column>
             <el-table-column
-              prop="prodLineCode"
+              prop="prodLineCode" width="100"
               label="产线设备">
             </el-table-column>
-            <el-table-column label="班次" align="center" prop="shiftId" :formatter="shiftFormat">
+            <el-table-column label="班次" align="center" prop="shiftId" :formatter="shiftFormat" width="40">
             </el-table-column>
-            <el-table-column label="工单状态" align="center" prop="status">
+            <el-table-column label="工单状态" align="center" prop="status" width="50">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.workorder_type" :value="scope.row.status"/>
               </template>
             </el-table-column>
+            <!--
             <el-table-column label="产品类型" align="center" prop="prodType">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.product_type" :value="scope.row.prodType"/>
               </template>
-            </el-table-column>
+            </el-table-column>-->
           </el-table>
 
           <br/>
diff --git a/src/views/quality/qcIncome/checkProjectType.vue b/src/views/quality/qcIncome/checkProjectType.vue
index e1ffbc30..8540428b 100644
--- a/src/views/quality/qcIncome/checkProjectType.vue
+++ b/src/views/quality/qcIncome/checkProjectType.vue
@@ -18,6 +18,7 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
+            <!--
             <el-col :span="4">
               <el-form-item label="是否发起OA" prop="startOA">
                 <el-radio-group v-model="form.startOA">
@@ -50,11 +51,18 @@
                 </el-select>
               </el-form-item>
             </el-col>
+           
             <el-col :span="14">
               <el-form-item v-if="form.startOA == '1'" label="不合格描述" prop="remark">
                 <el-input type='textarea' v-model="form.remark" placeholder="请输入不合格描述" />
               </el-form-item>
             </el-col>
+             -->
+              <el-col :span="14">
+              <el-form-item label="不合格描述" prop="remark">
+                <el-input type='textarea' v-model="form.remark" placeholder="请输入不合格描述" />
+              </el-form-item>
+            </el-col>
           </el-row>
         </el-form>