From 6858e8eca6407992a53e0256ee14e2267fb7601f Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 30 Nov 2022 14:28:11 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=89=AA=E8=A3=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/pidu/app/AppGoods/components/Add.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/project/pidu/app/AppGoods/components/Add.vue b/project/pidu/app/AppGoods/components/Add.vue
index d3f1184c..4fe9e703 100644
--- a/project/pidu/app/AppGoods/components/Add.vue
+++ b/project/pidu/app/AppGoods/components/Add.vue
@@ -15,6 +15,7 @@
               <ai-uploader
                 :instance="instance"
                 isShowTip
+                isCrop
                 v-model="form.imageUrl"
                 :limit="1">
                 <template slot="tips">

From 1182f5b3afe7c4d519adccdf932a9b543d5206ef Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 30 Nov 2022 14:40:39 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E5=95=86=E5=93=81=E7=AE=A1=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/pidu/app/AppGoods/components/List.vue | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/project/pidu/app/AppGoods/components/List.vue b/project/pidu/app/AppGoods/components/List.vue
index a5af66ed..4a689953 100644
--- a/project/pidu/app/AppGoods/components/List.vue
+++ b/project/pidu/app/AppGoods/components/List.vue
@@ -21,7 +21,7 @@
                 <span style="color: #606266;" v-if="girdList.length">{{ girdList.length ? girdList[0].girdName : '' }}</span>
                 <span v-else>可选范围</span>
                 <i class="el-icon-arrow-up"  v-if="!girdList.length"></i>
-                <i class="el-icon-circle-close" v-if="girdList.length" @click.stop="girdList = [], search.rangeIds = '', search.current = 1, getList()"></i>
+                <i class="el-icon-circle-close" v-if="girdList.length" @click.stop="girdList = [], search.girdId = '', search.current = 1, getList()"></i>
               </div>
             </div>
           </ai-picker>
@@ -86,7 +86,7 @@
           current: 1,
           size: 10,
           name: '',
-          rangeIds: ''
+          girdId: ''
         },
         name: '',
         info: {},
@@ -95,7 +95,7 @@
           { prop: 'merchandiseIntegral', align: 'center', label: '单价', sortable: true },
           { prop: 'merchandiseNumber', align: 'center', label: '数量', sortable: true },
           {
-            prop: 'arriveTime',
+            prop: 'exchangeNumber',
             align: 'center',
             label: '兑换量',
             sortable: true
@@ -107,7 +107,7 @@
             formart: v => v === '0' ? '不限' : '指定网格'
           },
           {
-            prop: 'arriveTime',
+            prop: 'launchTime',
             align: 'center',
             label: '上架时间'
           },
@@ -135,9 +135,11 @@
         this.girdList = e
 
         if (e.length) {
-          this.search.rangeIds = e[0].id
+          this.search.girdId = e[0].id
         } else {
-          this.search.rangeIds = ''
+          this.search.girdId = ''
+
+          this.getList()
         }
       },
       getList () {

From 6b55a574d80303440ab14340ec26072e3044bf73 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 30 Nov 2022 15:18:43 +0800
Subject: [PATCH 03/11] bug

---
 project/pidu/app/AppGoods/components/Add.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/project/pidu/app/AppGoods/components/Add.vue b/project/pidu/app/AppGoods/components/Add.vue
index 4fe9e703..37d71afe 100644
--- a/project/pidu/app/AppGoods/components/Add.vue
+++ b/project/pidu/app/AppGoods/components/Add.vue
@@ -16,6 +16,9 @@
                 :instance="instance"
                 isShowTip
                 isCrop
+                :cropOps="{
+                  fixedNumber: [1, 1]
+                }"
                 v-model="form.imageUrl"
                 :limit="1">
                 <template slot="tips">

From 7a936f8a9feb3ca015058d1864f1cd60fa2b607f Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 30 Nov 2022 15:20:52 +0800
Subject: [PATCH 04/11] bug

---
 project/pidu/app/AppOrder/components/Detail.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/project/pidu/app/AppOrder/components/Detail.vue b/project/pidu/app/AppOrder/components/Detail.vue
index 4e62fd95..f7daf444 100644
--- a/project/pidu/app/AppOrder/components/Detail.vue
+++ b/project/pidu/app/AppOrder/components/Detail.vue
@@ -20,7 +20,7 @@
           </ai-wrapper>
         </template>
       </ai-card>
-      <ai-card title="操作信息">
+      <ai-card title="操作信息" v-if="info.orderStatus === '1'">
         <template #content>
           <ai-wrapper
             label-width="120px">
@@ -155,6 +155,14 @@
       height: 80px;
       margin-right: 20px;
     }
+
+    span {
+      flex: 1;
+      display: -webkit-box;
+      overflow: hidden;
+      -webkit-line-clamp: 2;
+      -webkit-box-orient: vertical;
+    }
   }
 
 </style>

From 28f52973f37277db3a545db41bf08249465b2429 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 30 Nov 2022 16:17:55 +0800
Subject: [PATCH 05/11] bug

---
 project/pidu/app/AppGoods/components/List.vue |  6 ++--
 project/pidu/app/AppOrder/components/List.vue | 31 ++++++++++++-------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/project/pidu/app/AppGoods/components/List.vue b/project/pidu/app/AppGoods/components/List.vue
index 4a689953..11b066c5 100644
--- a/project/pidu/app/AppGoods/components/List.vue
+++ b/project/pidu/app/AppGoods/components/List.vue
@@ -29,12 +29,12 @@
         </template>
         <template #right>
           <el-input
-            v-model="search.name"
+            v-model="search.merchandiseName"
             size="small"
             placeholder="请输入商品名称"
             clearable
             v-throttle="() => {search.current = 1, getList()}"
-            @clear="search.current = 1, search.name = '', getList()"
+            @clear="search.current = 1, search.merchandiseName = '', getList()"
             suffix-icon="iconfont iconSearch">
           </el-input>
         </template>
@@ -85,7 +85,7 @@
         search: {
           current: 1,
           size: 10,
-          name: '',
+          merchandiseName: '',
           girdId: ''
         },
         name: '',
diff --git a/project/pidu/app/AppOrder/components/List.vue b/project/pidu/app/AppOrder/components/List.vue
index bbf49eb1..63bdc768 100644
--- a/project/pidu/app/AppOrder/components/List.vue
+++ b/project/pidu/app/AppOrder/components/List.vue
@@ -8,7 +8,7 @@
     <template slot="content">
       <ai-search-bar bottomBorder>
         <template #left>
-          <ai-user-selecter :instance="instance" @change="onUserChange" :isMultiple="false">
+          <ai-user-selecter v-model="user" :instance="instance" @change="onUserChange" :isMultiple="false">
             <div class="userSelcet">
               <span style="color: #606266;" v-if="search.consumerId">{{ name }}</span>
               <span v-else>兑换人</span>
@@ -24,7 +24,7 @@
             @change="search.current = 1, getList()">
           </ai-select>
           <el-date-picker
-            v-model="search.queryBeginTime"
+            v-model="search.createTimeStart"
             type="date"
             size="small"
             value-format="yyyy-MM-dd"
@@ -32,7 +32,7 @@
             @change="search.current = 1, getList()">
           </el-date-picker>
           <el-date-picker
-            v-model="search.queryEndTime"
+            v-model="search.createTimeEnd"
             type="date"
             size="small"
             value-format="yyyy-MM-dd"
@@ -120,7 +120,9 @@
           size: 10,
           merchandiseName: '',
           orderStatus: '',
-          consumerId: ''
+          consumerId: '',
+          createTimeStart: '',
+          createTimeEnd: ''
         },
         id: '',
         form: {
@@ -134,8 +136,8 @@
           { slot: 'goods', label: '商品' },
           { prop: 'merchandiseIntegral', align: 'center', label: '单价' },
           { prop: 'merchandiseNumber', align: 'center', label: '数量' },
-          // { 
-          //   prop: 'areaName', label: '活动地区', align: 'center' , 
+          // {
+          //   prop: 'areaName', label: '活动地区', align: 'center' ,
           //   render: (h, params) => {
           //     return h('span', {
           //     }, params.row.areaName)
@@ -170,8 +172,16 @@
     },
 
     methods: {
-      onUserChange () {
-        
+      onUserChange (e) {
+        if (e.length) {
+          this.name = e[0].name
+          this.search.consumerId = e[0].id
+        } else {
+          this.search.consumerId = ''
+        }
+        this.search.current = 1
+
+        this.getList()
       },
 
       onConfirm() {
@@ -196,10 +206,7 @@
       getList () {
         this.instance.post(`/app/appintegralmerchandiseorder/list`, null, {
           params: {
-            ...this.search,
-            arriveAreaId: this.search.arriveAreaId,
-            queryBeginTime: this.search.queryBeginTime ? this.search.queryBeginTime + ' 00:00:00' : '',
-            queryEndTime: this.search.queryEndTime ? this.search.queryEndTime + ' 23:59:59' : ''
+            ...this.search
           }
         }).then(res => {
           if (res.code == 0) {

From 3835a9a470344c0d19e5bf1320ecdeb9a553f32d Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 30 Nov 2022 16:21:27 +0800
Subject: [PATCH 06/11] bug

---
 project/pidu/app/AppGridMemberScore/components/ApplyList.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/project/pidu/app/AppGridMemberScore/components/ApplyList.vue b/project/pidu/app/AppGridMemberScore/components/ApplyList.vue
index 5fecbc1c..f655eb0e 100644
--- a/project/pidu/app/AppGridMemberScore/components/ApplyList.vue
+++ b/project/pidu/app/AppGridMemberScore/components/ApplyList.vue
@@ -96,6 +96,7 @@
         this.$confirm('请根据申请事项和凭证选是否审核通过', {
           confirmButtonText: '审核通过',
           cancelButtonText: '审核拒绝',
+          distinguishCancelAndClose: true
         }).then(() => {
           this.instance.post(`/app/appintegralmemberapply/auditApply?id=${id}&opType=1`).then(res => {
             if (res.code == 0) {

From 127c018d839fed23e818b751908edf259a458677 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 30 Nov 2022 16:46:51 +0800
Subject: [PATCH 07/11] bug

---
 project/pidu/app/AppOrder/components/Detail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/pidu/app/AppOrder/components/Detail.vue b/project/pidu/app/AppOrder/components/Detail.vue
index f7daf444..1b9b0b48 100644
--- a/project/pidu/app/AppOrder/components/Detail.vue
+++ b/project/pidu/app/AppOrder/components/Detail.vue
@@ -127,7 +127,7 @@
             }).then(res => {
               if (res.code == 0) {
                 this.isShow = false
-                this.getList()
+                this.getInfo(this.params.id)
                 this.$message.success('核销成功')
               }
             })

From 4e9be55405264b4bc771d5213e8ada4c545d4ce8 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 30 Nov 2022 17:00:44 +0800
Subject: [PATCH 08/11] bug

---
 project/pidu/app/AppGoods/components/List.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/pidu/app/AppGoods/components/List.vue b/project/pidu/app/AppGoods/components/List.vue
index 11b066c5..c40281bf 100644
--- a/project/pidu/app/AppGoods/components/List.vue
+++ b/project/pidu/app/AppGoods/components/List.vue
@@ -93,7 +93,7 @@
         colConfigs: [
           { slot: 'goods', label: '商品' },
           { prop: 'merchandiseIntegral', align: 'center', label: '单价', sortable: true },
-          { prop: 'merchandiseNumber', align: 'center', label: '数量', sortable: true },
+          { prop: 'merchandiseNumber', align: 'center', label: '库存', sortable: true },
           {
             prop: 'exchangeNumber',
             align: 'center',

From dc13def1871289f40eb678328bb7091b461c2b52 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 30 Nov 2022 17:14:02 +0800
Subject: [PATCH 09/11] bug

---
 .../components/ApplyList.vue                  | 25 ++++++++++++++++++-
 project/pidu/app/AppOrder/components/List.vue |  8 ++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/project/pidu/app/AppGridMemberScore/components/ApplyList.vue b/project/pidu/app/AppGridMemberScore/components/ApplyList.vue
index f655eb0e..64255ac1 100644
--- a/project/pidu/app/AppGridMemberScore/components/ApplyList.vue
+++ b/project/pidu/app/AppGridMemberScore/components/ApplyList.vue
@@ -1,6 +1,28 @@
 <template>
   <ai-list class="list" isTabs>
     <template slot="content">
+      <ai-search-bar bottomBorder>
+        <template #left>
+          <ai-select
+            v-model="search.status"
+            clearable
+            placeholder="请选择审核状态"
+            :selectList="dict.getDict('integralApplyStatus')"
+            @change="search.current = 1, getList()">
+          </ai-select>
+        </template>
+        <template #right>
+          <el-input
+            v-model="search.createUserName"
+            size="small"
+            placeholder="请输入申请人名称"
+            clearable
+            v-throttle="() => {search.current = 1, getList()}"
+            @clear="search.current = 1, search.createUserName = '', getList()"
+            suffix-icon="iconfont iconSearch">
+          </el-input>
+        </template>
+      </ai-search-bar>
       <ai-table
         :tableData="tableData"
         :col-configs="colConfigs"
@@ -47,7 +69,8 @@
         search: {
           current: 1,
           size: 10,
-          name: ''
+          createUserName: '',
+          status: ''
         },
         name: '',
         info: {},
diff --git a/project/pidu/app/AppOrder/components/List.vue b/project/pidu/app/AppOrder/components/List.vue
index 63bdc768..5d82e196 100644
--- a/project/pidu/app/AppOrder/components/List.vue
+++ b/project/pidu/app/AppOrder/components/List.vue
@@ -239,6 +239,14 @@
         height: 80px;
         margin-right: 20px;
       }
+
+      span {
+        flex: 1;
+        display: -webkit-box;
+        overflow: hidden;
+        -webkit-line-clamp: 2;
+        -webkit-box-orient: vertical;
+      }
     }
 
     .userSelcet {

From 5e27020f777e26d8948cc5ca877a3fb6ef63a4e7 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 1 Dec 2022 08:38:14 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/pidu/app/AppOrder/components/List.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/pidu/app/AppOrder/components/List.vue b/project/pidu/app/AppOrder/components/List.vue
index 5d82e196..69372ac8 100644
--- a/project/pidu/app/AppOrder/components/List.vue
+++ b/project/pidu/app/AppOrder/components/List.vue
@@ -55,7 +55,7 @@
       <ai-search-bar style="margin-top: 12px" bottomBorder>
         <template #left>
           <!-- <el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd('')">订单核销</el-button> -->
-          <ai-download :instance="instance" url="/app/appepidemicpreventionregisterinfo/export" :params="search" fileName="订单" :disabled="tableData.length == 0">
+          <ai-download :instance="instance" url="/app/appintegralmerchandiseorder/export" :params="search" fileName="订单" :disabled="tableData.length == 0">
             <el-button icon="iconfont iconExported" :disabled="tableData.length == 0">导出订单</el-button>
           </ai-download>
         </template>

From 5030e55f84b7c8c2652aa6cfdb4543b36ea2fa95 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 1 Dec 2022 09:13:36 +0800
Subject: [PATCH 11/11] bug

---
 .../apps/AppHomeReport/components/Detail.vue  | 36 +++++++++++++++++++
 .../AppVillageAuxiliarPolice.vue              |  0
 .../components/Add.vue                        |  0
 .../components/List.vue                       |  0
 4 files changed, 36 insertions(+)
 rename project/pingchang/{ => apps}/AppVillageAuxiliarPolice/AppVillageAuxiliarPolice.vue (100%)
 rename project/pingchang/{ => apps}/AppVillageAuxiliarPolice/components/Add.vue (100%)
 rename project/pingchang/{ => apps}/AppVillageAuxiliarPolice/components/List.vue (100%)

diff --git a/project/pingchang/apps/AppHomeReport/components/Detail.vue b/project/pingchang/apps/AppHomeReport/components/Detail.vue
index ba60b08e..dcadf20c 100644
--- a/project/pingchang/apps/AppHomeReport/components/Detail.vue
+++ b/project/pingchang/apps/AppHomeReport/components/Detail.vue
@@ -8,6 +8,9 @@
       <AiSidebar :tabTitle="tabList" v-model="currIndex"></AiSidebar>
       <div v-show="currIndex === 0">
         <ai-card title="基本信息" v-show="currIndex === 0">
+          <template #right>
+            <el-button type="primary" @click="(form.idNumber = info.idNumber, isShow = true)">编辑</el-button>
+          </template>
           <template #content>
             <ai-wrapper
               label-width="120px">
@@ -118,6 +121,18 @@
           </template>
         </ai-card>
       </div>
+      <ai-dialog
+        :visible.sync="isShow"
+        width="590px"
+        title="编辑"
+        @close="form.idNumber = ''"
+        @onConfirm="onConfirm">
+        <el-form ref="form" :model="form" label-width="110px" label-position="right">
+          <el-form-item label="身份证" prop="idNumber" :rules="[{required: true, message: '请输入身份证', trigger: 'blur'}]">
+            <el-input size="small" placeholder="请输入身份证" v-model="form.idNumber"></el-input>
+          </el-form-item>
+        </el-form>
+      </ai-dialog>
     </template>
   </ai-detail>
 </template>
@@ -139,6 +154,9 @@
         currIndex: 0,
         isLoading: false,
         tableData: [],
+        form: {
+          idNumber: ''
+        },
         colConfigs: [
           {prop: 'remarks', label: '异常记录', align: 'center' },
           {prop: 'createTime', label: '创建时间', align: 'center'},
@@ -174,6 +192,24 @@
         })
       },
 
+      onConfirm () {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            this.instance.post(`/app/appepidemicpreventionregisterinfo/updateForAdmin`, {
+              ...this.info,
+              ...this.form,
+              id: this.params.id
+            }).then(res => {
+              if (res.code == 0) {
+                this.isShow = false
+                this.getInfo(this.params.id)
+                this.$message.success('编辑成功')
+              }
+            })
+          }
+        })
+      },
+
       cancel () {
         this.$emit('change', {
           type: 'List',
diff --git a/project/pingchang/AppVillageAuxiliarPolice/AppVillageAuxiliarPolice.vue b/project/pingchang/apps/AppVillageAuxiliarPolice/AppVillageAuxiliarPolice.vue
similarity index 100%
rename from project/pingchang/AppVillageAuxiliarPolice/AppVillageAuxiliarPolice.vue
rename to project/pingchang/apps/AppVillageAuxiliarPolice/AppVillageAuxiliarPolice.vue
diff --git a/project/pingchang/AppVillageAuxiliarPolice/components/Add.vue b/project/pingchang/apps/AppVillageAuxiliarPolice/components/Add.vue
similarity index 100%
rename from project/pingchang/AppVillageAuxiliarPolice/components/Add.vue
rename to project/pingchang/apps/AppVillageAuxiliarPolice/components/Add.vue
diff --git a/project/pingchang/AppVillageAuxiliarPolice/components/List.vue b/project/pingchang/apps/AppVillageAuxiliarPolice/components/List.vue
similarity index 100%
rename from project/pingchang/AppVillageAuxiliarPolice/components/List.vue
rename to project/pingchang/apps/AppVillageAuxiliarPolice/components/List.vue