From b2639577f119115edb1bb5a67f3d137ddb3be6c6 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 18 三月 2025 14:56:31 +0800
Subject: [PATCH] 1.成品下单-退回可以重新提交 2.侧边栏样式修改

---
 src/views/business/productOrder/components/add.vue |   45 ++++++++++++++++++++++++++++-----------------
 1 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/src/views/business/productOrder/components/add.vue b/src/views/business/productOrder/components/add.vue
index 9c8b31e..bf2f385 100644
--- a/src/views/business/productOrder/components/add.vue
+++ b/src/views/business/productOrder/components/add.vue
@@ -232,6 +232,7 @@
           </div>
         </div>
         <el-table ref="sampleTable" :data="sampleList" border class="el-table sampleTable" highlight-current-row
+                  :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
           max-height="400px" tooltip-effect="dark" @selection-change="selectSample" @row-click="rowClick">
           <el-table-column v-if="active==1" :selectable="selectable" type="selection" width="60"></el-table-column>
           <el-table-column align="center" label="搴忓彿" type="index" width="65"></el-table-column>
@@ -295,8 +296,9 @@
             </template>
           </el-table-column>
         </el-table>
-        <el-table ref="productTable" v-loading="getProductLoad" :data="productList" :row-class-name="tableRowClassName" border class="el-table"
-                  :key="upIndex"
+        <el-table ref="productTable" v-loading="getProductLoad" :data="productList"
+                  :row-class-name="tableRowClassName" border class="el-table"
+                  :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
           max-height="400px" style="margin-bottom: 10px;" tooltip-effect="dark"
           @select="selectOne" @selection-change="selectProduct" @select-all="handleAll">
           <el-table-column v-if="active==1" :selectable="selectable0" type="selection" width="65"></el-table-column>
@@ -596,7 +598,7 @@
 } from "@/api/business/rawMaterialOrder";
 import {
   addInsOrder, addInsOrderTemplate, delInsOrderTemplate,
-  getQuarterOnOrder,
+  getQuarterOnOrder, selectInsOrderTemplateById,
   selectOrderManDay,
   updateInsOrder,
   upInsOrder,
@@ -606,6 +608,7 @@
 import {selectsStandardMethodByFLSSM} from "@/api/standard/standardLibrary";
 import limsTable from "@/components/Table/lims-table.vue";
 import {selectCustomPageList} from "@/api/system/customer";
+import {mapGetters} from "vuex";
 
 export default {
   name: 'Add',
@@ -613,6 +616,9 @@
     limsTable,
     cableConfig,
     AuxiliaryWireCore
+  },
+  computed:{
+  ...mapGetters(["nickName"]),
   },
   dicts: ['check_type1', 'urgency_level', 'form_type', 'sample_status_list'],
   data() {
@@ -899,7 +905,6 @@
         this.isSpecial = true
         this.$nextTick(() => {
           this.$refs.productTable.doLayout();
-          this.upIndex++
         });
       },
       getQuarterOnOrderList () {
@@ -980,7 +985,7 @@
       },
       // 鑾峰彇鐢ㄦ埛鍒楄〃
       getAuthorizedPerson() {
-        selectUserCondition().then(res => {
+        selectUserCondition({ type: 1 }).then(res => {
           let data = []
           res.data.forEach(a => {
             data.push({
@@ -1125,7 +1130,9 @@
             sampleList.forEach(a => {
               if (a.insProduct.length > 0) {
                 a.insProduct.forEach(c => {
-                  delete c.id
+                  if (this.tabIndex != 4) {
+                    delete c.id
+                  }
                 })
               }
               if (a.endModels) {
@@ -1163,7 +1170,9 @@
           sampleList.forEach(a => {
             if (a.insProduct.length > 0) {
               a.insProduct.forEach(c => {
-                delete c.id
+                if (this.tabIndex != 4) {
+                  delete c.id
+                }
               })
             }
             if (a.endModels) {
@@ -1268,8 +1277,11 @@
           this.addObj.quarterItemId = this.addObj.quarterItemId[1]
         }
         if(this.tabIndex==4&&this.active==2){
+          if (this.addObj.createTime) {
+            delete this.addObj.createTime
+          }
           // 閫�鍥炲悗鎻愪氦
-          updateInsOrder({insOrder: this.addObj, sampleList: sampleList}).then(res => {
+          updateInsOrder({insOrder: this.addObj, sampleProduct: sampleList}).then(res => {
             this.saveLoad = false
             this.$message.success('宸叉彁浜�')
             this.bsm3Dia = false;
@@ -1647,14 +1659,12 @@
         backtrack([], nums);
         return result;
       },
-      tableRowClassName({
-        row,
-        rowIndex
-      }) {
-        if (row.state === 0) {
+      tableRowClassName({row, rowIndex}) {
+        if (row.state == 1) {
+          return 'warning-row';
+        } else {
           return '';
         }
-        return 'warning-row';
       },
       selectInsOrderTemplate() {
         selectInsOrderTemplate({company: this.addObj.company}).then(res => {
@@ -1707,12 +1717,13 @@
         selectInsOrderTemplateById({id: e}).then(res => {
           let obj = JSON.parse(res.data)
           //鍒跺崟浜鸿缃负褰撳墠鐧诲綍鐢ㄦ埛
-          let user = JSON.parse(localStorage.getItem('user'))
+          let user = this.nickName
           obj.addObj.custom = user.name
           obj.addObj.userId = user.userId
           this.addObj = obj.addObj;
           this.sampleList = obj.sampleList;
           this.selectTree = obj.selectTree
+          this.rowClick(this.sampleList[0])
         })
       },
       delSampleAndProduct() {
@@ -2213,7 +2224,7 @@
 </script>
 
 <style scoped>
-.el-table .warning-row .cell {
-  color: #3A7BFA;
+>>>.warning-row {
+  color: #1890FF;
 }
 </style>

--
Gitblit v1.9.3