From f99b72c9f00b5df352f3622d8a0de0ec8dc49eb3 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 5 Feb 2024 17:00:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89pdf=E6=8F=92=E4=BB=B6=20=20?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8=20=20=E5=AF=BC=E8=87=B4=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E5=A4=B1=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/global.scss                   |  8 +--
 src/views/modules/base/workCenter.vue         | 60 ++++++++--------
 src/views/modules/schedule/closeSchedule.vue  |  2 +-
 src/views/modules/schedule/generateReport.vue | 72 ++++++++++++-------
 4 files changed, 80 insertions(+), 62 deletions(-)

diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss
index 5287ffb..48f5912 100644
--- a/src/assets/scss/global.scss
+++ b/src/assets/scss/global.scss
@@ -506,10 +506,10 @@ a:hover{
   height: 20px;
 }
 
-.sl-svg {
-  overflow: hidden;
-  float: right;
-}
+//.sl-svg {
+//  overflow: hidden;
+//  float: right;
+//}
 
 .rq-bmPic {
   position: relative;
diff --git a/src/views/modules/base/workCenter.vue b/src/views/modules/base/workCenter.vue
index 8ccfca6..2d2a084 100644
--- a/src/views/modules/base/workCenter.vue
+++ b/src/views/modules/base/workCenter.vue
@@ -136,34 +136,34 @@
           </el-table-column>
         </el-table>
       </el-tab-pane>
-      <el-tab-pane :label="labels.defect" name="forth">
-        <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
-          <el-button @click="jumpCalendar()" type="primary" style="margin-left: 2px;margin-top: 0px">{{buttons.defectModel}}</el-button>
-        </el-form>
-        <el-table
-          :height="height"
-          :data="dataList4"
-          border
-          v-loading="dataListLoading"
-          style="width: 100%;">
-          <el-table-column
-            v-for="(item,index) in columnList4" :key="index"
-            :sortable="item.columnSortable"
-            :prop="item.columnProp"
-            :header-align="item.headerAlign"
-            :show-overflow-tooltip="item.showOverflowTooltip"
-            :align="item.align"
-            :fixed="item.fixed==''?false:item.fixed"
-            :min-width="item.columnWidth"
-            :label="item.columnLabel">
-            <template slot-scope="scope">
-              <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
-              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                                 style="width: 100px; height: 80px"/></span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-tab-pane>
+<!--      <el-tab-pane :label="labels.defect" name="forth">-->
+<!--        <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">-->
+<!--          <el-button @click="jumpCalendar()" type="primary" style="margin-left: 2px;margin-top: 0px">{{buttons.defectModel}}</el-button>-->
+<!--        </el-form>-->
+<!--        <el-table-->
+<!--          :height="height"-->
+<!--          :data="dataList4"-->
+<!--          border-->
+<!--          v-loading="dataListLoading"-->
+<!--          style="width: 100%;">-->
+<!--          <el-table-column-->
+<!--            v-for="(item,index) in columnList4" :key="index"-->
+<!--            :sortable="item.columnSortable"-->
+<!--            :prop="item.columnProp"-->
+<!--            :header-align="item.headerAlign"-->
+<!--            :show-overflow-tooltip="item.showOverflowTooltip"-->
+<!--            :align="item.align"-->
+<!--            :fixed="item.fixed==''?false:item.fixed"-->
+<!--            :min-width="item.columnWidth"-->
+<!--            :label="item.columnLabel">-->
+<!--            <template slot-scope="scope">-->
+<!--              <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>-->
+<!--              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"-->
+<!--                                                 style="width: 100px; height: 80px"/></span>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--        </el-table>-->
+<!--      </el-tab-pane>-->
     </el-tabs>
     <el-dialog :title="labels.dataList" :close-on-click-modal="false" v-drag :visible.sync="modelFlag2" width="680px" >
       <el-table
@@ -1024,7 +1024,7 @@ export default {
           tableName: "加工中心表",
           columnProp: "active",
           headerAlign: "center",
-          align: "left",
+          align: "center",
           columnLabel: "在用",
           columnHidden: false,
           columnImage: false,
@@ -1042,7 +1042,7 @@ export default {
           tableName: "加工中心表",
           columnProp: "needScheduleFlag",
           headerAlign: "center",
-          align: "left",
+          align: "center",
           columnLabel: "是否需要派工",
           columnHidden: false,
           columnImage: false,
diff --git a/src/views/modules/schedule/closeSchedule.vue b/src/views/modules/schedule/closeSchedule.vue
index 7b0fef4..787ff0f 100644
--- a/src/views/modules/schedule/closeSchedule.vue
+++ b/src/views/modules/schedule/closeSchedule.vue
@@ -104,7 +104,7 @@
           <a v-if="scope.row.circulationSeqNo===null&&scope.row.closedFlag=='Y'"  type="text" size="small" @click="openSchedule(scope.row)">打开派工单</a>
           <span v-if="scope.row.circulationSeqNo!=null"  size="small" >派工单已流转</span>
           <a v-if="scope.row.circulationSeqNo==null" type="text" size="small" @click="cancelJob(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="circulation(scope.row)">流转</a>
         </template>
       </el-table-column>
 <!--      <el-table-column-->
diff --git a/src/views/modules/schedule/generateReport.vue b/src/views/modules/schedule/generateReport.vue
index 2afba83..8116210 100644
--- a/src/views/modules/schedule/generateReport.vue
+++ b/src/views/modules/schedule/generateReport.vue
@@ -379,9 +379,9 @@
         <el-form-item label="不合格数量" >
           <el-input type="number"  class="input_left" disabled style="width: 130px;"  v-model="saveHeaderData.qtyUnApprove" ></el-input>
         </el-form-item>
-        <el-form-item label=" " >
-          <el-button type="primary"  @click="addBad()">新增不良</el-button>
-        </el-form-item>
+<!--        <el-form-item label=" " >-->
+<!--          <el-button type="primary"  @click="addBad()">新增不良</el-button>-->
+<!--        </el-form-item>-->
       </el-form>
       <fieldset class="customer-fieldset" style="width: 597px;margin-left: -10px;">
         <legend class="customer-legend">不良品分析</legend>
@@ -418,31 +418,47 @@
         height="150"
         :data="badList"
         border>
-        <el-table-column label="不良原因">
-        <template slot-scope="{row,$index}">
-          <el-select v-model="row.defectCode" placeholder="请选择" style="width: 100%;height: 12px;padding: 0px " filterable @change="changeSum"
-                     allow-create>
-            <el-option v-for="item in defectList " :key="index" :label="item.defectNo+'-'+item.defectDesc"
-                       :value="item.defectNo">
+<!--        <el-table-column label="不良原因">-->
+<!--        <template slot-scope="{row,$index}">-->
+<!--          <el-select v-model="row.defectCode" placeholder="请选择" style="width: 100%;height: 12px;padding: 0px " filterable @change="changeSum"-->
+<!--                     allow-create>-->
+<!--            <el-option v-for="item in defectList " :key="index" :label="item.defectNo+'-'+item.defectDesc"-->
+<!--                       :value="item.defectNo">-->
 
-            </el-option>
-          </el-select>
-        </template></el-table-column>
-        <el-table-column label="不合格数" width="140">
-          <template slot-scope="{row,$index}">
-            <el-input type="number" v-model="row.defectQty" @change="changeSum"></el-input>
-          </template>
+<!--            </el-option>-->
+<!--          </el-select>-->
+<!--        </template></el-table-column>-->
+        <el-table-column
+          prop="defectCode"
+          header-align="center"
+          sortable
+          align="left"
+          min-width="80"
+          label="不良原因代码">
         </el-table-column>
         <el-table-column
-          prop=""
+          prop="defectDesc"
           header-align="center"
-          align="center"
-          width="100"
-          label="操作">
-          <template slot-scope="scope" class="foo_container">
-            <a type="text" size="small" @click="deleteBad(scope.$index)">删除</a>
+          sortable
+          align="left"
+          min-width="80"
+          label="不良原因名称">
+        </el-table-column>
+        <el-table-column label="不合格数" width="100">
+          <template slot-scope="{row,$index}">
+            <el-input type="number" v-model="row.defectQty" @change="changeSum"></el-input>
           </template>
         </el-table-column>
+<!--        <el-table-column-->
+<!--          prop=""-->
+<!--          header-align="center"-->
+<!--          align="center"-->
+<!--          width="100"-->
+<!--          label="操作">-->
+<!--          <template slot-scope="scope" class="foo_container">-->
+<!--            <a type="text" size="small" @click="deleteBad(scope.$index)">删除</a>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
       </el-table>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -782,9 +798,6 @@
               })
               return false;
             }
-            this.searchDefect()
-            this.badList=[];
-            this.saveHeaderData.badList=[];
             this.saveHeaderData.qtyApprove=0
             this.saveHeaderData.qtyUnApprove=0
             this.saveHeaderData.qtyRework=0
@@ -824,6 +837,7 @@
                 return false;
               }
             })
+            this.searchDefect()
             this.scanModalFlag=false;
             this.setUp.reviewFlag = true;
             this.setUp.saveButton=false;
@@ -894,9 +908,13 @@
         }
       },
       searchDefect(){
-        searchDefect().then(({data}) => {
+        let inData={
+          site:this.saveHeaderData.site,
+          workCenterNo:this.saveHeaderData.workCenterNo
+        }
+        searchDefect(inData).then(({data}) => {
           if (data.code == 0) {
-            this.defectList = data.rows;
+            this.badList = data.rows;
           }
         })
       }