积分
This commit is contained in:
		| @@ -8,37 +8,23 @@ | ||||
|     <template slot="content"> | ||||
|       <ai-search-bar bottomBorder> | ||||
|         <template #left> | ||||
|           <ai-user-selecter :instance="instance" @change="onUserChange" :isMultiple="false" v-model="user"> | ||||
|             <div class="userSelcet"> | ||||
|               <span style="color: #606266;" v-if="search.createUserId">{{ name }}</span> | ||||
|               <span v-else>兑换人</span> | ||||
|               <i class="el-icon-arrow-up"  v-if="!search.createUserId"></i> | ||||
|               <i class="el-icon-circle-close" v-if="search.createUserId" @click.stop="user = [], search.createUserId = '', name = '', search.current = 1, getList()"></i> | ||||
|           <ai-picker | ||||
|             :instance="instance" | ||||
|             dialogTitle="选择网格" | ||||
|             :ops="{label: 'girdName'}" | ||||
|             pageTitle="网格" | ||||
|             action="/app/appgirdinfo/girdList" | ||||
|             @pick="onPick" | ||||
|             @change="search.current = 1, getList()"> | ||||
|             <div class="AppAnnounceDetail-select"> | ||||
|               <div class="userSelcet"> | ||||
|                 <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> | ||||
|               </div> | ||||
|             </div> | ||||
|           </ai-user-selecter> | ||||
|           <ai-select | ||||
|             v-model="search.source" | ||||
|             clearable | ||||
|             placeholder="请选择订单状态" | ||||
|             :selectList="dict.getDict('EP_source')" | ||||
|             @change="search.current = 1, getList()"> | ||||
|           </ai-select> | ||||
|           <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> | ||||
|           </ai-picker> | ||||
|         </template> | ||||
|         <template #right> | ||||
|           <el-input | ||||
| @@ -106,7 +92,7 @@ | ||||
|           current: 1, | ||||
|           size: 10, | ||||
|           name: '', | ||||
|           createUserId: '' | ||||
|           rangeIds: '' | ||||
|         }, | ||||
|         name: '', | ||||
|         info: {}, | ||||
| @@ -136,24 +122,28 @@ | ||||
|         tableData: [], | ||||
|         total: 0, | ||||
|         loading: false, | ||||
|         disabledLevel: 0 | ||||
|         girdList: [] | ||||
|       } | ||||
|     }, | ||||
|  | ||||
|     created () { | ||||
|       this.dict.load(['EP_riskLevel']).then(() => { | ||||
|         this.getList() | ||||
|       }) | ||||
|       this.getList() | ||||
|     }, | ||||
|  | ||||
|     methods: { | ||||
|       onPick (e) { | ||||
|         this.girdList = e | ||||
|  | ||||
|         if (e.length) { | ||||
|           this.search.rangeIds = e[0].id | ||||
|         } else { | ||||
|           this.search.rangeIds = '' | ||||
|         } | ||||
|       }, | ||||
|       getList () { | ||||
|         this.instance.post(`/app/appintegralmerchandise/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) { | ||||
| @@ -163,10 +153,6 @@ | ||||
|         }) | ||||
|       }, | ||||
|  | ||||
|       onUserChange () { | ||||
|          | ||||
|       }, | ||||
|  | ||||
|       mapStatus (status) { | ||||
|         return { | ||||
|           '0': '可兑换', | ||||
|   | ||||
| @@ -1,123 +1,73 @@ | ||||
|  <template> | ||||
|   <ai-detail isHasSidebar v-loading="isLoading"> | ||||
|   <ai-detail v-loading="isLoading" class="detail"> | ||||
|     <template slot="title"> | ||||
|       <ai-title title="返乡报备详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)"> | ||||
|       <ai-title title="订单详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)"> | ||||
|       </ai-title> | ||||
|     </template> | ||||
|     <template slot="content"> | ||||
|       <AiSidebar :tabTitle="tabList" v-model="currIndex"></AiSidebar> | ||||
|       <div v-show="currIndex === 0"> | ||||
|         <ai-card title="基本信息" v-show="currIndex === 0"> | ||||
|           <template #content> | ||||
|             <ai-wrapper | ||||
|               label-width="120px"> | ||||
|               <ai-info-item label="姓名" :value="info.name"></ai-info-item> | ||||
|               <ai-info-item label="填报时间" :value="info.createTime"></ai-info-item> | ||||
|               <ai-info-item label="身份证号" :value="info.idNumber"></ai-info-item> | ||||
|               <ai-info-item label="手机号码" :value="info.phone"></ai-info-item> | ||||
|               <ai-info-item label="人员类别" :value="dict.getLabel('EP_registerPersonType', info.type)"></ai-info-item> | ||||
|               <ai-info-item label="是否从事高危行业" :value="dict.getLabel('EP_highRiskIndustries', info.highRiskIndustries)"></ai-info-item> | ||||
|             </ai-wrapper> | ||||
|           </template> | ||||
|         </ai-card> | ||||
|         <ai-card title="行程信息"> | ||||
|           <template #content> | ||||
|             <ai-wrapper | ||||
|               label-width="120px"> | ||||
|               <ai-info-item label="出发时间" :value="info.startTime"></ai-info-item> | ||||
|               <ai-info-item label="出发地" > | ||||
|                 <span  :style="{color: info.denger == 1 ? '#FF4466' : '#333'}">{{info.startAreaName}} </span> | ||||
|               </ai-info-item> | ||||
|               <ai-info-item label="出发地详址" isLine :value="info.startAddress"></ai-info-item> | ||||
|               <ai-info-item label="出行方式" :value="info.travelTypeNames"></ai-info-item> | ||||
|               <ai-info-item label="车次/航班" isLine :value="info.trainNo"></ai-info-item> | ||||
|               <ai-info-item label="行程描述" :value="info.description"></ai-info-item> | ||||
|               <ai-info-item label="抵平卡口" :value="info.gatewayName"></ai-info-item> | ||||
|               <ai-info-item label="抵平时间" :value="info.arriveTime"></ai-info-item> | ||||
|               <ai-info-item label="目的地" :value="info.arriveAreaName"></ai-info-item> | ||||
|               <ai-info-item label="目的地详址" isLine :value="info.arriveAddress"></ai-info-item> | ||||
|             </ai-wrapper> | ||||
|           </template> | ||||
|         </ai-card> | ||||
|         <ai-card title="健康状况"> | ||||
|           <template #content> | ||||
|             <ai-wrapper | ||||
|               label-width="120px"> | ||||
|               <ai-info-item label="是否有风险旅居史" v-if="info.fromHighRiskArea === '1'"> | ||||
|                 <span style="color: red">{{ info.highRiskAreaName }}</span> | ||||
|               </ai-info-item> | ||||
|               <ai-info-item label="是否有风险旅居史" v-else value="否"></ai-info-item> | ||||
|               <ai-info-item label="7天内是否接触新冠确诊或疑似患者"> | ||||
|                 <span :style="{color: info.contactPatients === '1' ? 'red' : ''}">{{ dict.getLabel('yesOrNo', info.contactPatients) }}</span> | ||||
|               </ai-info-item> | ||||
|               <ai-info-item label="当前健康状况" v-if="info.abnormalHealth === '1'"> | ||||
|                 <span style="color: red">{{ dict.getLabel('EP_abnormalType', info.abnormalType) }}</span> | ||||
|               </ai-info-item> | ||||
|               <ai-info-item label="当前健康状况" v-else value="否"></ai-info-item> | ||||
|             </ai-wrapper> | ||||
|           </template> | ||||
|         </ai-card> | ||||
|       </div> | ||||
|       <div v-show="currIndex === 1"> | ||||
|         <ai-card title="风险处置"> | ||||
|           <template #right> | ||||
|             <el-button type="primary" v-if="info.status === '0'" @click="release">解除异常</el-button> | ||||
|           </template> | ||||
|           <template #content> | ||||
|             <ai-wrapper | ||||
|               label-width="120px"> | ||||
|               <ai-info-item label="姓名" :value="info.name"></ai-info-item> | ||||
|               <ai-info-item label="填报时间" :value="info.createTime"></ai-info-item> | ||||
|               <ai-info-item label="身份证号" :value="info.idNumber"></ai-info-item> | ||||
|               <ai-info-item label="手机号码" :value="info.phone"></ai-info-item> | ||||
|               <ai-info-item label="人员类别" :value="dict.getLabel('EP_registerPersonType', info.type)"></ai-info-item> | ||||
|               <ai-info-item label="是否从事高危行业" :value="dict.getLabel('EP_highRiskIndustries', info.highRiskIndustries)"></ai-info-item> | ||||
|             </ai-wrapper> | ||||
|           </template> | ||||
|         </ai-card> | ||||
|         <ai-card title="风险处理意见"> | ||||
|           <template #content> | ||||
|             <ai-table | ||||
|               :isShowPagination="false" | ||||
|               tableSize="small" | ||||
|               border | ||||
|               :tableData="info.riskDisposalList" | ||||
|               :col-configs="colConfigs" | ||||
|               @getList="() => {}"> | ||||
|             </ai-table> | ||||
|           </template> | ||||
|         </ai-card> | ||||
|         <ai-card title="社区初排" v-if="info.cmAdvanceDisposal"> | ||||
|           <template #content> | ||||
|             <ai-wrapper | ||||
|               style="margin-bottom: 20px;" | ||||
|               label-width="120px"> | ||||
|               <ai-info-item label="处置意见" :value="dict.getLabel('EP_communityHandleType', info.cmAdvanceDisposal.communityHandleType)"></ai-info-item> | ||||
|               <ai-info-item v-if="info.cmAdvanceDisposal.communityHandleType === '1'" label="居家状态" :value="dict.getLabel('EP_homeStatus2', info.cmAdvanceDisposal.homeStatus)"></ai-info-item> | ||||
|               <ai-info-item v-if="info.cmAdvanceDisposal.communityHandleType === '1'" label="隔离时间" :value="info.cmAdvanceDisposal.quarantineBeginTime + ' - ' + info.cmAdvanceDisposal.quarantineEndTime"></ai-info-item> | ||||
|               <ai-info-item v-if="info.cmAdvanceDisposal.communityHandleType === '1'" label="隔离策略" :value="dict.getLabel('EP_quarantineStrategy', info.cmAdvanceDisposal.quarantineStrategy)"></ai-info-item> | ||||
|               <ai-info-item v-if="info.cmAdvanceDisposal.communityHandleType === '1'" label="管控方式" :value="dict.getLabel('EP_controlMethod', info.cmAdvanceDisposal.controlMethod)"></ai-info-item> | ||||
|               <ai-info-item v-if="info.cmAdvanceDisposal.communityHandleType === '1'" label="图片" isLine> | ||||
|                 <ai-uploader | ||||
|                   :instance="instance" | ||||
|                   :value="info.cmAdvanceDisposal.fileList" | ||||
|                   disabled | ||||
|                   :limit="9"> | ||||
|                 </ai-uploader> | ||||
|               </ai-info-item> | ||||
|               <ai-info-item v-if="info.cmAdvanceDisposal.communityHandleType === '2'" label="风险解除证明文件" isLine> | ||||
|                 <ai-uploader | ||||
|                   :instance="instance" | ||||
|                   :value="info.cmAdvanceDisposal.proveFileList" | ||||
|                   disabled | ||||
|                   :limit="9"> | ||||
|                 </ai-uploader> | ||||
|               </ai-info-item> | ||||
|             </ai-wrapper> | ||||
|             <ai-empty style="margin-bottom: 60px;" v-if="!info.cmAdvanceDisposal"></ai-empty> | ||||
|           </template> | ||||
|         </ai-card> | ||||
|       </div> | ||||
|       <ai-card title="基本信息"> | ||||
|         <template #right> | ||||
|           <el-button type="primary" v-if="info.orderStatus === '0'" @click="isShow = true">订单核销</el-button> | ||||
|         </template> | ||||
|         <template #content> | ||||
|           <ai-wrapper | ||||
|             label-width="120px"> | ||||
|             <ai-info-item label="订单编号" :value="info.orderCode"></ai-info-item> | ||||
|             <ai-info-item label="订单状态" :value="dict.getLabel('merchandiseOrderStatus', info.orderStatus)"></ai-info-item> | ||||
|             <ai-info-item label="兑换人" :value="info.consumerName"></ai-info-item> | ||||
|             <ai-info-item label="兑换时间" :value="info.createTime"></ai-info-item> | ||||
|             <ai-info-item label="备注" isLine :value="info.remark"></ai-info-item> | ||||
|           </ai-wrapper> | ||||
|         </template> | ||||
|       </ai-card> | ||||
|       <ai-card title="操作信息"> | ||||
|         <template #content> | ||||
|           <ai-wrapper | ||||
|             label-width="120px"> | ||||
|             <ai-info-item label="核销人" :value="info.auditUserName"></ai-info-item> | ||||
|             <ai-info-item label="核销时间" :value="info.auditTime"></ai-info-item> | ||||
|           </ai-wrapper> | ||||
|         </template> | ||||
|       </ai-card> | ||||
|       <ai-card title="操作信息"> | ||||
|         <template #content> | ||||
|           <ai-wrapper | ||||
|             label-width="120px"> | ||||
|             <ai-info-item label="核销人" :value="info.auditUserName"></ai-info-item> | ||||
|             <ai-info-item label="核销时间" :value="info.auditTime"></ai-info-item> | ||||
|           </ai-wrapper> | ||||
|         </template> | ||||
|       </ai-card> | ||||
|       <ai-card title="商品信息"> | ||||
|         <template #content> | ||||
|           <ai-table | ||||
|             :tableData="tableData" | ||||
|             :isShowPagination="false" | ||||
|             :col-configs="colConfigs" | ||||
|             @getList="() => {}"> | ||||
|             <el-table-column slot="goods" width="240px" label="商品" align="left"> | ||||
|               <template slot-scope="{ row }"> | ||||
|                 <div class="goods"> | ||||
|                   <img :src="row.imageUrl"> | ||||
|                   <span>{{ row.merchandiseName }}</span> | ||||
|                 </div> | ||||
|               </template> | ||||
|             </el-table-column> | ||||
|           </ai-table> | ||||
|         </template> | ||||
|       </ai-card> | ||||
|       <ai-dialog | ||||
|         :visible.sync="isShow" | ||||
|         width="590px" | ||||
|         title="订单核销" | ||||
|         @close="form.code = ''" | ||||
|         @onConfirm="onConfirm"> | ||||
|         <el-form ref="form" :model="form" label-width="110px" label-position="right"> | ||||
|           <el-form-item label="核销码" prop="code" :rules="[{required: true, message: '请输入核销码', trigger: 'blur'}]"> | ||||
|             <el-input size="small" placeholder="请输入核销码" v-model="form.code"></el-input> | ||||
|           </el-form-item> | ||||
|         </el-form> | ||||
|       </ai-dialog> | ||||
|     </template> | ||||
|   </ai-detail> | ||||
| </template> | ||||
| @@ -139,12 +89,15 @@ | ||||
|         currIndex: 0, | ||||
|         isLoading: false, | ||||
|         tableData: [], | ||||
|         form: { | ||||
|           code: '' | ||||
|         }, | ||||
|         colConfigs: [ | ||||
|           {prop: 'remarks', label: '异常记录', align: 'center' }, | ||||
|           {prop: 'createTime', label: '创建时间', align: 'center'}, | ||||
|           {prop: 'createUserName', label: '记录人', align: 'center' } | ||||
|           { slot: 'goods', label: '商品' }, | ||||
|           { prop: 'merchandiseIntegral', align: 'center', label: '单价' }, | ||||
|           { prop: 'merchandiseNumber', align: 'center', label: '数量' }, | ||||
|           { prop: 'merchandiseIntegral', align: 'center', label: '小计' } | ||||
|         ], | ||||
|         tabList: ['基本信息', '风险处置'] | ||||
|       } | ||||
|     }, | ||||
|  | ||||
| @@ -152,7 +105,7 @@ | ||||
|       this.isLoading = true | ||||
|       if (this.params && this.params.id) { | ||||
|         this.id = this.params.id | ||||
|         this.$dict.load(['EP_registerPersonType', 'EP_communityHandleType', 'EP_highRiskIndustries', 'EP_travelType', 'yesOrNo', 'EP_homeStatus2', 'EP_quarantineStrategy', 'EP_controlMethod', 'EP_abnormalType']).then(() => { | ||||
|         this.dict.load(['merchandiseOrderStatus']).then(() => { | ||||
|           this.getInfo(this.params.id) | ||||
|         }) | ||||
|       } | ||||
| @@ -160,12 +113,10 @@ | ||||
|  | ||||
|     methods: { | ||||
|       getInfo (id) { | ||||
|         this.instance.post(`/app/appepidemicpreventionregisterinfo/queryDetailById?id=${id}`).then(res => { | ||||
|         this.instance.post(`/app/appintegralmerchandiseorder/queryDetailById?id=${id}`).then(res => { | ||||
|           if (res.code === 0) { | ||||
|             this.info = res.data | ||||
|             this.info.travelTypeNames = res.data.travelType.split(',').map(v => { | ||||
|               return this.dict.getLabel('EP_travelType', v) | ||||
|             }).join(',') | ||||
|             this.tableData = [this.info] | ||||
|           } | ||||
|  | ||||
|           this.isLoading = false | ||||
| @@ -174,6 +125,25 @@ | ||||
|         }) | ||||
|       }, | ||||
|  | ||||
|       onConfirm() { | ||||
|         this.$refs.form.validate((valid) => { | ||||
|           if (valid) { | ||||
|             this.instance.post(`/app/appintegralmerchandiseorder/writeOffOrder`, null, { | ||||
|               params: { | ||||
|                 code: this.form.code, | ||||
|                 id: this.params.id | ||||
|               } | ||||
|             }).then(res => { | ||||
|               if (res.code == 0) { | ||||
|                 this.isShow = false | ||||
|                 this.getList() | ||||
|                 this.$message.success('核销成功') | ||||
|               } | ||||
|             }) | ||||
|           } | ||||
|         }) | ||||
|       }, | ||||
|  | ||||
|       cancel () { | ||||
|         this.$emit('change', { | ||||
|           type: 'List', | ||||
| @@ -185,4 +155,15 @@ | ||||
| </script> | ||||
|  | ||||
| <style scoped lang="scss"> | ||||
|   .detail .goods { | ||||
|     display: flex; | ||||
|     align-items: center; | ||||
|  | ||||
|     img { | ||||
|       width: 80px; | ||||
|       height: 80px; | ||||
|       margin-right: 20px; | ||||
|     } | ||||
|   } | ||||
|  | ||||
| </style> | ||||
|   | ||||
| @@ -10,17 +10,17 @@ | ||||
|         <template #left> | ||||
|           <ai-user-selecter :instance="instance" @change="onUserChange" :isMultiple="false"> | ||||
|             <div class="userSelcet"> | ||||
|               <span style="color: #606266;" v-if="search.createUserId">{{ name }}</span> | ||||
|               <span style="color: #606266;" v-if="search.consumerId">{{ name }}</span> | ||||
|               <span v-else>兑换人</span> | ||||
|               <i class="el-icon-arrow-up"  v-if="!search.createUserId"></i> | ||||
|               <i class="el-icon-circle-close" v-if="search.createUserId" @click.stop="user = [], search.createUserId = '', name = '', search.current = 1, getList()"></i> | ||||
|               <i class="el-icon-arrow-up"  v-if="!search.consumerId"></i> | ||||
|               <i class="el-icon-circle-close" v-if="search.consumerId" @click.stop="user = [], search.consumerId = '', name = '', search.current = 1, getList()"></i> | ||||
|             </div> | ||||
|           </ai-user-selecter> | ||||
|           <ai-select | ||||
|             v-model="search.source" | ||||
|             v-model="search.orderStatus" | ||||
|             clearable | ||||
|             placeholder="请选择订单状态" | ||||
|             :selectList="dict.getDict('merchandiseStatus')" | ||||
|             :selectList="dict.getDict('merchandiseOrderStatus')" | ||||
|             @change="search.current = 1, getList()"> | ||||
|           </ai-select> | ||||
|           <el-date-picker | ||||
| @@ -42,19 +42,19 @@ | ||||
|         </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> | ||||
|       </ai-search-bar> | ||||
|       <ai-search-bar style="margin-top: 12px" bottomBorder> | ||||
|         <template #left> | ||||
|           <el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd('')">订单核销</el-button> | ||||
|           <!-- <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"> | ||||
|             <el-button icon="iconfont iconExported" :disabled="tableData.length == 0">导出订单</el-button> | ||||
|           </ai-download> | ||||
| @@ -79,15 +79,27 @@ | ||||
|             </div> | ||||
|           </template> | ||||
|         </el-table-column> | ||||
|         <el-table-column slot="options" width="100px" fixed="right" label="操作" align="center"> | ||||
|         <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center"> | ||||
|           <template slot-scope="{ row }"> | ||||
|             <div class="table-options"> | ||||
|               <el-button type="text" v-if="row.orderStatus === '0'" @click="id = row.id, isShow = true">订单核销</el-button> | ||||
|               <el-button type="text" @click="toDetail(row.id)">详情</el-button> | ||||
|               <el-button type="text" @click="remove(row.id)">删除</el-button> | ||||
|             </div> | ||||
|           </template> | ||||
|         </el-table-column> | ||||
|       </ai-table> | ||||
|       <ai-dialog | ||||
|         :visible.sync="isShow" | ||||
|         width="590px" | ||||
|         title="订单核销" | ||||
|         @close="form.code = '', id = ''" | ||||
|         @onConfirm="onConfirm"> | ||||
|         <el-form ref="form" :model="form" label-width="110px" label-position="right"> | ||||
|           <el-form-item label="核销码" prop="code" :rules="[{required: true, message: '请输入核销码', trigger: 'blur'}]"> | ||||
|             <el-input size="small" placeholder="请输入核销码" v-model="form.code"></el-input> | ||||
|           </el-form-item> | ||||
|         </el-form> | ||||
|       </ai-dialog> | ||||
|     </template> | ||||
|   </ai-list> | ||||
| </template> | ||||
| @@ -106,27 +118,41 @@ | ||||
|         search: { | ||||
|           current: 1, | ||||
|           size: 10, | ||||
|           name: '', | ||||
|           createUserId: '' | ||||
|           merchandiseName: '', | ||||
|           orderStatus: '', | ||||
|           consumerId: '' | ||||
|         }, | ||||
|         id: '', | ||||
|         form: { | ||||
|           code: '' | ||||
|         }, | ||||
|         isShow: false, | ||||
|         user: [], | ||||
|         name: '', | ||||
|         info: {}, | ||||
|         colConfigs: [ | ||||
|           { slot: 'goods', label: '商品' }, | ||||
|           { prop: 'phone', align: 'center', label: '单价/数量' }, | ||||
|           { prop: 'startTime', align: 'center', label: '消耗积分' }, | ||||
|           { prop: 'startAreaName', align: 'center', label: '兑换人' }, | ||||
|           { prop: 'merchandiseIntegral', align: 'center', label: '单价' }, | ||||
|           { prop: 'merchandiseNumber', align: 'center', label: '数量' }, | ||||
|           // {  | ||||
|           //   prop: 'areaName', label: '活动地区', align: 'center' ,  | ||||
|           //   render: (h, params) => { | ||||
|           //     return h('span', { | ||||
|           //     }, params.row.areaName) | ||||
|           //   } | ||||
|           // }, | ||||
|           { prop: 'merchandiseIntegral', align: 'center', label: '消耗积分' }, | ||||
|           { prop: 'consumerName', align: 'center', label: '兑换人' }, | ||||
|           { | ||||
|             prop: 'arriveTime', | ||||
|             prop: 'createTime', | ||||
|             align: 'center', | ||||
|             label: '兑换时间' | ||||
|           }, | ||||
|           { | ||||
|             prop: 'status', | ||||
|             prop: 'orderStatus', | ||||
|             align: 'center', | ||||
|             label: '状态', | ||||
|             formart: v => this.dict.getLabel('merchandiseStatus', v) | ||||
|             formart: v => this.dict.getLabel('merchandiseOrderStatus', v) | ||||
|           } | ||||
|         ], | ||||
|         ids: [], | ||||
| @@ -138,7 +164,7 @@ | ||||
|     }, | ||||
|  | ||||
|     created () { | ||||
|       this.dict.load(['merchandiseStatus']).then(() => { | ||||
|       this.dict.load(['merchandiseOrderStatus']).then(() => { | ||||
|         this.getList() | ||||
|       }) | ||||
|     }, | ||||
| @@ -148,6 +174,25 @@ | ||||
|          | ||||
|       }, | ||||
|  | ||||
|       onConfirm() { | ||||
|         this.$refs.form.validate((valid) => { | ||||
|           if (valid) { | ||||
|             this.instance.post(`/app/appintegralmerchandiseorder/writeOffOrder`, null, { | ||||
|               params: { | ||||
|                 code: this.form.code, | ||||
|                 id: this.id | ||||
|               } | ||||
|             }).then(res => { | ||||
|               if (res.code == 0) { | ||||
|                 this.isShow = false | ||||
|                 this.getList() | ||||
|                 this.$message.success('核销成功') | ||||
|               } | ||||
|             }) | ||||
|           } | ||||
|         }) | ||||
|       }, | ||||
|  | ||||
|       getList () { | ||||
|         this.instance.post(`/app/appintegralmerchandiseorder/list`, null, { | ||||
|           params: { | ||||
| @@ -158,7 +203,6 @@ | ||||
|           } | ||||
|         }).then(res => { | ||||
|           if (res.code == 0) { | ||||
|             console.log(res.data.records) | ||||
|             this.tableData = res.data.records | ||||
|             this.total = res.data.total | ||||
|           } | ||||
| @@ -172,17 +216,6 @@ | ||||
|             id: id || '' | ||||
|           } | ||||
|         }) | ||||
|       }, | ||||
|  | ||||
|       remove(id) { | ||||
|         this.$confirm('确定删除该数据?').then(() => { | ||||
|           this.instance.post(`/app/appepidemicpreventionregisterinfo/delete?id=${id}`).then(res => { | ||||
|             if (res.code == 0) { | ||||
|               this.$message.success('删除成功!') | ||||
|               this.getList() | ||||
|             } | ||||
|           }) | ||||
|         }) | ||||
|       } | ||||
|     } | ||||
|   } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user