禅道bug修改

CallCenterWeb.UI/src/views/marketingManagement/fullDecrement/components/addOrEdit.vue

@@ -148,6 +148,8 @@ export default {
         })
       }else{
         this.$message.error('请输入有效的必填项信息')
+        this.reductionAmount=[];
+        this.amountRange=[];
         return 
       }
       
@@ -201,6 +203,8 @@ export default {
          
         } else {
           this.$message.error('请输入有效的必填项信息!')
+          this.reductionAmount=[];
+          this.amountRange=[];
           return false
         }
       })

CallCenterWeb.UI/src/views/memberManagement/memberList/components/addOrEdit.vue

@@ -23,13 +23,13 @@
       <el-form-item label="联系方式" prop="F_Phone">
         <el-input v-model="ruleForm.F_Phone" placeholder="请输入联系方式"></el-input>
       </el-form-item>
-      <el-form-item label="会员类型" prop="F_Type">
-        <el-select v-model="ruleForm.F_Type" clearable placeholder="请选择会员类型" class="form_select">
+      <el-form-item label="会员标签" prop="F_Type">
+        <el-select v-model="ruleForm.F_Type" clearable placeholder="请选择会员标签" class="form_select">
           <el-option
             v-for="item in memberType"
-            :key="item.F_ValueId"
-            :label="item.F_Value"
-            :value="item.F_Value">
+            :key="item.F_ID"
+            :label="item.F_Name"
+            :value="item.F_Name">
           </el-option>
         </el-select>
       </el-form-item>
@@ -93,7 +93,7 @@ import {
   getMemberInfo,
   addOrder,
   editOrder,
-  getMemberType
+  getLabelLists
 } from "@/api/memberManagement/memberList";
 import { validateTel } from "@/utils/validate";
 import { filterContent,pickerOptions } from "@/utils";
@@ -314,13 +314,11 @@ export default {
       return new Promise(resolve=>{
         const params={
           pageindex:1,
-          pagesize:10,
-          isleaf:true,
-          code:'HYLX',
+          pagesize:100,
         }
-        getMemberType(params).then(response => {
+        getLabelLists(params).then(response => {
           if (response.state.toLowerCase() === 'success') {
-            this.memberType= response.data.Rows
+            this.memberType= response.rows.Rows
           }
         })
       })

CallCenterWeb.UI/src/views/memberManagement/memberList/index.vue

@@ -9,7 +9,7 @@
       <el-table-column prop="F_Mobile" label="手机号码1" align="center"  width=""></el-table-column>
       <el-table-column prop="F_Mobile1" label="手机号码2" align="center"  width=""></el-table-column>
       <el-table-column prop="F_Phone" label="联系方式" align="center"  width="100px"></el-table-column>
-      <el-table-column prop="F_Label" label="会员类型" align="center"  width=""></el-table-column>
+      <el-table-column prop="F_Label" label="会员标签" align="center"  width=""></el-table-column>
       <el-table-column label="详细地址" align="center"  width="100px">
         <template slot-scope="scoped">
           <span v-show="scoped.row.F_Province==null?false:true">{{scoped.row.F_Province}}</span>