Browse Source

1. 修复

MONSTER-ygh 11 months ago
parent
commit
5419f96b85

+ 1 - 1
src/api/system/role.js

@@ -45,7 +45,7 @@ export function dataScope(data) {
 }
 
 // 角色状态修改
-export function changeRoleStatus(roleId, status) {
+export function changeRoleStatus(id, status) {
   const data = {
     id,
     status

+ 4 - 4
src/views/tourism/financialManagement/detailsBox/ticketRefundOrderDetails.vue

@@ -86,11 +86,11 @@
               <span style="display: block;min-width: 250px;">{{ form.refundSuccessTime }}</span>
             </el-form-item>
           </div>
-          <!-- <div style="display: flex;">
-            <el-form-item label="备注:">
-              <span style="display: block;min-width: 250px;">{{ form.remark }}</span>
+          <div style="display: flex;" v-if="form.errReason && model!='DEATILSADD'">
+            <el-form-item label="驳回原因:">
+              <span style="display: block;min-width: 250px;">{{ form.errReason }}</span>
             </el-form-item>
-          </div> -->
+          </div>
           <div v-if="model=='DEATILSADD'">
             <div class="form-title"><span>审核操作</span></div>
               <div>

+ 5 - 5
src/views/tourism/productManagement/formBox/scenicAreaTicketsForm.vue

@@ -23,7 +23,7 @@
           <el-form-item label="门票名称:" prop="name">
             <el-input style="width: 350px;" v-model="form.name" placeholder="请输入门票名称" maxlength="50" show-word-limit />
           </el-form-item>
-          <el-form-item label="详情图片:" prop="showlmg">
+          <el-form-item label="详情图片:" prop="showImg">
 
             <div
             style="width: 120px;"
@@ -46,7 +46,7 @@
                 :disabled="actionUrlLoading"
                 :on-error="handleAvatarError"
                 >
-                <img v-if="form.showlmg" style="width: 100px;height: 100px;" :src="form.showlmg" class="avatar">
+                <img v-if="form.showImg" style="width: 100px;height: 100px;" :src="form.showImg" class="avatar">
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
             </div>
@@ -117,7 +117,7 @@ export default {
       },
       rules: {
         name: [{ required: true, message: "请输入门票名称", trigger: ["change","blur"] }],
-        showlmg: [{ required: true, message: "请上传图片", trigger: ["change","blur"] }],
+        showImg: [{ required: true, message: "请上传图片", trigger: ["change","blur"] }],
         performSnapshot: [{ required: true, message: "请输产品介绍", trigger: ["change","blur"] }],
         performNotice: [{ required: true, message: "请输购票须知", trigger: ["change","blur"] }],
       },
@@ -246,9 +246,9 @@ export default {
       console.log("res, file",res, file)
       this.actionUrlLoading = false
       if(res.code != 200) {
-        this.$set(this.form,'showlmg',null) 
+        this.$set(this.form,'showImg',null) 
       }else {
-        this.$set(this.form,'showlmg',res.data.url) 
+        this.$set(this.form,'showImg',res.data.url) 
       }
       
     },

+ 13 - 9
src/views/tourism/productManagement/formBox/scenicAreaTicketsSpecsForm.vue

@@ -421,10 +421,17 @@ export default {
         if(res.code == 200) {
           let obj = {
             ...res.data,
-            useExpireDate: res.data.useExpireDate?res.data.useExpireDate.type:'1',
-            backStatusRadio: res.data.goodsPerformRefundRule?'-2':'-1',
+            // useExpireDate: res.data.useExpireDate?res.data.useExpireDate.type:'1',
+            // backStatusRadio: res.data.goodsPerformRefundRule?'-2':'-1',
           }
-          if(res.data.dayType){
+          if(res.data.goodsPerformRefundRule && res.data.goodsPerformRefundRule != 0) {
+            obj['backStatusRadio'] = '-2'
+            obj['backStatusDay'] = res.data.goodsPerformRefundRule.days
+            obj['backStatusTime'] = res.data.goodsPerformRefundRule.hour
+          }else {
+            obj['backStatusRadio'] = '-1'
+          }
+          if(res.data.dayType && res.data.dayType != 0){
             obj['dayTypeRadio'] = '-2'
             obj['dayType'] = res.data.dayType.split('~')
           }else {
@@ -446,10 +453,7 @@ export default {
             }
             
           }
-          if(res.data.goodsPerformRefundRule) {
-            obj['backStatusDay'] = res.data.goodsPerformRefundRule.days
-            obj['backStatusTime'] = res.data.goodsPerformRefundRule.hour
-          }
+          
           if( !res.data.goodsPerformSpecial ) {
             obj['ageRadio'] = "-1"
           }
@@ -544,7 +548,7 @@ export default {
       let params = JSON.parse(JSON.stringify(this.form))
 
       if(params.dayTypeRadio == -1) { // 日期类型
-        params.dayType = null
+        params.dayType = 0
       }else {
         params.dayType = params.dayType?params.dayType.join('~'):null
       }
@@ -552,7 +556,7 @@ export default {
       if(params.useExpireDateRadio == 1) { // 消费日期
         params['useExpireDate'] = JSON.stringify({
           type: 1,
-          value: null
+          value: ''
         })
       }else if(params.useExpireDateRadio == 2) {
         params['useExpireDate'] = JSON.stringify({