From 505b41fbd6f60f65ba711170fafef4029e734453 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 4 Mar 2022 15:46:15 +0800
Subject: [PATCH 01/17] 1

---
 examples/entries.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/entries.js b/examples/entries.js
index 3d7290b4..52683155 100644
--- a/examples/entries.js
+++ b/examples/entries.js
@@ -2,7 +2,7 @@
 const install = function(Vue) {
 	if (install.installed) return Promise.resolve();
 	else {
-		let contexts = require.context('../packages', true, /(\/.+)\/App[^\/]+\.vue$/);
+		let contexts = require.context('../project/shandong10086/apps', true, /(\/.+)\/App[^\/]+\.vue$/);
 		if (contexts) {
 			contexts.keys().map((e) => {
 				if (contexts(e).default) {

From d06b22878ca1d04c9cf38d9ce90294064bdd84bf Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 4 Mar 2022 15:48:23 +0800
Subject: [PATCH 02/17] =?UTF-8?q?=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/bigscreen/designer/components/form/DataConfig.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/bigscreen/designer/components/form/DataConfig.vue b/packages/bigscreen/designer/components/form/DataConfig.vue
index c40e396f..4fac77de 100644
--- a/packages/bigscreen/designer/components/form/DataConfig.vue
+++ b/packages/bigscreen/designer/components/form/DataConfig.vue
@@ -227,7 +227,7 @@
         this.instance.post(this.options.api).then(res => {
           if (res.code == 0) {
             if (res.data.length) {
-              if (this.options.type === 'table') {
+              if (this.options.type === 'table') { 
                 const keys = Object.keys(res.data[0])
                 const list = res.data
                 this.options.apiData = keys.map(v => {

From 6fc8928032d4750162281978cde059c171cd4f5c Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 4 Mar 2022 17:06:20 +0800
Subject: [PATCH 03/17] 28020

---
 .../apps/shandong/AppIntegralAudit/components/Detail.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/shandong10086/apps/shandong/AppIntegralAudit/components/Detail.vue b/project/shandong10086/apps/shandong/AppIntegralAudit/components/Detail.vue
index b3bf33c5..b7dea1b2 100644
--- a/project/shandong10086/apps/shandong/AppIntegralAudit/components/Detail.vue
+++ b/project/shandong10086/apps/shandong/AppIntegralAudit/components/Detail.vue
@@ -28,7 +28,7 @@
             <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="积分调整" isLine v-if="info.auditStatus === '1'" :value="(info.auditIntegral >= 0 ? + info.auditIntegral : info.auditIntegral) + '分'"></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>
           </ai-wrapper>

From 192e143b5c3d8c02c58950b65ee9e9bd25dd32fa Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 4 Mar 2022 17:08:55 +0800
Subject: [PATCH 04/17] 28039

---
 .../apps/shandong/AppVillagersCircle/components/List.vue       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/project/shandong10086/apps/shandong/AppVillagersCircle/components/List.vue b/project/shandong10086/apps/shandong/AppVillagersCircle/components/List.vue
index b1f6cfad..8e316ed9 100644
--- a/project/shandong10086/apps/shandong/AppVillagersCircle/components/List.vue
+++ b/project/shandong10086/apps/shandong/AppVillagersCircle/components/List.vue
@@ -121,7 +121,8 @@
         this.instance.post(`/app/appvillagercircleinfo/list`, null, {
           params: {
             ...this.search,
-            areaId: this.areaId
+            areaId: this.areaId,
+            createTimeEnd: this.search.createTimeEnd ? this.search.createTimeEnd + ' 23:59:59' : ''
           }
         }).then(res => {
           if (res.code == 0) {

From 99ac6ffbad994e3fa0207062252d475221740fe6 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 7 Mar 2022 11:59:19 +0800
Subject: [PATCH 05/17] =?UTF-8?q?=E5=90=8D=E5=AD=97=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{AppThematicConfig.vue.vue => AppThematicConfig.vue}          | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename packages/3.0.0/AppThematicConfig/{AppThematicConfig.vue.vue => AppThematicConfig.vue} (100%)

diff --git a/packages/3.0.0/AppThematicConfig/AppThematicConfig.vue.vue b/packages/3.0.0/AppThematicConfig/AppThematicConfig.vue
similarity index 100%
rename from packages/3.0.0/AppThematicConfig/AppThematicConfig.vue.vue
rename to packages/3.0.0/AppThematicConfig/AppThematicConfig.vue

From 52744994684d1100f0122aef8ce7c30d96e22ca9 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 7 Mar 2022 13:59:05 +0800
Subject: [PATCH 06/17] 28085

---
 examples/entries.js                                         | 2 +-
 packages/bigscreen/designer/components/Layout.vue           | 6 +++++-
 packages/bigscreen/designer/config.js                       | 2 +-
 .../apps/shandong/AppVillageCode/components/List.vue        | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/examples/entries.js b/examples/entries.js
index 52683155..3d7290b4 100644
--- a/examples/entries.js
+++ b/examples/entries.js
@@ -2,7 +2,7 @@
 const install = function(Vue) {
 	if (install.installed) return Promise.resolve();
 	else {
-		let contexts = require.context('../project/shandong10086/apps', true, /(\/.+)\/App[^\/]+\.vue$/);
+		let contexts = require.context('../packages', true, /(\/.+)\/App[^\/]+\.vue$/);
 		if (contexts) {
 			contexts.keys().map((e) => {
 				if (contexts(e).default) {
diff --git a/packages/bigscreen/designer/components/Layout.vue b/packages/bigscreen/designer/components/Layout.vue
index d9afd889..72409299 100644
--- a/packages/bigscreen/designer/components/Layout.vue
+++ b/packages/bigscreen/designer/components/Layout.vue
@@ -461,7 +461,11 @@
           return this.$message.error('请上传图片')
         }
 
-        this.images.push(this.form.images)
+        this.images = [
+          ...this.images,
+          ...this.form.images
+        ]
+
         this.form.images = []
         this.isShowAddImg = false
       },
diff --git a/packages/bigscreen/designer/config.js b/packages/bigscreen/designer/config.js
index c152dbf6..14e6add3 100644
--- a/packages/bigscreen/designer/config.js
+++ b/packages/bigscreen/designer/config.js
@@ -620,7 +620,7 @@ const components = [
             title: '',
             moniterId: '',
             monitorType: 'cmcc',
-            api: '/app/appzyvideoequipment/list',
+            api: '/app/appzyvideoequipment/list2',
             border: 'border2',
             sourceDataId: '',
             dataType: 'staticData',
diff --git a/project/shandong10086/apps/shandong/AppVillageCode/components/List.vue b/project/shandong10086/apps/shandong/AppVillageCode/components/List.vue
index 45e80022..31ff5d6b 100644
--- a/project/shandong10086/apps/shandong/AppVillageCode/components/List.vue
+++ b/project/shandong10086/apps/shandong/AppVillageCode/components/List.vue
@@ -1,7 +1,7 @@
 <template>
   <ai-list class="villagecode">
     <template slot="title">
-      <ai-title title="一村一码" isShowBottomBorder></ai-title>
+      <ai-title title="一村一群" isShowBottomBorder></ai-title>
     </template>
     <template #left>
       <div class="villagecode-left">

From 7bcc4469ccbaccc8a231a4048547a14604feb227 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 7 Mar 2022 14:00:24 +0800
Subject: [PATCH 07/17] 28073

---
 .../apps/shandong/AppIntegralAudit/components/Detail.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/shandong10086/apps/shandong/AppIntegralAudit/components/Detail.vue b/project/shandong10086/apps/shandong/AppIntegralAudit/components/Detail.vue
index b7dea1b2..de3f7a92 100644
--- a/project/shandong10086/apps/shandong/AppIntegralAudit/components/Detail.vue
+++ b/project/shandong10086/apps/shandong/AppIntegralAudit/components/Detail.vue
@@ -72,7 +72,7 @@
             </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="500" v-model="form.opinion" clearable placeholder="请输入审核意见" show-word-limit></el-input>
+            <el-input type="textarea" :rows="5" :maxlength="200" v-model="form.opinion" clearable placeholder="请输入审核意见" show-word-limit></el-input>
           </el-form-item>
         </el-form>
       </ai-dialog>

From 77fbf076256d17cf6fafee6bf91a6f0d6ac9f3e1 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 8 Mar 2022 11:20:40 +0800
Subject: [PATCH 08/17] BUG 27519

---
 .../apps/shandong/scoreManage/AppScoreManage.vue              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/shandong10086/apps/shandong/scoreManage/AppScoreManage.vue b/project/shandong10086/apps/shandong/scoreManage/AppScoreManage.vue
index 57f03759..82759bac 100644
--- a/project/shandong10086/apps/shandong/scoreManage/AppScoreManage.vue
+++ b/project/shandong10086/apps/shandong/scoreManage/AppScoreManage.vue
@@ -1,7 +1,7 @@
 <template>
   <ai-list>
     <template slot="title">
-      <ai-title title="积分审核" :isShowBottomBorder="false" :instance="instance" :isShowArea="true" v-model="areaId"
+      <ai-title title="积分维护" :isShowBottomBorder="false" :instance="instance" :isShowArea="true" v-model="areaId"
                 @change="changeArea"></ai-title>
     </template>
     <template slot="tabs">
@@ -24,7 +24,7 @@ import scoreChange from "./scoreChange";
 
 export default {
     name: 'AppScoreManage',
-    label: "积分审核",
+    label: "积分维护",
     components: {pointsDeclaration, pointsDetails, pointsAppeal, scoreChange},
     props: {
       instance: Function,

From 37f54ace014fd0dc8f3082a39653d2ef1dfbffe2 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 8 Mar 2022 11:50:44 +0800
Subject: [PATCH 09/17] =?UTF-8?q?=E7=AE=80=E5=86=99=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processManagement/approvalManage/AppApprovalManage.vue  | 6 +++---
 .../approvalManage/components/approvalDetail.vue            | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/processManagement/approvalManage/AppApprovalManage.vue b/packages/processManagement/approvalManage/AppApprovalManage.vue
index b887a8f8..55de8783 100644
--- a/packages/processManagement/approvalManage/AppApprovalManage.vue
+++ b/packages/processManagement/approvalManage/AppApprovalManage.vue
@@ -1,8 +1,8 @@
 <template>
-  <section class="approval-manage">
+  <section class="AppApprovalManage">
     <ai-list v-if="showList">
       <template slot="title">
-        <ai-title title="审批管理" :isShowBottomBorder="false"></ai-title>
+        <ai-title title="审批管理" :isShowBottomBorder="false"/>
       </template>
       <template slot="tabs">
         <el-tabs class="tabs-page" v-model="currIndex">
@@ -86,7 +86,7 @@
 </script>
 
 <style lang="scss" scoped>
-  .approval-manage {
+  .AppApprovalManage {
     width: 100%;
     height: 100%;
     background-color: #F3F6F9;
diff --git a/packages/processManagement/approvalManage/components/approvalDetail.vue b/packages/processManagement/approvalManage/components/approvalDetail.vue
index 2042ffab..350fbb06 100644
--- a/packages/processManagement/approvalManage/components/approvalDetail.vue
+++ b/packages/processManagement/approvalManage/components/approvalDetail.vue
@@ -61,7 +61,7 @@
                       </el-form-item>
                     </div>
                     <template v-if="applyForm=={}">
-                      <div class="no-data"></div>
+                      <div class="no-data"/>
                     </template>
                   </div>
                 </el-form>

From 65b407e744d15a3000820cddf0c5b81b897114cf Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 8 Mar 2022 14:18:45 +0800
Subject: [PATCH 10/17] BUG 28046

---
 .../AppDispatchManagement/components/Detail.vue    | 14 +++++++-------
 .../AppDispatchManagement/components/List.vue      | 12 +++++-------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/project/shandong10086/apps/shandong/AppDispatchManagement/components/Detail.vue b/project/shandong10086/apps/shandong/AppDispatchManagement/components/Detail.vue
index 50a4424c..b736543e 100644
--- a/project/shandong10086/apps/shandong/AppDispatchManagement/components/Detail.vue
+++ b/project/shandong10086/apps/shandong/AppDispatchManagement/components/Detail.vue
@@ -4,7 +4,7 @@
       <template #title>
         <ai-title title="公文详情" isShowBottomBorder isShowBack @onBackClick="cancel(true)">
           <template #rightBtn>
-            <ai-wechat-selecter :instance="instance" v-model="addUser" :isMultiple="form.readType == '0' ? false : true" @change="onChange" v-if="form.status === '0'">
+            <ai-wechat-selecter :instance="instance" v-model="addUser" :isMultiple="form.readType!='0'" @change="onChange" v-if="form.status === '0'">
               <el-button
                 size="small"
                 type="primary"
@@ -12,7 +12,7 @@
                 开始流转
               </el-button>
             </ai-wechat-selecter>
-            <ai-wechat-selecter :instance="instance" v-model="addUser" :isMultiple="form.readType == '0' ? false : true" @change="onChange" v-if="form.status === '2' && form.readType == '0'">
+            <ai-wechat-selecter :instance="instance" v-model="addUser" :isMultiple="form.readType!='0'" @change="onChange" v-if="form.status === '2' && form.readType == '0'">
               <el-button
                 size="small"
                 type="primary"
@@ -28,7 +28,7 @@
             结束流转</el-button>
           </template>
         </ai-title>
-        
+
       </template>
       <template #content>
         <ai-card :title="form.documentName">
@@ -131,7 +131,7 @@
                     class="iconfont iconDelete"
                     title="删除"
                     style="cursor: pointer;"
-                    @click="remove(row.id)">
+                    @click="remove(row.flowId)">
                   </span>
                 </template>
               </el-table-column>
@@ -220,9 +220,9 @@ export default {
     this.showDetail = true
     this.isAdd = false
     this.getDetail()
-    
+
   },
-  methods: { 
+  methods: {
     remove (id) {
       if(this.form.flowUsers.length<=1){
         return this.$message.error("至少留一个流转对象！");
@@ -560,4 +560,4 @@ export default {
       }
     }
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/project/shandong10086/apps/shandong/AppDispatchManagement/components/List.vue b/project/shandong10086/apps/shandong/AppDispatchManagement/components/List.vue
index 27337adf..dccacc5e 100644
--- a/project/shandong10086/apps/shandong/AppDispatchManagement/components/List.vue
+++ b/project/shandong10086/apps/shandong/AppDispatchManagement/components/List.vue
@@ -80,6 +80,7 @@
           :size.sync="page.size"
           @getList="getList"
           @selection-change="handleSelectionChange"
+          :dict="dict"
       >
         <el-table-column slot="selection" type="selection" width="55"></el-table-column>
         <el-table-column slot="options" label="操作" align="center" width="200">
@@ -142,24 +143,21 @@ export default {
           label: "公文类型",
           width: 120,
           align: "center",
-          formart: (documentType) =>
-              this.$dict.getLabel("officialDocumentName", documentType),
+          dict: "officialDocumentName"
         },
         {
           prop: "readType",
           label: "阅示类型",
           width: 120,
           align: "center",
-          formart: (readType) =>
-              this.$dict.getLabel("officialDocumentReadType", readType),
+          dict: "officialDocumentReadType"
         },
         {
           prop: "confidentialityLevel",
           label: "保密等级",
           width: 120,
           align: "center",
-          formart: (confidentialityLevel) =>
-              this.$dict.getLabel("officialDocumentConfidentialityLevel", confidentialityLevel),
+          dict: "officialDocumentConfidentialityLevel"
         },
         {
           prop: "flowUserName",
@@ -192,7 +190,7 @@ export default {
       ];
     },
   },
-  mounted() {
+  created() {
     this.dict.load('officialDocumentName', 'officialDocumentConfidentialityLevel', 'officialDocumentReadType', 'documentStatus').then(() => {
       this.$nextTick(() => this.getList())
     })

From cdd570fae028ba0438f8ecebe831c978152bf644 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 8 Mar 2022 14:21:38 +0800
Subject: [PATCH 11/17] BUG 28073

---
 .../shandong10086/apps/shandong/AppResident/auditList.vue   | 2 +-
 .../shandong10086/apps/shandong/AppResident/audtiDetail.vue | 6 +++---
 .../apps/shandong/AppVillagersCircle/components/Detail.vue  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/project/shandong10086/apps/shandong/AppResident/auditList.vue b/project/shandong10086/apps/shandong/AppResident/auditList.vue
index b7c2a87d..9c41eeef 100644
--- a/project/shandong10086/apps/shandong/AppResident/auditList.vue
+++ b/project/shandong10086/apps/shandong/AppResident/auditList.vue
@@ -71,7 +71,7 @@
               <el-radio label="1">是</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="审核意见" prop="opinion" style="width: 100%;" :rules="[{ required: form.pass === '0' ? true : false, message: '请输入审核意见' }]">
+          <el-form-item label="审核意见" prop="opinion" style="width: 100%;" :rules="[{ required: form.pass === '0', message: '请输入审核意见' }]">
             <el-input type="textarea" :rows="5" :maxlength="500" v-model="form.opinion" clearable placeholder="请输入审核意见" show-word-limit></el-input>
           </el-form-item>
         </el-form>
diff --git a/project/shandong10086/apps/shandong/AppResident/audtiDetail.vue b/project/shandong10086/apps/shandong/AppResident/audtiDetail.vue
index e41a9b74..6986f4c3 100644
--- a/project/shandong10086/apps/shandong/AppResident/audtiDetail.vue
+++ b/project/shandong10086/apps/shandong/AppResident/audtiDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <section class="addAborigines">
     <ai-detail>
-      <ai-title slot="title" title="详情" isShowBack @onBackClick="$router.push({query:{}})" isShowBottomBorder></ai-title>
+      <ai-title slot="title" title="详情" isShowBack @onBackClick="$router.push({query:{}})" isShowBottomBorder/>
       <template #content>
           <ai-card title="基本信息">
             <div slot="content">
@@ -193,8 +193,8 @@
                   <el-radio label="1">是</el-radio>
                 </el-radio-group>
               </el-form-item>
-              <el-form-item label="审核意见" prop="opinion" style="width: 100%;" :rules="[{ required: form.pass === '0' ? true : false, message: '请输入审核意见' }]">
-                <el-input type="textarea" :rows="5" :maxlength="500" v-model="form.opinion" clearable placeholder="请输入审核意见" show-word-limit></el-input>
+              <el-form-item label="审核意见" prop="opinion" style="width: 100%;" :rules="[{ required: form.pass === '0', message: '请输入审核意见' }]">
+                <el-input type="textarea" :rows="5" :maxlength="200" v-model="form.opinion" clearable placeholder="请输入审核意见" show-word-limit></el-input>
               </el-form-item>
             </el-form>
           </ai-dialog>
diff --git a/project/shandong10086/apps/shandong/AppVillagersCircle/components/Detail.vue b/project/shandong10086/apps/shandong/AppVillagersCircle/components/Detail.vue
index 238d22da..a984faa6 100644
--- a/project/shandong10086/apps/shandong/AppVillagersCircle/components/Detail.vue
+++ b/project/shandong10086/apps/shandong/AppVillagersCircle/components/Detail.vue
@@ -47,7 +47,7 @@
             </el-radio-group>
           </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="500" v-model="form.opinion" clearable placeholder="请输入审核意见" show-word-limit></el-input>
+            <el-input type="textarea" :rows="5" :maxlength="200" v-model="form.opinion" clearable placeholder="请输入审核意见" show-word-limit></el-input>
           </el-form-item>
         </el-form>
       </ai-dialog>

From 74f84fe07b7f77688a6180e0b7dc7c57e281ec58 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 8 Mar 2022 14:33:32 +0800
Subject: [PATCH 12/17] BUG 28086

---
 packages/creditScore/scoreFamily/detail.vue | 297 ++++++++++----------
 1 file changed, 148 insertions(+), 149 deletions(-)

diff --git a/packages/creditScore/scoreFamily/detail.vue b/packages/creditScore/scoreFamily/detail.vue
index 351e702b..613408c3 100644
--- a/packages/creditScore/scoreFamily/detail.vue
+++ b/packages/creditScore/scoreFamily/detail.vue
@@ -1,7 +1,7 @@
 <template>
   <ai-detail class="family_detail">
     <template slot="title">
-      <ai-title title="余额明细" :isShowBack="true" :isShowBottomBorder="true" @onBackClick="$emit('goBack')" ></ai-title>
+      <ai-title title="余额明细" :isShowBack="true" :isShowBottomBorder="true" @onBackClick="$emit('goBack')"></ai-title>
     </template>
     <template slot="content">
       <div class="detail-info">
@@ -25,33 +25,33 @@
       <ai-card title="余额变动明细">
         <template slot="right">
           <ai-download
-            :instance="instance"
-            url="/app/appvillagerintegraldetail/export"
-            :disabled="!Boolean(tableData.length)"
-            :params="{familyName:detailInfo.name,doType:doType}"
-            fileName="余额变动明细">
+              :instance="instance"
+              url="/app/appvillagerintegraldetail/export"
+              :disabled="!Boolean(tableData.length)"
+              :params="{familyId:detailInfo.familyId,bizType:detailInfo.bizType}"
+              fileName="余额变动明细">
             <span class="iconfont iconExported">导出</span>
           </ai-download>
         </template>
         <template #content>
-          <el-select v-model="doType" placeholder="请选择类型" size='small' clearable  @change="page.current=1,getList()">
+          <el-select v-model="doType" placeholder="请选择类型" size='small' clearable @change="page.current=1,getList()">
             <el-option
-              v-for="(item,i) in dict.getDict('integralDetailType')"
-              :label="item.dictName"
-              :key="i"
-              :value="item.dictValue">
+                v-for="(item,i) in dict.getDict('integralDetailType')"
+                :label="item.dictName"
+                :key="i"
+                :value="item.dictValue">
             </el-option>
           </el-select>
           <ai-table
-            style="margin-top: 16px;"
-            :tableData="tableData"
-            :col-configs="colConfigs"
-            :total="page.total"
-            :border="true"
-            :stripe="false"
-            :current.sync="page.current"
-            :size.sync="page.size"
-            @getList="getList">
+              style="margin-top: 16px;"
+              :tableData="tableData"
+              :col-configs="colConfigs"
+              :total="page.total"
+              :border="true"
+              :stripe="false"
+              :current.sync="page.current"
+              :size.sync="page.size"
+              @getList="getList">
           </ai-table>
         </template>
       </ai-card>
@@ -60,153 +60,152 @@
 </template>
 
 <script>
-  export default {
-    name: 'balance',
+export default {
+  name: 'balance',
 
-    props: {
-      detailInfo: {
-        type: Object,
-        require: true
+  props: {
+    detailInfo: {
+      type: Object,
+      require: true
+    },
+    instance: Function,
+    dict: Object
+  },
+
+  data() {
+    return {
+      page: {
+        current: 1,
+        size: 10,
+        total: 0
       },
-      instance: Function,
-      dict: Object
-    },
+      doType: '',
+      tableData: []
+    }
+  },
 
-    data () {
-      return {
-        page: {
-          current: 1,
-          size: 10,
-          total: 0
+  created() {
+    this.dict.load('integralDetailType')
+    this.getList()
+  },
+
+  computed: {
+    colConfigs() {
+      const _this = this
+      return [
+        {
+          prop: 'doTime',
+          label: '时间'
         },
-        doType: '',
-        tableData: []
-      }
-    },
-
-    created () {
-      this.dict.load('integralDetailType')
-      this.getList()
-    },
-
-    computed: {
-      colConfigs () {
-        const _this = this
-        return [
-          {
-            prop: 'doTime',
-            align: 'center',
-            label: '时间',
-            align:'left'
-          },
-          {
-            prop: 'bizType',
-            align: 'center',
-            label: '类型',
-            render (h, {row}) {
-              return h('span',{}, _this.dict.getLabel('integralDetailType', row.bizType))
-            }
-          },
-          {
-            prop: 'changeIntegral',
-            align: 'center',
-            label: '变动积分',
-            formart: v => v > 0 ? `+${v}` : v
-          },
-          {
-            prop: 'nowIntegral',
-            align: 'center',
-            label: '剩余积分'
-          },
-          {
-            prop: 'description',
-            align: 'center',
-            label: '事件类型',
-            align:'left'
+        {
+          prop: 'bizType',
+          align: 'center',
+          label: '类型',
+          render(h, {row}) {
+            return h('span', {}, _this.dict.getLabel('integralDetailType', row.bizType))
           }
-        ]
-      }
-    },
+        },
+        {
+          prop: 'changeIntegral',
+          align: 'center',
+          label: '变动积分',
+          formart: v => v > 0 ? `+${v}` : v
+        },
+        {
+          prop: 'nowIntegral',
+          align: 'center',
+          label: '剩余积分'
+        },
+        {
+          prop: 'description',
+          label: '事件类型',
+        }
+      ]
+    }
+  },
 
-    methods: {
-      getList () {
-        this.instance.post('/app/appvillagerintegraldetail/list', null, {
-          params: {                       
-            ...this.page,
-            familyId:this.detailInfo.id,
-            bizType:this.doType
-          }
-        }).then(res => {
-          if (res.code === 0) {
-            this.tableData = res.data.records
-            this.page.total = res.data.total
-          }
-        })
-      }
+  methods: {
+    getList() {
+      this.instance.post('/app/appvillagerintegraldetail/list', null, {
+        params: {
+          ...this.page,
+          familyId: this.detailInfo.id,
+          bizType: this.doType
+        }
+      }).then(res => {
+        if (res.code === 0) {
+          this.tableData = res.data.records
+          this.page.total = res.data.total
+        }
+      })
     }
   }
+}
 </script>
 
 <style lang="scss" scoped>
-  .family_detail{
-    height: 100%;
-    background-color: #fff;
+.family_detail {
+  height: 100%;
+  background-color: #fff;
 
-    ::v-deep .ai-card__body {
-      padding: 12px 16px 20px!important;
-    }
+  ::v-deep .ai-card__body {
+    padding: 12px 16px 20px !important;
+  }
 
 
-    .detail-info {
-      display: flex;
-      align-items: center;
-      margin-bottom: 20px;
+  .detail-info {
+    display: flex;
+    align-items: center;
+    margin-bottom: 20px;
 
-      .detail-info__item {
-        flex: 1;
-        height: 96px;
-        margin-right: 20px;
-        padding: 16px 24px;
-        background: #FFFFFF;
-        box-shadow: 0px 4px 6px -2px rgba(15, 15, 21, 0.15);
-        border-radius: 4px;
+    .detail-info__item {
+      flex: 1;
+      height: 96px;
+      margin-right: 20px;
+      padding: 16px 24px;
+      background: #FFFFFF;
+      box-shadow: 0 4px 6px -2px rgba(15, 15, 21, 0.15);
+      border-radius: 4px;
 
-        &:last-child {
-          margin-right: 0;
-        }
-
-        h2 {
-          margin-bottom: 8px;
-          color: #888888;
-          font-size: 16px;
-          font-weight: bold;
-        }
-
-        span {
-          display: block;
-          line-height: 32px;
-          font-size: 24px;
-          font-weight: bold;
-          color: #222;
-        }
+      &:last-child {
+        margin-right: 0;
       }
-    }
 
-    .iconExported{
-      color:#5088FF;
-      font-size: 12px;
-      cursor: pointer;
-    }
-    .info{
-      padding: 16px 0 16px 0;
-    }
-    .do_type{
-      height: 56px;
-    }
-    .fs-14{
-      ::v-deep .el-table--small{
-        font-size: 14px!important;
+      h2 {
+        margin-bottom: 8px;
+        color: #888888;
+        font-size: 16px;
+        font-weight: bold;
+      }
+
+      span {
+        display: block;
+        line-height: 32px;
+        font-size: 24px;
+        font-weight: bold;
+        color: #222;
       }
     }
   }
-</style>
\ No newline at end of file
+
+  .iconExported {
+    color: #5088FF;
+    font-size: 12px;
+    cursor: pointer;
+  }
+
+  .info {
+    padding: 16px 0 16px 0;
+  }
+
+  .do_type {
+    height: 56px;
+  }
+
+  .fs-14 {
+    ::v-deep .el-table--small {
+      font-size: 14px !important;
+    }
+  }
+}
+</style>

From b16720420d277d29022d215ae5ce712d51efa5c0 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 8 Mar 2022 14:40:56 +0800
Subject: [PATCH 13/17] BUG 27632

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

diff --git a/project/shandong10086/apps.import.json b/project/shandong10086/apps.import.json
index 1c21b6cd..db63642f 100644
--- a/project/shandong10086/apps.import.json
+++ b/project/shandong10086/apps.import.json
@@ -28,5 +28,7 @@
   "AppMeetingChinaunion": "三会一课",
   "AppPartyHistoryClass": "党员学习",
   "AppPartyOrganization": "党组织管理",
-  "AppPartyMember": "党员管理"
+  "AppPartyMember": "党员管理",
+  "AppLicence": "产品许可",
+  "AppContentManage": "内容中心"
 }

From 905db58f57746b25d9d74299c6b2e939655f338e Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 8 Mar 2022 14:44:26 +0800
Subject: [PATCH 14/17] BUG 28124

---
 .../AppMeetingChinaunion.vue                  | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue b/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue
index 419947bc..bfeef42f 100644
--- a/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue
+++ b/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue
@@ -4,7 +4,8 @@
       <ai-title title="三会一课" isShowBottomBorder slot="title">
         <template #rightBtn>
           <ai-party :instance="instance" v-model="partyId" :topOrgId="topOrgId" :name.sync="partyOrgLabel"
-                    style="display:inline-block" @origin="changeParty" customClicker url="/app/partyOrganization/queryAllChildren">
+                    style="display:inline-block" @origin="changeParty" customClicker
+                    url="/app/partyOrganization/queryAllChildren">
             <el-input size="small" v-model="partyOrgLabel" readonly placeholder="选择党组织">
               <el-row slot="append" type="flex" class="partyPicker">
                 <i class="iconfont icondangyuan"/>
@@ -42,11 +43,7 @@
           </template>
           <template #right>
             <el-input size="small" v-model="search.meetingAgenda" placeholder="会议标题/创建人"
-                      prefix-icon="iconfont iconSearch" clearable
-                      @keyup.enter.native="page.current=1,getAppThreeMeetingInfo()"/>
-            <el-button type="primary" icon="iconfont iconSearch" @click="page.current=1,getAppThreeMeetingInfo()">查询
-            </el-button>
-            <el-button icon="el-icon-refresh-right" @click="resetSearch">重置</el-button>
+                      suffix-icon="iconfont iconSearch" clearable @change="page.current=1,getAppThreeMeetingInfo()"/>
           </template>
         </ai-search-bar>
         <ai-search-bar>
@@ -136,18 +133,19 @@
       <div class="content input-240">
         <div class="flex">
           <el-date-picker
-            v-model="searchYear"
-            type="year"
-            size="small"
-            style="width: 200px; margin-right: 10px;"
-            value-format="yyyy"
-            @change="getMeetStatistics"
-            placeholder="选择年份">
+              v-model="searchYear"
+              type="year"
+              size="small"
+              style="width: 200px; margin-right: 10px;"
+              value-format="yyyy"
+              @change="getMeetStatistics"
+              placeholder="选择年份">
           </el-date-picker>
-          <el-select style="width: 200px" v-model="searchMonth" placeholder="全部" size="small" clearable class="timeSelect"
-                      @change="getMeetStatistics">
+          <el-select style="width: 200px" v-model="searchMonth" placeholder="全部" size="small" clearable
+                     class="timeSelect"
+                     @change="getMeetStatistics">
             <el-option v-for="(op,j) in dict.getDict('monthList')" :key="j" :label="op.dictName"
-                        :value="op.dictValue"/>
+                       :value="op.dictValue"/>
           </el-select>
         </div>
         <ul class="totalTitle">

From af674d432425e5e5ac1a601e4815a42c3ffe0a2b Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 8 Mar 2022 14:48:51 +0800
Subject: [PATCH 15/17] BUG 28125

---
 .../components/meetingDetail.vue              | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/packages/3.0.0/AppMeetingChinaunion/components/meetingDetail.vue b/packages/3.0.0/AppMeetingChinaunion/components/meetingDetail.vue
index cacd37b3..28ae9ab9 100644
--- a/packages/3.0.0/AppMeetingChinaunion/components/meetingDetail.vue
+++ b/packages/3.0.0/AppMeetingChinaunion/components/meetingDetail.vue
@@ -47,28 +47,28 @@
                         </span>
                       </span>
                 <span class="value" v-else>-</span></el-form-item>
-              <ai-title title="附件" isShowBottomBorder>
-                <template #rightBtn>
-                  <el-button type="text" icon="iconfont iconDownload" @click="downLoadAll">下载全部</el-button>
-                </template>
-              </ai-title>
-              <el-form-item label-width="0">
-                <div v-if="obj.annex.length">
-                  <div class="flie" v-for="(item, index) in obj.annex" :key="index"
-                       @click="downFile(item)">
-                    <p>
-                      <svg aria-hidden="true" style="width:24px;height:24px;">
-                        <use xlink:href="#iconAppendix_UNdownload"></use>
-                      </svg>
-                      <span>{{ item.name }}</span>
-                    </p>
-                    <span style="color:#999;">{{ (item.size / 1024).toFixed(2) + "KB" }}
-                            <span class="iconfont iconDownload" style="color:#5088FF"></span>
-                        </span>
-                  </div>
-                </div>
-                <div class="no-data" style="height:160px;width:100%;" v-else></div>
-              </el-form-item>
+<!--              <ai-title title="附件" isShowBottomBorder>-->
+<!--                <template #rightBtn>-->
+<!--                  <el-button type="text" icon="iconfont iconDownload" @click="downLoadAll">下载全部</el-button>-->
+<!--                </template>-->
+<!--              </ai-title>-->
+<!--              <el-form-item label-width="0">-->
+<!--                <div v-if="obj.annex.length">-->
+<!--                  <div class="flie" v-for="(item, index) in obj.annex" :key="index"-->
+<!--                       @click="downFile(item)">-->
+<!--                    <p>-->
+<!--                      <svg aria-hidden="true" style="width:24px;height:24px;">-->
+<!--                        <use xlink:href="#iconAppendix_UNdownload"></use>-->
+<!--                      </svg>-->
+<!--                      <span>{{ item.name }}</span>-->
+<!--                    </p>-->
+<!--                    <span style="color:#999;">{{ (item.size / 1024).toFixed(2) + "KB" }}-->
+<!--                            <span class="iconfont iconDownload" style="color:#5088FF"></span>-->
+<!--                        </span>-->
+<!--                  </div>-->
+<!--                </div>-->
+<!--                <div class="no-data" style="height:160px;width:100%;" v-else></div>-->
+<!--              </el-form-item>-->
               <ai-title title="人员信息" isShowBottomBorder/>
               <el-form-item label="与会组织">{{ arrLabel(obj.appThreeMeetingOrganizationList, 'name') }}</el-form-item>
               <el-form-item label="主持人">{{ arrLabel(obj.hostList, 'userName') }}</el-form-item>

From 61f8d7fea4cc651ebfc801553ea4486e37dd2b3e Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 8 Mar 2022 17:12:44 +0800
Subject: [PATCH 16/17] BUG 28137

---
 packages/creditScore/scoreFamily/detail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/creditScore/scoreFamily/detail.vue b/packages/creditScore/scoreFamily/detail.vue
index 613408c3..9152f4b9 100644
--- a/packages/creditScore/scoreFamily/detail.vue
+++ b/packages/creditScore/scoreFamily/detail.vue
@@ -28,7 +28,7 @@
               :instance="instance"
               url="/app/appvillagerintegraldetail/export"
               :disabled="!Boolean(tableData.length)"
-              :params="{familyId:detailInfo.familyId,bizType:detailInfo.bizType}"
+              :params="{familyId:detailInfo.id,bizType:detailInfo.doType}"
               fileName="余额变动明细">
             <span class="iconfont iconExported">导出</span>
           </ai-download>

From 4718b6094158cd64709eb7800008d077f11d43b4 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 8 Mar 2022 17:19:32 +0800
Subject: [PATCH 17/17] BUG 27673

---
 .../3.0.0/AppConvenienceAddressBook/components/Add.vue    | 6 +++---
 packages/wechat/AppAskForm/components/Add.vue             | 8 ++------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/packages/3.0.0/AppConvenienceAddressBook/components/Add.vue b/packages/3.0.0/AppConvenienceAddressBook/components/Add.vue
index 7544f14b..3500a7f2 100644
--- a/packages/3.0.0/AppConvenienceAddressBook/components/Add.vue
+++ b/packages/3.0.0/AppConvenienceAddressBook/components/Add.vue
@@ -7,7 +7,7 @@
     <template slot="content">
       <ai-card title="基本信息">
         <template #content>
-          <el-form ref="form" class="ai-form" :model="form" label-width="110px" label-position="right">
+          <el-form ref="CBookForm" class="ai-form" :model="form" label-width="110px" label-position="right">
             <el-form-item label="地区" style="width: 100%;" prop="codeName">
               <span style="color: #666;">{{ form.areaName }}</span>
             </el-form-item>
@@ -93,7 +93,7 @@
     methods: {
       getInfo (id) {
         this.instance.post(`/app/appconvenientaddressbook/queryDetailById?id=${id}`).then(res => {
-          if (res.code === 0) {
+          if (res?.data) {
             this.form = res.data
           }
         })
@@ -117,7 +117,7 @@
       },
 
       confirm () {
-        this.$refs.form.validate((valid) => {
+        this.$refs.CBookForm.validate((valid) => {
           if (valid) {
             this.instance.post(`/app/appconvenientaddressbook/addOrUpdate`, {
               ...this.form,
diff --git a/packages/wechat/AppAskForm/components/Add.vue b/packages/wechat/AppAskForm/components/Add.vue
index 06ac7ff4..efd172c5 100644
--- a/packages/wechat/AppAskForm/components/Add.vue
+++ b/packages/wechat/AppAskForm/components/Add.vue
@@ -587,11 +587,7 @@
       },
 
       onheadPictureChange (e) {
-        if (e.length) {
-          this.form.isShowheadPicture = true
-        } else {
-          this.form.isShowheadPicture = false
-        }
+        this.form.isShowheadPicture = !!e.length;
       },
 
       init () {
@@ -757,7 +753,7 @@
 
       onConfirm (status) {
         if (this.params.templateType == 1) {
-          this.submitTemp()
+          // this.submitTemp()
         }
 
         if (this.form.periodValidityType === '1') {