From 3880b9f02a2b9fcce3cd8f84a2cb39dbebfa31fc Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 17 Feb 2025 09:07:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/record/components/addRecord.vue | 6 +++---
 src/views/report/filldata.vue             | 4 ++--
 src/views/report/yeardata.vue             | 7 ++++---
 vue.config.js                             | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/views/record/components/addRecord.vue b/src/views/record/components/addRecord.vue
index 0d8bc4c..ad9074d 100644
--- a/src/views/record/components/addRecord.vue
+++ b/src/views/record/components/addRecord.vue
@@ -56,9 +56,9 @@
           </div>
           <div class="xy-table-item-content">
             <div>
-            <el-checkbox :disabled="stateObj.auth_type==1 || is_search" @change="changeAllArea" v-model="allArea">全部区域</el-checkbox>
+            <el-checkbox :disabled="is_search" @change="changeAllArea" v-model="allArea">全部区域</el-checkbox>
             </div>
-            <el-select :disabled="stateObj.auth_type==1 || is_search" style="width:100%" v-model="form.area_ids" multiple
+            <el-select :disabled="is_search" style="width:100%" v-model="form.area_ids" multiple
               placeholder="请选择">
               <el-option v-for="item in areaList" :key="item.id" :label="item.name" :value="item.id">
               </el-option>
@@ -79,7 +79,7 @@
           </div>
         </div>
       </template>
-      <template v-slot:catalog_id>
+      <template v-slot:catalog_id v-if="false">
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold">
             <span style="color: red;font-weight: bold;padding-right: 4px;">*</span>所属目录：
diff --git a/src/views/report/filldata.vue b/src/views/report/filldata.vue
index 9fd73ff..88cddc0 100644
--- a/src/views/report/filldata.vue
+++ b/src/views/report/filldata.vue
@@ -12,7 +12,7 @@
                   </el-option>
                 </el-select>
               </div>
-              <div>
+              <div v-if="stateObj.is_admin">
                 <el-select style="width:100%" clearable v-model="select.area_id" placeholder="请选择区域">
                   <el-option v-for="item in list_area" :key="item.id" :label="item.name" :value="item.id">
                   </el-option>
@@ -272,7 +272,7 @@
           }, {
             "key": "area_id",
             "op": "eq",
-            "value": this.select.area_id ? this.select.area_id : ''
+            "value": this.stateObj.is_admin ? '' : this.stateObj.area_id
           }, {
             "key": "year",
             "op": "eq",
diff --git a/src/views/report/yeardata.vue b/src/views/report/yeardata.vue
index a8fbffa..3759ec1 100644
--- a/src/views/report/yeardata.vue
+++ b/src/views/report/yeardata.vue
@@ -12,7 +12,7 @@
                   </el-option>
                 </el-select>
               </div>
-              <div>
+              <div v-if="stateObj.is_admin">
                 <el-select style="width:100%" clearable v-model="select.area_id" placeholder="请选择区域">
                   <el-option v-for="item in list_area" :key="item.id" :label="item.name" :value="item.id">
                   </el-option>
@@ -215,7 +215,8 @@
         const res = await index({
           page_size: this.select.page_size,
           page: this.select.page,
-          table_name: this.select.table_name,
+          table_name: this.select.table_name,
+          is_auth: this.stateObj.is_admin ? '' : 1,
           json_data_fields: ['area_id', 'business_id'],
           filter: [{
             "key": "business_id",
@@ -224,7 +225,7 @@
           },{
             "key": "area_id",
             "op": "eq",
-            "value": this.select.area_id ? this.select.area_id : ''
+            "value": this.stateObj.is_admin ? '' : this.stateObj.area_id
           }, {
             "key": "year",
             "op": "eq",
diff --git a/vue.config.js b/vue.config.js
index c82404e..5201527 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -25,7 +25,7 @@ module.exports = {
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
   publicPath: process.env.ENV === 'staging' ? '/admin_test' : '/admin',
-  outputDir: '/Users/mac/Documents/朗业/2024/s-四世同堂-档案/sstt_dangan/public/admin_test',
+  outputDir: '/Users/mac/Documents/朗业/2024/s-四世同堂-档案/sstt_dangan/public/admin',
   assetsDir: 'static',
   css: {
     loaderOptions: { // 向 CSS 相关的 loader 传递选项