add: 多门店代码合并

.vscode/settings.json

@@ -89,5 +89,9 @@
   },
   "[jsonc]": {
     "editor.defaultFormatter": "vscode.json-language-features"
+  },
+  "files.associations": {
+    "*.ttml": "xml",
+    "*.ttss": "css"
   }
 }

src/api/account/shop.ts

@@ -10,6 +10,19 @@ const ShopApi = {
       params: params,
     });
   },
+  getBranchList(params: PageQuery) {
+    return request<any, ShopInfoEditDTO[]>({
+      url: `${baseURL}/branchList`,
+      method: "get",
+      params: params,
+    });
+  },
+  getBranchChange(id: PageQuery) {
+    return request<any, ShopInfoEditDTO[]>({
+      url: `${baseURL}/change/${id}`,
+      method: "post",
+    });
+  },
   add(data: ShopInfoEditDTO) {
     return request<any, ShopInfoEditDTO>({
       url: `${baseURL}`,

src/api/account/shopBranch.ts

@@ -0,0 +1,54 @@
+import request from "@/utils/request";
+import { Account_BaseUrl } from "@/api/config";
+const baseURL = Account_BaseUrl + "/admin/shop/branch";
+
+const ShopBranchApi = {
+  getList(params: any) {
+    return request<any>({
+      url: `${baseURL}/page`,
+      method: "get",
+      params
+    });
+  },
+  getDataSync(params: any) {
+    return request<any>({
+      url: `${baseURL}/get/dataSyncMethod`,
+      method: "get",
+      params
+    });
+  },
+  setDataSync(id: any) {
+    return request<any>({
+      url: `${baseURL}/setting/dataSyncMethod?dataSyncMethod=${id}`,
+      method: "post",
+    });
+  },
+  dataSync(id: any) {
+    return request<any>({
+      url: `${baseURL}/data/sync/enable?branchShopId=${id}`,
+      method: "post",
+    });
+  },
+  enable(id: any) {
+    return request<any>({
+      url: `${baseURL}/account/enable?branchShopId=${id}`,
+      method: "post",
+    });
+  },
+  disable(id: any) {
+    return request<any>({
+      url: `${baseURL}/account/disable?branchShopId=${id}`,
+      method: "post",
+    });
+  },
+};
+
+
+export interface Responseres {
+  code?: number | null;
+  data?: any;
+  msg?: null | string;
+  [property: string]: any;
+}
+
+export default ShopBranchApi;

src/api/notifications/index.ts

@@ -0,0 +1,58 @@
+import request from "@/utils/request";
+import { Account_BaseUrl } from "@/api/config";
+const baseURL = Account_BaseUrl + "/admin";
+// 供应商
+const Api = {
+  /** 通知消息列表*/
+  getList(params: any) {
+    return request<any>({
+      url: `${baseURL}/syncNotice`,
+      method: "get",
+      params,
+    });
+  },
+  /** 全部*/
+  getAllList(params: any) {
+    return request<any>({
+      url: `${baseURL}/list`,
+      method: "get",
+      params,
+    });
+  },
+  get(id: string | number) {
+    return request<any>({
+      url: `${baseURL}/` + id,
+      method: "get",
+    });
+  },
+  add(data: any) {
+    return request<any>({
+      url: `${baseURL}`,
+      method: "post",
+      data,
+    });
+  },
+  edit(data: any) {
+    return request<any>({
+      url: `${baseURL}/syncNotice/read`,
+      method: "put",
+      data,
+    });
+  },
+
+  delete(id: string | number) {
+    return request<any>({
+      url: `${baseURL}/syncNotice?id=` + id,
+      method: "delete",
+    });
+  },
+  // 清空已读
+  syncNoticeclear() {
+    return request<any>({
+      url: `${baseURL}/syncNotice/clear`,
+      method: "delete",
+    });
+  },
+};
+
+export default Api;

src/api/product/index.ts

@@ -55,7 +55,7 @@ const AuthAPI = {
       method: "delete",
     });
   },
-  // 退款退回
+  // 同步
   refundToStock(data: any) {
     return request<any, Responseres>({
       url: `${baseURL}/refundToStock`,
@@ -63,6 +63,14 @@ const AuthAPI = {
       data,
     });
   },
+  // 退款退回
+  sync(data: any) {
+    return request<any, Responseres>({
+      url: `${baseURL}/sync`,
+      method: "post",
+      data,
+    });
+  },
 
   // 耗材列表
   productcons(params: any) {

src/api/product/libraryrecords.ts

@@ -0,0 +1,51 @@
+import request from "@/utils/request";
+import { Product_BaseUrl } from "@/api/config";
+const baseURL = Product_BaseUrl + "/admin/product";
+// 供应商
+const Api = {
+  /** 耗材库存变动记录*/
+  getList(params: any) {
+    return request<any>({
+      url: `${baseURL}/stock/flow`,
+      method: "get",
+      params,
+    });
+  },
+  /** 全部*/
+  getAllList(params: any) {
+    return request<any>({
+      url: `${baseURL}/list`,
+      method: "get",
+      params,
+    });
+  },
+  get(id: string | number) {
+    return request<any>({
+      url: `${baseURL}/` + id,
+      method: "get",
+    });
+  },
+  add(data: any) {
+    return request<any>({
+      url: `${baseURL}`,
+      method: "post",
+      data,
+    });
+  },
+  edit(data: any) {
+    return request<any>({
+      url: `${baseURL}`,
+      method: "put",
+      data,
+    });
+  },
+
+  delete(id: string | number) {
+    return request<any>({
+      url: `${baseURL}/` + id,
+      method: "delete",
+    });
+  },
+};
+
+export default Api;

src/api/product/stock.ts

@@ -8,7 +8,7 @@ const Api = {
     return request<any>({
       url: `${baseURL}/in`,
       method: "post",
-      data
+      data,
     });
   },
   //出库
@@ -16,7 +16,7 @@ const Api = {
     return request<any>({
       url: `${baseURL}/out`,
       method: "post",
-      data
+      data,
     });
   },
   // 库存盘点记录
@@ -24,7 +24,7 @@ const Api = {
     return request<any>({
       url: `${baseURL}/checkRecord`,
       method: "get",
-      params
+      params,
     });
   },
   //库存盘点
@@ -32,7 +32,7 @@ const Api = {
     return request<any>({
       url: `${baseURL}/check`,
       method: "post",
-      data
+      data,
     });
   },
   //耗材报损
@@ -41,7 +41,7 @@ const Api = {
     return request<any>({
       url: `${baseURL}/reportDamage`,
       method: "post",
-      data
+      data,
     });
   },
   //耗材库存变动记录
@@ -49,11 +49,17 @@ const Api = {
     return request<any>({
       url: `${baseURL}/flow`,
       method: "get",
-      params
+      params,
+    });
+  },
+  //耗材库存变动记录
+  reportinglosses(data: any) {
+    return request<any>({
+      url: `${baseURL}/reportDamage`,
+      method: "POST",
+      data,
     });
   },
 };
 
-
-
 export default Api;

src/api/supplier/index.ts

@@ -0,0 +1,60 @@
+import request from "@/utils/request";
+const baseURL = "/product/admin/product/vendor";
+
+// 供应商账单
+
+const AuthAPI = {
+  /** 供应商账单统计*/
+  getSummary(params: any) {
+    return request<any, Responseres>({
+      url: `${baseURL}/summary`,
+      method: "get",
+      params,
+    });
+  },
+  /** 分页*/
+  getPage(params: any) {
+    return request<any, Responseres>({
+      url: `${baseURL}/bill`,
+      method: "get",
+      params,
+    });
+  },
+  // 账单记录
+  getRecordList(params: any) {
+    return request<any, Responseres>({
+      url: `${baseURL}/bill/record`,
+      method: "get",
+      params,
+    });
+  },
+  // 账单付款记录
+  getPayRecordList(params: any) {
+    return request<any, Responseres>({
+      url: `${baseURL}/bill/pay/record`,
+      method: "get",
+      params,
+    });
+  },
+  // 账单付款
+  billPay(data: any) {
+    return request<any, Responseres>({
+      url: `${baseURL}/bill/pay`,
+      method: "post",
+      data,
+    });
+  },
+  
+};
+
+
+
+
+export interface Responseres {
+  code?: number | null;
+  data?: any;
+  msg?: null | string;
+  [property: string]: any;
+}
+
+export default AuthAPI;

src/api/system/user.ts

@@ -246,6 +246,7 @@ export interface UserInfo {
  * 用户分页查询对象
  */
 export interface UserPageQuery extends PageQuery {
+  times: any;
   /** 搜索关键字 */
   keywords?: string;
 

src/layout/components/Sidebar/components/SidebarLogo.vue

@@ -1,19 +1,70 @@
 <template>
-  <div class="logo">
+  <div class="logo wh-full flex-center">
-    <transition name="el-fade-in-linear" mode="out-in">
+    <!-- <transition name="el-fade-in-linear" mode="out-in"> -->
-      <router-link :key="+collapse" class="wh-full flex-center" to="/">
+    <!-- <router-link :key="+collapse" class="wh-full flex-center" to="/"> -->
-        <img :src="userStore.userInfo.logo" class="w20px h20px" />
+    <img :src="state.userInfo.logo" class="w20px h20px" />
-        <span v-if="!collapse" class="title">{{ userStore.userInfo.shopName }}</span>
+    <!-- <span v-if="!collapse" class="title">{{ userStore.userInfo.shopName }}</span> -->
-      </router-link>
+    <el-dropdown trigger="click" @command="handleCommand">
-    </transition>
+      <div class="el-dropdown-link" style="display: flex;">
+        <div v-if="!collapse" class="title">{{ state.shopName }}</div>
+        <el-icon class="el-icon--right"  v-if="loginType == 0">
+          <arrow-down />
+        </el-icon>
+      </div>
+      <template #dropdown>
+        <el-dropdown-menu v-if="loginType == 0">
+          <el-dropdown-item :command="item.shopId" v-for="(item, index) in state.branchList" :key="index"> {{
+            item.shopName }}</el-dropdown-item>
+        </el-dropdown-menu>
+      </template>
+    </el-dropdown>
+    <!-- </router-link> -->
+    <!-- </transition> -->
   </div>
 </template>
 
-<script lang="ts" setup>
+<script setup>
 import defaultSettings from "@/settings";
 import { useUserStore } from "@/store";
+import ShopApi from "@/api/account/shop";
 
 const userStore = useUserStore();
+const state = reactive({
+  branchList: [],
+  userInfo: useUserStore().userInfo,
+  shopName: useUserStore().userInfo.shopName
+});
+const loginType = ref(localStorage.getItem("loginType"))
+onMounted(() => {
+  geiShopList()
+});
+async function geiShopList() {
+  let res = await ShopApi.getBranchList()
+  state.branchList = res;
+  if (!localStorage.getItem("shopName")) {
+    state.shopName = state.branchList[0].shopName
+    localStorage.setItem("branch_shopId", state.branchList[0].id)
+    localStorage.setItem("shopName", state.branchList[0].shopName)
+  } else {
+    state.shopName = localStorage.getItem("shopName")
+  }
+
+}
+async function handleCommand(command) {
+  console.log(command)
+  let res = state.branchList.filter(v => v.shopId == command)[0]
+  // localStorage.getItem("shopId")
+  if (localStorage.getItem("shopId") == command) {
+    return
+  }
+  await ShopApi.getBranchChange(res.shopId)
+  // localStorage.setItem("branch_shopId", res.shopId)
+  localStorage.setItem("shopName", res.shopName)
+  state.shopName = res.shopName
+  location.reload()
+  console.log(res)
+  console.log(command)
+}
 
 defineProps({
   collapse: {
@@ -28,16 +79,18 @@ defineProps({
   width: 100%;
   height: $navbar-height;
   background-color: $sidebar-logo-background;
+  cursor: pointer;
 
   .title {
-    flex-shrink: 0; /* 防止容器在空间不足时缩小 */
+    flex-shrink: 0;
+    /* 防止容器在空间不足时缩小 */
     margin-left: 10px;
     font-size: 16px;
     color: #5a5e66;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
-    max-width: 150px;
+    max-width: 100px;
   }
 }
 

src/router/index.ts

@@ -63,38 +63,6 @@ export const constantRoutes: RouteRecordRaw[] = [
           keepAlive: true,
         },
       },
-      {
-        path: "credit",
-        name: "",
-        component: () => import("@/views/data/credit/index.vue"),
-        meta: {
-          title: "挂账管理",
-          affix: false,
-          keepAlive: true,
-
-        },
-      },
-      {
-        path: "credit-detail",
-        name: "",
-        component: () => import("@/views/data/credit/detail.vue"),
-        meta: {
-          title: "挂账明细",
-          affix: false,
-          keepAlive: true,
-          hidden: true
-        },
-      },
-      {
-        path: "work",
-        name: "",
-        component: () => import("@/views/data/work.vue"),
-        meta: {
-          title: "交班记录",
-          affix: false,
-          keepAlive: true,
-        },
-      },
       {
         path: "401",
         component: () => import("@/views/error/401.vue"),
@@ -473,7 +441,6 @@ export const constantRoutes: RouteRecordRaw[] = [
 
   //     /**列表end */
 
-
   //   ],
   // },
   // {

src/store/modules/user.ts

@@ -31,13 +31,14 @@ export const useUserStore = defineStore("user", () => {
     return new Promise<void>((resolve, reject) => {
       AuthAPI.login(loginRequest)
         .then((data) => {
-
           isShopAdmin.value = data.loginType == 0 ? true : false;
           Object.assign(userInfo.value, { ...data.shopInfo, shopId: data.shopInfo.id });
           promissionList.value = data.promissionList;
           const token = data.tokenInfo.tokenValue;
           setToken(token);
           setRefreshToken(token);
+          localStorage.setItem("shopId", "" + data.shopInfo.id);
+          localStorage.setItem("branch_shopId", data.shopInfo.id)
           resolve();
         })
         .catch((error) => {
@@ -51,16 +52,18 @@ export const useUserStore = defineStore("user", () => {
    *
    * @returns {UserInfo} 用户信息
    */
-  function getUserInfo() {
+  function getUserInfo(shopId?: string | number) {
     return new Promise<UserInfo>((resolve, reject) => {
-      ShopApi.get({ id: userInfo.value.shopId })
+      ShopApi.get({ id: shopId || userInfo.value.shopId })
         .then((data) => {
           if (!data) {
             reject("Verification failed, please Login again.");
             return;
           }
-          localStorage.setItem("shopId", "" + userInfo.value.shopId);
+          console.log(userInfo)
-          Object.assign(userInfo.value, { ...data, roles: [], promissionList: [], shopId: userInfo.value.shopId });
+          console.log(data)
+          localStorage.setItem("shopId", "" + data.id);
+          Object.assign(userInfo.value, { ...data, roles: [], promissionList: [], shopId: data.id });
           resolve(userInfo.value);
         })
         .catch((error) => {

src/utils/index.ts

@@ -117,3 +117,28 @@ export function downloadFile(obj: BlobPart, name: string, suffix: string, useUni
   link.click();
   document.body.removeChild(link);
 }
+
+/**
+ * 判断主店同步是否启用
+ */
+export function isSyncStatus() {
+  let userInfo = ref(JSON.parse(localStorage.getItem('userInfo') || '{}'))
+  if (userInfo.value.isHeadShop == 0 && userInfo.value.isEnableProdSync == 1 && userInfo.value.isEnableVipSync == 1 && userInfo.value.isEnableConsSync == 1) {
+    return true
+  }else {
+    return false
+  }
+}
+
+/**
+ * 判断是否有某权限
+ */
+export function hasPermission(params: any) {
+  let $PermissionObj = JSON.parse(localStorage.getItem("permission") || '[]' )
+  const obj = $PermissionObj.find((v: any) => v == params || v == params)
+  if (obj) {
+    return obj
+  }
+	return false
+}
+

src/utils/request.ts

@@ -22,6 +22,7 @@ service.interceptors.request.use(
     } else {
       delete config.headers.token;
     }
+    // config.headers.shopId = config.headers.shopId || localStorage.getItem("branch_shopId");
     config.headers.shopId = config.headers.shopId || useUserStoreHook().userInfo.id;
     return config;
   },

src/views/admin/system/menu/index.vue

@@ -40,7 +40,7 @@
         }"
         @row-click="handleRowClick"
       >
-        <el-table-column label="菜单名称" min-width="100">
+        <el-table-column label="菜单名称" min-width="140">
           <template #default="scope">
             {{ scope.row.title }}
           </template>
@@ -162,7 +162,7 @@
             <el-radio :value="2">接口</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="是否外链" prop="path">
+        <el-form-item label="是否外链" >
           <el-switch
             v-model="formData.iFrame"
             :active-value="1"

src/views/admin/system/role/components/menus.vue

@@ -28,16 +28,8 @@
     </div>
   </div>
 
-  <el-tree
+  <el-tree ref="permTreeRef" node-key="value" show-checkbox :data="menuPermOptions"
-    ref="permTreeRef"
+    :filter-node-method="handlePermFilter" :default-expand-all="true" :check-strictly="!parentChildLinked" class="mt-5">
-    node-key="value"
-    show-checkbox
-    :data="menuPermOptions"
-    :filter-node-method="handlePermFilter"
-    :default-expand-all="true"
-    :check-strictly="!parentChildLinked"
-    class="mt-5"
-  >
     <template #default="{ data }">
       {{ data.label }}
     </template>
@@ -110,7 +102,7 @@ onMounted(() => {
 
 watch(
   () => modelValue.value,
-  (newval) => {}
+  (newval) => { }
 );
 
 function getPerms() {
@@ -122,7 +114,6 @@ function reset() {
 }
 function setChecked(checkedMenuIds) {
   checkedMenuIds.forEach((menuId) => {
-    console.log(menuId);
     permTreeRef.value.setChecked(menuId, true, false);
   });
 }

src/views/admin/system/role/index.vue

@@ -338,8 +338,6 @@ async function handleOpenDialog(row: SysRole) {
     dialog.title = "新增角色";
   }
 }
-//test
-async function handleSubmit() {}
 
 // 提交角色表单
 function handleSubmit() {

src/views/application/marketing/coupon/list.vue

@@ -81,6 +81,7 @@ import couponEnum from "./couponEnum";
 import couponDetails from "./components/coupon_details.vue";
 import couponAdd from "./components/add.vue";
 import couponApi from "@/api/account/coupon";
+import { hasPermission } from "@/utils/index";
 
 export default {
   // eslint-disable-next-line vue/no-unused-components
@@ -100,6 +101,9 @@ export default {
   },
   mounted() {
     this.getTableData();
+    console.log(hasPermission('coupon:add'))
+    console.log(hasPermission('coupon:edit'))
+    // coupon:add  shopStaff:add
   },
   methods: {
     toAdd(data) {

src/views/data/index.vue

@@ -47,11 +47,15 @@
     </div> -->
     <div class="h_card_wrap">
       <div class="status_wrap">
-        <div class="left">
+        <div class="left" style="flex-shrink: 0">
           <div class="dot" />
           <span>营业</span>
         </div>
-        <div class="time_wrap u-flex">
+        <div class="u-flex" style="flex-wrap: wrap">
+          <el-select v-if="isHeadShop == 1&&loginType == 0" v-model="shopId" placeholder="选择分店" style="width: 200px; margin-right: 10px;" @change="shopChange">
+            <el-option v-for="item in branchList" :key="item.shopId" :label="item.shopName" :value="item.shopId" />
+          </el-select>
+          <div class="time_wrap u-flex" style="flex-shrink: 0">
             <el-radio-group v-model="timeValue" class="m-r-5" @change="timeChange">
               <el-radio-button value="0">今天</el-radio-button>
               <el-radio-button value="-1">昨天</el-radio-button>
@@ -62,8 +66,10 @@
               <el-radio-button value="custom">自定义</el-radio-button>
             </el-radio-group>
             <div class="u-flex">
-            <el-date-picker v-if="timeValue == 'custom'" v-model="query.createdAt" type="daterange" range-separator="至"
+              <el-date-picker v-if="timeValue == 'custom'" v-model="query.createdAt" type="daterange"
-              start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD " @change="summarytrade" />
+                range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD HH:mm:ss"
+                @change="summarytrade" />
+            </div>
           </div>
         </div>
       </div>
@@ -332,6 +338,7 @@
 
 <script>
 import dataSummaryApi from "@/api/order/data-summary";
+import ShopApi from "@/api/account/shop";
 import dayjs from "dayjs";
 import * as echarts from "echarts";
 import { debounce, formatDecimal } from "@/utils/tools";
@@ -383,6 +390,8 @@ export default {
           saveAmount: null,
         },
       ],
+      branchList: [],
+      shopId: null,
       trade: {},
       formatDecimal,
       topData: "",
@@ -419,6 +428,8 @@ export default {
       },
       tradeVip: "",
       tradeCount: "",
+      isHeadShop: JSON.parse(localStorage.getItem("userInfo")).isHeadShop,
+      loginType: localStorage.getItem("loginType")
     };
   },
   computed: {
@@ -473,9 +484,22 @@ export default {
       // }
     }, 100);
     window.addEventListener("resize", this.__resizeHandler);
+    this.geiShopList()
     // this.initCardUserChart();
   },
   methods: {
+    /**
+     * 获取分店列表
+     */
+    async geiShopList() {
+      let res = await ShopApi.getBranchList()
+      this.branchList = res;
+    },
+    shopChange(){
+      this.summarytrade();
+      this.lineChartTypeChange(this.lineChartType)
+      this.dateProduct()
+    },
     // 切换时间
     timeChange(e) {
       const format = ["YYYY-MM-DD 00:00:00", "YYYY-MM-DD 23:59:59"];
@@ -525,7 +549,9 @@ export default {
           break;
         case "custom":
           // 自定义
-          this.query.createdAt = [];
+          this.query.createdAt = [
+            dayjs().add(-30, "d").format(format[0]),
+            dayjs().format(format[1]),];
           break;
         default:
           break;
@@ -538,9 +564,13 @@ export default {
     async summarytrade() {
       try {
         this.tradeLoading = true;
+        if( this.query.createdAt[1] ){
+          this.query.createdAt.splice(1,1,this.query.createdAt[1].replace("00:00:00","23:59:59"))
+        }
         const res = await dataSummaryApi.trade({
           beginDate: this.query.createdAt[0],
           endDate: this.query.createdAt[1],
+          shopId: this.shopId
         });
         this.trade = res;
         this.tradeLoading = false;
@@ -864,7 +894,7 @@ export default {
     async dateAmount() {
       try {
         this.saleLoading = true;
-        const res = await dataSummaryApi.dateAmount({ day: this.saleActive });
+        const res = await dataSummaryApi.dateAmount({ day: this.saleActive,shopId: this.shopId });
         const data = res.total.map((item) => {
           return {
             orderAmount: item.orderAmount,
@@ -893,6 +923,7 @@ export default {
           day: this.saleTableActive,
           page: this.saleTablePage,
           size: this.saleTableSize,
+          shopId: this.shopId
         });
         this.saleTable = res.records;
         this.saleTableTotal = res.totalRow * 1;
@@ -908,7 +939,7 @@ export default {
     async datePayType() {
       try {
         this.payChartLoading = true;
-        const res = await dataSummaryApi.datePayType({ day: this.saleActive });
+        const res = await dataSummaryApi.datePayType({ day: this.saleActive,shopId: this.shopId });
         const data = res.countPayType.map((item) => {
           return {
             value: item.count,

src/views/data/sales.vue

@@ -10,16 +10,18 @@
           <el-form-item>
             <el-input placeholder="商品名称" v-model="query.productName" />
           </el-form-item>
-          <el-form-item>
+
-            <el-select v-model="query.prodCategoryId" placeholder="商品分类" style="width: 140px">
+          <el-form-item v-if="isHeadShop == 1&&loginType == 0">
-              <el-option
+            <el-select v-model="shopId" placeholder="选择分店" style="width: 200px; margin-right: 10px"
-                :label="item.name"
+              @change="getCategory">
-                :value="item.id"
+              <el-option v-for="item in branchList" :key="item.shopId" :label="item.shopName" :value="item.shopId" />
-                v-for="item in categorys"
-                :key="item.id"
-              ></el-option>
             </el-select>
           </el-form-item>
+          <!-- <el-form-item>
+            <el-select v-model="query.prodCategoryId" placeholder="商品分类" style="width: 140px">
+              <el-option :label="item.name" :value="item.id" v-for="item in categorys" :key="item.id"></el-option>
+            </el-select>
+          </el-form-item> -->
         </template>
         <el-form-item>
           <el-radio-group v-model="timeValue" @change="timeChange">
@@ -32,16 +34,9 @@
             <el-radio-button value="month">本月</el-radio-button>
             <el-radio-button value="custom">自定义</el-radio-button>
           </el-radio-group>
-          <el-date-picker
+          <el-date-picker class="u-m-l-10" v-model="query.createdAt" type="daterange" range-separator="至"
-            class="u-m-l-10"
+            start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD HH:mm:ss"
-            v-model="query.createdAt"
+            v-if="timeValue == 'custom'"></el-date-picker>
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            value-format="YYYY-MM-DD"
-            v-if="timeValue == 'custom'"
-          ></el-date-picker>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="getTableData">查询</el-button>
@@ -57,7 +52,9 @@
       <div class="collect_wrap">
         <div class="item">
           <div class="icon_wrap" style="--bg-color: #c978ee">
-            <el-icon color="#fff"><Coin /></el-icon>
+            <el-icon color="#fff">
+              <Coin />
+            </el-icon>
           </div>
           <div class="info">
             <div class="m">￥{{ payCount.totalAmount || 0 }}</div>
@@ -66,7 +63,9 @@
         </div>
         <div class="item">
           <div class="icon_wrap" style="--bg-color: #c978ee">
-            <el-icon color="#fff"><Coin /></el-icon>
+            <el-icon color="#fff">
+              <Coin />
+            </el-icon>
           </div>
           <div class="info">
             <div class="m">￥{{ payCount.refundAmount || 0 }}</div>
@@ -75,7 +74,9 @@
         </div>
         <div class="item">
           <div class="icon_wrap" style="--bg-color: #c978ee">
-            <el-icon color="#fff"><ShoppingCartFull /></el-icon>
+            <el-icon color="#fff">
+              <ShoppingCartFull />
+            </el-icon>
           </div>
           <div class="info">
             <div class="m">{{ payCount.saleCount || 0 }}</div>
@@ -84,7 +85,9 @@
         </div>
         <div class="item">
           <div class="icon_wrap" style="--bg-color: #c978ee">
-            <el-icon color="#fff"><ShoppingCart /></el-icon>
+            <el-icon color="#fff">
+              <ShoppingCart />
+            </el-icon>
           </div>
           <div class="info">
             <div class="m">{{ payCount.refundCount || 0 }}</div>
@@ -145,14 +148,9 @@
       </el-table>
     </div>
     <div class="head-container">
-      <el-pagination
+      <el-pagination :total="tableData.total" :current-page="tableData.page" :page-size="tableData.size"
-        :total="tableData.total"
+        @current-change="paginationChange" @size-change="sizeChange"
-        :current-page="tableData.page"
+        layout="total, sizes, prev, pager, next, jumper"></el-pagination>
-        :page-size="tableData.size"
-        @current-change="paginationChange"
-        @size-change="sizeChange"
-        layout="total, sizes, prev, pager, next, jumper"
-      ></el-pagination>
     </div>
   </div>
 </template>
@@ -160,6 +158,7 @@
 <script>
 import saleSummaryApi from "@/api/order/sale-summary";
 import categoryApi from "@/api/product/productclassification";
+import ShopApi from "@/api/account/shop";
 import dayjs from "dayjs";
 import { downloadFile } from "@/utils/index";
 
@@ -185,6 +184,11 @@ export default {
       downloadLoading: false,
       payCount: "",
       payCountTotal: 0,
+      branchList: [],
+      shopId: null,
+      isHeadShop: JSON.parse(localStorage.getItem("userInfo")).isHeadShop,
+      loginType: localStorage.getItem("loginType")
+
     };
   },
   filters: {
@@ -196,8 +200,16 @@ export default {
     this.resetQuery = { ...this.query };
     this.getTableData();
     this.getCategory();
+    this.geiShopList();
   },
   methods: {
+    /**
+     * 获取分店列表
+     */
+    async geiShopList() {
+      let res = await ShopApi.getBranchList()
+      this.branchList = res;
+    },
     totalfilter(item, d) {
       let num = item + d;
       return num.toFixed(2);
@@ -205,10 +217,12 @@ export default {
     // 获取商品分类
     async getCategory() {
       try {
+        this.query.prodCategoryId = ""
         const res = await categoryApi.getList({
           page: 1,
           size: 200,
           orderBy: "name asc",
+          shopId: this.shopId
         });
         this.categorys = res;
       } catch (error) {
@@ -218,12 +232,15 @@ export default {
     // 获取订单汇总
     async daycount() {
       try {
+        if (this.query.createdAt[1]) {
+          this.query.createdAt.splice(1, 1, this.query.createdAt[1].replace("00:00:00", "23:59:59"))
+        }
         const res = await saleSummaryApi.count({
           beginDate: this.query.createdAt[0],
           endDate: this.query.createdAt[1],
           prodCategoryId: this.query.prodCategoryId,
           productName: this.query.productName,
-
+          shopId: this.shopId,
           type: this.orderType,
         });
         this.payCount = res;
@@ -235,11 +252,15 @@ export default {
     async downloadHandle() {
       try {
         this.downloadLoading = true;
+        if (this.query.createdAt[1]) {
+          this.query.createdAt.splice(1, 1, this.query.createdAt[1].replace("00:00:00", "23:59:59"))
+        }
         const file = await saleSummaryApi.export({
           beginDate: this.query.createdAt[0],
           endDate: this.query.createdAt[1],
           prodCategoryId: this.query.prodCategoryId,
           productName: this.query.productName,
+          shopId: this.shopId
         });
         downloadFile(file, "数据", "xlsx");
         this.downloadLoading = false;
@@ -269,6 +290,9 @@ export default {
       this.tableData.loading = true;
       try {
         this.daycount();
+        if (this.query.createdAt[1]) {
+          this.query.createdAt.splice(1, 1, this.query.createdAt[1].replace("00:00:00", "23:59:59"))
+        }
         const res = await saleSummaryApi.page({
           page: this.tableData.page,
           size: this.tableData.size,
@@ -277,6 +301,7 @@ export default {
           endDate: this.query.createdAt[1],
           productName: this.query.productName,
           prodCategoryId: this.query.prodCategoryId,
+          shopId: this.shopId
         });
         this.tableData.loading = false;
         this.tableData.data = res.records;

src/views/data/table.vue

@@ -6,7 +6,7 @@
     </el-tabs> -->
     <div class="head-container">
       <el-form :model="query" inline label-position="left">
-        <div class="u-flex gap-10">
+        <div class="u-flex gap-10" style="flex-wrap: wrap;">
           <el-radio-group v-model="timeValue" @change="timeChange">
             <el-radio-button value="">全部</el-radio-button>
             <el-radio-button value="0">今天</el-radio-button>
@@ -18,14 +18,14 @@
             <el-radio-button value="custom">自定义</el-radio-button>
           </el-radio-group>
           <div>
-            <el-date-picker
+            <el-date-picker v-model="query.createdAt" type="daterange" range-separator="至" start-placeholder="开始日期"
-              v-model="query.createdAt"
+              end-placeholder="结束日期" value-format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
-              type="daterange"
+          </div>
-              range-separator="至"
+          <div>
-              start-placeholder="开始日期"
+            <el-select v-model="shopId" v-if="isHeadShop == 1&& loginType == 0" placeholder="选择分店"
-              end-placeholder="结束日期"
+              style="width: 200px; margin-right: 10px">
-              value-format="YYYY-MM-DD"
+              <el-option v-for="item in branchList" :key="item.shopId" :label="item.shopName" :value="item.shopId" />
-            ></el-date-picker>
+            </el-select>
           </div>
           <div>
             <el-button type="primary" @click="getTableData">查询</el-button>
@@ -100,6 +100,7 @@
 
 <script>
 import tableSummaryApi from "@/api/order/table-summary";
+import ShopApi from "@/api/account/shop";
 import dayjs from "dayjs";
 import { downloadFile } from "@/utils/index";
 
@@ -125,6 +126,11 @@ export default {
       downloadLoading: false,
       payCountList: "",
       payCountTotal: 0,
+      shopId: null,
+      branchList: [],
+      isHeadShop: JSON.parse(localStorage.getItem("userInfo")).isHeadShop,
+      loginType: localStorage.getItem("loginType")
+
     };
   },
   filters: {
@@ -135,8 +141,16 @@ export default {
   mounted() {
     this.resetQuery = { ...this.query };
     this.getTableData();
+    this.geiShopList();
   },
   methods: {
+    /**
+    * 获取分店列表
+    */
+    async geiShopList() {
+      let res = await ShopApi.getBranchList()
+      this.branchList = res;
+    },
     //携带table id跳转到订单列表页面
     toTableOrderList(data) {
       // console.log(data)
@@ -152,9 +166,13 @@ export default {
     async downloadHandle() {
       try {
         this.downloadLoading = true;
+        if (this.query.createdAt[1]) {
+          this.query.createdAt.splice(1, 1, this.query.createdAt[1].replace("00:00:00", "23:59:59"))
+        }
         const file = await tableSummaryApi.export({
           beginDate: this.query.createdAt[0],
           endDate: this.query.createdAt[1],
+          shopId: this.shopId
         });
         downloadFile(file, "数据", "xlsx");
         this.downloadLoading = false;
@@ -183,11 +201,15 @@ export default {
     async getTableData() {
       this.tableData.loading = true;
       try {
+        if (this.query.createdAt[1]) {
+          this.query.createdAt.splice(1, 1, this.query.createdAt[1].replace("00:00:00", "23:59:59"))
+        }
         const res = await tableSummaryApi.list({
           page: this.tableData.page,
           size: this.tableData.size,
           beginDate: this.query.createdAt[0],
           endDate: this.query.createdAt[1],
+          shopId: this.shopId
         });
         this.tableData.loading = false;
         this.tableData.data = res;

src/views/finance/supplierBill/billingRecord.vue

@@ -0,0 +1,171 @@
+<template>
+  <div class="app-container">
+    <div class="head-container">
+      <el-card shadow="never">
+        <el-alert title="当前列表仅作为数据记录，不产生任何实际交易。" type="warning" show-icon :closable="false"
+          style="margin-bottom: 15px;" />
+        <el-row :gutter="20">
+          <el-col :span="4">
+            <el-input v-model="state.query.name" clearable placeholder="请输入耗材名称" style="width: 100%" class="filter-item"
+              @keyup.enter="getTableData" />
+          </el-col>
+
+          <el-col :span="16">
+            <el-button type="primary" @click="getTableData">查询</el-button>
+            <el-button type="primary" @click="handlePayment('all')" plain>批量付款</el-button>
+            <el-text tag="b" size="large" style="margin-left: 15px;">供应商：{{ state.supplierName }}</el-text>
+          </el-col>
+        </el-row>
+      </el-card>
+    </div>
+    <div class="head-container">
+      <el-card shadow="never">
+        <el-table @selection-change="handleSelectionChange" v-loading="state.tableData.loading"
+          :data="state.tableData.list">
+          <el-table-column type="selection" width="55" />
+          <el-table-column prop="id" label="ID" width="80" />
+          <el-table-column label="耗材信息">
+            <template v-slot="scope">
+              <div>{{ scope.row.conName }}</div>
+              <div>单价：{{ scope.row.purchasePrice }}</div>
+              <div>入库数量：{{ scope.row.inOutNumber }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="amountPayable" label="账单金额" width="120" />
+          <el-table-column prop="actualPaymentAmount" label="已付款金额" width="120" />
+          <el-table-column prop="unPaidAmount" label="未付款金额" width="120" />
+          <el-table-column prop="createTime" label="创建时间" width="120" />
+          <el-table-column prop="remark" label="备注" />
+          <el-table-column label="操作" width="200">
+            <template v-slot="scope">
+              <el-button type="primary" size="small" link @click="handlePayment(scope.row)">
+                付款
+              </el-button>
+              <el-button type="primary" size="small" link @click="handleRecord(scope.row.id)">
+                付款记录
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-card>
+
+    </div>
+    <div class="head-container">
+      <el-pagination v-model:current-page="state.tableData.page" v-model:page-size="state.tableData.size"
+        :total="state.tableData.total" :page-sizes="[10, 20, 30, 50, 100]"
+        layout="total, sizes , prev, pager ,next, jumper " @current-change="paginationChange" />
+    </div>
+    <payment ref="refPayment" @refresh="getTableData"></payment>
+  </div>
+</template>
+
+<script setup>
+import AuthAPI from "@/api/supplier/index";
+import payment from "./components/payment.vue";
+import { ElMessage } from "element-plus";
+
+const route = useRoute();
+const router = useRouter();
+
+const state = reactive({
+  query: {
+    name: "",
+    vendorId: null,
+  },
+  tableData: {
+    list: [],
+    page: 1,
+    size: 10,
+    loading: false,
+    total: 0,
+  },
+  supplierName: '',
+  flowIdList: [],
+  allAmount: 0
+});
+onMounted(() => {
+  if (route.query.vendorId) {
+    state.query.vendorId = route.query.vendorId
+  }
+  if (route.query.supplierName) {
+    state.supplierName = route.query.supplierName
+  }
+  getTableData();
+});
+// 获取账单记录列表
+async function getTableData() {
+  state.tableData.loading = true;
+  try {
+    const res = await AuthAPI.getRecordList({
+      page: state.tableData.page,
+      size: state.tableData.size,
+      key: state.query.name,
+      vendorId: state.query.vendorId,
+    });
+    state.tableData.loading = false;
+    state.tableData.list = res.records;
+    state.tableData.total = res.totalRow * 1;
+  } catch (error) {
+    console.log(error);
+  }
+}
+const refPayment = ref();
+function handlePayment(item) {
+  if (item != 'all') {
+    state.flowIdList = [item.id]
+    state.allAmount = item.unPaidAmount
+  } else {
+    if( state.flowIdList.length <= 0 ){
+      ElMessage({ type: "error", message: "请选择付款耗材" });
+      return;
+    } 
+  }
+
+  refPayment.value.open({ flowIdList: state.flowIdList, supplierName: state.supplierName,allAmount:state.allAmount });
+}
+function handleSelectionChange(e) {
+  state.flowIdList = []
+  state.allAmount = 0
+  e.map(item => {
+    state.flowIdList.push(item.id)
+    state.allAmount += item.unPaidAmount
+  })
+}
+// 付款记录
+function handleRecord(id) {
+  router.push({ name: "financePaymentRecord", query: { id: id, supplierName: state.supplierName } });
+
+}
+
+// 重置查询
+function resetHandle() {
+  state.query.name = "";
+  getTableData();
+}
+// 分页回调
+function paginationChange(e) {
+  state.tableData.page = e;
+  getTableData();
+}
+
+</script>
+
+<style scoped lang="scss">
+.head-container {
+  margin-bottom: 20px;
+}
+
+.shop_info {
+  display: flex;
+
+  .info {
+    flex: 1;
+    padding-left: 4px;
+  }
+}
+
+.el-link {
+  min-height: 23px;
+  margin: 0 5px;
+}
+</style>

src/views/finance/supplierBill/components/payment.vue

@@ -0,0 +1,84 @@
+<template>
+  <!-- 修改和增加 -->
+  <el-dialog title="付款" v-model="show" width="400px" @close="reset">
+    <el-form :inline="false" ref="refform" label-width="90" :model="form" :rules="rules" class="demo-form-inline">
+      <el-form-item label="供应商">
+        <el-input v-model="supplierName" placeholder="请输入供应商名称" readonly></el-input>
+      </el-form-item>
+      <el-form-item label="付款金额 " prop="amount">
+        <el-input-number v-model="form.amount" :readonly="form.flowIdList.length > 1" :max="maxAmount" placeholder="请输入付款金额"
+          style="width: 100%;"></el-input-number>
+      </el-form-item>
+      <el-form-item label="付款方式" prop="type">
+        <el-input v-model="form.type" placeholder="请输入付款方式"></el-input>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="form.remark" placeholder="请输入备注"></el-input>
+      </el-form-item>
+      <el-form-item style="display: flex; justify-content: flex-end">
+        <el-button @click="close">取 消</el-button>
+        <el-button type="primary" @click="submitForm('refform')">确 定</el-button>
+      </el-form-item>
+    </el-form>
+  </el-dialog>
+</template>
+
+
+<script setup>
+import AuthAPI from "@/api/supplier/index";
+import { ElMessage } from "element-plus";
+
+const emits = defineEmits(["refresh"]);
+
+const rules = {
+  amount: [{ required: true, message: "请输入付款金额", trigger: "blur" }],
+  type: [{ required: true, message: "请输入付款方式", trigger: "blur" }],
+
+};
+
+const basicForm = {
+  flowIdList: [],
+  amount: undefined,
+  type: '',
+  remark: '',
+};
+const form = reactive({
+  ...basicForm,
+});
+const supplierName = ref('');
+const maxAmount = ref(0);
+const show = ref(false);
+function open(item) {
+  form.flowIdList = item.flowIdList
+  supplierName.value = item.supplierName
+  form.amount = item.allAmount
+  maxAmount.value = item.allAmount
+  // Object.assign(form, item);
+  show.value = true;
+}
+
+function close() {
+  show.value = false;
+}
+const refform = ref();
+async function submitForm() {
+  refform.value.validate(async (valid) => {
+    if (valid) {
+      const res = await AuthAPI.billPay(form);
+      ElMessage({ type: "success", message: "付款成功" });
+      emits("refresh");
+      close();
+    }
+  });
+}
+
+function reset() {
+  console.log("reset");
+  Object.assign(form, basicForm);
+  close();
+}
+defineExpose({
+  open,
+  close,
+});
+</script>

src/views/finance/supplierBill/index.vue

@@ -0,0 +1,148 @@
+<template>
+  <div class="app-container">
+    <div class="head-container">
+      <el-card shadow="never">
+        <el-alert title="当前列表仅作为数据记录，不产生任何实际交易。" type="warning" show-icon :closable="false"
+          style="margin-bottom: 15px;" />
+        <el-row :gutter="20">
+          <el-col :span="4">
+            <el-input v-model="state.query.name" clearable placeholder="请输入供应商名称" style="width: 100%"
+              class="filter-item" @keyup.enter="getTableData" />
+          </el-col>
+
+          <el-col :span="16">
+            <el-button type="primary" @click="getTableData">查询</el-button>
+          </el-col>
+        </el-row>
+      </el-card>
+    </div>
+    <div class="head-container">
+      <el-card shadow="never">
+        <el-row :gutter="24">
+          <el-col :span="8" style="display: flex;flex-direction: column; justify-content: center;align-items: center;">
+            <div>账单总金额（全部/本月）</div>
+            <div>{{ state.summaryData.amountPayable || 0 }} / {{ state.summaryData.mouthAmountPayable || 0 }}</div>
+          </el-col>
+
+          <el-col :span="8" style="display: flex;flex-direction: column; justify-content: center;align-items: center;">
+            <div>已付款总金额（全部/本月）</div>
+            <div>{{ state.summaryData.actualPaymentAmount || 0 }} / {{ state.summaryData.mouthActualPaymentAmount || 0 }}</div>
+          </el-col>
+          <el-col :span="8" style="display: flex;flex-direction: column; justify-content: center;align-items: center;">
+            <div>未付款总金额（全部/本月）</div>
+            <div>{{ state.summaryData.unPaidAmount || 0 }} / {{ state.summaryData.mouthUnPaidAmount || 0 }}</div>
+          </el-col>
+        </el-row>
+      </el-card>
+    </div>
+    <div class="head-container">
+      <el-card shadow="never">
+        <el-table v-loading="state.tableData.loading" :data="state.tableData.list">
+          <el-table-column prop="name" label="供应商" width="220" />
+          <el-table-column prop="amountPayable" label="账单金额" width="200" />
+          <el-table-column prop="actualPaymentAmount" label="已付款金额" width="200" />
+          <el-table-column prop="unPaidAmount" label="未付款金额" width="200" />
+          <el-table-column prop="remark" label="备注" />
+          <el-table-column label="操作" width="120">
+            <template v-slot="scope">
+              <el-button type="primary" size="small" link @click="handleTo(scope.row)">
+                账单记录
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-card>
+
+    </div>
+    <div class="head-container">
+      <el-pagination v-model:current-page="state.tableData.page" v-model:page-size="state.tableData.size"
+        :total="state.tableData.total" :page-sizes="[10, 20, 30, 50, 100]"
+        layout="total, sizes , prev, pager ,next, jumper " @current-change="paginationChange" />
+    </div>
+  </div>
+</template>
+
+<script setup>
+import AuthAPI from "@/api/supplier/index";
+const router = useRouter();
+
+const state = reactive({
+  query: {
+    name: "",
+  },
+  summaryData: {},
+  tableData: {
+    list: [],
+    page: 1,
+    size: 10,
+    loading: false,
+    total: 0,
+  },
+});
+onMounted(() => {
+  getSummary();
+
+  getTableData();
+});
+
+async function getSummary() {
+  try {
+    const res = await AuthAPI.getSummary();
+    state.summaryData = res;
+  } catch (error) {
+    console.log(error);
+  }
+}
+// 获取账单列表
+async function getTableData() {
+  state.tableData.loading = true;
+  try {
+    const res = await AuthAPI.getPage({
+      page: state.tableData.page,
+      size: state.tableData.size,
+      key: state.query.name,
+    });
+    state.tableData.loading = false;
+    state.tableData.list = res.records;
+    state.tableData.total = res.totalRow * 1;
+  } catch (error) {
+    console.log(error);
+  }
+}
+function handleTo(row) {
+  // router.push({ path: "/finance/supplierBill/billingRecord", query: { id: e.id } });
+  router.push({ name: "financeBillingRecord", query: { vendorId: row.vendorId, supplierName: row.name } });
+
+}
+// 重置查询
+function resetHandle() {
+  state.query.name = "";
+  getTableData();
+}
+// 分页回调
+function paginationChange(e) {
+  state.tableData.page = e;
+  getTableData();
+}
+
+</script>
+
+<style scoped lang="scss">
+.head-container {
+  margin-bottom: 20px;
+}
+
+.shop_info {
+  display: flex;
+
+  .info {
+    flex: 1;
+    padding-left: 4px;
+  }
+}
+
+.el-link {
+  min-height: 23px;
+  margin: 0 5px;
+}
+</style>

src/views/finance/supplierBill/paymentRecord.vue

@@ -0,0 +1,137 @@
+<template>
+  <div class="app-container">
+    <div class="head-container">
+      <el-card shadow="never">
+        <el-alert title="当前列表仅作为数据记录，不产生任何实际交易。" type="warning" show-icon :closable="false"
+          style="margin-bottom: 15px;" />
+        <el-text tag="b" size="large" style="margin-left: 15px;">供应商：{{ state.supplierName }}</el-text>
+      </el-card>
+    </div>
+    <div class="head-container">
+      <el-card shadow="never">
+        <el-table v-loading="state.tableData.loading" :data="state.tableData.list">
+          <el-table-column prop="id" label="ID" width="80" />
+          <el-table-column label="耗材信息">
+            <template v-slot="scope">
+              <div>{{ scope.row.conName }}</div>
+              <div>单价：{{ scope.row.purchasePrice }}</div>
+              <div>入库数量：{{ scope.row.inOutNumber }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="amount" label="付款金额" width="120" />
+          <el-table-column prop="type" label="付款方式" width="120" />
+          <el-table-column prop="remark" label="备注" />
+          <el-table-column prop="createTime" label="创建时间" />
+          <el-table-column label="操作人" width="200">
+            <template v-slot="scope">
+              <div>员工名称：{{ scope.row.nickname }}</div>
+              <div>员工编号：{{ scope.row.code }}</div>
+              <div>员工账号：{{ scope.row.account }}</div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-card>
+
+    </div>
+    <div class="head-container">
+      <el-pagination v-model:current-page="state.tableData.page" v-model:page-size="state.tableData.size"
+        :total="state.tableData.total" :page-sizes="[10, 20, 30, 50, 100]"
+        layout="total, sizes , prev, pager ,next, jumper " @current-change="paginationChange" />
+    </div>
+  </div>
+</template>
+
+<script setup>
+import ShopApi from "@/api/account/shop";
+import AuthAPI from "@/api/supplier/index";
+
+import { ElMessageBox } from "element-plus";
+const route = useRoute();
+
+const state = reactive({
+  query: {
+    name: "",
+    flowId: null,
+  },
+  tableData: {
+    list: [],
+    page: 1,
+    size: 10,
+    loading: false,
+    total: 0,
+  },
+  supplierName: '',
+});
+onMounted(() => {
+  console.log(route.query);
+  if (route.query.id) {
+    state.query.flowId = route.query.id
+  }
+  if (route.query.supplierName) {
+    state.supplierName = route.query.supplierName
+  }
+  getTableData();
+});
+// 获取账单付款列表
+async function getTableData() {
+  state.tableData.loading = true;
+  try {
+    const res = await AuthAPI.getPayRecordList({
+      page: state.tableData.page,
+      size: state.tableData.size,
+      flowId: state.query.flowId,
+    });
+    state.tableData.loading = false;
+    state.tableData.list = res.records;
+    state.tableData.total = res.totalRow * 1;
+  } catch (error) {
+    console.log(error);
+  }
+}
+function handleSync(e) {
+  console.log(e)
+  ElMessageBox.confirm(`同步功能开启后不能关闭，请确认是否给${e.shopName}开启同步?`, "提示", {
+    confirmButtonText: "确认",
+    cancelButtonText: "取消",
+    type: "warning",
+  }).then(async () => {
+    const res = await ShopApi.delete({ id: row.id });
+    ElMessage({
+      type: "success",
+      message: "同步成功",
+    });
+    getTableData();
+  }).catch(() => { });
+}
+// 重置查询
+function resetHandle() {
+  state.query.name = "";
+  getTableData();
+}
+// 分页回调
+function paginationChange(e) {
+  state.tableData.page = e;
+  getTableData();
+}
+
+</script>
+
+<style scoped lang="scss">
+.head-container {
+  margin-bottom: 20px;
+}
+
+.shop_info {
+  display: flex;
+
+  .info {
+    flex: 1;
+    padding-left: 4px;
+  }
+}
+
+.el-link {
+  min-height: 23px;
+  margin: 0 5px;
+}
+</style>

src/views/inventory/classification/config/content.ts

@@ -20,7 +20,15 @@ const contentConfig: IContentConfig = {
     return Api.edit(data);
   },
   pk: "id",
-  toolbar: ["add"],
+  toolbar: [
+    {
+      icon: "plus",
+      text: "新增",
+      type: "primary",
+      name: "add",
+      auth: "import",
+    },
+  ],
   defaultToolbar: ["refresh", "filter", "search"],
   cols: [
     // { type: "selection", width: 50, align: "center" },
@@ -49,7 +57,7 @@ const contentConfig: IContentConfig = {
       fixed: "right",
       width: 280,
       templet: "tool",
-      operat: ["edit"],
+      operat: [{ text: "编辑", icon: 'edit', name: "edit"}],
     },
   ],
 };

src/views/inventory/classification/index.vue

@@ -71,6 +71,7 @@ import contentConfig from "./config/content";
 import editModalConfig from "./config/edit";
 import searchConfig from "./config/search";
 import { returnOptionsLabel } from "./config/config";
+import { isSyncStatus } from "@/utils/index";
 
 const {
   searchRef,
@@ -87,6 +88,14 @@ const {
   handleFilterChange,
 } = usePage();
 
+if (isSyncStatus()) {
+  contentConfig.toolbar[0].hidden = true
+  contentConfig.cols[contentConfig.cols.length - 1].operat[0].hidden = true
+} else {
+  contentConfig.toolbar[0].hidden = false
+  contentConfig.cols[contentConfig.cols.length - 1].operat[0].hidden = false
+}
+
 // 新增
 async function handleAddClick() {
   addModalRef.value?.setModalVisible();

src/views/inventory/consumables/components/DataStatistics.vue

@@ -77,8 +77,40 @@
         </div>
       </div>
     </div>
-
+    <!--<div style="
-    <stockHistory ref="refStockHistory"></stockHistory>
+        width: 200px;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        background: #fff;
+      ">
+      <div style="font-weight: bold">入库</div>
+      <div style="margin-top: 10px">{{ data.stockInNum || 0 }}</div>
+      <div style="margin-top: 10px">{{ data.totalRow || 0 }}</div>
+    </div>
+     <div style="
+        width: 200px;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        background: #fff;
+      ">
+      <div style="font-weight: bold">出库</div>
+      <div style="margin-top: 10px">{{ data.stockOutNum || 0 }}</div>
+      <div style="margin-top: 10px">{{ data.totalRow || 0 }}</div>
+    </div>
+    <div style="
+        width: 200px;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        background: #fff;
+      ">
+      <div style="font-weight: bold">报损</div>
+      <div style="margin-top: 10px">{{ data.damageNum || 0 }}</div>
+      <div style="margin-top: 10px">{{ data.totalRow || 0 }}</div>
+    </div> -->
+    <stockHistory ref="refStockHistory" />
   </div>
 </template>
 <script setup>
@@ -97,7 +129,6 @@ function refStockHistoryShow(key) {
 }
 </script>
 
-
 <style scoped lang="scss">
 .DataStatistics {
   border: 1px solid #e4e7ed;
@@ -110,7 +141,7 @@ function refStockHistoryShow(key) {
   align-items: center;
   justify-content: space-around;
 
-  > div {
+  >div {
     height: 80px;
     background-color: #f4f9ff;
     display: flex;
@@ -130,6 +161,7 @@ function refStockHistoryShow(key) {
     span {
       color: #666;
       font-size: 14px;
+
       &.num {
         color: #3f9eff;
         cursor: pointer;

src/views/inventory/consumables/components/add-haocai copy.vue

@@ -1,197 +0,0 @@
-<template>
-  <!-- 修改和增加 -->
-  <el-dialog :title="dialogtitle" v-model="show" width="85%">
-    <div v-if="dialogtitle != '编辑'">
-      <div v-for="(item, index) in forms" :key="index">
-        <el-form
-          :inline="true"
-          :ref="(el) => setFormRef(el, index)"
-          :model="item"
-          :rules="rules"
-          class="demo-form-inline"
-        >
-          <el-form-item label=" ">
-            <el-icon color="red" @click="formsReduce(index)"><Remove /></el-icon>
-          </el-form-item>
-          <el-form-item label="耗材名称" prop="conName">
-            <el-input v-model="item.conName" placeholder="请输入耗材信息名称"></el-input>
-          </el-form-item>
-          <el-form-item label="耗材类型" prop="conTypeId">
-            <el-select v-model="item.conTypeId" placeholder="请选择耗材类型" style="width: 200px">
-              <el-option
-                v-for="option in consGroups"
-                :key="option.conTypeId"
-                :label="option.conTypeName"
-                :value="option.id"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="单位" prop="conUnit">
-            <el-input v-model="item.conUnit" placeholder="请输入单位"></el-input>
-          </el-form-item>
-
-          <el-form-item label="耗材价格">
-            <el-input v-model="item.price" placeholder="请输入耗材价格"></el-input>
-          </el-form-item>
-          <el-form-item label="预警值">
-            <el-input v-model="item.conWarning" placeholder="请输入耗材预警值"></el-input>
-          </el-form-item>
-
-          <el-form-item label=" ">
-            <el-icon color="green" @click="formsAdd(index)"><CirclePlus /></el-icon>
-          </el-form-item>
-        </el-form>
-      </div>
-
-      <div style="display: flex; justify-content: flex-end">
-        <el-button @click="dialogshow = false">取 消</el-button>
-        <el-button type="primary" @click="submitForms()">确 定</el-button>
-      </div>
-    </div>
-    <el-form
-      v-else
-      :inline="true"
-      ref="refform"
-      :model="form"
-      :rules="rules"
-      class="demo-form-inline"
-    >
-      {{ dialogtitle }}
-
-      <el-form-item label="耗材信息名称" prop="conName">
-        <el-input v-model="form.conName" placeholder="请输入耗材信息名称"></el-input>
-      </el-form-item>
-
-      <el-form-item label="耗材价格">
-        <el-input v-model="form.price" placeholder="请输入耗材价格"></el-input>
-      </el-form-item>
-      <el-form-item label="单位" prop="conUnit">
-        <el-input v-model="form.conUnit" placeholder="请输入单位"></el-input>
-      </el-form-item>
-      <el-form-item label="预警值">
-        <el-input v-model="form.conWarning" placeholder="请输入耗材预警值"></el-input>
-      </el-form-item>
-      <!-- <el-form-item label="状态" v-if="dialogtitle == '编辑'">
-            <el-switch v-model="form.status" active-value="1" inactive-value="0"></el-switch>
-          </el-form-item> -->
-      <!-- <el-form-item label="单位耗材值" prop="surplusStock">
-          <el-input v-model="form.surplusStock" placeholder="请输入单位耗材值"></el-input>
-        </el-form-item> -->
-      <el-form-item style="display: flex; justify-content: flex-end">
-        <el-button @click="dialogshow = false">取 消</el-button>
-        <el-button type="primary" @click="submitForm('refform')">确 定</el-button>
-      </el-form-item>
-    </el-form>
-  </el-dialog>
-</template>
-
-
-<script setup>
-import consApi from "@/api/product/cons";
-import consGroupApi from "@/api/product/cons-group";
-import { ElMessage } from "element-plus";
-const consGroups = ref([]);
-const rules = {
-  conCode: [{ required: true, message: "请输入耗材信息代码", trigger: "blur" }],
-  conName: [{ required: true, message: "请输入耗材信息名称", trigger: "blur" }],
-  conTypeId: [{ required: true, message: "请选择耗材类型", trigger: "change" }],
-  price: [{ required: true, message: "请输入耗材价格", trigger: "blur" }],
-  conWarning: [{ required: true, message: "请输入耗材预警值", trigger: "blur" }],
-  conTypeId: [{ required: true, message: "请输入耗材类型id", trigger: "blur" }],
-  conUnit: [{ required: true, message: "请输入单位", trigger: "blur" }],
-  conWarning: [
-    {
-      required: true,
-      message: "请输入单位",
-      trigger: "blur",
-    },
-  ],
-};
-function getConsGroups() {
-  consGroupApi.getAllList().then((res) => {
-    consGroups.value = res.map((v) => {
-      return {
-        ...v,
-        label: v.name,
-        value: v.id,
-      };
-    });
-  });
-}
-getConsGroups();
-const basicForm = {
-  conCode: "",
-  conName: "",
-  conTypeId: "",
-  price: "0",
-  conNames: "",
-  conUnit: "",
-  conWarning: "999",
-  shopId: localStorage.getItem("shopId"),
-  status: "",
-};
-const forms = ref([{ ...basicForm }]);
-const form = reactive({
-  ...basicForm,
-});
-
-const show = ref(false);
-let dialogtitle = ref("");
-function open(item) {
-  dialogtitle.value = item ? "编辑" : "新增";
-  show.value = true;
-}
-function formsAdd(index) {
-  forms.value.push({ ...basicForm });
-}
-function close() {
-  show.value = false;
-}
-
-const refForms = ref([]);
-function setFormRef(el, index) {
-  if (el) {
-    refForms.value[index] = el;
-  }
-}
-function returnPromise(index, prosise) {
-  return new Promise((resolve, reject) => {
-    prosise
-      .then((res) => {
-        console.log(res);
-        resolve({ sucees: true });
-      })
-      .catch((err) => {
-        console.log(err);
-        resolve({ sucees: false });
-      });
-  });
-}
-async function submitForms() {
-  let isAllPassForm = 0;
-  for (let i in this.forms) {
-    console.log(refForms.value[i]);
-    const res = await returnPromise(i, refForms.value[i].validate());
-    console.log(res);
-    isAllPassForm += res.sucees ? 1 : 0;
-  }
-  //判断验证是否通过
-  if (isAllPassForm === this.forms.length) {
-    await consApi.add(this.forms);
-    ElMessage({ type: "success", message: "添加成功" });
-    // for(let i of this.forms){
-    //   const res=await posttbConsInfo(i)
-    //   this.$message({ type: "success", message: "添加成功" });
-    // }
-    this.dialogshow = false;
-    this.resetRuleForms();
-    this.ruleFormLoading = false;
-    this.getTableData();
-  }
-}
-defineExpose({
-  open,
-  close,
-});
-</script>

src/views/inventory/consumables/config/content.ts

@@ -13,11 +13,11 @@ const contentConfig: IContentConfig = {
     pageSizes: [10, 20, 30, 50],
   },
   indexAction: function (params) {
-    let obj = { ...params }
+    let obj = { ...params };
     if (obj.createAt) {
-      obj.beginTime = obj.createAt[0]
+      obj.beginTime = obj.createAt[0];
-      obj.endTime = obj.createAt[1]
+      obj.endTime = obj.createAt[1];
-      delete obj.createAt
+      delete obj.createAt;
     }
     return Api.getList(obj);
   },
@@ -25,28 +25,62 @@ const contentConfig: IContentConfig = {
   // modifyAction: function (data) {
   //   // return Api.edit(data);
   // },
+  indexActionData: {},
   pk: "id",
   toolbar: [
-    "add",
+    {
+      icon: "plus",
+      text: "新增",
+      type: "primary",
+      name: "add",
+      auth: "import",
+    },
+    {
+      icon: "refresh",
+      text: "同步",
+      type: "danger",
+      name: "sync",
+      auth: "import",
+    },
     {
       text: "入库",
-      name: 'ruku',
+      name: "ruku",
-      auth: 'ruku'
+      auth: "ruku",
     },
     {
       text: "出库",
-      name: 'chuku',
+      name: "chuku",
-      auth: ''
+      auth: "",
     },
     {
       text: "分类管理",
-      name: 'category',
+      name: "category",
-      auth: ''
+      auth: "",
     },
     {
       text: "供应商管理",
-      name: 'gongyinsahng',
+      name: "gongyinsahng",
-      auth: ''
+      auth: "",
+    },
+    {
+      text: "入库记录",
+      name: "manual-in",
+      auth: "",
+    },
+    {
+      text: "出库记录",
+      name: "manual-out",
+      auth: "",
+    },
+    {
+      text: "报损记录",
+      name: "damage-out",
+      auth: "",
+    },
+    {
+      text: "报损",
+      name: "reportinglosses",
+      auth: "",
     },
   ],
   defaultToolbar: ["refresh", "filter", "search"],
@@ -68,8 +102,8 @@ const contentConfig: IContentConfig = {
     {
       label: "所属商品",
       align: "center",
-      templet: 'custom',
+      templet: "custom",
-      slotName: 'goods'
+      slotName: "goods",
     },
     {
       label: "库存数量",
@@ -94,7 +128,7 @@ const contentConfig: IContentConfig = {
       fixed: "right",
       width: 150,
       templet: "custom",
-      slotName: 'operate'
+      slotName: "operate",
     },
   ],
 };

src/views/inventory/consumables/config/search.ts

@@ -1,5 +1,5 @@
 import type { ISearchConfig } from "@/components/CURD/types";
-import consGroupApi from '@/api/product/cons-group'
+import consGroupApi from "@/api/product/cons-group";
 import { statusOptions, payTypeOptions } from "./config";
 const searchConfig: ISearchConfig = {
   pageName: "sys:user",
@@ -20,14 +20,14 @@ const searchConfig: ISearchConfig = {
       initialValue: "",
       initFn(formItem) {
         console.log(formItem);
-        consGroupApi.getAllList({}).then(res => {
+        consGroupApi.getAllList({}).then((res) => {
-          formItem.options = res.map((item: { name: any; id: any; }) => {
+          formItem.options = res.map((item: { name: any; id: any }) => {
             return {
               label: item?.name,
-              value: item?.id
+              value: item?.id,
-            }
+            };
-          })
+          });
-        })
+        });
       },
     },
 
@@ -42,22 +42,23 @@ const searchConfig: ISearchConfig = {
           width: "200px",
         },
       },
+      initialValue: "",
     },
-    {
+    // {
-      type: "date-picker",
+    //   type: "date-picker",
-      label: "创建时间",
+    //   label: "创建时间",
-      prop: "createAt",
+    //   prop: "createAt",
-      attrs: {
+    //   attrs: {
-        type: "daterange",
+    //     type: "daterange",
-        "range-separator": "~",
+    //     "range-separator": "~",
-        "start-placeholder": "开始时间",
+    //     "start-placeholder": "开始时间",
-        "end-placeholder": "截止时间",
+    //     "end-placeholder": "截止时间",
-        "value-format": "YYYY-MM-DD",
+    //     "value-format": "YYYY-MM-DD",
-        style: {
+    //     style: {
-          width: "240px",
+    //       width: "240px",
-        },
+    //     },
-      },
+    //   },
-    },
+    // },
   ],
 };
 

src/views/inventory/consumables/index.vue

@@ -2,26 +2,14 @@
   <div class="app-container">
     <!-- 列表 -->
     <!-- 搜索 -->
-    <page-search
+    <page-search ref="searchRef" :search-config="searchConfig" @query-click="newHandleQueryClick"
-      ref="searchRef"
+      @reset-click="handleResetClick" />
-      :search-config="searchConfig"
-      @query-click="newHandleQueryClick"
-      @reset-click="handleResetClick"
-    />
     <!-- 统计 -->
-    <data-tongji :data="gongjiData"></data-tongji>
+    <data-tongji :data="gongjiData" />
     <!-- 列表 -->
-    <page-content
+    <page-content ref="contentRef" :content-config="contentConfig" @add-click="handleAddClick"
-      ref="contentRef"
+      @edit-click="handleEditClick" @export-click="handleExportClick" @search-click="handleSearchClick"
-      :content-config="contentConfig"
+      @toolbar-click="handleToolbarClick" @operat-click="handleOperatClick" @filter-change="handleFilterChange">
-      @add-click="handleAddClick"
-      @edit-click="handleEditClick"
-      @export-click="handleExportClick"
-      @search-click="handleSearchClick"
-      @toolbar-click="handleToolbarClick"
-      @operat-click="handleOperatClick"
-      @filter-change="handleFilterChange"
-    >
       <template #status="scope">
         <el-tag :type="scope.row[scope.prop] == 1 ? 'success' : 'info'">
           {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
@@ -33,28 +21,22 @@
       <template #goods="scope">
         <div class="goodslang">
           <div class="goods-list">
-            <el-button
+            <el-button v-for="item in scope.row.productList" :key="item.productId" type="text"
-              v-for="item in scope.row.productList"
+              @click="toGoods(item.id)">
-              @click="toGoods(item.id)"
-              :key="item.productId"
-              type="text"
-            >
               {{ item.name }}
             </el-button>
             <span v-if="scope.row.productList.length > 1">,</span>
           </div>
-          <el-dropdown trigger="click" v-if="scope.row.productList.length > 1" @command="toGoods">
+          <el-dropdown v-if="scope.row.productList.length > 1" trigger="click" @command="toGoods">
             <span class="el-dropdown-link" style="color: blue">
-              <el-icon><CaretBottom /></el-icon>
+              <el-icon>
+                <CaretBottom />
+              </el-icon>
             </span>
             <template #dropdown>
               <el-dropdown-menu>
-                <el-dropdown-item
+                <el-dropdown-item v-for="item in scope.row.productList" :key="item.id" class="clearfix"
-                  class="clearfix"
+                  :command="item.id">
-                  v-for="item in scope.row.productList"
-                  :key="item.id"
-                  :command="item.id"
-                >
                   {{ item.name }}
                 </el-dropdown-item>
               </el-dropdown-menu>
@@ -73,25 +55,34 @@
       </template>
       <template #mobile="scope">
         <el-text>{{ scope.row[scope.prop] }}</el-text>
-        <copy-button
+        <copy-button v-if="scope.row[scope.prop]" :text="scope.row[scope.prop]" style="margin-left: 2px" />
-          v-if="scope.row[scope.prop]"
-          :text="scope.row[scope.prop]"
-          style="margin-left: 2px"
-        />
       </template>
       <template #operate="scope">
-        <div>
+        <div style="
-          <el-button @click="refAddHaocaiOpen(scope.row)" type="primary" link>编辑</el-button>
+            display: flex;
-          <el-button @click="refAddHaocaiTakinShow(scope.row)" link type="primary">
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+          ">
+          <el-button v-if="!isSyncStatus()" type="primary" link @click="refAddHaocaiOpen(scope.row)">
+            编辑
+          </el-button>
+          <el-button link type="primary" @click="refAddHaocaiTakinShow(scope.row, 'consumables')">
             耗材盘点
           </el-button>
+          <el-button link type="primary" @click="refAddHaocaiTakinShow(scope.row, 'manual-in')">
+            入库记录
+          </el-button>
+          <!-- <el-button link type="primary" @click="refAddHaocaiTakinShow(scope.row, 'delete')">
+            删除
+          </el-button> -->
         </div>
       </template>
     </page-content>
     <!-- 耗材添加编辑 -->
-    <add-haocai ref="refAddHaocai" @refresh="refresh"></add-haocai>
+    <add-haocai ref="refAddHaocai" @refresh="refresh" />
     <!-- 耗材盘点 -->
-    <addConsTakin ref="refAddHaocaiTakin" @success="refresh"></addConsTakin>
+    <addConsTakin ref="refAddHaocaiTakin" @success="refresh" />
   </div>
 </template>
 
@@ -100,12 +91,16 @@ import addHaocai from "./components/add-haocai.vue";
 import dataTongji from "./components/DataStatistics.vue";
 import addConsTakin from "./components/addConsTakin.vue";
 import consApi from "@/api/product/cons";
+import UserAPI from "@/api/product/index";
+
 import type { IObject, IOperatData } from "@/components/CURD/types";
 import usePage from "@/components/CURD/usePage";
 import contentConfig from "./config/content";
 import editModalConfig from "./config/edit";
 import searchConfig from "./config/search";
 import { returnOptionsLabel } from "./config/config";
+import { isSyncStatus } from "@/utils/index";
+
 const router = useRouter();
 const {
   searchRef,
@@ -123,6 +118,24 @@ function toGoods(id: number | string) {
   router.push({ path: "/product/index", query: { id: id } });
 }
 
+// 默认初始数据
+const route = useRoute();
+const { conName } = route.query;
+if (conName) {
+  contentConfig.indexActionData = { conName };
+  if (conName) {
+    searchConfig.formItems[1].initialValue = conName;
+  }
+}
+
+if (isSyncStatus()) {
+  contentConfig.toolbar[0].hidden = true;
+  contentConfig.toolbar[1].hidden = false;
+} else {
+  contentConfig.toolbar[0].hidden = false;
+  contentConfig.toolbar[1].hidden = true;
+}
+
 //统计数据
 const gongjiData = reactive({ totalRow: 0 });
 function getTongji(params: IObject | undefined) {
@@ -152,7 +165,20 @@ watch(
 
 //耗材盘点
 const refAddHaocaiTakin = ref();
-function refAddHaocaiTakinShow(item: any) {
+function refAddHaocaiTakinShow(item: any, type: string) {
+  console.log(item);
+  if (type === "manual-in") {
+    router.push({ path: "/inventory/libraryrecords", query: { inOutItem: type, conId: item.id } });
+    return;
+  }
+  if (type === "delete") {
+    refAddHaocaiTakin.value.show(item, type);
+    return;
+  }
+  if (type === "consumables") {
+    refAddHaocaiTakin.value.show(item, type);
+    return;
+  }
   refAddHaocaiTakin.value.show(item);
 }
 
@@ -177,8 +203,13 @@ async function handleEditClick(row: IObject) {
   editModalRef.value?.setFormData({ ...row, url: [row.url] });
 }
 // 其他工具栏
-function handleToolbarClick(name: string) {
+async function handleToolbarClick(name: string) {
   console.log(name);
+  if (name === "sync") {
+    let res = await UserAPI.sync();
+    ElMessage.success("操作成功，数据正在后台同步中...");
+    return;
+  }
   if (name === "category") {
     router.push({ path: "/inventory/classification" });
     return;
@@ -195,6 +226,14 @@ function handleToolbarClick(name: string) {
     router.push({ path: "/inventory/operation_in", query: { type: "out" } });
     return;
   }
+  if (name == "reportinglosses") {
+    router.push({ path: "/inventory/operation_in", query: { type: "reportinglosses" } });
+    return;
+  }
+  if (name == "damage-out" || name == "manual-out" || name == "manual-in") {
+    router.push({ path: "/inventory/libraryrecords", query: { inOutItem: name } });
+    return;
+  }
 }
 // 其他操作列
 async function handleOperatClick(data: IOperatData) {

src/views/inventory/libraryrecords/config/add.ts

@@ -0,0 +1,77 @@
+import Api from "@/api/product/vendor";
+import { returnOptions, switchAttr } from "./config";
+import type { IModalConfig } from "@/components/CURD/types";
+
+const modalConfig: IModalConfig = {
+  pageName: "sys:user",
+  dialog: {
+    title: "添加供应商",
+    width: 800,
+    draggable: true,
+  },
+  form: {
+    labelWidth: 140,
+  },
+  formAction: function (data) {
+    return Api.add({ ...data });
+  },
+  beforeSubmit(data) {
+    console.log("提交之前处理", data);
+  },
+  formItems: [
+
+    {
+      label: "名称",
+      prop: "name",
+      rules: [{ required: true, message: "请输入名称", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入名称",
+      },
+    },
+    {
+      label: "联系人名字",
+      prop: "contactName",
+      rules: [{ required: false, message: "请输入联系人名字", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入联系人名字",
+      },
+    },
+    {
+      label: "联系人电话",
+      prop: "telephone",
+      rules: [{ required: false, message: "请输入联系人名字", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入联系人名字",
+      },
+    },
+    {
+      label: "供应商地址",
+      prop: "address",
+      rules: [{ required: false, message: "请输入供应商地址", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入供应商地址",
+      },
+    },
+    {
+      label: "备注",
+      prop: "remark",
+      rules: [{ required: false, message: "请输入备注", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入备注",
+      },
+    },
+    {
+      label: "排序",
+      prop: "sort",
+      rules: [{ required: true, message: "请输入排序", trigger: "blur" }],
+      type: "input-number",
+      attrs: {
+        placeholder: "请输入排序",
+      },
+    },
+
+  ],
+};
+
+// 如果有异步数据会修改配置的，推荐用reactive包裹，而纯静态配置的可以直接导出
+export default reactive(modalConfig);

src/views/inventory/libraryrecords/config/config.ts

@@ -0,0 +1,46 @@
+export interface options {
+  label: string;
+  value: string | number;
+  [property: string]: any;
+}
+export interface optionObject {
+  [property: string]: options[];
+}
+const options: optionObject = {
+  payType: [
+    { label: "现金", value: "cash" },
+    { label: "微信", value: "weixin" },
+    { label: "银行卡", value: "bank" },
+    { label: "会员支付", value: "member-account" },
+    { label: "支付宝", value: "alipay" },
+    { label: "刷卡", value: "deposit" },
+    { label: "挂账", value: "arrears" },
+    { label: "刷卡", value: "deposit" },
+    { label: "储值", value: "member-account" },
+    { label: "自定义", value: "virtual" },
+  ],
+  isIdeal: [
+    { label: "否", value: 0 },
+    { label: "是", value: 1 },
+  ],
+};
+
+export const switchAttr = {
+  "active-value": 1,
+  "inactive-value": 0,
+};
+
+export type optionsType = string;
+
+export function returnOptions(type: optionsType) {
+  return options[type];
+}
+
+export function returnOptionsLabel(optionsType: optionsType, value: string | number) {
+  const options = returnOptions(optionsType);
+  if (!options) {
+    return "";
+  }
+  const option = options.find((item) => item.value === value);
+  return option ? option.label : "";
+}

src/views/inventory/libraryrecords/config/content.ts

@@ -0,0 +1,94 @@
+import Api from "@/api/product/libraryrecords";
+import type { IContentConfig } from "@/components/CURD/types";
+
+const contentConfig: IContentConfig = {
+  pageName: "sys:user",
+  table: {
+    border: true,
+    highlightCurrentRow: true,
+  },
+  pagination: {
+    background: true,
+    layout: "prev,pager,next,jumper,total,sizes",
+    pageSize: 20,
+    pageSizes: [10, 20, 30, 50],
+  },
+  indexAction: function (params) {
+    return Api.getList(params);
+  },
+  deleteAction: function (id) {
+    return Api.delete(id);
+  },
+  modifyAction: function (data) {
+    return Api.edit(data);
+  },
+  indexActionData: {},
+  pk: "id",
+  toolbar: [
+    // {
+    //   text: "入库记录",
+    //   name: "manual-in",
+    //   auth: "",
+    // },
+    // {
+    //   text: "出库记录",
+    //   name: "manual-out",
+    //   auth: "",
+    // },
+    // {
+    //   text: "报损记录",
+    //   name: "damage-out",
+    //   auth: "",
+    // },
+  ],
+  defaultToolbar: ["refresh", "filter", "search"],
+  cols: [
+    // { type: "selection", width: 50, align: "center" },
+    {
+      label: "耗材名称",
+      align: "center",
+      prop: "conName",
+    },
+    {
+      label: "单位",
+      align: "center",
+      prop: "unitName",
+    },
+    {
+      label: "供应商",
+      align: "center",
+      prop: "vendorName",
+    },
+    {
+      label: "变动原因",
+      align: "center",
+      templet: "custom",
+      slotName: "conUnit",
+    },
+    {
+      label: "出入库数量",
+      align: "center",
+      prop: "inOutNumber",
+    },
+    {
+      label: "变动后的库存",
+      align: "center",
+      prop: "afterNumber",
+    },
+    {
+      label: "创建时间",
+      align: "center",
+      prop: "createTime",
+    },
+    // {
+    //   label: "操作",
+    //   align: "center",
+    //   fixed: "right",
+    //   width: 280,
+    //   templet: "tool",
+    //   operat: ["edit", "delete"],
+    // },
+  ],
+};
+
+export default contentConfig;

src/views/inventory/libraryrecords/config/edit.ts

@@ -0,0 +1,75 @@
+import Api from "@/api/product/vendor";
+import { returnOptions, switchAttr } from "./config";
+import type { IModalConfig } from "@/components/CURD/types";
+
+const modalConfig: IModalConfig = {
+  pageName: "sys:user",
+  dialog: {
+    title: "编辑供应商",
+    width: 800,
+    draggable: true,
+  },
+  form: {
+    labelWidth: 140,
+  },
+  formAction: function (data) {
+    return Api.edit({ ...data });
+  },
+  beforeSubmit(data) {
+    console.log("提交之前处理", data);
+  },
+  formItems: [
+    {
+      label: "名称",
+      prop: "name",
+      rules: [{ required: true, message: "请输入名称", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入名称",
+      },
+    },
+    {
+      label: "联系人名字",
+      prop: "contactName",
+      rules: [{ required: false, message: "请输入联系人名字", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入联系人名字",
+      },
+    },
+    {
+      label: "联系人电话",
+      prop: "telephone",
+      rules: [{ required: false, message: "请输入联系人名字", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入联系人名字",
+      },
+    },
+    {
+      label: "供应商地址",
+      prop: "address",
+      rules: [{ required: false, message: "请输入供应商地址", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入供应商地址",
+      },
+    },
+    {
+      label: "备注",
+      prop: "remark",
+      rules: [{ required: false, message: "请输入备注", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入备注",
+      },
+    },
+    {
+      label: "排序",
+      prop: "sort",
+      rules: [{ required: true, message: "请输入排序", trigger: "blur" }],
+      type: "input-number",
+      attrs: {
+        placeholder: "请输入排序",
+      },
+    },
+  ],
+};
+
+// 如果有异步数据会修改配置的，推荐用reactive包裹，而纯静态配置的可以直接导出
+export default reactive(modalConfig);

src/views/inventory/libraryrecords/config/search.ts

@@ -0,0 +1,58 @@
+import type { ISearchConfig } from "@/components/CURD/types";
+const searchConfig: ISearchConfig = {
+  pageName: "sys:user",
+  isExpandable: false,
+  formItems: [
+    {
+      type: "select",
+      label: "类型",
+      prop: "inOutType",
+      attrs: {
+        placeholder: "请选择",
+        clearable: true,
+        style: {
+          width: "200px",
+        },
+      },
+      options: [
+        {
+          label: "增加",
+          value: "in",
+        },
+        {
+          label: "减少",
+          value: "out",
+        },
+      ],
+    },
+    {
+      type: "select",
+      label: "名目",
+      prop: "inOutItem",
+      attrs: {
+        placeholder: "请选择",
+        clearable: true,
+        style: {
+          width: "200px",
+        },
+      },
+      options: [
+        {
+          label: "入库记录",
+          value: "manual-in",
+        },
+        {
+          label: "出库记录",
+          value: "manual-out",
+        },
+        {
+          label: "报损记录",
+          value: "damage-out",
+        },
+      ],
+      initialValue: "",
+    },
+  ],
+};
+
+export default searchConfig;

src/views/inventory/libraryrecords/index.vue

@@ -0,0 +1,106 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索 -->
+    <page-search
+      ref="searchRef"
+      :search-config="searchConfig"
+      @query-click="handleQueryClick"
+      @reset-click="handleResetClick"
+    />
+    <!-- 列表 -->
+    <page-content
+      ref="contentRef"
+      :content-config="contentConfig"
+      @add-click="handleAddClick"
+      @edit-click="handleEditClick"
+      @export-click="handleExportClick"
+      @search-click="handleSearchClick"
+      @toolbar-click="handleToolbarClick"
+      @operat-click="handleOperatClick"
+      @filter-change="handleFilterChange"
+    >
+      <template #conUnit="scope">
+        <span v-if="scope.row.inOutItem == 'manual-in'">手动入库</span>
+        <span v-if="scope.row.inOutItem == 'manual-out'">手动出库</span>
+        <span v-if="scope.row.inOutItem == 'win-in'">盘盈入库</span>
+        <span v-if="scope.row.inOutItem == 'loss-out'">盘亏出库</span>
+        <span v-if="scope.row.inOutItem == 'order-in'">订单退款入库</span>
+        <span v-if="scope.row.inOutItem == 'order-out'">订单消费出库</span>
+      </template>
+    </page-content>
+
+    <!-- 新增 -->
+    <page-modal
+      ref="addModalRef"
+      :modal-config="addModalConfig"
+      @submit-click="handleSubmitClick"
+    />
+
+    <!-- 编辑 -->
+    <page-modal
+      ref="editModalRef"
+      :modal-config="editModalConfig"
+      @submit-click="handleSubmitClick"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import VersionApi from "@/api/system/version";
+import type { IObject, IOperatData } from "@/components/CURD/types";
+import usePage from "@/components/CURD/usePage";
+import addModalConfig from "./config/add";
+import contentConfig from "./config/content";
+import editModalConfig from "./config/edit";
+import searchConfig from "./config/search";
+
+const {
+  searchRef,
+  contentRef,
+  addModalRef,
+  editModalRef,
+  handleQueryClick,
+  handleResetClick,
+  // handleAddClick,
+  // handleEditClick,
+  handleSubmitClick,
+  handleExportClick,
+  handleSearchClick,
+  handleFilterChange,
+} = usePage();
+
+// 默认初始数据
+const route = useRoute();
+const { inOutItem, conId } = route.query;
+if (inOutItem || conId) {
+  contentConfig.indexActionData = { inOutItem, conId };
+  if (inOutItem) {
+    searchConfig.formItems[1].initialValue = inOutItem;
+  }
+}
+
+// 新增
+async function handleAddClick() {
+  addModalRef.value?.setModalVisible();
+  // addModalConfig.formItems[2]!.attrs!.data =
+}
+// 编辑
+async function handleEditClick(row: IObject) {
+  editModalRef.value?.handleDisabled(false);
+  editModalRef.value?.setModalVisible();
+  // 根据id获取数据进行填充
+  console.log(row);
+  editModalRef.value?.setFormData({ ...row });
+}
+// 其他工具栏
+function handleToolbarClick(name: string) {
+  console.log(name);
+  if (name === "custom1") {
+    ElMessage.success("点击了自定义1按钮");
+  }
+}
+// 其他操作列
+async function handleOperatClick(data: IOperatData) {
+  console.log(data);
+}
+</script>

src/views/inventory/operation_in/components/consumableList.vue

@@ -1,16 +1,12 @@
 <!-- 耗材列表 -->
 <template>
-  <el-dialog title="选择耗材" v-model="dialogVisible">
+  <el-dialog v-model="dialogVisible" title="选择耗材">
     <el-form :model="searchForm" inline>
       <el-form-item>
-        <el-input
+        <el-input v-model="searchForm.conTypeName" placeholder="耗材类型名称" @input="onInput" />
-          v-model="searchForm.conTypeName"
-          placeholder="耗材类型名称"
-          @input="onInput"
-        ></el-input>
       </el-form-item>
       <el-form-item>
-        <el-input v-model="searchForm.conName" placeholder="耗材名称" @input="onInput"></el-input>
+        <el-input v-model="searchForm.conName" placeholder="耗材名称" @input="onInput" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="getTableData">查询</el-button>
@@ -18,21 +14,13 @@
       </el-form-item>
     </el-form>
     <div class="head-container">
-      <el-table
+      <el-table ref="table" v-loading="tableData.loading" :data="tableData.list" :row-key="getRowKey"
-        ref="table"
+        @select="firstSelectChange" @selection-change="onSelectionChange">
-        :data="tableData.list"
+        <el-table-column type="selection" width="55" align="center" />
-        v-loading="tableData.loading"
+        <el-table-column label="耗材名称" prop="conName" />
-        @select="firstSelectChange"
+        <el-table-column label="所属分类" prop="consGroupName" />
-        :row-key="getRowKey"
+        <el-table-column label="价格" prop="price" />
-        @selection-change="onSelectionChange"
+        <el-table-column label="单位" prop="conUnit" />
-      >
-        <el-table-column type="selection" width="55" align="center"></el-table-column>
-        <el-table-column label="耗材名称" prop="conName"></el-table-column>
-        <el-table-column label="价格" prop="price"></el-table-column>
-        <el-table-column label="耗材代码" prop="conCode"></el-table-column>
-        <el-table-column label="耗材类型名称" prop="conTypeName"></el-table-column>
-        <el-table-column label="单位" prop="conUnit"></el-table-column>
-        <el-table-column label="最近入库量" prop="lasterInStock"></el-table-column>
         <el-table-column label="库存数量" prop="stockNumber">
           <template v-slot="scope">
             {{ formatDecimal(scope.row.stockNumber, 2, true) }}
@@ -45,14 +33,8 @@
                 </el-table-column> -->
       </el-table>
     </div>
-    <el-pagination
+    <el-pagination :total="tableData.total" :current-page="tableData.page + 1" :page-size="tableData.size"
-      :total="tableData.total"
+      layout="total, sizes, prev, pager, next, jumper" @current-change="paginationChange" @size-change="sizeChange" />
-      :current-page="tableData.page + 1"
-      :page-size="tableData.size"
-      @current-change="paginationChange"
-      @size-change="sizeChange"
-      layout="total, sizes, prev, pager, next, jumper"
-    ></el-pagination>
     <template #footer>
       <span class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>

src/views/inventory/operation_in/index.vue

@@ -1,128 +1,81 @@
 <template>
   <div class="app-container bg-fff u-m-20">
     <div class="head-container">
-      <el-form
+      <el-form ref="queryForm" :model="queryForm" :rules="queryRules" label-position="left" label-width="100px">
-        ref="queryForm"
-        :model="queryForm"
-        :rules="queryRules"
-        label-position="left"
-        label-width="100px"
-      >
         <el-row>
           <el-form-item label="类型">
-            <el-radio-group :model-value="type">
+            <el-radio-group :model-value="type" @change="tabChange">
-              <el-radio-button value="in">入库</el-radio-button>
+              <el-radio v-if="type == 'reportinglosses'" value="reportinglosses">报损</el-radio>
-              <el-radio-button value="out">出库</el-radio-button>
+              <div v-else>
+                <el-radio value="in">入库</el-radio>
+                <el-radio value="out">出库</el-radio>
+              </div>
             </el-radio-group>
           </el-form-item>
         </el-row>
+        <div v-if="type != 'reportinglosses'">
           <el-row>
-          <el-col :span="8">
+            <el-col v-if="type == 'in'" :span="8">
               <el-form-item label="供应商">
-              <el-select
+                <el-select v-model="queryForm.vendorId" placeholder="请选择供应商" clearable style="width: 220px"
-                v-model="queryForm.vendorId"
+                  @change="changeTypeEnum">
-                placeholder="请选择供应商"
+                  <el-option v-for="item in purveyorList" :key="item.id" :label="item.name" :value="item.id" />
-                clearable
-                style="width: 220px"
-                @change="changeTypeEnum"
-              >
-                <el-option
-                  :label="item.name"
-                  :value="item.id"
-                  v-for="item in purveyorList"
-                  :key="item.id"
-                ></el-option>
                 </el-select>
                 {{ queryForm.waitAmount }}
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="出入库时间" prop="inOutDate">
-              <el-date-picker
+                <el-date-picker v-model="queryForm.inOutDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
-                v-model="queryForm.inOutDate"
+                  placeholder="选择日期" style="width: 220px" disabled="false" />
-                type="date"
-                format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
-                placeholder="选择日期"
-                style="width: 220px"
-              ></el-date-picker>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="8">
               <el-form-item label="应付金额">
-              <el-input
+                <el-input v-model="queryForm.amountPayable" placeholder="请输入应收金额" style="width: 220px" />
-                v-model="queryForm.amountPayable"
-                placeholder="请输入应收金额"
-                style="width: 220px"
-              ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="实付金额">
-              <el-input
+                <el-input v-model="queryForm.actualPaymentAmount" placeholder="请输入实收金额" style="width: 220px" />
-                v-model="queryForm.actualPaymentAmount"
-                placeholder="请输入实收金额"
-                style="width: 220px"
-              ></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="8">
               <el-form-item label="付款时间">
-              <el-date-picker
+                <el-date-picker v-model="queryForm.paymentDate" type="date" format="YYYY-MM-DD"
-                v-model="queryForm.paymentDate"
+                  value-format="YYYY-MM-DD" placeholder="选择日期" style="width: 220px" />
-                type="date"
-                format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
-                placeholder="选择日期"
-                style="width: 220px"
-              ></el-date-picker>
               </el-form-item>
             </el-col>
-          <el-col :span="8">
+            <!-- <el-col :span="8">
             <el-form-item label="批号">
-              <el-input
+              <el-input v-model="queryForm.batchNo" placeholder="请输入批号" style="width: 220px" />
-                v-model="queryForm.batchNo"
-                placeholder="请输入批号"
-                style="width: 220px"
-              ></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           </el-row>
-        <el-row>
+          <!-- <el-row>
             <el-col :span="8">
               <el-form-item label="备注">
-              <el-input
+                <el-input v-model="queryForm.remark" placeholder="请输入备注" style="width: 220px" />
-                v-model="queryForm.remark"
-                placeholder="请输入备注"
-                style="width: 220px"
-              ></el-input>
               </el-form-item>
             </el-col>
-        </el-row>
+          </el-row> -->
+        </div>
         <el-form-item label="选择耗材">
-          <div></div>
+          <div />
           <el-button type="primary" @click="showHaocai">选择耗材</el-button>
 
-          <el-autocomplete
+          <el-autocomplete v-model="autocompletename" :fetch-suggestions="querySearchAsync" value-key="conName"
-            v-model="autocompletename"
+            placeholder="耗材搜索" style="width: 200px; margin-left: 20px" @select="handleSelect" />
-            :fetch-suggestions="querySearchAsync"
-            value-key="conName"
-            placeholder="耗材搜索"
-            @select="handleSelect"
-            style="width: 200px; margin-left: 20px"
-          ></el-autocomplete>
         </el-form-item>
       </el-form>
     </div>
-    <div class="head-container">
+    <div style="font-weight: bold; font-size: 16px; color: #666">
-      <el-button type="primary" plain>
       共{{ tableData.list.length }}种耗材，金额合计
       <span style="color: red">￥{{ amountPayable }}</span>
-      </el-button>
     </div>
     <div class="head-container">
       <el-table :data="tableData.list">
@@ -131,13 +84,14 @@
             {{ scope.row.conName }}
           </template>
         </el-table-column>
-        <el-table-column label="进价">
+        <el-table-column label="所属分类">
           <template v-slot="scope">
-            <el-input-number
+            {{ scope.row.consGroupName }}
-              v-model="scope.row.price"
+          </template>
-              :min="0"
+        </el-table-column>
-              controls-position="right"
+        <el-table-column>
-            ></el-input-number>
+          <template v-slot="scope">
+            <el-input-number v-model="scope.row.price" :min="0" controls-position="right" />
             <div class="tips" style="font-size: 16px">
               原价￥
 
@@ -149,30 +103,17 @@
         </el-table-column>
         <el-table-column label="单位">
           <template v-slot="scope">
-            <el-select
+            <el-select v-model="scope.row.unit" :placeholder="scope.row.unit" @change="changeUnit(scope.row)">
-              v-model="scope.row.unit"
+              <el-option :label="scope.row.conUnit" :value="scope.row.conUnit" />
-              :placeholder="scope.row.unit"
+              <el-option v-if="scope.row.conUnitTwo" :label="scope.row.conUnitTwo" :value="scope.row.conUnitTwo" />
-              @change="changeUnit(scope.row)"
-            >
-              <el-option :label="scope.row.conUnit" :value="scope.row.conUnit"></el-option>
-              <el-option
-                :label="scope.row.conUnitTwo"
-                :value="scope.row.conUnitTwo"
-                v-if="scope.row.conUnitTwo"
-              ></el-option>
             </el-select>
             <div class="tips">&nbsp;</div>
           </template>
         </el-table-column>
         <el-table-column label="数量">
           <template v-slot="scope">
-            <el-input-number
+            <el-input-number v-model="scope.row.stockNumber" :min="0" :step="1" step-strictly
-              v-model="scope.row.stockNumber"
+              controls-position="right" />
-              :min="0"
-              :step="1"
-              step-strictly
-              controls-position="right"
-            ></el-input-number>
             <div class="tips" style="font-size: 16px">
               {{ type == "in" ? "入库" : "出库" }}前：
               {{ returnStockNumber(scope.row, scope.row.number) }}
@@ -181,12 +122,27 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="小计">
+        <!-- <el-table-column v-if="type == 'reportinglosses'" label="报损数量">
           <template v-slot="scope">
-            <el-input :value="xiaoji(scope.row)" readonly style="width: 100px" />
+            {{ scope.row.number }}
+            <div class="tips" style="font-size: 16px">
+              入库前：
+              {{ returnStockNumber(scope.row, scope.row.number) }}
+
+              {{ scope.row.unit }}
+            </div>
+          </template>
+        </el-table-column> -->
+        <el-table-column v-if="type == 'reportinglosses'" label="上传图片">
+          <template v-slot="scope">
+            <MultiImageUpload v-model="scope.row.imgUrls" />
           </template>
         </el-table-column>
-
+        <!-- <el-table-column label="备注">
+          <template v-slot="scope">
+            <el-input v-model="textarea" stype="textarea" placeholder="" />
+          </template>
+        </el-table-column> -->
         <el-table-column label="操作" width="80">
           <template v-slot="scope">
             <el-button link @click="tableData.list.splice(scope.$index, 1)">删除</el-button>
@@ -195,21 +151,14 @@
       </el-table>
     </div>
     <div>
-      <el-button type="primary" @click="submitHandle" :loading="queryFormLoading">确定</el-button>
+      <el-button type="primary" :loading="queryFormLoading" @click="submitHandle">
+        保存并返回
+      </el-button>
     </div>
     <!-- 选择耗材 -->
     <ConsumableList ref="ConsumableList" @success="selectConsumable" />
-    <el-dialog
+    <el-dialog v-model="showResult" :show-close="false" :close-on-press-escape="false" :close-on-click-modal="false">
-      v-model="showResult"
+      <el-result icon="success" title="入库提交成功" :subTitle="`共操作${tableData.list.length}件商品`">
-      :show-close="false"
-      :close-on-press-escape="false"
-      :close-on-click-modal="false"
-    >
-      <el-result
-        icon="success"
-        title="入库提交成功"
-        :subTitle="`共操作${tableData.list.length}件商品`"
-      >
         <template #extra>
           <template>
             <el-button type="primary" size="medium" @click="resetHandle">创建新的入库单</el-button>
@@ -231,6 +180,8 @@ import vendorApi from "@/api/product/vendor";
 import stockApi from "@/api/product/stock";
 import dayjs from "dayjs";
 import goodsList from "./components/goods-list.vue";
+import MultiImageUpload from "@/components/Upload/MultiImageUpload.vue";
+
 import ConsumableList from "./components/consumableList.vue";
 import { formatDecimal } from "@/utils/tools.js";
 export default {
@@ -248,7 +199,7 @@ export default {
         {
           label: "商品入库",
           value: "goods",
-          type: "purveyor",
+          type: "out",
         },
         {
           label: "耗材入库",
@@ -257,22 +208,6 @@ export default {
         },
       ],
       shopTypesActive: 0,
-      shopTypes: [
-        {
-          label: "供应商入库",
-          value: "purveyor",
-        },
-        {
-          label: "其他入库",
-          value: "purchase",
-        },
-      ],
-      shopTypes2: [
-        {
-          label: "供应商入库",
-          value: "purveyor",
-        },
-      ],
       resetForm: "",
       queryFormLoading: false,
       queryForm: {
@@ -314,11 +249,6 @@ export default {
       timeout: null,
     };
   },
-  mounted() {
-    this.type = this.$route.query.type || "in";
-    this.resetForm = { ...this.queryForm };
-    this.tbShopPurveyorGet();
-  },
   computed: {
     amountPayable() {
       if (!this.tableData.list.length) return 0;
@@ -333,6 +263,11 @@ export default {
       this.queryForm.amountPayable = newval;
     },
   },
+  mounted() {
+    this.type = this.$route.query.type || "in";
+    this.resetForm = { ...this.queryForm };
+    this.tbShopPurveyorGet();
+  },
   methods: {
     changeUnit(row) {
       row.price = this.returnPrice(row, row.originPrice);
@@ -393,6 +328,7 @@ export default {
       const price = row.price * row.stockNumber;
       return price;
     },
+
     handleSelect(item) {
       //选定后清空
       this.autocompletename = "";
@@ -400,12 +336,13 @@ export default {
     },
 
     // 切换入库内容
-    tabChange(value, type) {
+    tabChange(value) {
-      this.shopTypesActive = type == "in" ? 0 : 1;
+      this.shopTypesActive = value == "in" ? 0 : 1;
       this.inTabValue = value;
+      this.type = value;
       this.resetHandle();
-      this.$refs.shopList.reset(); //清除选项
+      // this.$refs.shopList.reset(); //清除选项
-      this.$refs.ConsumableList.reset(); //清除选项
+      // this.$refs.ConsumableList.reset(); //清除选项
     },
     // 切换类型
     changeTypeEnum(index) {
@@ -452,21 +389,26 @@ export default {
                 unitName: v.conUnit,
                 inOutNumber,
                 subTotal: this.xiaoji(v),
+                imgUrls: v.imgUrls,
+                number: v.number,
               };
             });
             if (this.type == "in") {
               await stockApi.in({ ...this.queryForm, bodyList });
-            } else {
+            } else if (this.type == "out") {
               await stockApi.out({ ...this.queryForm, bodyList });
+            } else if (this.type == "reportinglosses") {
+              await stockApi.reportinglosses(bodyList);
             }
             this.queryFormLoading = false;
-            const title = this.type == "in" ? "入库" : "出库";
+            // const title = this.type == "in" ? "入库" : "出库";
             ElMessage({
-              message: title + "提交成功",
+              // message: title + "提交成功",
+              message: "提交成功",
               type: "success",
             });
-            this.resetHandle(); //初始化
+            this.$router.push("/inventory/consumables");
-            // this.showResult = true
+            this.showResult = true;
             // this.$refs.shopList.reset()//清除选项
             // this.$refs.ConsumableList.reset()//清除选项
           } catch (error) {
@@ -487,6 +429,7 @@ export default {
         item.unit = item.defaultUnit || item.conUnit;
         item.originPrice = item.price;
         item.price = this.returnPrice(item, item.price);
+        item.imgUrls = item.imgUrls ? item.imgUrls : [];
         return item;
       });
       this.tableData.list = [...this.tableData.list, ...arr];
@@ -496,7 +439,8 @@ export default {
     resetHandle() {
       this.showResult = false;
       this.queryForm = { ...this.resetForm };
-      this.queryForm.type = this.inTabs.find((item) => item.value == this.inTabValue).type;
+      console.log(this.inTabs, this.inTabValue);
+      this.queryForm.type = this.inTabs.find((item) => item.type == this.inTabValue).type;
       this.tableData.list = [];
       this.$refs.queryForm.resetFields();
     },
@@ -524,6 +468,5 @@ export default {
   }
 }
 
-.app-container {
+.app-container {}
-}
 </style>

src/views/inventory/supplier/config/add.ts

@@ -19,7 +19,6 @@ const modalConfig: IModalConfig = {
     console.log("提交之前处理", data);
   },
   formItems: [
-
     {
       label: "名称",
       prop: "name",
@@ -41,7 +40,7 @@ const modalConfig: IModalConfig = {
       prop: "telephone",
       rules: [{ required: false, message: "请输入联系人名字", trigger: "blur" }],
       attrs: {
-        placeholder: "请输入联系人名字",
+        placeholder: "请输入联系人电话",
       },
     },
     {
@@ -69,7 +68,6 @@ const modalConfig: IModalConfig = {
         placeholder: "请输入排序",
       },
     },
-
   ],
 };
 

src/views/inventory/supplier/config/content.ts

@@ -23,7 +23,15 @@ const contentConfig: IContentConfig = {
     return Api.edit(data);
   },
   pk: "id",
-  toolbar: ["add"],
+  toolbar: [
+    {
+      icon: "plus",
+      text: "新增",
+      type: "primary",
+      name: "add",
+      auth: "import",
+    },
+  ],
   defaultToolbar: ["refresh", "filter", "search"],
   cols: [
     // { type: "selection", width: 50, align: "center" },
@@ -57,13 +65,13 @@ const contentConfig: IContentConfig = {
       align: "center",
       prop: "createTime",
     },
-    {
+    // {
-      label: "状态",
+    //   label: "状态",
-      align: "center",
+    //   align: "center",
-      prop: "status",
+    //   prop: "status",
-      templet: 'custom',
+    //   templet: 'custom',
-      slotName: 'switch'
+    //   slotName: 'switch'
-    },
+    // },
 
     {
       label: "操作",
@@ -71,7 +79,7 @@ const contentConfig: IContentConfig = {
       fixed: "right",
       width: 280,
       templet: "tool",
-      operat: ["edit", 'delete'],
+      operat: [{ text: "编辑", icon: 'edit', name: "edit"}, { text: "删除", icon: 'delete', type: 'danger', name: "delete"}],
     },
   ],
 };

src/views/inventory/supplier/config/edit.ts

@@ -19,7 +19,6 @@ const modalConfig: IModalConfig = {
     console.log("提交之前处理", data);
   },
   formItems: [
-
     {
       label: "名称",
       prop: "name",
@@ -41,7 +40,7 @@ const modalConfig: IModalConfig = {
       prop: "telephone",
       rules: [{ required: false, message: "请输入联系人名字", trigger: "blur" }],
       attrs: {
-        placeholder: "请输入联系人名字",
+        placeholder: "请输入联系人电话",
       },
     },
     {
@@ -69,7 +68,6 @@ const modalConfig: IModalConfig = {
         placeholder: "请输入排序",
       },
     },
-
   ],
 };
 

src/views/inventory/supplier/index.vue

@@ -71,6 +71,7 @@ import contentConfig from "./config/content";
 import editModalConfig from "./config/edit";
 import searchConfig from "./config/search";
 import { returnOptionsLabel } from "./config/config";
+import { isSyncStatus } from "@/utils/index";
 
 const {
   searchRef,
@@ -87,6 +88,16 @@ const {
   handleFilterChange,
 } = usePage();
 
+if (isSyncStatus()) {
+  contentConfig.toolbar[0].hidden = true
+  contentConfig.cols[contentConfig.cols.length - 1].operat[0].hidden = true
+  contentConfig.cols[contentConfig.cols.length - 1].operat[1].hidden = true
+} else {
+  contentConfig.toolbar[0].hidden = false
+  contentConfig.cols[contentConfig.cols.length - 1].operat[0].hidden = false
+  contentConfig.cols[contentConfig.cols.length - 1].operat[1].hidden = false
+}
+
 // 新增
 async function handleAddClick() {
   addModalRef.value?.setModalVisible();

src/views/login/index.vue

@@ -1,13 +1,7 @@
 <template>
   <div class="login" :style="'background-image:url(' + Background + ');'">
-    <el-form
+    <el-form ref="loginForm" :model="state.loginForm" :rules="state.loginRules" label-position="left" label-width="0px"
-      ref="loginForm"
+      class="login-form">
-      :model="state.loginForm"
-      :rules="state.loginRules"
-      label-position="left"
-      label-width="0px"
-      class="login-form"
-    >
       <h3 class="title">银收客后台管理</h3>
       <el-form-item>
         <el-radio-group v-model="state.loginForm.loginType">
@@ -16,39 +10,19 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item prop="username">
-        <el-input
+        <el-input v-model="state.loginForm.username" type="text" auto-complete="off" placeholder="商户号"></el-input>
-          v-model="state.loginForm.username"
-          type="text"
-          auto-complete="off"
-          placeholder="商户号"
-        ></el-input>
       </el-form-item>
       <el-form-item prop="staffUserName" v-if="state.loginForm.loginType == 1">
-        <el-input
+        <el-input v-model="state.loginForm.staffUserName" type="text" auto-complete="off" placeholder="账号"></el-input>
-          v-model="state.loginForm.staffUserName"
-          type="text"
-          auto-complete="off"
-          placeholder="账号"
-        ></el-input>
       </el-form-item>
       <el-form-item prop="password">
-        <el-input
+        <el-input v-model="state.loginForm.password" type="password" auto-complete="off" placeholder="密码"
-          v-model="state.loginForm.password"
+          @keyup.enter="handleLogin"></el-input>
-          type="password"
-          auto-complete="off"
-          placeholder="密码"
-          @keyup.enter="handleLogin"
-        ></el-input>
       </el-form-item>
       <el-form-item prop="code">
         <div class="code_wrap">
-          <el-input
+          <el-input v-model="state.loginForm.code" auto-complete="off" placeholder="验证码" style="width: 63%"
-            v-model="state.loginForm.code"
+            @keyup.enter="handleLogin"></el-input>
-            auto-complete="off"
-            placeholder="验证码"
-            style="width: 63%"
-            @keyup.enter="handleLogin"
-          ></el-input>
           <div class="login-code">
             <img :src="state.codeUrl" @click="getCode" />
           </div>
@@ -56,13 +30,8 @@
       </el-form-item>
 
       <el-form-item style="width: 100%">
-        <el-button
+        <el-button :loading="state.loading" size="default" type="primary" style="width: 100%"
-          :loading="state.loading"
+          @click.prevent="handleLogin">
-          size="default"
-          type="primary"
-          style="width: 100%"
-          @click.prevent="handleLogin"
-        >
           <span v-if="!state.loading">登 录</span>
           <span v-else>登 录 中...</span>
         </el-button>
@@ -198,11 +167,14 @@ function handleLogin() {
             loginName: userStore.userInfo.phone,
             token,
           }).then((checkInfo) => {
-            console.log("checkInfo", checkInfo.userInfo);
+            console.log("checkInfo", checkInfo);
             userStore.meituan_douyin_info = checkInfo.userInfo;
             setDouyinToken(checkInfo.userInfo.token);
           });
-          await userStore.getUserInfo();
+          localStorage.removeItem("shopName")
+          let resData = await $API_login.getPermission()
+          localStorage.setItem("permission",JSON.stringify(resData))
+          localStorage.setItem("loginType",state.loginForm.loginType)
           
           const { path, queryParams } = parseRedirect();
           console.log(path, queryParams);

src/views/notifications/config/add.ts

@@ -0,0 +1,75 @@
+import Api from "@/api/product/vendor";
+import { returnOptions, switchAttr } from "./config";
+import type { IModalConfig } from "@/components/CURD/types";
+
+const modalConfig: IModalConfig = {
+  pageName: "sys:user",
+  dialog: {
+    title: "添加供应商",
+    width: 800,
+    draggable: true,
+  },
+  form: {
+    labelWidth: 140,
+  },
+  formAction: function (data) {
+    return Api.add({ ...data });
+  },
+  beforeSubmit(data) {
+    console.log("提交之前处理", data);
+  },
+  formItems: [
+    {
+      label: "名称",
+      prop: "name",
+      rules: [{ required: true, message: "请输入名称", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入名称",
+      },
+    },
+    {
+      label: "联系人名字",
+      prop: "contactName",
+      rules: [{ required: false, message: "请输入联系人名字", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入联系人名字",
+      },
+    },
+    {
+      label: "联系人电话",
+      prop: "telephone",
+      rules: [{ required: false, message: "请输入联系人名字", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入联系人名字",
+      },
+    },
+    {
+      label: "供应商地址",
+      prop: "address",
+      rules: [{ required: false, message: "请输入供应商地址", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入供应商地址",
+      },
+    },
+    {
+      label: "备注",
+      prop: "remark",
+      rules: [{ required: false, message: "请输入备注", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入备注",
+      },
+    },
+    {
+      label: "排序",
+      prop: "sort",
+      rules: [{ required: true, message: "请输入排序", trigger: "blur" }],
+      type: "input-number",
+      attrs: {
+        placeholder: "请输入排序",
+      },
+    },
+  ],
+};
+
+// 如果有异步数据会修改配置的，推荐用reactive包裹，而纯静态配置的可以直接导出
+export default reactive(modalConfig);

src/views/notifications/config/config.ts

@@ -0,0 +1,46 @@
+export interface options {
+  label: string;
+  value: string | number;
+  [property: string]: any;
+}
+export interface optionObject {
+  [property: string]: options[];
+}
+const options: optionObject = {
+  payType: [
+    { label: "现金", value: "cash" },
+    { label: "微信", value: "weixin" },
+    { label: "银行卡", value: "bank" },
+    { label: "会员支付", value: "member-account" },
+    { label: "支付宝", value: "alipay" },
+    { label: "刷卡", value: "deposit" },
+    { label: "挂账", value: "arrears" },
+    { label: "刷卡", value: "deposit" },
+    { label: "储值", value: "member-account" },
+    { label: "自定义", value: "virtual" },
+  ],
+  isIdeal: [
+    { label: "否", value: 0 },
+    { label: "是", value: 1 },
+  ],
+};
+
+export const switchAttr = {
+  "active-value": 1,
+  "inactive-value": 0,
+};
+
+export type optionsType = string;
+
+export function returnOptions(type: optionsType) {
+  return options[type];
+}
+
+export function returnOptionsLabel(optionsType: optionsType, value: string | number) {
+  const options = returnOptions(optionsType);
+  if (!options) {
+    return "";
+  }
+  const option = options.find((item) => item.value === value);
+  return option ? option.label : "";
+}

src/views/notifications/config/content.ts

@@ -0,0 +1,88 @@
+import Api from "@/api/notifications";
+import type { IContentConfig } from "@/components/CURD/types";
+
+const contentConfig: IContentConfig = {
+  pageName: "sys:user",
+  table: {
+    border: true,
+    highlightCurrentRow: true,
+  },
+  pagination: {
+    background: true,
+    layout: "prev,pager,next,jumper,total,sizes",
+    pageSize: 20,
+    pageSizes: [10, 20, 30, 50],
+  },
+  indexAction: function (params) {
+    return Api.getList(params);
+  },
+  deleteAction: function (id) {
+    return Api.delete(id);
+  },
+  modifyAction: function (data) {
+    return Api.edit(data);
+  },
+  indexActionData: {},
+  pk: "id",
+  toolbar: [
+    {
+      text: "全部已读",
+      name: "mark_all_read",
+      auth: "",
+      type: "primary",
+    },
+    {
+      text: "清空已读",
+      name: "Clear_Read",
+      auth: "",
+      type: "danger",
+    },
+  ],
+  defaultToolbar: ["refresh", "filter", "search"],
+  cols: [
+    // { type: "selection", width: 50, align: "center" },
+    {
+      label: "通知类型",
+      align: "center",
+      prop: "title",
+    },
+    {
+      label: "是否已读",
+      align: "center",
+      prop: "isRead",
+      slotName: "isRead",
+      templet: "custom",
+    },
+    {
+      label: "消息内容",
+      align: "center",
+      prop: "content",
+      slotName: "content",
+      templet: "custom",
+    },
+    {
+      label: "创建时间",
+      align: "center",
+      prop: "createTime",
+    },
+    {
+      label: "操作",
+      align: "center",
+      fixed: "right",
+      width: 280,
+      templet: "custom",
+      slotName: "operate",
+      operat: ["delete"],
+    },
+    // {
+    //   label: "操作",
+    //   align: "center",
+    //   fixed: "right",
+    //   width: 150,
+    //   templet: "custom",
+    //   slotName: "operate",
+    // },
+  ],
+};
+
+export default contentConfig;

src/views/notifications/config/edit.ts

@@ -0,0 +1,75 @@
+import Api from "@/api/product/vendor";
+import { returnOptions, switchAttr } from "./config";
+import type { IModalConfig } from "@/components/CURD/types";
+
+const modalConfig: IModalConfig = {
+  pageName: "sys:user",
+  dialog: {
+    title: "编辑供应商",
+    width: 800,
+    draggable: true,
+  },
+  form: {
+    labelWidth: 140,
+  },
+  formAction: function (data) {
+    return Api.edit({ ...data });
+  },
+  beforeSubmit(data) {
+    console.log("提交之前处理", data);
+  },
+  formItems: [
+    {
+      label: "名称",
+      prop: "name",
+      rules: [{ required: true, message: "请输入名称", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入名称",
+      },
+    },
+    {
+      label: "联系人名字",
+      prop: "contactName",
+      rules: [{ required: false, message: "请输入联系人名字", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入联系人名字",
+      },
+    },
+    {
+      label: "联系人电话",
+      prop: "telephone",
+      rules: [{ required: false, message: "请输入联系人名字", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入联系人名字",
+      },
+    },
+    {
+      label: "供应商地址",
+      prop: "address",
+      rules: [{ required: false, message: "请输入供应商地址", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入供应商地址",
+      },
+    },
+    {
+      label: "备注",
+      prop: "remark",
+      rules: [{ required: false, message: "请输入备注", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入备注",
+      },
+    },
+    {
+      label: "排序",
+      prop: "sort",
+      rules: [{ required: true, message: "请输入排序", trigger: "blur" }],
+      type: "input-number",
+      attrs: {
+        placeholder: "请输入排序",
+      },
+    },
+  ],
+};
+
+// 如果有异步数据会修改配置的，推荐用reactive包裹，而纯静态配置的可以直接导出
+export default reactive(modalConfig);

src/views/notifications/config/search.ts

@@ -0,0 +1,57 @@
+import type { ISearchConfig } from "@/components/CURD/types";
+const searchConfig: ISearchConfig = {
+  pageName: "sys:user",
+  isExpandable: false,
+  formItems: [
+    {
+      type: "select",
+      label: "通知类型 ",
+      prop: "type",
+      attrs: {
+        placeholder: "请选择",
+        clearable: true,
+        style: {
+          width: "200px",
+        },
+      },
+      options: [
+        {
+          label: "数据同步",
+          value: "数据同步",
+        },
+        {
+          label: "数据变动",
+          value: "数据变动",
+        },
+        {
+          label: "库存预警",
+          value: "库存预警",
+        },
+      ],
+    },
+    {
+      type: "select",
+      label: "是否已读",
+      prop: "isRead",
+      attrs: {
+        placeholder: "请选择",
+        clearable: true,
+        style: {
+          width: "200px",
+        },
+      },
+      options: [
+        {
+          label: "未读",
+          value: "0",
+        },
+        {
+          label: "已读",
+          value: "1",
+        },
+      ],
+    },
+  ],
+};
+
+export default searchConfig;

src/views/notifications/index.vue

@@ -0,0 +1,148 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索 -->
+    <page-search ref="searchRef" :search-config="searchConfig" @query-click="handleQueryClick"
+      @reset-click="handleResetClick" />
+    <!-- 列表 -->
+    <page-content ref="contentRef" :content-config="contentConfig" @add-click="handleAddClick"
+      @edit-click="handleEditClick" @export-click="handleExportClick" @search-click="handleSearchClick"
+      @toolbar-click="handleToolbarClick" @operat-click="handleOperatClick" @filter-change="handleFilterChange">
+      <!-- <template #type="scope">
+        <span v-if="scope.row.type == 0">商品新增</span>
+        <span v-if="scope.row.type == 1">商品编辑</span>
+        <span v-if="scope.row.type == 2">耗材新增</span>
+        <span v-if="scope.row.type == 3">耗材编辑</span>
+      </template> -->
+      <template #content="scope">
+        <span>{{ scope.row.title }}</span>
+        <!-- <span v-if="scope.row.type == 1">商品编辑</span>
+        <span v-if="scope.row.type == 2">耗材新增</span>
+        <span v-if="scope.row.type == 3">耗材编辑</span> -->
+        <div v-for="(item, index) in matchedProducts(scope.row.content)" :key="index">
+          <span v-for="i in item.map" :key="i.id" style="color: #6161f7" @click="handleContentClick(item, i)">
+            {{ i.name }},
+          </span>
+        </div>
+
+        请及时确认
+      </template>
+      <template #isRead="scope">
+        <el-tag :type="scope.row.isRead == 1 ? 'success' : 'info'">
+          {{ scope.row.isRead == 1 ? "已读" : "未读" }}
+        </el-tag>
+      </template>
+      <template #operate="scope">
+        <div style="
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+          ">
+          <div v-if="scope.row.isRead != 1">
+            <el-button link type="primary" @click="refAddHaocaiTakinShow(scope.row, '')">
+              设为已读
+            </el-button>
+          </div>
+          <el-button link type="primary" @click="refAddHaocaiTakinShow(scope.row, 'delete')">
+            删除
+          </el-button>
+        </div>
+      </template>
+    </page-content>
+
+    <!-- 新增 -->
+    <page-modal ref="addModalRef" :modal-config="addModalConfig" @submit-click="handleSubmitClick" />
+
+    <!-- 编辑 -->
+    <page-modal ref="editModalRef" :modal-config="editModalConfig" @submit-click="handleSubmitClick" />
+  </div>
+</template>
+
+<script setup lang="ts">
+import VersionApi from "@/api/system/version";
+import type { IObject, IOperatData } from "@/components/CURD/types";
+import usePage from "@/components/CURD/usePage";
+import addModalConfig from "./config/add";
+import contentConfig from "./config/content";
+import editModalConfig from "./config/edit";
+import searchConfig from "./config/search";
+import Api from "@/api/notifications";
+import router from "@/router";
+import { log } from "console";
+
+const {
+  searchRef,
+  contentRef,
+  addModalRef,
+  editModalRef,
+  handleQueryClick,
+  handleResetClick,
+  // handleAddClick,
+  // handleEditClick,
+  handleSubmitClick,
+  handleExportClick,
+  handleSearchClick,
+  handleFilterChange,
+} = usePage();
+
+// 新增
+async function handleAddClick() {
+  addModalRef.value?.setModalVisible();
+  // addModalConfig.formItems[2]!.attrs!.data =
+}
+// 编辑
+async function handleEditClick(row: IObject) {
+  editModalRef.value?.handleDisabled(false);
+  editModalRef.value?.setModalVisible();
+  // 根据id获取数据进行填充
+  editModalRef.value?.setFormData({ ...row });
+}
+// 其他工具栏
+async function handleToolbarClick(name: string) {
+  if (name === "mark_all_read") {
+    await Api.edit({
+      noticeIdList: [],
+    });
+  }
+  if (name == "Clear_Read") {
+    await Api.syncNoticeclear();
+  }
+  contentRef.value?.fetchPageData();
+}
+
+const matchedProducts = (data: string) => {
+  return JSON.parse(data);
+};
+
+//删除
+async function refAddHaocaiTakinShow(item: any, type: string) {
+  if (type === "delete") {
+    await Api.delete(item.id);
+  } else {
+    await Api.edit({
+      noticeIdList: [item.id],
+    });
+  }
+  contentRef.value?.fetchPageData();
+}
+
+// 其他操作列
+async function handleOperatClick(data: IOperatData) {
+  console.log(data);
+}
+// Handle content click
+function handleContentClick(scope: any, item: any) {
+  if (scope.type == "product") {
+    router.push({
+      path: "/product/addgoods",
+      query: { goods_id: item.id },
+    });
+  }
+  if (scope.type == "consInfo") {
+    router.push({
+      path: "/inventory/consumables",
+      query: { conName: item.name },
+    });
+  }
+}
+</script>

src/views/online-shop/goods-group.vue

@@ -234,6 +234,8 @@ import searchConfig from "./goodsGroupconfig/search";
 import searchConfig2 from "./goodsGroupconfig/search2";
 import myDialog from "@/components/mycomponents/myDialog.vue";
 import selectGoodslist from "./goodsGroupconfig/selectGoodslist.vue";
+import { isSyncStatus } from "@/utils/index";
+
 const {
   searchRef,
   searchRefs,
@@ -252,6 +254,18 @@ const {
   handleFilterChange,
 } = usePage();
 
+if (isSyncStatus()) {
+  contentConfig.toolbar[0].hidden = true;
+  contentConfig.cols[contentConfig.cols.length - 1].operat[0].hidden = true;
+  contentConfig.cols[contentConfig.cols.length - 1].operat[1].hidden = true;
+  contentConfig.cols[3].templet = "custom";
+} else {
+  contentConfig.toolbar[0].hidden = false;
+  contentConfig.cols[3].templet = "switch";
+  contentConfig.cols[contentConfig.cols.length - 1].operat[0].hidden = false;
+  contentConfig.cols[contentConfig.cols.length - 1].operat[1].hidden = false;
+}
+
 let switchref = ref(false);
 
 // 新增

src/views/online-shop/goodsGroupconfig/content.ts

@@ -73,7 +73,7 @@ const contentConfig: IContentConfig<UserPageQuery> = {
       fixed: "right",
       width: 280,
       templet: "tool",
-      operat: ["edit", "delete"],
+      operat: [{ text: "编辑", icon: 'edit', name: "edit"}, { text: "删除", icon: 'delete', type: 'danger', name: "delete"}],
     },
   ],
 };

src/views/product/category.vue

@@ -95,6 +95,7 @@ import contentConfig from "./categoryconfig/content";
 import contentConfig2 from "./categoryconfig/content2";
 import editModalConfig from "./categoryconfig/edit";
 import searchConfig from "./categoryconfig/search";
+import { isSyncStatus } from "@/utils/index";
 
 const {
   searchRef,
@@ -111,6 +112,17 @@ const {
   handleFilterChange,
 } = usePage();
 
+if (isSyncStatus()) {
+  contentConfig.toolbar[0].hidden = true
+  contentConfig.cols[contentConfig.cols.length - 1].operat[0].hidden = true
+  contentConfig.cols[contentConfig.cols.length - 1].operat[1].hidden = true
+  contentConfig.cols[2].templet = "custom"
+} else {
+  contentConfig.toolbar[0].hidden = false
+  contentConfig.cols[2].templet = "switch"
+  contentConfig.cols[contentConfig.cols.length - 1].operat[0].hidden = false
+  contentConfig.cols[contentConfig.cols.length - 1].operat[1].hidden = false
+}
 // 新增
 async function handleAddClick() {
   addModalRef.value?.setModalVisible();

src/views/product/categoryconfig/content.ts

@@ -44,7 +44,15 @@ const contentConfig: IContentConfig<UserPageQuery> = {
   //   return res.list;
   // },
   pk: "id",
-  toolbar: ["add"],
+  toolbar: [
+    {
+      icon: "plus",
+      text: "新增",
+      type: "primary",
+      name: "add",
+      auth: "import",
+    },
+  ],
   cols: [
     // { type: "selection", width: 50, align: "center" },
     { label: "分类名称", align: "center", prop: "name" },
@@ -68,7 +76,7 @@ const contentConfig: IContentConfig<UserPageQuery> = {
       fixed: "right",
       width: 280,
       templet: "tool",
-      operat: ["edit", "delete"],
+      operat: [{ text: "编辑", icon: 'edit', name: "edit"}, { text: "删除", icon: 'delete', type: 'danger', name: "delete"}],
     },
   ],
 };

src/views/product/index.vue

@@ -127,7 +127,7 @@
     <MyDialog ref="myDialogRefbaosun" @confirm="confirmbaosun" title="报损">
       <el-form :model="form">
         <el-form-item label="报损数量" label-width="">
-          <el-input-number v-model="datas.number" label="描述文字"></el-input-number>
+          <el-input-number v-model="datas.number" :min="1" label="描述文字"></el-input-number>
         </el-form-item>
         <el-form-item label="报损照片" label-width="">
           <MultiImageUpload v-model="datas.images" />
@@ -206,7 +206,7 @@
     </MyDialog>
     <!-- 库存修改 -->
     <MyDialog ref="myDialogRefkucun" @confirm="confirmkucun" width="30%" title="库存修改">
-      <el-input-number v-model="kucundata.stockNumber" :min="0" />
+      <el-input-number v-model="kucundata.stockNumbers" :min="0" />
     </MyDialog>
   </div>
 </template>
@@ -216,6 +216,7 @@ import UserAPI from "@/api/product/index";
 import { useRouter } from "vue-router";
 import type { IObject, IOperatData } from "@/components/CURD/types";
 import usePage from "@/components/CURD/usePage";
+import { isSyncStatus } from "@/utils/index";
 import addModalConfig from "./indexconfig/add";
 import contentConfig from "./indexconfig/content";
 import MultiImageUpload from "@/components/Upload/MultiImageUpload.vue";
@@ -224,6 +225,7 @@ import editModalConfig from "./indexconfig/edit";
 import searchConfig from "./indexconfig/search";
 import MyDialog from "@/components/mycomponents/myDialog.vue";
 import Statistics from "./indexconfig/statistics.vue";
+import { min } from "lodash";
 
 const {
   searchRef,
@@ -255,6 +257,83 @@ let datas = reactive({
   number: 0,
   remark: "",
   images: [],
+  productId: null, // Added productId property
+});
+
+if (isSyncStatus()) {
+  contentConfig.toolbar[0].hidden = true;
+  contentConfig.toolbar[1].hidden = false;
+  contentConfig.cols[contentConfig.cols.length - 1].operat[2].hidden = true;
+} else {
+  contentConfig.toolbar[0].hidden = false;
+  contentConfig.toolbar[1].hidden = true;
+  contentConfig.cols[contentConfig.cols.length - 1].operat[2].hidden = false;
+}
+
+onMounted(() => {
+  console.log(route.query);
+  if (route.query.id) {
+    contentRef.value?.fetchPageData({ id: route.query.id });
+  }
+  // 获取耗材列表
+  gethaocaiList();
+});
+
+if (isSyncStatus()) {
+  contentConfig.toolbar[0].hidden = true;
+  contentConfig.toolbar[1].hidden = false;
+  contentConfig.cols[contentConfig.cols.length - 1].operat[2].hidden = true;
+} else {
+  contentConfig.toolbar[0].hidden = false;
+  contentConfig.toolbar[1].hidden = true;
+  contentConfig.cols[contentConfig.cols.length - 1].operat[2].hidden = false;
+}
+
+onMounted(() => {
+  console.log(route.query);
+  if (route.query.id) {
+    contentRef.value?.fetchPageData({ id: route.query.id });
+  }
+  // 获取耗材列表
+  gethaocaiList();
+});
+
+if (isSyncStatus()) {
+  contentConfig.toolbar[0].hidden = true;
+  contentConfig.toolbar[1].hidden = false;
+  contentConfig.cols[contentConfig.cols.length - 1].operat[2].hidden = true;
+} else {
+  contentConfig.toolbar[0].hidden = false;
+  contentConfig.toolbar[1].hidden = true;
+  contentConfig.cols[contentConfig.cols.length - 1].operat[2].hidden = false;
+}
+
+onMounted(() => {
+  console.log(route.query);
+  if (route.query.id) {
+    contentRef.value?.fetchPageData({ id: route.query.id });
+  }
+  // 获取耗材列表
+  gethaocaiList();
+});
+
+if (isSyncStatus()) {
+  contentConfig.toolbar[0].hidden = true;
+  contentConfig.toolbar[1].hidden = false;
+  contentConfig.cols[contentConfig.cols.length - 1].operat[2].hidden = true;
+} else {
+  contentConfig.toolbar[0].hidden = false;
+  contentConfig.toolbar[1].hidden = true;
+  contentConfig.cols[contentConfig.cols.length - 1].operat[2].hidden = false;
+}
+
+onMounted(() => {
+  console.log(route.query);
+  if (route.query.id) {
+    contentRef.value?.fetchPageData({ id: route.query.id });
+  }
+  // 获取耗材列表
+  gethaocaiList();
 });
 function newHandleQueryClick(e: IObject | undefined) {
   const filterParams = contentRef.value?.getFilterParams();
@@ -264,13 +343,15 @@ function newHandleQueryClick(e: IObject | undefined) {
 // 库存修改
 function kucunedit(item) {
   kucundata.value = item;
+  kucundata.value.stockNumbers = item.stockNumber;
   myDialogRefkucun.value.open();
 }
 async function confirmkucun() {
   let res = await UserAPI.modifyStock({
     id: kucundata.value.id,
-    stockNumber: kucundata.value.stockNumber,
+    stockNumber: kucundata.value.stockNumbers,
   });
+  kucundata.value.stockNumber = kucundata.value.stockNumbers;
   ElMessage.success("成功");
   myDialogRefkucun.value.close();
 }
@@ -354,16 +435,25 @@ async function handleSwitchhaocai(row: IObject) {
 
 // 编辑
 async function handleEditClick(row: IObject) {
+  try {
     router.push({ name: "addgoods", query: { goods_id: row.id } });
+  } catch (error) {
+    ElMessage.error("没有编辑权限");
+  }
 }
 
 // 其他工具栏
-function handleToolbarClick(name: string) {
+async function handleToolbarClick(name: string) {
   console.log(name);
   if (name === "custom1") {
     // ElMessage.success("点击了自定义1按钮");
     myDialogRef.value.open();
   }
+  if (name === "sync") {
+    //商品同步
+    let res = await UserAPI.sync();
+    ElMessage.success("操作成功，数据正在后台同步中...");
+  }
 }
 async function confirm() {
   let res = await UserAPI.stockWarning(form.warnLine);
@@ -380,6 +470,7 @@ async function confirmbaosun() {
   let res = await UserAPI.reportDamage(datas);
   ElMessage.success("成功");
   myDialogRefbaosun.value.close();
+  contentRef.value?.fetchPageData();
 }
 async function confirmhaocai() {
   let obj = {
@@ -409,16 +500,10 @@ function typeFilter(item: any) {
 async function handleOperatClick(data: IOperatData) {
   datas.productId = data.row.id;
   myDialogRefbaosun.value.open();
+  datas.number = 1;
+  datas.remark = "";
 }
 
-onMounted(() => {
-  console.log(route.query);
-  if (route.query.id) {
-    contentRef.value?.fetchPageData({ id: route.query.id });
-  }
-  // 获取耗材列表
-  gethaocaiList();
-});
 async function gethaocaiList() {
   let res = await UserAPI.productcons({ id: route.query.id });
   options.value = res.records;

src/views/product/indexconfig/SpecificationAttribute.vue

@@ -14,7 +14,7 @@
           </template>
           <template v-slot="scope">
             <el-input-number size="default" v-model="scope.row.salePrice" @change="priceFormat(scope.row, 'salePrice')"
-              @blur="priceFormat(scope.row, 'salePrice')" controls-position="right"></el-input-number>
+              @blur="priceFormat(scope.row, 'salePrice')" controls-position="right" :disabled="isSyncStatus()"></el-input-number>
           </template>
         </el-table-column>
         <el-table-column prop="originPrice">
@@ -26,7 +26,7 @@
           </template>
           <template v-slot="scope">
             <el-input-number @change="priceFormat(scope.row, 'originPrice')" v-model="scope.row.originPrice"
-              @blur="priceFormat(scope.row, 'originPrice')" controls-position="right"></el-input-number>
+              @blur="priceFormat(scope.row, 'originPrice')" controls-position="right" :disabled="isSyncStatus()"></el-input-number>
           </template>
         </el-table-column>
         <el-table-column prop="costPrice">
@@ -38,7 +38,7 @@
           </template>
           <template v-slot="scope">
             <el-input-number @change="priceFormat(scope.row, 'costPrice')" v-model="scope.row.costPrice"
-              @blur="priceFormat(scope.row, 'costPrice')" controls-position="right"></el-input-number>
+              @blur="priceFormat(scope.row, 'costPrice')" controls-position="right" :disabled="isSyncStatus()"></el-input-number>
           </template>
         </el-table-column>
 
@@ -51,7 +51,7 @@
           </template>
           <template v-slot="scope">
             <el-input-number @change="priceFormat(scope.row, 'memberPrice')" v-model="scope.row.memberPrice"
-              @blur="priceFormat(scope.row, 'memberPrice')" controls-position="right"></el-input-number>
+              @blur="priceFormat(scope.row, 'memberPrice')" controls-position="right" :disabled="isSyncStatus()"></el-input-number>
           </template>
         </el-table-column>
         <el-table-column label="起售数量" prop="suitNum">
@@ -64,9 +64,9 @@
           <template v-slot="scope">
             <el-input-number @change="priceFormat(scope.row, 'suitNum')" v-model="scope.row.suitNum"
               @blur="priceFormat(scope.row, 'suitNum')" :min="0" controls-position="right"
-              v-if="props.info.type == 'weigh'"></el-input-number>
+              v-if="props.info.type == 'weigh'" :disabled="isSyncStatus()"></el-input-number>
             <el-input-number @change="priceFormat(scope.row, 'suitNum')" v-model="scope.row.suitNum"
-              @blur="priceFormat(scope.row, 'suitNum')" :min="1" controls-position="right" v-else></el-input-number>
+              @blur="priceFormat(scope.row, 'suitNum')" :min="1" controls-position="right" :disabled="isSyncStatus()" v-else></el-input-number>
           </template>
         </el-table-column>
       </el-table>
@@ -77,7 +77,7 @@
       <el-form-item>
         <el-input-number @change="priceFormat(batchNumberForm, 'batchNumber')"
           @blur="priceFormat(batchNumberForm, 'batchNumber')" v-model="batchNumberForm.batchNumber"
-          controls-position="right" style="width: 100%"></el-input-number>
+          controls-position="right" style="width: 100%" :disabled="isSyncStatus()"></el-input-number>
       </el-form-item>
     </el-form>
     <template #footer>
@@ -93,6 +93,8 @@
 </template>
 <script setup>
 import { ref } from 'vue'
+import { isSyncStatus } from "@/utils/index";
+
 const ruleFormRef = ref(null)
 let batchNumberKey = ref(null)
 let batchNumberForm = reactive({

src/views/product/indexconfig/addgoods.vue

@@ -4,21 +4,21 @@
       <el-form-item label="商品名称" required>
         <el-col :span="12">
           <el-form-item prop="name">
-            <el-input v-model="ruleForm.name" placeholder="请输入商品名称" />
+            <el-input v-model="ruleForm.name" placeholder="请输入商品名称" :disabled="isSyncStatus()" />
           </el-form-item>
         </el-col>
       </el-form-item>
       <el-form-item label="商品介绍">
         <el-col :span="12">
           <el-form-item>
-            <el-input v-model="ruleForm.shortTitle" type="textarea" placeholder="请输入商品介绍" />
+            <el-input v-model="ruleForm.shortTitle" type="textarea" placeholder="请输入商品介绍" :disabled="isSyncStatus()" />
           </el-form-item>
         </el-col>
       </el-form-item>
       <el-form-item label="单位" required>
         <el-col :span="12">
           <el-form-item prop="unitId">
-            <el-select v-model="ruleForm.unitId" placeholder="请选择单位">
+            <el-select v-model="ruleForm.unitId" placeholder="请选择单位" :disabled="isSyncStatus()">
               <el-option :label="item.name" :value="item.id" v-for="item in datas.Company" :key="item.id" />
             </el-select>
           </el-form-item>
@@ -27,7 +27,7 @@
       <el-form-item label="商品分类" required>
         <el-col :span="12">
           <el-form-item prop="region">
-            <el-select v-model="ruleForm.categoryId" placeholder="请选择商品分类">
+            <el-select v-model="ruleForm.categoryId" placeholder="请选择商品分类" :disabled="isSyncStatus()">
               <el-option :label="item.name" :value="item.id" v-for="item in datas.classification" :key="item.id" />
             </el-select>
           </el-form-item>
@@ -54,7 +54,7 @@
       <AddImg ref="addImg" @successEvent="successEvent"></AddImg>
 
       <el-form-item label="商品类型">
-        <el-radio-group v-model="ruleForm.type" @change="changeTypeEnum(ruleForm.type)">
+        <el-radio-group v-model="ruleForm.type" @change="changeTypeEnum(ruleForm.type)" :disabled="isSyncStatus()">
           <el-radio value="single">单规格商品</el-radio>
           <el-radio value="sku">多规格商品</el-radio>
           <el-radio value="package">套餐商品</el-radio>
@@ -63,7 +63,7 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item label="套餐商品" v-if="ruleForm.type == 'package'">
-        <div style="display: block;width: 100%;">
+        <div style="display: block; width: 100%">
           <div class="head-container">
             <el-radio-group v-model="ruleForm.groupType" @change="typeChange">
               <el-radio-button :label="0">固定套餐</el-radio-button>
@@ -73,7 +73,7 @@
           <div v-if="ruleForm.groupType == '0'">
             <el-table border :data="item.goods" v-for="(item, index) in ruleForm.proGroupVo" :key="index">
               <el-table-column label="名称" prop="proName"></el-table-column>
-              <el-table-column label="规格" prop="skuName"> </el-table-column>
+              <el-table-column label="规格" prop="skuName"></el-table-column>
               <el-table-column label="价格" prop="price"></el-table-column>
               <el-table-column label="数量" prop="number">
                 <template v-slot="scope">
@@ -82,10 +82,12 @@
               </el-table-column>
               <el-table-column width="150">
                 <template #header>
-                  <el-button type="primary" @click="addgoods(-1)">添加商品</el-button>
+                  <el-button type="primary" @click="addgoods(-1)" :disabled="isSyncStatus()">
+                    添加商品
+                  </el-button>
                 </template>
                 <template v-slot="scope">
-                  <el-button type="text" :disabled="scope.row.type != 'sku'"
+                  <el-button type="text" :disabled="scope.row.type != 'sku' && isSyncStatus()"
                     @click="showSelectSkuHandle(scope.row, scope.$index, index)">设置规格</el-button>
                   <el-button type="text"
                     @click="ruleForm.proGroupVo[index].goods.splice(scope.$index, 1)">删除</el-button>
@@ -97,45 +99,52 @@
             <div class="group_wrap" v-for="(item, index) in ruleForm.proGroupVo" :key="index">
               <el-form inline :model="item">
                 <el-form-item label="规格组名">
-                  <el-input v-model="item.title" />
+                  <el-input v-model="item.title" :disabled="isSyncStatus()" />
                 </el-form-item>
                 <el-form-item :label="`本组菜品${item.goods.length}选`">
-                  <el-input v-model="item.number" />
+                  <el-input v-model="item.number" :disabled="isSyncStatus()" />
                 </el-form-item>
                 <el-form-item>
-                  <el-button @click="ruleForm.proGroupVo.splice(index, 1)">删除</el-button>
+                  <el-button @click="ruleForm.proGroupVo.splice(index, 1)" :disabled="isSyncStatus()">
+                    删除
+                  </el-button>
                 </el-form-item>
               </el-form>
-              <div style="margin-top: 20px;">
+              <div style="margin-top: 20px">
                 <el-table border :data="item.goods">
                   <el-table-column label="名称" prop="proName"></el-table-column>
                   <el-table-column label="规格" prop="skuName"></el-table-column>
                   <el-table-column label="价格" prop="price"></el-table-column>
                   <el-table-column label="数量" prop="number">
                     <template v-slot="scope">
-                      <el-input-number v-model="scope.row.number" :min="0" />
+                      <el-input-number v-model="scope.row.number" :min="0" :disabled="isSyncStatus()" />
                     </template>
                   </el-table-column>
                   <el-table-column width="150">
                     <template #header>
-                      <el-button type="primary" @click="addgoods(index);">添加商品</el-button>
+                      <el-button type="primary" @click="addgoods(index)" :disabled="isSyncStatus()">
+                        添加商品
+                      </el-button>
                     </template>
                     <template v-slot="scope">
-                      <el-button type="text" :disabled="scope.row.type != 'sku'"
+                      <el-button type="text" :disabled="scope.row.type != 'sku' && isSyncStatus()"
                         @click="showSelectSkuHandle(scope.row, scope.$index, index)">设置规格</el-button>
-                      <el-button type="text"
+                      <el-button type="text" @click="ruleForm.proGroupVo[index].goods.splice(scope.$index, 1)"
-                        @click="ruleForm.proGroupVo[index].goods.splice(scope.$index, 1)">删除</el-button>
+                        :disabled="isSyncStatus()">删除</el-button>
                     </template>
                   </el-table-column>
                 </el-table>
               </div>
             </div>
-            <el-button type="primary" @click="addtaocan">添加套餐组</el-button>
+            <el-button type="primary" @click="addtaocan" :disabled="isSyncStatus()">
+              添加套餐组
+            </el-button>
           </div>
         </div>
       </el-form-item>
       <el-form-item label="选择规格" v-if="ruleForm.type == 'sku'">
-        <el-select v-model="ruleForm.specId" placeholder="请选择规格" style="width: 500px" @change="selectSpecHandle">
+        <el-select v-model="ruleForm.specId" placeholder="请选择规格" style="width: 500px" @change="selectSpecHandle"
+          :disabled="isSyncStatus()">
           <el-option :label="item.name" :value="item.id" v-for="item in datas.specificationsconfig"
             :key="item.id"></el-option>
         </el-select>
@@ -156,8 +165,8 @@
         :info="ruleForm" :list="list" ref="specificationAttributeRef"></SpecificationAttribute>
       <el-form-item label="重量">
         <el-col :span="12">
-          <div style="display: block;">
+          <div style="display: block">
-            <el-input v-model="ruleForm.weight" placeholder="">
+            <el-input v-model="ruleForm.weight" placeholder="" :disabled="isSyncStatus()">
               <template #append>千克</template>
             </el-input>
             <!-- <div style="color: #999;">用于快递或配送运费计重</div> -->
@@ -165,7 +174,7 @@
         </el-col>
       </el-form-item>
       <el-form-item label="是否允许临时改价">
-        <el-radio-group v-model="ruleForm.isAllowTempModifyPrice">
+        <el-radio-group v-model="ruleForm.isAllowTempModifyPrice" :disabled="isSyncStatus()">
           <el-radio :value="1">允许</el-radio>
           <el-radio :value="0">不允许</el-radio>
         </el-radio-group>
@@ -187,10 +196,15 @@
         </el-checkbox-group>
       </el-form-item>
       <el-form-item>
-        <el-col :span="12">
+        <el-col :span="20">
-          <el-time-picker v-model="ruleForm.useTime" is-range range-separator="至" start-placeholder="开始时间"
+          <!-- <el-time-picker v-model="ruleForm.useTime" is-range range-separator="至" start-placeholder="开始时间"
-            end-placeholder="结束时间" :default-value="[new Date('00:00:00'), new Date('23:59:59')]" value-format="HH:mm:ss"
+            end-placeholder="结束时间" value-format="HH:mm:ss" format="HH:mm:ss"   />
-            format="HH:mm:ss" />
+ -->
+
+          <el-time-picker v-model="ruleForm.startTime" value-format="HH:mm:ss" format="HH:mm:ss" placeholder="选择开始时间">
+          </el-time-picker>-
+          <el-time-picker v-model="ruleForm.endTime" value-format="HH:mm:ss" format="HH:mm:ss" placeholder="选择结束时间">
+          </el-time-picker>
         </el-col>
       </el-form-item>
       <el-form-item label="上架">
@@ -198,7 +212,7 @@
       </el-form-item>
       <el-form-item label="库存开关">
         <div style="display: block;">
-          <el-switch v-model="ruleForm.isStock" :active-value="1" :inactive-value="0" />
+          <el-switch v-model="ruleForm.isStock" :active-value="1" :inactive-value="0" :disabled="isSyncStatus()" />
           <div style="color: #999;">注：关闭则不计算出入库数据</div>
         </div>
       </el-form-item>
@@ -211,14 +225,13 @@
 
       <el-form-item label="打包费" prop="delivery">
         <div style="display: block;">
-          <el-input-number v-model="ruleForm.packFee" controls-position="right"></el-input-number>
+          <el-input-number v-model="ruleForm.packFee" controls-position="right"
+            :disabled="isSyncStatus()"></el-input-number>
           <div style="color: #999;">单份商品打包费。注：店铺开启外卖模式下该数据才生效</div>
         </div>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="submitForm(ruleFormRef)">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">确定</el-button>
-          确定
-        </el-button>
         <el-button @click="resetForm(ruleFormRef)">取消</el-button>
       </el-form-item>
     </el-form>
@@ -247,30 +260,33 @@
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref } from 'vue'
+import { reactive, ref } from "vue";
-import type { FormInstance, FormRules } from 'element-plus'
+import type { FormInstance, FormRules } from "element-plus";
 // 规格属性
-import SpecificationAttribute from './SpecificationAttribute.vue'
+import SpecificationAttribute from "./SpecificationAttribute.vue";
+import { isSyncStatus } from "@/utils/index";
 import UserAPI from "@/api/product/productclassification";
 import UserAPI2 from "@/api/product/commonUnits";
 import UserAPI3 from "@/api/product/index";
 import UserAPI4 from "@/api/product/specificationsconfig";
 import shopList from "@/components/mycomponents/shopList.vue";
-import AddImg from '@/components/mycomponents/addImg.vue';
+import AddImg from "@/components/mycomponents/addImg.vue";
-import { useRouter } from 'vue-router';
+import { useRouter } from "vue-router";
 import { useTagsViewStore } from "@/store";
 const tagsViewStore = useTagsViewStore();
 const router = useRouter();
-let list = ref<any[]>([{
+let list = ref<any[]>([
-  "originPrice": 0,
+  {
-  "costPrice": 0,
+    originPrice: 0,
-  "salePrice": 0,
+    costPrice: 0,
-  "memberPrice": 0,
+    salePrice: 0,
-  "suitNum": 1,
+    memberPrice: 0,
-  "coverImg": "",
+    suitNum: 1,
-  "weight": 0,
+    coverImg: "",
-  "barCode": "88888888888888888888"
+    weight: 0,
-}]);
+    barCode: "88888888888888888888",
+  },
+]);
 let datas = reactive<datasForm>({
   cycle: [
     { label: "周一", value: "Monday" },
@@ -279,7 +295,7 @@ let datas = reactive<datasForm>({
     { label: "周四", value: "Thursday" },
     { label: "周五", value: "Friday" },
     { label: "周六", value: "Saturday" },
-    { label: "周七", value: "Sunday" }
+    { label: "周七", value: "Sunday" },
   ],
   Company: [],
   classification: [],
@@ -287,14 +303,14 @@ let datas = reactive<datasForm>({
   specificationsconfig: [],
   selectSpeclist: [],
   defaultSku: {
-    "originPrice": 0,
+    originPrice: 0,
-    "costPrice": 0,
+    costPrice: 0,
-    "salePrice": 0,
+    salePrice: 0,
-    "memberPrice": 0,
+    memberPrice: 0,
-    "suitNum": 1,
+    suitNum: 1,
-    "coverImg": "",
+    coverImg: "",
-    "weight": 0,
+    weight: 0,
-    "barCode": "88888888888888888888"
+    barCode: "88888888888888888888",
   },
   specTableHeaders: [],
   // 套餐商品-单规格index
@@ -303,78 +319,79 @@ let datas = reactive<datasForm>({
   showSelectSku: false,
   selectSkuItem: {},
   addGroupIndex: -1,
-
+});
-})
+let shopListRef = ref(null);
-let shopListRef = ref(null)
+let addImg = ref(null);
-let addImg = ref(null)
+let isedit = ref(true);
-let isedit = ref(true)
 interface datasForm {
-  cycle: { label: string, value: string }[],
+  cycle: { label: string; value: string }[];
-  Company: any[],
+  Company: any[];
-  classification: any[],
+  classification: any[];
-  specificationsconfig: any[],
+  specificationsconfig: any[];
-  selectSpeclist: any[],
+  selectSpeclist: any[];
-  defaultSku: any,
+  defaultSku: any;
-  specTableHeaders: any[],
+  specTableHeaders: any[];
-  selectSkuTableIndex: any,
+  selectSkuTableIndex: any;
-  selectSkuConfirmIndex: number,
+  selectSkuConfirmIndex: number;
-  showSelectSku: boolean,
+  showSelectSku: boolean;
-  selectSkuItem: any,
+  selectSkuItem: any;
-  addGroupIndex: any,
+  addGroupIndex: any;
 }
 interface RuleForm {
-  name: string,
+  name: string;
-  shortTitle: string,
+  shortTitle: string;
-  unitId: string,
+  unitId: string;
-  categoryId: string,
+  categoryId: string;
-  coverImg: string,
+  coverImg: string;
-  images: string[],
+  images: string[];
-  type: string,
+  type: string;
-  specId: any,
+  specId: any;
-  groupType: any,
+  groupType: any;
-  skuList: string[],
+  skuList: string[];
-  weight: any,
+  weight: any;
-  isAllowTempModifyPrice: any,
+  isAllowTempModifyPrice: any;
-  days: any,
+  days: any;
-  useTime: string[],
+  useTime: string[];
-  startTime: string,
+  startTime: string;
-  endTime: string,
+  endTime: string;
-  isSale: string,
+  isSale: string;
-  isStock: string,
+  isStock: string;
-  isHot: string,
+  isHot: string;
-  stockNumber: any,
+  stockNumber: any;
-  packFee: any,
+  packFee: any;
-  sort: Number,
+  sort: Number;
-  proGroupVo: any[],
+  proGroupVo: any[];
-  selectSpecInfo: any
+  selectSpecInfo: any;
 }
-const ruleFormRef = ref<FormInstance>()
+const ruleFormRef = ref<FormInstance>();
 const ruleForm = reactive<RuleForm>({
   //商品名称
-  name: '',
+  name: "",
   //商品介绍
-  shortTitle: '',
+  shortTitle: "",
   // 单位id
-  unitId: '',
+  unitId: "",
   // 分类id
-  categoryId: '',
+  categoryId: "",
   // 封面图url
-  coverImg: '',
+  coverImg: "",
   // 详情图urls
   images: [],
   // 商品类型
-  type: 'single',
+  type: "single",
   // 规格id
-  specId: '',
+  specId: "",
   // 套餐类型
-  groupType: '0',
+  groupType: "0",
   // 套餐入参
-  proGroupVo: [{
+  proGroupVo: [
-    title: '',
+    {
-    count: '',
+      title: "",
-    number: '',
+      count: "",
-    goods: []
+      number: "",
-  }],
+      goods: [],
+    },
+  ],
   // sku集合
   skuList: [],
   // 重量
@@ -382,10 +399,10 @@ const ruleForm = reactive<RuleForm>({
   // 是否允许改价
   isAllowTempModifyPrice: 1,
   // 定时上下架周期
-  days: ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'],
+  days: ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"],
-  useTime: ['00:00:00', '23:59:59'],
+  useTime: ["00:00:00", "23:59:59"],
   // 开始时间
-  startTime: '',
+  startTime: "",
   // 结束时间
   endTime: "",
   // 是否上架
@@ -400,37 +417,34 @@ const ruleForm = reactive<RuleForm>({
   packFee: 0,
   // 排序值
   sort: 1,
-  selectSpecInfo: {}
+  selectSpecInfo: {},
-})
+});
 const rules = reactive<FormRules<RuleForm>>({
-  name: [
+  name: [{ required: true, message: "请输入商品名称", trigger: "blur" }],
-    { required: true, message: '请输入商品名称', trigger: 'blur' },
-  ],
   unitId: [
     {
       required: true,
-      message: '请选择单位',
+      message: "请选择单位",
-      trigger: 'change',
+      trigger: "change",
     },
   ],
   categoryId: [
     {
       required: true,
-      message: '请选择商品分类',
+      message: "请选择商品分类",
-      trigger: 'change',
+      trigger: "change",
     },
   ],
   images: [
     {
       required: true,
-      message: '请选择图片',
+      message: "请选择图片",
-      trigger: 'change',
+      trigger: "change",
     },
   ],
-
+});
-})
 onMounted(() => {
-  getList()
+  getList();
   if (router.currentRoute.value.query.goods_id) {
     tbProductGetDetail(router.currentRoute.value.query.goods_id);
   }
@@ -438,50 +452,51 @@ onMounted(() => {
 watch(() => router.currentRoute.value.query.goods_id, (val) => {
   tbProductGetDetail(val);
 })
+
 async function tbProductGetDetail(id: any) {
   // 获取商品详情
   const res = await UserAPI3.getDetail(id);
-  changeTypeEnum(res.type)
+  changeTypeEnum(res.type);
   for (const key in res) {
-    if (key !== 'images' && key !== 'days') {
+    if (key !== "images" && key !== "days") {
       (ruleForm as any)[key] = res[key];
     }
   }
   ruleForm.images = res.images.map((item: any, index: number) => item);
-  ruleForm.days = res.days.split(',');
+  ruleForm.days = res.days.split(",");
   ruleForm.useTime = [res.startTime, res.endTime];
-  ruleForm.proGroupVo = res.groupSnap
+  ruleForm.proGroupVo = res.groupSnap;
   if (res.type === "sku") {
-    await tbProductSpecGet()
+    await tbProductSpecGet();
-    selectSpecHandle(ruleForm.specId)
+    selectSpecHandle(ruleForm.specId);
     datas.selectSpeclist.forEach((item: any) => {
-      item.selectSpecResult = res.selectSpecInfo[item.name]
+      item.selectSpecResult = res.selectSpecInfo[item.name];
       // if (item.name === res.selectSpecInfo.name
       // ) { }
       // item.children.forEach((ele: any) => {
       // item.selectSpecResult.push(ele.name)
       // })
-    })
+    });
-    selectSpecResultChange()
+    selectSpecResultChange();
   } else {
-    list.value = ruleForm.skuList
+    list.value = ruleForm.skuList;
   }
 }
 // 选择套餐商品sku
 function selectSkuHandle(item: any, index: number) {
   // 把所有的设置为false
   datas.selectSkuItem.skuList.map((item: any, index: number) => {
-    let nitem = { ...item }
+    let nitem = { ...item };
-    nitem.active = false
+    nitem.active = false;
-    datas.selectSkuItem.skuList[index] = nitem
+    datas.selectSkuItem.skuList[index] = nitem;
-  })
+  });
 
   if (item.active) {
-    item.active = false
+    item.active = false;
   } else {
-    item.active = true
+    item.active = true;
   }
-  datas.selectSkuItem.skuList[index] = { ...item }
+  datas.selectSkuItem.skuList[index] = { ...item };
 
   // let arr = datas.selectSkuItem.skuList.filter((item:any) => item.active)
 
@@ -492,35 +507,49 @@ function selectSkuHandle(item: any, index: number) {
   // }
 }
 function addimgEvent() {
-  (addImg.value as any)?.show()
+  if (isSyncStatus()) {
+    ElMessage.error('当前同步启用状态下不可修改')
+    return
+  }
+  (addImg.value as any)?.show();
 }
 // 确认套餐商品设置规格
 function showSelectSkuConfirm() {
-  let item = datas.selectSkuItem.skuList.filter((item: any) => item.active)
+  let item = datas.selectSkuItem.skuList.filter((item: any) => item.active);
-  ruleForm.proGroupVo[datas.selectSkuTableIndex].goods[datas.selectSkuConfirmIndex] = { ...ruleForm.proGroupVo[datas.selectSkuTableIndex].goods[datas.selectSkuConfirmIndex], skuId: item[0].id }
+  ruleForm.proGroupVo[datas.selectSkuTableIndex].goods[datas.selectSkuConfirmIndex] = {
-  ruleForm.proGroupVo[datas.selectSkuTableIndex].goods[datas.selectSkuConfirmIndex] = { ...ruleForm.proGroupVo[datas.selectSkuTableIndex].goods[datas.selectSkuConfirmIndex], skuName: item[0].specInfo }
+    ...ruleForm.proGroupVo[datas.selectSkuTableIndex].goods[datas.selectSkuConfirmIndex],
-  datas.showSelectSku = false
+    skuId: item[0].id,
+  };
+  ruleForm.proGroupVo[datas.selectSkuTableIndex].goods[datas.selectSkuConfirmIndex] = {
+    ...ruleForm.proGroupVo[datas.selectSkuTableIndex].goods[datas.selectSkuConfirmIndex],
+    skuName: item[0].specInfo,
+  };
+  datas.showSelectSku = false;
 }
 // 显示套餐商品设置规格
 function showSelectSkuHandle(row: any, index: any, tabIndex: any) {
-  datas.selectSkuTableIndex = tabIndex
+  datas.selectSkuTableIndex = tabIndex;
-  datas.selectSkuConfirmIndex = index
+  datas.selectSkuConfirmIndex = index;
-  datas.showSelectSku = true
+  datas.showSelectSku = true;
 
-  let obj = { ...row }
+  let obj = { ...row };
 
   obj.skuList.map((item: any) => {
-    item.active = false
+    item.active = false;
-  })
+  });
 
-  datas.selectSkuItem = obj
+  datas.selectSkuItem = obj;
 }
 // 添加商品
 function addgoods(index: number = -1) {
   datas.addGroupIndex = index;
-  (shopListRef.value as any)?.opens()
+  (shopListRef.value as any)?.opens();
 }
 function deleteEvent(d: any) {
+  if (isSyncStatus()) {
+    ElMessage.error('当前同步启用状态下不可修改')
+    return
+  }
   let index = ruleForm.images.findIndex((ele) => ele == d);
   ruleForm.images.splice(index, 1);
 }
@@ -529,45 +558,45 @@ function successEvent(d: any) {
 }
 // 分组选择商品
 function selectShopRes(res: Array<any>) {
-  let newres = res.map(item => {
+  let newres = res.map((item) => {
-    item.proId = item.id
+    item.proId = item.id;
-    item.proName = item.name
+    item.proName = item.name;
-    item.price = item.lowPrice
+    item.price = item.lowPrice;
-    item.skuId = item.skuList[0].id
+    item.skuId = item.skuList[0].id;
-    item.skuName = ''
+    item.skuName = "";
-    item.number = 1
+    item.number = 1;
     // 单规格skuid添加
-    return item
+    return item;
-  })
+  });
 
-  if (ruleForm.groupType == '0') {
+  if (ruleForm.groupType == "0") {
     let obj = {
-      title: '',
+      title: "",
       count: newres.length,
-      number: '',
+      number: "",
-      goods: newres
+      goods: newres,
-    }
+    };
-    ruleForm.proGroupVo = [{ ...obj }]
+    ruleForm.proGroupVo = [{ ...obj }];
   } else {
     if (datas.addGroupIndex != -1) {
-      ruleForm.proGroupVo[datas.addGroupIndex].count = newres.length
+      ruleForm.proGroupVo[datas.addGroupIndex].count = newres.length;
-      ruleForm.proGroupVo[datas.addGroupIndex].goods = newres
+      ruleForm.proGroupVo[datas.addGroupIndex].goods = newres;
     } else {
-      let arr = [...ruleForm.proGroupVo]
+      let arr = [...ruleForm.proGroupVo];
       arr.push({
-        title: '',
+        title: "",
         count: newres.length,
-        number: '',
+        number: "",
-        goods: newres
+        goods: newres,
-      })
+      });
-      ruleForm.proGroupVo = [...arr]
+      ruleForm.proGroupVo = [...arr];
     }
   }
 }
 // 获取单位、分类数据
 async function getList() {
-  datas.Company = (await UserAPI2.getList(null)) as any[]
+  datas.Company = (await UserAPI2.getList(null)) as any[];
-  datas.classification = (await UserAPI.getList(null)) as any[]
+  datas.classification = (await UserAPI.getList(null)) as any[];
 }
 // 选择规格属性
 function selectSpecResultChange() {
@@ -591,7 +620,7 @@ function createSkuHeader() {
 // 可选套餐弹窗
 function addtaocan() {
   datas.addGroupIndex = -1;
-  (shopListRef.value as any)?.opens()
+  (shopListRef.value as any)?.opens();
 }
 // 生成多规格表体
 function createSkuBody() {
@@ -621,7 +650,6 @@ function createSkuBody() {
         for (let key in v) {
           obj[`${key}`] = v[key];
           specSnap.push(v[key]);
-
         }
       }
       let specSnapStr = specSnap.join(",");
@@ -649,18 +677,18 @@ function createSkuBody() {
   }
   if (ruleForm.skuList.length) {
     if (isedit.value) {
-      let arr: any[] = []
+      let arr: any[] = [];
       ruleForm.skuList.forEach((item: any, index: number) => {
         newarr.forEach((val: any, i: number) => {
           if (item.specInfo == val.specInfo) {
             //       newarr[i] = item
-            Object.assign(val, item)
+            Object.assign(val, item);
-            arr.push(val)
+            arr.push(val);
           }
         });
       });
-      list.value = arr
+      list.value = arr;
-      isedit.value = false
+      isedit.value = false;
     } else {
       list.value = newarr;
     }
@@ -671,13 +699,13 @@ function createSkuBody() {
 // 切换类型
 function changeTypeEnum(item: string) {
   // single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券
-  list.value = []
+  list.value = [];
-  if (item == 'sku') {
+  if (item == "sku") {
     tbProductSpecGet();
   } else {
-    ruleForm.specId = ""
+    ruleForm.specId = "";
-    datas.selectSpeclist = []
+    datas.selectSpeclist = [];
-    list.value = [datas.defaultSku]
+    list.value = [datas.defaultSku];
   }
 }
 // 笛卡尔积算法
@@ -698,115 +726,112 @@ function cartesian(arr) {
 // 套餐类型切换
 function typeChange() {
   // ruleForm.typeEnum = 'normal'
-  if (ruleForm.groupType == '0') {
+  if (ruleForm.groupType == "0") {
-    ruleForm.proGroupVo = []
+    ruleForm.proGroupVo = [];
     ruleForm.proGroupVo[0] = {
-      title: '',
+      title: "",
-      count: '',
+      count: "",
       number: 1,
-      goods: []
+      goods: [],
-    }
+    };
   } else {
-    ruleForm.proGroupVo = []
+    ruleForm.proGroupVo = [];
   }
   // this.changeTypeEnum()
 }
 // 获取规格列表
 async function tbProductSpecGet() {
-  datas.specificationsconfig = (await UserAPI4.getPage(null)) as []
+  datas.specificationsconfig = (await UserAPI4.getPage(null)) as [];
 }
 // 选择规格
 function selectSpecHandle(e: any) {
-  const selectSpec = JSON.parse(JSON.stringify(datas.specificationsconfig.find((item) => item.id == e).children));
+  const selectSpec = JSON.parse(
+    JSON.stringify(datas.specificationsconfig.find((item) => item.id == e).children)
+  );
   for (let item in selectSpec) {
     selectSpec[item].selectSpecResult = [];
   }
   datas.selectSpeclist = selectSpec;
 }
-const specificationAttributeRef = ref(null)
+const specificationAttributeRef = ref(null);
 const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) return
+  if (!formEl) return;
   await formEl.validate(async (valid, fields) => {
     if (valid) {
-      ruleForm.days = ruleForm.days.join(',')
       // 第一张图片作为封面图
-      ruleForm.coverImg = ruleForm.images[0]
+      ruleForm.coverImg = ruleForm.images[0];
       // 规格id修改
       // ruleForm.specId = specIdFunction(ruleForm.type)
-      let selectTitle = false
+      let selectTitle = false;
-      ruleForm.proGroupVo.forEach((item: any) => {
+      ruleForm.proGroupVo.forEach((item: any) => { });
-      })
       if (selectTitle) {
-        ElMessage.error('请填写组名和几选几')
+        ElMessage.error("请填写组名和几选几");
-        return
+        return;
       }
-      // 修改时间
-      ruleForm.startTime = ruleForm.useTime[0]
-      ruleForm.endTime = ruleForm.useTime[1]
       // 拿到sku数据
-      ruleForm.skuList = (specificationAttributeRef.value as any)?.getdata()
+      ruleForm.skuList = (specificationAttributeRef.value as any)?.getdata();
       // 多规格 selectSpecInfo 添加
-      if (ruleForm.type == 'sku') {
+      if (ruleForm.type == "sku") {
-        let obj: any = {}
+        let obj: any = {};
         datas.selectSpeclist.forEach((item: any) => {
-          obj[item.name] = item.selectSpecResult
+          obj[item.name] = item.selectSpecResult;
-        })
+        });
-        ruleForm.selectSpecInfo = obj
+        ruleForm.selectSpecInfo = obj;
-      } else if (ruleForm.type == 'package') {
+      } else if (ruleForm.type == "package") {
         // console.log(ruleForm, '套餐')
       }
-      setTimeout(() => {
+
-        ruleForm.days = ruleForm.days.split(',')
-      }, 200);
       // 标题和几选几是否填写
       if (ruleForm.type == "package") {
-        if (ruleForm.groupType == '1') {
+        if (ruleForm.groupType == "1") {
-          let selectTitle = false
+          let selectTitle = false;
           ruleForm.proGroupVo.forEach((item: any) => {
-            if (item.number == '' || item.title == '') {
+            if (item.number == "" || item.title == "") {
-              selectTitle = true
+              selectTitle = true;
             }
-          })
+          });
           if (selectTitle) {
-            ElMessage.error('请填写组名和几选几')
+            ElMessage.error("请填写组名和几选几");
-            return
+            return;
           }
         }
       }
+      ruleForm.days = ruleForm.days.join(',')
+      setTimeout(() => {
+        ruleForm.days = ruleForm.days.split(",");
+      }, 200);
 
-      if (ruleForm.type == 'weight') {
+      if (ruleForm.type == "weight") {
-        ruleForm.specId = ''
+        ruleForm.specId = "";
       }
       if (ruleForm.id) {
-        let res = await UserAPI3.update(ruleForm)
+        let res = await UserAPI3.update(ruleForm);
         if (res.code == 200) {
           ElMessage.success("修改成功");
         }
       } else {
-
+        let res = await UserAPI3.addunit(ruleForm);
-        let res = await UserAPI3.addunit(ruleForm)
         if (res.code == 200) {
           ElMessage.success("添加成功");
         }
       }
       setTimeout(() => {
         closeSelectedTag({
-          "name": "addgoods",
+          name: "addgoods",
-          "title": "新增商品",
+          title: "新增商品",
-          "path": "/product/addgoods",
+          path: "/product/addgoods",
-          "fullPath": "/product/addgoods",
+          fullPath: "/product/addgoods",
-        })
+        });
       }, 500);
       setTimeout(() => {
-        router.push({ path: '/product/index' });
+        router.push({ path: "/product/index" });
       }, 1000);
     } else {
       ElMessage.error("请填写完整信息");
-      console.log('error submit!', fields)
+      console.log("error submit!", fields);
     }
-  })
+  });
-}
+};
-
 
 // 关闭当前窗口
 function closeSelectedTag(view: TagView) {
@@ -818,31 +843,31 @@ function closeSelectedTag(view: TagView) {
 }
 // 规格id过滤
 const specIdFunction = (type: string) => {
-  if (type === 'single') {
+  if (type === "single") {
-    return ''
+    return "";
-  } else if (type === '2') {
+  } else if (type === "2") {
-    return 2
+    return 2;
-  } else if (type === '3') {
+  } else if (type === "3") {
-    return 3
+    return 3;
-  } else if (type === '4') {
+  } else if (type === "4") {
-    return 4
+    return 4;
-  } else if (type === '5') {
+  } else if (type === "5") {
-    return 5
+    return 5;
   }
-}
+};
 const resetForm = (formEl: FormInstance | undefined) => {
   closeSelectedTag({
-    "name": "addgoods",
+    name: "addgoods",
-    "title": "新增商品",
+    title: "新增商品",
-    "path": "/product/addgoods",
+    path: "/product/addgoods",
-    "fullPath": "/product/addgoods",
+    fullPath: "/product/addgoods",
-    "affix": false,
+    affix: false,
-    "keepAlive": true,
+    keepAlive: true,
-    "query": {}
+    query: {},
-  })
+  });
-  if (!formEl) return
+  if (!formEl) return;
-  formEl.resetFields()
+  formEl.resetFields();
-}
+};
 </script>
 <style scoped lang="scss">
 .addgoods {
@@ -865,7 +890,7 @@ const resetForm = (formEl: FormInstance | undefined) => {
       }
 
       .tag {
-        background-color: #F7F7FA;
+        background-color: #f7f7fa;
         padding: 6px 12px;
         margin-right: 10px;
         border-radius: 4px;
@@ -876,7 +901,7 @@ const resetForm = (formEl: FormInstance | undefined) => {
         }
 
         &.active {
-          background-color: #46A6FF;
+          background-color: #46a6ff;
           color: #fff;
         }
       }
@@ -886,7 +911,7 @@ const resetForm = (formEl: FormInstance | undefined) => {
 
 .group_wrap {
   padding: 20px;
-  background-color: #F7F7FA;
+  background-color: #f7f7fa;
   margin-bottom: 20px;
 }
 

src/views/product/indexconfig/content.ts

@@ -58,7 +58,20 @@ const contentConfig: IContentConfig<UserPageQuery> = {
   },
   pk: "id",
   toolbar: [
-    "add",
+    {
+      icon: "plus",
+      text: "新增",
+      type: "primary",
+      name: "add",
+      auth: "import",
+    },
+    {
+      icon: "refresh",
+      text: "同步",
+      type: "danger",
+      name: "sync",
+      auth: "import",
+    },
     {
       icon: "edit",
       text: "库存预警",
@@ -66,6 +79,7 @@ const contentConfig: IContentConfig<UserPageQuery> = {
       name: "custom1",
       auth: "import",
     },
+   
   ],
   cols: [
     // { type: "selection", width: 50, align: "center" },
@@ -113,7 +127,7 @@ const contentConfig: IContentConfig<UserPageQuery> = {
       fixed: "right",
       width: 280,
       templet: "tool",
-      operat: [{ text: "报损" }, "edit", "delete"],
+      operat: [{ text: "报损", name: ''}, { text: "编辑", icon: 'edit', name: "edit"}, { text: "删除", icon: 'delete', type: 'danger', name: "delete"}],
     },
   ],
 };

src/views/product/specifications.vue

@@ -29,10 +29,10 @@
           <copy-button v-if="scope.row[scope.prop]" :text="scope.row[scope.prop]" style="margin-left: 2px" />
         </template>
         <template #operates="scope">
-          <el-button type="text" size="small" v-if="scope.row.level < 3"
+          <el-button type="text" size="small" v-if="scope.row.level < 3&&!isSyncStatus()"
             @click="addlowerLevel(scope.row)">添加下一级</el-button>
-          <el-button type="text" size="small" @click="handleEditClick(scope.row)">编辑</el-button>
+          <el-button type="text" size="small" v-if="!isSyncStatus()" @click="handleEditClick(scope.row)">编辑</el-button>
-          <el-button type="text" size="small" @click="deleteClick(scope.row)">删除</el-button>
+          <el-button type="text" size="small" v-if="!isSyncStatus()" @click="deleteClick(scope.row)">删除</el-button>
         </template>
       </page-content>
       <!-- 添加下一级-编辑 -->
@@ -123,6 +123,8 @@ import contentConfig2 from "./specificationsconfig/content2";
 import editModalConfig from "./specificationsconfig/edit";
 import searchConfig from "./specificationsconfig/search";
 import { pid } from "process";
+import { isSyncStatus } from "@/utils/index";
+
 const validateSku1 = (rule, value, callback) => {
   if (!datas.skuForm.label) {
     callback(new Error(' '))
@@ -190,6 +192,12 @@ let datas = reactive({
   addchilderinfo: {}
 })
 let myDialogRef = ref(null)
+if (isSyncStatus()) {
+  contentConfig.toolbar[0].hidden = true
+} else {
+  contentConfig.toolbar[0].hidden = false
+}
+
 function subitgood() {
   skuForm.value.validate(async valid => {
     if (valid) {

src/views/product/specificationsconfig/content.ts

@@ -41,7 +41,13 @@ const contentConfig: IContentConfig<UserPageQuery> = {
   // },
   pk: "id",
   toolbar: [
-    "add",
+    {
+      icon: "plus",
+      text: "新增",
+      type: "primary",
+      name: "add",
+      auth: "import",
+    },
   ],
   cols: [
     // { type: "selection", width: 50, align: "center" },

src/views/product/unit.vue

@@ -61,6 +61,7 @@ import contentConfig from "./unitconfig/content";
 import contentConfig2 from "./unitconfig/content2";
 import editModalConfig from "./unitconfig/edit";
 import searchConfig from "./unitconfig/search";
+import { isSyncStatus } from "@/utils/index";
 
 const {
   searchRef,
@@ -77,6 +78,16 @@ const {
   handleFilterChange,
 } = usePage();
 
+if (isSyncStatus()) {
+  contentConfig.toolbar[0].hidden = true
+  contentConfig.cols[contentConfig.cols.length - 1].operat[0].hidden = true
+  contentConfig.cols[contentConfig.cols.length - 1].operat[1].hidden = true
+} else {
+  contentConfig.toolbar[0].hidden = false
+  contentConfig.cols[contentConfig.cols.length - 1].operat[0].hidden = false
+  contentConfig.cols[contentConfig.cols.length - 1].operat[1].hidden = false
+}
+
 // 新增
 async function handleAddClick() {
   addModalRef.value?.setModalVisible();

src/views/product/unitconfig/content.ts

@@ -38,7 +38,13 @@ const contentConfig: IContentConfig<UserPageQuery> = {
   },
   pk: "id",
   toolbar: [
-    "add",
+    {
+      icon: "plus",
+      text: "新增",
+      type: "primary",
+      name: "add",
+      auth: "import",
+    },
   ],
   cols: [
     // { type: "selection", width: 50, align: "center" },
@@ -50,7 +56,7 @@ const contentConfig: IContentConfig<UserPageQuery> = {
       fixed: "right",
       width: 280,
       templet: "tool",
-      operat: ["edit", "delete"],
+      operat: [{ text: "编辑", icon: 'edit', name: "edit"}, { text: "删除", icon: 'delete', type: 'danger', name: "delete"}],
     },
   ],
 };

src/views/shop/branchStore/index.vue

@@ -0,0 +1,196 @@
+<template>
+  <div class="app-container">
+    <div class="head-container">
+      <el-card shadow="never">
+        <el-row :gutter="20">
+          <el-col :span="4">
+            <el-input v-model="state.query.name" clearable placeholder="请输入分店名称" style="width: 100%" class="filter-item"
+              @keyup.enter="getTableData" />
+          </el-col>
+          
+
+          <el-col :span="16">
+            <el-button type="primary" @click="getTableData">查询</el-button>
+            <el-button @click="resetHandle">重置</el-button>
+
+            <span style="margin-left: 30px;">设置同步方式：</span>
+            <el-select v-model="state.par.dataSyncMethod" @change="setDataSync" placeholder="请设置同步方式"
+              style="width: 200px">
+              <el-option v-for="item in state.status" :key="item.type" :label="item.label" :value="item.type" />
+            </el-select>
+          </el-col>
+        </el-row>
+      </el-card>
+    </div>
+    <div class="head-container">
+      <el-card shadow="never">
+        <el-table v-loading="state.tableData.loading" :data="state.tableData.list">
+          <el-table-column prop="id" label="ID" width="80" />
+          <el-table-column label="店铺信息">
+            <template v-slot="scope">
+              <div>{{ scope.row.shopName }}{{ scope.row.shopType == 'chain' ? '（连锁店）' : scope.row.shopType == 'join' ? '（加盟店）' : '' }}</div>
+              <div>账号：{{ scope.row.account }}</div>
+              <div>联系电话：{{ scope.row.phone }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="isEnableProdSync" label="商品同步" width="120">
+            <template v-slot="scope">
+              <el-tag :type="scope.row.isEnableProdSync == 1 ? 'success' : 'error'" effect="dark"> {{ scope.row.isEnableProdSync == 1 ? '启用' : '禁用' }} </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column prop="isEnableVipSync" label="会员同步" width="120">
+            <template v-slot="scope">
+              <el-tag :type="scope.row.isEnableVipSync == 1 ? 'success' : 'error'" effect="dark"> {{ scope.row.isEnableVipSync == 1 ? '启用' : '禁用' }} </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column prop="isEnableConsSync" label="耗材同步" width="120">
+            <template v-slot="scope">
+              <el-tag :type="scope.row.isEnableConsSync == 1 ? 'success' : 'error'" effect="dark"> {{ scope.row.isEnableConsSync == 1 ? '启用' : '禁用' }} </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column prop="isAllowAccountLogin" label="账号状态" width="120">
+            <template v-slot="scope">
+              <el-tag :type="scope.row.isAllowAccountLogin == 1 ? 'success' : 'error'" effect="dark"> {{ scope.row.isAllowAccountLogin == 1 ? '启用' : '禁用' }} </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column prop="createdAt" label="备注" />
+          <el-table-column label="操作" width="200">
+            <template v-slot="scope">
+              <el-button v-if="!scope.row.isEnableProdSync || !scope.row.isEnableVipSync || !scope.row.isEnableConsSync"
+                type="primary" size="small" link icon="edit" @click="handleSync(scope.row)">
+                同步启用
+              </el-button>
+              <el-button type="primary" size="small" link icon="edit" @click="handleAccount(scope.row)">
+                {{ scope.row.isAllowAccountLogin ? '账号禁用' : '账号启用' }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-card>
+
+    </div>
+    <div class="head-container">
+      <el-pagination v-model:current-page="state.tableData.page" v-model:page-size="state.tableData.size"
+        :total="state.tableData.total" :page-sizes="[10, 20, 30, 50, 100]"
+        layout="total, sizes , prev, pager ,next, jumper " @current-change="paginationChange" />
+    </div>
+  </div>
+</template>
+
+<script setup>
+import dayjs from "dayjs";
+import ShopBranchApi from "@/api/account/shopBranch";
+import { ElNotification, ElMessageBox } from "element-plus";
+
+const state = reactive({
+  query: {
+    name: "",
+  },
+  par: {
+    dataSyncMethod: '',
+  },
+  status: [
+    { type: 'auto', label: "实时自动同步", },
+    { type: 'manual', label: "手动同步", }
+  ],
+  tableData: {
+    list: [],
+    page: 1,
+    size: 10,
+    loading: false,
+    total: 0,
+  },
+});
+onMounted(() => {
+  getTableData();
+  getDataSync()
+});
+async function getDataSync () {
+  let res = await ShopBranchApi.getDataSync()
+  state.par.dataSyncMethod = res
+}
+
+// 获取分店列表
+async function getTableData() {
+  state.tableData.loading = true;
+  try {
+    const res = await ShopBranchApi.getList({
+      page: state.tableData.page,
+      size: state.tableData.size,
+      branchShopName: state.query.name,
+    });
+    state.tableData.loading = false;
+    state.tableData.list = res.records;
+    state.tableData.total = res.totalRow * 1;
+  } catch (error) {
+    console.log(error);
+  }
+}
+// 设置数据同步
+async function setDataSync() {
+  await ShopBranchApi.setDataSync(state.par.dataSyncMethod);
+  ElMessage({
+    type: "success",
+    message: "设置成功",
+  });
+}
+
+// 开启同步
+function handleSync(e) {
+  console.log(e)
+  ElMessageBox.confirm(`同步功能开启后不能关闭，请确认是否给${e.shopName}开启同步?`, "提示", {
+    confirmButtonText: "确认",
+    cancelButtonText: "取消",
+    type: "warning",
+  }).then(async () => {
+    await ShopBranchApi.dataSync(e.id)
+    ElMessage({
+      type: "success",
+      message: "同步成功",
+    });
+    getTableData();
+  }).catch(() => { });
+}
+
+// 账号启用/禁用
+async function handleAccount(row) {
+  if (row.isAllowAccountLogin) {
+    await ShopBranchApi.disable(row.id);
+
+  } else {
+    await ShopBranchApi.enable(row.id);
+  }
+  getTableData();
+}
+// 重置查询
+function resetHandle() {
+  state.query.name = "";
+  getTableData();
+}
+// 分页回调
+function paginationChange(e) {
+  state.tableData.page = e;
+  getTableData();
+}
+
+</script>
+
+<style scoped lang="scss">
+.head-container {
+  margin-bottom: 20px;
+}
+
+.shop_info {
+  display: flex;
+
+  .info {
+    flex: 1;
+    padding-left: 4px;
+  }
+}
+
+.el-link {
+  min-height: 23px;
+  margin: 0 5px;
+}
+</style>

src/views/shop/list/components/addShop.vue

@@ -1,44 +1,31 @@
 <template>
-  <el-dialog
+  <el-dialog :title="state.form.id ? '编辑店铺' : '添加店铺'" v-model="state.dialogVisible" @close="reset">
-    :title="state.form.id ? '编辑店铺' : '添加店铺'"
-    v-model="state.dialogVisible"
-    @close="reset"
-  >
     <div style="height: 50vh; overflow-y: auto">
-      <el-form
+      <el-form ref="refForm" :model="state.form" :rules="state.rules" label-width="120px" label-position="left">
-        ref="refForm"
-        :model="state.form"
-        :rules="state.rules"
-        label-width="120px"
-        label-position="left"
-      >
         <el-form-item label="店铺名称" prop="shopName">
           <el-input v-model="state.form.shopName" placeholder="请输入门店名称"></el-input>
         </el-form-item>
         <el-form-item label="店铺类型">
-          <el-radio-group v-model="state.form.shopType">
+          <el-radio-group v-model="state.form.shopType" :disabled="state.isEdit || state.type == 'addBranch'">
             <el-radio-button value="only">单店</el-radio-button>
             <el-radio-button value="chain">连锁店</el-radio-button>
             <el-radio-button value="join">加盟店</el-radio-button>
           </el-radio-group>
-          <div class="tips">请谨慎修改！！！</div>
+          <div class="tips"><el-alert title="请谨慎修改" type="warning" size="7" effect="dark" show-icon :closable="false"/></div>
+          
         </el-form-item>
-        <el-form-item label="主店账号" prop="mainId" v-if="state.form.shopType != 'only'">
+        <el-form-item label="是否为主店" prop="isHeadShop" v-if="state.form.shopType != 'only'">
-          <el-select
+          <el-radio-group v-model="state.form.isHeadShop" @change=" state.form.mainId = ''" :disabled="state.isEdit || state.type == 'addBranch'">
-            v-model="state.form.mainId"
+            <el-radio :value="1">是</el-radio>
-            placeholder="请选择主店铺"
+            <el-radio :value="0">否</el-radio>
-            filterable
+          </el-radio-group>
-            remote
+        </el-form-item>
-            reserve-keyword
+        <el-form-item label="选择主店" prop="mainId" v-if="state.form.isHeadShop == '0'&&state.form.shopType != 'only'">
-            :remote-method="getTableData"
+          <!-- <el-form-item label="主店账号" prop="mainId" v-if="state.form.shopType != 'only'"> -->
-            :loading="state.shopListLoading"
+          <el-select v-model="state.form.mainId" placeholder="请选择主店铺" filterable reserve-keyword
-          >
+            :remote-method="getTableData" :loading="state.shopListLoading" :disabled="state.isEdit || state.type == 'addBranch'">
-            <el-option
+            <el-option v-for="item in state.shopList" :label="`${item.shopName}`" :value="item.id"
-              v-for="item in state.shopList"
+              :key="item.id"></el-option>
-              :label="`ID:${item.id} - 名称：${item.shopName}`"
-              :value="item.id"
-              :key="item.id"
-            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="连锁店扩展店名">
@@ -55,14 +42,16 @@
             <el-radio-button value="before">先付费</el-radio-button>
             <el-radio-button value="after">后付费</el-radio-button>
           </el-radio-group>
-          <div class="tips">请谨慎修改！！！</div>
+          <div class="tips"><el-alert title="请谨慎修改" type="warning" size="7" effect="dark" show-icon :closable="false"/></div>
+
         </el-form-item>
         <el-form-item label="管理方式" v-if="state.form.shopType != 'only'">
-          <el-radio-group v-model="state.form.tube_type">
+          <el-radio-group v-model="state.form.tubeType">
-            <el-radio-button value="0">不可直接管理</el-radio-button>
+            <el-radio-button :value="0">不可直接管理</el-radio-button>
-            <el-radio-button value="1">直接管理</el-radio-button>
+            <el-radio-button :value="1">直接管理</el-radio-button>
           </el-radio-group>
-          <div class="tips">请谨慎修改！！！</div>
+          <div class="tips"><el-alert title="请谨慎修改" type="warning" size="7" effect="dark" show-icon :closable="false"/></div>
+
         </el-form-item>
         <el-form-item label="试用/正式">
           <el-radio-group v-model="state.form.profiles">
@@ -78,24 +67,14 @@
           <el-input v-model="state.form.accountName" placeholder="请输入登录账号"></el-input>
         </el-form-item>
         <el-form-item label="登录密码" prop="password" v-if="!state.form.id">
-          <el-input
+          <el-input type="password" show-password v-model="state.form.accountPwd" placeholder="请输入登录密码"></el-input>
-            type="password"
-            show-password
-            v-model="state.form.accountPwd"
-            placeholder="请输入登录密码"
-          ></el-input>
         </el-form-item>
         <el-form-item label="联系电话" prop="phone">
           <el-input v-model="state.form.phone" placeholder="请输入联系电话"></el-input>
         </el-form-item>
         <el-form-item label="设备数量">
-          <el-input-number
+          <el-input-number v-model="state.form.supportDeviceNumber" controls-position="right" :min="1" :step="1"
-            v-model="state.form.supportDeviceNumber"
+            step-strictly></el-input-number>
-            controls-position="right"
-            :min="1"
-            :step="1"
-            step-strictly
-          ></el-input-number>
         </el-form-item>
         <!-- <el-form-item label="外卖起送金额">
                     <el-input-number v-model="form.takeaway_money" placeholder="0.00" controls-position="right"
@@ -104,10 +83,7 @@
         <el-form-item label="店铺经度" prop="lat">
           <el-row>
             <el-col :span="9" v-if="state.form.provinces">
-              <el-input
+              <el-input :value="`${state.form.provinces}-${state.form.cities}-${state.form.districts}`" disabled />
-                :value="`${state.form.provinces}-${state.form.cities}-${state.form.districts}`"
-                disabled
-              />
             </el-col>
             <el-col :span="4" v-if="state.form.lng">
               <el-input v-model="state.form.lng" placeholder="经度" disabled></el-input>
@@ -123,18 +99,10 @@
           </el-row>
         </el-form-item>
         <el-form-item label="店铺详细地址">
-          <el-input
+          <el-input type="textarea" v-model="state.form.address" placeholder="请输入门店详细地址"></el-input>
-            type="textarea"
-            v-model="state.form.address"
-            placeholder="请输入门店详细地址"
-          ></el-input>
         </el-form-item>
         <el-form-item label="店铺简介">
-          <el-input
+          <el-input type="textarea" v-model="state.form.detail" placeholder="请输入店铺简介"></el-input>
-            type="textarea"
-            v-model="state.form.detail"
-            placeholder="请输入店铺简介"
-          ></el-input>
         </el-form-item>
         <el-form-item label="状态">
           <el-radio-group v-model="state.form.status">
@@ -144,12 +112,7 @@
         </el-form-item>
       </el-form>
     </div>
-    <el-dialog
+    <el-dialog title="选择地址" v-model="state.showLocation" :modal="false" :modal-append-to-body="false">
-      title="选择地址"
-      v-model="state.showLocation"
-      :modal="false"
-      :modal-append-to-body="false"
-    >
       <div class="map_box">
         <div class="map">
           <el-amap ref="map" :center="state.amapOptions.center" @init="mapInit">
@@ -157,13 +120,8 @@
           </el-amap>
         </div>
         <div class="search_box">
-          <el-input
+          <el-input v-model="state.searchOption.keyword" placeholder="请输入关键字" @focus="state.searchOption.focus = true"
-            v-model="state.searchOption.keyword"
+            @blur="autoCompleteSearchBlur" @input="autoCompleteSearch(state.searchOption.keyword)">
-            placeholder="请输入关键字"
-            @focus="state.searchOption.focus = true"
-            @blur="autoCompleteSearchBlur"
-            @input="autoCompleteSearch(state.searchOption.keyword)"
-          >
             <template #append>
               <el-button type="primary" @click="placeSearchSearch(state.searchOption.keyword)">
                 搜索
@@ -171,12 +129,8 @@
             </template>
           </el-input>
           <div class="list" v-if="state.searchOption.focus && state.searchOption.show">
-            <div
+            <div class="item" @click="autoCompleteListClick(item)" v-for="item in state.autoCompleteList"
-              class="item"
+              :key="item.id">
-              @click="autoCompleteListClick(item)"
-              v-for="item in state.autoCompleteList"
-              :key="item.id"
-            >
               {{ item.name }}
             </div>
           </div>
@@ -234,11 +188,11 @@ const state = reactive({
   endTime: "",
   formLoading: false,
   form: {
-    id: "",
+    id: null,
     shopName: "",
     mainId: "",
     shopType: "only",
-    tube_type: "0",
+    tubeType: 0,
     registerType: "before",
     profiles: "release",
     activateCode: "",
@@ -257,7 +211,9 @@ const state = reactive({
     cities: "",
     districts: "",
     chainName: "",
+    isHeadShop: 0,
   },
+  type: '',
   resetForm: "",
   rules: {
     activateCode: [
@@ -274,6 +230,13 @@ const state = reactive({
         trigger: "blur",
       },
     ],
+    isHeadShop: [
+      {
+        required: true,
+        message: " ",
+        trigger: "blur",
+      },
+    ],
     mainId: [
       {
         required: true,
@@ -337,6 +300,7 @@ const state = reactive({
   },
   shopListLoading: false,
   shopList: [],
+  isEdit: false,
 });
 onBeforeMount(async () => {
   const res = await initMapLoad();
@@ -347,6 +311,7 @@ onMounted(() => {
 
 // 获取商家列表
 async function getTableData(query = "") {
+  console.log(123)
   state.shopListLoading = true;
   try {
     const res = await ShopApi.getList({
@@ -354,9 +319,10 @@ async function getTableData(query = "") {
       size: 100,
       shopName: query,
       type: "only",
+      isHeadShop: 1,
     });
     state.shopListLoading = false;
-    state.shopList = res.content;
+    state.shopList = res.records;
   } catch (error) {
     state.shopListLoading = false;
     console.log(error);
@@ -394,6 +360,7 @@ function submitHandle() {
           type: "success",
         });
         close();
+        location.reload()
       } catch (error) {
         state.formLoading = false;
         console.log(error);
@@ -409,13 +376,24 @@ function handleSuccess(response, file, fileList) {
   state.files = response.data;
 }
 
-function show(obj) {
+function show(obj,type) {
   getTableData();
   state.dialogVisible = true;
   if (obj && obj.id) {
     console.log(obj);
     state.form = { ...obj };
   }
+  if (obj && obj.mainId) {
+    Object.assign(state.form, obj);
+  }
+  if( type ){
+    state.type = type
+  }
+  console.log(state.form);
+  console.log(state.type);
+  if( state.form.shopType != 'only'){
+    state.isEdit = true
+  }
   for (let key in state.rules) {
     if (key === "accountName") {
       if (obj.id) {
@@ -429,9 +407,14 @@ function show(obj) {
 }
 function close() {
   state.dialogVisible = false;
+  state.form = { ...state.resetForm };
+  state.type = "";
+  state.isEdit = false
 }
 function reset() {
   state.form = { ...state.resetForm };
+  state.type = "";
+  state.isEdit = false
 }
 
 let ElMap = undefined;
@@ -525,14 +508,17 @@ defineExpose({
     top: 10px;
     left: 10px;
     z-index: 3000;
+
     .list {
       background-color: #fff;
+
       .item {
         height: 40px;
         line-height: 40px;
         box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
         padding: 0 10px;
         cursor: pointer;
+
         &:hover {
           background-color: #eee;
         }
@@ -565,4 +551,7 @@ defineExpose({
 .amap-sug-result {
   z-index: 2000;
 }
+.tips{
+  margin-left: 10px;
+}
 </style>

src/views/shop/list/index.vue

@@ -3,33 +3,16 @@
     <div class="head-container">
       <el-row :gutter="20">
         <el-col :span="3">
-          <el-input
+          <el-input v-model="state.query.name" clearable placeholder="请输入店铺名称" style="width: 100%" class="filter-item"
-            v-model="state.query.name"
+            @keyup.enter="getTableData" />
-            clearable
-            placeholder="请输入店铺名称"
-            style="width: 100%"
-            class="filter-item"
-            @keyup.enter="getTableData"
-          />
         </el-col>
         <el-col :span="3">
-          <el-input
+          <el-input v-model="state.query.account" clearable placeholder="请输入商户号" style="width: 100%" class="filter-item"
-            v-model="state.query.account"
+            @keyup.enter="getTableData" />
-            clearable
-            placeholder="请输入商户号"
-            style="width: 100%"
-            class="filter-item"
-            @keyup.enter="getTableData"
-          />
         </el-col>
         <el-col :span="3">
           <el-select v-model="state.query.status" placeholder="请选择店铺状态" style="width: 100%">
-            <el-option
+            <el-option v-for="item in state.status" :key="item.type" :label="item.label" :value="item.type" />
-              :label="item.label"
-              :value="item.type"
-              v-for="item in state.status"
-              :key="item.type"
-            />
           </el-select>
         </el-col>
         <el-col :span="6">
@@ -42,33 +25,31 @@
       <el-button type="primary" icon="plus" @click="addShopShow">添加店铺</el-button>
     </div>
     <div class="head-container">
-      <el-table :data="state.tableData.list" v-loading="state.tableData.loading">
+      <el-table v-loading="state.tableData.loading" :data="state.tableData.list">
         <el-table-column label="店铺信息" width="200">
           <template v-slot="scope">
             <div class="shop_info">
-              <el-image
+              <el-image :src="scope.row.logo"
-                :src="scope.row.logo"
+                style="width: 50px; height: 50px; border-radius: 4px; background-color: #efefef">
-                style="width: 50px; height: 50px; border-radius: 4px; background-color: #efefef"
-              >
                 <template #error>
                   <div class="img_error">
-                    <i class="icon el-icon-document-delete"></i>
+                    <i class="icon el-icon-document-delete" />
                   </div>
                 </template>
               </el-image>
               <div class="info">
                 <span>{{ scope.row.shopName }}</span>
                 <div class="tag_wrap">
-                  <el-tag type="info" effect="dark" v-if="scope.row.profiles == 'no'">
+                  <el-tag v-if="scope.row.profiles == 'no'" type="info" effect="dark">
                     未激活
                   </el-tag>
-                  <el-tag type="warning" effect="dark" v-if="scope.row.profiles == 'probation'">
+                  <el-tag v-if="scope.row.profiles == 'probation'" type="warning" effect="dark">
                     试用
                   </el-tag>
-                  <el-tag type="success" effect="dark" v-if="scope.row.profiles == 'release'">
+                  <el-tag v-if="scope.row.profiles == 'release'" type="success" effect="dark">
                     正式
                   </el-tag>
-                  <el-tag type="primary" effect="dark" v-if="scope.row.isWxMaIndependent">
+                  <el-tag v-if="scope.row.isWxMaIndependent" type="primary" effect="dark">
                     独立小程序
                   </el-tag>
                 </div>
@@ -76,23 +57,26 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="registerType" label="类型">
+        <el-table-column prop="registerType" label="经营模式">
           <template v-slot="scope">
             <span v-if="scope.row.registerType == 'before'">快餐版</span>
             <span v-if="scope.row.registerType == 'after'">餐饮版</span>
           </template>
         </el-table-column>
-        <el-table-column prop="address" label="商户号"></el-table-column>
+        <el-table-column prop="address" label="商户号" />
-        <el-table-column prop="lowPrice" label="来源"></el-table-column>
+        <el-table-column prop="status" label="店铺类型" align="center">
-        <el-table-column prop="lowPrice" label="认证状态">-</el-table-column>
+          <template v-slot="scope">
+            <div>
+              <span v-if="scope.row.shopType == 'only'">单店</span>
+              <span v-if="scope.row.shopType == 'chain'">连锁店</span>
+              <span v-if="scope.row.shopType == 'join'">加盟店</span>
+              <div v-if="scope.row.shopType != 'only'&&scope.row.isHeadShop == 0">(主店：{{ scope.row.headShopName }})</div>
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column prop="status" label="店铺状态">
           <template v-slot="scope">
-            <el-switch
+            <el-switch v-model="scope.row.status" :active-value="1" :inactive-value="0" disabled />
-              v-model="scope.row.status"
-              :active-value="1"
-              :inactive-value="0"
-              disabled
-            ></el-switch>
           </template>
         </el-table-column>
         <el-table-column prop="createdAt" label="到期时间">
@@ -106,21 +90,28 @@
         <el-table-column label="操作" width="200">
           <template v-slot="scope">
             <el-link @click="addShopShow(scope.row)">
-              <el-icon><Edit /></el-icon>
+              <el-icon>
+                <Edit />
+              </el-icon>
               编辑
             </el-link>
             <el-link @click="activateCodeShow(scope.row)">
-              <el-icon><Edit /></el-icon>
+              <el-icon>
+                <Edit />
+              </el-icon>
               激活
             </el-link>
             <el-dropdown @command="dropdownClick($event, scope.row)">
               <el-link>
                 更多
-                <el-icon><ArrowDown /></el-icon>
+                <el-icon>
+                  <ArrowDown />
+                </el-icon>
               </el-link>
 
               <template #dropdown>
                 <el-dropdown-menu>
+                  <el-dropdown-item v-if="scope.row.isHeadShop == 1" :command="0">添加分店</el-dropdown-item>
                   <el-dropdown-item :command="{ row: scope.row, command: 1 }">
                     三方配置
                   </el-dropdown-item>
@@ -136,14 +127,9 @@
       </el-table>
     </div>
     <div class="head-container">
-      <el-pagination
+      <el-pagination v-model:current-page="state.tableData.page" v-model:page-size="state.tableData.size"
-        :total="state.tableData.total"
+        :total="state.tableData.total" :page-sizes="[10, 20, 30, 50, 100]"
-        v-model:current-page="state.tableData.page"
+        layout="total, sizes , prev, pager ,next, jumper " @current-change="paginationChange" />
-        v-model:page-size="state.tableData.size"
-        :page-sizes="[10, 20, 30, 50, 100]"
-        @current-change="paginationChange"
-        layout="total, sizes , prev, pager ,next, jumper "
-      ></el-pagination>
     </div>
     <addShop ref="refAddShop" @success="getTableData" />
     <detailModal ref="refDetailModal" />
@@ -199,6 +185,11 @@ const refDetailModal = ref(null);
 function dropdownClick(e, row) {
   console.log(e);
   console.log(row);
+  if (e == 0) {
+    refAddShop.value.show({mainId:row.id,shopType:row.shopType,isHeadShop:0},'addBranch');
+
+    return;
+  }
   if (e.command == 1) {
     refDetailModal.value.show(e.row);
     return;
@@ -217,7 +208,7 @@ function dropdownClick(e, row) {
         });
         getTableData();
       })
-      .catch(() => {});
+      .catch(() => { });
     return;
   }
 }
@@ -257,6 +248,7 @@ async function getTableData() {
 .head-container {
   margin-bottom: 20px;
 }
+
 .shop_info {
   display: flex;
 
@@ -265,6 +257,7 @@ async function getTableData() {
     padding-left: 4px;
   }
 }
+
 .el-link {
   min-height: 23px;
   margin: 0 5px;

src/views/shop/staff/config/search.ts

@@ -1,9 +1,38 @@
 import type { ISearchConfig } from "@/components/CURD/types";
 import { paramTypeOptions } from './config'
+import UserAPI from "@/api/product/productclassification";
+import ShopApi from "@/api/account/shop";
+
 
 const searchConfig: ISearchConfig = {
   pageName: "sys:user",
   formItems: [
+    {
+      type: "select",
+      label: "分店选择",
+      prop: "shopId",
+      attrs: {
+        placeholder: "请选择分店",
+        clearable: true,
+        style: {
+          width: "200px",
+        },
+      },
+      options: [],
+      async initFn(formItem) {
+        // formItem.options = await UserAPI.getList();
+        let res = await ShopApi.getBranchList();
+        let options = [];
+        res.map(v=>{
+          options.push({
+            label: v.shopName,
+            value: v.shopId,
+          })
+        })  
+        formItem.options = options
+
+      },
+    },
     {
       type: "input",
       label: "账号名",

src/views/shop/staff/index.vue

@@ -47,12 +47,8 @@
         <!-- <h3 style="color: rgb(63, 158, 255)">收银机权限设置</h3>
         <div>
           <el-checkbox-group v-model="addPagePathIdList">
-            <el-checkbox
+            <el-checkbox v-for="(item, index) in pagePathIdLists" :key="index" :value="item.value"
-              v-for="(item, index) in pagePathIdLists"
+              :label="item.label" />
-              :key="index"
-              :value="item.value"
-              :label="item.label"
-            />
           </el-checkbox-group>
         </div>
         <h3 style="color: rgb(63, 158, 255)">员工权限设置</h3>
@@ -67,7 +63,7 @@
       :modal-config="editModalConfig"
       @submit-click="handleSubmitClick"
     >
-      <!-- <template #formFooter>
+      <template #formFooter>
         <h3 style="color: rgb(63, 158, 255)">收银机权限设置</h3>
         <div>
           <el-checkbox-group v-model="editPagePathIdList">
@@ -82,7 +78,8 @@
         <h3 style="color: rgb(63, 158, 255)">员工权限设置</h3>
 
         <selectPermission v-model="selPermissionList" :list="permissionList"></selectPermission>
-      </template> -->
+      </template>
+      -->
     </page-modal>
 
     <!-- 修改密码 -->
@@ -143,6 +140,12 @@ const oldeditSubmitFunc = editModalConfig.formAction;
 // 数据初始化
 async function init() {
   // 覆写添加确定方法
+  if (
+    JSON.parse(localStorage.getItem("userInfo") || "{}").isHeadShop == 0 &&
+    localStorage.getItem("loginType") == "0"
+  ) {
+    searchConfig.formItems.splice(0, 1);
+  }
   addModalConfig.formAction = function (data) {
     return ShopStaffApi.add({
       ...data,