供应商管理

dsk-operate-ui/src/api/supplier/supplier.js

@@ -21,7 +21,8 @@ export function customerExport(param) {
     url: '/customer/export',
     method: 'post',
     data:param,
-    responseType: 'blob'
+    responseType: 'blob',
+    timeout: 60000
   });
 }
 //专业类别选项列表

dsk-operate-ui/src/assets/styles/supplierlist.scss

+.el-icon-arrow-down{
+  color: #C0C4CC;
+}
 .title_wrap,.el-divider{
   border-color: #eee;
 }
@@ -203,3 +206,6 @@
 
   }
 }
+.table-supplier .fixed-table .el-table__fixed-header-wrapper{
+  top: -16px !important;
+}

dsk-operate-ui/src/views/login.vue

@@ -77,6 +77,7 @@
             type="text"
             auto-complete="off"
             placeholder="请输入登录账号"
+            :onkeyup="loginForm.username = loginForm.username.replace(/\s+/g,'')"
           >
             <img class="img" slot="prefix" src="../assets/images/user.png"/>
           </el-input>
@@ -88,6 +89,7 @@
             auto-complete="off"
             placeholder="请输入账号密码"
             @keyup.enter.native="handleLogin"
+            :onkeyup="loginForm.password = loginForm.password.replace(/\s+/g,'')"
           >
             <img class="img" slot="prefix" src="../assets/images/password.png"/>
           </el-input>
@@ -99,6 +101,7 @@
             placeholder="请输入图形验证码"
             style="width: 290px;float: left;"
             @keyup.enter.native="handleLogin"
+            :onkeyup="loginForm.code = loginForm.code.replace(/\s+/g,'')"
           >
             <img class="img" slot="prefix" src="../assets/images/txyzm.png"/>
           </el-input>

dsk-operate-ui/src/views/supplier/supplierlist/laborSubcontractingTeam.vue

@@ -120,6 +120,11 @@
 
           </el-table-column>
 
+          <el-table-column label="营业执照号码" min-width="180">
+            <template slot-scope="scope">
+              {{scope.row.unifySocialCode||"--"}}
+            </template>
+          </el-table-column>
           <el-table-column label="推荐单位" min-width="280">
             <template slot-scope="scope">
               {{scope.row.recommendOrg||"--"}}
@@ -140,14 +145,24 @@
               {{scope.row.registerCity||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="专业类别" min-width="85" :resizable="false">
+          <el-table-column label="法人代表" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.groupSpecialty||"--"}}
+              {{scope.row.representative||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="法人代表" min-width="85" :resizable="false">
+          <el-table-column label="公司联系人" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.representative||"--"}}
+              {{scope.row.contactPerson||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="联系人电话" min-width="120" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.contactPhone||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="注册资本(万元)" min-width="120" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.registerCapital||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="纳税人身份" min-width="120" :resizable="false">
@@ -160,29 +175,44 @@
               {{scope.row.taxRate||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="施工承包范围" min-width="120" :resizable="false">
+          <el-table-column label="资质等级" min-width="85" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.credential||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="主项资质" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.constructJobScope||"--"}}
+              --
             </template>
           </el-table-column>
-          <el-table-column label="资质等级" min-width="85" :resizable="false">
+          <el-table-column label="劳务资质" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.credential||"--"}}
+              --
             </template>
           </el-table-column>
-          <el-table-column label="注册资本(万元)" min-width="120" :resizable="false">
+          <el-table-column label="施工队长" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.registerCapital||"--"}}
+              {{scope.row.leaderName||'--'}}
             </template>
           </el-table-column>
-          <el-table-column label="公司联系人" min-width="120" :resizable="false">
+          <el-table-column label="联系电话" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.contactPerson||"--"}}
+              {{scope.row.laborCaptainPhone||'--'}}
             </template>
           </el-table-column>
-          <el-table-column label="联系人电话" min-width="120" :resizable="false">
+          <el-table-column label="身份证号" min-width="180" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.contactPhone||"--"}}
+              {{scope.row.laborCaptainIdcard||'--'}}
+            </template>
+          </el-table-column>
+          <el-table-column label="队伍规模" min-width="85" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.serviceTeamPersonnum||'--'}}
+            </template>
+          </el-table-column>
+          <el-table-column label="专业特长" min-width="85" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.serviceTeamSpeciality||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="准入时间" min-width="120" :resizable="false">

dsk-operate-ui/src/views/supplier/supplierlist/ledger.vue

@@ -204,12 +204,12 @@
           </el-table-column>
           <el-table-column label="联系人电话" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.contactPhone||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="准入时间" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.contactPhone||"--"}}
+              {{scope.row.approveDate2||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司合作数量" min-width="120" :resizable="false">