供应商管理

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

@@ -245,3 +245,6 @@
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+.el-range-editor--medium{
+  text-align: left;
+}

dsk-operate-ui/src/views/supplier/disableManagement/Unlist.vue

@@ -55,7 +55,7 @@
               <span>{{(formdata.pageNum - 1) *formdata.pageSize + scope.$index + 1}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="单据编号" :fixed="tableColumnFixed" width="120" :resizable="false">
+          <el-table-column label="单据编号" :fixed="tableColumnFixed" width="150" :resizable="false">
             <template slot-scope="scope">
               {{scope.row.frecordno||"--"}}
             </template>
@@ -75,7 +75,7 @@
 
           </el-table-column>
 
-          <el-table-column label="社会统一信用代码" min-width="150">
+          <el-table-column label="社会统一信用代码" min-width="180">
             <template slot-scope="scope">
               {{scope.row.funifiedsocialcreditcode||"--"}}
             </template>
@@ -107,7 +107,7 @@
           </el-table-column>
         </el-table>
       </div>
-      <div class="pagination clearfix" v-show="total>0">
+      <div class="pagination clearfix" v-show="total>formdata.pageSize">
         <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                        :total="total">
         </el-pagination>

dsk-operate-ui/src/views/supplier/disableManagement/disableList.vue

@@ -58,7 +58,7 @@
               <span>{{(formdata.pageNum - 1) *formdata.pageSize + scope.$index + 1}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="单据编号" :fixed="tableColumnFixed" width="120" :resizable="false">
+          <el-table-column label="单据编号" :fixed="tableColumnFixed" width="150" :resizable="false">
             <template slot-scope="scope">
               {{scope.row.frecordno||"--"}}
             </template>
@@ -78,7 +78,7 @@
 
           </el-table-column>
 
-          <el-table-column label="社会统一信用代码" min-width="150">
+          <el-table-column label="社会统一信用代码" min-width="180">
             <template slot-scope="scope">
               {{scope.row.funifiedsocialcreditcode||"--"}}
             </template>
@@ -110,7 +110,7 @@
           </el-table-column>
         </el-table>
       </div>
-      <div class="pagination clearfix" v-show="total>0">
+      <div class="pagination clearfix" v-show="total>formdata.pageSize">
         <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                        :total="total">
         </el-pagination>

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

@@ -351,7 +351,7 @@
 
               </el-table>
             </div>
-            <div class="pagination clearfix" v-show="total>0">
+            <div class="pagination clearfix" v-show="total>formdata.pageSize">
               <el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                              :total="total">
               </el-pagination>
@@ -426,7 +426,7 @@
                 </el-table-column>
               </el-table>
             </div>
-            <div class="pagination clearfix" v-show="total>0">
+            <div class="pagination clearfix" v-show="total>formdata.pageSize">
               <el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                              :total="total">
               </el-pagination>

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

@@ -56,7 +56,7 @@
           </el-table-column>
         </el-table>
       </div>
-      <div class="pagination clearfix" v-show="total>0">
+      <div class="pagination clearfix" v-show="total>pageSize">
         <el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                        :total="total">
         </el-pagination>

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

@@ -81,7 +81,7 @@
           </el-table-column>
         </el-table>
       </div>
-      <div class="pagination clearfix" v-show="total>0">
+      <div class="pagination clearfix" v-show="total>pageSize">
         <el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                        :total="total">
         </el-pagination>

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

@@ -94,11 +94,6 @@
               <span>{{(formdata.pageNum - 1) *formdata.pageSize + scope.$index + 1}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="二级市场编码" :fixed="tableColumnFixed" width="120" :resizable="false">
-            <template slot-scope="scope">
-              {{scope.row.secondaryCode||"--"}}
-            </template>
-          </el-table-column>
           <el-table-column label="供应商编号" prop="customerCode" :fixed="tableColumnFixed" width="120" :resizable="false">
           </el-table-column>
 
@@ -125,7 +120,11 @@
             </template>
 
           </el-table-column>
-
+          <el-table-column label="二级市场编码" width="120" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.secondaryCode||"--"}}
+            </template>
+          </el-table-column>
           <el-table-column label="推荐单位" min-width="280">
             <template slot-scope="scope">
               {{scope.row.recommendOrg||"--"}}
@@ -148,7 +147,7 @@
           </el-table-column>
           <el-table-column label="专业类别" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              <el-tooltip placement="top" v-if="scope.row.groupSpecialty.length>35">
+              <el-tooltip placement="top" v-if="scope.row.groupSpecialty&&scope.row.groupSpecialty.length>35">
                 <div slot="content">{{scope.row.groupSpecialty}}</div>
                 <span class="ellipsis">
                   {{scope.row.groupSpecialty||"--"}}
@@ -176,7 +175,7 @@
           </el-table-column>
           <el-table-column label="施工承包范围" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <el-tooltip placement="top-start" v-if="scope.row.constructJobScope.length>35">
+              <el-tooltip placement="top-start" v-if="scope.row.constructJobScope&&scope.row.constructJobScope.length>35">
                 <div slot="content">{{scope.row.constructJobScope}}</div>
                 <div class="ellipsis">
                   <span>{{scope.row.constructJobScope||"--"}}</span>
@@ -241,7 +240,7 @@
 
         </el-table>
       </div>
-      <div class="pagination clearfix" v-show="total>0">
+      <div class="pagination clearfix" v-show="total>formdata.pageSize">
         <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                        :total="total">
         </el-pagination>

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

@@ -99,11 +99,6 @@
               <span>{{(formdata.pageNum - 1) *formdata.pageSize + scope.$index + 1}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="二级市场编码" :fixed="tableColumnFixed" width="120" :resizable="false">
-            <template slot-scope="scope">
-              {{scope.row.secondaryCode||"--"}}
-            </template>
-          </el-table-column>
           <el-table-column label="供应商编号" prop="customerCode" :fixed="tableColumnFixed" width="120" :resizable="false">
           </el-table-column>
 
@@ -130,7 +125,11 @@
             </template>
 
           </el-table-column>
-
+          <el-table-column label="二级市场编码" width="120" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.secondaryCode||"--"}}
+            </template>
+          </el-table-column>
           <el-table-column label="营业执照号码" min-width="180">
             <template slot-scope="scope">
               {{scope.row.unifySocialCode||"--"}}
@@ -260,7 +259,7 @@
 
         </el-table>
       </div>
-      <div class="pagination clearfix" v-show="total>0">
+      <div class="pagination clearfix" v-show="total>formdata.pageSize">
         <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                        :total="total">
         </el-pagination>

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

@@ -86,7 +86,7 @@
         <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
                   v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '10px'}" class="table-item1 fixed-table" border highlight-current-row
                   :header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" :row-class-name="setRowClass" :header-cell-class-name="setCellClass"
-                  ref="theOwnerListTable">
+                  ref="theOwnerListTable" :row-key="'customerKey'">
 
           <el-table-column type="index" label="序号" :fixed="tableColumnFixed" width="60" :resizable="false">
             <template slot-scope="scope">
@@ -145,7 +145,7 @@
           </el-table-column>
           <el-table-column label="专业类别" min-width="520" :resizable="false">
             <template slot-scope="scope">
-              <el-tooltip placement="top" v-if="scope.row.groupSpecialty.length>35">
+              <el-tooltip placement="top" v-if="scope.row.groupSpecialty&&scope.row.groupSpecialty.length>35">
                 <div slot="content">{{scope.row.groupSpecialty}}</div>
                 <span class="ellipsis">
                   {{scope.row.groupSpecialty||"--"}}
@@ -184,7 +184,7 @@
               {{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.laborCaptainIdcard||"--"}}
             </template>
@@ -201,7 +201,7 @@
           </el-table-column>
           <el-table-column label="施工承包范围" min-width="520" :resizable="false">
             <template slot-scope="scope">
-              <el-tooltip placement="top-start" v-if="scope.row.constructJobScope.length>35">
+              <el-tooltip placement="top-start" v-if="scope.row.constructJobScope&&scope.row.constructJobScope.length>35">
                 <div slot="content">{{scope.row.constructJobScope}}</div>
                 <div class="ellipsis">
                   <span>{{scope.row.constructJobScope||"--"}}</span>
@@ -265,7 +265,7 @@
 
         </el-table>
       </div>
-      <div class="pagination clearfix" v-show="total>0">
+      <div class="pagination clearfix" v-show="total>formdata.pageSize">
         <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                        :total="total">
         </el-pagination>

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

@@ -141,7 +141,7 @@
           </el-table-column>
           <el-table-column label="专业类别" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              <el-tooltip placement="top" v-if="scope.row.groupSpecialty.length>35">
+              <el-tooltip placement="top" v-if="scope.row.groupSpecialty&&scope.row.groupSpecialty.length>35">
                 <div slot="content">{{scope.row.groupSpecialty}}</div>
                 <span class="ellipsis">
                   {{scope.row.groupSpecialty||"--"}}
@@ -169,7 +169,7 @@
           </el-table-column>
           <el-table-column label="施工承包范围" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <el-tooltip placement="top-start" v-if="scope.row.constructJobScope.length>35">
+              <el-tooltip placement="top-start" v-if="scope.row.constructJobScope&&scope.row.constructJobScope.length>35">
                 <div slot="content">{{scope.row.constructJobScope}}</div>
                 <div class="ellipsis">
                   <span>{{scope.row.constructJobScope||"--"}}</span>
@@ -234,7 +234,7 @@
 
         </el-table>
       </div>
-      <div class="pagination clearfix" v-show="total>0">
+      <div class="pagination clearfix" v-show="total>formdata.pageSize">
         <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                        :total="total">
         </el-pagination>

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

@@ -143,7 +143,7 @@
           </el-table-column>
           <el-table-column label="专业类别" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              <el-tooltip placement="top" v-if="scope.row.groupSpecialty.length>35">
+              <el-tooltip placement="top" v-if="scope.row.groupSpecialty&&scope.row.groupSpecialty.length>35">
                 <div slot="content">{{scope.row.groupSpecialty}}</div>
                 <span class="ellipsis">
                   {{scope.row.groupSpecialty||"--"}}
@@ -223,7 +223,7 @@
 
         </el-table>
       </div>
-      <div class="pagination clearfix" v-show="total>0">
+      <div class="pagination clearfix" v-show="total>formdata.pageSize">
         <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                        :total="total">
         </el-pagination>

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

@@ -215,7 +215,7 @@
 
         </el-table>
       </div>
-      <div class="pagination clearfix" v-show="total>0">
+      <div class="pagination clearfix" v-show="total>formdata.pageSize">
         <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                        :total="total">
         </el-pagination>