From dc1226c67b9b34b602254ed3ca3de0e5b272cffa Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 22 九月 2022 17:49:06 +0800
Subject: [PATCH] 1.不良明细报表、品质异常排行报表、维修明细报表开发完成

---
 src/views/template.vue |   53 ++++++++++++++---------------------------------------
 1 files changed, 14 insertions(+), 39 deletions(-)

diff --git a/src/views/template.vue b/src/views/template.vue
index c50cab1..1e0fa00 100644
--- a/src/views/template.vue
+++ b/src/views/template.vue
@@ -54,13 +54,10 @@
           :cell-style="this.$cellStyle"
           @sort-change="sortChange"
         >
-          <!--          <el-table-column-->
-          <!--            type="selection"-->
-          <!--            width="50"-->
-          <!--          />-->
           <el-table-column
             prop="RowNum"
             width="50"
+            fixed
             label="搴忓彿"
           />
           <el-table-column
@@ -77,15 +74,7 @@
             prop="description"
             label="缁勭粐绫诲瀷"
             sortable="custom"
-          >
-            <template slot-scope="{row}">
-              <div v-if="row.description==='F'">宸ュ巶</div>
-              <div v-if="row.description==='D'">閮ㄩ棬</div>
-              <div v-if="row.description==='W'">杞﹂棿</div>
-              <div v-if="row.description==='K'">绉戝</div>
-              <div v-if="row.description==='L'">鐢熶骇绾�</div>
-            </template>
-          </el-table-column>
+          />
           <el-table-column
             prop="parentorg_name"
             label="涓婄骇鍗曚綅"
@@ -104,11 +93,17 @@
           />
           <el-table-column
             label="鎿嶄綔"
+            width="120"
+            fixed="right"
           >
             <template slot-scope="{row}">
               <div class="operationClass">
-                <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
-                <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
+                <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+                  <i class="el-icon-edit-outline" @click="edit('edit',row)" />
+                </el-tooltip>
+                <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
+                  <i class="el-icon-delete" @click="del(row)" />
+                </el-tooltip>
               </div>
             </template>
           </el-table-column>
@@ -120,7 +115,7 @@
         :page.sync="form.page"
         :limit.sync="form.rows"
         align="right"
-        layout="prev, pager, next,sizes"
+        layout="total,prev, pager, next,sizes"
         popper-class="select_bottom"
         @pagination="getOrganizationSearch"
       />
@@ -177,32 +172,14 @@
 import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
 import { getCookie } from '@/utils/auth'
 import ImportPicker from '@/components/ImportPicker'
+import { validateCode } from '@/utils/global'
 
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
 export default {
   name: 'Zzjg',
   components: {
     Pagination, ImportPicker
   },
   data() {
-    const validateName = (rule, value, callback) => {
-      if (!value) {
-        return callback(new Error('璇疯緭鍏ョ紪鐮�'))
-      } else {
-        if (SER_HZ.test(value)) {
-          return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
-        } else {
-          callback()
-        }
-      }
-    }
-    const validateTypeCode = (rule, value, callback) => {
-      if (!value) {
-        return callback(new Error('璇烽�夋嫨涓婄骇'))
-      } else {
-        callback()
-      }
-    }
     return {
       mainHeight: 0,
       tableHeight: 0,
@@ -239,14 +216,12 @@
           { required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
         ],
         OrgCode: [
-          { required: true, validator: validateName, trigger: ['blur', 'change'] }
+          { required: true, validator: validateCode, trigger: ['blur', 'change'] }
         ],
         OrgName: [
           { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
-        ],
-        SupUnit: [
-          { required: true, validator: validateTypeCode, trigger: ['blur', 'change'] }
         ]
+
       },
 
       title_value: '鏁版嵁瀵煎叆 / 鐐规閮ㄤ綅',

--
Gitblit v1.9.3