*

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

@@ -273,3 +273,34 @@
   -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
 }
+.evalist{
+  background: #fff;
+  display: flex;
+  padding: 12px 10px;
+  justify-content: space-around;
+  >div{
+    margin: 0 6px;
+    border: 1px solid #DCDFE6;
+    height: 78px;
+    width: calc(14.28% - 12px);
+    text-align: center;
+    line-height: 24px;
+    border-radius: 4px;
+    .eva1{
+      padding-top: 13px;
+      >img{
+        width: 24px;
+        margin-right: 5px;
+        margin-top: -1px;
+      }
+    }
+    .eva2{
+      padding-top: 8px;
+      >span{
+        font-weight: 500;
+        font-size: 24px;
+        margin-right: 5px;
+      }
+    }
+  }
+}

dsk-operate-ui/src/views/detail/party-a/component/CustomTimeSelect.vue

@@ -165,10 +165,18 @@ export default {
             startTime = new Date(endTime.getTime() - 3600 * 1000 * 24 * 7);
             timeStr = [this.formatDate(startTime), this.formatDate(endTime)];
             break;
+          case '近一周':
+            startTime = new Date(endTime.getTime() - 3600 * 1000 * 24 * 7);
+            timeStr = [this.formatDate(startTime), this.formatDate(endTime)];
+            break;
           case '近半月':
             startTime = new Date(endTime.getTime() - 3600 * 1000 * 24 * 15);
             timeStr = [this.formatDate(startTime), this.formatDate(endTime)];
             break;
+          case '近一月':
+            startTime = new Date(endTime.getTime() - 3600 * 1000 * 24 * 30);
+            timeStr = [this.formatDate(startTime), this.formatDate(endTime)];
+            break;
           case '近1年':
             startTime = new Date().setFullYear(new Date().getFullYear() - 1);
             if (this.dateTo) {

dsk-operate-ui/src/views/detail/party-a/component/HeadFormNew.vue

@@ -25,7 +25,7 @@
                 @mouseleave="searchUnHover($event,form)">
                 <img src="@/assets/images/enterprise/enterprise-search-icon.svg">
                 <transition name="fade-position" appear mode="out-in">
-                  <span v-if="!form.hover && !form.value">搜索</span>
+                  <span v-if="!form.hover && !form.value">{{form.isword?form.isword:'搜索'}}</span>
                   <el-input v-model="form.value" :placeholder="form.placeholder ? form.placeholder : '输入关键词查询'"
                     :style="form.width?'width:'+form.width+'px':'width:238px'" @focus.stop="searchFocus($event,form)"
                     @input="value => searchInput(value,form)" v-else @keydown.native.enter="changeSelect">

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

@@ -489,7 +489,8 @@
     color: #232323;
     height: 30px;
     margin-bottom: 50px;
-    padding-left: 10px;
+    /*padding-left: 10px;*/
+    text-align: center;
     img{
       width: 22px;
       margin-right: 8px;

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

@@ -210,11 +210,11 @@
       },
       //点击准入
       goAccess(row){
-        this.$tab.openPage('测试一下-准入情况', '/supplier/supplierlist/access')
+        this.$tab.openPage(row.customerName+'-准入情况', '/supplier/supplierlist/access')
       },
       //点击考评
       goAssessment(row){
-        this.$tab.openPage('测试一下-供应商考评', '/supplier/supplierlist/assessment')
+        this.$tab.openPage(row.customerName+'-供应商考评', '/supplier/supplierlist/assessment')
       },
     }
   }

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

@@ -218,11 +218,11 @@
       },
       //点击准入
       goAccess(row){
-        this.$tab.openPage('测试一下-准入情况', '/supplier/supplierlist/access')
+        this.$tab.openPage(row.customerName+'-准入情况', '/supplier/supplierlist/access')
       },
       //点击考评
       goAssessment(row){
-        this.$tab.openPage('测试一下-供应商考评', '/supplier/supplierlist/assessment')
+        this.$tab.openPage(row.customerName+'-供应商考评', '/supplier/supplierlist/assessment')
       },
     }
   }

dsk-operate-ui/src/views/supplier/supplierRating/result.vue

+<template>
+  <div class="supplier">
+    <div class="search-supplier">
+      <div class="title_wrap">
+        <div class="enterprise_title">
+          评价结果
+        </div>
+      </div>
+      <div class="content-supplier">
+        <el-form :model="formdata" label-width="82px" label-position="right"  :inline="true" >
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="分供方名称">
+                <el-input v-model="formdata.customerName" placeholder="请输入分供方名称" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="品类">
+                <el-select v-model="formdata.name1" placeholder="请选择" :collapse-tags="true" clearable>
+                  <!--<el-option v-for="(item,index) in suppliertype" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>-->
+                  <el-option label="物资" value="1"></el-option>
+                  <el-option label="设备" value="2"></el-option>
+                  <el-option label="劳务分包" value="3"></el-option>
+                  <el-option label="专业分包" value="4"></el-option>
+                  <el-option label="专业服务" value="5"></el-option>
+                  <el-option label="租赁" value="6"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="评价类型">
+                <el-select v-model="formdata.name2" placeholder="请选择" :collapse-tags="true" clearable>
+                  <!--<el-option v-for="(item,index) in suppliertype" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>-->
+                  <el-option label="物资" value="1"></el-option>
+                  <el-option label="设备" value="2"></el-option>
+                  <el-option label="劳务分包" value="3"></el-option>
+                  <el-option label="专业分包" value="4"></el-option>
+                  <el-option label="专业服务" value="5"></el-option>
+                  <el-option label="租赁" value="6"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="供应商状态">
+                <el-select v-model="formdata.customerState" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                  <el-option v-for="(item,index) in customstate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <el-form-item label="评价等级">
+                <el-select v-model="formdata.creditLevel" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                  <el-option v-for="(item,index) in creditlevel" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="资质等级">
+                <el-select v-model="formdata.credential" multiple placeholder="请选择" :collapse-tags="true" clearable>
+                  <el-option v-for="(item,index) in credential" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-divider></el-divider>
+          <el-row>
+
+            <el-col :span="8">
+              <el-form-item label="准入时间">
+                <el-date-picker
+                  v-model="formdata.times"
+                  type="daterange"
+                  value-format="yyyy-MM-dd"
+                  range-separator="至"
+                  start-placeholder="年/月/日"
+                  end-placeholder="年/月/日">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="涉诉状态">
+                <el-select multiple placeholder="请选择" :collapse-tags="true" clearable>
+                  <el-option v-for="(item,index) in litigationstatus" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-divider></el-divider>
+          <el-form-item label="  ">
+            <el-button type="primary" size="small" @click="getSearch">查询</el-button>
+            <el-button size="small" @click="clears">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import "@/assets/styles/public.scss";
+  import "@/assets/styles/supplierlist.scss";
+  export default {
+    name: 'result',
+    data(){
+      return{
+        formdata:{}
+      }
+    },
+    methods:{
+
+      getSearch(){
+        this.formdata.pageNum = 1
+        // this.customerAll()
+      },
+      clears() {
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

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

@@ -292,7 +292,7 @@
 
             <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
               <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
-                        v-sticky-header.always="{offsetTop : '0px',offsetBottom : '10px'}" class="table-item1 fixed-table" border highlight-current-row
+                        v-sticky-header.always="{offsetTop : '0px',offsetBottom : '-20px'}" 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">
 
@@ -469,7 +469,7 @@
         pageSize:20,
         pageNum:1,
         // table列是否悬浮
-        tableColumnFixed: true,
+        tableColumnFixed: false,
         custmerInfo:{},
 
       }

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

@@ -18,7 +18,7 @@
 
       <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
         <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
+                  v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" 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">
 

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

@@ -18,7 +18,7 @@
 
       <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
         <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
+                  v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" 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">
 

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

@@ -103,7 +103,7 @@
 
       <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
         <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
+                  v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" 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">
 
@@ -241,7 +241,8 @@
           </el-table-column>
           <el-table-column label="分包商等级" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <span class="wordprimary" @click="getFBS(scope.row)">{{scope.row.creditLevel||"--"}}</span>
+              <span class="wordprimary" @click="getFBS(scope.row)" v-if="scope.row.creditlevel">{{scope.row.creditLevel}}</span>
+              <span v-else>--</span>
             </template>
           </el-table-column>
           <el-table-column label="链接" min-width="160" :resizable="false">
@@ -493,7 +494,7 @@
       },
       //点击考评
       goAssessment(row){
-        this.$tab.openPage('测试一下-供应商考评', '/supplier/supplierlist/assessment')
+        this.$tab.openPage(row.customerName+'-供应商考评', '/supplier/supplierlist/assessment')
       },
     }
   }

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

@@ -110,7 +110,7 @@
 
       <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
         <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
+                  v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" 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">
 
@@ -262,7 +262,8 @@
           </el-table-column>
           <el-table-column label="分包商等级" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <span class="wordprimary" @click="getFBS(scope.row)">{{scope.row.creditLevel||"--"}}</span>
+              <span class="wordprimary" @click="getFBS(scope.row)" v-if="scope.row.creditlevel">{{scope.row.creditLevel}}</span>
+              <span v-else>--</span>
             </template>
           </el-table-column>
           <el-table-column label="链接" min-width="160" :resizable="false">
@@ -516,7 +517,7 @@
       },
       //点击考评
       goAssessment(row){
-        this.$tab.openPage('测试一下-供应商考评', '/supplier/supplierlist/assessment')
+        this.$tab.openPage(row.customerName+'-供应商考评', '/supplier/supplierlist/assessment')
       },
     }
   }

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

@@ -102,7 +102,7 @@
 
       <div class="table-item-jf table-item" v-if="!isSkeleton&&total>0">
         <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
+                  v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" 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" :row-key="'customerKey'">
 
@@ -120,13 +120,13 @@
                 <el-tooltip placement="top" v-if="scope.row.customerText.length>20">
                   <div slot="content">{{scope.row.customerText}}</div>
                   <div class="renling">
-                    <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?path=cooperationRecord&companyName=${scope.row.customerName}`" tag="a"
+                    <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?path=cooperationRecord&companyName=${scope.row.customerText}?customerId=scope.row.customerId`" tag="a"
                                  class="wordprimary" v-html="scope.row.customerName"></router-link>
                     <span v-else v-html="scope.row.customerName"></span>
                   </div>
                 </el-tooltip>
                 <div class="renling" v-else>
-                  <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?path=cooperationRecord&companyName=${scope.row.customerName}`" tag="a"
+                  <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?path=cooperationRecord&companyName=${scope.row.customerText}?customerId=scope.row.customerId`" tag="a"
                                class="wordprimary" v-html="scope.row.customerName"></router-link>
                   <span v-else v-html="scope.row.customerName"></span>
                 </div>
@@ -267,7 +267,8 @@
           </el-table-column>
           <el-table-column label="分包商等级" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <span class="wordprimary" @click="getFBS(scope.row)">{{scope.row.creditLevel||"--"}}</span>
+              <span class="wordprimary" @click="getFBS(scope.row)" v-if="scope.row.creditlevel">{{scope.row.creditLevel}}</span>
+              <span v-else>--</span>
             </template>
           </el-table-column>
           <el-table-column label="链接" min-width="160" :resizable="false">
@@ -527,11 +528,11 @@
       },
       //点击考评
       goAssessment(row){
-        this.$tab.openPage('测试一下-供应商考评', '/supplier/supplierlist/assessment')
+        this.$tab.openPage(row.customerName+'-供应商考评', '/supplier/supplierlist/assessment')
       },
       //点击处置
       goDisposal(row){
-        this.$tab.openPage('测试一下-供应商处置', '/supplier/supplierlist/disposal')
+        this.$tab.openPage(row.customerName+'-供应商处置', '/supplier/supplierlist/disposal')
       },
     }
   }

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

@@ -103,7 +103,7 @@
 
       <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
         <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
+                  v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" 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">
 
@@ -235,7 +235,8 @@
           </el-table-column>
           <el-table-column label="分包商等级" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <span class="wordprimary" @click="getFBS(scope.row)">{{scope.row.creditLevel||"--"}}</span>
+              <span class="wordprimary" @click="getFBS(scope.row)" v-if="scope.row.creditlevel">{{scope.row.creditLevel}}</span>
+              <span v-else>--</span>
             </template>
           </el-table-column>
           <el-table-column label="链接" min-width="160" :resizable="false">
@@ -489,7 +490,7 @@
       },
       //点击考评
       goAssessment(row){
-        this.$tab.openPage('测试一下-供应商考评', '/supplier/supplierlist/assessment')
+        this.$tab.openPage(row.customerName+'-供应商考评', '/supplier/supplierlist/assessment')
       },
     }
   }

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

@@ -103,7 +103,7 @@
 
       <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
         <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
+                  v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" 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">
 
@@ -224,7 +224,8 @@
           </el-table-column>
           <el-table-column label="分包商等级" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <span class="wordprimary" @click="getFBS(scope.row)">{{scope.row.creditLevel||"--"}}</span>
+              <span class="wordprimary" @click="getFBS(scope.row)" v-if="scope.row.creditlevel">{{scope.row.creditLevel}}</span>
+              <span v-else>--</span>
             </template>
           </el-table-column>
           <el-table-column label="链接" min-width="160" :resizable="false">
@@ -476,7 +477,7 @@
       },
       //点击考评
       goAssessment(row){
-        this.$tab.openPage('测试一下-供应商考评', '/supplier/supplierlist/assessment')
+        this.$tab.openPage(row.customerName+'-供应商考评', '/supplier/supplierlist/assessment')
       },
     }
   }

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

@@ -103,7 +103,7 @@
 
       <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
         <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
+                  v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" 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">
 
@@ -216,7 +216,8 @@
           </el-table-column>
           <el-table-column label="分包商等级" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <span class="wordprimary" @click="getFBS(scope.row)">{{scope.row.creditLevel||"--"}}</span>
+              <span class="wordprimary" @click="getFBS(scope.row)" v-if="scope.row.creditlevel">{{scope.row.creditLevel}}</span>
+              <span v-else>--</span>
             </template>
           </el-table-column>
           <el-table-column label="链接" min-width="160" :resizable="false">
@@ -468,7 +469,7 @@
       },
       //点击考评
       goAssessment(row){
-        this.$tab.openPage('测试一下-供应商考评', '/supplier/supplierlist/assessment')
+        this.$tab.openPage(row.customerName+'-供应商考评', '/supplier/supplierlist/assessment')
       },
     }
   }