禅道bug修改

CallCenterWeb.UI/src/views/callScreen/components/createOrder.vue

@@ -61,7 +61,7 @@
                     class="form_select"
                     value-key="F_ProductId"
                     clearable
-                    placeholder="请选择商品类型"
+                    placeholder="请选择商品"
                     @change="commodityListChange"
                   >
                     <el-option

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

@@ -41,10 +41,10 @@
       <el-table-column prop="F_Money" label="变动金额" align="center" />
       <el-table-column prop="F_Remark" label="售后备注" align="center" />
       <el-table-column prop="F_AddTime" label="下单日期" align="center" />
-      <el-table-column prop="F_AddUserName" label="下单员工" align="center" />
+      <el-table-column prop="F_AboutName" label="下单员工" align="center" />
       <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
         <template slot-scope="scope">
-          <el-button v-permission="'HY_refund'" type="text" @click="btn_refund(scope.row.F_Id)">退款</el-button>
+          <el-button v-permission="'HY_refund'" v-if="isrefund(scope.row.F_State)" type="text" @click="btn_refund(scope.row.F_Id)">退款</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -170,6 +170,14 @@ export default {
     handleTabClick(tab, event) {
       this.getList()
     },
+    //设置退款展示
+    isrefund(state){
+      if(state==1){
+        return false
+      }else{
+        return true
+      }
+    },
     //合并订单审核
     btn_refund(auditId) {
       this.$layer.iframe({

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

@@ -19,7 +19,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="手机号码" prop="F_CustomerPhone">
-            <el-input v-model="ruleForm.F_CustomerPhone" placeholder="请输入手机号码" @change="changeCustomerPhone"/>
+            <el-input v-model="ruleForm.F_CustomerPhone" placeholder="请输入手机号码" @change="changeCustomerPhone" onkeyup="value=value.replace(/[^\d.]/g,'')"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -61,7 +61,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="收件人手机号" >
-            <el-input v-model="ruleForm.F_AddPhone" placeholder="请输入收件人手机号"/>
+            <el-input v-model="ruleForm.F_AddPhone" placeholder="请输入收件人手机号" onkeyup="value=value.replace(/[^\d.]/g,'')"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -105,7 +105,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="邮编" >
-            <el-input v-model="ruleForm.F_PostalCode" placeholder="请输入邮编"/>
+            <el-input v-model="ruleForm.F_PostalCode" placeholder="请输入邮编" onkeyup="value=value.replace(/[^\d.]/g,'')"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -164,7 +164,7 @@
         <el-input :autosize="{ minRows: 4}" v-model="ruleForm.F_Remark" type="textarea" placeholder="请输入备注"/>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="submitForm(3)">保存</el-button>
+        <el-button type="primary" @click="submitForm(1)">保存</el-button>
       </el-form-item>
     </el-form>
   </div>
@@ -172,7 +172,7 @@
 
 <script>
 import { getProviceCity, getDictionaryValueList } from '@/api/commonAPI'
-import { getOrder, getActivityAccount } from "@/api/orderManagement/orderList";
+import { getOrder, getActivityAccount,getintegral } from "@/api/orderManagement/orderList";
 import { editOrderCustomerService } from "@/api/customerServiceManagement/orderListCustomerService";
 import { validateTel } from '@/utils/validate'
 import { delFiles, filterContent, pickerOptions } from '@/utils'
@@ -454,33 +454,19 @@ 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') {
-            if (response.rows.Rows.length > 1) {
+        getintegral(params).then(response=>{
+          if(response.state=='success'){
+            if(response.rows.Rows.length>0){
               this.alreadyPoints = response.rows.Rows[0].F_Score
+            }else{
+              this.alreadyPoints = ''
             }
+            
           }
         })
-        resolve()
-      })
     },
     changeCustomerPhone(value) {
       this.getAlreadyPoints(value)

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

@@ -81,7 +81,7 @@
           <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>
+          <el-button v-permission="'HY_logistics_status'" v-if="authority_logistics_status(scope.row.F_Status,scope.row.F_State)" type="text" @click="btn_logistics_status(scope.row.F_Id)">物流状态</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -355,7 +355,7 @@ export default {
     },
     //编辑权限
     authority_edit(state) {
-      if (state == 6) {
+      if (state == 6||state==3) {
         return false
       } else {
         return true
@@ -371,16 +371,20 @@ export default {
     },
     //通过权限
     authority_through(state) {
-      if (state == 6) {
+      if (state == 6||state==3) {
         return false
       } else {
         return true
       }
     },
     //物流状态权限
-    authority_logistics_status(status) {
-      if (status == 0 || status == 1 ) {
-        return true
+    authority_logistics_status(status,state) {
+      if (status == 0 || status == 1) {
+        if(state==6){
+          return true
+        }else{
+          return false
+        }
       } else {
         return false
       }

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

@@ -59,7 +59,7 @@
       <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
         <template slot-scope="scope">
           <el-button v-permission="'HY_refund_entry'" v-if="authority_refund_entry(scope.row.F_PayState)" type="text" @click="btn_refund_entry(scope.row.F_Id)">录入</el-button>
-          <el-button v-permission="'HY_audit'" type="text" @click="btn_audit(scope.row.F_Id)">审核</el-button>
+          <el-button v-permission="'HY_audit'" v-if="isexamine(scope.row.F_PayState)" type="text" @click="btn_audit(scope.row.F_Id)">审核</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -167,6 +167,7 @@ export default {
           SearchEndTime: this.searchData.searchTime[1], //添加结束时间
           F_PayState: this.activeName, //交易状态
           F_IsExpress: -2, //-2全部 0客服未分配快递 1已分配
+          PayState:1
         };
         getOrderListCustomerService(params).then(response => {
           this.loading = false;
@@ -195,6 +196,14 @@ export default {
     handleTabClick(tab, event) {
       this.getList()
     },
+    //设置审核权限
+    isexamine(state){
+      if(state==1){
+        return false
+      }else{
+        return true
+      }
+    },
     btn_audit(ordercode){
        this.$layer.iframe({
         content: {

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

@@ -608,7 +608,12 @@ export default {
         }
         getintegral(params).then(response=>{
           if(response.state=='success'){
-            this.alreadyPoints = response.rows.Rows[0].F_Score
+            if(response.rows.Rows.length>0){
+              this.alreadyPoints = response.rows.Rows[0].F_Score
+            }else{
+              this.alreadyPoints = ''
+            }
+            
           }
         })
     },

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

@@ -19,7 +19,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="手机号码" prop="F_CustomerPhone">
-            <el-input v-model="ruleForm.F_CustomerPhone" placeholder="请输入手机号码" @change="changeCustomerPhone"/>
+            <el-input v-model="ruleForm.F_CustomerPhone" placeholder="请输入手机号码" @change="changeCustomerPhone" onkeyup="value=value.replace(/[^\d.]/g,'')"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -122,7 +122,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="收件人手机号" >
-            <el-input v-model="ruleForm.F_AddPhone" placeholder="请输入收件人手机号"/>
+            <el-input v-model="ruleForm.F_AddPhone" placeholder="请输入收件人手机号" onkeyup="value=value.replace(/[^\d.]/g,'')"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -166,7 +166,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="邮编" >
-            <el-input v-model="ruleForm.F_PostalCode" placeholder="请输入邮编"/>
+            <el-input v-model="ruleForm.F_PostalCode" placeholder="请输入邮编" onkeyup="value=value.replace(/[^\d.]/g,'')"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -573,7 +573,11 @@ export default {
         }
         getintegral(params).then(response=>{
           if(response.state=='success'){
-            this.alreadyPoints = response.rows.Rows[0].F_Score
+            if(response.rows.Rows.length>0){
+              this.alreadyPoints = response.rows.Rows[0].F_Score
+            }else{
+              this.alreadyPoints = ''
+            }
           }
         })
         // getOrderLists(params).then(response => {

CallCenterWeb.UI/src/views/systemSetup/roleSetting/department/component/addOrEdit.vue

@@ -16,18 +16,18 @@
       <el-form-item label="分类名称" prop="deptname">
         <el-input v-model="ruleForm.deptname" placeholder="请输入分类名称"/>
       </el-form-item>
-      <el-form-item v-if="addEditLock" label="是否锁定:" prop="islock" >
+      <!-- <el-form-item v-if="addEditLock" label="是否锁定:" prop="islock" >
         <el-radio-group v-model="ruleForm.islock">
           <el-radio label="0">否</el-radio>
           <el-radio label="1">是</el-radio>
         </el-radio-group>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="任务额:" prop="targetmoney">
         <el-input v-model="ruleForm.targetmoney" type="text" autosize placeholder="请输入任务额"/>
       </el-form-item>
-      <el-form-item label="排列序号" prop="sort">
+      <!-- <el-form-item label="排列序号" prop="sort">
         <el-input v-model.number="ruleForm.sort" maxlength="20" placeholder="请输入排列序号"/>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" @click="submitForm">保存</el-button>
       </el-form-item>
@@ -56,9 +56,9 @@ export default{
       ruleForm: {
         parentid: '', // 父节点id
         deptid: '', // 当前节点id
-        sort: '', // 序号
+        // sort: '', // 序号
         deptname: '', // 分类名称
-        islock: '', //是否锁定
+        // islock: '', //是否锁定
         targetmoney: '', //任务额
       },
       rules: {
@@ -109,9 +109,9 @@ export default{
         if (response.state.toLowerCase() === 'success') {
           const res = response.data.model
           this.ruleForm.deptname = res.F_DeptName // 分类名称
-          this.ruleForm.sort = res.F_Sort // 排序
-          this.ruleForm.islock = res.F_Lock + '' // 排序
-          this.ruleForm.sort = res.F_TargetMoney // 排序
+          // this.ruleForm.sort = res.F_Sort // 排序
+          // this.ruleForm.islock = res.F_Lock + '' // 排序
+          this.ruleForm.targetmoney = res.F_TargetMoney // 排序
           this.ruleForm.parentid = res.F_ParentId // 父节点id
           const len = response.data.levelid.length
           const levelid = response.data.levelid

CallCenterWeb.UI/src/views/systemSetup/roleSetting/department/index.vue

@@ -20,11 +20,11 @@
         @selection-change="changeSelects">
           <el-table-column type="selection" width="40" fixed></el-table-column>
           <el-table-column prop="F_DeptName" label="部门名称" align="center" min-width=""/>
-          <el-table-column prop="F_Lock" label="锁定" align="center" min-width="">
+          <!-- <el-table-column prop="F_Lock" label="锁定" align="center" min-width="">
             <template slot-scope="scope">
               {{ scope.row.F_Lock | judgmentLockName }}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column prop="F_TargetMoney" label="任务额" align="center" min-width="">
             <template slot-scope="scope">
               {{ scope.row.F_TargetMoney | judgmentTargetMoney }}

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

@@ -90,7 +90,7 @@
           <span>{{ scope.row.EndTime | timesFilter }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="TalkLongTime" label="通话时长" align="center" min-width />
+      <el-table-column prop="TalkLongTime" label="录音时长" align="center" min-width />
       <el-table-column prop="RelayNumber" label="中继号码" align="center" min-width />
       <!-- <el-table-column label="外呼类型" align="center" min-width>
         <template slot-scope="scope">{{ scope.row.callopttype | callopttypeFilter }}</template>