Parcourir la source

Merge branch 'master' into 测试

lxf il y a 1 an
Parent
commit
d36d0d287f

+ 3 - 3
src/views/group/finance/check-bill/index.vue

@@ -121,13 +121,13 @@
     <el-dialog title="打印" v-if="openPrint" v-model="openPrint" width="94%">
       <el-tabs v-model="activeName" class="demo-tabs">
         <el-tab-pane label="SKU对账单" name="sku">
-          <PrintSKU :rowData="rowData" @clickCancel="openPrint = false"></PrintSKU>
+          <PrintSKU :rowData="rowData" v-if="activeName === 'sku'" @clickCancel="openPrint = false"></PrintSKU>
         </el-tab-pane>
         <el-tab-pane label="BOM对账单" name="bom">
-          <PrintBOM :rowData="rowData" @clickCancel="openPrint = false"></PrintBOM>
+          <PrintBOM :rowData="rowData" v-if="activeName === 'bom'" @clickCancel="openPrint = false"></PrintBOM>
         </el-tab-pane>
         <el-tab-pane label="订单对账单" name="order">
-          <PrintOrder :rowData="rowData" @clickCancel="openPrint = false"></PrintOrder>
+          <PrintOrder :rowData="rowData" v-if="activeName === 'order'" @clickCancel="openPrint = false"></PrintOrder>
         </el-tab-pane>
       </el-tabs>
     </el-dialog>

+ 3 - 3
src/views/group/finance/summary/index.vue

@@ -17,13 +17,13 @@
     <el-dialog title="打印" v-if="openPrint" v-model="openPrint" width="94%">
       <el-tabs v-model="activeName" class="demo-tabs">
         <el-tab-pane label="SKU对账单" name="sku">
-          <PrintSKU :rowData="rowData" @clickCancel="openPrint = false"></PrintSKU>
+          <PrintSKU :rowData="rowData" v-if="activeName === 'sku'" @clickCancel="openPrint = false"></PrintSKU>
         </el-tab-pane>
         <el-tab-pane label="BOM对账单" name="bom">
-          <PrintBOM :rowData="rowData" @clickCancel="openPrint = false"></PrintBOM>
+          <PrintBOM :rowData="rowData" v-if="activeName === 'bom'" @clickCancel="openPrint = false"></PrintBOM>
         </el-tab-pane>
         <el-tab-pane label="订单对账单" name="order">
-          <PrintOrder :rowData="rowData" @clickCancel="openPrint = false"></PrintOrder>
+          <PrintOrder :rowData="rowData" v-if="activeName === 'order'" @clickCancel="openPrint = false"></PrintOrder>
         </el-tab-pane>
       </el-tabs>
     </el-dialog>

+ 3 - 3
src/views/subsidiary/finance/check-bill/index.vue

@@ -46,13 +46,13 @@
     <el-dialog title="打印" v-if="openPrint" v-model="openPrint" width="94%">
       <el-tabs v-model="activeName" class="demo-tabs">
         <el-tab-pane label="SKU对账单" name="sku">
-          <PrintSKU :rowData="rowData" @clickCancel="openPrint = false"></PrintSKU>
+          <PrintSKU :rowData="rowData" v-if="activeName === 'sku'" @clickCancel="openPrint = false"></PrintSKU>
         </el-tab-pane>
         <el-tab-pane label="BOM对账单" name="bom">
-          <PrintBOM :rowData="rowData" @clickCancel="openPrint = false"></PrintBOM>
+          <PrintBOM :rowData="rowData" v-if="activeName === 'bom'" @clickCancel="openPrint = false"></PrintBOM>
         </el-tab-pane>
         <el-tab-pane label="订单对账单" name="order">
-          <PrintOrder :rowData="rowData" @clickCancel="openPrint = false"></PrintOrder>
+          <PrintOrder :rowData="rowData" v-if="activeName === 'order'" @clickCancel="openPrint = false"></PrintOrder>
         </el-tab-pane>
       </el-tabs>
     </el-dialog>

+ 3 - 3
src/views/subsidiary/finance/summary/index.vue

@@ -17,13 +17,13 @@
     <el-dialog title="打印" v-if="openPrint" v-model="openPrint" width="94%">
       <el-tabs v-model="activeName" class="demo-tabs">
         <el-tab-pane label="SKU对账单" name="sku">
-          <PrintSKU :rowData="rowData" @clickCancel="openPrint = false"></PrintSKU>
+          <PrintSKU :rowData="rowData" v-if="activeName === 'sku'" @clickCancel="openPrint = false"></PrintSKU>
         </el-tab-pane>
         <el-tab-pane label="BOM对账单" name="bom">
-          <PrintBOM :rowData="rowData" @clickCancel="openPrint = false"></PrintBOM>
+          <PrintBOM :rowData="rowData" v-if="activeName === 'bom'" @clickCancel="openPrint = false"></PrintBOM>
         </el-tab-pane>
         <el-tab-pane label="订单对账单" name="order">
-          <PrintOrder :rowData="rowData" @clickCancel="openPrint = false"></PrintOrder>
+          <PrintOrder :rowData="rowData" v-if="activeName === 'order'" @clickCancel="openPrint = false"></PrintOrder>
         </el-tab-pane>
       </el-tabs>
     </el-dialog>

+ 10 - 1
src/views/subsidiary/order/management/add.vue

@@ -79,6 +79,10 @@
                     <el-table-column label="产品" width="300">
                       <template #default="{ row }">
                         <div style="width: 100%">
+                          <div style="line-height: 35px" v-if="!(route.query && route.query.detailId)">
+                            <span style="color: black; font-weight: 700">库存数量: </span>
+                            <span>{{ item.inventoryQuantity }}</span>
+                          </div>
                           <div style="line-height: 35px">
                             <span style="color: black; font-weight: 700">商品名称: </span>
                             <span>{{ item.wlnSkuName }}</span>
@@ -799,7 +803,7 @@ const selectProduct = (row, SKU) => {
     if (list && list.length > 0) {
       return ElMessage("该产品已添加");
     }
-    proxy.post("/sku/detail", { id: SKU.id }).then((res) => {
+    proxy.post("/sku/detail", { id: SKU.id }).then(async (res) => {
       let orderSkuBomList = [];
       if (res.skuSpecList && res.skuSpecList.length > 0) {
         let listTwo = res.skuSpecList.filter((item) => item.id === row.id);
@@ -816,6 +820,10 @@ const selectProduct = (row, SKU) => {
           }
         }
       }
+      let inventoryQuantity = 0;
+      let getSkuInventoryQuantity = await proxy.post("/skuSpec/getSkuInventoryQuantity", { id: row.id }).then((resQuantity) => {
+        inventoryQuantity = resQuantity;
+      });
       formData.data.orderSkuList.push({
         wlnSkuName: SKU.name,
         skuId: row.skuId,
@@ -836,6 +844,7 @@ const selectProduct = (row, SKU) => {
         orderSkuBomList: orderSkuBomList,
         blueprint: row.designImgUrl,
         productionDocument: row.sharedFolder,
+        inventoryQuantity: inventoryQuantity,
       });
       ElMessage({ message: "添加成功", type: "success" });
     });