From 7bcbe67c861f487b151b28c668300cca78fa5591 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 21 Jun 2022 10:48:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityParty/members/points.vue | 67 +++++++++++++++---
 .../communityService/measure/points.vue       | 68 ++++++++++++++++---
 2 files changed, 114 insertions(+), 21 deletions(-)

diff --git a/src/views/modules/communityParty/members/points.vue b/src/views/modules/communityParty/members/points.vue
index 78281bed..9d08c548 100644
--- a/src/views/modules/communityParty/members/points.vue
+++ b/src/views/modules/communityParty/members/points.vue
@@ -56,10 +56,10 @@
     </el-card>
     <el-card class="resi-card-table">
       
-      <div class="resi-row-btn">
+      <!-- <div class="resi-row-btn">
         <el-button class="diy-button--add" size="small" @click="handleAdd">批量审核</el-button>
         
-      </div>
+      </div> -->
       
       <el-table
         :data="tableData"
@@ -71,8 +71,8 @@
         class="resi-table"
         @select="handleSelection"
       >
-        <el-table-column type="selection" align="center" width="50">
-        </el-table-column>
+        <!-- <el-table-column type="selection" align="center" width="50">
+        </el-table-column> -->
         <el-table-column label="序号" type="index" align="center" width="50">
         </el-table-column>
         <el-table-column
@@ -172,10 +172,32 @@
       </div>
     </el-card>
     <el-dialog title="审核信息" :visible.sync="dialogFormVisible">
+      <template v-if="!isBatch">
+        <div class="d-title">{{ detailInfo.title }}</div>
+        <div class="d-desc">{{ detailInfo.statement }}</div>
+        <div class="input-width1" style="display: flex;">
+          <el-image
+            v-for="item in detailInfo.annexList" 
+            :key="item"
+            style="width: 100px; height: 100px; margin-right: 10px;"
+            :src="item" 
+            :preview-src-list="detailInfo.annexList">
+          </el-image>
+        </div>
+        <div class="d-tips">申请人：{{ detailInfo.showName }}</div>
+        <div class="d-tips">申请时间：{{ detailInfo.createdTime }}</div>
+        <el-divider></el-divider>
+      </template>
+      <div class=""></div>
       <el-form :model="form">
-        
+        <el-form-item label="申请类别:" :label-width="'100px'">
+          <span>{{ detailInfo.ruleName }}</span>
+        </el-form-item>
+        <el-form-item label="申请积分:" :label-width="'100px'">
+          <span>{{ detailInfo.pointValue }}</span>
+        </el-form-item>
         <el-form-item label="审核状态" prop="status" :label-width="'100px'">
-          <el-select v-model="form.status" placeholder="请选择" class="input-width">
+          <el-select v-model="form.status" placeholder="请选择" :disabled="disabled" class="input-width">
             <el-option
                 v-for="item in zwLists"
                 :key="item.value"
@@ -185,13 +207,13 @@
           </el-select>
         </el-form-item>
         <el-form-item label="备注" prop="remark" :label-width="'100px'">
-          <el-input v-model="form.remark" autocomplete="off" class="input-width"></el-input>
+          <el-input v-model="form.remark" type="textarea" :disabled="disabled" autocomplete="off" class="input-width"></el-input>
         </el-form-item>
         
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="handlerCancle">取 消</el-button>
-        <el-button type="primary" @click="handleSubmit">确 定</el-button>
+        <el-button v-if="!disabled" type="primary" @click="handleSubmit">确 定</el-button>
       </div>
     </el-dialog>
     <el-dialog title="详情" :visible.sync="dialogVisible" width="800px">
@@ -263,10 +285,11 @@ export default {
   data() {
     return {
       dialogVisible: false,
-      dialogFormVisible: false,
+      dialogFormVisible: true,
       tableLoading: false,
       disabled: false,
       pageLoading: false,
+      isBatch: false,
       currentPage: 1,
       pageSize: 20,
       total: null,
@@ -426,11 +449,15 @@ export default {
     },
     async handleLook(row) {
       this.disabled = true
+      this.isBatch = false
       await this.getDetail(row.id)
+      this.dialogFormVisible = true
     },
     async handleEdit(row, addType) {
       this.form.ids = [row.id]
-      // await this.getDetail(row.id)
+      this.isBatch = false
+      // this.detailInfo = { ...row }
+      await this.getDetail(row.id)
       this.dialogFormVisible = true
     },
     
@@ -486,7 +513,10 @@ export default {
             return this.$message.error(res.msg)
           } else {
             this.detailInfo = { ...res.data }
-            this.dialogVisible = true
+            if (this.disabled) {
+              this.form.status = res.data.status
+              this.form.remark = res.data.remark
+            }
           }
         })
         .catch((err) => {
@@ -610,6 +640,21 @@ export default {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+
+.d-title {
+  text-align: center;
+  font-size: 18px;
+}
+.d-desc {
+  margin: 10px 0;
+  // font-size: ;
+  text-indent: 2em;
+  line-height: 16px;
+}
+.d-tips {
+  color: #999;
+  margin-top: 10px;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/modules/communityService/measure/points.vue b/src/views/modules/communityService/measure/points.vue
index 877db1cf..eba344f2 100644
--- a/src/views/modules/communityService/measure/points.vue
+++ b/src/views/modules/communityService/measure/points.vue
@@ -56,10 +56,10 @@
     </el-card>
     <el-card class="resi-card-table">
       
-      <div class="resi-row-btn">
+      <!-- <div class="resi-row-btn">
         <el-button class="diy-button--add" size="small" @click="handleAdd">批量审核</el-button>
         
-      </div>
+      </div> -->
       
       <el-table
         :data="tableData"
@@ -71,8 +71,8 @@
         class="resi-table"
         @select="handleSelection"
       >
-        <el-table-column type="selection" align="center" width="50">
-        </el-table-column>
+        <!-- <el-table-column type="selection" align="center" width="50">
+        </el-table-column> -->
         <el-table-column label="序号" type="index" align="center" width="50">
         </el-table-column>
         <el-table-column
@@ -172,10 +172,32 @@
       </div>
     </el-card>
     <el-dialog title="审核信息" :visible.sync="dialogFormVisible">
+      <template v-if="!isBatch">
+        <div class="d-title">{{ detailInfo.title }}</div>
+        <div class="d-desc">{{ detailInfo.statement }}</div>
+        <div class="input-width1" style="display: flex;">
+          <el-image
+            v-for="item in detailInfo.annexList" 
+            :key="item"
+            style="width: 100px; height: 100px; margin-right: 10px;"
+            :src="item" 
+            :preview-src-list="detailInfo.annexList">
+          </el-image>
+        </div>
+        <div class="d-tips">申请人：{{ detailInfo.showName }}</div>
+        <div class="d-tips">申请时间：{{ detailInfo.createdTime }}</div>
+        <el-divider></el-divider>
+      </template>
+      <div class=""></div>
       <el-form :model="form">
-        
+        <el-form-item label="申请类别:" :label-width="'100px'">
+          <span>{{ detailInfo.ruleName }}</span>
+        </el-form-item>
+        <el-form-item label="申请积分:" :label-width="'100px'">
+          <span>{{ detailInfo.pointValue }}</span>
+        </el-form-item>
         <el-form-item label="审核状态" prop="status" :label-width="'100px'">
-          <el-select v-model="form.status" placeholder="请选择" class="input-width">
+          <el-select v-model="form.status" placeholder="请选择" :disabled="disabled" class="input-width">
             <el-option
                 v-for="item in zwLists"
                 :key="item.value"
@@ -185,13 +207,13 @@
           </el-select>
         </el-form-item>
         <el-form-item label="备注" prop="remark" :label-width="'100px'">
-          <el-input v-model="form.remark" autocomplete="off" class="input-width"></el-input>
+          <el-input v-model="form.remark" type="textarea" :disabled="disabled" autocomplete="off" class="input-width"></el-input>
         </el-form-item>
         
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="handlerCancle">取 消</el-button>
-        <el-button type="primary" @click="handleSubmit">确 定</el-button>
+        <el-button v-if="!disabled" type="primary" @click="handleSubmit">确 定</el-button>
       </div>
     </el-dialog>
     <el-dialog title="详情" :visible.sync="dialogVisible" width="800px">
@@ -303,6 +325,7 @@ export default {
       partyOrgRange: [],
       timeRange: [],
       customerId: '',
+      isBatch: false,
       searchForm: {
         // partyOrgId: '',
         mobile: '',
@@ -408,6 +431,7 @@ export default {
     },
     handleAdd() {
       if (this.selectionList.length == 0) return this.$message.warning('请选择数据')
+      this.isBatch = true
       this.dialogFormVisible = true
     },
 
@@ -416,6 +440,7 @@ export default {
       this.selectionList = []
       this.tempList = []
       this.disabled = false
+      this.isBatch = false
       this.form = {
         ids: [],
         status: '2',
@@ -426,11 +451,15 @@ export default {
     },
     async handleLook(row) {
       this.disabled = true
+      this.isBatch = false
       await this.getDetail(row.id)
+      this.dialogFormVisible = true
     },
     async handleEdit(row, addType) {
       this.form.ids = [row.id]
-      // await this.getDetail(row.id)
+      this.isBatch = false
+      // this.detailInfo = { ...row }
+      await this.getDetail(row.id)
       this.dialogFormVisible = true
     },
     
@@ -486,7 +515,12 @@ export default {
             return this.$message.error(res.msg)
           } else {
             this.detailInfo = { ...res.data }
-            this.dialogVisible = true
+            if (this.disabled) {
+              this.form.status = res.data.status
+              this.form.remark = res.data.remark
+            }
+            
+            // this.dialogVisible = true
           }
         })
         .catch((err) => {
@@ -610,6 +644,20 @@ export default {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+.d-title {
+  text-align: center;
+  font-size: 18px;
+}
+.d-desc {
+  margin: 10px 0;
+  // font-size: ;
+  text-indent: 2em;
+  line-height: 16px;
+}
+.d-tips {
+  color: #999;
+  margin-top: 10px;
+}
 </style>
 
 <style lang="scss" scoped>