From b66ab07d3a9b2859e34ebb0ef2f86906f898e0e2 Mon Sep 17 00:00:00 2001
From: jameszow <jameszow@163.com>
Date: Fri, 20 Oct 2023 14:10:29 +0800
Subject: [PATCH 1/5] Add batch set price modal

---
 .../info/components/BatchSetPriceModal.vue    | 122 ++++++++++++++++++
 1 file changed, 122 insertions(+)
 create mode 100644 src/views/product/info/components/BatchSetPriceModal.vue

diff --git a/src/views/product/info/components/BatchSetPriceModal.vue b/src/views/product/info/components/BatchSetPriceModal.vue
new file mode 100644
index 0000000..1ee0fdc
--- /dev/null
+++ b/src/views/product/info/components/BatchSetPriceModal.vue
@@ -0,0 +1,122 @@
+<template>
+    <a-modal
+        :title="title"
+        :width="500"
+        v-model:open="openPriceModal"
+        :confirm-loading="confirmLoading"
+        :mask-style="{'top':'93px','left':'154px'}"
+        :mask-closable="false"
+        @ok="handleOk"
+        @cancel="handleCancel"
+        style="top:30%;height: 30%;">
+      <a-spin :spinning="confirmLoading">
+        <a-form ref="formRef" :rules="rules" :label-col="labelCol" :wrapper-col="wrapperCol">
+          <a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="请输入价格">
+            <a-input-number placeholder="请输入价格" v-model:value="batchPrice" />
+          </a-form-item>
+        </a-form>
+      </a-spin>
+    </a-modal>
+</template>
+
+<script lang="ts">
+import { ref, reactive, UnwrapRef } from 'vue';
+import {Button, Form, FormItem, InputNumber, Modal, Spin} from "ant-design-vue";
+import {Rule} from 'ant-design-vue/es/form';
+
+interface FormState {
+  batchPrice: number;
+}
+
+export default {
+  name: 'BatchSetPriceModal',
+  components: {
+    'a-modal': Modal,
+    'a-button': Button,
+    'a-spin': Spin,
+    'a-form': Form,
+    'a-form-item': FormItem,
+    'a-input-number': InputNumber
+  },
+  setup(_, context) {
+    const title = ref('批量设置');
+    const openPriceModal = ref(false);
+    const isReadOnly = ref(false);
+    const batchPrice = ref('');
+    const batchType = ref('');
+    const model = reactive({});
+    const labelCol = {
+      xs: { span: 24 },
+      sm: { span: 5 },
+    };
+    const wrapperCol = {
+      xs: { span: 24 },
+      sm: { span: 16 },
+    };
+    const confirmLoading = ref(false);
+    const formRef = ref();
+
+    const rules: Record<string, Rule[]> = {
+      batchPrice: [
+        {required: true, message: '请输入价格', trigger: 'change'},
+      ]
+    }
+
+    const add = (type) => {
+      openPriceModal.value = true
+      batchType.value = type;
+      if (type === 'purchase') {
+        title.value = '采购价-批量设置';
+      } else if (type === 'retail') {
+        title.value = '零售价-批量设置';
+      } else if (type === 'sale') {
+        title.value = '销售价-批量设置';
+      } else if (type === 'low') {
+        title.value = '最低售价-批量设置';
+      }
+      // formRef.value.resetFields();
+    };
+
+    const edit = (record) => {
+      openPriceModal.value = true
+    };
+
+    const close = () => {
+      openPriceModal.value = false
+    };
+
+    const handleOk = () => {
+      const price = batchPrice.value
+      context.emit('ok', price, batchType.value);
+      openPriceModal.value = false
+    };
+
+    const handleCancel = () => {
+      close();
+    };
+
+    return {
+      title,
+      isReadOnly,
+      batchType,
+      model,
+      labelCol,
+      wrapperCol,
+      confirmLoading,
+      formRef,
+      add,
+      edit,
+      close,
+      handleOk,
+      handleCancel,
+      openPriceModal,
+      batchPrice,
+      rules
+    };
+  }
+};
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file

From 2b5ac7160f278d6d017604990ab2c4cb5100f1be Mon Sep 17 00:00:00 2001
From: jameszow <jameszow@163.com>
Date: Fri, 20 Oct 2023 14:10:52 +0800
Subject: [PATCH 2/5] Integrated bulk pricing module

---
 .../info/components/ProductInfoModal.vue      | 60 +++++++++++++++----
 1 file changed, 50 insertions(+), 10 deletions(-)

diff --git a/src/views/product/info/components/ProductInfoModal.vue b/src/views/product/info/components/ProductInfoModal.vue
index 8f4b0f1..572bc46 100644
--- a/src/views/product/info/components/ProductInfoModal.vue
+++ b/src/views/product/info/components/ProductInfoModal.vue
@@ -204,10 +204,10 @@
                   + 插入一行
                 </a-button>
                 <a-button style="margin-left: 8px" danger @click="deleteRows" type="primary"> 删除选中行</a-button>
-                <a-button style="margin-left: 8px" @click="">采购价-批量</a-button>
-                <a-button style="margin-left: 8px" @click="">零售价-批量</a-button>
-                <a-button style="margin-left: 8px" @click="">销售价-批量</a-button>
-                <a-button style="margin-left: 8px" @click="">最低售价-批量</a-button>
+                <a-button style="margin-left: 8px" @click="batchSetPrice('purchase')">采购价-批量</a-button>
+                <a-button style="margin-left: 8px" @click="batchSetPrice('retail')">零售价-批量</a-button>
+                <a-button style="margin-left: 8px" @click="batchSetPrice('sale')">销售价-批量</a-button>
+                <a-button style="margin-left: 8px" @click="batchSetPrice('low')">最低售价-批量</a-button>
                 <span style="margin-left: 8px">
                </span>
               </div>
@@ -273,6 +273,7 @@
               <a-button style="margin-left: 8px" @click="batchSetStock('lowSafeStock')">最低安全库存-批量</a-button>
               <a-button style="margin-left: 8px" @click="batchSetStock('highSafeStock')">最高安全库存-批量</a-button>
             </template>
+            <batch-set-price-modal ref="priceModalForm" @ok="batchSetPriceModalFormOk"></batch-set-price-modal>
           </a-tab-pane>
           <a-tab-pane key="4" tab="图片信息" forceRender>
             <a-row class="form-row" :gutter="24">
@@ -338,6 +339,8 @@ import {DefaultOptionType} from "ant-design-vue/es/vc-tree-select/TreeSelect";
 import {ProductAttributeListReq} from "@/api/product/model/productAttributeModel"
 import {getBarCode} from "@/api/product/product"
 import {getAttributeList, getAttributeById} from "@/api/product/productAttribute"
+import {useMessage} from "@/hooks/web/useMessage";
+import BatchSetPriceModal from "@/views/product/info/components/BatchSetPriceModal.vue";
 
 export default {
   name: 'ProductInfoModal',
@@ -345,7 +348,7 @@ export default {
   components: {
     'a-modal': Modal,
     'a-upload': Upload,
-    'a-a-button': Button,
+    'a-button': Button,
     'a-spin': Spin,
     'a-row': Row,
     'a-col': Col,
@@ -361,8 +364,10 @@ export default {
     'a-tabs': Tabs,
     'a-tab-pane': TabPane,
     'a-table': Table,
+    BatchSetPriceModal,
   },
   setup(_, context) {
+    const { createMessage } = useMessage();
     const productStandard = ref<String>('');
     const productName = ref<String>('');
     const confirmLoading = ref(false);
@@ -387,6 +392,8 @@ export default {
     const skuTwo = reactive([]);
     const skuThree = reactive([]);
 
+    const priceModalForm = ref(null);
+
     onMounted(() => {
       // 在组件初始化加载时调用请求接口的方法
       // loadUnitListData();
@@ -715,7 +722,6 @@ export default {
             meTable.dataSource.forEach(row => {
               edit(row.key);
             });
-            console.info(meTable.dataSource);
           }
         }
       })
@@ -733,8 +739,6 @@ export default {
           productAttributeList.value[i].disabled = true
         }
       }
-
-
     });
 
     async function onManySkuChange(value) {
@@ -777,11 +781,45 @@ export default {
       }
     }
 
+    function batchSetPrice(type) {
+      if(manySkuSelected.value > 0) {
+        priceModalForm.value.add(type);
+        priceModalForm.value.openPriceModal = true;
+      } else {
+        createMessage.warn('抱歉，您还没有选择多属性，开启多属性后才能批量设置金额');
+      }
+    }
 
     function batchSetStock(type) {
-
     }
 
+    function batchSetPriceModalFormOk(price, batchType) {
+      if(meTable.dataSource.length === 0) {
+        createMessage.warn('请先录入条码、单位等信息！');
+        return;
+      }
+      if (batchType === 'purchase') {
+        for (let i = 0; i < meTable.dataSource.length; i++) {
+          meTable.dataSource[i].purchasePrice = price
+        }
+      } else if (batchType === 'retail') {
+        for (let i = 0; i < meTable.dataSource.length; i++) {
+          meTable.dataSource[i].retailPrice = price
+        }
+      } else if (batchType === 'sale') {
+        for (let i = 0; i < meTable.dataSource.length; i++) {
+          meTable.dataSource[i].salesPrice = price
+        }
+      } else if (batchType === 'low') {
+        for (let i = 0; i < meTable.dataSource.length; i++) {
+          meTable.dataSource[i].lowSalesPrice = price
+        }
+      }
+      meTable.dataSource.forEach(row => {
+        edit(row.key);
+      });
+
+    }
 
     const editableData = reactive({});
 
@@ -806,7 +844,6 @@ export default {
     const edit = (key) => {
       const rowData = meTable.dataSource.find(item => item.key === key);
       if (rowData) {
-        console.info("能不能修改key: " + key)
         editableData[key] = cloneDeep(rowData);
       }
     };
@@ -898,6 +935,9 @@ export default {
       productStandard,
       productName,
       unit,
+      batchSetPrice,
+      priceModalForm,
+      batchSetPriceModalFormOk
     };
   },
 }

From b80f7ed409d429aabc05c7c74a67c0129992e0d5 Mon Sep 17 00:00:00 2001
From: jameszow <jameszow@163.com>
Date: Fri, 20 Oct 2023 17:35:57 +0800
Subject: [PATCH 3/5] Add batch set stock modal

---
 .../info/components/BatchSetStockModal.vue    | 107 ++++++++++++++++++
 1 file changed, 107 insertions(+)
 create mode 100644 src/views/product/info/components/BatchSetStockModal.vue

diff --git a/src/views/product/info/components/BatchSetStockModal.vue b/src/views/product/info/components/BatchSetStockModal.vue
new file mode 100644
index 0000000..d21b083
--- /dev/null
+++ b/src/views/product/info/components/BatchSetStockModal.vue
@@ -0,0 +1,107 @@
+<template>
+  <a-modal
+      :title="title"
+      :width="500"
+      v-model:open="openStockModal"
+      :confirm-loading="confirmLoading"
+      :mask-style="{'top':'93px','left':'154px'}"
+      :mask-closable="false"
+      @ok="handleOk"
+      @cancel="handleCancel"
+      style="top:30%;height: 30%;">
+    <a-spin :spinning="confirmLoading">
+      <a-form ref="formRef" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="请输入数量">
+          <a-input-number placeholder="请输入数量" v-model:value="batchNumber" />
+        </a-form-item>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script lang="ts">
+import { ref, reactive, UnwrapRef } from 'vue';
+import {Button, Form, FormItem, InputNumber, Modal, Spin} from "ant-design-vue";
+
+export default {
+  name: 'BatchSetStockModal',
+  components: {
+    'a-modal': Modal,
+    'a-button': Button,
+    'a-spin': Spin,
+    'a-form': Form,
+    'a-form-item': FormItem,
+    'a-input-number': InputNumber
+  },
+  setup(_, context) {
+    const title = ref('批量设置');
+    const openStockModal = ref(false);
+    const isReadOnly = ref(false);
+    const batchNumber = ref('');
+    const batchType = ref('');
+    const model = reactive({});
+    const labelCol = {
+      xs: { span: 24 },
+      sm: { span: 5 },
+    };
+    const wrapperCol = {
+      xs: { span: 24 },
+      sm: { span: 16 },
+    };
+    const confirmLoading = ref(false);
+    const formRef = ref();
+
+    const add = (type) => {
+      openStockModal.value = true
+      batchType.value = type;
+      if (type === 'initStock') {
+        title.value = '期初库存-批量设置';
+      } else if (type === 'lowSafeStock') {
+        title.value = '最低安全库存-批量设置';
+      } else if (type === 'highSafeStock') {
+        title.value = '最高安全库存-批量设置';
+      }
+    };
+
+    const edit = (record) => {
+      openStockModal.value = true
+    };
+
+    const close = () => {
+      openStockModal.value = false
+    };
+
+    const handleOk = () => {
+      const stockNumber = batchNumber.value
+      context.emit('ok', stockNumber, batchType.value);
+      openStockModal.value = false
+    };
+
+    const handleCancel = () => {
+      close();
+    };
+
+    return {
+      title,
+      isReadOnly,
+      batchType,
+      model,
+      labelCol,
+      wrapperCol,
+      confirmLoading,
+      formRef,
+      add,
+      edit,
+      close,
+      handleOk,
+      handleCancel,
+      openStockModal,
+      batchNumber,
+    };
+  }
+};
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file

From 96d460876a2e4951178279fafd59ecb85a6d8cd4 Mon Sep 17 00:00:00 2001
From: jameszow <jameszow@163.com>
Date: Fri, 20 Oct 2023 17:36:07 +0800
Subject: [PATCH 4/5] Add product stock api

---
 src/api/product/model/productModel.ts |  8 ++++++++
 src/api/product/product.ts            | 11 ++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 src/api/product/model/productModel.ts

diff --git a/src/api/product/model/productModel.ts b/src/api/product/model/productModel.ts
new file mode 100644
index 0000000..c1ac52d
--- /dev/null
+++ b/src/api/product/model/productModel.ts
@@ -0,0 +1,8 @@
+export interface ProductStockResp {
+    id: number | string;
+    warehouseId: number | string;
+    warehouseName: string;
+    initStockQuantity: number;
+    lowStockQuantity: number;
+    highStockQuantity: number;
+}
\ No newline at end of file
diff --git a/src/api/product/product.ts b/src/api/product/product.ts
index 8d6736a..6cfe136 100644
--- a/src/api/product/product.ts
+++ b/src/api/product/product.ts
@@ -1,9 +1,10 @@
 import {defHttp} from '/@/utils/http/axios';
-import { ErrorMessageMode } from '/#/axios';
 import {BaseDataResp} from "@/api/model/baseModel";
+import {ProductStockResp} from "@/api/product/model/productModel";
 
 enum Api {
     getBarCode = '/product/getBarCode',
+    getStock = '/product/getStock',
 }
 
 export function getBarCode() {
@@ -12,4 +13,12 @@ export function getBarCode() {
             url: Api.getBarCode,
         }
     );
+}
+
+export function getStock() {
+    return defHttp.get<BaseDataResp<ProductStockResp>>(
+        {
+            url: Api.getStock,
+        }
+    );
 }
\ No newline at end of file

From 2472ffd33c72441669d81da7c857a98ebebf1614 Mon Sep 17 00:00:00 2001
From: jameszow <jameszow@163.com>
Date: Fri, 20 Oct 2023 17:36:26 +0800
Subject: [PATCH 5/5] Add stock reactive data and views

---
 .../info/components/ProductInfoModal.vue      | 130 ++++++++++++++++--
 1 file changed, 120 insertions(+), 10 deletions(-)

diff --git a/src/views/product/info/components/ProductInfoModal.vue b/src/views/product/info/components/ProductInfoModal.vue
index 572bc46..c808bea 100644
--- a/src/views/product/info/components/ProductInfoModal.vue
+++ b/src/views/product/info/components/ProductInfoModal.vue
@@ -212,8 +212,7 @@
                </span>
               </div>
               <div>
-                <a-table @change="onValueChange"
-                         :loading="meTable.loading"
+                <a-table :loading="meTable.loading"
                          :columns="meTable.columns"
                          :dataSource="meTable.dataSource"
                          :dataSource.sync="meTable.dataSource"
@@ -228,6 +227,7 @@
                   </template>
                 </a-table>
               </div>
+              <batch-set-price-modal ref="priceModalForm" @ok="batchSetPriceModalFormOk"></batch-set-price-modal>
             </div>
             <a-row class="form-row" :gutter="24">
               <a-col :lg="24" :md="24" :sm="24">
@@ -268,12 +268,30 @@
             </a-row>
           </a-tab-pane>
           <a-tab-pane key="3" tab="库存数量" forceRender>
-            <template>
+            <a-row class="form-row" :gutter="24">
               <a-button style="margin: 0px 0px 8px 0px" @click="batchSetStock('initStock')">期初库存-批量</a-button>
               <a-button style="margin-left: 8px" @click="batchSetStock('lowSafeStock')">最低安全库存-批量</a-button>
               <a-button style="margin-left: 8px" @click="batchSetStock('highSafeStock')">最高安全库存-批量</a-button>
-            </template>
-            <batch-set-price-modal ref="priceModalForm" @ok="batchSetPriceModalFormOk"></batch-set-price-modal>
+            </a-row>
+              <a-row class="form-row" :gutter="24">
+                <a-table :loading="stock.loading"
+                         :columns="stock.columns"
+                         :dataSource="stock.dataSource"
+                         :rowNumber="true"
+                         bordered
+                         :scroll="{ x: '100%', y: 300 }">
+                  <template #bodyCell="{ column, text, record }">
+                    <template v-if="column.key === 'warehouseName'">
+                      <a-input v-model:value="editStockData[record.key][column.key]" disabled />
+                    </template>
+                    <template v-else-if="editStockData[record.key]">
+                      <a-input v-model:value="editStockData[record.key][column.key]"
+                               :placeholder="`请输入${getColumnTitle(column)}`" />
+                    </template>
+                  </template>
+                </a-table>
+              </a-row>
+            <batch-set-stock-modal ref="stockModalForm" @ok="batchSetStokModalFormOk"></batch-set-stock-modal>
           </a-tab-pane>
           <a-tab-pane key="4" tab="图片信息" forceRender>
             <a-row class="form-row" :gutter="24">
@@ -313,7 +331,7 @@
 </template>
 
 <script lang="ts">
-import {ref, reactive, onMounted, watch, computed} from 'vue';
+import {ref, reactive, onMounted, watch, computed, readonly} from 'vue';
 import {
   Modal,
   Upload,
@@ -337,11 +355,11 @@ import {getCategoryList} from "/@/api/product/productCategory"
 import {ProductUnitQueryReq} from "/@/api/product/model/productUnitModel"
 import {DefaultOptionType} from "ant-design-vue/es/vc-tree-select/TreeSelect";
 import {ProductAttributeListReq} from "@/api/product/model/productAttributeModel"
-import {getBarCode} from "@/api/product/product"
+import {getBarCode, getStock} from "@/api/product/product"
 import {getAttributeList, getAttributeById} from "@/api/product/productAttribute"
 import {useMessage} from "@/hooks/web/useMessage";
 import BatchSetPriceModal from "@/views/product/info/components/BatchSetPriceModal.vue";
-
+import BatchSetStockModal from "@/views/product/info/components/BatchSetStockModal.vue";
 export default {
   name: 'ProductInfoModal',
   emits: ['success', 'cancel'],
@@ -365,6 +383,7 @@ export default {
     'a-tab-pane': TabPane,
     'a-table': Table,
     BatchSetPriceModal,
+    BatchSetStockModal
   },
   setup(_, context) {
     const { createMessage } = useMessage();
@@ -393,6 +412,7 @@ export default {
     const skuThree = reactive([]);
 
     const priceModalForm = ref(null);
+    const stockModalForm = ref(null);
 
     onMounted(() => {
       // 在组件初始化加载时调用请求接口的方法
@@ -503,6 +523,35 @@ export default {
       ]
     });
 
+    const stock = reactive({
+      loading: false,
+      dataSource: [],
+      columns: [
+        {
+          title: '仓库',
+          key: 'warehouseName',
+          type: 'input',
+        },
+        {
+          title: '期初库存数量',
+          key: 'initStockQuantity',
+          type: 'inputNumber',
+          placeholder: '请输入${title}'
+        },
+        {
+          title: '最低安全库存数量',
+          key: 'lowStockQuantity',
+          type: 'inputNumber',
+          placeholder: '请输入${title}'
+        },
+        {
+          title: '最高安全库存数量',
+          key: 'highStockQuantity',
+          type: 'inputNumber',
+          placeholder: '请输入${title}'
+        }
+      ]
+    });
 
     const productInfo = reactive({
       mfrs: '制造商',
@@ -530,6 +579,7 @@ export default {
       loadUnitListData();
       loadCategoryTreeData();
       loadAttributeTreeData();
+      loadStock();
     }
 
     function unitOnChange(event) {
@@ -569,7 +619,6 @@ export default {
       editableData[record.key][dataIndex] = value;
     };
 
-
     async function loadUnitListData() {
       const unitObject: ProductUnitQueryReq = {
         page: 1,
@@ -727,6 +776,32 @@ export default {
       })
     }
 
+    function loadStock() {
+      getStock().then(res => {
+        if (res && res.code==='00000') {
+          let stockList = res.data
+          if (stockList.length > 0) {
+            stock.dataSource.splice(0);
+            console.info(stockList)
+            for (let i = 0; i < stockList.length; i++) {
+              const rowData = {
+                key: stockList[i].id,
+                warehouseName: stockList[i].warehouseName,
+                initStockQuantity: stockList[i].initStockQuantity,
+                lowStockQuantity: stockList[i].lowStockQuantity,
+                highStockQuantity: stockList[i].highStockQuantity
+              }
+              stock.dataSource.push(rowData);
+            }
+            console.info(stock.dataSource)
+            stock.dataSource.forEach(row => {
+              editStock(row.key);
+            });
+          }
+        }
+      })
+    }
+
     watch(manySkuSelected, (value) => {
       // 控制多属性下拉框中选择项的状态
       // 1.如果value < 3 则将所有的多属性下拉框中的选项都设置为可选，但是可以取消勾选 2.如果value >= 3 则将所有的多属性下拉框中的选项都设置为不可选
@@ -791,6 +866,8 @@ export default {
     }
 
     function batchSetStock(type) {
+      stockModalForm.value.add(type);
+      stockModalForm.value.openStockModal = true;
     }
 
     function batchSetPriceModalFormOk(price, batchType) {
@@ -818,6 +895,25 @@ export default {
       meTable.dataSource.forEach(row => {
         edit(row.key);
       });
+    }
+
+    function batchSetStokModalFormOk(stockNumber, batchType) {
+      if (batchType === 'initStock') {
+        for (let i = 0; i < stock.dataSource.length; i++) {
+          stock.dataSource[i].initStockQuantity = stockNumber
+        }
+      } else if (batchType === 'lowSafeStock') {
+        for (let i = 0; i < stock.dataSource.length; i++) {
+          stock.dataSource[i].lowStockQuantity = stockNumber
+        }
+      } else if (batchType === 'highSafeStock') {
+        for (let i = 0; i < stock.dataSource.length; i++) {
+          stock.dataSource[i].highStockQuantity = stockNumber
+        }
+      }
+      stock.dataSource.forEach(row => {
+        editStock(row.key);
+      });
 
     }
 
@@ -848,6 +944,13 @@ export default {
       }
     };
 
+    const editStock = (key) => {
+      const rowData = stock.dataSource.find(item => item.key === key);
+      if (rowData) {
+        editStockData[key] = cloneDeep(rowData);
+      }
+    };
+
     const rowSelection = ref({
       selectedRowKeys: [],
       onChange: (selectedRowKeys) => {
@@ -861,6 +964,9 @@ export default {
       rowSelection.value.selectedRowKeys = [];
     }
 
+    const editStockData = reactive([])
+
+
     function getBase64(file: File) {
       return new Promise((resolve, reject) => {
         const reader = new FileReader();
@@ -937,7 +1043,11 @@ export default {
       unit,
       batchSetPrice,
       priceModalForm,
-      batchSetPriceModalFormOk
+      batchSetPriceModalFormOk,
+      stock,
+      editStockData,
+      stockModalForm,
+      batchSetStokModalFormOk
     };
   },
 }