From d33eacc1f85ac3a736b33ba4713a19aae466d711 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 05 八月 2022 16:42:53 +0800
Subject: [PATCH] 1.做适应平板显示的内容大小

---
 src/views/jcsz/jsqd.vue |  476 +++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 300 insertions(+), 176 deletions(-)

diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 4a554be..206278f 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -47,17 +47,16 @@
       <div style="margin-left: 10px;display: flex">
         <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
         <el-button type="primary" icon="el-icon-setting" @click="settingButton">璁剧疆</el-button>
-        <!--        <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
+        <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
       </div>
       <el-divider />
       <div class="elTableDiv">
         <el-table
           :data="tableData"
           border
-
           stripe
           :height="tableHeight+'px'"
-          :style="{width: 100+'%',height:tableHeight+'px'}"
+          :style="{width: 100+'%',height: tableHeight+'px'}"
           highlight-current-row
           :header-cell-style="this.$headerCellStyle"
           :cell-style="this.$cellStyle"
@@ -72,24 +71,29 @@
             prop="RowNum"
             width="50"
             label="搴忓彿"
+            fixed
           />
           <el-table-column
             prop="role_code"
             label="瑙掕壊缂栫爜"
             sortable="custom"
+            min-width="110"
           />
           <el-table-column
             prop="role_name"
             label="瑙掕壊鍚嶇О"
             sortable="custom"
+            min-width="110"
           />
           <el-table-column
             prop="roletype_name"
             label="瑙掕壊绫诲瀷"
             sortable="custom"
+            min-width="110"
           />
           <el-table-column
             prop="description"
+            min-width="160"
             label="瑙掕壊鎻忚堪"
             sortable="custom"
           />
@@ -97,10 +101,12 @@
             prop="lm_user"
             label="鍒涘缓浜哄憳"
             sortable="custom"
+            width="110"
           />
           <el-table-column
             prop="lm_date"
             label="鍒涘缓鏃堕棿"
+            min-width="160"
             sortable="custom"
           />
           <el-table-column
@@ -111,7 +117,7 @@
           >
             <template slot-scope="{row}">
               <i v-if="row.is_user==='Y'" class="el-icon-user-solid" @click="userClick(row)" />
-              <i v-if="row.is_user==='N'" class="el-icon-user-solid" style="color: #E4E7ED" @click="userClick(row)" />
+              <i v-if="row.is_user==='N'" class="el-icon-user-solid" style="color: rgb(180 ,181, 185)" @click="userClick(row)" />
             </template>
           </el-table-column>
           <el-table-column
@@ -122,11 +128,13 @@
           >
             <template slot-scope="{row}">
               <i v-if="row.is_right==='Y'" class="el-icon-share" @click="rightClick(row)" />
-              <i v-if="row.is_right==='N'" class="el-icon-share" style="color: #E4E7ED" @click="rightClick(row)" />
+              <i v-if="row.is_right==='N'" class="el-icon-share" style="color: rgb(180 ,181, 185)" @click="rightClick(row)" />
             </template>
           </el-table-column>
           <el-table-column
             label="鎿嶄綔"
+            fixed="right"
+            width="120"
           >
             <template slot-scope="{row}">
               <div class="operationClass">
@@ -280,10 +288,10 @@
     <el-dialog
       title="瑙掕壊鍏宠仈鐢ㄦ埛"
       :visible.sync="userDialogVisible"
-      width="1500px"
+      width="900px"
       :close-on-click-modal="false"
       top="15vh"
-      :fullscreen="isFullscreen"
+      :fullscreen="isIpad"
       class="userDialogVisible"
       @closed="handleCloseUser"
       @close="handleCloseUser"
@@ -298,10 +306,16 @@
       <div style="display: flex;min-height: 50px">
         <el-form ref="dialogFormUser" inline :model="dialogFormUser" label-width="80px">
           <el-form-item label="鐢ㄦ埛缂栫爜">
-            <el-input v-model="dialogFormUser.usercode" style="width: 200px" />
+            <el-input
+              v-model="dialogFormUser.usercode"
+              :style="{width:isIpad? '180px':'200px'}"
+            />
           </el-form-item>
           <el-form-item label="鐢ㄦ埛鍚嶇О">
-            <el-input v-model="dialogFormUser.username" style="width: 200px" />
+            <el-input
+              v-model="dialogFormUser.username"
+              :style="{width:isIpad? '180px':'200px'}"
+            />
           </el-form-item>
           <el-form-item label="鎵�灞炵粍缁�">
             <el-cascader
@@ -312,7 +326,7 @@
               :append-to-body="false"
               :options="StuOrgArr"
               :props="defaultProps"
-              style="width: 200px;"
+              :style="{width:isIpad? '180px':'200px'}"
 
               @change="dialogCascaderChange"
             />
@@ -323,7 +337,7 @@
               v-model="dialogFormUser.isrole"
               filterable
               :popper-append-to-body="false"
-              style="width: 200px"
+              :style="{width:isIpad? '180px':'200px'}"
               placeholder="璇烽�夋嫨"
             >
               <el-option
@@ -355,7 +369,7 @@
         :data="dialogFormUserTable"
         border
         highlight-current-row
-        height="300"
+        height="370"
         :header-cell-style="this.$headerCellStyle"
         :cell-style="this.$cellStyle"
         :row-key="getRowKey"
@@ -426,7 +440,7 @@
       :visible.sync="dialogVisibleRight"
       width="800px"
       top="15vh"
-      :fullscreen="isFullscreen"
+      :fullscreen="isIpad"
       :close-on-click-modal="false"
       class="dialogVisibleRight"
       @closed="handleCloseRight"
@@ -497,11 +511,16 @@
         </div>
       </span>
     </el-dialog>
+
+    <!--瀵煎叆缁勪欢-->
+    <import-picker ref="importPickerFunc" :shows.sync="shows" :title="title_value" :colos="colos" :code="code" />
+
   </div>
 </template>
 
 <script>
 import Pagination from '@/components/Pagination'
+import ImportPicker from '@/components/ImportPicker'
 import {
   AddUpdateRole,
   DeleteRole, RoleAssociationRight,
@@ -517,7 +536,7 @@
 export default {
   name: 'JSQD',
   components: {
-    Pagination
+    Pagination, ImportPicker
   },
   data() {
     const validateName = (rule, value, callback) => {
@@ -531,15 +550,8 @@
         }
       }
     }
-    // const validateTypeCode = (rule, value, callback) => {
-    //   if (!value) {
-    //     return callback(new Error('璇烽�夋嫨涓婄骇'))
-    //   } else {
-    //     callback()
-    //   }
-    // }
     return {
-      isFullscreen: false,
+      isIpad: false,
       mainHeight: 0,
       tableHeight: 0,
       form: {
@@ -633,24 +645,44 @@
         children: 'children',
         label: 'name',
         value: 'code'
+      },
+      PCTrue: false, // 鏄惁灞曠ず
+      APPTrue: false, // 鏄惁灞曠ず
+
+      title_value: '鏁版嵁瀵煎叆 / 瑙掕壊娓呭崟',
+      code: '1',
+      shows: false
+    }
+  },
+  watch: {
+    shows() {
+      if (!this.shows) {
+        this.getRoleSearch()
       }
     }
   },
   created() {
-    this.getRoleSearch()
-    this.getRoleTypeSearch2()
-    this.getUserOrganization()
+    this.handleRequest()
   },
   mounted() {
     window.addEventListener('resize', this.getHeight)
     this.getHeight()
   },
   methods: {
+    handleRequest() {
+      this.getRoleSearch().then(res => {
+        if (res.code === '200') {
+          this.getRoleTypeSearch2()
+          this.getUserOrganization()
+        }
+      })
+    },
     // 鑾峰彇瑙掕壊娓呭崟
     async getRoleSearch() {
       const res = await RoleSearch(this.form)
       this.tableData = res.data
       this.total = res.count
+      return { code: res.code }
     },
     // 鑾峰彇鐢ㄦ埛绫诲瀷
     async getRoleTypeSearch() {
@@ -698,10 +730,6 @@
       this.formSetting.order = order
       this.formSetting.prop = prop
       this.getRoleTypeSearch()
-    },
-
-    upload() {
-
     },
     // 鏌ヨ
     search() {
@@ -792,11 +820,13 @@
     // 鑾峰彇椤甸潰楂樺害
     getHeight() {
       this.$nextTick(() => {
-        console.log(window.innerHeight)
-        console.log(window.innerHeight)
         this.mainHeight = window.innerHeight - 250
-        this.tableHeight = this.mainHeight - 100
-        // this.isFullscreen = window.innerHeight < 800
+        this.tableHeight = this.mainHeight - 50
+        if (window.innerHeight < 769) {
+          this.tableHeight = this.tableHeight - 50
+        }
+
+        this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
       })
     },
     /* 璁剧疆妯″潡*/
@@ -973,125 +1003,206 @@
         type: ''
       }
       const { data: res } = await RoleAssociationRight(data)// 鎺ュ彛鑾峰彇鏁版嵁
-      this.dialogFormRight.rightPCArr = res[0]
-      this.dialogFormRight.rightAPPArr = res[1]
+
+      this.dialogFormRight.rightPCArr = res[0][0].is_delete === '0' ? res[0] : []
+      this.dialogFormRight.rightAPPArr = res[1][0].is_delete === '0' ? res[1] : []
+
+      this.PCTrue = res[0][0].is_delete === '0'
+      this.APPTrue = res[1][0].is_delete === '0'
+      // '0'鏄剧ず  '1' 涓嶆樉绀�   杩囨护鍑虹浉瀵瑰簲鐨勮彍鍗�
+      if (this.PCTrue) {
+        this.dialogFormRight.rightPCArr[0].children = this.dialogFormRight.rightPCArr[0].children.filter(item => item.is_delete === '0')
+        this.dialogFormRight.rightPCArr[0].children.forEach(item => {
+          item.children = item.children.filter(it => it.is_delete === '0')
+        })
+      }
+
+      if (this.APPTrue) {
+        this.dialogFormRight.rightAPPArr[0].children = this.dialogFormRight.rightAPPArr[0].children.filter(item => item.is_delete === '0')
+        this.dialogFormRight.rightAPPArr[0].children.forEach(item => {
+          item.children = item.children.filter(it => it.is_delete === '0')
+        })
+      }
 
       // 鍒ゆ柇鍝釜鏄珮浜�
       let pcIsSelected1 = false
       let pcIsSelected2 = false
       let appIsSelected1 = false
       let appIsSelected2 = false
-      const rightPCArrFlag = res[0][0].flag
-      const rightAPPArrFlag = res[1][0].flag
+      let rightPCArrFlag
+      let rightAPPArrFlag
+
+      if (this.PCTrue) {
+        rightPCArrFlag = this.dialogFormRight.rightPCArr[0].flag
+      }
+      if (this.APPTrue) {
+        rightAPPArrFlag = this.dialogFormRight.rightAPPArr[0].flag
+      }
 
       let waitFlag = false// 鍥炴樉绛夊緟鏄惁鏀捐
 
-      // 1.绗竴绉嶆儏鍐礟C鍜孉PP閮戒竴娆¢兘娌¢�変腑鏃�    PC鏈�変腑锛孉PP鏈�変腑
-      if (rightPCArrFlag === 'N' && rightAPPArrFlag === 'N') {
-        pcIsSelected1 = true
-        this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
-      }
-
-      // 2.绗簩绉嶆儏鍐礟C宸查�変腑锛孉PP鏈�変腑
-      if (rightPCArrFlag === 'Y' && rightAPPArrFlag === 'N') {
-        pcIsSelected1 = true
-        pcIsSelected2 = true
-
-        const interval = setInterval(() => {
-          if ($("input[name='PC']").length > 0) {
-            waitFlag = true
-          }
-          if (waitFlag) {
-            clearInterval(interval)
-            this.$nextTick(() => {
-              $("input[name='PC']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
-            })
-          }
-        }, 100)
-
-        this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
-      }
-
-      // 3.绗笁绉嶆儏鍐礟C鏈�変腑锛孉PP宸查�変腑
-      if (rightPCArrFlag === 'N' && rightAPPArrFlag === 'Y') {
-        appIsSelected1 = true
-        appIsSelected2 = true
-
-        const interval = setInterval(() => {
-          if ($("input[name='APP']").length > 0) {
-            waitFlag = true
-          }
-          if (waitFlag) {
-            clearInterval(interval)
-            this.$nextTick(() => {
-              $("input[name='APP']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
-            })
-          }
-        }, 100)
-
-        this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightAPPArr[0].code
-      }
-      // 4.绗洓绉嶆儏鍐礟C宸查�変腑锛孉PP宸查�変腑
-      if (rightPCArrFlag === 'Y' && rightAPPArrFlag === 'Y') {
-        pcIsSelected1 = true
-        pcIsSelected2 = true
-        appIsSelected1 = false
-        appIsSelected2 = true
-
-        const interval = setInterval(() => {
-          if ($("input[name='PC']").length > 0) {
-            waitFlag = true
-          }
-          if (waitFlag) {
-            clearInterval(interval)
-            this.$nextTick(() => {
-              $("input[name='PC']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
-              $("input[name='APP']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
-            })
-          }
-        }, 100)
-
-        this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
-      }
-      this.dialogFormRight.rightOperationArr.push({
-        isSelected1: pcIsSelected1,
-        isSelected2: pcIsSelected2,
-        code: this.dialogFormRight.rightPCArr[0].code,
-        flag: rightPCArrFlag,
-        name: this.dialogFormRight.rightPCArr[0].name
-      }, {
-        isSelected1: appIsSelected1,
-        isSelected2: appIsSelected2,
-        code: this.dialogFormRight.rightAPPArr[0].code,
-        flag: rightAPPArrFlag,
-        name: this.dialogFormRight.rightAPPArr[0].name
-      })
-
-      this.dialogFormRight.rightPCArr[0].name = '鍏ㄩ儴'
-      this.dialogFormRight.rightAPPArr[0].name = '鍏ㄩ儴'
-
-      this.dialogFormRight.rightPCArr[0].children.forEach(item => {
-        if (item.children && item.children.length > 0 && item.flag === 'Y') {
-          item.children.forEach(it => {
-            if (it.flag === 'Y') {
-              this.dialogFormRight.rightPCArrSelected.push(it.code)
-            }
-          })
-        } else if (item.children && item.children.length === 0 && item.flag === 'Y') {
-          this.dialogFormRight.rightPCArrSelected.push(item.code)
+      if (this.PCTrue && this.APPTrue) {
+        // 1.绗竴绉嶆儏鍐礟C鍜孉PP閮戒竴娆¢兘娌¢�変腑鏃�    PC鏈�変腑锛孉PP鏈�変腑
+        if (rightPCArrFlag === 'N' && rightAPPArrFlag === 'N') {
+          pcIsSelected1 = true
+          this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
         }
-      })
-      this.dialogFormRight.rightAPPArr[0].children.forEach(item => {
-        if (item.children && item.children.length > 0 && item.flag === 'Y') {
-          item.children.forEach(it => {
-            if (it.flag === 'Y') {
-              this.dialogFormRight.rightAPPArrSelected.push(it.code)
+        // 2.绗簩绉嶆儏鍐礟C宸查�変腑锛孉PP鏈�変腑
+        if (rightPCArrFlag === 'Y' && rightAPPArrFlag === 'N') {
+          pcIsSelected1 = true
+          pcIsSelected2 = true
+
+          const interval = setInterval(() => {
+            if ($("input[name='PC']").length > 0) {
+              waitFlag = true
             }
-          })
-        } else if (item.children && item.children.length === 0 && item.flag === 'Y') {
-          this.dialogFormRight.rightAPPArrSelected.push(item.code)
+            if (waitFlag) {
+              clearInterval(interval)
+              this.$nextTick(() => {
+                $("input[name='PC']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+              })
+            }
+          }, 100)
+
+          this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
         }
-      })
+        // 3.绗笁绉嶆儏鍐礟C鏈�変腑锛孉PP宸查�変腑
+        if (rightPCArrFlag === 'N' && rightAPPArrFlag === 'Y') {
+          appIsSelected1 = true
+          appIsSelected2 = true
+
+          const interval = setInterval(() => {
+            if ($("input[name='APP']").length > 0) {
+              waitFlag = true
+            }
+            if (waitFlag) {
+              clearInterval(interval)
+              this.$nextTick(() => {
+                $("input[name='APP']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+              })
+            }
+          }, 100)
+
+          this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightAPPArr[0].code
+        }
+        // 4.绗洓绉嶆儏鍐礟C宸查�変腑锛孉PP宸查�変腑
+        if (rightPCArrFlag === 'Y' && rightAPPArrFlag === 'Y') {
+          pcIsSelected1 = true
+          pcIsSelected2 = true
+          appIsSelected1 = false
+          appIsSelected2 = true
+
+          const interval = setInterval(() => {
+            if ($("input[name='PC']").length > 0) {
+              waitFlag = true
+            }
+            if (waitFlag) {
+              clearInterval(interval)
+              this.$nextTick(() => {
+                $("input[name='PC']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+                $("input[name='APP']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+              })
+            }
+          }, 100)
+
+          this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
+        }
+      }
+
+      if (this.PCTrue && !this.APPTrue) {
+        if (rightPCArrFlag === 'Y') {
+          pcIsSelected1 = true
+          pcIsSelected2 = true
+
+          const interval = setInterval(() => {
+            if ($("input[name='PC']").length > 0) {
+              waitFlag = true
+            }
+            if (waitFlag) {
+              clearInterval(interval)
+              this.$nextTick(() => {
+                $("input[name='PC']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+              })
+            }
+          }, 100)
+
+          this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
+        }
+      }
+
+      if (!this.PCTrue && this.APPTrue) {
+        if (rightAPPArrFlag === 'Y') {
+          appIsSelected1 = true
+          appIsSelected2 = true
+
+          const interval = setInterval(() => {
+            if ($("input[name='APP']").length > 0) {
+              waitFlag = true
+            }
+            if (waitFlag) {
+              clearInterval(interval)
+              this.$nextTick(() => {
+                $("input[name='APP']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+              })
+            }
+          }, 100)
+
+          this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightAPPArr[0].code
+        }
+      }
+
+      if (this.PCTrue) {
+        this.dialogFormRight.rightOperationArr.push({
+          isSelected1: pcIsSelected1,
+          isSelected2: pcIsSelected2,
+          code: this.dialogFormRight.rightPCArr[0].code,
+          flag: rightPCArrFlag,
+          name: this.dialogFormRight.rightPCArr[0].name
+        })
+      }
+      if (this.APPTrue) {
+        this.dialogFormRight.rightOperationArr.push({
+          isSelected1: appIsSelected1,
+          isSelected2: appIsSelected2,
+          code: this.dialogFormRight.rightAPPArr[0].code,
+          flag: rightAPPArrFlag,
+          name: this.dialogFormRight.rightAPPArr[0].name
+        })
+      }
+      if (this.PCTrue) {
+        this.dialogFormRight.rightPCArr[0].name = '鍏ㄩ儴'
+      }
+      if (this.APPTrue) {
+        this.dialogFormRight.rightAPPArr[0].name = '鍏ㄩ儴'
+      }
+
+      // 鏍戝舰鍥炴樉閮ㄥ垎
+      if (this.PCTrue) {
+        this.dialogFormRight.rightPCArr[0].children.forEach(item => {
+          if (item.children && item.children.length > 0 && item.flag === 'Y') {
+            item.children.forEach(it => {
+              if (it.flag === 'Y') {
+                this.dialogFormRight.rightPCArrSelected.push(it.code)
+              }
+            })
+          } else if (item.children && item.children.length === 0 && item.flag === 'Y') {
+            this.dialogFormRight.rightPCArrSelected.push(item.code)
+          }
+        })
+      }
+      if (this.APPTrue) {
+        this.dialogFormRight.rightAPPArr[0].children.forEach(item => {
+          if (item.children && item.children.length > 0 && item.flag === 'Y') {
+            item.children.forEach(it => {
+              if (it.flag === 'Y') {
+                this.dialogFormRight.rightAPPArrSelected.push(it.code)
+              }
+            })
+          } else if (item.children && item.children.length === 0 && item.flag === 'Y') {
+            this.dialogFormRight.rightAPPArrSelected.push(item.code)
+          }
+        })
+      }
       this.$nextTick(() => {
         if (this.$refs.rightPCRef) {
           this.$refs.rightPCRef.setCheckedKeys(this.dialogFormRight.rightPCArrSelected)
@@ -1114,6 +1225,8 @@
       if (this.$refs.rightAPPRef) {
         this.$refs.rightAPPRef.setCheckedKeys([])
       }
+      this.PCTrue = false
+      this.APPTrue = false
     },
     // 鏉冮檺瀵硅瘽妗嗗彇娑堜簨浠�
     rightDialogVisibleCancel() {
@@ -1123,46 +1236,49 @@
     async rightDialogVisibleConfirm() {
       const rightPCArrSelected = []// 淇濆瓨鎻愪氦鏍戦�変腑 PC
       const rightAPPArrSelected = []// 淇濆瓨鎻愪氦鏍戦�変腑 APP
-
-      this.dialogFormRight.rightPCArr[0].children.forEach(item => {
-        if (item.children && item.children.length > 0) {
-          const children = []
-          let flag = false // 琛ㄧずchildren閲屾湁鍊紁ush杩涘幓浜�
-          item.children.forEach(it => {
-            if (this.dialogFormRight.rightPCArrSelected.includes(it.code) || this.dialogFormRight.rightPCArrSelected.includes('PC')) {
-              flag = true
-              children.push(
-                { code: it.code, name: it.name, flag: 'Y' }
-              )
-            }
-          })
-          if (flag) {
-            rightPCArrSelected.push({
-              code: item.code, name: item.name, flag: 'Y', children: children
+      if (this.PCTrue) {
+        this.dialogFormRight.rightPCArr[0].children.forEach(item => {
+          if (item.children && item.children.length > 0) {
+            const children = []
+            let flag = false // 琛ㄧずchildren閲屾湁鍊紁ush杩涘幓浜�
+            item.children.forEach(it => {
+              if (this.dialogFormRight.rightPCArrSelected.includes(it.code) || this.dialogFormRight.rightPCArrSelected.includes('PC')) {
+                flag = true
+                children.push(
+                  { code: it.code, name: it.name, flag: 'Y' }
+                )
+              }
             })
-          }
-        }
-      })
-      this.dialogFormRight.rightAPPArr[0].children.forEach(item => {
-        if (item.children && item.children.length > 0) {
-          const children = []
-          let flag = false // 琛ㄧずchildren閲屾湁鍊紁ush杩涘幓浜�
-          item.children.forEach(it => {
-            if (this.dialogFormRight.rightAPPArrSelected.includes(it.code) || this.dialogFormRight.rightAPPArrSelected.includes('APP')) {
-              flag = true
-              children.push(
-                { code: it.code, name: it.name, flag: 'Y' }
-              )
+            if (flag) {
+              rightPCArrSelected.push({
+                code: item.code, name: item.name, flag: 'Y', children: children
+              })
             }
-          })
-          if (flag) {
-            rightAPPArrSelected.push({
-              code: item.code, name: item.name, flag: 'Y', children: children
-            })
           }
-        }
-      })
+        })
+      }
 
+      if (this.APPTrue) {
+        this.dialogFormRight.rightAPPArr[0].children.forEach(item => {
+          if (item.children && item.children.length > 0) {
+            const children = []
+            let flag = false // 琛ㄧずchildren閲屾湁鍊紁ush杩涘幓浜�
+            item.children.forEach(it => {
+              if (this.dialogFormRight.rightAPPArrSelected.includes(it.code) || this.dialogFormRight.rightAPPArrSelected.includes('APP')) {
+                flag = true
+                children.push(
+                  { code: it.code, name: it.name, flag: 'Y' }
+                )
+              }
+            })
+            if (flag) {
+              rightAPPArrSelected.push({
+                code: item.code, name: item.name, flag: 'Y', children: children
+              })
+            }
+          }
+        })
+      }
       // 鏈�缁堣鎻愪氦鐨勬暟鎹�
       let rightSubmit = []
 
@@ -1335,6 +1451,14 @@
           this.dialogFormRight.rightAPPArrSelected = ['APP']
         }
       }
+    },
+    // 瀵煎叆鎸夐挳
+    upload() {
+      this.shows = true
+      this.$refs.importPickerFunc.newDataFunc()
+    },
+    colos() {
+      this.shows = false
     }
 
   }

--
Gitblit v1.9.3