Merge branch 'feature' of http://120.46.222.128:10021/elink-star/epmet-work-pc into feature

src/views/components/checkBox.vue

@@ -45,9 +45,7 @@ export default {
     }
   },
   created() {
-    console.log(this.leftList,"sfsdfd");
     this.boxList = this.list.filter(item => item.itemType != 'inputRange')
-    console.log(this.boxList,"kdsflkljf");
     this.pid = this.list[0].itemGroupId
   },
   methods: {

src/views/modules/base/diyInfo.vue

@@ -303,10 +303,13 @@ export default {
       this.$emit('close')
     },
     handleExportTemplate(id) {
+      console.log(id,"sdl;fkldsf");
+      
       this.exportTemplate(id)
       this.$emit('close')
     },
     async exportTemplate(id) {
+      console.log(id,"dsofspdjf");
       let url = "/actual/base/residentBaseInfo/exportExcelCustom"
       let params = {
         templateId: id || '',

src/views/modules/base/smartExport/exset.vue

@@ -4,7 +4,7 @@
       <h4>智能导出/导出设置</h4>
       <el-form ref="form"  >
         <el-form-item required label="报表名称" autocomplete="off"  >
-          <el-input v-model="form.name" size="mini" style="width: 40%; margin-left: 30px"></el-input>
+          <el-input v-model="search.name" size="mini" style="width: 40%; margin-left: 30px"></el-input>
         </el-form-item>
         <el-form-item label="筛选条件"> 
           <el-form :inline="true" class="header_form_box" :model="form"  size="mini"
@@ -225,6 +225,7 @@ export default {
 
   name: "set",
   data() {
+ 
     let orgOptionProps = {
       multiple: false,
       value: 'agencyId',
@@ -233,6 +234,11 @@ export default {
       checkStrictly: true
     }
     return {
+      search: {
+      isSaveTemp: false,
+        name: '',
+        itemList: []
+    },
       orgOptionProps,
       household: [],
       projectStaffList: [
@@ -784,7 +790,7 @@ specialCategoryList: [
           item.id=item.itemId
         })
 
-        console.log( this.form,"this.form");
+        console.log(this.form,"this.form");
         } else {
             this.$message.error(msg);
         }
@@ -918,16 +924,16 @@ specialCategoryList: [
     },
     //导出数据
     async exportTemplate() {
-      if(!this.form.name){
+      if(!this.search.name){
         return this.$message.error("请输入模板名称")
       }
       let url = "/actual/base/residentBaseInfo/exportExcelCustom"
       let params = {
-        // templateId: this.originId,
+        templateId: "",
         searchForm: {...this.form},
         formCode: 'resident_base_info',
         exportConfig: {
-          ...this.form,
+          ...this.search,
           formCode: 'resident_base_info',
           originId:this.originId,
           itemList: this.rightList.map(item => {

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' }

src/views/modules/volunteer/LifeCircleManagement/index.vue

@@ -4,25 +4,22 @@
       <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-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 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 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 v-model.trim="formData.tags" size="small" class="item_width_1" clearable placeholder="请输入">
             </el-input>
           </el-form-item>
 
@@ -41,57 +38,47 @@
       <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 :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 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">
+        <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 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 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 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 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">
+        <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>
+            <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 @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"
@@ -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)) {

src/views/modules/volunteer/Venuemanagement/add.vue

@@ -523,6 +523,9 @@
                   address: [
                       { required: true, message: '请选择位置', trigger: 'blur' }
                   ],
+                  typeName: [
+                      { required: true, message: '请选择阵地', trigger: 'blur' }
+                  ],
 
               }
           },

src/views/modules/volunteer/Venuemanagement/info.vue

@@ -9,15 +9,9 @@
                                 :disabled="true" class="u-item-width-normal"></el-input>
                         </el-form-item>
                      -->
-                <el-form-item label="挂靠阵地" prop="type" label-width="100px">
-                    <!-- <el-select  :disabled="showdisabled" v-model="formData.type" placeholder="请选择" clearable class="u-item-width-normal">
-                            <el-option  :disabled="showdisabled" class="u-item-width-normal" v-for="item in formData.optionstype" :key="item.value" :label="item.label"
-                                :value="item.value">typeName
-                                   <div>{{ formData.typeName }}</div>
-                            </el-option>
-                        </el-select> -->
+                <!-- <el-form-item label="挂靠阵地" prop="type" label-width="100px">
                     <div>{{ formData.positionName }}</div>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="名称" label-width="100px" prop="name">
                     <!-- <el-input v-model.trim="formData.name" size="small" clearable placeholder="请输入名称"
                                 :disabled="showdisabled" class="u-item-width-normal"></el-input> -->
@@ -87,7 +81,7 @@
    import util from '@js/util.js';
    // import UploadImage from './upload-image.vue'
    import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
-   
+   import dayjs from 'dayjs';
    var map
    var search
    var markers
@@ -185,8 +179,9 @@
                   console.log(res);
                   if (res.code == 0) {
                       this.tableData1 = res.data.list
-                    l
-
+                      this.tableData1.forEach(item => {
+                      item.time = dayjs(item.time).format('YYYY-MM-DD')
+                      })
                   } else {
                       this.$message.error(res.msg)
                   }

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>

src/views/modules/volunteer/pointsRedemption/update.vue

@@ -183,6 +183,7 @@ import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
 
          ],
        formData:{
+         imgAttachments:[],
          Servicelevel:"",
          starLevel:"",
            redeemTimesEveryone:'',
@@ -246,6 +247,27 @@ import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
  
    },
    methods: {
+      onChangeFileList(e) {
+              console.log(e, 'sssssb');
+              this.fileList = e.length > 0 ? e.map(item => ({
+                  fileType: '0',
+                  type:'image',
+                  fileType: '0',
+                  name:item.response.data.fileName,
+                  fileUrl: item.response.data.url,
+                  format: item.response.data.fileName.split('.').pop(),
+                  url: item.response.data.url
+              })) : []; // 当e为空时清空fileList
+              if (e.length > 0) {
+                  console.log(this.fileList,"this.fileList");
+                  this.formData.imgAttachments=this.fileList;
+                 console.log(this.formData.imgAttachments,"this.fileList");
+                
+              } else {
+                  this.formData.coverPic = '';
+              }
+          },
+   
       //获取详情
     getTableData() {
         const url = "/voluntary/pointsAward/admin/detail";