From ac5aa564b192df0d89a419dc0535fd2899aad97b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E5=93=BC=E5=94=A7L?= <xl376837995@163.com>
Date: Thu, 18 Jan 2024 16:37:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9C=81=E5=B8=82=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/medical/inherit.vue        |  15 +-
 src/views/modules/medical/light.vue          |   7 +-
 src/views/modules/user/user-point-memery.vue | 279 +++++++++----------
 3 files changed, 144 insertions(+), 157 deletions(-)

diff --git a/src/views/modules/medical/inherit.vue b/src/views/modules/medical/inherit.vue
index 28fccca..fd67dfe 100644
--- a/src/views/modules/medical/inherit.vue
+++ b/src/views/modules/medical/inherit.vue
@@ -25,7 +25,8 @@
       </el-table-column>
       <el-table-column label="图片" align="center">
         <template slot-scope="scope">
-          <img v-for="item in scope.row.imgList" :src="item.url" alt="" style="width:70px;height:100px;margin: 0 5px;" />
+          <img v-for="item in scope.row.imgList" :src="item.url" alt=""
+            style="width:70px;height:100px;margin: 0 5px;" />
         </template>
       </el-table-column>
       <!-- <el-table-column label="内容" align="center"  prop="content">
@@ -58,8 +59,8 @@
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
     <!-- 弹窗, 新增 / 修改 -->
-    <el-dialog :visible.sync="addOrUpdateVisible" :close-on-click-modal="false" :append-to-body="true" :title="titlesub" width="50%"
-      @close="cancleClose">
+    <el-dialog :visible.sync="addOrUpdateVisible" :close-on-click-modal="false" :append-to-body="true" :title="titlesub"
+      width="50%" @close="cancleClose">
       <el-form :inline="true" :model="addForm" ref="addFormRef" :rules="addFormRule">
         <el-row type="flex" justify="center">
           <el-form-item label="姓名" prop="name">
@@ -243,7 +244,7 @@
         this.cityEntity = []
         console.log('addForm.provinceCode', this.addForm.provId);
         this.$http({
-          url: this.$http.adornUrl(`/api/province/getCityList?provId=${this.addForm.provId}`),
+          url: this.$http.adornUrl(`/book/medicaldes/getCityByPro?provId=${this.addForm.provId}`),
           method: 'post',
         }).then(({
           data
@@ -316,8 +317,8 @@
       },
       getprovinceEntity() {
         this.$http({
-          url: this.$http.adornUrl('/api/province/getProvince'),
-          method: 'get',
+          url: this.$http.adornUrl('/book/medicaldes/getMedicaldesProList'),
+          method: 'post',
         }).then(({
           data
         }) => {
@@ -426,7 +427,7 @@
         for (var i = 0; i < this.provinceEntity.length; i++) {
           for (var j = 0; j < this.provinceEntity[i].cityList.length; j++) {
             if (this.provinceEntity[i].cityList[j].cityId == code) {
-              return this.provinceEntity[i].cityList[j].cityName
+              return this.provinceEntity[i].provName + ' - ' + this.provinceEntity[i].cityList[j].cityName
             }
           }
         }
diff --git a/src/views/modules/medical/light.vue b/src/views/modules/medical/light.vue
index 8d8ee1d..850e605 100644
--- a/src/views/modules/medical/light.vue
+++ b/src/views/modules/medical/light.vue
@@ -77,7 +77,7 @@
           <el-form-item label="资源文件" label-width="100px">
             <el-upload :limit="1" class="el-uploadfeng " ref="files" :action="baseUrl + '/oss/fileoss'"
               :on-preview="handlePictureCardPreview" :file-list="fileList" :on-success="handlePicSuccess"
-              accept=".mp3,.mp4,.gif,.mpeg,.mpg" :on-remove="handleRemove">
+              accept=".mp3,.mp4,.gif,.png,.jpg,.mpeg,.mpg" :on-remove="handleRemove">
               <i class="el-icon-plus"></i>
             </el-upload>
             <!-- <el-dialog :visible.sync="dialogVisible" :append-to-body="true">
@@ -114,7 +114,7 @@
           dictValue: '吴门之歌',
           dictType: '1',
         }, {
-          dictValue: '巴山夜雨',
+          dictValue: '巴山夜语',
           dictType: '2',
         }, {
           dictValue: '吴门之徽',
@@ -338,16 +338,15 @@
       handlePictureCardPreview(file) {
         this.addForm.url = file.url;
         this.dialogVisible = true;
+
       },
       handlePicSuccess(res, file) {
-        // console.log(res,'res')
         if (res.msg == "success") {
           this.addForm.url = res.url;
           this.fileList.push({
             name: file.name,
             url: res.url
           })
-          console.log(this.dataForm.url, 'url')
           this.$message.success("上传成功");
         } else {
           this.$message.error("上传失败");
diff --git a/src/views/modules/user/user-point-memery.vue b/src/views/modules/user/user-point-memery.vue
index 4bf4b18..3330a7c 100644
--- a/src/views/modules/user/user-point-memery.vue
+++ b/src/views/modules/user/user-point-memery.vue
@@ -9,40 +9,16 @@
         <el-button @click="getDataList()">查询</el-button>
       </el-form-item>
     </el-form>    -->
-    <el-table
-      :data="dataList"
-      border
-      v-loading="dataListLoading"     
-      style="width: 100%;">
-      <el-table-column
-        type="selection"
-        header-align="center"
-        align="center"
-        width="50">
+    <el-table :data="dataList" border v-loading="dataListLoading" style="width: 100%;">
+      <el-table-column type="selection" header-align="center" align="center" width="50">
       </el-table-column>
-      <el-table-column
-        prop="createTime"
-        header-align="center"
-        align="center"
-        label="操作时间">
-      </el-table-column>   
-      <el-table-column
-        prop="userName"
-        header-align="center"
-        align="center"
-        label="用户">
+      <el-table-column prop="createTime" header-align="center" align="center" label="操作时间">
       </el-table-column>
-      <el-table-column
-        prop="orderType"
-        header-align="center"
-        align="center"
-        label="充值 支付 赠送优惠券.....">
+      <el-table-column prop="userName" header-align="center" align="center" label="用户">
       </el-table-column>
-      <el-table-column
-        prop="changeAmount"
-        header-align="center"
-        align="center"
-        label="变动金额">
+      <el-table-column prop="orderType" header-align="center" align="center" label="充值 支付 赠送优惠券.....">
+      </el-table-column>
+      <el-table-column prop="changeAmount" header-align="center" align="center" label="变动金额">
         <template slot-scope="scope">
           <span v-if="scope.row.changeAmount > 0" style="color: red;">{{scope.row.changeAmount}}</span>
           <span v-if="scope.row.changeAmount < 0" style="color: #54a966;">{{scope.row.changeAmount}}</span>
@@ -54,61 +30,48 @@
         align="center"
         label="关联id">
       </el-table-column> -->
-      <el-table-column
-        prop="remark"
-        header-align="center"
-        align="center"
-        label="备注">
+      <el-table-column prop="remark" header-align="center" align="center" label="备注">
       </el-table-column>
-      <el-table-column
-        prop="userBalance"
-        header-align="center"
-        align="center"
-        label="余额">
+      <el-table-column prop="userBalance" header-align="center" align="center" label="余额">
       </el-table-column>
-      <el-table-column
-        fixed="right"
-        header-align="center"
-        align="center"
-        width="150"
-        label="操作">
+      <el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row)">明细</el-button>
           <!-- <el-button type="text" size="small" @click="deleteHandle(scope.row.transactionId)">删除</el-button> -->
         </template>
       </el-table-column>
     </el-table>
-  <el-pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" :current-page="pageIndex"
+    <el-pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" :current-page="pageIndex"
       :page-sizes="[10, 20, 50, 100]" :page-size="pageSize" :total="totalPage"
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
-    <el-dialog title="充/扣天医币明细" :close-on-click-modal="false" :visible.sync="memoryDetail" append-to-body width="30%">   
-      <el-form :model="mdetail" label-width="100px"  ref="pointForm">
-        
-<el-form-item label="充/扣主题：">
- <!-- <el-input v-model="pointForm.remark"></el-input> -->
- <span>{{mdetail.remark}}</span>
-</el-form-item>
-<el-form-item label="操作时间：">
- <!-- <el-input v-model="pointForm.remark"></el-input> -->
- <span>{{mdetail.createTime}}</span>
-</el-form-item>
-<el-form-item label="充值类型：">  
-  <el-tag type="danger" v-if="mdetail.changeAmount > 0">充值天医币</el-tag>
-  <el-tag type="success" v-else>扣除天医币</el-tag>
-</el-form-item>
-<el-form-item label="金额：" >
-  <!-- <el-input-number v-model="mdetail.pointAmount" :placeholder="mdetail.peanutCoin+'可用'">
-  </el-input-number>           -->
-  <span>{{mdetail.changeAmount}}</span>
-</el-form-item>
+    <el-dialog title="充/扣天医币明细" :close-on-click-modal="false" :visible.sync="memoryDetail" append-to-body width="30%">
+      <el-form :model="mdetail" label-width="100px" ref="pointForm">
 
-<el-form-item label="充扣明细：">
-  <span>{{mdetail.note}}</span>
-  <!-- <el-input type="textarea" rows="5" v-model="mdetail.note" placeholder="操作说明">
+        <el-form-item label="充/扣主题：">
+          <!-- <el-input v-model="pointForm.remark"></el-input> -->
+          <span>{{mdetail.remark}}</span>
+        </el-form-item>
+        <el-form-item label="操作时间：">
+          <!-- <el-input v-model="pointForm.remark"></el-input> -->
+          <span>{{mdetail.createTime}}</span>
+        </el-form-item>
+        <el-form-item label="充值类型：">
+          <el-tag type="danger" v-if="mdetail.changeAmount > 0">充值天医币</el-tag>
+          <el-tag type="success" v-else>扣除天医币</el-tag>
+        </el-form-item>
+        <el-form-item label="金额：">
+          <!-- <el-input-number v-model="mdetail.pointAmount" :placeholder="mdetail.peanutCoin+'可用'">
+  </el-input-number>           -->
+          <span>{{mdetail.changeAmount}}</span>
+        </el-form-item>
+
+        <el-form-item label="充扣明细：">
+          <span>{{mdetail.note}}</span>
+          <!-- <el-input type="textarea" rows="5" v-model="mdetail.note" placeholder="操作说明">
   </el-input> -->
-</el-form-item>
-</el-form>
+        </el-form-item>
+      </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="closeDia">关 闭</el-button>
         <!-- <el-button type="primary" @click="huaSheng">确 定</el-button> -->
@@ -118,63 +81,64 @@
 </template>
 
 <script>
-import { memoryUsage } from 'process';
+  import {
+    memoryUsage
+  } from 'process';
 
-export default {
-  data() {
-    return {
-      dataForm: {
+  export default {
+    data() {
+      return {
+        dataForm: {
           key: ''
         },
-        memoryDetail:false,
-        headers: [
-      {
-        prop: 'remark',
-        label: '充/扣主题',
-      },
-      {
-        prop: 'createTime',
-        label: '操作时间',
-      },
-      {
-        prop: 'changeAmount',
-        label: '充值类型',
-      },
-      {
-        prop: 'changeAmount',
-        label: '充值类型',
-      },
-    ],
-      query: {
-        id: 0,
-        tel:''
-      },
-      mdetail:{}, // 
-      dataListLoading: false,
-      dataList: [],
+        memoryDetail: false,
+        headers: [{
+            prop: 'remark',
+            label: '充/扣主题',
+          },
+          {
+            prop: 'createTime',
+            label: '操作时间',
+          },
+          {
+            prop: 'changeAmount',
+            label: '充值类型',
+          },
+          {
+            prop: 'changeAmount',
+            label: '充值类型',
+          },
+        ],
+        query: {
+          id: 0,
+          tel: ''
+        },
+        mdetail: {}, //
+        dataListLoading: false,
+        dataList: [],
         pageIndex: 1,
         pageSize: 10,
         totalPage: 0,
-     
-     
-    }
-  },
-  created(){
-     // this.getDataList()
-  },
-  activated() {
-  this.query.id = this.$route.query.id;
-  this.query.tel = this.$route.query.tel;
-  // console.log(this.$route.query.orderId)
-  this.getDataList()
-},  
-  
-  methods: { 
-    closeDia(){
-      this.memoryDetail = false
-      this.mdetail = {}
+
+
+      }
     },
-    huaSheng(){
+    created() {
+      // this.getDataList()
+    },
+    activated() {
+      this.query.id = this.$route.query.id;
+      this.query.tel = this.$route.query.tel;
+      // console.log(this.$route.query.orderId)
+      this.getDataList()
+    },
+
+    methods: {
+      closeDia() {
+        this.memoryDetail = false
+        this.mdetail = {}
+      },
+      huaSheng() {
         this.$http({
           url: this.$http.adornUrl(`/book/user/pointChange?&note=${this.mdetail.note}&id=${this.mdetail.id}`),
           method: 'get',
@@ -189,34 +153,54 @@ export default {
           }
         })
       },
-   // 获取数据列表
-   getDataList() {
+      // 获取数据列表
+      getDataList() {
         this.dataListLoading = true
+
         this.$http({
-          url: this.$http.adornUrl('/book/transactiondetails/list?'),
-          method: 'get',
-          params: this.$http.adornParams({
+          url: this.$http.adornUrl('/book/transactiondetails/getTransactionList'),
+          method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+          data: {
             'page': 1,
             'limit': 200,
-            'key': this.query.tel
-          })
-        }).then(({
-          data
-        }) => {
-          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
-            this.dataListLoading = false
-          }
+            'userId': this.query.id
+          },
+          header: { //默认 无 说明：请求头
+            'Content-Type': 'application/json'
+          },
+        }).then(res => {
+            if (res.data.code === 0) {
+              this.dataList = res.data.page.records
+              this.totalPage = res.data.page.total
+              this.dataListLoading = false
+            }
         })
+
+        // this.$http({
+        //   url: this.$http.adornUrl('/book/transactiondetails/getTransactionList'),
+        //   method: 'post',
+        //   params: this.$http.adornParams({
+        //     'page': 1,
+        //     'limit': 200,
+        //     'userId': this.query.id
+        //   })
+        // }).then(({
+        //   data
+        // }) => {
+        //   if (data && data.code === 0) {
+        //     this.dataList = data.page.list
+        //     this.totalPage = data.page.totalCount
+        //     this.dataListLoading = false
+        //   }
+        // })
       },
       // 新增 / 修改
-      addOrUpdateHandle (row) {
-        this.memoryDetail = true  
+      addOrUpdateHandle(row) {
+        this.memoryDetail = true
         this.mdetail = row
       },
-    // 每页数
-    sizeChangeHandle(val) {
+      // 每页数
+      sizeChangeHandle(val) {
         this.pageSize = val
         this.pageIndex = 1
         this.getDataList()
@@ -226,11 +210,14 @@ export default {
         this.pageIndex = val
         this.getDataList()
       },
- 
+
+    }
+
   }
-  
-}
 </script>
 <style lang="less" scoped>
- /deep/ .el-form-item{margin-bottom: 1px solid #eee; margin-bottom: 10px;}
+  /deep/ .el-form-item {
+    margin-bottom: 1px solid #eee;
+    margin-bottom: 10px;
+  }
 </style>