From a79a165d606454d5ac3aaa973f90a098e8ac99cf Mon Sep 17 00:00:00 2001
From: yanran200830 <yanran200830@163.com>
Date: Mon, 28 Nov 2022 14:53:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=96=AB=E6=83=85=E9=98=B2=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/pidu/app/AppGoods/components/Add.vue  |  2 +-
 project/pidu/app/AppGoods/components/List.vue | 17 +++++--
 .../components/List.vue                       | 44 ++++++++++++++++---
 3 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/project/pidu/app/AppGoods/components/Add.vue b/project/pidu/app/AppGoods/components/Add.vue
index b3aa3915..7559fae1 100644
--- a/project/pidu/app/AppGoods/components/Add.vue
+++ b/project/pidu/app/AppGoods/components/Add.vue
@@ -137,7 +137,7 @@
             this.instance.post(`/app/appintegralmerchandise/addOrUpdate`, {
               ...this.form,
               imageUrl: this.form.imageUrl[0].url,
-              rangeList: this.form.girdList.length ? this.form.girdList.map(v => {
+              rangeList: this.girdList.length ? this.girdList.map(v => {
                 return {
                   rangeId: v.id,
                   rangeName: v.girdName
diff --git a/project/pidu/app/AppGoods/components/List.vue b/project/pidu/app/AppGoods/components/List.vue
index 3db2cc59..2a20e3d9 100644
--- a/project/pidu/app/AppGoods/components/List.vue
+++ b/project/pidu/app/AppGoods/components/List.vue
@@ -79,8 +79,8 @@
         <el-table-column slot="options" width="160px" fixed="right" label="操作" align="center">
           <template slot-scope="{ row }">
             <div class="table-options">
-              <el-button type="text" @click="toDetail(row.id)" v-if="row.status === '0' || row.status === '2'">下架</el-button>
-              <el-button type="text" @click="toDetail(row.id)" v-if="row.status === '1'">上架</el-button>
+              <el-button type="text" @click="operation(row.id, row.status)" v-if="row.status === '0' || row.status === '2'">下架</el-button>
+              <el-button type="text" @click="operation(row.id, row.status)" v-if="row.status === '1'">上架</el-button>
               <el-button type="text" @click="toAdd(row.id)">编辑</el-button>
               <el-button type="text" @click="remove(row.id)">删除</el-button>
             </div>
@@ -181,9 +181,20 @@
         })
       },
 
+      operation (id, status) {
+        this.$confirm(status === '1' ? '确定上架该商品？' : '确定下架该商品？').then(() => {
+          this.instance.post(`/app/appintegralmerchandise/takeOnOffById?id=${id}&opType=${status === '0' ? 0 : 1}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success(status === '1' ? '上架成功' : '下架成功')
+              this.getList()
+            }
+          })
+        })
+      },
+
       remove (id) {
         this.$confirm('确定删除该数据？').then(() => {
-          this.instance.post(`/app/appintegralmerchandise/delete?id=${id}`).then(res => {
+          this.instance.post(`/app/appintegralmerchandise/delete?ids=${id}`).then(res => {
             if (res.code == 0) {
               this.$message.success('删除成功！')
               this.getList()
diff --git a/project/pingchang/apps/AppCommunityManagement/components/List.vue b/project/pingchang/apps/AppCommunityManagement/components/List.vue
index bfe9b413..62ad9f93 100644
--- a/project/pingchang/apps/AppCommunityManagement/components/List.vue
+++ b/project/pingchang/apps/AppCommunityManagement/components/List.vue
@@ -3,13 +3,20 @@
     <template slot="content">
       <ai-search-bar class="search-bar">
         <template #left>
-          <!-- <ai-select
-            v-model="search.infoType"
+          <ai-select
+            v-model="search.handleType"
             clearable
-            placeholder="请选择对象类型"
-            :selectList="dict.getDict('EP_registerInfoType')"
+            placeholder="请选择处理意见"
+            :selectList="dict.getDict('EP_handleType2')"
             @change="search.current = 1, getList()">
-          </ai-select> -->
+          </ai-select>
+          <ai-select
+            v-model="search.queryType"
+            clearable
+            placeholder="请选择核酸状态"
+            :selectList="dict.getDict('EP_nucleicAcidStatus')"
+            @change="search.current = 1, getList()">
+          </ai-select>
           <ai-select
             v-model="search.status"
             clearable
@@ -25,6 +32,22 @@
               <i class="el-icon-circle-close" v-if="search.controllerUserId" @click.stop="user = [], search.controllerUserId = '', name = '', search.current = 1, getList()"></i>
             </div>
           </ai-user-selecter>
+          <el-date-picker
+            v-model="search.queryBeginTime"
+            type="date"
+            size="small"
+            value-format="yyyy-MM-dd"
+            placeholder="选择开始日期"
+            @change="search.current = 1, getList()">
+          </el-date-picker>
+          <el-date-picker
+            v-model="search.queryEndTime"
+            type="date"
+            size="small"
+            value-format="yyyy-MM-dd"
+            placeholder="选择结束日期"
+            @change="search.current = 1, getList()">
+          </el-date-picker>
         </template>
         <template #right>
           <ai-download :instance="instance" url="/app/appepidemicpreventioncommunitymanagement/export" :params="search" fileName="社区管理" :disabled="tableData.length == 0">
@@ -78,6 +101,11 @@
           current: 1,
           size: 10,
           name: '',
+          queryBeginTime: '',
+          queryEndTime: '',
+          handleType: '',
+          gatewayId: '',
+          queryType: '',
           infoType: '',
           status: '',
           controllerUserId: ''
@@ -105,7 +133,7 @@
     },
 
     created() {
-      this.$dict.load(['EP_CM_status', 'EP_registerInfoType', 'EP_registerInfoType', 'EP_handleType']).then(() => {
+      this.$dict.load(['EP_CM_status', 'EP_registerInfoType', 'EP_registerInfoType', 'EP_handleType', 'EP_handleType2', 'EP_nucleicAcidStatus']).then(() => {
         this.getList()
       })
     },
@@ -114,7 +142,9 @@
       getList() {
         this.instance.post(`/app/appepidemicpreventioncommunitymanagement/list`, null, {
           params: {
-            ...this.search
+            ...this.search,
+            queryBeginTime: this.search.queryBeginTime ? this.search.queryBeginTime + ' 00:00:00' : '',
+            queryEndTime: this.search.queryEndTime ? this.search.queryEndTime + ' 23:59:59' : ''
           }
         }).then(res => {
           if (res.code == 0) {