kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

Browse Source
This commit is contained in:
liuye
2022-05-26 16:17:53 +08:00
parent 97d5c51a12 1ea7bf16f2
commit b63cd4b427
3 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
packages/conv/creditScore/AppIntegralAudit/components/Detail.vue
View File

@@ -26,8 +26,8 @@
label-width="120px">
<ai-info-item label="审核结果" :value="info.auditStatus === '1' ? '通过' : '拒绝'" isLine></ai-info-item>
<ai-info-item label="审核意见" v-if="info.auditStatus === '2'" isLine :value="info.auditOpinion"></ai-info-item>
<ai-info-item label="积分规则类别" v-if="info.auditStatus === '1'" :value="dict.getLabel('atWillReportType', info.auditIntegralType)"></ai-info-item>
<ai-info-item label="积分规则事项" v-if="info.auditStatus === '1'" :value="info.auditRuleName"></ai-info-item>
<!-- <ai-info-item label="积分规则类别" v-if="info.auditStatus === '1'" :value="dict.getLabel('atWillReportType', info.auditIntegralType)"></ai-info-item>-->
<!-- <ai-info-item label="积分规则事项" v-if="info.auditStatus === '1'" :value="info.auditRuleName"></ai-info-item>-->
<ai-info-item label="积分调整" isLine v-if="info.auditStatus === '1'" :value="(info.auditIntegral >= 0 ? info.auditIntegral : info.auditIntegral) + '分'"></ai-info-item>
<ai-info-item label="审核人" :value="info.auditUserName"></ai-info-item>
<ai-info-item label="审核时间" :value="info.auditTime"></ai-info-item>
@@ -47,30 +47,30 @@
<el-radio label="1">是</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.pass === '1'" label="积分规则类别" prop="auditRuleId" style="width: 100%;" :rules="[{ required: true, message: '' }]">
<div class="flex-warpper">
<el-form-item label-width="0" prop="auditIntegralType" :rules="[{ required: true, message: '请选择积分规则类别' }]">
<ai-select
v-model="form.auditIntegralType"
clearable
style="width: 180px;"
placeholder="请选择积分规则类别"
:selectList="dict.getDict('atWillReportType')"
@change="onChange">
</ai-select>
</el-form-item>
<el-form-item style="margin: 0 10px;" prop="auditRuleId" :rules="[{ required: true, message: '请选择积分规则事项' }]">
<ai-select
v-model="form.auditRuleId"
clearable
style="width: 180px;"
placeholder="请选择积分规则事项"
:selectList="ruleList">
</ai-select>
</el-form-item>
<span>{{ integralText }}</span>
</div>
</el-form-item>
<!-- <el-form-item v-if="form.pass === '1'" label="积分规则类别" prop="auditRuleId" style="width: 100%;" :rules="[{ required: true, message: '' }]">-->
<!-- <div class="flex-warpper">-->
<!-- <el-form-item label-width="0" prop="auditIntegralType" :rules="[{ required: true, message: '请选择积分规则类别' }]">-->
<!-- <ai-select-->
<!-- v-model="form.auditIntegralType"-->
<!-- clearable-->
<!-- style="width: 180px;"-->
<!-- placeholder="请选择积分规则类别"-->
<!-- :selectList="dict.getDict('atWillReportType')"-->
<!-- @change="onChange">-->
<!-- </ai-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item style="margin: 0 10px;" prop="auditRuleId" :rules="[{ required: true, message: '请选择积分规则事项' }]">-->
<!-- <ai-select-->
<!-- v-model="form.auditRuleId"-->
<!-- clearable-->
<!-- style="width: 180px;"-->
<!-- placeholder="请选择积分规则事项"-->
<!-- :selectList="ruleList">-->
<!-- </ai-select>-->
<!-- </el-form-item>-->
<!-- <span>{{ integralText }}</span>-->
<!-- </div>-->
<!-- </el-form-item>-->
<el-form-item label="审核意见" v-if="form.pass === '0'" prop="opinion" style="width: 100%;" :rules="[{ required: true, message: '请输入审核意见' }]">
<el-input type="textarea" :rows="5" :maxlength="200" v-model="form.opinion" clearable placeholder="请输入审核意见" show-word-limit></el-input>
</el-form-item>

2
packages/conv/creditScore/scoreSupermarket/orderManagement.vue
View File

@@ -200,7 +200,7 @@
</el-button>
<template v-if="row.orderStatus==0 || row.orderStatus==3">
<el-button type="text" v-if="row.orderStatus==0" @click="handlePendingOrder(row.id,1)">确认兑换</el-button>
<el-button type="text" v-if="row.orderStatus==0 || row.orderStatus==3" @click="handlePendingOrder(row.id,0)">取消订单</el-button>
<el-button type="text" v-if="row.orderStatus==0 || row.orderStatus==3" @click="handlePendingOrder(row.id,2)">取消订单</el-button>
</template>
</div>
</template>

2
project/shandong10086/apps.import.json
View File

@@ -19,7 +19,9 @@
"AppScoreFamily": "家庭积分",
"AppScorePersonal": "个人积分",
"AppScoreRules": "积分规则",
"AppScoreSysUser": "员工积分",
"AppScoreSupermarket": "积分超市",
"AppScoreManage": "积分维护",
"AppVillageActivity": "乡村活动",
"AppAddressBook": "内部通讯录",
"AppNavConfig": "小程序导航配置",