From c0811b12c6a2f0e0452347d287ffdd436d029da7 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Wed, 22 May 2024 09:40:26 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dataCenter/goods/Index.vue          |  32 +++--
 src/views/dataCenter/goods/modules/Update.vue | 114 +++++++++---------
 2 files changed, 80 insertions(+), 66 deletions(-)

diff --git a/src/views/dataCenter/goods/Index.vue b/src/views/dataCenter/goods/Index.vue
index 0e618bf..3b62a12 100644
--- a/src/views/dataCenter/goods/Index.vue
+++ b/src/views/dataCenter/goods/Index.vue
@@ -346,7 +346,7 @@
         <a @click="handleDelete([item.goods_id])">删除</a>
       </div>
     </s-table>
-    <Update ref="UpdateRef" />
+    <Update ref="UpdateRef" @refresh="refreshParentMethod" />
   </a-card>
 </template>
 <script>
@@ -364,26 +364,26 @@ Vue.use(DatePicker)
 const columns = [
   {
     title: '商品ID',
-    width: '100px',
+    width: '90px',
     dataIndex: 'goods_id',
     sorter: true,
   },
   {
     title: '商品',
     dataIndex: 'goods_name',
-    width: '320px',
+    width: '300px',
     scopedSlots: { customRender: 'goods_name' },
   },
   {
     title: '成本价',
-    width: '120px',
+    width: '100px',
     dataIndex: 'cost_price_min',
     scopedSlots: { customRender: 'cost_price_min' },
     sorter: true,
   },
   {
     title: '前台价',
-    width: '100px',
+    width: '95px',
     dataIndex: 'goods_price_min',
     scopedSlots: { customRender: 'goods_price_min' },
     sorter: true,
@@ -396,7 +396,7 @@ const columns = [
   },
   {
     title: '利润率',
-    width: '110px',
+    width: '95px',
     dataIndex: 'profit_rate',
     sorter: true,
     scopedSlots: { customRender: 'profit_rate' },
@@ -416,14 +416,14 @@ const columns = [
   },
   {
     title: '商品池',
-    width: '100px',
+    width: '95px',
     dataIndex: 'is_pool',
     sorter: true,
     scopedSlots: { customRender: 'is_pool' },
   },
   {
     title: '状态',
-    width: '60px',
+    width: '50px',
     dataIndex: 'is_sale',
     scopedSlots: { customRender: 'is_sale' },
   },
@@ -433,6 +433,12 @@ const columns = [
     dataIndex: 'create_time',
     sorter: true,
   },
+  {
+    title: '最后更新时间',
+    width: '150px',
+    dataIndex: 'update_time',
+    sorter: true,
+  },
   {
     title: '操作',
     dataIndex: 'action',
@@ -733,6 +739,9 @@ export default {
         this.rate = ''
       }
     },
+    refreshParentMethod() {
+      this.handleRefresh(true)
+    },
     // 编辑记录
     async handleEdit(id) {
       // 显示对话框
@@ -1025,7 +1034,7 @@ export default {
   },
 }
 </script>
-<style  lang="less">
+<style lang="less">
 .overlayName .ant-tooltip-inner {
   background-color: rgba(0, 0, 0, 0.7) !important;
   width: 350px;
@@ -1033,7 +1042,6 @@ export default {
 }
 </style>
 <style lang="less" scoped>
-
 /deep/.ant-card-body {
   padding: 22px 18px;
 }
@@ -1055,6 +1063,10 @@ export default {
 /deep/.el-picker-panel__sidebar {
   width: 85px;
 }
+.ant-table .actions a {
+  padding: 20px 4px;
+  margin: 0;
+}
 // 筛选tab
 .tab-list {
   margin-right: 20px;
diff --git a/src/views/dataCenter/goods/modules/Update.vue b/src/views/dataCenter/goods/modules/Update.vue
index a8748a5..6984911 100644
--- a/src/views/dataCenter/goods/modules/Update.vue
+++ b/src/views/dataCenter/goods/modules/Update.vue
@@ -170,7 +170,12 @@
                   />
                   <span class="ml-10">元</span>
                 </a-form-item>
-                <a-form-item label="成本价" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="成本价仅用于商品页展示">
+                <a-form-item
+                  label="成本价"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  extra="成本价仅用于商品页展示"
+                >
                   <a-input-number :min="0" :precision="2" v-decorator="['cost_price']" />
                   <span class="ml-10">元</span>
                 </a-form-item>
@@ -206,7 +211,6 @@
                   <span class="ml-10">千克 (Kg)</span>
                 </a-form-item>
               </div>
-
             </div>
             <!-- 商品详情 -->
             <div class="tab-pane" v-show="tabKey == 2">
@@ -276,11 +280,8 @@
                           <span>{{ province.name }}</span>
                           <template v-if="province.citys.length">
                             <span>(</span>
-                            <span
-                              class="city-name"
-                              v-for="(city, cidx) in province.citys"
-                              :key="cidx"
-                            >{{ city.name }}{{ province.citys.length > cidx + 1 ? '、' : '' }}</span
+                            <span class="city-name" v-for="(city, cidx) in province.citys" :key="cidx"
+                              >{{ city.name }}{{ province.citys.length > cidx + 1 ? '、' : '' }}</span
                             >
                             <span>)</span>
                           </template>
@@ -293,7 +294,9 @@
                       </p>
                     </template>
                   </a-table>
-                  <a-button icon="environment" v-if="ruleList.length == 0" @click="handleAdd">点击添加销售区域</a-button>
+                  <a-button icon="environment" v-if="ruleList.length == 0" @click="handleAdd"
+                    >点击添加销售区域</a-button
+                  >
                 </a-form-item>
               </div>
 
@@ -439,7 +442,7 @@ import Region from '@/common/model/Region'
 const defaultItem = {
   key: 0,
   region: [],
-  region_text: []
+  region_text: [],
 }
 export default {
   name: 'Update',
@@ -451,9 +454,9 @@ export default {
     InputNumberGroup,
     MultiSpec,
     AreasModal,
-    Region
+    Region,
   },
-  data () {
+  data() {
     return {
       // 默认的标签索引
       tabKey: 0,
@@ -484,37 +487,37 @@ export default {
           title: '销售区域',
           dataIndex: 'region_text',
           width: '400px',
-          scopedSlots: { customRender: 'region_text' }
-        }
+          scopedSlots: { customRender: 'region_text' },
+        },
       ],
       // 城市总数
-      citysCount: null
+      citysCount: null,
     }
   },
 
-  beforeDestroy () {
+  beforeDestroy() {
     // 销毁商品详情
     GoodsModel.formData.goods = {}
   },
   methods: {
-    showEdit (goodsId) {
+    showEdit(goodsId) {
       // 记录商品ID
-    this.goodsId = goodsId
-    this.initData()
-    this.getDataList()
-    // 城市总数
-    Region.getCitysCount().then((count) => {
-      this.citysCount = count
-    })
-    this.visible = true
-  },
-       // 关闭对话框事件
-    handleCancel () {
+      this.visible = true
+      this.goodsId = goodsId
+      this.initData()
+      this.getDataList()
+      // 城市总数
+      Region.getCitysCount().then((count) => {
+        this.citysCount = count
+      })
+    },
+    // 关闭对话框事件
+    handleCancel() {
       this.visible = false
       this.form.resetFields()
     },
     // 初始化数据
-    initData (goodsId) {
+    initData(goodsId) {
       // 获取form所需的数据
       this.isLoading = true
       GoodsModel.getFromData(this.goodsId).then(() => {
@@ -535,7 +538,7 @@ export default {
     },
 
     // 手动强制更新页面
-    onForceUpdate (bool = false) {
+    onForceUpdate(bool = false) {
       this.$forceUpdate()
       // bool为true时再执行一次 $forceUpdate, 特殊情况下需执行两次，原因如下：
       // 第一次执行 $forceUpdate时, 新元素绑定v-decorator无法获取到form.getFieldValue
@@ -546,12 +549,12 @@ export default {
     },
 
     // 切换tab选项卡
-    handleTabs (key) {
+    handleTabs(key) {
       this.tabKey = key
     },
 
     // 刷新分类列表
-    onReloadCategoryList () {
+    onReloadCategoryList() {
       this.isLoading = true
       GoodsModel.getCategoryList().then(() => {
         this.isLoading = false
@@ -559,7 +562,7 @@ export default {
     },
 
     // 刷新服务与承诺列表
-    onReloadServiceList () {
+    onReloadServiceList() {
       this.isLoading = true
       GoodsModel.getServiceList().then(() => {
         this.isLoading = false
@@ -567,25 +570,25 @@ export default {
     },
 
     // 刷新配送模板列表
-    onReloadDeliveryList () {
+    onReloadDeliveryList() {
       this.isLoading = true
       GoodsModel.getDeliveryList().then(() => {
         this.isLoading = false
       })
     },
     // 获取商品列表
-    getDataList () {
+    getDataList() {
       return GoodsApi.list().then((result) => {
         this.checkList = result.data.list.data
       })
     },
     // 确认按钮
-    handleSubmit (e) {
+    handleSubmit(e) {
       e.preventDefault()
       // 表单验证
       const {
         form: { validateFields },
-        ruleList
+        ruleList,
       } = this
       validateFields((errors, values) => {
         // 定位到错误的tab选项卡
@@ -609,13 +612,12 @@ export default {
         // 提交到后端api
         values.rules = ruleList
         this.onFormSubmit(values)
-        this.handleCancel()
         return true
       })
     },
 
     // 定位到错误的tab选项卡
-    onTargetTabError (errors) {
+    onTargetTabError(errors) {
       // 表单字段与tabKey对应关系
       // 只需要必填字段就可
       const tabsFieldsMap = [
@@ -628,11 +630,11 @@ export default {
           'is_ind_delivery_type',
           'delivery_type',
           'is_brand',
-          'is_in_store'
+          'is_in_store',
         ],
         ['spec_type', 'goods_price', 'is_restrict', 'restrict_total', 'restrict_single', 'cost_price'],
         ['content'],
-        ['alone_grade_equity', 'first_money', 'second_money', 'third_money']
+        ['alone_grade_equity', 'first_money', 'second_money', 'third_money'],
       ]
       const field = Object.keys(errors).shift()
       for (const key in tabsFieldsMap) {
@@ -644,17 +646,17 @@ export default {
     },
 
     // 提交到后端api
-    onFormSubmit (values) {
+    onFormSubmit(values) {
       this.isLoading = true
       this.isBtnLoading = true
       GoodsApi.edit({ goodsId: this.goodsId, form: values })
         .then((result) => {
           // 显示提示信息
           this.$message.success(result.message, 1.5)
-          // // 跳转到列表页
-          // setTimeout(() => {
-          //   this.$router.push('./index')
-          // }, 1500)
+          this.$emit('refresh')
+          setTimeout(() => {
+            this.handleCancel()
+          }, 500)
         })
         .catch(() => {
           this.isBtnLoading = false
@@ -663,7 +665,7 @@ export default {
     },
 
     // 新增记录
-    handleAdd () {
+    handleAdd() {
       const index = this.ruleList.length
       const newItem = { ...defaultItem, key: index }
       // 排除的城市id集(已存在的城市id集)
@@ -677,7 +679,7 @@ export default {
     },
 
     // 编辑记录
-    handleEdit (index, item) {
+    handleEdit(index, item) {
       // 排除的城市id集(已存在的城市id集)
       const excludedCityIds = this.getExcludedCityIds()
       // 显示选择地区对话框
@@ -685,9 +687,9 @@ export default {
     },
 
     // 选择地区后的回调
-    handleAreaSubmit (result) {
+    handleAreaSubmit(result) {
       const {
-        custom: { scene, item }
+        custom: { scene, item },
       } = result
       item.region = result.selectedCityIds
       item.region_text = result.selectedText
@@ -697,7 +699,7 @@ export default {
     },
 
     // 排除的城市id集(已存在的城市id集)
-    getExcludedCityIds () {
+    getExcludedCityIds() {
       const excludedCityIds = []
       this.ruleList.forEach((item) => {
         item.region.forEach((cityId) => {
@@ -709,22 +711,22 @@ export default {
     },
 
     // 显示选择地区对话框
-    handleAreasModal (scene, index, item, excludedCityIds) {
+    handleAreasModal(scene, index, item, excludedCityIds) {
       this.$refs.AreasModal.handle({ scene, index, item }, item.region, excludedCityIds)
     },
 
     // 删除记录
-    handleDelete (index) {
+    handleDelete(index) {
       const app = this
       const modal = this.$confirm({
         title: '您确定要删除该记录吗?',
-        onOk () {
+        onOk() {
           app.ruleList.splice(index, 1)
           modal.destroy()
-        }
+        },
       })
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="less" scoped>

From f749b0fabe5590f6fd833be3cb235b188eeab0bb Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Wed, 22 May 2024 11:02:22 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dataCenter/goods/Index.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/dataCenter/goods/Index.vue b/src/views/dataCenter/goods/Index.vue
index 3b62a12..537fe06 100644
--- a/src/views/dataCenter/goods/Index.vue
+++ b/src/views/dataCenter/goods/Index.vue
@@ -483,6 +483,7 @@ export default {
       selectedRowKeys: [],
       // 加载数据方法 必须为 Promise 对象
       loadData: (param) => {
+        console.log(param)
         const data = { ...param, ...this.queryParam }
         const orderEnum = {
           ascend: 'asc',
@@ -740,7 +741,7 @@ export default {
       }
     },
     refreshParentMethod() {
-      this.handleRefresh(true)
+      this.handleRefresh(false)
     },
     // 编辑记录
     async handleEdit(id) {
@@ -1028,6 +1029,7 @@ export default {
      * @param Boolean bool 强制刷新到第一页
      */
     handleRefresh(bool = false) {
+      console.log(bool)
       this.selectedRowKeys = []
       this.$refs.table.refresh(bool)
     },

From 30bb1d5cea7b7afdcaca0e1f1ba7dbea02c7c297 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Wed, 22 May 2024 15:41:32 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dataCenter/goods/Index.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/views/dataCenter/goods/Index.vue b/src/views/dataCenter/goods/Index.vue
index 537fe06..10d8839 100644
--- a/src/views/dataCenter/goods/Index.vue
+++ b/src/views/dataCenter/goods/Index.vue
@@ -483,7 +483,6 @@ export default {
       selectedRowKeys: [],
       // 加载数据方法 必须为 Promise 对象
       loadData: (param) => {
-        console.log(param)
         const data = { ...param, ...this.queryParam }
         const orderEnum = {
           ascend: 'asc',
@@ -1029,7 +1028,6 @@ export default {
      * @param Boolean bool 强制刷新到第一页
      */
     handleRefresh(bool = false) {
-      console.log(bool)
       this.selectedRowKeys = []
       this.$refs.table.refresh(bool)
     },

From 145a72236d9a1fb7484fdcd8af63ae4f25d31061 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Thu, 23 May 2024 10:37:31 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dataCenter/goods/modules/Update.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/dataCenter/goods/modules/Update.vue b/src/views/dataCenter/goods/modules/Update.vue
index 6984911..5efe8e0 100644
--- a/src/views/dataCenter/goods/modules/Update.vue
+++ b/src/views/dataCenter/goods/modules/Update.vue
@@ -502,6 +502,7 @@ export default {
   methods: {
     showEdit(goodsId) {
       // 记录商品ID
+      GoodsModel.formData.goods = {}
       this.visible = true
       this.goodsId = goodsId
       this.initData()
@@ -528,8 +529,10 @@ export default {
           // 第二次赋值 (适用于动态渲染的form-item)
           this.$nextTick(() => {
             this.form.setFieldsValue(GoodsModel.getFieldsValue2())
+
             this.ruleList = this.formData.goods.rules ? this.formData.goods.rules : []
             this.onForceUpdate()
+            this.$forceUpdate()
           })
         }
         // this.ruleList = record.rule.map((item, index) => { return { ...item, key: index } })

From 37c1ef555212fc2f87c36d9c9eea6f11fd82db04 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Fri, 24 May 2024 10:30:12 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Modal/GoodsModal/GoodsModal.vue   | 9 +++++++--
 src/components/SelectGoods/SelectGoods.vue       | 4 +++-
 src/views/dataCenter/goods/modules/MultiSpec.vue | 5 +++--
 src/views/dataCenter/goods/modules/Update.vue    | 4 +++-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/components/Modal/GoodsModal/GoodsModal.vue b/src/components/Modal/GoodsModal/GoodsModal.vue
index 52573cf..7634abe 100644
--- a/src/components/Modal/GoodsModal/GoodsModal.vue
+++ b/src/components/Modal/GoodsModal/GoodsModal.vue
@@ -53,7 +53,7 @@
         />
       </template>
       <span slot="specific_value" slot-scope="text">
-        <a-tooltip placement="topLeft" :title="text"> {{ text}}</a-tooltip>
+        <a-tooltip placement="topLeft" :title="text"> {{ text }}</a-tooltip>
       </span>
       <!-- 商品状态 -->
       <span slot="status" slot-scope="text">
@@ -112,6 +112,7 @@ export default {
     maxNum: PropTypes.integer.def(100),
     // 默认选中的列表记录
     defaultList: PropTypes.array.def([]),
+    channel:PropTypes.any
   },
   components: {
     STable,
@@ -128,11 +129,15 @@ export default {
       // 当前表单元素
       searchForm: this.$form.createForm(this),
       // 查询参数
-      queryParam: {},
+      queryParam: {
+        is_sale: 1,
+        is_pool: 1,
+      },
       // table表头
       columns,
       // 加载数据方法 必须为 Promise 对象
       loadData: (param) => {
+        this.queryParam.channel = this.channel
         return GoodsApi.list({ ...param, ...this.queryParam }).then((response) => {
           return response.data.list
         })
diff --git a/src/components/SelectGoods/SelectGoods.vue b/src/components/SelectGoods/SelectGoods.vue
index 1cfff62..011adb1 100644
--- a/src/components/SelectGoods/SelectGoods.vue
+++ b/src/components/SelectGoods/SelectGoods.vue
@@ -6,6 +6,7 @@
       :multiple="multiple"
       :maxNum="maxNum"
       :defaultList="selectedItems"
+      :channel="channel"
       @handleSubmit="handleSelectGoodsSubmit"
     />
   </div>
@@ -53,7 +54,8 @@ export default {
     // 最大选择的数量限制, multiple模式下有效
     maxNum: PropTypes.integer.def(100),
     // 默认选中的商品
-    defaultList: PropTypes.array.def([])
+    defaultList: PropTypes.array.def([]),
+    channel:PropTypes.any
   },
   data () {
     return {
diff --git a/src/views/dataCenter/goods/modules/MultiSpec.vue b/src/views/dataCenter/goods/modules/MultiSpec.vue
index 11b75ce..059cf57 100644
--- a/src/views/dataCenter/goods/modules/MultiSpec.vue
+++ b/src/views/dataCenter/goods/modules/MultiSpec.vue
@@ -95,7 +95,7 @@
         bordered
       >
         <template slot="select_goods" slot-scope="text, item">
-          <SelectGoods :multiple="false" @change="handleSelectGoods($event, item)" />
+          <SelectGoods :multiple="false" :channel="channel" @change="handleSelectGoods($event, item)" />
         </template>
         <!-- 商品名称 -->
         <!-- <template slot="goods_name" slot-scope="text, item">
@@ -155,7 +155,8 @@ export default {
     defaultSkuList: PropTypes.array.def([]),
     // 商品规格是否锁定(锁定状态下不允许编辑规格)
     isSpecLocked: PropTypes.bool.def(false),
-    checkList: PropTypes.array.def([])
+    checkList: PropTypes.array.def([]),
+    channel:PropTypes.any
   },
   data () {
     return {
diff --git a/src/views/dataCenter/goods/modules/Update.vue b/src/views/dataCenter/goods/modules/Update.vue
index 5efe8e0..ef61112 100644
--- a/src/views/dataCenter/goods/modules/Update.vue
+++ b/src/views/dataCenter/goods/modules/Update.vue
@@ -152,6 +152,7 @@
                   :isSpecLocked="formData.goods.isSpecLocked"
                   :defaultSpecList="formData.goods.specList"
                   :defaultSkuList="formData.goods.skuList"
+                  :channel="formData.goods.channel"
                   :checkList="checkList"
                 />
               </div>
@@ -502,7 +503,6 @@ export default {
   methods: {
     showEdit(goodsId) {
       // 记录商品ID
-      GoodsModel.formData.goods = {}
       this.visible = true
       this.goodsId = goodsId
       this.initData()
@@ -520,8 +520,10 @@ export default {
     // 初始化数据
     initData(goodsId) {
       // 获取form所需的数据
+      GoodsModel.formData.goods = {}
       this.isLoading = true
       GoodsModel.getFromData(this.goodsId).then(() => {
+        this.formData.goods.goods_images=[]
         // 商品表单数据
         if (!isEmptyObject(this.form.getFieldsValue())) {
           // 第一次赋值

From 40d92f28f66540290e331b358011125d9f668aa7 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Sun, 26 May 2024 20:54:08 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dataCenter/goods/Index.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/views/dataCenter/goods/Index.vue b/src/views/dataCenter/goods/Index.vue
index 10d8839..2cc7605 100644
--- a/src/views/dataCenter/goods/Index.vue
+++ b/src/views/dataCenter/goods/Index.vue
@@ -401,6 +401,13 @@ const columns = [
     sorter: true,
     scopedSlots: { customRender: 'profit_rate' },
   },
+  {
+    title: '加价率',
+    width: '80px',
+    dataIndex: 'markup_rate',
+    sorter: true,
+    scopedSlots: { customRender: 'markup_rate' },
+  },
   {
     title: '库存',
     width: '80px',

From 59d093c54ed0357e638e142b0af7e3ec049fd9c2 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Mon, 27 May 2024 15:16:50 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Modal/GoodsModal/GoodsModal.vue   | 4 +++-
 src/components/SelectGoods/SelectGoods.vue       | 4 +++-
 src/views/dataCenter/goods/modules/MultiSpec.vue | 5 +++--
 src/views/dataCenter/goods/modules/Update.vue    | 1 +
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/components/Modal/GoodsModal/GoodsModal.vue b/src/components/Modal/GoodsModal/GoodsModal.vue
index 7634abe..8b7aef3 100644
--- a/src/components/Modal/GoodsModal/GoodsModal.vue
+++ b/src/components/Modal/GoodsModal/GoodsModal.vue
@@ -112,7 +112,8 @@ export default {
     maxNum: PropTypes.integer.def(100),
     // 默认选中的列表记录
     defaultList: PropTypes.array.def([]),
-    channel:PropTypes.any
+    channel: PropTypes.any,
+    source: PropTypes.any.def(0),
   },
   components: {
     STable,
@@ -138,6 +139,7 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: (param) => {
         this.queryParam.channel = this.channel
+        this.queryParam = this.source == 1 ? this.queryParam : {}
         return GoodsApi.list({ ...param, ...this.queryParam }).then((response) => {
           return response.data.list
         })
diff --git a/src/components/SelectGoods/SelectGoods.vue b/src/components/SelectGoods/SelectGoods.vue
index 011adb1..0849f27 100644
--- a/src/components/SelectGoods/SelectGoods.vue
+++ b/src/components/SelectGoods/SelectGoods.vue
@@ -7,6 +7,7 @@
       :maxNum="maxNum"
       :defaultList="selectedItems"
       :channel="channel"
+      :source="source"
       @handleSubmit="handleSelectGoodsSubmit"
     />
   </div>
@@ -55,7 +56,8 @@ export default {
     maxNum: PropTypes.integer.def(100),
     // 默认选中的商品
     defaultList: PropTypes.array.def([]),
-    channel:PropTypes.any
+    channel:PropTypes.any,
+    source: PropTypes.any.def(0),
   },
   data () {
     return {
diff --git a/src/views/dataCenter/goods/modules/MultiSpec.vue b/src/views/dataCenter/goods/modules/MultiSpec.vue
index 059cf57..10738a5 100644
--- a/src/views/dataCenter/goods/modules/MultiSpec.vue
+++ b/src/views/dataCenter/goods/modules/MultiSpec.vue
@@ -95,7 +95,7 @@
         bordered
       >
         <template slot="select_goods" slot-scope="text, item">
-          <SelectGoods :multiple="false" :channel="channel" @change="handleSelectGoods($event, item)" />
+          <SelectGoods :multiple="false" :source='source' :channel="channel" @change="handleSelectGoods($event, item)" />
         </template>
         <!-- 商品名称 -->
         <!-- <template slot="goods_name" slot-scope="text, item">
@@ -156,7 +156,8 @@ export default {
     // 商品规格是否锁定(锁定状态下不允许编辑规格)
     isSpecLocked: PropTypes.bool.def(false),
     checkList: PropTypes.array.def([]),
-    channel:PropTypes.any
+    channel:PropTypes.any,
+    source: PropTypes.any.def(0),
   },
   data () {
     return {
diff --git a/src/views/dataCenter/goods/modules/Update.vue b/src/views/dataCenter/goods/modules/Update.vue
index ef61112..62d69e1 100644
--- a/src/views/dataCenter/goods/modules/Update.vue
+++ b/src/views/dataCenter/goods/modules/Update.vue
@@ -154,6 +154,7 @@
                   :defaultSkuList="formData.goods.skuList"
                   :channel="formData.goods.channel"
                   :checkList="checkList"
+                  :source="1"
                 />
               </div>
               <!-- 单规格的表单内容 -->

From 0fa8a1013163fe0006bddaadc0b24c4b3d7a195c Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Wed, 29 May 2024 16:05:50 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E5=8A=A0=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/goods/index.js               | 12 ++++++
 src/common/model/goods/MultiSpec.js  |  2 +
 src/views/dataCenter/goods/Index.vue | 56 +++++++++++++++++++++++++++-
 3 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/src/api/goods/index.js b/src/api/goods/index.js
index 38491fb..ceca30d 100644
--- a/src/api/goods/index.js
+++ b/src/api/goods/index.js
@@ -15,6 +15,7 @@ const api = {
   addPrice:'/goods/addPrice',
   exportData:'/goods/import',
   jingPin:'/goods/jingpin',
+  batchAddPrice:'/goods/batchAddPrice',
 }
 
 // 列表记录
@@ -143,6 +144,17 @@ export function addPrice (data) {
     method: 'post',
     data: data
   })
+}
+/**
+ * 批量加价率
+ * @param {*} data
+ */
+export function batchAddPrice (data) {
+  return axios({
+    url: api.batchAddPrice,
+    method: 'post',
+    data: data
+  })
 }/**
  * 导出
  * @param {*} data
diff --git a/src/common/model/goods/MultiSpec.js b/src/common/model/goods/MultiSpec.js
index 30d1c80..63d1c07 100644
--- a/src/common/model/goods/MultiSpec.js
+++ b/src/common/model/goods/MultiSpec.js
@@ -141,6 +141,7 @@ export default class MultiSpec {
     const specGroupArr = this.specGroupArr()
     // sku记录的规格属性集(生成笛卡尔积)
     const cartesianList = cartesianProductOf(specGroupArr)
+    console.log(cartesianList,'specGroupArr')
     // 合并单元格
     const rowSpanArr = this.rowSpanArr(specGroupArr, cartesianList)
     // 生成sku字段名
@@ -148,6 +149,7 @@ export default class MultiSpec {
     // 生成sku列表数据
     this.buildSkuList(cartesianList)
     // 返回多规格数据
+    console.log(this.multiSpecData.skuList)
     return this.multiSpecData
   }
 
diff --git a/src/views/dataCenter/goods/Index.vue b/src/views/dataCenter/goods/Index.vue
index 2cc7605..a03a730 100644
--- a/src/views/dataCenter/goods/Index.vue
+++ b/src/views/dataCenter/goods/Index.vue
@@ -178,6 +178,17 @@
           <input placeholder="请输入加价利润率" @input="validateAmount" v-model="rate" class="input" type="text" />
         </div>
       </a-modal>
+      <a-modal
+        v-model:visible="batchPrice"
+        width="450px"
+        title="批量加价"
+        @ok="handleBatchPrice(selectedRowKeys, batchRate)"
+      >
+        <div class="fen" style="margin-top:-10px">
+          <span style="margin-right: 5px">加价利润率：</span>
+          <input placeholder="请输入加价利润率" @input="validateBatchAmount" v-model="batchRate" class="input" type="text" />
+        </div>
+      </a-modal>
       <a-modal
         v-model:visible="saleVisible"
         width="250px"
@@ -252,6 +263,12 @@
               @click="priceVisible = true"
               >分类加价</a-button
             >
+            <a-button
+            v-if="selectedRowKeys.length"
+              style="background-color: #67C23A; color: #fff; border: none; border-radius: 2px"
+              @click="batchPrice = true"
+              >批量加价</a-button
+            >
             <a-button
               style="background-color: #501212; color: #fff; border: none; border-radius: 2px"
               @click="handleExport(selectedRowKeys)"
@@ -516,6 +533,7 @@ export default {
       saleVisible: false,
       priceVisible: false,
       jingPinVisible: false,
+      batchPrice:false,
       specsType: [
         { name: '全部', val: '' },
         { name: '单规格', val: 10 },
@@ -550,6 +568,7 @@ export default {
       categoryIds: [],
       categoryPriceIds: [],
       rate: '',
+      batchRate:'',
       pickerOptions: {
         disabledDate(time) {
           return time.getTime() > Date.now()
@@ -736,11 +755,11 @@ export default {
         this.$message.error('金额不能小于0')
         this.rate = ''
       } else if (row.startsWith('0')) {
-        this.money = ''
+        this.rate = ''
         // 金额小数部分不能超过2位
       } else if (!/^\d+(\.\d{1,2})?$/.test(row)) {
         this.$message.error('请输入数字！')
-        this.money = ''
+        this.rate = ''
       } else if (row.split('.')[1] && row.split('.')[1].length > 2) {
         this.$message.error('金额小数部分不能超过2位，请修改')
         this.rate = ''
@@ -921,6 +940,39 @@ export default {
           this.isLoading = false
         })
     },
+    validateBatchAmount() {
+      const row = this.batchRate
+      // 金额不能小于0
+      if (row < 0) {
+        this.$message.error('金额不能小于0')
+        this.batchRate = ''
+      } else if (row.startsWith('0')) {
+        this.batchRate = ''
+        // 金额小数部分不能超过2位
+      } else if (!/^\d+(\.\d{1,2})?$/.test(row)) {
+        this.$message.error('请输入数字！')
+        this.batchRate = ''
+      } else if (row.split('.')[1] && row.split('.')[1].length > 2) {
+        this.$message.error('金额小数部分不能超过2位，请修改')
+        this.batchRate = ''
+      }
+    },
+    handleBatchPrice(goodsIds, rate) {
+      if (!rate) {
+        this.$message.warn('请输入加价利润率', 1.5)
+        return
+      }
+      this.isLoading = true
+      GoodsApi.batchAddPrice({ goodsIds, rate })
+        .then((result) => {
+          this.batchPrice = false
+          this.$message.success(result.message, 1.5)
+          this.handleRefresh()
+        })
+        .finally((result) => {
+          this.isLoading = false
+        })
+    },
     // 停售
     handleUpdateSales(goodsIds, is_sale) {
       this.isLoading = true

From 61d25ed2d6dd21ccf80b54153761ed49ef479a4a Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Wed, 29 May 2024 16:38:53 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dataCenter/goods/Index.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/views/dataCenter/goods/Index.vue b/src/views/dataCenter/goods/Index.vue
index a03a730..9939aef 100644
--- a/src/views/dataCenter/goods/Index.vue
+++ b/src/views/dataCenter/goods/Index.vue
@@ -946,9 +946,6 @@ export default {
       if (row < 0) {
         this.$message.error('金额不能小于0')
         this.batchRate = ''
-      } else if (row.startsWith('0')) {
-        this.batchRate = ''
-        // 金额小数部分不能超过2位
       } else if (!/^\d+(\.\d{1,2})?$/.test(row)) {
         this.$message.error('请输入数字！')
         this.batchRate = ''