暂存

src/components/search-stock-good-modal/columns.js

@@ -1,21 +1,31 @@
 export default [
-  { type: "selection", fixed: "left", _noset_: true, width: "45", align: "center"},
+  { type: "selection", fixed: "left", _noset_: true, width: "45", align: "center" },
   {
     prop: "spuCode",
     label: "商品编码",
-    width: "155",
+    width: "158",
   },
   {
     prop: "good_name",
     label: "商品名称",
-    "min-width": "120",
+    _slot_: "good_name",
+    "min-width": "200",
   },
   {
     prop: "class_cat",
     label: "分类",
-    "min-width": "100",
+    "width": "170",
+  },
+  {
+    prop: "brand_name",
+    label: "品牌",
+    "width": "100",
+  },
+  {
+    prop: "unit",
+    label: "单位",
+    width: "50",
   },
-
   {
     prop: "usable_stock",
     label: "可用库存",
@@ -42,11 +52,7 @@ export default [
   //   label: "商品库存",
   //   width: "70",
   // },
-  {
-    prop: "unit",
-    label: "单位",
-    width: "45",
-  },
+
   // {
   //   prop: "bstatus",
   //   label: "当前状态",
@@ -59,21 +65,8 @@ export default [
   //   prop: "classArr",
   //   label: "商品类别",
   // },
-  {
-    prop: "color",
-    label: "商品颜色",
-    width: "70",
-  },
-  {
-    prop: "material",
-    label: "商品材质",
-    width: "70",
-  },
-  {
-    prop: "brand",
-    label: "品牌",
-    "width": "70",
-  },
+
+
   // {
   //   prop: "good_type",
   //   label: "商品类型",

src/components/search-stock-good-modal/index.vue

@@ -23,12 +23,30 @@
         style="width: 100%"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column
-          v-for="(column, index) in columns"
-          :key="column + index"
-          show-overflow-tooltip
-          v-bind="column"
-        />
+        <template v-for="(column, index) in columns">
+          <el-table-column
+            v-if="column._slot_ && column._slot_ === 'good_name'"
+            show-overflow-tooltip
+            :key="column + index"
+          >
+            <template slot-scope="scope">
+              <span>{{ scope.row.good_name }}</span>
+              <span
+                v-for="(si, sii) in scope.row.specinfo"
+                :key="si.spec_value_id + sii"
+                >{{ sii === 0 ? "_" : "-" }}{{ si.spec_name }}[{{
+                  si.spec_value
+                }}]</span
+              >
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-else
+            :key="column + index"
+            show-overflow-tooltip
+            v-bind="column"
+          />
+        </template>
       </el-table>
       <div
         v-if="pageInfo !== false && tableData && tableData.length > 0"
@@ -140,7 +158,6 @@ export default {
   },
 
   methods: {
-    
     restSearch() {
       this.parmValue = {
         wsm_code: "", //仓库code

src/views/sellOut/sellOutOrder/columns.js

@@ -2,11 +2,19 @@ const columns = [
   {
     prop: "outCode",
     label: "发货申请单编号",
-    width: "160"
+    width: "156"
   },
+
+  {
+    prop: "orderCode",
+    label: "订单编号",
+    width: "156"
+  },
+
   {
     prop: "apply_name",
     label: "申请人",
+    width: "70px",
   },
   // {
   //   prop: "orderCode",
@@ -39,11 +47,11 @@ const columns = [
     label: "商品名称",
     width: "150"
   },
-  {
-    prop: "supplierNo",
-    label: "供应商编码",
-    width: "160"
-  },
+  // {
+  //   prop: "supplierNo",
+  //   label: "供应商编码",
+  //   width: "160"
+  // },
 
 
   {
@@ -56,23 +64,23 @@ const columns = [
     label: "客户名称",
     width: "200"
   },
-  {
-    prop: "contactor",
-    label: "联系人",
-  },
-  {
-    prop: "mobile",
-    label: "联系电话",
-    width: "100"
-  },
-  {
-    prop: "post_name",
-    label: "物流公司",
-  },
-  {
-    prop: "post_code",
-    label: "物流单号",
-  },
+  // {
+  //   prop: "contactor",
+  //   label: "联系人",
+  // },
+  // {
+  //   prop: "mobile",
+  //   label: "联系电话",
+  //   width: "100"
+  // },
+  // {
+  //   prop: "post_name",
+  //   label: "物流公司",
+  // },
+  // {
+  //   prop: "post_code",
+  //   label: "物流单号",
+  // },
   {
     prop: "post_fee",
     label: "物流费用",

src/views/stock/allot/columns.js

@@ -1,24 +1,32 @@
-
 export default [
-  // 表格 - 列参数
-
   {
     prop: "allot_code",
     label: "调拨编号",
-    width: "170"
+    width: "158"
   },
 
   {
-    prop: "name",
-    label: "出库仓库名称",
-    width: "95"
+    prop: "status",
+    label: "调拨状态",
+    _slot_: "status",
+    width: "130px",
   },
-
   {
-    prop: "wsm_code",
-    label: "出库仓库编号",
+    prop: "apply_name",
+    label: "申请人",
+    width: "80"
+  },
+  {
+    prop: "out_company_name",
+    label: "出库仓库业务公司",
     width: "172"
   },
+
+  {
+    prop: "out_companyNo",
+    label: "出库仓库业务公司编号",
+    width: "158"
+  },
   {
     prop: "rname",
     label: "出库仓库所在公司",
@@ -30,18 +38,28 @@ export default [
     label: "出库仓库所在公司编号",
     width: "145"
   },
-
   {
-    prop: "wsm_in_name",
-    label: "入库仓库名称",
+    prop: "name",
+    label: "出库仓库名称",
     width: "95"
+  },
 
+  {
+    prop: "wsm_code",
+    label: "出库仓库编号",
+    width: "172"
   },
+
   {
-    prop: "wsm_in_code",
-    label: "入库仓库编号",
+    prop: "in_company_name",
+    label: "入库仓库业务公司",
     width: "172"
+  },
 
+  {
+    prop: "in_companyNo",
+    label: "入库仓库业务公司编号",
+    width: "158"
   },
   {
     prop: "tname",
@@ -56,16 +74,20 @@ export default [
 
   },
   {
-    prop: "apply_name",
-    label: "申请人",
-    width: "80"
+    prop: "wsm_in_name",
+    label: "入库仓库名称",
+    width: "95"
+
   },
   {
-    prop: "status",
-    label: "调拨状态",
-    _slot_: "status",
-    width: "130px",
+    prop: "wsm_in_code",
+    label: "入库仓库编号",
+    width: "172"
+
   },
+
+
+
   {
     prop: "addtime",
     label: "创建时间",

src/views/stock/allot/components/addForm.vue

@@ -1,6 +1,6 @@
 <template>
   <el-row class="addForm">
-    <p>{{ powers }}</p>
+    <!-- <p>{{ powers }}</p> -->
     <el-col :span="24">
       <el-form
         :model="ruleForm"
@@ -499,6 +499,7 @@ export default {
             v.error_remark = v.error_remark || "";
             v.stock_num = v.stock_num || "0";
             v.edit = false;
+            v.spuCode = v.good_type_code;
             this.tableForm.product_go.push(v);
           });
           let columnsList = JSON.parse(JSON.stringify(config.columns));
@@ -681,7 +682,7 @@ export default {
         dList = JSON.parse(JSON.stringify(this.delList));
       console.log(addList);
       addList.forEach((v1, index) => {
-        let oldindex = oldList.findIndex((v2) => v1.type_code === v2.type_code);
+        let oldindex = oldList.findIndex((v2) => v1.spuCode=== v2.spuCode);
         if (oldindex === -1) {
           addList[index].usable_num = addList[index].usable_stock;
           addList[index].allot_num = addList[index].usable_stock;
@@ -690,7 +691,7 @@ export default {
         }
       });
       newList.forEach((v3) => {
-        let otherindex = dList.findIndex((v4) => v3.type_code === v4.type_code);
+        let otherindex = dList.findIndex((v4) => v3.spuCode === v4.spuCode);
         if (otherindex !== -1) {
           dList.splice(otherindex, 1);
         }

src/views/stock/allot/components/columns.js

@@ -54,8 +54,8 @@ export default {
   columns: [
     // 表格 - 列参数
     {
-      prop: "type_code",
-      label: "商品属性编码",
+      prop: "spuCode",
+      label: "商品编号",
       width: "160",
       show: true,
       type:"text"

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

@@ -1,57 +1,69 @@
 export default [
-    {
-          type: "expand",
-          _slot_: "expand",
-          label: "",
-        },
-        {
-          prop: "good_code",
-          label: "商品编码",
-          width: "160",
-        },
-        // {
-        //   prop: "type_code",
-        //   label: "属性编码",
-        //   width: "150",
-        // },
-        {
-          prop: "good_name",
-          label: "商品名称",
-          "min-width": "150",
-        },
-        {
-          prop: "sort_f",
-          label: "分类",
-          width: "155",
-        },
-        {
-          prop: "unit",
-          label: "单位",
-          width: "50",
-        },
-        {
-          prop: "usable_stock",
-          label: "当前库存",
-          width: "80",
-        },
-        {
-          prop: "wait_in_stock",
-          label: "待入库",
-          width: "80",
-        },
-        {
-          prop: "wait_out_stock",
-          label: "待出库",
-          width: "80",
-        },
-        {
-          prop: "intra_stock",
-          label: "在途库存",
-          width: "80",
-        },
-        {
-          prop: "intra_stock",
-          label: "预警库存",
-          width: "80",
-        },
+  {
+    type: "expand",
+    _slot_: "expand",
+    label: "",
+  },
+  {
+    prop: "good_code",
+    label: "商品编码",
+    width: "160",
+  },
+  // {
+  //   prop: "type_code",
+  //   label: "属性编码",
+  //   width: "150",
+  // },
+  {
+    prop: "good_name",
+    label: "商品名称",
+    "min-width": "150",
+  },
+  {
+    prop: "specinfo",
+    label: "规格",
+    "min-width": "150",
+    _slot_: 'specinfo'
+  },
+  {
+    prop: "sort_f",
+    label: "分类",
+    width: "155",
+  },
+  {
+    prop: "brand_name",
+    label: "分类",
+    width: "85",
+  },
+  
+  {
+    prop: "unit",
+    label: "单位",
+    width: "50",
+  },
+  {
+    prop: "usable_stock",
+    label: "当前库存",
+    width: "80",
+  },
+  {
+    prop: "wait_in_stock",
+    label: "待入库",
+    width: "80",
+  },
+  {
+    prop: "wait_out_stock",
+    label: "待出库",
+    width: "80",
+  },
+  {
+    prop: "intra_stock",
+    label: "在途库存",
+    width: "80",
+  },
+  // {
+  //   prop: "intra_stock",
+  //   label: "预警库存",
+  //   width: "80",
+  // },
 ]

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

@@ -74,35 +74,80 @@
             <el-table-column
               label="仓库名称"
               prop="wsm_name"
-              width="80"
+              show-overflow-tooltip
+              width="150"
             ></el-table-column>
             <el-table-column
               label="仓库编码"
               prop="wsm_code"
-              width="180"
+              show-overflow-tooltip
+              width="170"
+            ></el-table-column>
+             <el-table-column
+              label="仓库所在公司名称"
+              prop="supplierName"
+              show-overflow-tooltip
+              width="150"
+            ></el-table-column>
+            <el-table-column
+              label="仓库所在公司编码"
+              prop="supplierNo"
+              show-overflow-tooltip
+              width="160"
+            ></el-table-column>
+             <el-table-column
+              label="仓库业务公司名称"
+              prop="company"
+              show-overflow-tooltip
+              width="150"
+            ></el-table-column>
+            <el-table-column
+              label="仓库业务公司编码"
+              prop="companyNo"
+              show-overflow-tooltip
+              width="160"
             ></el-table-column>
             <el-table-column
               label="当前库存"
+              width="100"
+              show-overflow-tooltip
               prop="total_stock"
             ></el-table-column>
             <el-table-column
               label="待入库"
+              width="100"
+              show-overflow-tooltip
               prop="wait_in_stock"
             ></el-table-column>
             <el-table-column
               label="待出库"
+              width="100"
+              show-overflow-tooltip
               prop="wait_out_stock"
             ></el-table-column>
             <el-table-column
               label="可用库存"
+              width="100"
+              show-overflow-tooltip
               prop="usable_stock"
             ></el-table-column>
             <el-table-column
               label="在途库存"
+              width="100"
+              show-overflow-tooltip
               prop="intra_stock"
             ></el-table-column>
           </el-table>
         </template>
+        <template #specinfo="{ scope }">
+          <span
+            v-for="(si, sii) in scope.row.specinfo"
+            :key="sii + si.spec_value_id"
+            >{{ sii === 0 ? "" : "-" }}{{ si.spec_name }}[{{
+              si.spec_value
+            }}]</span
+          >
+        </template>
       </ex-table>
       <add-edit
         :id="modelId"
@@ -121,7 +166,7 @@
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
-import {statusList} from "@/assets/js/statusList";
+import { statusList } from "@/assets/js/statusList";
 import asyncRequest from "@/apis/service/stock/productWeido";
 import { mapGetters } from "vuex";
 import columns from "./columns";

src/views/stock/stockCount/index.vue

@@ -7,15 +7,15 @@
         <el-row>
           <el-col>
             <el-tabs v-model="activeName">
-              <el-tab-pane label="商品维度" name="productWeido"
+              <!--  <el-tab-pane label="商品维度" name="productWeido"
                 ><product-weido
-              /></el-tab-pane>
-              <el-tab-pane label="仓库维度" name="dataWeido">
+              /></el-tab-pane>-->
+             <el-tab-pane label="仓库维度" name="dataWeido">
                 <data-weido
               /></el-tab-pane>
-              <el-tab-pane label="区间统计" name="count">
+             <!--   <el-tab-pane label="区间统计" name="count">
                 <space-count
-              /></el-tab-pane>
+              /></el-tab-pane> -->
             </el-tabs>
           </el-col>
         </el-row>
@@ -59,7 +59,7 @@ export default {
   },
   data() {
     return {
-      activeName: "productWeido", //默认选中的区间统计选项
+      activeName: "dataWeido", //默认选中的区间统计选项
     };
   },
   methods: {},

src/views/stock/survey/index.vue

@@ -230,6 +230,16 @@ export default {
           prop: "stock",
           label: "变动数量",
           "width": "90px",
+        },
+         {
+          prop: "companyNo",
+          label: "业务公司编号",
+          "width": "150px",
+        },
+        {
+          prop: "company",
+          label: "业务公司名称",
+         "min-width": "150px",
         },
         {
           prop: "code",