暂存

src/styles/mixin.scss

@@ -8,7 +8,8 @@
 
 @mixin scrollBar {
   &::-webkit-scrollbar-track-piece {
-    background: #d3dce6;
+    background: transparent;
+    //#d3dce6;
   }
 
   &::-webkit-scrollbar {

src/views/biddingWorkbench/workbench/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="workbench pagePadding" style="padding-top:24px">
+  <div class="workbench pagePadding" style="padding-top: 24px">
     <div
       class="workbench-main"
       v-loading="loading"
@@ -7,22 +7,17 @@
     >
       <ul class="clear">
         <li>
-          <div class="taskTitle color1">项目单任务</div>
-          <div class="taskList">111</div>
-        </li>
-        <li>
-          <div class="taskTitle color2">咨询单任务</div>
-          <div class="taskList">111</div>
-        </li>
-        <li>
-          <div class="taskTitle color3">客户指定商品任务</div>
-          <div class="taskList">
+          <div class="taskTitle color1">咨询单任务</div>
+          <div class="taskList clear">
+            <div class="aaa" v-for="item in list" :key="item">{{ item }}</div>
             <div class="no-data">暂无数据！</div>
           </div>
         </li>
+
         <li>
-          <div class="taskTitle color4">服务</div>
+          <div class="taskTitle color2">客户指定商品任务</div>
           <div class="taskList">
+            <div class="aaa" v-for="item in list" :key="item">{{ item }}</div>
             <div class="no-data">暂无数据！</div>
           </div>
         </li>
@@ -72,6 +67,11 @@ export default {
       showModel: false,
       modelId: "000",
       sitem: {},
+      list: [
+        1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+        21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
+        39, 40,
+      ],
       parmValue: {
         page: 1, // 页码
         size: 15, // 每页显示条数
@@ -257,26 +257,56 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import "~@/styles/mixin.scss";
 .workbench {
   position: relative;
   width: 100%;
   height: 100%;
+  box-sizing: border-box;
+  background: #f0f2f5;
   .workbench-main {
     position: relative;
     width: 100%;
     height: 100%;
+    box-sizing: border-box;
     ul {
       width: 100%;
       height: 100%;
+      box-sizing: border-box;
       li {
-        float: left;
-        width: 23.9%;
         position: relative;
         height: 100%;
-        margin: 0 1.5% 0 0;
-        border: 1px solid rgba(121, 121, 121, 1);
-        &:last-child{
+        width: 100%;
+        border-radius: 5px;
+        overflow: hidden;
+        box-sizing: border-box;
+        // border: 1px solid rgba(121, 121, 121, 1);
+        .aaa {
+          border-bottom: 1px dashed #e6ebf5;
+          height: 140px;
+          line-height: 140px;
+          float: left;
+          width: 100%;
+          text-align: center;
+          // &:last-child{
+          //   border: 0;
+          // }
+        }
+        &:first-child {
+          float: left;
+          width: 66%;
+          margin: 0 2% 0 0;
+          .aaa {
+            width: 50%;
+            &:nth-child(2n + 1) {
+              border-right: 1px dashed #e6ebf5;
+            }
+          }
+        }
+        &:last-child {
           margin: 0;
+          float: right;
+          width: 32%;
         }
         .taskTitle {
           width: 100%;
@@ -284,33 +314,40 @@ export default {
           line-height: 55px;
           text-align: center;
           position: absolute;
-          top:0;
-          left:0;
+          top: 0;
+          left: 0;
           z-index: 2;
-          border-bottom: 1px solid rgba(121, 121, 121, 1);
+          // border-bottom: 1px solid rgba(121, 121, 121, 1);
           &.color1 {
             background: rgba(250, 205, 145, 1);
           }
           &.color2 {
             background: rgba(202, 249, 130, 1);
           }
-          &.color3 {
-            background: rgba(129, 211, 248, 1);
-          }
-          &.color4 {
-            background: rgba(255, 255, 128, 1);
-          }
+          // &.color3 {
+          //   background: rgba(129, 211, 248, 1);
+          // }
+          // &.color4 {
+          //   background: rgba(255, 255, 128, 1);
+          // }
         }
-        .taskList{
+        .taskList {
           position: relative;
-          padding:56px 0 0 0;
-          .no-data{
+          padding: 0 0 0 5px;
+          margin: 56px 0 0 0;
+          background: #fff;
+          height: calc(100% - 56px);
+          width: 100%;
+          overflow-y: scroll;
+          @include scrollBar();
+          .no-data {
             width: 100%;
             height: 60px;
             line-height: 60px;
             font-size: 14px;
+            float: left;
             text-align: center;
-            color: rgba(0,0,0,.65);
+            color: rgba(0, 0, 0, 0.65);
           }
         }
       }

src/views/goodStore/active/index.vue

@@ -315,7 +315,7 @@ export default {
     };
   },
   mounted() {
-    // this.searchList();
+    this.searchList();
   },
   methods: {
     restSearch() {

src/views/goodStore/activeGood/index.vue

@@ -326,7 +326,7 @@ export default {
     };
   },
   mounted() {
-    // this.searchList();
+    this.searchList();
   },
   methods: {
     restSearch() {

src/views/stock/survey/index.vue

@@ -5,7 +5,18 @@
     >
       <div style="width: 100%">
         <el-row style="padding: 15px 0 0 0px">
-          <el-col :span="12" style="width: 300px; padding: 0">
+          <el-col :span="12" style="width: 290px;">
+            <search-work-company
+              :value="parmValue.supplierNo"
+              :names="supplier_name"
+              :size="searchSize"
+              :is-detail="id !== 'add'"
+              :disabled="isDetail"
+              :placeholder="'业务公司'"
+              @searchChange="supplierChange"
+            />
+          </el-col>
+          <el-col :span="12" style="width: 300px; padding-left: 10px">
             <search-supplier
               :size="searchSize"
               :placeholder="'供应商公司'"
@@ -13,7 +24,7 @@
               @searchChange="selectSupplier"
             />
           </el-col>
-          <el-col :span="12" style="width: 200px; padding-left: 10px">
+          <el-col :span="12" style="width: 240px; padding-left: 10px">
             <search-stock
               :isDetail="true"
               :size="searchSize"
@@ -130,6 +141,7 @@ export default {
       stock_code: "",
       supplier_code: "",
       parmValue: {
+        supplierNo:[],
         supplier_code: [],
         stock_code: [],
         page: 1,
@@ -270,6 +282,14 @@ export default {
       this.pageInfo.curr = 1;
       this.stockList();
       this.searchList();
+    },
+       //供应商公司选择
+    supplierChange(e) {
+      if (e && e.id) {
+        this.parmValue.supplierNo = [e.code]; //供应商编码
+      } else {
+        this.parmValue.supplierNo = [];
+      }
     },
     // 选择供应商仓库
     selectStock(e) {