禅道bug修改

CallCenterWeb.UI/src/views/afterSaleManagement/saleOrderList/index.vue

@@ -43,7 +43,7 @@
       <el-tab-pane label="退回" name="2"></el-tab-pane>
       <el-tab-pane label="通过" name="3"></el-tab-pane>
       <el-tab-pane label="无货" name="4"></el-tab-pane>
-      <el-tab-pane label="已分拣" name="5"></el-tab-pane> -->
+      <el-tab-pane label="已分拣" name="5"></el-tab-pane>-->
       <el-tab-pane label="已发货" name="6"></el-tab-pane>
     </el-tabs>
     <el-table
@@ -86,7 +86,7 @@
           <el-button
             v-permission="'HY_afterSale'"
             type="text"
-            v-if="authority_afterSale(scope.row.F_Status,scope.row.IsSale)"
+            v-if="authority_afterSale(scope.row.F_Status)"
             @click="btn_afterSale(scope.row.F_Id)"
           >售后</el-button>
           <el-button
@@ -110,91 +110,93 @@
 </template>
 
 <script>
-import { getDictionaryValueList } from '@/api/commonAPI'
+import { getDictionaryValueList } from "@/api/commonAPI";
 import { getOrderLists } from "@/api/orderManagement/orderList";
 import { pickerOptions } from "@/utils";
-import afterSale from './afterSale';
-import detail from "@/views/orderManagement/orderList/detail"
+import afterSale from "./afterSale";
+import detail from "@/views/orderManagement/orderList/detail";
 import Pagination from "@/components/Pagination"; // 对el-pagination 二次封装
 
 export default {
   name: "SaleOrderList",
   components: {
-    Pagination
+    Pagination,
   },
   filters: {
-    judgmentStateName (status) {
+    judgmentStateName(status) {
       const statusMap = {
-        '-1': '无效',
-        '0': '暂存',
-        '1': '提交',
-        '2': '退回',
-        '3': '通过',
-        '4': '无货',
-        '5': '已分拣',
-        '6': '已发货'
-      }
-      return statusMap[status]
+        "-1": "无效",
+        0: "暂存",
+        1: "提交",
+        2: "退回",
+        3: "通过",
+        4: "无货",
+        5: "已分拣",
+        6: "已发货",
+      };
+      return statusMap[status];
     },
-    judgmentStatusName (status) {
+    judgmentStatusName(status) {
       const statusMap = {
-        '0': '未发出',
-        '1': '未签收',
-        '2': '签收',
-        '3': '改代收',
-        '4': '拒收',
-      }
-      return statusMap[status]
+        0: "未发出",
+        1: "未签收",
+        2: "签收",
+        3: "改代收",
+        4: "拒收",
+      };
+      return statusMap[status];
     },
-    judgmentOrderGoods (status) {
-      let orderGoodsNameQuantity = ''
+    judgmentOrderGoods(status) {
+      let orderGoodsNameQuantity = "";
       for (let i = 0; i < status.length; i++) {
-        orderGoodsNameQuantity = `${orderGoodsNameQuantity}${status[i].F_ProductName}*${status[i].F_Count},`
+        orderGoodsNameQuantity = `${orderGoodsNameQuantity}${status[i].F_ProductName}*${status[i].F_Count},`;
       }
-      orderGoodsNameQuantity = orderGoodsNameQuantity.substring(0, orderGoodsNameQuantity.length - 1)
-      return orderGoodsNameQuantity
+      orderGoodsNameQuantity = orderGoodsNameQuantity.substring(
+        0,
+        orderGoodsNameQuantity.length - 1
+      );
+      return orderGoodsNameQuantity;
     },
   },
-  data () {
+  data() {
     return {
-      sale:'',
       loading: false,
       searchData: {
-        adFrom: '', //消息/广告媒体来源
-        type: '', //订单类型
-        id: '', //订单号
-        customer: '', //客户姓名
-        customerPhone: '', //客户手机号
-        trackingNo: '', //运单号
-        searchTime: '', //订单时间
+        adFrom: "", //消息/广告媒体来源
+        type: "", //订单类型
+        id: "", //订单号
+        customer: "", //客户姓名
+        customerPhone: "", //客户手机号
+        trackingNo: "", //运单号
+        searchTime: "", //订单时间
       },
       activeName: "-2", //标签切换首页
       pickerOptions, // 日期数据
       pageParams: {
         pageindex: 1, // 当前第几页
         pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
-        total: 0 // 总共多少数据
+        total: 0, // 总共多少数据
       },
       dataLists: [], // 列表数据
       multipleSelection: [], // 选中的数据
       selectedId: [], // 选中的数据的id
-      orderType: [],//订单类型
+      orderType: [], //订单类型
       mergeOrderId: [], //合并订单id
     };
   },
-  created () {
-    this.getOrderType()
-    this.getList()
-    document.onkeyup = e => {
+  created() {
+    this.getOrderType();
+    this.getList();
+    document.onkeyup = (e) => {
       if (e.keyCode === 13) {
         this.getList();
       }
     };
   },
   methods: {
-    getList () {
+    getList() {
       this.loading = true;
-      return new Promise(resolve => {
+      return new Promise((resolve) => {
         const params = {
           F_State: this.activeName, //订单状态
           pageindex: this.pageParams.pageindex, // int 第几页
@@ -210,7 +212,7 @@ export default {
           F_PayState: -2,
           state: 0,
         };
-        getOrderLists(params).then(response => {
+        getOrderLists(params).then((response) => {
           this.loading = false;
           if (response.state.toLowerCase() === "success") {
             this.pageParams.total = response.data.Totals;
@@ -221,87 +223,91 @@ export default {
       });
     },
     // 获取订单类型
-    getOrderType () {
-      return new Promise(resolve => {
+    getOrderType() {
+      return new Promise((resolve) => {
         const params = {
           isleaf: true,
-          code: 'ORDERTYPE'
-        }
-        getDictionaryValueList(params).then(response => {
-          if (response.state.toLowerCase() === 'success') {
-            this.orderType = response.data.Rows
+          code: "ORDERTYPE",
+        };
+        getDictionaryValueList(params).then((response) => {
+          if (response.state.toLowerCase() === "success") {
+            this.orderType = response.data.Rows;
           }
-        })
-      })
+        });
+      });
     },
-    handleTabClick (tab, event) {
-      this.pageParams.pageindex=1
-      this.getList()
+    handleTabClick(tab, event) {
+      this.pageParams.pageindex = 1;
+
+      this.getList();
     },
-    btn_search () {
+    btn_search() {
       this.pageParams.pageindex = 1;
       this.getList();
     },
-    authority_collection (status) {
+    authority_collection(status) {
       if (status == 1) {
-        return true
+        return true;
       } else {
-        return false
+        return false;
       }
     },
-    authority_afterSale (status,sale) {
-      if (status == 2 || sale <=0 ) {
-        return true
+    authority_afterSale(status) {
+      if (status == 2) {
+        return true;
       } else {
-        return false
+        return false;
       }
     },
     //售后
-    btn_afterSale (afterSalesId) {
+    btn_afterSale(afterSalesId) {
       this.$layer.iframe({
         content: {
           content: afterSale, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: afterSalesId } // props
+          data: { rowid: afterSalesId }, // props
         },
         area: ["80%", "80%"],
-        title: "售后内容"
+        title: "售后内容",
       });
     },
     //改代收
-    btn_collection (collectionId) {
+    btn_collection(collectionId) {
       this.$layer.iframe({
         content: {
           content: afterSale, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: collectionId, collectionAfterSalesReasonType: '改代收' } // props
+          data: {
+            rowid: collectionId,
+            collectionAfterSalesReasonType: "改代收",
+          }, // props
         },
         area: ["80%", "80%"],
-        title: "改代收"
+        title: "改代收",
       });
     },
     //详情
-    hadndleOrderCode (ordercode) {
+    hadndleOrderCode(ordercode) {
       this.$layer.iframe({
         content: {
           content: detail, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { 'rowid': ordercode }// props
+          data: { rowid: ordercode }, // props
         },
-        area: ['80%', '90%'],
-        title: '订单详情'
-      })
+        area: ["80%", "90%"],
+        title: "订单详情",
+      });
     },
     //选择多个
-    handleSelectionChange (val) {
-      const ids = []
-      this.multipleSelection = val
+    handleSelectionChange(val) {
+      const ids = [];
+      this.multipleSelection = val;
       for (let i = 0; i < this.multipleSelection.length; i++) {
-        ids.push(this.multipleSelection[i].F_Id)
+        ids.push(this.multipleSelection[i].F_Id);
       }
-      this.mergeOrderId = ids
+      this.mergeOrderId = ids;
     },
-  }
+  },
 };
 </script>
 

CallCenterWeb.UI/src/views/orderManagement/createOrder/index.vue

@@ -370,7 +370,7 @@ export default {
         F_RecommendId: 0, //否 number 推荐人id
         F_RecommendName: '', //否 string 推荐人名称
         F_Belong: 0, //否 number 归属人id
-        F_BelongName: '', //否 string 归属人名称
+        F_BelongName: '', //否 string 归属人名称,
       },
       rules: {
         F_Customer: [{

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

@@ -160,21 +160,27 @@ export default {
           message: '请输入目标金额!',
         },
         { 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();
-              }
+        // currentAmount: [{ 
+          // required: false,
+          // trigger: 'blur',
+          // validator:(rule,value,callback)=>{
+          // if(value != ""){
+          //         if(value.match(/^\d*(\.?\d{0,2})/g)[0] == false){
+          //             callback(new Error("请填写数字"));
+          //         }else{
+          //             callback();
+          //         }
+          //     }else{
+          //         callback();
+          //     }
 
-          },
-          }],
+          // },
+          // }],
+           currentAmount: [
+            { required: true, trigger: 'blur', message:'金额不能为空'},
+            { pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/, message: '请输入正确额格式,可保留两位小数' },
+            { trigger: 'blur'},
+          ],
       },
       taskType:[
         {

CallCenterWeb.UI/src/views/trafficData/callRecord/index.vue

@@ -37,10 +37,10 @@
 
     <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="45" />
-      <el-table-column type="index" label="编号" align="center" fixed width="80" />
-      <el-table-column prop="Caller" label="主叫号码" align="center" min-width />
-      <el-table-column prop="UserCode" label="坐席工号" align="center" min-width />
-      <el-table-column prop="Callee" label="被叫号码" align="center" min-width />
+      <el-table-column type="index" label="编号" align="center" fixed width="80" ></el-table-column>
+      <el-table-column prop="Caller" label="主叫号码" align="center" min-width ></el-table-column>
+      <!-- <el-table-column prop="UserCode" label="坐席工号" align="center" min-width ></el-table-column> -->
+      <el-table-column prop="Callee" label="被叫号码" align="center" min-width ></el-table-column>
       <el-table-column label="呼叫类型" align="center" min-width>
         <template slot-scope="scope">{{ scope.row.CallType | calltypeFilter }}</template>
       </el-table-column>