禅道bug修改

CallCenterWeb.UI/src/views/customerServiceManagement/orderListCustomerService/index.vue

@@ -37,7 +37,7 @@
     <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick" >
       <el-tab-pane label="全部" name="-2"></el-tab-pane>
       <el-tab-pane label="无效" name="-1"></el-tab-pane>
-      <el-tab-pane label="暂存" name="0"></el-tab-pane>
+      <!-- <el-tab-pane label="暂存" name="0"></el-tab-pane> -->
       <el-tab-pane label="提交" name="1"></el-tab-pane>
       <el-tab-pane label="退回" name="2"></el-tab-pane>
       <!-- <el-tab-pane label="通过" name="3"></el-tab-pane>
@@ -78,8 +78,8 @@
       <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
         <template slot-scope="scope">
           <el-button v-permission="'HY_edit'" v-if="authority_edit(scope.row.F_State)" type="text" @click="btn_edit(scope.row.F_Id)">编辑</el-button>
-          <!-- <el-button v-permission="'HY_goback'" v-if="authority_goback(scope.row.F_State)" type="text" @click="btn_goback(scope.row.F_Id)">退回</el-button>
-          <el-button v-permission="'HY_through'" v-if="authority_through(scope.row.F_State)" type="text" @click="btn_through(scope.row.F_Id)">通过</el-button> -->
+          <el-button v-permission="'HY_goback'" v-if="authority_goback(scope.row.F_State)" type="text" @click="btn_goback(scope.row.F_Id)">退回</el-button>
+          <el-button v-permission="'HY_through'" v-if="authority_through(scope.row.F_State)" type="text" @click="btn_through(scope.row.F_Id)">通过</el-button>
           <el-button v-permission="'HY_label'" type="text" @click="btn_label(scope.row.F_Id)">标签</el-button>
           <el-button v-permission="'HY_logistics_status'" v-if="authority_logistics_status(scope.row.F_Status)" type="text" @click="btn_logistics_status(scope.row.F_Id)">物流状态</el-button>
         </template>

CallCenterWeb.UI/src/views/customerServiceManagement/orderTransactionList/index.vue

@@ -245,7 +245,7 @@ export default {
     },
     //录入权限
     authority_refund_entry(payState) {
-      if (payState == 0 || payState == 2) {
+      if (payState == 2) {
         return true
       } else {
         return false

CallCenterWeb.UI/src/views/mediaCenter/launchManagment/mediaInformation/index.vue

@@ -172,9 +172,9 @@ export default {
         const params = {
           pageindex: this.pageParams.pageindex, // 第几页
           pagesize: this.pageParams.pagesize, // 每页几条信息
-          type: this.launchTypeID==''?'':this.launchTypeID-0, // 投放类型
-          name: this.mediaNameId==''?'':this.mediaNameId-0, // 媒体名称
-          commodity: this.boundGoodsId==''?'':this.boundGoodsId-0, // 媒体名称
+          type: this.launchTypeID, // 投放类型
+          name: this.mediaNameId, // 媒体名称
+          commodity: this.boundGoodsId, // 媒体名称
           tel: this.tel.trim(), // 刊登号码
           phone: this.phone.trim(), // 400号码
         }

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

@@ -69,8 +69,8 @@
       <svg-icon icon-class="daoru" />导入
     </el-button>
     <el-button type="primary" class="filter-item" @click="btn_export">导出</el-button>
-    <el-button type="primary" class="filter-item" @click="btn_file_merge">档案合并</el-button>
-    <el-button type="primary" class="filter-item" @click="btn_file_split">档案拆分</el-button>
+    <!-- <el-button type="primary" class="filter-item" @click="btn_file_merge">档案合并</el-button>
+    <el-button type="primary" class="filter-item" @click="btn_file_split">档案拆分</el-button> -->
     <el-button type="primary" class="filter-item" icon="el-icon-plus" @click="btn_add">添加</el-button>
     <el-button type="primary" class="filter-item" @click="btn_deletes">批量删除</el-button>
     <el-button type="primary" class="filter-item" @click="transfer">转移</el-button>

CallCenterWeb.UI/src/views/taskManagement/taskList/common/addOrEdit.vue

@@ -66,10 +66,10 @@
         </el-select>
       </el-form-item>
       <el-form-item label="目标金额" prop="targetAmount">
-          <el-input @keyup.native="handleInput" v-model="ruleForm.targetAmount" placeholder="请输入目标金额"/>
+          <el-input :maxlength="10" v-model.number="ruleForm.targetAmount" placeholder="请输入目标金额"/>
       </el-form-item>
       <el-form-item label="当前金额" prop="currentAmount">
-          <el-input @keyup.native="handleInput" v-model="ruleForm.currentAmount" placeholder="请输入当前金额"/>
+          <el-input :maxlength="10" v-model="ruleForm.currentAmount" placeholder="请输入当前金额"/>
       </el-form-item>
       <el-form-item label="提醒时间" prop="reminderTime">
         <el-date-picker
@@ -158,8 +158,23 @@ export default {
         targetAmount: [{
           required: true,
           message: '请输入目标金额!',
-          trigger: 'blur'
-        }],
+        },
+        { type: 'number', message: '目标金额必须为数字'}],
+        currentAmount: [{ 
+          required: false,
+          validator:(rule,value,callback)=>{
+          if(value != ""){
+                  if(value.match(/^\d*(\.?\d{0,2})/g)[0] == false){
+                      callback(new Error("请填写数字"));
+                  }else{
+                      callback();
+                  }
+              }else{
+                  callback();
+              }
+
+          },
+          }],
       },
       taskType:[
         {
@@ -197,7 +212,8 @@ export default {
       },
       depData:[],//部门数据
       pickerOptions,//日期数据
-      loading: false
+      loading: false,
+      
     }
   },
   created() {
@@ -260,6 +276,7 @@ export default {
       })
     },
     resetForm() {
+      this.ruleForm.currentAmount=''
       this.$refs.ruleForm.resetFields()
     },
     // 获取详情
@@ -316,8 +333,8 @@ export default {
     //限制输入小数
     handleInput(e) {
         e.target.value = (e.target.value.match(/^\d*(\.?\d{0,2})/g)[0]) || null
-
     },
+
   }
 }
 </script>