提交

src/api/activity/activity.js

@@ -30,10 +30,10 @@ export function getZylTicketDetail(params) {
  * @param {*} userId 机构用户ID
  * @returns
  */
-export function postZylUpdateGift(data) {
+export function postZylUpdateGift(params) {
   return request({
     url: '/user/zyl/update/gift',
-    method: 'post',
-    data: data
+    method: 'get',
+    params
   })
 }

src/views/operate/activity/ziyalan-list.vue

@@ -1,16 +1,43 @@
 <template>
   <div class="app-container">
+    <!-- 顶部操作区域 -->
+    <div class="filter-container">
+      <div class="filter-control">
+        <span>手机号:</span>
+        <el-input
+          style="width: 200px"
+          v-model="listQuery.mobile"
+          placeholder="手机号"
+          clearable
+          maxlength="11"
+          @keyup.enter.native="getList"
+          @clear="getList"
+        />
+      </div>
+      <div class="filter-control">
+        <el-button type="primary" @click="getList"> 查询 </el-button>
+      </div>
+    </div>
     <!-- 列表 -->
     <el-table v-loading="isLoading" :data="list" border style="width: 100%" height="660">
-      <el-table-column prop="ticketId" label="票根号" align="center" />
-      <el-table-column prop="name" label="购票人姓名" align="center">
+      <el-table-column prop="ticketId" label="票根号" align="center">
+        <template slot-scope="{ row }">
+          {{ row.ticketId ? row.ticketId : '---' }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="name" label="姓名" align="center">
         <template slot-scope="{ row }">
           {{ row.name ? row.name : '---' }}
         </template>
       </el-table-column>
-      <el-table-column prop="userId" label="采美机构绑定状态" align="center">
+      <el-table-column prop="mobile" label="手机号" align="center">
+        <template slot-scope="{ row }">
+          {{ row.mobile ? row.mobile : '---' }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="userId" label="绑定状态" align="center">
         <template slot-scope="{ row }">
-          <el-tag v-if="row.userId" type="success" size="small">已绑定</el-tag>
+          <el-tag v-if="row.ticketId && row.userId" type="success" size="small">已绑定</el-tag>
           <el-tag v-else type="info" size="small">未绑定</el-tag>
         </template>
       </el-table-column>
@@ -27,7 +54,7 @@
       </el-table-column>
       <el-table-column prop="shopIds" label="打卡进度" align="center">
         <template slot-scope="{ row }">
-          <el-tag v-if="row.shopIds" type="success" size="small">已完成</el-tag>
+          <el-tag v-if="handleShopIds(row.shopIds)" type="success" size="small">已完成</el-tag>
           <el-tag v-else type="info" size="small">未完成</el-tag>
         </template>
       </el-table-column>
@@ -56,9 +83,9 @@
     <zi-dialog v-if="dialogVisible" ref="ziDialog" :user-id="handleUserId" @cancel="handleCancel" />
     <!-- 修改礼品领取状态 -->
     <el-dialog title="修改礼品领取状态" :visible.sync="dialogFormVisible" width="500px">
-      <el-form ref="dataForm" :model="renewCustome" :rules="rules" label-position="right">
+      <el-form ref="dataForm" label-position="right">
         <el-form-item prop="status">
-          <el-radio v-model="renewCustome.status" :label="0">已领取</el-radio>
+          <el-radio v-model="giftFlag" :label="1" border>已领取</el-radio>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -70,7 +97,7 @@
 </template>
 
 <script>
-import { getZylTicketList, postZylUpdateGift } from '@/api/activity/activity'
+import { getZylTicketList, postZylUpdateGift,getZylTicketDetail } from '@/api/activity/activity'
 import ZiDialog from './components/zi-dialog'
 export default {
   name: 'CustomerList',
@@ -81,7 +108,8 @@ export default {
       isLoading: true,
       listQuery: {
         pageNum: 1,
-        pageSize: 20
+        pageSize: 20,
+        mobile:''
       },
       list: [],
       total: 0,
@@ -89,9 +117,9 @@ export default {
       dialogFormVisible: false,
       handleUserId: '',
       renewCustome: {
-        id: '',
-        status: ''
+        userId:0
       },
+      giftFlag:0,
       rules: {
         status: [{ required: true, message: '请设置统计状态', trigger: 'blur' }]
       }
@@ -110,6 +138,21 @@ export default {
       this.listQuery.pageNum = 1
       this.getZylTicketList()
     },
+    // 判断是否全部打卡
+    handleShopIds(shopIds){
+      let flag = false
+      const defaultShop = [2,3,4,5,7,8,9,10]
+      if(shopIds){
+        const shopIdsArr = shopIds.split(',').map(Number)
+        console.log('shopIdsArr',shopIdsArr)
+        if(shopIdsArr.length === defaultShop.length ){
+          flag = true
+        }else{
+          flag = false
+        }
+      }
+      return flag
+    },
     // 获取机构列表
     async getZylTicketList() {
       try {
@@ -128,17 +171,12 @@ export default {
     },
     // 修改礼品领取状态
     handleChangeState(row) {
+      this.renewCustome.userId = row.userId
       this.dialogFormVisible = true
     },
     // 确认修改礼品领取状态
     handleConfirm() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.postZylUpdateGift(this.renewCustome)
-        } else {
-          return false
-        }
-      })
+      this.postZylUpdateGift(this.renewCustome)
     },
     // 统计状态
     async postZylUpdateGift(params) {

src/views/serviceSettlement/list/edit.vue

@@ -19,6 +19,9 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="服务商品牌：" prop="brandName" v-if="formLabelAlign.serviceLevel === 4">
+        <el-input v-model="formLabelAlign.brandName" placeholder="服务商品牌" />
+      </el-form-item>
       <el-form-item label="服务商地区：" prop="address">
         <!--<el-cascader
           ref="cascader"
@@ -148,6 +151,7 @@ export default {
     return {
       formLabelAlign: {
         address: '',
+        brandName: '',
         infoRelateds: [],
         area: [],
         textRelateds: [],
@@ -165,6 +169,7 @@ export default {
           { required: true, message: '请输入服务商名称', trigger: 'blur' },
           { max: 50, message: '长度最多50个汉字', trigger: 'blur' }
         ],
+        brandName: [{ required: true, message: '请输入服务商品牌', trigger: 'blur' }],
         address: [{ required: true, message: '请输入地址', trigger: 'blur' }],
         serviceLevel: [
           { required: true, message: '请选择服务商级别', trigger: 'change' }

src/views/serviceSettlement/list/index.vue

@@ -85,16 +85,11 @@
       />
       <el-table-column prop="name" label="服务商名称" align="center" />
       <el-table-column prop="serviceLevel" label="服务商级别" align="center">
-        <template slot-scope="scope">
-          <div>
-            {{
-              scope.row.serviceLevel == "1"
-                ? "一级"
-                : scope.row.serviceLevel == "2"
-                  ? "二级"
-                  : "三级"
-            }}
-          </div>
+        <template slot-scope="{ row }">
+          <el-tag type="success" effect="dark" size="mini" v-if="row.serviceLevel === 1">一级</el-tag>
+          <el-tag type="success" effect="dark" size="mini" v-if="row.serviceLevel === 2">二级</el-tag>
+          <el-tag type="success" effect="dark" size="mini" v-if="row.serviceLevel === 3">三级</el-tag>
+          <el-tag type="success" effect="dark" size="mini" v-if="row.serviceLevel === 4">品牌特约</el-tag>
         </template>
       </el-table-column>
       <el-table-column prop="serviceCategory" label="服务商类型" align="center">

src/views/serviceSettlement/mixin/index.js

@@ -3,7 +3,7 @@ import { getToken } from '@/utils/auth'
 export default {
   data() {
     return {
-      serviceLevel: [{ id: '', value: '请选择' }, { id: 1, value: '一级' }, { id: 2, value: '二级' }, { id: 3, value: '三级' }],
+      serviceLevel: [{ id: '', value: '请选择' }, { id: 1, value: '一级' }, { id: 2, value: '二级' }, { id: 3, value: '三级' }, { id: 4, value: '品牌特约' }],
       serviceCategoryList: [{ id: '', value: '请选择' }, { id: 1, value: '个人' }, { id: 2, value: '企业' }]
     }
   },