From 79539038b794725dbe62fb22ede975b1695edf3e Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 28 Dec 2022 09:56:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=AB=E9=83=BD=E7=A7=AF=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/router/axios.js                      |  2 +
 .../components/ApplyList.vue                  | 68 ++++++++++++-------
 .../AppPointsDetails/AppPointsDetails.vue     |  6 +-
 vue.config.js                                 |  8 +++
 4 files changed, 58 insertions(+), 26 deletions(-)

diff --git a/examples/router/axios.js b/examples/router/axios.js
index 39162cdd..6d780491 100644
--- a/examples/router/axios.js
+++ b/examples/router/axios.js
@@ -15,6 +15,8 @@ instance.interceptors.request.use(config => {
     config.baseURL = "/saas"
   } else if (/\/tianfuxing/.test(location.pathname)) {
     config.baseURL = "/tfx"
+  } else if (/\/qianxinan/.test(location.pathname)) {
+    config.baseURL = "/qxn"
   } else if (/\/xiushan/.test(location.pathname)) {
     config.baseURL = "/xsjr"
   } else if (/project\/oms/.test(location.pathname)) {
diff --git a/project/pidu/app/AppGridMemberScore/components/ApplyList.vue b/project/pidu/app/AppGridMemberScore/components/ApplyList.vue
index 64255ac1..470d23d2 100644
--- a/project/pidu/app/AppGridMemberScore/components/ApplyList.vue
+++ b/project/pidu/app/AppGridMemberScore/components/ApplyList.vue
@@ -46,11 +46,27 @@
         <el-table-column slot="options" width="120px" fixed="right" label="操作" align="center">
           <template slot-scope="{ row }">
             <div class="table-options">
-              <el-button type="text" @click="operation(row.id)" v-if="row.status === '0'">审核</el-button>
+              <el-button type="text" @click="operation(row)" v-if="row.status === '0'">审核</el-button>
             </div>
           </template>
         </el-table-column>
       </ai-table>
+      <ai-dialog :customFooter="true"
+        title="积分审核"
+        :visible.sync="dialog"
+        :destroyOnClose="true"
+        width="720px">
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+          <el-form-item label="积分" prop="applyIntegral">
+            <el-input v-model.trim="form.applyIntegral" placeholder="请输入正数" size="small"></el-input>
+          </el-form-item>
+        </el-form>
+        <p style="padding-left:80px;font-weight:700;">请根据申请事项和凭证选是否审核通过</p>
+        <div class="dialog-footer" slot="footer">
+          <el-button @click="onCancel" size="medium">审核拒绝</el-button>
+          <el-button @click="onConfirm" type="primary" size="medium">审核通过</el-button>
+        </div>
+      </ai-dialog>
     </template>
   </ai-list>
 </template>
@@ -91,7 +107,13 @@
           }
         ],
         tableData: [],
-        total: 0
+        total: 0,
+        form: {applyIntegral: '', id: ''},
+        rules: {
+          applyIntegral: [{required: true, message: '请输入积分', trigger: 'blur' },
+          {pattern: /^([1-9]\d*|0)(\.\d{1,2})?$/, message: '请输入正数且最多只能保留两位小数'}],
+        },
+        dialog: false,
       }
     },
 
@@ -115,29 +137,29 @@
         })
       },
 
-      operation (id) {
-        this.$confirm('请根据申请事项和凭证选是否审核通过', {
-          confirmButtonText: '审核通过',
-          cancelButtonText: '审核拒绝',
-          distinguishCancelAndClose: true
-        }).then(() => {
-          this.instance.post(`/app/appintegralmemberapply/auditApply?id=${id}&opType=1`).then(res => {
-            if (res.code == 0) {
-              this.$message.success('审核通过成功')
-              this.getList()
-            }
-          })
-        }).catch(action => {
-          if (action === 'cancel') {
-            this.instance.post(`/app/appintegralmemberapply/auditApply?id=${id}&opType=2`).then(res => {
-              if (res.code == 0) {
-                this.$message.success('审核拒绝成功')
-                this.getList()
-              }
-            })
+      operation (row) {
+        this.dialog = true
+        this.form = {...row}
+      },
+
+      onConfirm() {
+        this.instance.post(`/app/appintegralmemberapply/auditApply?id=${this.form.id}&opType=1&applyIntegral=${this.form.applyIntegral}`).then(res => {
+          if (res.code == 0) {
+            this.$message.success('审核通过成功')
+            this.dialog = false
+            this.getList()
           }
         })
-      }
+      },
+      onCancel() {
+        this.instance.post(`/app/appintegralmemberapply/auditApply?id=${this.form.id}&opType=2&applyIntegral=${this.form.applyIntegral}`).then(res => {
+          if (res.code == 0) {
+            this.$message.success('审核拒绝成功')
+            this.dialog = false
+            this.getList()
+          }
+        })
+      } 
     }
   }
 </script>
diff --git a/project/qianxinan/AppPointsDetails/AppPointsDetails.vue b/project/qianxinan/AppPointsDetails/AppPointsDetails.vue
index bf585ec1..9d6d6d96 100644
--- a/project/qianxinan/AppPointsDetails/AppPointsDetails.vue
+++ b/project/qianxinan/AppPointsDetails/AppPointsDetails.vue
@@ -9,10 +9,10 @@
               :props="defaultProps" :show-all-levels="false" @change="gridChange"></el-cascader>
           </template>
           <template #right>
-            <ai-import :instance="instance" :dict="dict" type="appintegraluser" name="积分管理"
+            <!-- <ai-import :instance="instance" :dict="dict" type="appintegraluser" name="积分管理"
                       @success="getTableData()">
               <el-button icon="iconfont iconImport">导入</el-button>
-            </ai-import>
+            </ai-import> -->
             <ai-download :instance="instance" url="/app/appintegraluser/girdIntegralExport" :params="search" :fileName="menuName"
                          :disabled="tableData.length == 0">
             </ai-download>
@@ -129,7 +129,7 @@ export default {
         { prop: "girdName", label: '所属网格' },
         { prop: "integral", label: '积分余额', align: "center", sortable: "custom" },
         { prop: "totalIntegral", label: '累计积分', align: "center", sortable: "custom" },
-        { prop: "usedIntegral", label: '已用积分', align: "center", sortable: "custom"  },
+        // { prop: "usedIntegral", label: '已用积分', align: "center", sortable: "custom"  },
         { slot: "options" },
       ]
     },
diff --git a/vue.config.js b/vue.config.js
index fed6a8c0..babd81cf 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -127,6 +127,14 @@ module.exports = {
           //地址重写
           '^/tfx': '/'
         }
+      },
+      '/qxn': {
+        target: 'http://192.168.1.87:12000',
+        changeOrigin: true,
+        pathRewrite: {
+          //地址重写
+          '^/qxn': '/'
+        }
       }
     },
     disableHostCheck: true