From 82263ebb91cd2fd4fcc1d52d204ceefef4ab334f Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Tue, 23 Jan 2024 17:32:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E7=BA=BF=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  2 +-
 src/main.js                                   |  3 +-
 .../productManagement/workorder_online.vue    | 48 +++++++++++--------
 3 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index 24a0a16..fea5625 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "vue-seamless-scroll": "^1.1.23",
     "vuedraggable": "^2.20.0",
     "vuex": "3.6.0",
-    "vxe-table": "^3.6.13",
+    "vxe-table": "^3.7.8",
     "xe-utils": "^3.5.11",
     "xlsx": "^0.18.5"
   },
diff --git a/src/main.js b/src/main.js
index c1fcd23..0cd9de0 100644
--- a/src/main.js
+++ b/src/main.js
@@ -39,8 +39,8 @@ import UploadFile from '@/components/FileUpload/index';
 import DictData from '@/components/DictData'
 
 import VXETable from 'vxe-table'
+
 import 'vxe-table/lib/style.css'
-import "@/vxe.scss"
 
 import dataV from '@jiaminghi/data-view'
 
@@ -90,6 +90,7 @@ Vue.use(Element, {
 })
 
 Vue.use(VXETable)
+
 Vue.use(dataV)
 Vue.use(AFTableColumn)
 
diff --git a/src/views/productManagement/workorder_online.vue b/src/views/productManagement/workorder_online.vue
index e16adef..73a0bac 100644
--- a/src/views/productManagement/workorder_online.vue
+++ b/src/views/productManagement/workorder_online.vue
@@ -29,29 +29,31 @@
       show-overflow
       ref="xTable"
       v-loading="loading_1"
+      :cell-style="rowClassName"
       height="800"
-      :row-config="{ isHover: true, useKey: true, keyField: 'sort' }"
+      :row-config="{ isHover: true, useKey: true }"
+      :column-config="{ useKey: true }"
       :data="workorder_table_data"
     >
       <vxe-column type="seq" width="60"></vxe-column>
-      <vxe-column field="clientWorkorder" title="工单号" width="130"></vxe-column>
-      <vxe-column field="blankNumber" title="毛坯号"></vxe-column>
-      <vxe-column field="finishedPartNumber" title="成品零件号"></vxe-column>
-      <vxe-column field="productDescription" title="产品描述"></vxe-column>
-      <vxe-column field="colour" title="颜色"></vxe-column>
-      <vxe-column field="specifications" title="规格"></vxe-column>
-      <vxe-column field="codeNumber" title="编码号"></vxe-column>
-      <vxe-column field="vehicleNumber" title="车数"></vxe-column>
-      <vxe-column field="hangNumber" title="挂具摆放数"></vxe-column>
-      <vxe-column field="previousNumber" title="上件数"></vxe-column>
-      <vxe-column field="cylinderNumber" title="双组号缸号"></vxe-column>
-      <vxe-column field="remark1" title="备注1"></vxe-column>
-      <vxe-column field="remark2" title="备注2"></vxe-column>
+      <vxe-column field="clientWorkorder" title="工单号" width="130" type="html"></vxe-column>
+      <vxe-column field="blankNumber" title="毛坯号" type="html"></vxe-column>
+      <vxe-column field="finishedPartNumber" title="成品零件号" type="html"></vxe-column>
+      <vxe-column field="productDescription" title="产品描述" type="html"></vxe-column>
+      <vxe-column field="colour" title="颜色" type="html"></vxe-column>
+      <vxe-column field="specifications" title="规格" type="html"></vxe-column>
+      <vxe-column field="codeNumber" title="编码号" type="html"></vxe-column>
+      <vxe-column field="vehicleNumber" title="车数" type="html"></vxe-column>
+      <vxe-column field="hangNumber" title="挂具摆放数" type="html"></vxe-column>
+      <vxe-column field="previousNumber" title="上件数" type="html"></vxe-column>
+      <vxe-column field="cylinderNumber" title="双组号缸号" type="html"></vxe-column>
+      <vxe-column field="remark1" title="备注1" type="html"></vxe-column>
+      <vxe-column field="remark2" title="备注2" type="html"></vxe-column>
       <vxe-column title="操作" width="150" show-overflow>
         <template #default="{ row }">
           <div v-show="row.remark3 == '是'">
-            <vxe-button  size="mini" type="text" status="primary" content="开始上线" @click="updateitem(row)"></vxe-button>
-            <vxe-button  size="mini" type="text" status="danger" content="取消上线" @click="cancelitem(row)"></vxe-button>
+            <vxe-button size="mini" type="text" status="primary" content="开始上线" @click="updateitem(row)"></vxe-button>
+            <vxe-button size="mini" type="text" status="danger" content="取消上线" @click="cancelitem(row)"></vxe-button>
           </div>
         </template>
       </vxe-column>
@@ -110,8 +112,6 @@ export default {
           this.loading_1 = false
           this.workorder_table_data = res.data.item1
           this.pagination.total = res.data.item2
-
-         
         }
       })
     },
@@ -127,7 +127,6 @@ export default {
     },
     //todo 取消上线
     cancelitem(row) {
-      
       this.$modal
         .confirm('是否确认取消生产工单名称为' + row.productDescription + '"的数据项？')
         .then(function () {
@@ -140,6 +139,15 @@ export default {
           }
         })
     },
+    //todo 更改单元格格式
+    rowClassName(item) {
+      if (item.row.status > 0) {
+        return {
+          backgroundColor: '#FFFF00',
+        }
+      }
+      return null
+    },
   },
 }
 </script>
@@ -147,7 +155,7 @@ export default {
 <style lang="scss" scoped>
 .el-dropdown-link {
   cursor: pointer;
-  color: #409eff;
+  color: #93ff40;
 }
 .el-icon-arrow-down {
   font-size: 0.5rem;