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

src/views/FinancialManagement/CarInsurance/PlatformSettlement/NonVehicleBalance.vue

@@ -244,6 +244,10 @@ export default {
         name:'批量结算',
         click:(row, index) => {return this.balanceFunPro()},
       },
+      {
+        name:'模板下载',
+        click:(row, index) => {return this.templateDownload()},
+      },
       {
         name:'导入',
         slot:true,
@@ -565,6 +569,11 @@ export default {
           }
         });
     },
+    templateDownload(){
+      let a = document.createElement('a')
+      a.href = `${process.env.BASE_URL}/template/SettlementTemplate.xlsx`;
+      a.click();
+    },
     // 查询
     handleSearchList(data) {
       // if( this.formData.year ||  this.formData.month ||  this.formData.date){

src/views/Sys/Deptall.vue

@@ -39,12 +39,13 @@
           >
             <el-form-item label="机构编码：">
               <el-input
+              clearable
                 v-model="peopledeptid"
                 placeholder="请输入机构编码"
               ></el-input>
             </el-form-item>
             <el-form-item label="来源：">
-              <el-select v-model="managementSource" placeholder="选择来源" >
+              <el-select v-model="managementSource" placeholder="选择来源" clearable>
                 <el-option v-for="val in organizationSourceoptions" :key="val.dictValue" :label="val.dictTag" :value="val.dictValue"></el-option>
               </el-select>
             </el-form-item>
@@ -549,12 +550,12 @@ export default {
     KtCommonTable,
   },
   created() {
-    this.peopleid = Cookies.get("user");
-    if (this.peopleid != "admin") {
-      this.peopledeptid = Cookies.get("user").split("D")[0];
-    } else {
-      this.peopledeptid = "9";
-    }
+    // this.peopleid = Cookies.get("user");
+    // if (this.peopleid != "admin") {
+    //   this.peopledeptid = Cookies.get("user").split("D")[0];
+    // } else {
+    //   this.peopledeptid = "9";
+    // }
 
     this.findTreeData(); // 获取左边机构树数据
     //获取所有下拉框数据

src/views/Sys/User.vue

@@ -97,18 +97,18 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="角色权限" prop="email">
-                <el-select size="small" v-model="dataForm.roleId" placeholder="请选择" @change="changeRole($event)">
+              <el-form-item label="角色权限" prop="roleId">
+                <el-select size="small" clearable  v-model="dataForm.roleId" placeholder="请选择" @change="changeRole($event)">
                   <el-option :label="roleItem.name" :value="roleItem.id" v-for="(roleItem, roleIndex) in roleoptions"
                     :key="roleIndex"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="树权限" prop="email">
-                <el-select size="small" v-model="dataForm.showLevel" placeholder="请选择">
-                  <el-option :label="roleItem.dictTag" :value="roleItem.dictValue" v-for="(roleItem, roleIndex) in treeOptions"
-                    :key="roleIndex"></el-option>
+              <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" 
+                    :key="index"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -277,6 +277,7 @@ export default {
     changeRole(roleid) {
       this.dataForm.roleId = roleid;
     },
+    
     /**Split 开始 */
     changeTreeWidth(widthVal) {
       // 初始化树的宽度
@@ -334,7 +335,8 @@ export default {
 
     handleTableEdit(params) {
       // 编辑后线人员
-      Object.assign(this.dataForm, params.row);
+      // Object.assign(this.dataForm, params.row);
+      this.dataForm = Object.assign({}, params.row)
       this.dialogVisible = true
     },
     // 右侧列表的方法End
@@ -371,7 +373,7 @@ export default {
         let params = {
           roleId: this.dataForm.roleId,
           userId: this.dataForm.id,
-          showLevel: this.dataForm.showLevel,
+          showLevel: this.dataForm.showLevel==""?null:this.dataForm.showLevel,
         }
         this.$api.user.saveUserRole(params).then((res) => {
           if (res.code == 200) {