Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb

src/views/invoicing/components/operatingDetail.vue

@@ -54,7 +54,12 @@ export default {
     methods: {
         //返回现有库存数量
         returnNowHasNumbr(row) {
-            return row.stockNumber * 1 + row.number * 1 + row.unitName
+            const subType=this.tableData.detail.subType||1
+            console.log(row)
+            if(!row.hasOwnProperty('number')){
+                return ''
+            }
+            return row.stockNumber * 1 + row.number * subType + row.unitName
         },
         show(row) {
             this.dialogVisible = true
@@ -67,6 +72,7 @@ export default {
                 const res = await tbProductStockOperateDetail(id)
                 this.tableData.loading = false
                 this.tableData.detail = res
+                
             } catch (error) {
                 console.log(error);
             }

src/views/invoicing/consumable/specifications.vue

@@ -186,11 +186,9 @@
                         v-model="haocai.conName"
                         style="width: 130px"
                         placeholder="请选择耗材信息"
-                      
                       ></el-input>
                     </div>
                   </div>
-                 
                 </template>
               </el-table-column>
               <el-table-column label="单位耗材值" width="180">
@@ -212,14 +210,15 @@
                           v-if="scope.row.haocais.length > 1"
                           type="danger"
                           size="mini"
-                        @click="delGoodsHaocai(scope.row.haocais, haocaiIndex)"
+                          @click="
+                            delGoodsHaocai(scope.row.haocais, haocaiIndex)
+                          "
                           icon="el-icon-delete"
                           circle
                         ></el-button>
                       </div>
                     </div>
                   </div>
-                 
                 </template>
               </el-table-column>
               <el-table-column label="操作">
@@ -234,7 +233,6 @@
                     增加耗材
                   </el-button> -->
                 </template>
-                
               </el-table-column>
             </el-table-column>
             <!-- <el-table-column label="操作">
@@ -325,7 +323,20 @@
       @close="resetHaocaiTable"
     >
       <div class="head-container flex">
-        <el-input
+        <el-select
+          v-model="queryinformation.conTypeId"
+          placeholder="请选择耗材分类"
+          style="width: 100%; margin-right: 10px"
+        >
+          <el-option
+            :label="item.conTypeName"
+            :value="item.id"
+            v-for="item in consTypeList"
+            :key="item.conTypeId"
+          />
+        </el-select>
+
+        <!-- <el-input
           v-model="queryinformation.conTypeId"
           size="small"
           clearable
@@ -333,7 +344,7 @@
           style="width: 100%"
           class="filter-item"
           @keyup.enter.native="getTableDatainformation"
-        />
+        /> -->
         <el-input
           v-model="queryinformation.conTypeName"
           size="small"
@@ -365,7 +376,7 @@
           <el-button
             style="margin-right: 20px"
             type="primary"
-            @click="getTableDatainformation"
+            @click="haocaiChaxun"
             >查询</el-button
           >
           <el-button @click="resetHandleinformation">重置</el-button>
@@ -409,7 +420,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="head-container" style="margin-top: 10px;">
+      <div class="head-container" style="margin-top: 10px">
         <el-pagination
           :total="tableDatainformation.total"
           :current-page="tableDatainformation.page + 1"
@@ -468,6 +479,7 @@ import dayjs from "dayjs";
 import shopList from "../components/shopList";
 import bindHaocai from "./components/specifications_bind_supplies";
 import { upProSort, tbProduct } from "@/api/shop";
+import { gettbConsType } from "@/api/consumable";
 import {
   getviewConSku,
   gettbProductSpec,
@@ -513,6 +525,7 @@ export default {
         loading: false,
         total: 0,
       },
+      consTypeList: [],
       queryinformation: {
         conTypeId: "",
         conTypeName: "",
@@ -552,12 +565,26 @@ export default {
     this.getTableData();
     this.getTableDatasku();
     this.getTableDatainformation();
+    this.gettbConsType();
     this.$nextTick(() => {
       // this.tableDrag()
       // this.$refs.shopList.isselectEvent()
     });
   },
   methods: {
+    // 获取类型
+    async gettbConsType() {
+      try {
+        const res = await gettbConsType({
+          page: 0,
+          size: 100,
+          shopId: localStorage.getItem("shopId"),
+        });
+        this.consTypeList = res.content;
+      } catch (error) {
+        console.log(error);
+      }
+    },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (columnIndex === 0) {
         let index = this.commodityArr.findIndex((v) => v.id === row.id);
@@ -616,7 +643,7 @@ export default {
       this.informationdialogshow = false;
     },
     haocaiConfirm() {
-      let hasEmpty=JSON.stringify(haocaiSelectedMap)=='{}'
+      let hasEmpty = JSON.stringify(haocaiSelectedMap) == "{}";
       if (!hasEmpty) {
         this.commodityArr.forEach((ele) => {
           if (ele.skuId == this.ALLisDistribute.skuId) {
@@ -683,7 +710,6 @@ export default {
     selectShop(res) {
       const skuArr = [];
 
-
       res.forEach((ele) => {
         ele.skuList.forEach((sku) => {
           skuArr.push({
@@ -752,10 +778,11 @@ export default {
     },
     // 选择耗材
     selecthaocai(item) {
+      console.log(item)
+      console.log(haocaiSelectedMap)
       this.ALLisDistribute = item;
       this.commodityArr.forEach((ele) => {
-        if (ele.id == this.ALLisDistribute.id) {
+        if (ele.id == this.ALLisDistribute.id && ele.skuId==item.skuId) {
-          console.log(ele.haocais);
           ele.haocais.map((v) => {
             if (v.conInfoId) {
               haocaiSelectedMap[v.conInfoId] = v;
@@ -845,6 +872,10 @@ export default {
       this.tableDatainformation.page = e - 1;
       this.getTableDatainformation();
     },
+    haocaiChaxun() {
+      this.tableDatainformation.page = 0;
+      this.getTableDatainformation();
+    },
     // 获取信息管理
     async getTableDatainformation() {
       this.tableDatainformation.loading = true;
@@ -868,9 +899,9 @@ export default {
     },
     // 耗材信息的信息
     tableDatainformationtable(item) {
-      haocaiSelectedMap[item.id]=item
+      haocaiSelectedMap[item.id] = item;
-      this.haocaiConfirm()
+      this.haocaiConfirm();
-      return
+      return;
       this.commodityArr.forEach((ele) => {
         if (ele.skuId == this.ALLisDistribute.skuId) {
           console.log(ele.haocais);
@@ -950,16 +981,42 @@ export default {
           return;
         }
 
-        const newArr = this.commodityArr.map((ele) => {
+        let newArr = [];
-          return {
+        for (let i of this.commodityArr) {
-            ...ele,
+            //共享库存
-            consInfoId: ele.consInfoId,
+            console.log(i.haocais)
-            productId: ele.id,
+          if (i.isDistribute) {
-            skuInfos: ele.haocais,
+            for (let k of i.haocais) {
-            surplusStock: ele.surplusStock,
+              newArr.push({
-            status: ele.status,
+                consInfoId: k.conInfoId,
-          };
+                productId: i.id,
+                surplusStock: k.surplusStock,
               });
+            }
+          } else {
+            // 非共享商品 多规格
+            for (let k of i.haocais) {
+              newArr.push({
+                consInfoId: k.conInfoId,
+                productId: i.id,
+                skuInfos:{
+                  ...k
+                },
+              });
+            }
+          }
+        }
+
+        // const newArr = this.commodityArr.map((ele) => {
+        //   console.log(ele)
+        //   return {
+        //     consInfoId: ele.consInfoId,
+        //     productId: ele.id,
+        //     skuInfos: ele.haocais,
+        //     surplusStock: ele.surplusStock,
+        //     status: ele.status,
+        //   };
+        // });
         await posttbProskuCons(newArr);
 
         // for(let data of newArr){
@@ -1022,7 +1079,8 @@ export default {
   }
 }
 .flex {
-  display: flex;align-content: center;
+  display: flex;
+  align-content: center;
 }
 .head-container .filter-item {
   margin: 0 10px 0 0;

src/views/product/add_shop.vue

@@ -577,8 +577,11 @@ export default {
             specInfo[index].realSalesNumber = item.productId;
             specInfo[index].shopId = item.shopId;
             specInfo[index].warnLine = item.warnLine;
+            specInfo[index].suit = item.suit;
+            specInfo[index].stockNumber = item.stockNumber;
             return specInfo[index];
           });
+          console.log(this.form.skuList);
           this.originSkuList = [...this.form.skuList];
           this.selectSpecResult = true;
         }

src/views/product/components/addGroup.vue

@@ -145,6 +145,7 @@ export default {
             this.form.isShow = 1
             this.form.name = ''
             this.form.sort = 0
+            this.form.id = null
             this.form.productIds = []
             this.productIds = []
         }