Merge branch 'multi-store' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test

src/store/modules/user.ts

@@ -63,7 +63,7 @@ export const useUserStore = defineStore("user", () => {
           console.log(userInfo)
           console.log(data)
           localStorage.setItem("shopId", "" + data.id);
-          Object.assign(userInfo.value, { ...data, roles: [], promissionList: [], shopId: userInfo.value.shopId });
+          Object.assign(userInfo.value, { ...data, roles: [], promissionList: [], shopId: data.id });
           resolve(userInfo.value);
         })
         .catch((error) => {

src/views/data/index.vue

@@ -52,7 +52,7 @@
           <span>营业</span>
         </div>
         <div class="u-flex" style="flex-wrap: wrap">
-          <el-select v-model="shopId" placeholder="选择分店" style="width: 200px; margin-right: 10px;" @change="shopChange">
+          <el-select v-if="isHeadShop == 1" 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">
@@ -67,7 +67,7 @@
             </el-radio-group>
             <div class="u-flex">
               <el-date-picker v-if="timeValue == 'custom'" v-model="query.createdAt" type="daterange"
-                range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD "
+                range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD HH:mm:ss"
                 @change="summarytrade" />
             </div>
           </div>
@@ -428,6 +428,8 @@ export default {
       },
       tradeVip: "",
       tradeCount: "",
+      isHeadShop: JSON.parse(localStorage.getItem("userInfo")).isHeadShop
+
     };
   },
   computed: {

src/views/data/sales.vue

@@ -11,7 +11,7 @@
             <el-input placeholder="商品名称" v-model="query.productName" />
           </el-form-item>
 
-          <el-form-item>
+          <el-form-item v-if="isHeadShop == 1">
             <el-select v-model="shopId" placeholder="选择分店" style="width: 200px; margin-right: 10px">
               <el-option v-for="item in branchList" :key="item.shopId" :label="item.shopName" :value="item.shopId" />
             </el-select>
@@ -34,7 +34,7 @@
             <el-radio-button value="custom">自定义</el-radio-button>
           </el-radio-group>
           <el-date-picker class="u-m-l-10" v-model="query.createdAt" type="daterange" range-separator="至"
-            start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD"
+            start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD HH:mm:ss"
             v-if="timeValue == 'custom'"></el-date-picker>
         </el-form-item>
         <el-form-item>
@@ -185,6 +185,8 @@ export default {
       payCountTotal: 0,
       branchList: [],
       shopId: null,
+      isHeadShop: JSON.parse(localStorage.getItem("userInfo")).isHeadShop
+
     };
   },
   filters: {

src/views/data/table.vue

@@ -24,11 +24,11 @@
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
-              value-format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD HH:mm:ss"
             ></el-date-picker>
           </div>
           <div>
-            <el-select v-model="shopId" placeholder="选择分店" style="width: 200px; margin-right: 10px">
+            <el-select v-model="shopId" v-if="isHeadShop == 1" placeholder="选择分店" style="width: 200px; margin-right: 10px">
               <el-option v-for="item in branchList" :key="item.shopId" :label="item.shopName" :value="item.shopId" />
             </el-select>
           </div>
@@ -133,6 +133,7 @@ export default {
       payCountTotal: 0,
       shopId: null,
       branchList: [],
+      isHeadShop: JSON.parse(localStorage.getItem("userInfo")).isHeadShop
     };
   },
   filters: {

src/views/shop/staff/index.vue

@@ -2,24 +2,12 @@
   <div class="app-container">
     <!-- 列表 -->
     <!-- 搜索 -->
-    <page-search
+    <page-search ref="searchRef" :search-config="searchConfig" @query-click="handleQueryClick"
-      ref="searchRef"
+      @reset-click="handleResetClick" />
-      :search-config="searchConfig"
-      @query-click="handleQueryClick"
-      @reset-click="handleResetClick"
-    />
     <!-- 列表 -->
-    <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,11 +21,7 @@
       </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>
     </page-content>
 
@@ -47,12 +31,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>
@@ -62,21 +42,13 @@
     </page-modal>
 
     <!-- 编辑 -->
-    <page-modal
+    <page-modal ref="editModalRef" :modal-config="editModalConfig" @submit-click="handleSubmitClick">
-      ref="editModalRef"
-      :modal-config="editModalConfig"
-      @submit-click="handleSubmitClick"
-    >
       <template #formFooter>
         <h3 style="color: rgb(63, 158, 255)">收银机权限设置</h3>
         <div>
           <el-checkbox-group v-model="editPagePathIdList">
-            <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>
@@ -143,6 +115,9 @@ const oldeditSubmitFunc = editModalConfig.formAction;
 // 数据初始化
 async function init() {
   // 覆写添加确定方法
+  if (JSON.parse(localStorage.getItem('userInfo') || '{}').isHeadShop == 0) {
+    searchConfig.formItems.splice(0, 1)
+  }
   addModalConfig.formAction = function (data) {
     return ShopStaffApi.add({
       ...data,