From 7fd7dd271dac434f6332953dd512b451f49500e4 Mon Sep 17 00:00:00 2001
From: huyuanxiang <273637057@qq.com>
Date: Thu, 13 Jul 2023 11:14:40 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E4=BA=A7=E5=93=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=8A=E4=B8=8B=E6=9E=B6=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=EF=BC=8C=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/shop.js             |  3 ++-
 src/views/erp/GoodsList.vue | 33 +++++++++++++++++++++++++++++----
 src/views/erp/OrderList.vue |  6 +++---
 3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/src/api/shop.js b/src/api/shop.js
index d603364..e5cc3a6 100644
--- a/src/api/shop.js
+++ b/src/api/shop.js
@@ -1,3 +1,4 @@
 import { getAction, deleteAction, putAction, postAction, httpAction } from '@/api/manage'
 
-export const editOrder = (params)=>postAction("/erp/order/edit",params);
\ No newline at end of file
+export const editOrder = (params)=>postAction("/erp/order/edit",params);
+export const editGoods = (params)=>postAction("/erp/goods/edit",params);
\ No newline at end of file
diff --git a/src/views/erp/GoodsList.vue b/src/views/erp/GoodsList.vue
index a6b0ad6..99ab4a6 100644
--- a/src/views/erp/GoodsList.vue
+++ b/src/views/erp/GoodsList.vue
@@ -68,18 +68,21 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
+           <a-popconfirm title="确定该操作吗?" @confirm="() => handleChangeStatus(record, getStatusData(record).status)">
+               <a v-has="'erp:goods:online'" >{{ getStatusData(record).text }}</a>
+           </a-popconfirm>
+          <a-divider type="vertical" v-has="'erp:goods:online'" />
           <a v-has="'erp:goods:edit'" @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
+          <a-divider type="vertical" v-has="'erp:goods:edit'" />
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
               <a-menu-item>
                 <a @click="handleDetail(record)">详情</a>
               </a-menu-item>
-              <a-menu-item>
+              <a-menu-item v-has="'erp:goods:delete'">
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a  v-has="'erp:goods:delete'">删除</a>
+                  <a  >删除</a>
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
@@ -99,6 +102,7 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import GoodsModal from './modules/GoodsModal'
+  import { editGoods } from '@/api/shop'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
@@ -202,6 +206,27 @@
       },
     },
     methods: {
+      getStatusData(row) {
+        const isOnline = row.ifSale + ''
+        const objInfo = {
+          '1' : {
+            text: '下架',
+            status: 0
+          },
+          '0' : {
+            text: '上架',
+            status: 1
+          }
+        }
+        return objInfo[isOnline]
+
+      },
+      handleChangeStatus(row, isSafe) {
+        row.ifSale = isSafe
+        editGoods(row).then(res => {
+          this.loadData();
+        })
+      },
       initDictConfig(){
       },
       getSuperFieldList(){
diff --git a/src/views/erp/OrderList.vue b/src/views/erp/OrderList.vue
index 6987e5c..d705697 100644
--- a/src/views/erp/OrderList.vue
+++ b/src/views/erp/OrderList.vue
@@ -98,12 +98,12 @@
             <a class="ant-dropdown-link">
               更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
-              <a-menu-item>
+              <a-menu-item v-has="'erp:order:view'">
                 <a @click="handleDetail(record)">详情</a>
               </a-menu-item>
-              <a-menu-item>
+              <a-menu-item v-has="'erp:order:delete'">
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a v-has="'erp:order:delete'">删除</a>
+                  <a >删除</a>
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>