Merge remote-tracking branch 'origin/build' into union

project/pidu/app/AppGoods/components/Add.vue

@@ -15,6 +15,10 @@
               <ai-uploader
                 :instance="instance"
                 isShowTip
+                isCrop
+                :cropOps="{
+                  fixedNumber: [1, 1]
+                }"
                 v-model="form.imageUrl"
                 :limit="1">
                 <template slot="tips">

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>
@@ -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,17 +85,17 @@
         search: {
           current: 1,
           size: 10,
-          name: '',
+          merchandiseName: '',
-          rangeIds: ''
+          girdId: ''
         },
         name: '',
         info: {},
         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: '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 () {

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: {},
@@ -96,6 +119,7 @@
         this.$confirm('请根据申请事项和凭证选是否审核通过', {
           confirmButtonText: '审核通过',
           cancelButtonText: '审核拒绝',
+          distinguishCancelAndClose: true
         }).then(() => {
           this.instance.post(`/app/appintegralmemberapply/auditApply?id=${id}&opType=1`).then(res => {
             if (res.code == 0) {

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">
@@ -127,7 +127,7 @@
             }).then(res => {
               if (res.code == 0) {
                 this.isShow = false
-                this.getList()
+                this.getInfo(this.params.id)
                 this.$message.success('核销成功')
               }
             })
@@ -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>

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"
@@ -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>
@@ -120,7 +120,9 @@
           size: 10,
           merchandiseName: '',
           orderStatus: '',
-          consumerId: ''
+          consumerId: '',
+          createTimeStart: '',
+          createTimeEnd: ''
         },
         id: '',
         form: {
@@ -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,
+            ...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' : ''
           }
         }).then(res => {
           if (res.code == 0) {
@@ -232,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 {

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