From 0b1837e9b6d1ac8825e9c1acf6f0cd5b2b14a897 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 04 一月 2023 10:41:00 +0800
Subject: [PATCH] 1.列展示设置   静态框架初步搭建完成

---
 src/views/zlgl/gxjy.vue |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/views/zlgl/gxjy.vue b/src/views/zlgl/gxjy.vue
index 4840be3..7d61a90 100644
--- a/src/views/zlgl/gxjy.vue
+++ b/src/views/zlgl/gxjy.vue
@@ -3,7 +3,7 @@
     <div class="body" :style="{height:mainHeight+'px'}">
       <div style="padding-top: 10px;display: flex;flex-direction: column">
         <div style="margin-bottom: 15px;font-size: 14px">
-          <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />鎵爜淇℃伅
+          <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" style="margin-right: 5px" />鎵爜淇℃伅
         </div>
         <div style="display: flex;align-items: center">
           <div style="width: 90px;display: flex">
@@ -88,7 +88,7 @@
         </div>
 
         <div style="margin: 15px 0;font-size: 14px">
-          <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />妫�楠屾爣鍑嗕俊鎭�
+          <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" style="margin-right: 5px" />妫�楠屾爣鍑嗕俊鎭�
         </div>
         <div style="display: flex;align-items: center">
           <div style="width: 90px;display: flex">
@@ -163,7 +163,7 @@
         </div>
 
         <div style="margin: 15px 0;font-size: 14px">
-          <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />妫�楠岄」淇℃伅
+          <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" style="margin-right: 5px" />妫�楠岄」淇℃伅
         </div>
         <div>
           <el-button type="primary" @click="add">鏂板</el-button>
@@ -220,6 +220,7 @@
             <el-table-column
               prop="code"
               label="妫�楠屾爣鍑嗙紪鐮�"
+              show-tooltip-when-overflow
             >
               <template slot-scope="{row}">
                 <div v-if="row.isVisible===0">{{ row.code }}</div>
@@ -242,6 +243,7 @@
             <el-table-column
               prop="name"
               label="妫�楠屾爣鍑嗗悕绉�"
+              show-tooltip-when-overflow
             >
               <template slot-scope="{row}">
                 <div v-if="row.isVisible===0">{{ row.name }}</div>
@@ -265,6 +267,7 @@
             <el-table-column
               prop="stepcheckitem_desc"
               label="妫�楠屾爣鍑嗘弿杩�"
+              show-tooltip-when-overflow
             >
               <template slot-scope="scope">
                 <el-input
@@ -285,6 +288,7 @@
               prop="result"
               label="妫�楠岀粨鏋�"
               width="100"
+              show-tooltip-when-overflow
             >
               <template slot-scope="{row}">
                 <div v-if="row.result==='OK'">鍚堟牸</div>
@@ -358,6 +362,7 @@
   StepCheckItemSelect
 } from '@/api/zlgl'
 import { MesOrderSelectUser } from '@/api/scgl'
+import { getCookie } from '@/utils/auth'
 
 export default {
   name: 'QXDY',
@@ -381,7 +386,7 @@
       },
       checkStandard: '', // 妫�楠屾爣鍑�
       checkStandardSelect: [], // 妫�楠屾爣鍑嗕笅鎷夋暟缁�
-      checkUser: '', // 妫�楠屼汉鍛�
+      checkUser: getCookie('navTabId'), // 妫�楠屼汉鍛�
       checkqty: 0, // 妫�楠屾暟閲�
       checkUserSelect: [], // 妫�楠屼汉鍛樹笅鎷夋暟缁�
       checkResult: '', // 妫�楠岀粨鏋�
@@ -638,6 +643,9 @@
         if (this.form.orderstepqrcode.length < 1) {
           return this.$message.info('鎵弿鏉＄爜涓嶈兘涓虹┖锛�')
         }
+        if (this.form.wo_code.toString().length === 0) {
+          return this.$message.info('鏈幏寰楀伐鍗曠紪鐮侊紒')
+        }
         if (this.checkStandard.length < 1) {
           return this.$message.info('妫�楠屾爣鍑嗕笉鑳戒负绌猴紒')
         }
@@ -705,7 +713,7 @@
       this.JYTableData = []
       this.multipleSelection = []
       this.checkdescr = ''
-      this.checkUser = ''
+      this.checkUser = getCookie('navTabId')
       this.checkqty = 0
       this.checkResult = ''
       this.checkStandard = ''

--
Gitblit v1.9.3