From 6caecd26f75979777956dc96e14d6f3b39ce6688 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 15 七月 2022 17:23:42 +0800
Subject: [PATCH] 1.修改bug

---
 src/views/jcsz/zzjg.vue |   58 ++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/src/views/jcsz/zzjg.vue b/src/views/jcsz/zzjg.vue
index 5a672ff..d6cecf4 100644
--- a/src/views/jcsz/zzjg.vue
+++ b/src/views/jcsz/zzjg.vue
@@ -48,7 +48,7 @@
           stripe
           :style="{width: 100+'%',height:tableHeight+'px'}"
           highlight-current-row
-          :height="tableHeight"
+          :height="tableHeight+'px'"
           :header-cell-style="this.$headerCellStyle"
           :cell-style="this.$cellStyle"
           @sort-change="sortChange"
@@ -79,18 +79,23 @@
             sortable="custom"
           >
             <template slot-scope="{row}">
-              <div v-if="row.description==='F'">宸ュ巶</div>
+              <!--              <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>
+              <!--              <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="涓婄骇鍗曚綅"
             sortable="custom"
-          />
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.parentorg_name===null">/</div>
+              <div v-else>{{ row.parentorg_name }}</div>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="lm_user"
             label="鍒涘缓浜哄憳"
@@ -129,7 +134,7 @@
     <el-dialog
       :title="operation==='add'?'鏂板':'缂栬緫'"
       :visible.sync="dialogVisible"
-      width="60%"
+      width="800px"
       top="15vh"
       :close-on-click-modal="false"
       @closed="handleClose"
@@ -155,7 +160,8 @@
         <el-form-item label="缁勭粐鍚嶇О" prop="OrgName">
           <el-input v-model="dialogForm.OrgName" style="width: 200px" />
         </el-form-item>
-        <el-form-item v-if="dialogFormOrgTypeSelected!=='F'" prop="SupUnit" label="涓婄骇鍗曚綅">
+        <!--        <el-form-item v-if="dialogFormOrgTypeSelected!=='F'" prop="SupUnit" label="涓婄骇鍗曚綅">-->
+        <el-form-item v-if="dialogFormOrgTypeSelected!=='D'" prop="SupUnit" label="涓婄骇鍗曚綅">
           <el-select
             v-model="dialogForm.SupUnit"
             style="width: 200px"
@@ -190,7 +196,7 @@
 
 const SER_HZ = /^[\u4e00-\u9fa5]+$/
 export default {
-  name: 'Zzjg',
+  name: 'ZZJG',
   components: {
     Pagination
   },
@@ -230,11 +236,11 @@
         rows: 20 // 姣忛〉澶氬皯鏉�
       },
       OrgTypeArr: [
-        { label: '宸ュ巶', value: 'F' },
+        // { label: '宸ュ巶', value: 'F' },
         { label: '閮ㄩ棬', value: 'D' },
-        { label: '杞﹂棿', value: 'W' },
-        { label: '绉戝', value: 'K' },
-        { label: '鐢熶骇绾�', value: 'L' }
+        { label: '杞﹂棿', value: 'W' }
+        // { label: '绉戝', value: 'K' },
+        // { label: '鐢熶骇绾�', value: 'L' }
       ],
 
       total: 10,
@@ -342,7 +348,8 @@
       } else {
         this.dialogFormOrgTypeSelected = val
       }
-      if (this.dialogFormOrgTypeSelected !== 'F') {
+      // if (this.dialogFormOrgTypeSelected !== 'F') {
+      if (this.dialogFormOrgTypeSelected !== 'D') {
         const { data: res } = await PrentOrganization({ orgcode: this.dialogFormOrgTypeSelected })
         this.SupUnitArr = res
       }
@@ -361,17 +368,19 @@
     edit(operation, row) {
       this.operation = operation
       this.dialogVisible = true
-      if (row.description === 'F') {
-        this.dialogForm.OrgType = '宸ュ巶'
-      } else if (row.description === 'D') {
+      // if (row.description === 'F') {
+      //   this.dialogForm.OrgType = '宸ュ巶'
+      // } else
+      if (row.description === 'D') {
         this.dialogForm.OrgType = '閮ㄩ棬'
       } else if (row.description === 'W') {
         this.dialogForm.OrgType = '杞﹂棿'
-      } else if (row.description === 'K') {
-        this.dialogForm.OrgType = '绉戝'
-      } else if (row.description === 'L') {
-        this.dialogForm.OrgType = '鐢熶骇绾�'
       }
+      // else if (row.description === 'K') {
+      //   this.dialogForm.OrgType = '绉戝'
+      // } else if (row.description === 'L') {
+      //   this.dialogForm.OrgType = '鐢熶骇绾�'
+      // }
       this.$nextTick(() => {
         this.changeRadio(this.dialogForm.OrgType)
         this.dialogForm.OrgCode = row.org_code
@@ -420,7 +429,8 @@
             numvalue: '',
             // RightCode: this.operation === 'add' ? getCookie('ruleCode') : '',
             // numvalue: this.operation === 'add' ? this.numvalue : '',
-            SupUnit: this.dialogFormOrgTypeSelected === 'F' ? '0' : this.dialogForm.SupUnit,
+            // SupUnit: this.dialogFormOrgTypeSelected === 'F' ? '0' : this.dialogForm.SupUnit,
+            SupUnit: this.dialogFormOrgTypeSelected === 'D' ? '0' : this.dialogForm.SupUnit,
             OperType: this.operation === 'add' ? 'Add' : 'Update',
             Operator: getCookie('admin')
           }
@@ -495,9 +505,9 @@
   color: #606266;
 }
 
-//::v-deep .el-dialog__body {
-//  padding: 20px 100px !important;
-//}
+::v-deep .el-dialog__body {
+  padding: 20px 100px !important;
+}
 
 ::v-deep .el-radio__input.is-checked .el-radio__inner {
   background-color: $main_color;

--
Gitblit v1.9.3