From 75465323898271fdb0b6f478c5e3ca3ada7c8a91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Mon, 14 Oct 2024 10:22:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=B4=BB=E5=9C=88=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=8A=A0*=EF=BC=8C=E6=8A=98=E6=89=A3=E5=88=B8=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../volunteer/LifeCircleManagement/add.vue    |  12 +-
 .../volunteer/LifeCircleManagement/index.vue  | 202 +++++++++---------
 .../volunteer/pointsRedemption/add.vue        |   4 +-
 3 files changed, 105 insertions(+), 113 deletions(-)

diff --git a/src/views/modules/volunteer/LifeCircleManagement/add.vue b/src/views/modules/volunteer/LifeCircleManagement/add.vue
index ee206136d..39db4f339 100644
--- a/src/views/modules/volunteer/LifeCircleManagement/add.vue
+++ b/src/views/modules/volunteer/LifeCircleManagement/add.vue
@@ -592,10 +592,10 @@
 
            
         //  console.log(this.formData.tags.map(item => item.tab).join(', '),"     this.formData");
-          //  if (!this.formData.type) {
-          //     this.$message.error('请选择类型');
-          //     return;
-          //  }
+           if (!this.formData.type) {
+              this.$message.error('请选择类型');
+              return;
+           }
            if (!this.formData.name) {
               this.$message.error('请输入组织介绍');
               return;
@@ -756,8 +756,8 @@
     computed: {
         dataRule() {
             return {
-                typeName: [
-                    { required: true, message: '请选择组织类型', trigger: 'blur' }
+                type: [
+                    { required: true, message: '请选择类型', trigger: 'blur' }
                 ],
                 name: [
                     { required: true, message: '请填写名称', trigger: 'blur' }
diff --git a/src/views/modules/volunteer/LifeCircleManagement/index.vue b/src/views/modules/volunteer/LifeCircleManagement/index.vue
index 90fe3a357..e87402f78 100644
--- a/src/views/modules/volunteer/LifeCircleManagement/index.vue
+++ b/src/views/modules/volunteer/LifeCircleManagement/index.vue
@@ -1,111 +1,98 @@
 <template>
-    <div class="g-main">
-        <div class="m-search">
-            <el-form :inline="true" ref="ref_searchform" :label-width="'100px'">
-                <div>
-                    <el-form-item label="类型">
-                        <el-select v-model="formData.tyep" placeholder="请选择" clearable>
-                            <el-option v-for="item in formData.optionstype" :key="item.value" :label="item.label"
-                                :value="item.value">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="名称">
-                        <el-input v-model.trim="formData.name" size="small" class="item_width_1" clearable
-                            placeholder="请输入">
-                        </el-input>
-                    </el-form-item>
-                    <el-form-item label="位置">
-                        <el-input v-model.trim="formData.address" size="small" class="item_width_1" clearable
-                            placeholder="请输入">
-                        </el-input>
-                    </el-form-item>
-                    <el-form-item label="标签">
-                        <el-input v-model.trim="formData.tags" size="small" class="item_width_1" clearable
-                            placeholder="请输入">
-                        </el-input>
-                    </el-form-item>
-                    
-                </div>
-                <div class="block">
-                    <div style="display: flex; justify-content: flex-end;">
-                        <el-button style="margin-left:10px" class="diy-button--blue" size="small"
-                            @click="handleSearch">查询</el-button>
-                        <el-button style="margin-left:10px" class="diy-button--white" size="small"
-                            @click="resetSearch">重置</el-button>
-                    </div>
-                </div>
-            </el-form>
+  <div class="g-main">
+    <div class="m-search">
+      <el-form :inline="true" ref="ref_searchform" :label-width="'100px'">
+        <div>
+          <el-form-item label="类型">
+            <el-cascader v-model="this.formData.type" @change="handleChangeAgency" :options="options1"
+              :disabled="showdisabled" :props="{
+        emitPath: false,
+        multiple: false,
+      }"></el-cascader>
+          </el-form-item>
+          <el-form-item label="名称">
+            <el-input v-model.trim="formData.name" size="small" class="item_width_1" clearable placeholder="请输入">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="位置">
+            <el-input v-model.trim="formData.address" size="small" class="item_width_1" clearable placeholder="请输入">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="标签">
+            <el-input v-model.trim="formData.tags" size="small" class="item_width_1" clearable placeholder="请输入">
+            </el-input>
+          </el-form-item>
+
+        </div>
+        <div class="block">
+          <div style="display: flex; justify-content: flex-end;">
+            <el-button style="margin-left:10px" class="diy-button--blue" size="small"
+              @click="handleSearch">查询</el-button>
+            <el-button style="margin-left:10px" class="diy-button--white" size="small"
+              @click="resetSearch">重置</el-button>
+          </div>
         </div>
-        <div class="m-table">
-            <el-button style="" class="diy-button--add" size="small" @click="handleAdd">新增</el-button>
-            <el-button style="" class="diy-button--add" size="small" @click="handleExportModule()">下载模板</el-button>
-            <el-button class="diy-button--white" size="small">
-                <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn" action="uploadUlr"
-                    :limit="1" :accept="'.xls,.xlsx'" :with-credentials="true" :show-file-list="false"
-                    :auto-upload="true" :on-progress="handleProgress" :on-success="handleExcelSuccess"
-                    :before-upload="beforeExcelUpload" :http-request="uploadHttpRequest">
-                    导入
-                </el-upload>
-            </el-button>
-            <el-table class="table" :data="tableData" border  style="width: 100%">
-                <el-table-column label="序号" header-align="center" align="center" type="index"
-                    width="80"></el-table-column>
-                <el-table-column prop="agencyName" header-align="center" align="center" label="所属组织"
-                    :show-overflow-tooltip="true">
-                </el-table-column>
-                <el-table-column prop="typeName" header-align="center" align="center" label="类型"
-                    :show-overflow-tooltip="true">
-                    <!-- <template slot-scope="scope">
+      </el-form>
+    </div>
+    <div class="m-table">
+      <el-button style="" class="diy-button--add" size="small" @click="handleAdd">新增</el-button>
+      <el-button style="" class="diy-button--add" size="small" @click="handleExportModule()">下载模板</el-button>
+      <el-button class="diy-button--white" size="small">
+        <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn" action="uploadUlr" :limit="1"
+          :accept="'.xls,.xlsx'" :with-credentials="true" :show-file-list="false" :auto-upload="true"
+          :on-progress="handleProgress" :on-success="handleExcelSuccess" :before-upload="beforeExcelUpload"
+          :http-request="uploadHttpRequest">
+          导入
+        </el-upload>
+      </el-button>
+      <el-table class="table" :data="tableData" border style="width: 100%">
+        <el-table-column label="序号" header-align="center" align="center" type="index" width="80"></el-table-column>
+        <el-table-column prop="agencyName" header-align="center" align="center" label="所属组织"
+          :show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column prop="typeName" header-align="center" align="center" label="类型" :show-overflow-tooltip="true">
+          <!-- <template slot-scope="scope">
         <span>{{ scope.row.enabled === 1 ? '关闭' : '显示' }}</span>
       </template> -->
-                </el-table-column>
-                <el-table-column prop="name" header-align="center" align="center" label="名称"
-                    :show-overflow-tooltip="true">
-                </el-table-column>
-                <el-table-column prop="address" header-align="center" align="center" label="位置"
-                    :show-overflow-tooltip="true">
-                </el-table-column>
-                <el-table-column prop="linkman" header-align="center" align="center" label="联系人"
-                    :show-overflow-tooltip="true">
-                </el-table-column>
-                <el-table-column prop="linkPhone" header-align="center" align="center" label="联系电话"
-                    :show-overflow-tooltip="true">
-                </el-table-column>
-                 <el-table-column prop="tags" header-align="center" align="center" label="标签" :show-overflow-tooltip="true">
-          </el-table-column>
-          <el-table-column prop="remark" header-align="center" align="center" label="备注":show-overflow-tooltip="true">
-          </el-table-column>
-                <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center"
-                    class="operate">
-                    <template slot-scope="scope">
-                        <el-button type="text" style="color:#1C6AFD;" size="small"
-                            @click="handleDetail(scope.row)">查看</el-button>
-                        <el-button type="text" style="color:#1C6AFD;" size="small"
-                            @click="handleEdit(scope.row)">修改</el-button>
-                        <el-button type="text" style="color:#1C6AFD;" size="small"
-                            @click="handleDel(scope.row)">删除</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <div>
-                <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                    :current-page.sync="pageNo" :page-sizes="[10, 20, 50]" :page-size="pageSize"
-                    layout="sizes, prev, pager, next, total" :total="total">
-                </el-pagination>
-            </div>
-            <el-dialog :visible.sync="showAdd" :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle"
-                width="850px" top="10vh" class="dialog-h" @closed="showAddClose">
-                <add   ref="ref_form" v-if="showAdd" @showAddClose="showAddClose" />
-            </el-dialog>
-              <el-dialog :visible.sync="showInfo" :close-on-click-modal="false" :close-on-press-escape="false" title="查看"
-                  width="850px" top="10vh" class="dialog-h" @closed="showInfoClose">
-                  <info ref="ref_form" v-if="showInfo" :VolunteerList="fmData" @showInfoClose="showInfoClose" />
-              </el-dialog>
+        </el-table-column>
+        <el-table-column prop="name" header-align="center" align="center" label="名称" :show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column prop="address" header-align="center" align="center" label="位置" :show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column prop="linkman" header-align="center" align="center" label="联系人" :show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column prop="linkPhone" header-align="center" align="center" label="联系电话"
+          :show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column prop="tags" header-align="center" align="center" label="标签" :show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column prop="remark" header-align="center" align="center" label="备注" :show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate">
+          <template slot-scope="scope">
+            <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleDetail(scope.row)">查看</el-button>
+            <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleEdit(scope.row)">修改</el-button>
+            <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleDel(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div>
+        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNo"
+          :page-sizes="[10, 20, 50]" :page-size="pageSize" layout="sizes, prev, pager, next, total" :total="total">
+        </el-pagination>
+      </div>
+      <el-dialog :visible.sync="showAdd" :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle"
+        width="850px" top="10vh" class="dialog-h" @closed="showAddClose">
+        <add ref="ref_form" v-if="showAdd" @showAddClose="showAddClose" />
+      </el-dialog>
+      <el-dialog :visible.sync="showInfo" :close-on-click-modal="false" :close-on-press-escape="false" title="查看"
+        width="850px" top="10vh" class="dialog-h" @closed="showInfoClose">
+        <info ref="ref_form" v-if="showInfo" :VolunteerList="fmData" @showInfoClose="showInfoClose" />
+      </el-dialog>
+
 
-     
-        </div>
     </div>
+  </div>
 </template>
 
 <script>
@@ -127,7 +114,7 @@ export default {
 
     data() {
         return {
-          options:[
+          options1:[
         {
 
             "children": [
@@ -306,7 +293,7 @@ export default {
             formTitle:"",
             formData: {
                 name:"",
-                tyep:"",
+                type:"",
                 tags:"",
                 address:"",
    
@@ -350,6 +337,11 @@ export default {
         this.getTableData();
       },
       methods: {
+            //获取类型
+    handleChangeAgency(val) {
+            console.log(val);
+            this.formData.type = val;
+       },
            // 获取生活圈类型
    async getLifeType () {
        const url = "/sys/dict/data/dictlist"
@@ -450,7 +442,7 @@ if (code === 0) {
   this.tableData = data.list;
   
   this.tableData.forEach(item => {
-    this.options.forEach(item1 => {
+    this.options1.forEach(item1 => {
 
 
       if (Array.isArray(item1.children)) {
diff --git a/src/views/modules/volunteer/pointsRedemption/add.vue b/src/views/modules/volunteer/pointsRedemption/add.vue
index 078993695..b2e1f38d7 100644
--- a/src/views/modules/volunteer/pointsRedemption/add.vue
+++ b/src/views/modules/volunteer/pointsRedemption/add.vue
@@ -87,13 +87,13 @@
             </el-col>
          
 
-            <el-form-item :inline="true" required v-if="formData.classKey == 'zkq'" label="折扣" label-width="150px">
+            <!-- <el-form-item :inline="true" required v-if="formData.classKey == 'zkq'" label="折扣" label-width="150px">
                <div class="item_width_2" style="display: flex;">
              
                   <el-input v-model="formData.worthAmount" placeholder="请输入折扣"></el-input>
                   <div>折</div>
                </div>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item :inline="true" required v-if="formData.classKey == 'mjq'|| formData.classKey == 'cxdjq'" label="金额" label-width="150px">
                <div class="item_width_2" style="display: flex;">
                   <div>￥</div>