Quellcode durchsuchen

禅道bug修改

liuzhen vor 5 Jahren
Ursprung
Commit
53deddf0cf

+ 3 - 3
CallCenterWeb.UI/src/views/customerServiceManagement/orderListCustomerService/index.vue

37
     <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick" >
37
     <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick" >
38
       <el-tab-pane label="全部" name="-2"></el-tab-pane>
38
       <el-tab-pane label="全部" name="-2"></el-tab-pane>
39
       <el-tab-pane label="无效" name="-1"></el-tab-pane>
39
       <el-tab-pane label="无效" name="-1"></el-tab-pane>
40
-      <el-tab-pane label="暂存" name="0"></el-tab-pane>
40
+      <!-- <el-tab-pane label="暂存" name="0"></el-tab-pane> -->
41
       <el-tab-pane label="提交" name="1"></el-tab-pane>
41
       <el-tab-pane label="提交" name="1"></el-tab-pane>
42
       <el-tab-pane label="退回" name="2"></el-tab-pane>
42
       <el-tab-pane label="退回" name="2"></el-tab-pane>
43
       <!-- <el-tab-pane label="通过" name="3"></el-tab-pane>
43
       <!-- <el-tab-pane label="通过" name="3"></el-tab-pane>
78
       <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
78
       <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
79
         <template slot-scope="scope">
79
         <template slot-scope="scope">
80
           <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>
80
           <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>
81
-          <!-- <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>
82
-          <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> -->
81
+          <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>
82
+          <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>
83
           <el-button v-permission="'HY_label'" type="text" @click="btn_label(scope.row.F_Id)">标签</el-button>
83
           <el-button v-permission="'HY_label'" type="text" @click="btn_label(scope.row.F_Id)">标签</el-button>
84
           <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>
84
           <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>
85
         </template>
85
         </template>

+ 1 - 1
CallCenterWeb.UI/src/views/customerServiceManagement/orderTransactionList/index.vue

245
     },
245
     },
246
     //录入权限
246
     //录入权限
247
     authority_refund_entry(payState) {
247
     authority_refund_entry(payState) {
248
-      if (payState == 0 || payState == 2) {
248
+      if (payState == 2) {
249
         return true
249
         return true
250
       } else {
250
       } else {
251
         return false
251
         return false

+ 3 - 3
CallCenterWeb.UI/src/views/mediaCenter/launchManagment/mediaInformation/index.vue

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

+ 2 - 2
CallCenterWeb.UI/src/views/memberManagement/memberList/components/searchFilter.vue

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

+ 23 - 6
CallCenterWeb.UI/src/views/taskManagement/taskList/common/addOrEdit.vue

66
         </el-select>
66
         </el-select>
67
       </el-form-item>
67
       </el-form-item>
68
       <el-form-item label="目标金额" prop="targetAmount">
68
       <el-form-item label="目标金额" prop="targetAmount">
69
-          <el-input @keyup.native="handleInput" v-model="ruleForm.targetAmount" placeholder="请输入目标金额"/>
69
+          <el-input :maxlength="10" v-model.number="ruleForm.targetAmount" placeholder="请输入目标金额"/>
70
       </el-form-item>
70
       </el-form-item>
71
       <el-form-item label="当前金额" prop="currentAmount">
71
       <el-form-item label="当前金额" prop="currentAmount">
72
-          <el-input @keyup.native="handleInput" v-model="ruleForm.currentAmount" placeholder="请输入当前金额"/>
72
+          <el-input :maxlength="10" v-model="ruleForm.currentAmount" placeholder="请输入当前金额"/>
73
       </el-form-item>
73
       </el-form-item>
74
       <el-form-item label="提醒时间" prop="reminderTime">
74
       <el-form-item label="提醒时间" prop="reminderTime">
75
         <el-date-picker
75
         <el-date-picker
158
         targetAmount: [{
158
         targetAmount: [{
159
           required: true,
159
           required: true,
160
           message: '请输入目标金额!',
160
           message: '请输入目标金额!',
161
-          trigger: 'blur'
162
-        }],
161
+        },
162
+        { type: 'number', message: '目标金额必须为数字'}],
163
+        currentAmount: [{ 
164
+          required: false,
165
+          validator:(rule,value,callback)=>{
166
+          if(value != ""){
167
+                  if(value.match(/^\d*(\.?\d{0,2})/g)[0] == false){
168
+                      callback(new Error("请填写数字"));
169
+                  }else{
170
+                      callback();
171
+                  }
172
+              }else{
173
+                  callback();
174
+              }
175
+
176
+          },
177
+          }],
163
       },
178
       },
164
       taskType:[
179
       taskType:[
165
         {
180
         {
197
       },
212
       },
198
       depData:[],//部门数据
213
       depData:[],//部门数据
199
       pickerOptions,//日期数据
214
       pickerOptions,//日期数据
200
-      loading: false
215
+      loading: false,
216
+      
201
     }
217
     }
202
   },
218
   },
203
   created() {
219
   created() {
260
       })
276
       })
261
     },
277
     },
262
     resetForm() {
278
     resetForm() {
279
+      this.ruleForm.currentAmount=''
263
       this.$refs.ruleForm.resetFields()
280
       this.$refs.ruleForm.resetFields()
264
     },
281
     },
265
     // 获取详情
282
     // 获取详情
316
     //限制输入小数
333
     //限制输入小数
317
     handleInput(e) {
334
     handleInput(e) {
318
         e.target.value = (e.target.value.match(/^\d*(\.?\d{0,2})/g)[0]) || null
335
         e.target.value = (e.target.value.match(/^\d*(\.?\d{0,2})/g)[0]) || null
319
-
320
     },
336
     },
337
+
321
   }
338
   }
322
 }
339
 }
323
 </script>
340
 </script>

BIN
CallCenterWeb.UI/static/xls/daibanguanli.xlsx