build

src/views/dataDashboard/stockCount/components/dataWeido/columns.js

@@ -4,43 +4,46 @@ export default [
     _slot_: 'expand',
     label: ''
   },
-  {
-    prop: 'company_no',
-    label: '仓库业务公司编码',
-    width: '150'
-  },
+  // {
+  //   prop: 'company_no',
+  //   label: '仓库业务公司编码',
+  //   width: '150'
+  // },
   {
     prop: 'company_name',
     label: '仓库业务公司名称',
-    'min-width': '180'
-  },
-  {
-    prop: 'supplier_code',
-    label: '仓库所在公司编码',
-    width: '150'
+    'min-width': '180',
+    _slot_: 'company'
   },
+  // {
+  //   prop: 'supplier_code',
+  //   label: '仓库所在公司编码',
+  //   width: '150'
+  // },
   {
     prop: 'supplier_name',
     label: '仓库所在公司名称',
-    'min-width': '180'
+    'min-width': '180',
+    _slot_: 'supplier'
   },
   {
-    prop: 'contactor_name',
+    prop: 'person',
     label: '供应商负责人',
     'min-width': '100'
   },
-  {
-    prop: 'wsm_code',
-    label: '仓库编码',
-    width: '180'
-  },
+  // {
+  //   prop: 'wsm_code',
+  //   label: '仓库编码',
+  //   width: '180'
+  // },
   {
     prop: 'wsm_name',
     label: '仓库名称',
-    'min-width': '100'
+    'min-width': '180',
+    _slot_: 'wsm'
   },
   {
-    prop: 'person',
+    prop: 'contactor_name',
     label: '仓库负责人',
     'min-width': '100'
   },

src/views/dataDashboard/stockCount/components/dataWeido/index.vue

@@ -176,6 +176,33 @@
             ></el-table-column>
           </el-table>
         </template>
+
+        <template #company="{scope}">
+          <div style="display:flex;align-items:center">
+            <el-tooltip :content="'仓库业务公司编码 : ' + scope.row.company_no" placement="top">
+              <i class="el-icon-warning-outline" style="margin-right:2px;cursor:pointer" />
+            </el-tooltip>
+            <p>{{scope.row.company_name}}</p>
+          </div>
+        </template>
+
+        <template #supplier="{scope}">
+          <div style="display:flex;align-items:center">
+            <el-tooltip :content="'仓库所在公司编码 : ' + scope.row.supplier_code" placement="top">
+              <i class="el-icon-warning-outline" style="margin-right:2px;cursor:pointer" />
+            </el-tooltip>
+            <p>{{scope.row.supplier_name}}</p>
+          </div>
+        </template>
+
+        <template #wsm="{scope}">
+          <div style="display:flex;align-items:center">
+            <el-tooltip :content="'仓库编码 : ' + scope.row.wsm_code" placement="top">
+              <i class="el-icon-warning-outline" style="margin-right:2px;cursor:pointer" />
+            </el-tooltip>
+            <p>{{scope.row.wsm_name}}</p>
+          </div>
+        </template>
       </ex-table>
       <add-edit
         :id="modelId"
@@ -191,6 +218,8 @@
     </div>
   </div>
 </template>
+
+
 <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";

src/views/dataDashboard/stockCount/components/productWeido/index.vue

@@ -98,50 +98,77 @@
               label="仓库名称"
               prop="wsm_name"
               show-overflow-tooltip
-              width="150"
-            />
+              min-width="150"
+            >
+              <template slot-scope="scope">
+                <div style="display:flex;align-items:center">
+                  <el-tooltip :content="'仓库编码 : ' + scope.row.wsm_code" placement="top">
+                    <i class="el-icon-warning-outline" style="margin-right:2px;cursor:pointer" />
+                  </el-tooltip>
+                  <p>{{scope.row.wsm_name}}</p>
+                </div>
+              </template>
+            </el-table-column>
             <el-table-column 
               label="仓库负责人"
               prop="contactor_name"
               show-overflow-tooltip
               width="120"
             />
-            <el-table-column
+            <!-- <el-table-column
               label="仓库编码"
               prop="wsm_code"
               show-overflow-tooltip
               width="170"
-            ></el-table-column>
+            ></el-table-column> -->
             <el-table-column
               label="仓库所在公司名称"
               prop="supplierName"
               show-overflow-tooltip
-              width="150"
-            />
+              min-width="150"
+            >
+               <template slot-scope="scope">
+                <div style="display:flex;align-items:center">
+                  <el-tooltip :content="'仓库所在公司编码 : ' + scope.row.supplierNo" placement="top">
+                    <i class="el-icon-warning-outline" style="margin-right:2px;cursor:pointer" />
+                  </el-tooltip>
+                  <p>{{scope.row.supplierName}}</p>
+                </div>
+              </template>
+            </el-table-column>
             <el-table-column
               label="供应商负责人"
               prop="person"
               show-overflow-tooltip
               width="120"
             />
-            <el-table-column
+            <!-- <el-table-column
               label="仓库所在公司编码"
               prop="supplierNo"
               show-overflow-tooltip
               width="160"
-            ></el-table-column>
+            ></el-table-column> -->
             <el-table-column
               label="仓库业务公司名称"
               prop="company"
               show-overflow-tooltip
-              width="150"
-            ></el-table-column>
-            <el-table-column
+              min-width="150"
+            >
+              <template slot-scope="scope">
+                <div style="display:flex;align-items:center">
+                  <el-tooltip :content="'仓库业务公司名称 : ' + scope.row.companyNo" placement="top">
+                    <i class="el-icon-warning-outline" style="margin-right:2px;cursor:pointer" />
+                  </el-tooltip>
+                  <p>{{scope.row.company}}</p>
+                </div>
+              </template>
+            </el-table-column>
+            <!-- <el-table-column
               label="仓库业务公司编码"
               prop="companyNo"
               show-overflow-tooltip
               width="160"
-            ></el-table-column>
+            ></el-table-column> -->
             <el-table-column
               label="当前库存"
               width="100"

src/views/stock/stockCount/components/dataWeido/columns.js

@@ -4,43 +4,46 @@ export default [
     _slot_: 'expand',
     label: ''
   },
-  {
-    prop: 'company_no',
-    label: '仓库业务公司编码',
-    width: '150'
-  },
+  // {
+  //   prop: 'company_no',
+  //   label: '仓库业务公司编码',
+  //   width: '150'
+  // },
   {
     prop: 'company_name',
     label: '仓库业务公司名称',
-    'min-width': '180'
-  },
-  {
-    prop: 'supplier_code',
-    label: '仓库所在公司编码',
-    width: '150'
+    'min-width': '180',
+    _slot_: 'company'
   },
+  // {
+  //   prop: 'supplier_code',
+  //   label: '仓库所在公司编码',
+  //   width: '150'
+  // },
   {
     prop: 'supplier_name',
     label: '仓库所在公司名称',
-    'min-width': '180'
+    'min-width': '180',
+    _slot_: 'supplier'
   },
   {
-    prop: 'contactor_name',
+    prop: 'person',
     label: '供应商负责人',
     'min-width': '100'
   },
-  {
-    prop: 'wsm_code',
-    label: '仓库编码',
-    width: '180'
-  },
+  // {
+  //   prop: 'wsm_code',
+  //   label: '仓库编码',
+  //   width: '180'
+  // },
   {
     prop: 'wsm_name',
     label: '仓库名称',
-    'min-width': '100'
+    'min-width': '180',
+    _slot_: 'wsm'
   },
   {
-    prop: 'person',
+    prop: 'contactor_name',
     label: '仓库负责人',
     'min-width': '100'
   },

src/views/stock/stockCount/components/dataWeido/index.vue

@@ -161,6 +161,33 @@
             ></el-table-column>
           </el-table>
         </template>
+
+        <template #company="{scope}">
+          <div style="display:flex;align-items:center">
+            <el-tooltip :content="'仓库业务公司编码 : ' + scope.row.company_no" placement="top">
+              <i class="el-icon-warning-outline" style="margin-right:2px;cursor:pointer" />
+            </el-tooltip>
+            <p>{{scope.row.company_name}}</p>
+          </div>
+        </template>
+
+        <template #supplier="{scope}">
+          <div style="display:flex;align-items:center">
+            <el-tooltip :content="'仓库所在公司编码 : ' + scope.row.supplier_code" placement="top">
+              <i class="el-icon-warning-outline" style="margin-right:2px;cursor:pointer" />
+            </el-tooltip>
+            <p>{{scope.row.supplier_name}}</p>
+          </div>
+        </template>
+
+        <template #wsm="{scope}">
+          <div style="display:flex;align-items:center">
+            <el-tooltip :content="'仓库编码 : ' + scope.row.wsm_code" placement="top">
+              <i class="el-icon-warning-outline" style="margin-right:2px;cursor:pointer" />
+            </el-tooltip>
+            <p>{{scope.row.wsm_name}}</p>
+          </div>
+        </template>
       </ex-table>
       <add-edit
         :id="modelId"

src/views/stock/stockCount/components/productWeido/index.vue

@@ -86,50 +86,77 @@
               label="仓库名称"
               prop="wsm_name"
               show-overflow-tooltip
-              width="150"
-            />
+              min-width="150"
+            >
+              <template slot-scope="scope">
+                <div style="display:flex;align-items:center">
+                  <el-tooltip :content="'仓库编码 : ' + scope.row.wsm_code" placement="top">
+                    <i class="el-icon-warning-outline" style="margin-right:2px;cursor:pointer" />
+                  </el-tooltip>
+                  <p>{{scope.row.wsm_name}}</p>
+                </div>
+              </template>
+            </el-table-column>
             <el-table-column 
               label="仓库负责人"
               prop="contactor_name"
               show-overflow-tooltip
               width="120"
             />
-            <el-table-column
+            <!-- <el-table-column
               label="仓库编码"
               prop="wsm_code"
               show-overflow-tooltip
               width="170"
-            ></el-table-column>
+            ></el-table-column> -->
             <el-table-column
               label="仓库所在公司名称"
               prop="supplierName"
               show-overflow-tooltip
-              width="150"
-            />
+              min-width="150"
+            >
+               <template slot-scope="scope">
+                <div style="display:flex;align-items:center">
+                  <el-tooltip :content="'仓库所在公司编码 : ' + scope.row.supplierNo" placement="top">
+                    <i class="el-icon-warning-outline" style="margin-right:2px;cursor:pointer" />
+                  </el-tooltip>
+                  <p>{{scope.row.supplierName}}</p>
+                </div>
+              </template>
+            </el-table-column>
             <el-table-column
               label="供应商负责人"
               prop="person"
               show-overflow-tooltip
               width="120"
             />
-            <el-table-column
+            <!-- <el-table-column
               label="仓库所在公司编码"
               prop="supplierNo"
               show-overflow-tooltip
               width="160"
-            ></el-table-column>
+            ></el-table-column> -->
             <el-table-column
               label="仓库业务公司名称"
               prop="company"
               show-overflow-tooltip
-              width="150"
-            ></el-table-column>
-            <el-table-column
+              min-width="150"
+            >
+              <template slot-scope="scope">
+                <div style="display:flex;align-items:center">
+                  <el-tooltip :content="'仓库业务公司名称 : ' + scope.row.companyNo" placement="top">
+                    <i class="el-icon-warning-outline" style="margin-right:2px;cursor:pointer" />
+                  </el-tooltip>
+                  <p>{{scope.row.company}}</p>
+                </div>
+              </template>
+            </el-table-column>
+            <!-- <el-table-column
               label="仓库业务公司编码"
               prop="companyNo"
               show-overflow-tooltip
               width="160"
-            ></el-table-column>
+            ></el-table-column> -->
             <el-table-column
               label="当前库存"
               width="100"