Parcourir la source

任务管理-详情里是否展示拨号

lihongxiao il y a 2 ans
Parent
commit
e0671b1839

+ 2 - 2
config/dev.env.js

@@ -7,12 +7,12 @@ module.exports = merge(prodEnv, {
 
 
   ENV_CONFIG:'"dev"',
-  BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
+  // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
   // BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
-  // BASE_URL: '"http:///192.168.0.253:8080/"',//田智
+  BASE_URL: '"http:///192.168.0.253:8080/"',//田智
   // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http://192.168.1.101:8080/"',
   // BASE_URL: '"http:///192.168.0.22:8080/"',//郝宇

+ 1 - 1
src/http/moudules/user.js

@@ -200,7 +200,7 @@ export const userQueryPage = (data) => {
 // 配置用户角色
 export const saveUserRole = (params) => {
     return axios({
-        url: '/user/saveUserRole?roleId='+params.roleId+'&userId='+params.userId+'&showLevel='+params.showLevel,
+        url: '/user/saveUserRole?roleId='+params.roleId+'&userId='+params.userId+'&showLevel='+params.showLevel+'&isDial='+params.isDial,
         method: 'post'
     })
 }

+ 3 - 3
src/views/Core/components/detailsDialog.vue

@@ -177,7 +177,7 @@
               <el-col :span="6"><span>车主姓名:</span>{{ orderInfo.ownerinfo.name }}</el-col>
               <el-col :span="6"><span>证件类型:</span>{{ orderInfo.ownerinfo.identifyType }}</el-col>
               <el-col :span="6"><span>身份证号:</span>{{ orderInfo.ownerinfo.identifyNumber }}</el-col>
-              <el-col :span="6"><span>手机号:</span>{{ orderInfo.ownerinfo.mobile }}</el-col>
+              <el-col :span="6"><span>手机号:</span>{{ orderInfo.ownerinfo.mobile }}<el-button style="margin-left:20px" type="text" v-if="isTaskPool && orderInfo.isDial&& orderInfo.isDial=='1'" >拨号</el-button></el-col>
             </el-row>
             <el-row class="premium-style" :gutter="20">
               <el-col :span="6"><span>电子邮箱:</span>{{ orderInfo.ownerinfo.email ? orderInfo.ownerinfo.email : '-'
@@ -193,7 +193,7 @@
               <el-col :span="6"><span>投保人姓名:</span>{{ orderInfo.applyinfo.name }}</el-col>
               <el-col :span="6"><span>证件类型:</span>{{ orderInfo.applyinfo.identifyType }}</el-col>
               <el-col :span="6"><span>身份证号:</span>{{ orderInfo.applyinfo.identifyNumber }}</el-col>
-              <el-col :span="6"><span>手机号:</span>{{ orderInfo.applyinfo.mobile }}</el-col>
+              <el-col :span="6"><span>手机号:</span>{{ orderInfo.applyinfo.mobile }}<el-button style="margin-left:20px" type="text" v-if="isTaskPool && orderInfo.isDial&& orderInfo.isDial=='1'" >拨号</el-button></el-col>
             </el-row>
             <el-row class="premium-style" :gutter="20">
               <el-col :span="6"><span>电子邮箱:</span>{{ orderInfo.applyinfo.email ? orderInfo.applyinfo.email : '/'
@@ -209,7 +209,7 @@
               <el-col :span="6"><span>被保人姓名:</span>{{ orderInfo.insureinfo.name }}</el-col>
               <el-col :span="6"><span>证件类型:</span>{{ orderInfo.insureinfo.identifyType }}</el-col>
               <el-col :span="6"><span>身份证号:</span>{{ orderInfo.insureinfo.identifyNumber }}</el-col>
-              <el-col :span="6"><span>手机号:</span>{{ orderInfo.insureinfo.mobile }}</el-col>
+              <el-col :span="6"><span>手机号:</span>{{ orderInfo.insureinfo.mobile }}<el-button style="margin-left:20px" type="text" v-if="isTaskPool && orderInfo.isDial&& orderInfo.isDial=='1'" >拨号</el-button></el-col>
             </el-row>
             <el-row class="premium-style" :gutter="20">
               <el-col :span="6"><span>电子邮箱:</span>{{ orderInfo.insureinfo.email ? orderInfo.insureinfo.email : '/'

+ 36 - 7
src/views/Sys/User.vue

@@ -112,6 +112,14 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="拨号权限" prop="isDial">
+                <el-select size="small" clearable  v-model="dataForm.isDial" placeholder="请选择" @change="refreshData">
+                  <el-option v-for="(val, index) in isDialOptions" :label="val.label" :value="val.value" 
+                    :key="index"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
         </el-tabs>
       </el-form>
@@ -227,7 +235,16 @@ export default {
       },
       // 新增或修改的弹出框End
       roleoptions: [],
-      treeOptions:[]
+      treeOptions:[],
+      isDialOptions:[
+        {
+          label:'关闭',
+          value:'0'
+        },{
+          label:'开启',
+          value:'1'
+        },
+      ]
     }
   },
   created() {
@@ -256,6 +273,9 @@ export default {
     }
   },
   methods: {
+    refreshData (val) {
+      this.$forceUpdate()
+    },
     dictList(data) {
       this.$api.dict
         .dictList()
@@ -325,11 +345,17 @@ export default {
         this.pageRequest.pageSize = data.pageRequest.pageSize;
       }
       this.$api.user.userQueryPage(this.pageRequest).then((res) => {
-        //角色权限过滤转换
-        res.data.content.forEach(item => {
-          item.roleId=Number(item.roleId)
-        })
-        this.pageResult = res.data;
+        if(res.code==200){
+          //角色权限过滤转换
+          res.data.content.forEach(item => {
+            item.roleId=Number(item.roleId)
+          })
+          this.pageResult = res.data;
+        }
+          else{
+          this.$message.error(res.msg)
+        }
+       
       }).then(data != null ? data.callback : '')
     },
 
@@ -337,6 +363,8 @@ export default {
       // 编辑后线人员
       // Object.assign(this.dataForm, params.row);
       this.dataForm = Object.assign({}, params.row)
+      this.dataForm.isDial='0'
+      this.dataForm.showLevel=this.dataForm.showLevel=='null' || this.dataForm.showLevel==null?'subordinate':this.dataForm.showLevel
       this.dialogVisible = true
     },
     // 右侧列表的方法End
@@ -373,7 +401,8 @@ export default {
         let params = {
           roleId: this.dataForm.roleId,
           userId: this.dataForm.id,
-          showLevel: this.dataForm.showLevel==""?null:this.dataForm.showLevel,
+          showLevel: this.dataForm.showLevel,
+          isDial: this.dataForm.isDial,
         }
         this.$api.user.saveUserRole(params).then((res) => {
           if (res.code == 200) {

+ 35 - 17
src/views/Task/daikeComponents/KtLetter.vue

@@ -3722,6 +3722,7 @@ export default {
                     case "MJ4":
                       eleA.amount = eleB.deductibleRate;
                     case "A":
+                      eleA.amount = JSON.stringify(eleB.amount);
                       this.protocolJudge('A', true)
                       break;
                     default:
@@ -5122,35 +5123,52 @@ export default {
       if (this.tbczcarShow && this.imageList2.length > 0) {
         //投保人同车主
         this.imageList3 = JSON.parse(JSON.stringify(this.imageList2));
-      console.log(this.imageList3,1111111111);
-        if (this.imageList3.length == 1) {
-          this.imageList3[0].imageType = "C03";
-        } else {
-          this.imageList3[0].imageType = "C03";
-          this.imageList3[1].imageType = "D03";
+        if (this.imageList3.length == 1 ) {
+          this.imageList3[0].imageType = this.imageList3[0].imageType.includes('C0')?"C03":'D03'
+        }
+        else {
+          this.imageList3.forEach(e=>{
+            e.imageType= e.imageType.includes('C0')?"C03":'D03'
+          })
         }
       }
-      console.log(this.imageList3,22222222222);
 
       if (this.bbczcarShow && this.imageList2.length > 0) {
         //被保人同车主
         this.imageList4 = JSON.parse(JSON.stringify(this.imageList2));
-        if (this.imageList4.length == 1) {
-          this.imageList4[0].imageType = "C04";
-        } else {
-          this.imageList4[0].imageType = "C04";
-          this.imageList4[1].imageType = "D04";
+        if (this.imageList4.length == 1 ) {
+          this.imageList4[0].imageType = this.imageList4[0].imageType.includes('C0')?"C04":'D04'
+        }
+        else {
+          this.imageList4.forEach(e=>{
+            e.imageType= e.imageType.includes('C0')?"C04":'D04'
+          })
         }
+        // if (this.imageList4.length == 1) {
+        //   this.imageList4[0].imageType = "C04";
+        // }
+        //  else {
+        //   this.imageList4[0].imageType = "C04";
+        //   this.imageList4[1].imageType = "D04";
+        // }
       }
       if (this.bbtbcarShow && this.imageList3.length > 0) {
         //被保人同投保人
         this.imageList4 = JSON.parse(JSON.stringify(this.imageList3));
-        if (this.imageList4.length == 1) {
-          this.imageList4[0].imageType = "C04";
-        } else {
-          this.imageList4[0].imageType = "C04";
-          this.imageList4[1].imageType = "D04";
+        if (this.imageList4.length == 1 ) {
+          this.imageList4[0].imageType = this.imageList4[0].imageType.includes('C0')?"C04":'D04'
         }
+        else {
+          this.imageList4.forEach(e=>{
+            e.imageType= e.imageType.includes('C0')?"C04":'D04'
+          })
+        }
+        // if (this.imageList4.length == 1) {
+        //   this.imageList4[0].imageType = "C04";
+        // } else {
+        //   this.imageList4[0].imageType = "C04";
+        //   this.imageList4[1].imageType = "D04";
+        // }
       }
 
       //日期长度<10处理