From 677259cd253b9734e80626fa6d9fda9074dd908f Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 3 Mar 2025 14:21:47 +0800
Subject: [PATCH 1/5] =?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/assets/scss/rq.scss                       |  3 +++
 src/views/modules/print/print_liuhua_card.js  |  6 ++---
 src/views/modules/production/dailyPlan.vue    | 22 ++++++++++++++++---
 .../modules/production/scheduleForSOTask.vue  | 11 +++++++++-
 .../production/scheduleForShopOrder.vue       | 10 +++++++++
 .../production/scheduleForVPShopOrder.vue     | 11 +++++++++-
 6 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/src/assets/scss/rq.scss b/src/assets/scss/rq.scss
index 22c3a3a..2acb4be 100644
--- a/src/assets/scss/rq.scss
+++ b/src/assets/scss/rq.scss
@@ -62,3 +62,6 @@
 .redModel .el-form-item__label {
   font-weight:bold;color:#bd0b06
 }
+.el-table .yellow-row {
+  background: #e7e756;
+}
diff --git a/src/views/modules/print/print_liuhua_card.js b/src/views/modules/print/print_liuhua_card.js
index 35d15fa..a9ebdb4 100644
--- a/src/views/modules/print/print_liuhua_card.js
+++ b/src/views/modules/print/print_liuhua_card.js
@@ -87,7 +87,7 @@ export function printCardLabel(printList) {
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(64,379,80,25,"产品颜色:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(64,539,90,25,"外购件批号:");
+      LODOP.ADD_PRINT_TEXT(64,539,90,25,"催化剂类型:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(86,4,85,25,"原材料型号:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
@@ -235,8 +235,8 @@ export function printCardLabel(printList) {
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(63,462,85,20,printData.cpys);//产品颜色
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      // LODOP.ADD_PRINT_TEXT(63,615,105,25,"外购件批号");//外购件批号
-      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(63,615,105,25,printData.chjlt);//催化剂类型
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(86,82,120,20,printData.yclxh);//原材料型号
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(87,283,105,25,printData.hljyd);//混炼胶硬度
diff --git a/src/views/modules/production/dailyPlan.vue b/src/views/modules/production/dailyPlan.vue
index 52f0b1b..bb0091e 100644
--- a/src/views/modules/production/dailyPlan.vue
+++ b/src/views/modules/production/dailyPlan.vue
@@ -102,6 +102,7 @@
     <el-table
       :height="height"
       :data="tableData"
+      :row-class-name="tableRowClassName"
       border
       style="width: 100%">
       <el-table-column
@@ -118,14 +119,14 @@
         prop="site"
         header-align="center"
         align="left"
-        min-width="60"
+        min-width="40"
         label="工厂编码">
       </el-table-column>
       <el-table-column
         prop="orderNo"
         header-align="center"
         align="left"
-        min-width="60"
+        min-width="70"
         label="订单号">
       </el-table-column>
       <el-table-column
@@ -146,7 +147,7 @@
         prop="partDescription"
         header-align="center"
         align="left"
-        min-width="200"
+        min-width="140"
         label="物料名称">
       </el-table-column>
       <el-table-column
@@ -177,6 +178,13 @@
         min-width="40"
         label="订单数量">
       </el-table-column>
+      <el-table-column
+        prop="weightFactor"
+        header-align="center"
+        align="right"
+        min-width="40"
+        label="产品净重">
+      </el-table-column>
       <el-table-column
         prop="weight"
         header-align="center"
@@ -860,6 +868,14 @@
           this.scheduledingsData.qty=''
         }
       },
+      tableRowClassName ({row, rowIndex}) {
+
+        if (row.orderTypeDesc==='加急订单'||row.orderTypeDesc==='变更订单') {
+          return 'yellow-row'
+        }
+
+        return ''
+      },
     },
     created () {
 
diff --git a/src/views/modules/production/scheduleForSOTask.vue b/src/views/modules/production/scheduleForSOTask.vue
index 91effb1..055834a 100644
--- a/src/views/modules/production/scheduleForSOTask.vue
+++ b/src/views/modules/production/scheduleForSOTask.vue
@@ -285,6 +285,13 @@
         min-width="80"
         label="订单数量">
       </el-table-column>
+      <el-table-column
+        prop="weightFactor"
+        header-align="center"
+        align="right"
+        min-width="80"
+        label="产品净重">
+      </el-table-column>
       <el-table-column
         prop="weight"
         header-align="center"
@@ -989,7 +996,9 @@
         }
       },
       tableRowClassName ({row, rowIndex}) {
-
+        if (row.orderTypeDesc==='加急订单'||row.orderTypeDesc==='变更订单') {
+          return 'yellow-row'
+        }
         if (row.lastStartDate == this.dayjs().format('YYYY-MM-DD')) {
           return 'success-row'
         }
diff --git a/src/views/modules/production/scheduleForShopOrder.vue b/src/views/modules/production/scheduleForShopOrder.vue
index 3604793..e188579 100644
--- a/src/views/modules/production/scheduleForShopOrder.vue
+++ b/src/views/modules/production/scheduleForShopOrder.vue
@@ -251,6 +251,13 @@
         width="80"
         label="订单数量">
       </el-table-column>
+      <el-table-column
+        prop="weightFactor"
+        header-align="center"
+        align="right"
+        min-width="80"
+        label="产品净重">
+      </el-table-column>
       <el-table-column
         prop="weight"
         header-align="center"
@@ -1017,6 +1024,9 @@
       },
       tableRowClassName ({row, rowIndex}) {
 
+        if (row.orderTypeDesc==='加急订单'||row.orderTypeDesc==='变更订单') {
+          return 'yellow-row'
+        }
         if (row.lastStartDate == this.dayjs().format('YYYY-MM-DD')) {
           return 'success-row'
         }
diff --git a/src/views/modules/production/scheduleForVPShopOrder.vue b/src/views/modules/production/scheduleForVPShopOrder.vue
index 9ab8ff0..e39e97d 100644
--- a/src/views/modules/production/scheduleForVPShopOrder.vue
+++ b/src/views/modules/production/scheduleForVPShopOrder.vue
@@ -162,6 +162,13 @@
         min-width="100"
         label="组合件需求数量">
       </el-table-column>
+      <el-table-column
+        prop="weightFactor"
+        header-align="center"
+        align="right"
+        min-width="80"
+        label="组合件净重">
+      </el-table-column>
       <el-table-column
         prop="weight"
         header-align="center"
@@ -813,7 +820,9 @@
 
       },
       tableRowClassName ({row, rowIndex}) {
-
+        if (row.orderTypeDesc==='加急订单'||row.orderTypeDesc==='变更订单') {
+          return 'yellow-row'
+        }
         if (row.lastStartDate == this.dayjs().format('YYYY-MM-DD')) {
           return 'success-row'
         }

From e5be0ba7a1447e619d8eca5c5086972ca7ba658c Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 6 Mar 2025 10:35:58 +0800
Subject: [PATCH 2/5] =?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/Abnormal/AbnormalFeedBack.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/modules/Abnormal/AbnormalFeedBack.vue b/src/views/modules/Abnormal/AbnormalFeedBack.vue
index f558a20..0755839 100644
--- a/src/views/modules/Abnormal/AbnormalFeedBack.vue
+++ b/src/views/modules/Abnormal/AbnormalFeedBack.vue
@@ -36,6 +36,9 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item :label="'异常原因：'">
+        <el-input v-model="searchData.abnormalDesc"  style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item label="状态：" >
         <el-select v-model="searchData.status" style="width: 120px">
           <el-option label="全部" value=""></el-option>
@@ -521,6 +524,7 @@
           startDate:'',
           endDate:'',
           abnormalCode:'',
+          abnormalDesc:'',
           site:'',
           status:'',
           operatorDesc:'',

From 86fa1818874796714535492b02324c9dac7ffff5 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 6 Mar 2025 13:47:24 +0800
Subject: [PATCH 3/5] =?UTF-8?q?2025-03-06=20yfy=E9=A6=96=E6=8F=90=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/oss/oss.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/modules/oss/oss.vue b/src/views/modules/oss/oss.vue
index cffcc32..2d0e7e9 100644
--- a/src/views/modules/oss/oss.vue
+++ b/src/views/modules/oss/oss.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="mod-oss">
+
     <el-form :inline="true" :model="dataForm">
       <el-form-item>
         <el-button type="primary" @click="configHandle()">云存储配置</el-button>

From 0a5d8cc23b07868782e712baa6fcc10d8a392354 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 6 Mar 2025 16:54:57 +0800
Subject: [PATCH 4/5] =?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/Abnormal/AbnormalFeedBack.vue | 10 ++++++----
 src/views/modules/sys/user.vue                  |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/Abnormal/AbnormalFeedBack.vue b/src/views/modules/Abnormal/AbnormalFeedBack.vue
index 0755839..b3d9624 100644
--- a/src/views/modules/Abnormal/AbnormalFeedBack.vue
+++ b/src/views/modules/Abnormal/AbnormalFeedBack.vue
@@ -184,7 +184,7 @@
         width="340"
         label="操作">
         <template slot-scope="scope">
-          <a type="text" size="small" v-if="searchData.userId==='admin'||searchData.userId==='E0002'" @click="updateModel(scope.row)">修改</a>
+          <a type="text" size="small"  v-if="(searchData.userId==='admin'||searchData.userId==='E0002')&&scope.row.status!='已完结'" @click="updateModel(scope.row)">修改</a>
           <a type="text" size="small" @click="getFileModel(scope.row)">整改文件</a>
           <a type="text" size="small" @click="getDetailModel(scope.row)">查看</a>
           <a type="text" size="small" @click="doPrint(scope.row)">打印</a>
@@ -431,7 +431,7 @@
     </el-dialog>
     <el-dialog title="整改文件" :close-on-click-modal="false" v-drag :visible.sync="fileModalFlag" width="650px" >
       <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
-        <el-form :inline="true" label-position="top" style="margin-top: 0px">
+        <el-form :inline="true" label-position="top" style="margin-top: 0px" v-if="fileSearchData.status!=='已完结'">
           <el-button type="primary" @click="addUploadFileModal">上传文件</el-button>
         </el-form>
       </el-form>
@@ -466,7 +466,7 @@
           <template slot-scope="scope">
             <!--              <a :href="'http://192.168.1.130:80/file/'+scope.row.url" :download="scope.row.fileName">下载</a>-->
             <a  @click="downloadFile(scope.row)" >下载</a>
-            <a type="text" size="small"  @click="deleteHandle(scope.row.id)">删除</a>
+            <a type="text" size="small" v-if="fileSearchData.status!=='已完结'" @click="deleteHandle(scope.row.id)">删除</a>
           </template>
         </el-table-column>
       </el-table>
@@ -600,7 +600,8 @@
         fileSearchData:{
           fileTypeCode:'Abnormal',
           orderRef1:'',
-          orderRef2:''
+          orderRef2:'',
+          status:'',
         },
         tableData:[],
         addData:{
@@ -1043,6 +1044,7 @@
           fileTypeCode:'Abnormal',
           orderRef1:row.site,
           orderRef2:row.id,
+          status:row.status,
         }
         this.getFileList()
         this.fileModalFlag=true;
diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue
index dd0204c..5fc2d77 100644
--- a/src/views/modules/sys/user.vue
+++ b/src/views/modules/sys/user.vue
@@ -64,8 +64,8 @@
         width="150"
         label="操作">
         <template slot-scope="scope">
+          <a v-if="isAuth('sys:user:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.userId)">修改</a>
           <span v-if="scope.row.userId !==1">
-            <a v-if="isAuth('sys:user:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.userId)">修改</a>
 <!--            <a v-if="isAuth('sys:user:update')&&scope.row.status==1 " type="text" size="small" @click="updateHandle(scope.row.userId,0)">禁用</a>-->
 <!--            <a v-if="isAuth('sys:user:update')&&scope.row.status==0 " type="text" size="small" @click="updateHandle(scope.row.userId,1)">启用</a>-->
             <a v-if="isAuth('sys:user:delete')" type="text" size="small" @click="deleteHandle(scope.row.userId)">删除</a>

From 4720d23b2672a8291e4900097941ca911ff35129 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Fri, 7 Mar 2025 09:21:09 +0800
Subject: [PATCH 5/5] =?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

---
 .../production/productionBlankingSearch.vue   | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/production/productionBlankingSearch.vue b/src/views/modules/production/productionBlankingSearch.vue
index 4468990..ddf3ce5 100644
--- a/src/views/modules/production/productionBlankingSearch.vue
+++ b/src/views/modules/production/productionBlankingSearch.vue
@@ -319,13 +319,16 @@
         this.dataListSelections = val
       },
       tableRowClassName ({row, rowIndex}) {
-        if (row.finishedFlag == '2') {
-          return 'success-row'
-        }
-        if (row.finishedFlag == '3') {
-          return 'false-row'
-        }
-        if (row.finishedFlag == '4') {
+        // if (row.finishedFlag == '2') {
+        //   return 'success-row'
+        // }
+        // if (row.finishedFlag == '3') {
+        //   return 'false-row'
+        // }
+        // if (row.finishedFlag == '4') {
+        //   return 'yellow-row'
+        // }
+        if (row.orderTypeDesc==='加急订单'||row.orderTypeDesc==='变更订单') {
           return 'yellow-row'
         }
         return ''
@@ -458,6 +461,8 @@
         }).catch(() => {
         })
       },
+
+
     }
   }
 </script>