瀏覽代碼

1、财务管理模块体现管理新增体现时间筛选
2、人员新增页面排版问题

lihongxiao 2 年之前
父節點
當前提交
22314fe720

+ 25 - 1
src/http/moudules/task.js

@@ -289,6 +289,14 @@ export const sysDeptAccountPage = (data) => {
     data
   })
 }
+// 账户余额提现接口
+export const withdrawDeptAccount = (data) => {
+  return axios({
+    url: '/sysDeptAccount/withdrawDeptAccount',
+    method: 'post',
+    data
+  })
+}
 // 账户余额分页查询
 export const findPageAccount = (data) => {
   return axios({
@@ -882,4 +890,20 @@ export const documentarySettle = (data) => {
     method: "put",
     data
   })
-}
+}
+// 机构结算管理-提现待审核列表
+export const WithdrawqueryStatus = (data) => {
+  return axios({
+    url: "/sysDeptAccountWithdraw/queryStatus",
+    method: "post",
+    data
+  })
+}
+// 机构结算管理-提现待审核审核接口
+export const withdraAaudit = (data) => {
+  return axios({
+    url: "/sysDeptAccountWithdraw/audit",
+    method: "post",
+    data
+  })
+}

+ 29 - 5
src/views/FinancialManagement/CarInsurance/DeptSettlement/QueryBalance.vue

@@ -63,7 +63,8 @@
               </el-form>
             </el-row>
             <!-- 审核通过 -->
-              <kt-common-table :showOperation="false" :data="pageResult" :columns="columns"   :showBatchDelete="false" @findPage="findPage" >
+              <kt-common-table :data="pageResult" :columns="columns"   :showBatchDelete="false" @findPage="findPage" 
+               permsButton3="sys:queryBalance:withdrawal" button3Name="提现" @handleButton3="handleButton3">
               </kt-common-table>
 
         </SplitArea>
@@ -128,8 +129,8 @@
           // { prop: "deptName",label: "机构名称",minWidth: 80,sortable: false,formatter:this.companyNameFormatter},
           { prop: "deptName",label: "机构名称",minWidth: 80,sortable: false,},
           { prop: "managementFee",label: "可提现余额",minWidth: 80,sortable: false},
-          { prop: "applyAmount",label: "提现中金额",minWidth: 80,sortable: false},
-          { prop: "payamount",label: "已提现金额",minWidth: 100,sortable: false},
+          { prop: "waitAmount",label: "提现中金额",minWidth: 80,sortable: false},
+          // { prop: "payamount",label: "已提现金额",minWidth: 100,sortable: false},
           { prop: "totalAmount",label: "累计提现",minWidth: 100,sortable: false},
           { prop: "createTime",label: "创建时间",minWidth: 100,sortable: false}
         ],
@@ -191,7 +192,29 @@
         this.findPage();
       },
       //--left tree end-------
-	  
+      handleButton3(index,row){
+        this.$prompt('请输入提现金额', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          inputPattern: /^\d+(.\d{1,2})?$/,
+          inputErrorMessage: '请输入提现金额!'
+        }).then(({ value }) => {
+          if(value){
+            this.$api.task.withdrawDeptAccount({deptId:index.row.deptId,amount:value}).then((res) => {
+              if(res.code==200){
+                this.findPage();
+                this.$message({
+                type: 'success',
+                message:'提现成功'
+                });
+              }
+              else{
+                this.$message.error(res.msg)
+              }
+            })
+          }
+        })
+      },
 	  companyNameFormatter(row, column){
 	  	let companyId = row.deptId;
 	  	return CommonUtil.getDataName({dataList: this.ztreeNodes, value: 'id', label: 'name', data: companyId})
@@ -230,7 +253,8 @@
         }).catch((error)=>{
           this[typeName + "options"] = [];
         })
-      }
+      },
+     
 
 
     }

+ 9 - 22
src/views/FinancialManagement/CarInsurance/DeptSettlement/SettledCommissionList.vue

@@ -47,20 +47,7 @@
         pageRequest: { //查询的默认条件
           pageNum: 1,
           pageSize: 10,
-          columnFilters: {
-            "deptid": {
-              "name": "deptid",
-              "value": ""
-            },
-            "applystatus": {
-              "name": "applystatus",
-              "value": "2"
-            },
-            "applytype": {
-              "name": "applytype",
-              "value": "C"
-            }
-          }
+          status:'2'
         },
         columns: [ //数据列
           {prop: "applyno",label: "提现单号",minWidth: 160},
@@ -80,14 +67,14 @@
       };
     },
     created() {
-      this.peopleid = Cookies.get('user');
-      if(this.peopleid!='admin'){
-        this.peopledeptid = Cookies.get('user').split('D')[0];
-        this.pageRequest.columnFilters.deptid.value=this.peopledeptid;
-      }else{
-        this.peopledeptid = '9';
-        this.pageRequest.columnFilters.deptid.value=this.peopledeptid;
-      }
+      // this.peopleid = Cookies.get('user');
+      // if(this.peopleid!='admin'){
+      //   this.peopledeptid = Cookies.get('user').split('D')[0];
+      //   this.pageRequest.columnFilters.deptid.value=this.peopledeptid;
+      // }else{
+      //   this.peopledeptid = '9';
+      //   this.pageRequest.columnFilters.deptid.value=this.peopledeptid;
+      // }
       //获取所有下拉框数据
       this.getDictItems("agreementtype");
     },

+ 15 - 33
src/views/FinancialManagement/CarInsurance/DeptSettlement/UnsettledCommissionList.vue

@@ -55,32 +55,14 @@
         pageRequest: { //查询的默认条件
           pageNum: 1,
           pageSize: 10,
-          columnFilters: {
-            "deptid": {
-              "name": "deptid",
-              "value": ""
-            },
-            "applystatus": {
-              "name": "applystatus",
-              "value": "0"
-            },
-            "applytype": {
-              "name": "applytype",
-              "value": "C"
-            }
-          }
+          status:'2'
         },
         columns: [ //数据列
-          {prop: "applyno",label: "提现单号",minWidth: 160},
-          {prop: "deptid",label: "机构代码",minWidth: 100},
-          {prop: "deptname",label: "机构名称",minWidth: 100},
-          {prop: "accountbalance",label: "可提现账户余额",minWidth: 100},
-          {prop: "applyamount",label: "提现金额",minWidth: 100},
-          {prop: "balance",label: "账户余额",minWidth: 100},
-          {prop: "disrate",label: "服务费",minWidth: 100},
-          {prop: "bankname",label: "开户行",minWidth: 100},
-          {prop: "accountno",label: "账号",minWidth: 100},
-          {prop: "createtime",label: "申请时间",minWidth: 130}
+        {prop: "id",label: "提现单号",},
+          {prop: "deptId",label: "机构代码",},
+          {prop: "name",label: "机构名称"},
+          {prop: "amount",label: "提现金额"},
+          {prop: "createTime",label: "申请时间"}
         ],
         //------------协议下拉框数据   begin-----------------
         agreementtypeoptions: [], //协议类型
@@ -88,14 +70,14 @@
       };
     },
     created() {
-      this.peopleid = Cookies.get('user');
-      if(this.peopleid!='admin'){
-        this.peopledeptid = Cookies.get('user').split('D')[0];
-        this.pageRequest.columnFilters.deptid.value=this.peopledeptid;
-      }else{
-        this.peopledeptid = '9';
-        this.pageRequest.columnFilters.deptid.value=this.peopledeptid;
-      }
+      // this.peopleid = Cookies.get('user');
+      // if(this.peopleid!='admin'){
+      //   this.peopledeptid = Cookies.get('user').split('D')[0];
+      //   this.pageRequest.columnFilters.deptid.value=this.peopledeptid;
+      // }else{
+      //   this.peopledeptid = '9';
+      //   this.pageRequest.columnFilters.deptid.value=this.peopledeptid;
+      // }
       //获取所有下拉框数据
       this.getDictItems("agreementtype");
     },
@@ -166,7 +148,7 @@
           this.pageRequest.pageNum = data.pageRequest.pageNum;
           this.pageRequest.pageSize = data.pageRequest.pageSize;
         }
-        that.$api.task.payApplyFindPage(that.pageRequest)
+        that.$api.task.WithdrawqueryStatus(that.pageRequest)
           .then(res => {
             console.log(res.data)
             that.pageResult = res.data;

+ 48 - 56
src/views/FinancialManagement/CarInsurance/DeptSettlement/UnsettledCommissionListExamine.vue

@@ -19,7 +19,7 @@
         </el-row>
       </el-form>
 
-      <kt-common-table :operationWidth="240" permsDelete="sys:user:delete" :showBatchDelete="false" :showBatchPrint="true" permsButton3="sys:user:edit" :data="pageResult" :columns="columns" @findPage="findPage" button3Name="审核并支付" button3Background="#00B0F0" @handleButton3="handleButton3" @handlePrint="handlePrint">
+      <kt-common-table :operationWidth="240"  :showBatchDelete="false" :showBatchPrint="true" permsButton3="sys:unsettledCommissionListExamine:audit" :data="pageResult" :columns="columns" @findPage="findPage" button3Name="审核" button3Background="#00B0F0" @handleButton3="handleButton3" @handlePrint="handlePrint">
       </kt-common-table>
     </el-main>
 
@@ -51,32 +51,14 @@
         pageRequest: { //查询的默认条件
           pageNum: 1,
           pageSize: 10,
-          columnFilters: {
-            "deptid": {
-              "name": "deptid",
-              "value": ""
-            },
-            "applystatus": {
-              "name": "applystatus",
-              "value": "0"
-            },
-            "applytype": {
-              "name": "applytype",
-              "value": "C"
-            }
-          }
+          status:'0'
         },
         columns: [ //数据列
-          {prop: "applyno",label: "提现单号",minWidth: 160},
-          {prop: "deptid",label: "机构代码",minWidth: 100},
-          {prop: "deptname",label: "机构名称",minWidth: 100},
-          {prop: "accountbalance",label: "可提现账户余额",minWidth: 100},
-          {prop: "applyamount",label: "提现金额",minWidth: 100},
-          {prop: "balance",label: "账户余额",minWidth: 100},
-          {prop: "disrate",label: "服务费",minWidth: 100},
-          {prop: "bankname",label: "开户行",minWidth: 100},
-          {prop: "accountno",label: "账号",minWidth: 100},
-          {prop: "createtime",label: "申请时间",minWidth: 130}
+          {prop: "id",label: "提现单号",},
+          {prop: "deptId",label: "机构代码",},
+          {prop: "name",label: "机构名称"},
+          {prop: "amount",label: "提现金额"},
+          {prop: "createTime",label: "申请时间"}
         ],
         //------------协议下拉框数据   begin-----------------
         agreementtypeoptions: [], //协议类型
@@ -84,14 +66,14 @@
       };
     },
     created() {
-      this.peopleid = Cookies.get('user');
-      if(this.peopleid!='admin'){
-        this.peopledeptid = Cookies.get('user').split('D')[0];
-        this.pageRequest.columnFilters.deptid.value=this.peopledeptid;
-      }else{
-        this.peopledeptid = '9';
-        this.pageRequest.columnFilters.deptid.value=this.peopledeptid;
-      }
+      // this.peopleid = Cookies.get('user');
+      // if(this.peopleid!='admin'){
+      //   this.peopledeptid = Cookies.get('user').split('D')[0];
+      //   this.pageRequest.columnFilters.deptid.value=this.peopledeptid;
+      // }else{
+      //   this.peopledeptid = '9';
+      //   this.pageRequest.columnFilters.deptid.value=this.peopledeptid;
+      // }
       //获取所有下拉框数据
       this.getDictItems("agreementtype");
     },
@@ -162,7 +144,7 @@
           this.pageRequest.pageNum = data.pageRequest.pageNum;
           this.pageRequest.pageSize = data.pageRequest.pageSize;
         }
-        that.$api.task.payApplyFindPage(that.pageRequest)
+        that.$api.task.WithdrawqueryStatus(that.pageRequest)
           .then(res => {
             console.log(res.data)
             that.pageResult = res.data;
@@ -170,31 +152,41 @@
           .then(data != null ? data.callback : "");
       },
       handleButton3({row,index}) {
-        let auditid = Cookies.get('user') // 放置token到Cookie
-        let auditname = Cookies.get('name') // 放置token到Cookie
-        this.$confirm('是否确认审核并线下支付?', '提示', {}).then(() => {
-          var data = {
-            "applyno": row.applyno,
-            "applystatus": '2',
-            "auditid": auditid,
-            "auditname": auditname,
-            "paytime": this.formatTime(new Date().getTime(), 'Y-M-D h:m:s')
-          }
-          this.$api.task.insPayApplyAudit(data).then(res => {
-            this.dialogVisible = false
-            this.findPage(null);
-            this.$message({
-              type: 'success',
-              message: '已提交'
-            });
+        console.log(row,222222222);
+        this.$prompt('是否审核通过,输入驳回原因', '提示', {
+          confirmButtonText: '审核驳回',
+          cancelButtonText: '审核通过',
+          inputPattern: /^.+$/,
+          inputErrorMessage: '输输入驳回原因!'
+        }).then(({ value }) => {
+            this.$api.task.withdraAaudit({...row,status:'2',remark:value}).then(res => {
+            if(res.code==200){
+              this.dialogVisible = false
+              this.findPage(null);
+              this.$message({
+                type: 'success',
+                message: '审核驳回通过'
+              });
+            }
+            else{
+              this.$message.error(res.msg)
+            }
           });
         }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消审核'
-          });
+          this.$api.task.withdraAaudit({...row,status:'1'}).then(res => {
+            if(res.code==200){
+              this.dialogVisible = false
+              this.findPage(null);
+              this.$message({
+                type: 'success',
+                message: '审核通过'
+              });
+            }
+            else{
+              this.$message.error(res.msg)
+            }
+          })
         });
-
       },
 
       // 格式化日期,如月、日、时、分、秒保证为2位数

+ 17 - 0
src/views/FinancialManagement/WithdrawalManagement/GeneralizationEnd.vue

@@ -15,6 +15,16 @@
           <el-form-item label="提现单号">
             <el-input v-model="queryForm.id" placeholder="提现单号" clearable></el-input>
           </el-form-item>
+          <el-form-item label="提现时间">
+            <el-date-picker
+              v-model="queryForm.date"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" size="small" @click="findPage">查询</el-button>
           </el-form-item>
@@ -95,6 +105,13 @@ export default {
         this.pageRequest.pageNum = data.pageRequest.pageNum;
         this.pageRequest.pageSize = data.pageRequest.pageSize;
       }
+      if (this.queryForm.date && this.queryForm.date.length>0) {
+        this.queryForm.startTime = this.queryForm.date[0];
+        this.queryForm.endTime = this.queryForm.date[1];
+      } else {
+        this.queryForm.startTime = "";
+        this.queryForm.endTime = "";
+      }
       that.$api.task
         .payqueryPage({
           ...this.pageRequest,

+ 17 - 0
src/views/FinancialManagement/WithdrawalManagement/GeneralizationPending.vue

@@ -15,6 +15,16 @@
           <el-form-item label="提现单号">
             <el-input v-model="queryForm.id" placeholder="提现单号" clearable></el-input>
           </el-form-item>
+          <el-form-item label="提现时间">
+            <el-date-picker
+              v-model="queryForm.date"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" size="small" @click="findPage">查询</el-button>
           </el-form-item>
@@ -103,6 +113,13 @@ export default {
         this.pageRequest.pageNum = data.pageRequest.pageNum;
         this.pageRequest.pageSize = data.pageRequest.pageSize;
       }
+      if (this.queryForm.date && this.queryForm.date.length>0) {
+        this.queryForm.startTime = this.queryForm.date[0];
+        this.queryForm.endTime = this.queryForm.date[1];
+      } else {
+        this.queryForm.startTime = "";
+        this.queryForm.endTime = "";
+      }
       that.$api.task
         .payqueryPage({ ...this.pageRequest, ...this.queryForm,amountStatus:'3' })
         .then(res => {

+ 17 - 0
src/views/FinancialManagement/WithdrawalManagement/NonDocumentaryEnd.vue

@@ -15,6 +15,16 @@
           <el-form-item label="提现单号">
             <el-input v-model="queryForm.id" placeholder="提现单号" clearable></el-input>
           </el-form-item>
+          <el-form-item label="提现时间">
+            <el-date-picker
+              v-model="queryForm.date"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" size="small" @click="findPage">查询</el-button>
           </el-form-item>
@@ -95,6 +105,13 @@ export default {
         this.pageRequest.pageNum = data.pageRequest.pageNum;
         this.pageRequest.pageSize = data.pageRequest.pageSize;
       }
+      if (this.queryForm.date && this.queryForm.date.length>0) {
+        this.queryForm.startTime = this.queryForm.date[0];
+        this.queryForm.endTime = this.queryForm.date[1];
+      } else {
+        this.queryForm.startTime = "";
+        this.queryForm.endTime = "";
+      }
       that.$api.task
         .payqueryPage({
           ...this.pageRequest,

+ 17 - 0
src/views/FinancialManagement/WithdrawalManagement/NonDocumentaryPending.vue

@@ -15,6 +15,16 @@
           <el-form-item label="提现单号">
             <el-input v-model="queryForm.id" placeholder="提现单号" clearable></el-input>
           </el-form-item>
+          <el-form-item label="提现时间">
+            <el-date-picker
+              v-model="queryForm.date"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" size="small" @click="findPage">查询</el-button>
           </el-form-item>
@@ -103,6 +113,13 @@ export default {
         this.pageRequest.pageNum = data.pageRequest.pageNum;
         this.pageRequest.pageSize = data.pageRequest.pageSize;
       }
+      if (this.queryForm.date && this.queryForm.date.length>0) {
+        this.queryForm.startTime = this.queryForm.date[0];
+        this.queryForm.endTime = this.queryForm.date[1];
+      } else {
+        this.queryForm.startTime = "";
+        this.queryForm.endTime = "";
+      }
       that.$api.task
         .payqueryPage({ ...this.pageRequest, ...this.queryForm,amountStatus:'2' })
         .then(res => {

+ 17 - 0
src/views/FinancialManagement/WithdrawalManagement/WithdrawalProceduresEnd.vue

@@ -15,6 +15,16 @@
           <el-form-item label="提现单号">
             <el-input v-model="queryForm.id" placeholder="提现单号" clearable></el-input>
           </el-form-item>
+          <el-form-item label="提现时间">
+            <el-date-picker
+              v-model="queryForm.date"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" size="small" @click="findPage">查询</el-button>
           </el-form-item>
@@ -95,6 +105,13 @@ export default {
         this.pageRequest.pageNum = data.pageRequest.pageNum;
         this.pageRequest.pageSize = data.pageRequest.pageSize;
       }
+      if (this.queryForm.date && this.queryForm.date.length>0) {
+        this.queryForm.startTime = this.queryForm.date[0];
+        this.queryForm.endTime = this.queryForm.date[1];
+      } else {
+        this.queryForm.startTime = "";
+        this.queryForm.endTime = "";
+      }
       that.$api.task
         .payqueryPage({
           ...this.pageRequest,

+ 17 - 0
src/views/FinancialManagement/WithdrawalManagement/WithdrawalProceduresPending.vue

@@ -15,6 +15,16 @@
           <el-form-item label="提现单号">
             <el-input v-model="queryForm.id" placeholder="提现单号" clearable></el-input>
           </el-form-item>
+          <el-form-item label="提现时间">
+            <el-date-picker
+              v-model="queryForm.date"
+              type="datetimerange"
+              range-separator="至"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" size="small" @click="findPage">查询</el-button>
           </el-form-item>
@@ -103,6 +113,13 @@ export default {
         this.pageRequest.pageNum = data.pageRequest.pageNum;
         this.pageRequest.pageSize = data.pageRequest.pageSize;
       }
+      if (this.queryForm.date && this.queryForm.date.length>0) {
+        this.queryForm.startTime = this.queryForm.date[0];
+        this.queryForm.endTime = this.queryForm.date[1];
+      } else {
+        this.queryForm.startTime = "";
+        this.queryForm.endTime = "";
+      }
       that.$api.task
         .payqueryPage({ ...this.pageRequest, ...this.queryForm,amountStatus:'1' })
         .then(res => {

+ 18 - 2
src/views/PeopleManage/Staff/StaffExamine.vue

@@ -67,7 +67,7 @@
       <el-tabs v-model="activeName" >
         <el-tab-pane label="基本信息" name="1">
           <el-form :model="formData" disabled ref="formData" :inline="true" @keyup.enter.native="nextStep('1')"
-            label-width="130px" size="small">
+            label-width="110px" size="small">
             <el-row>
               <el-col :span="8">
                 <el-form-item label="机构名称" prop="deptId">
@@ -89,6 +89,8 @@
                   <el-input v-model="formData.mobile"></el-input>
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="身份证号" prop="identity">
                   <el-input v-model="formData.identity" :maxlength="18"></el-input>
@@ -105,6 +107,8 @@
                     show-password></el-input>
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="状态" prop="status">
                   <el-select style="width:200px" v-model="formData.status" placeholder="请选择">
@@ -135,7 +139,7 @@
         </el-tab-pane>
         <el-tab-pane label="详细信息" name="2">
           <el-form :model="formDataDetail" :rules="formDataRules" ref="formDataDetail" :inline="true"
-            label-width="130px" size="small">
+            label-width="110px" size="small">
             <el-row>
               <el-col :span="8">
                 <el-form-item label="开户账号" prop="accountno">
@@ -154,6 +158,8 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="出生日期" prop="birthday">
                   <el-date-picker disabled style="width:200px" v-model="formDataDetail.birthday" type="date"
@@ -176,6 +182,8 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="民族" prop="nations">
                   <el-select disabled style="width:200px" v-model="formDataDetail.nations" placeholder="请选择民族">
@@ -202,6 +210,8 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="邮政编码" prop="postalCode">
                   <el-input disabled v-model="formDataDetail.postalCode"></el-input>
@@ -223,6 +233,8 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="学历" prop="education">
                   <el-select disabled style="width:200px" v-model="formDataDetail.education" placeholder="请选择">
@@ -248,6 +260,8 @@
                   </el-date-picker>
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="原工作单位" prop="formerEmployer">
                   <el-input disabled v-model="formDataDetail.formerEmployer"></el-input>
@@ -265,6 +279,8 @@
                   <el-input disabled v-model="formDataDetail.agentQualificationCode"></el-input>
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="紧急联系人电话" prop="emergencyContactTel">
                   <el-input disabled v-model="formDataDetail.emergencyContactTel"></el-input>

+ 29 - 14
src/views/PeopleManage/Staff/StaffManage.vue

@@ -121,7 +121,7 @@
       <el-tabs v-model="activeName"  :before-leave="beforeTabLeave" >
         <el-tab-pane label="基本信息" name="1">
           <el-form :model="formData" :rules="formDataRules" ref="formData" :inline="true" @keyup.enter.native="nextStep()"
-            label-width="130px" size="small">
+            label-width="110px" size="small">
             <el-row>
               <el-col :span="8">
                 <el-form-item label="机构名称" prop="deptId">
@@ -144,6 +144,8 @@
                   <el-input v-model="formData.mobile"></el-input>
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="身份证号" prop="identity">
                   <el-input v-model="formData.identity" :maxlength="18" @change="identityChange"></el-input>
@@ -162,6 +164,8 @@
                     show-password></el-input> -->
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="状态" prop="status">
                   <el-select @change="statusChange" style="width:200px" v-model="formData.status" placeholder="请选择">
@@ -219,18 +223,17 @@
         </el-tab-pane>
         <el-tab-pane label="详细信息" name="2">
           <el-form :model="formDataDetail" :rules="formDataRulesDetail" ref="formDataDetail" :inline="true"
-           label-width="100px" size="small">
+           label-width="110px" size="small">
             <el-row>
               <el-col :span="8">
                 <el-form-item label="开户账号" prop="accountno">
-                  <el-input v-model="formDataDetail.accountno"></el-input>
+                  <el-input style="width:200px" v-model="formDataDetail.accountno"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="开户行" prop="bankName">
-                  <el-input v-model="formDataDetail.bankName"></el-input>
-                </el-form-item>、
-                
+                  <el-input style="width:200px" v-model="formDataDetail.bankName"></el-input>
+                </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="性别" prop="sex">
@@ -239,6 +242,8 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="出生日期" prop="birthday">
                   <el-date-picker style="width:200px" v-model="formDataDetail.birthday" type="date" placeholder="选择日期">
@@ -247,7 +252,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="户籍" prop="koseki">
-                  <el-input v-model="formDataDetail.koseki"></el-input>
+                  <el-input style="width:200px" v-model="formDataDetail.koseki"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -260,6 +265,8 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="民族" prop="nations">
                   <el-select style="width:200px" v-model="formDataDetail.nations" placeholder="请选择民族">
@@ -286,14 +293,16 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="邮政编码" prop="postalCode">
-                  <el-input v-model="formDataDetail.postalCode"></el-input>
+                  <el-input style="width:200px" v-model="formDataDetail.postalCode"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                  <el-form-item label="居住地址" prop="address">
-                   <el-input v-model="formDataDetail.address"></el-input>
+                   <el-input style="width:200px" v-model="formDataDetail.address"></el-input>
                  </el-form-item>
                </el-col>
              
@@ -307,6 +316,8 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="学历" prop="education">
                   <el-select style="width:200px" v-model="formDataDetail.education" placeholder="请选择">
@@ -322,7 +333,7 @@
               </el-col>
               <el-col :span="8">
                   <el-form-item label="毕业院校" prop="school">
-                    <el-input v-model="formDataDetail.school"></el-input>
+                    <el-input style="width:200px" v-model="formDataDetail.school"></el-input>
                   </el-form-item>
                 </el-col>
               <el-col :span="8">
@@ -331,9 +342,11 @@
                   </el-date-picker>
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="原工作单位" prop="formerEmployer">
-                  <el-input v-model="formDataDetail.formerEmployer"></el-input>
+                  <el-input style="width:200px" v-model="formDataDetail.formerEmployer"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -344,17 +357,19 @@
                 </el-col>
                 <el-col :span="8">
                 <el-form-item label="代理人资格证号" prop="agentQualificationCode">
-                  <el-input v-model="formDataDetail.agentQualificationCode"></el-input>
+                  <el-input style="width:200px" v-model="formDataDetail.agentQualificationCode"></el-input>
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="紧急联系人电话" prop="emergencyContactTel">
-                  <el-input v-model="formDataDetail.emergencyContactTel"></el-input>
+                  <el-input style="width:200px" v-model="formDataDetail.emergencyContactTel"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="紧急联系人姓名" prop="emergencyContactName">
-                  <el-input v-model="formDataDetail.emergencyContactName"></el-input>
+                  <el-input  style="width:200px" v-model="formDataDetail.emergencyContactName"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>

+ 28 - 12
src/views/PeopleManage/TeamLeader/TeamLeaderExamine.vue

@@ -100,7 +100,7 @@
       <el-tabs v-model="activeName">
         <el-tab-pane label="基本信息" name="1">
           <el-form :model="formData" disabled  ref="formData" :inline="true" @keyup.enter.native="nextStep()"
-            label-width="130px" size="small">
+            label-width="110px" size="small">
             <el-row>
               <el-col :span="8">
                 <el-form-item label="机构名称" prop="deptId">
@@ -122,6 +122,8 @@
                   <el-input v-model="formData.mobile"></el-input>
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="身份证号" prop="identity">
                   <el-input v-model="formData.identity" :maxlength="18"></el-input>
@@ -138,6 +140,8 @@
                     show-password></el-input>
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="状态" prop="status">
                   <el-select style="width:200px" v-model="formData.status" placeholder="请选择">
@@ -168,16 +172,16 @@
         </el-tab-pane>
         <el-tab-pane label="详细信息" name="2">
           <el-form :rules="formDataRules" :model="formDataDetail" ref="formDataDetail" :inline="true"
-            @keyup.enter.native="submitForml('提交审核')" label-width="130px" size="small">
+            @keyup.enter.native="submitForml('提交审核')" label-width="110px" size="small">
             <el-row>
               <el-col :span="8">
                 <el-form-item label="开户账号" prop="accountno">
-                  <el-input disabled v-model="formDataDetail.accountno"></el-input>
+                  <el-input style="width:200px" disabled v-model="formDataDetail.accountno"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="开户行" prop="bankName">
-                  <el-input disabled v-model="formDataDetail.bankName"></el-input>
+                  <el-input style="width:200px" disabled v-model="formDataDetail.bankName"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -187,6 +191,8 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="出生日期" prop="birthday">
                   <el-date-picker disabled style="width:200px" v-model="formDataDetail.birthday" type="date"
@@ -196,7 +202,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="户籍" prop="koseki">
-                  <el-input disabled v-model="formDataDetail.koseki"></el-input>
+                  <el-input style="width:200px" disabled v-model="formDataDetail.koseki"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -206,6 +212,8 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="民族" prop="nations">
                   <el-select disabled style="width:200px" v-model="formDataDetail.nations" placeholder="请选择民族">
@@ -228,14 +236,16 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="邮政编码" prop="postalCode">
-                  <el-input disabled v-model="formDataDetail.postalCode"></el-input>
+                  <el-input style="width:200px" disabled v-model="formDataDetail.postalCode"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="居住地址" prop="address">
-                  <el-input disabled v-model="formDataDetail.address"></el-input>
+                  <el-input style="width:200px" disabled v-model="formDataDetail.address"></el-input>
                 </el-form-item>
               </el-col>
 
@@ -246,6 +256,8 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="学历" prop="education">
                   <el-select disabled style="width:200px" v-model="formDataDetail.education" placeholder="请选择">
@@ -255,7 +267,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="毕业院校" prop="school">
-                  <el-input disabled v-model="formDataDetail.school"></el-input>
+                  <el-input style="width:200px" disabled v-model="formDataDetail.school"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -265,9 +277,11 @@
                   </el-date-picker>
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="原工作单位" prop="formerEmployer">
-                  <el-input disabled v-model="formDataDetail.formerEmployer"></el-input>
+                  <el-input style="width:200px" disabled v-model="formDataDetail.formerEmployer"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -279,17 +293,19 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="代理人资格证号" prop="agentQualificationCode">
-                  <el-input disabled v-model="formDataDetail.agentQualificationCode"></el-input>
+                  <el-input style="width:200px" disabled v-model="formDataDetail.agentQualificationCode"></el-input>
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="紧急联系人电话" prop="emergencyContactTel">
-                  <el-input disabled v-model="formDataDetail.emergencyContactTel"></el-input>
+                  <el-input style="width:200px" disabled v-model="formDataDetail.emergencyContactTel"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="紧急联系人姓名" prop="emergencyContactName">
-                  <el-input disabled v-model="formDataDetail.emergencyContactName"></el-input>
+                  <el-input style="width:200px" disabled v-model="formDataDetail.emergencyContactName"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="22">

+ 28 - 9
src/views/PeopleManage/TeamLeader/TeamLeaderManage.vue

@@ -133,7 +133,7 @@
             ref="formData"
             :inline="true"
             @keyup.enter.native="nextStep()"
-            label-width="130px"
+            label-width="110px"
             size="small"
           >
             <el-row>
@@ -165,6 +165,8 @@
                   <el-input v-model="formData.mobile"></el-input>
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="身份证号" prop="identity">
                   <el-input
@@ -190,6 +192,8 @@
                   <!-- show-password></el-input> -->
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="状态" prop="status">
                   <el-select
@@ -257,18 +261,18 @@
             :rules="formDataRulesDetail"
             ref="formDataDetail"
             :inline="true"
-            label-width="130px"
+            label-width="110px"
             size="small"
           >
             <el-row>
               <el-col :span="8">
                 <el-form-item label="开户账号" prop="accountno">
-                  <el-input v-model="formDataDetail.accountno"></el-input>
+                  <el-input style="width:200px" v-model="formDataDetail.accountno"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="开户行" prop="bankName">
-                  <el-input v-model="formDataDetail.bankName"></el-input>
+                  <el-input style="width:200px" v-model="formDataDetail.bankName"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -287,6 +291,8 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="出生日期" prop="birthday">
                   <el-date-picker
@@ -300,7 +306,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="户籍" prop="koseki">
-                  <el-input v-model="formDataDetail.koseki"></el-input>
+                  <el-input style="width:200px" v-model="formDataDetail.koseki"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -310,6 +316,8 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="民族" prop="nations">
                   <el-select  style="width:200px" v-model="formDataDetail.nations" placeholder="请选择民族">
@@ -332,14 +340,16 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="邮政编码" prop="postalCode">
-                  <el-input v-model="formDataDetail.postalCode"></el-input>
+                  <el-input style="width:200px" v-model="formDataDetail.postalCode"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="居住地址" prop="address">
-                  <el-input v-model="formDataDetail.address"></el-input>
+                  <el-input style="width:200px" v-model="formDataDetail.address"></el-input>
                 </el-form-item>
               </el-col>
 
@@ -354,6 +364,8 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="学历" prop="education">
                   <el-select
@@ -367,7 +379,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="毕业院校" prop="school">
-                  <el-input v-model="formDataDetail.school"></el-input>
+                  <el-input style="width:200px" v-model="formDataDetail.school"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -381,9 +393,11 @@
                   </el-date-picker>
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="原工作单位" prop="formerEmployer">
-                  <el-input v-model="formDataDetail.formerEmployer"></el-input>
+                  <el-input style="width:200px" v-model="formDataDetail.formerEmployer"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -403,13 +417,17 @@
                   prop="agentQualificationCode"
                 >
                   <el-input
+                  style="width:200px"
                     v-model="formDataDetail.agentQualificationCode"
                   ></el-input>
                 </el-form-item>
               </el-col>
+            </el-row>
+              <el-row>
               <el-col :span="8">
                 <el-form-item label="紧急联系人电话" prop="emergencyContactTel">
                   <el-input
+                  style="width:200px"
                     v-model="formDataDetail.emergencyContactTel"
                   ></el-input>
                 </el-form-item>
@@ -420,6 +438,7 @@
                   prop="emergencyContactName"
                 >
                   <el-input
+                  style="width:200px"
                     v-model="formDataDetail.emergencyContactName"
                   ></el-input>
                 </el-form-item>