禅道bug修改

CallCenterWeb.UI/src/api/orderManagement/orderList.js

@@ -78,4 +78,12 @@ export function orderPayMoney(params) {
     method: 'post',
     params
   })
+}
+//获取积分
+export function getintegral(params) {
+  return request({
+    url: 'api/VipInfo/getphonedetails',
+    method: 'get',
+    params
+  })
 }

CallCenterWeb.UI/src/components/Dialplate/index.vue

@@ -318,6 +318,7 @@ export default {
             store.dispatch('ChangeCallNum', this.telNumber)
             Send(this.scoketDatas)
             store.dispatch('UpdateCalloutScreen', !this.telIsVisCallout)// 关闭外呼面板
+            this.telNumber=''
           }
         })
       } else {

CallCenterWeb.UI/src/views/afterSaleManagement/afterSaleList/afterSaleDetail.vue

@@ -103,7 +103,27 @@ export default {
           const res = response.data
           this.orderDetailData.F_OrderId = res.F_OrderId //订单编号
           this.orderDetailData.F_OldDetailList = res.F_OldDetailList //退回产品列表
-          this.orderDetailData.F_Type = res.F_Type + '' //售后类型
+          switch(res.F_Type){
+            case 1:
+              this.orderDetailData.F_Type='调换货';
+              break;
+            case 2:
+              this.orderDetailData.F_Type='退货';
+              break;
+            case 3:
+              this.orderDetailData.F_Type='部分退货';
+              break;
+            case 4:
+              this.orderDetailData.F_Type='对发货';
+              break;
+            case 5:
+              this.orderDetailData.F_Type='补发货';
+              break;
+            case 6:
+              this.orderDetailData.F_Type='补差额';
+              break;
+          }
+          // this.orderDetailData.F_Type = res.F_Type //售后类型
           this.orderDetailData.F_Money = res.F_Money //变动金额
           this.orderDetailData.F_Remark = res.F_Remark //售后备注
           this.orderDetailData.F_ReturnType = res.F_ReturnType //售后原因类型

CallCenterWeb.UI/src/views/autoCallScreen/index.vue

@@ -82,7 +82,6 @@
               </p>
               <p class="callin_con callin_time">
                 <time
-                  v-show="!dropoff"
                 >当前通话时长：{{ telCallTime.hh }}:{{ telCallTime.mm }}:{{ telCallTime.ss }}</time>
               </p>
             </el-col>

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

@@ -231,8 +231,8 @@
             </el-row>
             <el-row>
               <el-col :span='6'>
-                <el-form-item label="使用积分" prop="F_UserScore" >
-                  <el-input v-model.number="ruleForm.F_UserScore" placeholder="请输入使用积分"/>
+                <el-form-item label="使用积分" prop="F_UseScore" >
+                  <el-input v-model.number="ruleForm.F_UseScore" placeholder="请输入使用积分"/>
                 </el-form-item>
               </el-col>
               <el-col :span='6'>
@@ -274,7 +274,7 @@
 
 <script>
 import { getProviceCity, getDictionaryValueList } from '@/api/commonAPI'
-import { addOrder, getActivityAccount } from '@/api/orderManagement/orderList'
+import { addOrder, getActivityAccount,getintegral } from '@/api/orderManagement/orderList'
 import { validateTel } from '@/utils/validate'
 import { delFiles, filterContent, pickerOptions } from '@/utils'
 import { getCommodityType } from '@/api/commodityManagement/commodityType'
@@ -366,7 +366,7 @@ export default {
         F_PayType: '', //否 string  支付方式
         F_Stock: '', //否 string 出货仓库
         F_RealPrice: 0, //否 number 实收金额
-        F_UserScore: '', //否 number  使用积分
+        F_UseScore: '', //否 number  使用积分
         F_RecommendId: 0, //否 number 推荐人id
         F_RecommendName: '', //否 string 推荐人名称
         F_Belong: 0, //否 number 归属人id
@@ -398,7 +398,7 @@ export default {
           trigger: 'blur',
           message: '请输入订单号',
         }],
-        F_UserScore: [{
+        F_UseScore: [{
           required: false,
           trigger: 'blur',
           message: '请输入使用积分',
@@ -429,7 +429,7 @@ export default {
           this.ruleForm.F_State = state
           this.ruleForm.OrderDetailList = this.commodityTableData
           this.ruleForm.F_ExpressFee = this.ruleForm.F_ExpressFee == '' ? 0 : this.ruleForm.F_ExpressFee
-          this.ruleForm.F_UserScore = this.ruleForm.F_UserScore == '' ? 0 : this.ruleForm.F_UserScore
+          this.ruleForm.F_UseScore = this.ruleForm.F_UseScore == '' ? 0 : this.ruleForm.F_UseScore
           this.loading = true
           addOrder(this.ruleForm).then(response => {
             this.loading = false
@@ -603,31 +603,14 @@ export default {
     },
     //获取已有积分
     getAlreadyPoints(phone) {
-      this.loading = true
-      return new Promise(resolve => {
-        const params = {
-          pageindex: "", // int 第几页
-          pagesize: "", // int 每页几条信息
-          name: "", //客户姓名
-          phone: phone, //手机号码
-          type: "", //会员类型
-          province: "", //省份
-          city: "", //市
-          area: "", //县区
-          town: "", //乡镇
-          address: "", //详细地址
-          birthday: "", //会员生日
-          recommender: "", //推荐人
-          saleperson: "", //销售负责人
+      const params = {
+          phone: phone, 
         }
-        getOrderLists(params).then(response => {
-          this.loading = false
-          if (response.state.toLowerCase() === 'success') {
+        getintegral(params).then(response=>{
+          if(response.state=='success'){
             this.alreadyPoints = response.rows.Rows[0].F_Score
           }
         })
-        resolve()
-      })
     },
     changeCustomerPhone(value) {
       this.getAlreadyPoints(value)

CallCenterWeb.UI/src/views/orderManagement/orderList/edit.vue

@@ -197,8 +197,8 @@
           </el-form-item>
         </el-col>
         <el-col :span='6'>
-          <el-form-item label="使用积分" prop="F_UserScore" >
-            <el-input v-model.number="ruleForm.F_UserScore" placeholder="请输入使用积分"/>
+          <el-form-item label="使用积分" prop="F_UseScore" >
+            <el-input v-model.number="ruleForm.F_UseScore" placeholder="请输入使用积分"/>
           </el-form-item>
         </el-col>
         <el-col :span='6'>
@@ -234,7 +234,7 @@
 
 <script>
 import { getProviceCity, getDictionaryValueList } from '@/api/commonAPI'
-import { getOrder, editOrder, getActivityAccount } from "@/api/orderManagement/orderList";
+import { getOrder, editOrder, getActivityAccount,getintegral } from "@/api/orderManagement/orderList";
 import { validateTel } from '@/utils/validate'
 import { delFiles, filterContent, pickerOptions } from '@/utils'
 import { getCommodityType } from '@/api/commodityManagement/commodityType'
@@ -336,7 +336,7 @@ export default {
         F_PayType: '', //否 string  支付方式
         F_Stock: '', //否 string 出货仓库
         F_RealPrice: 0, //否 number 实收金额
-        F_UserScore: '', //否 number  使用积分
+        F_UseScore: '', //否 number  使用积分
         F_RecommendId: '',// 否 number 推荐人id
         F_RecommendName: '', //否 string 推荐人名称
         F_Belong: 0, //否 number 归属人id
@@ -369,7 +369,7 @@ export default {
           trigger: 'blur',
           message: '请输入订单号',
         }],
-        F_UserScore: [{
+        F_UseScore: [{
           required: false,
           trigger: 'blur',
           message: '请输入使用积分',
@@ -405,7 +405,7 @@ export default {
           this.ruleForm.F_State = state
           this.ruleForm.OrderDetailList = JSON.stringify(this.returnOrderDetailList) == JSON.stringify(this.commodityTableData) ? [] : this.commodityTableData
           this.ruleForm.F_ExpressFee = this.ruleForm.F_ExpressFee == '' ? 0 : this.ruleForm.F_ExpressFee
-          this.ruleForm.F_UserScore = this.ruleForm.F_UserScore == '' ? 0 : this.ruleForm.F_UserScore
+          this.ruleForm.F_UseScore = this.ruleForm.F_UseScore == '' ? 0 : this.ruleForm.F_UseScore
           // 编辑
           editOrder(this.ruleForm)
             .then(response => {
@@ -564,33 +564,23 @@ export default {
     },
     //获取已有积分
     getAlreadyPoints(phone) {
-      this.loading = true
-      return new Promise(resolve => {
         const params = {
-          pageindex: "", // int 第几页
-          pagesize: "", // int 每页几条信息
-          name: "", //客户姓名
-          phone: phone, //手机号码
-          type: "", //会员类型
-          province: "", //省份
-          city: "", //市
-          area: "", //县区
-          town: "", //乡镇
-          address: "", //详细地址
-          birthday: "", //会员生日
-          recommender: "", //推荐人
-          saleperson: "", //销售负责人
+          phone: phone, 
         }
-        getOrderLists(params).then(response => {
-          this.loading = false
-          if (response.state.toLowerCase() === 'success') {
-            if (response.rows.Rows.length > 1) {
-              this.alreadyPoints = response.rows.Rows[0].F_Score
-            }
+        getintegral(params).then(response=>{
+          if(response.state=='success'){
+            this.alreadyPoints = response.rows.Rows[0].F_Score
           }
         })
-        resolve()
-      })
+        // getOrderLists(params).then(response => {
+        //   this.loading = false
+        //   if (response.state.toLowerCase() === 'success') {
+        //     if (response.rows.Rows.length > 1) {
+        //       this.alreadyPoints = response.rows.Rows[0].F_Score
+        //     }
+        //   }
+        // })
+        // resolve()
     },
     changeCustomerPhone(value) {
       this.getAlreadyPoints(value)
@@ -821,7 +811,7 @@ export default {
           this.ruleForm.F_ExpressFee = res.F_ExpressFee //运费
           this.ruleForm.F_PayType = res.F_PayType //支付方式
           this.ruleForm.F_Stock = res.F_Stock //出货仓库
-          this.ruleForm.F_UserScore = res.F_UseScore//使用积分
+          this.ruleForm.F_UseScore = res.F_UseScore//使用积分
           this.ruleForm.F_RecommendId = res.F_RecommendId//推荐人id
           this.ruleForm.F_RecommendName = res.F_RecommendName//推荐人名称
           this.ruleForm.F_Belong = res.F_Belong //归属人id