积分明细

project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue

@@ -81,9 +81,9 @@
         </el-form>
       </ai-dialog>
     </template>
-    <template #footer>
+    <template #footer v-if="info.auditStatus === '0'">
       <el-button @click="cancel">取消</el-button>
-      <el-button type="primary" @click="isShow = true" v-if="info.auditStatus === '0'">审核</el-button>
+      <el-button type="primary" @click="isShow = true">审核</el-button>
     </template>
   </ai-detail>
 </template>
@@ -121,7 +121,7 @@ export default {
         opinion: '',
         pass: ''
       },
-      ruleList: []
+      ruleList: [],
     }
   },
 
@@ -138,10 +138,16 @@ export default {
   },
 
   created() {
+    let loading = this.$loading({
+      text: 'Loading',
+    });
     if (this.params && this.params.id) {
       this.id = this.params.id
       this.dict.load(['atWillReportType', 'auditStatus']).then(() => {
         this.getInfo(this.params.id)
+        this.$nextTick(() => {
+          loading.close()
+        })
       })
     }
   },

project/sanjianxi/apps/AppPartyScore/psDetail.vue

@@ -11,6 +11,12 @@
             </template>
           </ai-card>
           <ai-card hideTitle class="staCard fill">
+            <template slot="content">
+              <div class="color-999" v-text="`党员积分`"/>
+              <b class="color-26f" v-text="detail.integral||0"/>
+            </template>
+          </ai-card>
+          <!-- <ai-card hideTitle class="staCard fill">
             <template #content>
               <div class="color-999" v-text="`学习强国`"/>
               <el-button type="text" @click="handleEditLearningIntergral(detail.id)">编辑</el-button>
@@ -28,7 +34,7 @@
               <div class="color-999" v-text="`家庭积分`"/>
               <b class="color-26f" v-text="detail.familySurplusIntegral||0"/>
             </template>
-          </ai-card>
+          </ai-card> -->
         </el-row>
         <ai-card title="余额变动明细">
           <template #content>
@@ -127,8 +133,9 @@ export default {
     color: #26f;
   }
 
-  ::v-deep.staCard {
+  ::v-deep .staCard {
     font-size: 14px;
+    width: 25%;
 
     b {
       font-size: 24px;
@@ -137,6 +144,7 @@ export default {
 
     & + .staCard {
       margin-left: 16px;
+      width: 25%;
     }
 
     .ai-card__body {

project/sanjianxi/apps/AppPartyScoreFlow/psfList.vue

@@ -13,6 +13,9 @@
           <template #right>
             <el-input size="small" placeholder="搜索党员" v-model="search.partyName" clearable
                       @change="page.current=1,getTableData()" suffix-icon="iconfont iconSearch"/>
+            <ai-import :instance="instance" :dict="dict" importUrl="/appcollectiveeconomyequity/import" url="/appcollectiveeconomyequity/downloadTemplate" name="集体经济组织股权管理信息" @success="getTableData(), $message.success('导入成功!')">
+              <el-button size="small">导入</el-button>
+            </ai-import>
           </template>
         </ai-search-bar>
         <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"