From 82d93a1266736ebe1e24257115e6d1442b121de1 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 25 May 2022 18:49:44 +0800
Subject: [PATCH 1/4] BUG 29869

---
 packages/conv/creditScore/scoreSupermarket/orderManagement.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/conv/creditScore/scoreSupermarket/orderManagement.vue b/packages/conv/creditScore/scoreSupermarket/orderManagement.vue
index 7c51013e..1c264e9f 100644
--- a/packages/conv/creditScore/scoreSupermarket/orderManagement.vue
+++ b/packages/conv/creditScore/scoreSupermarket/orderManagement.vue
@@ -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>

From 09bc287157f58b6a9ae3fa5a4fb3f90ec5f9432c Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 26 May 2022 08:53:46 +0800
Subject: [PATCH 2/4] BUG 29874

---
 .../AppIntegralAudit/components/Detail.vue    | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/packages/conv/creditScore/AppIntegralAudit/components/Detail.vue b/packages/conv/creditScore/AppIntegralAudit/components/Detail.vue
index de3f7a92..ad56d8ec 100644
--- a/packages/conv/creditScore/AppIntegralAudit/components/Detail.vue
+++ b/packages/conv/creditScore/AppIntegralAudit/components/Detail.vue
@@ -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>

From 3a7506e0f6084a7a0ffb526570b7c7d3354146dd Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 26 May 2022 08:57:44 +0800
Subject: [PATCH 3/4] BUG 29875

---
 .../conv/creditScore/AppIntegralAudit/components/Detail.vue   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/conv/creditScore/AppIntegralAudit/components/Detail.vue b/packages/conv/creditScore/AppIntegralAudit/components/Detail.vue
index ad56d8ec..8ad7b2b8 100644
--- a/packages/conv/creditScore/AppIntegralAudit/components/Detail.vue
+++ b/packages/conv/creditScore/AppIntegralAudit/components/Detail.vue
@@ -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>

From 1ea7bf16f25171ab1938e546cdae591a6bf0a2c1 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 26 May 2022 09:25:15 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=B1=B1=E4=B8=9C=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E5=BA=94=E7=94=A8=E7=A7=AF=E5=88=86=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E5=92=8C=E5=91=98=E5=B7=A5=E7=A7=AF=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/shandong10086/apps.import.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/project/shandong10086/apps.import.json b/project/shandong10086/apps.import.json
index e978aa21..bf82861b 100644
--- a/project/shandong10086/apps.import.json
+++ b/project/shandong10086/apps.import.json
@@ -19,7 +19,9 @@
   "AppScoreFamily": "家庭积分",
   "AppScorePersonal": "个人积分",
   "AppScoreRules": "积分规则",
+  "AppScoreSysUser": "员工积分",
   "AppScoreSupermarket": "积分超市",
+  "AppScoreManage": "积分维护",
   "AppVillageActivity": "乡村活动",
   "AppAddressBook": "内部通讯录",
   "AppNavConfig": "小程序导航配置",