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

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

@@ -7,12 +7,12 @@
     <el-dropdown trigger="click" @command="handleCommand">
       <div class="el-dropdown-link" style="display: flex;">
         <div v-if="!collapse" class="title">{{ state.shopName }}</div>
-        <el-icon class="el-icon--right">
+        <el-icon class="el-icon--right"  v-if="loginType == 0">
           <arrow-down />
         </el-icon>
       </div>
       <template #dropdown>
-        <el-dropdown-menu>
+        <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>
@@ -34,7 +34,7 @@ const state = reactive({
   userInfo: useUserStore().userInfo,
   shopName: useUserStore().userInfo.shopName
 });
-
+const loginType = ref(localStorage.getItem("loginType"))
 onMounted(() => {
   geiShopList()
 });

src/views/data/index.vue

@@ -52,7 +52,7 @@
           <span>营业</span>
         </div>
         <div class="u-flex" style="flex-wrap: wrap">
-          <el-select v-if="isHeadShop == 1" v-model="shopId" placeholder="选择分店" style="width: 200px; margin-right: 10px;" @change="shopChange">
+          <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">
@@ -428,8 +428,8 @@ export default {
       },
       tradeVip: "",
       tradeCount: "",
-      isHeadShop: JSON.parse(localStorage.getItem("userInfo")).isHeadShop
+      isHeadShop: JSON.parse(localStorage.getItem("userInfo")).isHeadShop,
-
+      loginType: localStorage.getItem("loginType")
     };
   },
   computed: {

src/views/data/sales.vue

@@ -11,7 +11,7 @@
             <el-input placeholder="商品名称" v-model="query.productName" />
           </el-form-item>
 
-          <el-form-item v-if="isHeadShop == 1">
+          <el-form-item v-if="isHeadShop == 1&&loginType == 0">
             <el-select v-model="shopId" placeholder="选择分店" style="width: 200px; margin-right: 10px"
               @change="getCategory">
               <el-option v-for="item in branchList" :key="item.shopId" :label="item.shopName" :value="item.shopId" />
@@ -186,7 +186,8 @@ export default {
       payCountTotal: 0,
       branchList: [],
       shopId: null,
-      isHeadShop: JSON.parse(localStorage.getItem("userInfo")).isHeadShop
+      isHeadShop: JSON.parse(localStorage.getItem("userInfo")).isHeadShop,
+      loginType: localStorage.getItem("loginType")
 
     };
   },

src/views/data/table.vue

@@ -22,7 +22,7 @@
               end-placeholder="结束日期" value-format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
           </div>
           <div>
-            <el-select v-model="shopId" v-if="isHeadShop == 1" placeholder="选择分店"
+            <el-select v-model="shopId" v-if="isHeadShop == 1&& loginType == 0" 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>
@@ -128,7 +128,9 @@ export default {
       payCountTotal: 0,
       shopId: null,
       branchList: [],
-      isHeadShop: JSON.parse(localStorage.getItem("userInfo")).isHeadShop
+      isHeadShop: JSON.parse(localStorage.getItem("userInfo")).isHeadShop,
+      loginType: localStorage.getItem("loginType")
+
     };
   },
   filters: {

src/views/login/index.vue

@@ -174,7 +174,8 @@ function handleLogin() {
           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);
           // router.replace({ path: path, query: queryParams });

src/views/product/index.vue

@@ -87,7 +87,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" />
@@ -168,6 +168,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,
@@ -316,7 +317,11 @@ async function handleSwitchhaocai(row: IObject) {
 
 // 编辑
 async function handleEditClick(row: IObject) {
+  try {
   router.push({ name: "addgoods", query: { goods_id: row.id } });
+  } catch (error) {
+    ElMessage.error('没有编辑权限')
+  }
 }
 
 // 其他工具栏
@@ -347,6 +352,7 @@ async function confirmbaosun() {
   let res = await UserAPI.reportDamage(datas)
   ElMessage.success("成功");
   myDialogRefbaosun.value.close();
+  contentRef.value?.fetchPageData();
 }
 async function confirmhaocai() {
   let obj = {
@@ -376,7 +382,8 @@ function typeFilter(item: any) {
 async function handleOperatClick(data: IOperatData) {
   datas.productId = data.row.id
   myDialogRefbaosun.value.open();
-
+  datas.number = 1
+  datas.remark = ""
 }
 
 

src/views/product/indexconfig/addgoods.vue

@@ -189,7 +189,7 @@
       <el-form-item>
         <el-col :span="12">
           <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" />
         </el-col>
       </el-form-item>
@@ -737,7 +737,7 @@ const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) return
   await formEl.validate(async (valid, fields) => {
     if (valid) {
-      ruleForm.days = ruleForm.days.join(',')
+      
       // 第一张图片作为封面图
       ruleForm.coverImg = ruleForm.images[0]
       // 规格id修改
@@ -750,6 +750,11 @@ const submitForm = async (formEl: FormInstance | undefined) => {
         return
       }
       // 修改时间
+      console.log(ruleForm.useTime)
+      if( !ruleForm.useTime ){
+        ElMessage.error('请选择定时上下架时间')
+        return
+      }
       ruleForm.startTime = ruleForm.useTime[0]
       ruleForm.endTime = ruleForm.useTime[1]
       // 拿到sku数据
@@ -764,9 +769,7 @@ const submitForm = async (formEl: FormInstance | undefined) => {
       } else if (ruleForm.type == 'package') {
         // console.log(ruleForm, '套餐')
       }
-      setTimeout(() => {
+   
-        ruleForm.days = ruleForm.days.split(',')
-      }, 200);
       // 标题和几选几是否填写
       if (ruleForm.type == "package") {
         if (ruleForm.groupType == '1') {
@@ -782,8 +785,10 @@ const submitForm = async (formEl: FormInstance | undefined) => {
           }
         }
       }
-
+      ruleForm.days = ruleForm.days.join(',')
-
+      setTimeout(() => {
+        ruleForm.days = ruleForm.days.split(',')
+      }, 200);
       if (ruleForm.id) {
         let res = await UserAPI3.update(ruleForm)
         if (res.code == 200) {

src/views/shop/staff/index.vue

@@ -115,7 +115,7 @@ const oldeditSubmitFunc = editModalConfig.formAction;
 // 数据初始化
 async function init() {
   // 覆写添加确定方法
-  if (JSON.parse(localStorage.getItem('userInfo') || '{}').isHeadShop == 0) {
+  if (JSON.parse(localStorage.getItem('userInfo') || '{}').isHeadShop == 0 && localStorage.getItem('loginType') == '0') {
     searchConfig.formItems.splice(0, 1)
   }
   addModalConfig.formAction = function (data) {