Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

config/dev.env.js

@@ -14,6 +14,8 @@ module.exports = merge(prodEnv, {
   // BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
   BASE_URL: '"http:///192.168.0.253:8080/"',//田智
   // BASE_URL: '"http:///192.168.0.42: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/"',//郝宇
   // BASE_URL: '"http:///192.168.0.103:8、080/"',//霍续亮

src/http/moudules/letter.js

@@ -913,4 +913,13 @@ export const getDrivingInsuranceRule = (data) => {
         method: "post",
         data
     })
-    }
+    }
+
+
+//客户手机号查询
+export const getMobileByOrderNo = (orderNo,type) => {
+  return axios({
+      url: "/insurance/order/getMobileByOrderNo?orderNo="+orderNo+'&type='+type,
+      method: "get",
+  })
+  }

src/http/moudules/user.js

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

src/views/Sys/User.vue

@@ -107,7 +107,7 @@
             <el-col :span="12">
               <el-form-item label="树权限" prop="showLevel">
                 <el-select size="small" clearable  v-model="dataForm.showLevel" placeholder="请选择">
-                  <el-option v-for="(val, index) in treeOptions" :label="val.dictTag" :value="val.dictValue" 
+                  <el-option v-for="(val, index) in treeOptions" :label="val.dictTag" :value="val.dictValue"
                     :key="index"></el-option>
                 </el-select>
               </el-form-item>
@@ -115,11 +115,21 @@
             <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" 
+                  <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-col :span="12">
+              <el-form-item label="拨号权限账号" prop="dialUserName">
+                <el-input  v-model="dataForm.dialUserName"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="拨号权限密码" prop="dialPassWord">
+                <el-input  v-model="dataForm.dialPassWord"></el-input>
+              </el-form-item>
+            </el-col>
           </el-row>
         </el-tabs>
       </el-form>
@@ -231,7 +241,10 @@ export default {
       dialogVisible: false, // 新增编辑界面是否显示
       dataForm: {  // 人员个人信息
         remark: "",
-        roleId: ""
+        roleId: "",
+        dialUserName:"",
+        dialPassWord:"",
+        isDial:"0",
       },
       // 新增或修改的弹出框End
       roleoptions: [],
@@ -259,7 +272,7 @@ export default {
     //获取所有下拉框数据(字典)
     this.getRoles();
     this.dictList()
-    
+
   },
   mounted() {
     this.findLeftTreeData();// 获取机构树的数据
@@ -297,7 +310,7 @@ export default {
     changeRole(roleid) {
       this.dataForm.roleId = roleid;
     },
-    
+
     /**Split 开始 */
     changeTreeWidth(widthVal) {
       // 初始化树的宽度
@@ -355,15 +368,13 @@ export default {
           else{
           this.$message.error(res.msg)
         }
-       
+
       }).then(data != null ? data.callback : '')
     },
 
     handleTableEdit(params) {
-      // 编辑后线人员
-      // Object.assign(this.dataForm, params.row);
       this.dataForm = Object.assign({}, params.row)
-      this.dataForm.isDial='0'
+      this.dataForm.isDial=this.dataForm.isDial==null?'0':'1';
       this.dataForm.showLevel=this.dataForm.showLevel=='null' || this.dataForm.showLevel==null?'subordinate':this.dataForm.showLevel
       this.dialogVisible = true
     },
@@ -398,13 +409,14 @@ export default {
     // 提交
     submitForm() {
       this.$confirm('确认提交吗？', '提示', {}).then(() => {
-        let params = {
+        this.$api.user.saveUserRole({
           roleId: this.dataForm.roleId,
           userId: this.dataForm.id,
           showLevel: this.dataForm.showLevel,
           isDial: this.dataForm.isDial,
-        }
-        this.$api.user.saveUserRole(params).then((res) => {
+          dialUserName:this.dataForm.dialUserName,
+          dialPassWord:this.dataForm.dialPassWord,
+        }).then((res) => {
           if (res.code == 200) {
             this.$message({
               message: '操作成功',