兑付修改

src/api/serviceManagement/servicesToBeReviewed/index.js

@@ -3,7 +3,7 @@ import request from '@/router/axios';
 // 获取数据
 export function getTaskV2PageApi(query) {
   return request({
-    url: ' /admin/task/v2/page',
+    url: '/admin/task/v2/page',
     method: 'get',
     params: query
   });
@@ -12,7 +12,7 @@ export function getTaskV2PageApi(query) {
 // 获取任务数据
 export function getTaskTypeAvailApi(query) {
   return request({
-    url: ' /admin/task/type/v2/avail',
+    url: '/admin/task/type/v2/avail',
     method: 'get',
     params: query
   });
@@ -21,7 +21,7 @@ export function getTaskTypeAvailApi(query) {
 // 获取生产企业
 export function getDeptv2Avail(query) {
   return request({
-    url: ' /admin/dept/v2/avail',
+    url: '/admin/dept/v2/avail',
     method: 'get',
     params: query
   });
@@ -30,7 +30,7 @@ export function getDeptv2Avail(query) {
 // 获取代表名称
 export function getUserV2Avail(query) {
   return request({
-    url: ' /admin/user/v2/avail',
+    url: '/admin/user/v2/avail',
     method: 'get',
     params: query
   });
@@ -38,7 +38,7 @@ export function getUserV2Avail(query) {
 // 管理产品名称
 export function getDrug2Avail(query) {
   return request({
-    url: ' /admin/drug/v2/avail',
+    url: '/admin/drug/v2/avail',
     method: 'get',
     params: query
   });
@@ -46,7 +46,7 @@ export function getDrug2Avail(query) {
 
 export function getTaskV2TokenApi(data) {
   return request({
-    url: ' /admin/task/v2/token',
+    url: '/admin/task/v2/token',
     method: 'post',
     data: data
   });
@@ -55,7 +55,7 @@ export function getTaskV2TokenApi(data) {
 // 单条审核
 export function checkSingleApi(data) {
   return request({
-    url: ' /admin/task/v2/check/single',
+    url: '/admin/task/v2/check/single',
     method: 'post',
     data: data
   });
@@ -64,7 +64,7 @@ export function checkSingleApi(data) {
 // 批量审核
 export function taskV2CheckBatchApi(data) {
   return request({
-    url: ' /admin/task/v2/check/batch',
+    url: '/admin/task/v2/check/batch',
     method: 'post',
     data: data
   });
@@ -73,7 +73,7 @@ export function taskV2CheckBatchApi(data) {
 // 获取积分包
 export function getPkgV2Api() {
   return request({
-    url: ' /admin/pkg/avail',
+    url: '/admin/pkg/avail',
     method: 'get'
   });
 }
@@ -82,7 +82,7 @@ export function getPkgV2Api() {
 
 export function getTaskV2PageTileApi(params) {
   return request({
-    url: ' /admin/task/v2/page/tile',
+    url: '/admin/task/v2/page/tile',
     method: 'get',
     params: params
   });
@@ -90,7 +90,7 @@ export function getTaskV2PageTileApi(params) {
 
 export function getTaskV2PageCheckedApi(params) {
   return request({
-    url: ' /admin/task/v2/page/checked',
+    url: '/admin/task/v2/page/checked',
     method: 'get',
     params: params
   });
@@ -99,7 +99,7 @@ export function getTaskV2PageCheckedApi(params) {
 // 获取任务审核记录
 export function getTaskV2CheckHisApi(params) {
   return request({
-    url: ' /admin/task/v2/check/his',
+    url: '/admin/task/v2/check/his',
     method: 'get',
     params: params
   });
@@ -108,7 +108,7 @@ export function getTaskV2CheckHisApi(params) {
 // 获取任务审核记录
 export function getPretreatmentApi(data) {
   return request({
-    url: ' /admin/task/v2/check/pretreatment',
+    url: '/admin/task/v2/check/pretreatment',
     method: 'post',
     data: data
   });
@@ -116,7 +116,7 @@ export function getPretreatmentApi(data) {
 
 export function pretreatmentClearApi(data) {
   return request({
-    url: ' /admin/task/v2/check/pretreatment/clear',
+    url: '/admin/task/v2/check/pretreatment/clear',
     method: 'post',
     data: data
   });
@@ -124,7 +124,7 @@ export function pretreatmentClearApi(data) {
 
 export function pkgCheckExportApi(data) {
   return request({
-    url: ' /admin/pkg/check/export',
+    url: '/admin/pkg/check/export',
     method: 'get',
     params: data,
     responseType: 'arraybuffer'

src/views/paymentVoucherNotification/distributeVoucher/components/createDialig.vue

@@ -24,15 +24,30 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="本次兑付分值" prop="currentRedemptionScore">
+              <el-form-item label="可兑付分值" prop="availRdpScore">
                 <div class="percent-number">
-                  <el-input-number v-model="form.currentRedemptionScore" :disabled="!form.packageId" class="w100" :controls="false" :min="0" @blur="currentRedemptionScoreChange">
-                  </el-input-number>
+                  <el-input-number v-model="form.availRdpScore" disabled class="w100" :controls="false" :min="0"> </el-input-number>
                 </div>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="本次兑付分值" prop="currentRedemptionScore">
+                <div class="percent-number">
+                  <el-input-number
+                    v-model="form.currentRedemptionScore"
+                    :disabled="!form.packageId"
+                    class="w100"
+                    :controls="false"
+                    :min="0"
+                    :max="form.availRdpScore"
+                    @blur="currentRedemptionScoreChange"
+                  >
+                  </el-input-number>
+                </div>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="本次兑付比例" prop="currentRedemptionRate">
                 <div class="percent-number">
@@ -142,10 +157,10 @@ import {
   redemptionPkgListApi,
   redemptionoticeCheckApi
 } from '@/api/distributeVoucher.js';
-import {mapGetters} from 'vuex';
+import { mapGetters } from 'vuex';
 import Table1 from './table/table1.vue';
 export default {
-  components: {Table1},
+  components: { Table1 },
   data() {
     return {
       dialogVisible: false,
@@ -163,8 +178,8 @@ export default {
         currentRedemptionRate: ''
       },
       rules: {
-        currentRedemptionScore: [{required: true, message: '请输入本次兑换分值', trigger: 'blur'}],
-        currentRedemptionRate: [{required: true, message: '请输入本次兑换分值', trigger: 'blur'}]
+        currentRedemptionScore: [{ required: true, message: '请输入本次兑换分值', trigger: 'blur' }],
+        currentRedemptionRate: [{ required: true, message: '请输入本次兑换分值', trigger: 'blur' }]
       },
       confirmForm: {
         remarks: ''
@@ -175,10 +190,10 @@ export default {
         checkResult: ''
       },
       reviewFormRules: {
-        checkResult: [{required: true, message: '请选择审核意见', trigger: 'change'}]
+        checkResult: [{ required: true, message: '请选择审核意见', trigger: 'change' }]
       },
       confirmFormRules: {
-        remarks: [{required: true, message: '请输入备注', trigger: 'blur'}]
+        remarks: [{ required: true, message: '请输入备注', trigger: 'blur' }]
       },
       detailInfo: {},
       totalPercentageNums: 0
@@ -193,8 +208,6 @@ export default {
       this.totalPercentageNums = nums;
       if (this.form.currentRedemptionScore) {
         const total = (this.form.currentRedemptionScore * nums) / 1000000;
-        console.log('total', total);
-
         this.form.totalAmount = total;
       }
     },
@@ -252,6 +265,7 @@ export default {
         this.detailInfo = res.data.data;
         this.form.pkgName = res.data.data.pkgName;
         this.form.pkgScore = res.data.data.pkgScore;
+        this.form.availRdpScore = res.data.data.availRdpScore > 0 ? res.data.data.availRdpScore : 0;
         this.$refs.table1.initInfo(this.detailInfo);
       }
     },
@@ -268,7 +282,7 @@ export default {
         totalAmount: this.form.totalAmount,
         currentRedemptionTotal: items[0].totalPercentage
       };
-      this.$refs.ruleFormRef.validate(async valid => {
+      this.$refs.ruleFormRef.validate(async (valid) => {
         if (valid) {
           const res = await redemptionNoticeCreate(obj);
           if (res.data.code === 0) {
@@ -282,12 +296,12 @@ export default {
     async redemptionNoticeRead(id) {
       redemptionNoticeReadApi({
         noticeId: id
-      }).then(res => {
+      }).then((res) => {
         console.log('res', res);
       });
     },
     confirmFn(type) {
-      this.$refs.confirmFormRef.validate(async valid => {
+      this.$refs.confirmFormRef.validate(async (valid) => {
         if (valid) {
           const obj = {
             noticeId: this.detailInfo.noticeId,
@@ -303,7 +317,7 @@ export default {
       });
     },
     checkFn() {
-      this.$refs.reviewFormRef.validate(async valid => {
+      this.$refs.reviewFormRef.validate(async (valid) => {
         if (valid) {
           let obj = this.reviewForm;
           obj.redemptionNoticeId = this.currentRow.noticeId;

src/views/serviceManagement/serviceReviewed/index.vue

@@ -344,9 +344,10 @@ export default {
     },
     mahNameChange(e) {
       if (e) {
+        console.log('e', e);
+
         const curr = this.drugListArr[e];
         this.currDrugList = curr;
-
         this.drugDisabled = false;
       } else {
         this.searchFrom.skuId = '';

src/views/serviceManagement/servicesToBeReviewed/index.vue

@@ -380,7 +380,7 @@ export default {
       default:
         nodeId = 1;
     }
-    console.log('nodeId', nodeId);
+
 
     const lastYear = dayjs().subtract(1, 'year').format('YYYY');
 
@@ -668,7 +668,7 @@ export default {
           this.loading = false;
         } catch (err) {
           this.loading = false;
-          console.log('err', err);
+          q
         }
       }