Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud

# Conflicts:
#	src/views/admin/system/user/face-manage.vue

src/views/admin/system/user/face-manage.vue

@@ -26,10 +26,15 @@
 					label="操作"
 				>
 					<template #default="{ row }">
+<<<<<<< HEAD
 						<el-button v-auth="'userFace_sysUserFace_edit'" link type="primary" @click="editFace(row)">
 							<Icon icon="ep:edit" />修改
 						</el-button>
 						<el-button v-auth="'userFace_sysUserFace_del'" link type="danger" @click="delFace(row)"> 删除 </el-button>
+=======
+						<el-button link type="primary" @click="editFace(row)">修改</el-button>
+						<el-button link type="danger" @click="delFace(row)">删除</el-button>
+>>>>>>> 8cfb59e9a6321865edc4426d8f37304c734f1b05
 					</template>
 				</el-table-column>
 			</el-table>

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

@@ -1,15 +1,18 @@
 <template>
 	<div class="layout-padding">
 		<splitpanes>
-			<pane size="15">
+			<pane size="30">
 				<div class="layout-padding-auto layout-padding-view">
 					<el-scrollbar>
-						<query-tree
+						<dep-tree
 							ref="queryTreeRef"
 							:placeholder="$t('common.queryDeptTip')"
 							:query="deptData.queryList"
 							:show-expand="true"
 							@node-click="handleNodeClick"
+							@treeDeepSearch="treeDeepSearch"
+							switch-inactive-text="当前部门"
+							switch-active-text="当前部门及子部门"
 						>
 							<!-- 没有数据权限提示 -->
 							<template #default="{ node, data }">
@@ -20,23 +23,15 @@
 									:content="$t('sysuser.noDataScopeTip')"
 									placement="right-start"
 								>
-									<span
-										>{{ node.label }}
+									<span>
+										{{ node.label }}
 										<SvgIcon name="ele-Lock" />
 									</span>
 								</el-tooltip>
 								<span v-if="!data.isLock">{{ node.label }}</span>
 							</template>
-						</query-tree>
+						</dep-tree>
 					</el-scrollbar>
-					<div class="flex justify-center items-center pt-2">
-						<el-switch
-							v-model="state.queryForm.isDeepDept"
-							@change="isDeepDeptChange"
-							inactive-text="当前部门"
-							active-text="当前部门及子部门"
-						/>
-					</div>
 				</div>
 			</pane>
 			<pane class="ml8">
@@ -283,7 +278,8 @@ const deptData = reactive({
 	},
 })
 
-const isDeepDeptChange = () => {
+const treeDeepSearch = (isDeep: boolean) => {
+	state.queryForm.isDeepDept = isDeep
 	getDataList()
 }
 

src/views/supermarketerp/supermarketAuxiliaryCode/form.vue

@@ -29,7 +29,7 @@
 
 <script setup lang="ts" name="SupermarketAuxiliaryCodeDialog">
 import { useMessage } from '/@/hooks/message';
-import { getObj, addObj, putObj } from '/@/api/supermarket/supermarketAuxiliaryCode';
+import { getObj, addObj, putObj } from '/src/api/supermarketerp/supermarketAuxiliaryCode';
 const emit = defineEmits(['refresh']);
 
 // 定义变量内容

src/views/supermarketerp/supermarketAuxiliaryCode/index.vue

@@ -87,7 +87,7 @@
 
 <script setup lang="ts" name="systemSupermarketAuxiliaryCode">
 import { BasicTableProps, useTable } from '/@/hooks/table';
-import { fetchList, delObjs } from '/@/api/supermarket/supermarketAuxiliaryCode';
+import { fetchList, delObjs } from '/src/api/supermarketerp/supermarketAuxiliaryCode';
 import { useMessage, useMessageBox } from '/@/hooks/message';
 
 // 引入组件

src/views/supermarketerp/supermarketBrand/form.vue

@@ -55,7 +55,7 @@
 <script setup lang="ts" name="SupermarketBrandDialog">
 import { useDict } from "/@/hooks/dict"
 import { useMessage } from "/@/hooks/message"
-import { getObj, addObj, putObj } from "/@/api/supermarket/supermarketBrand"
+import { getObj, addObj, putObj } from "/src/api/supermarketerp/supermarketBrand"
 import { rule } from "/@/utils/validate"
 const emit = defineEmits(["refresh"])
 

src/views/supermarketerp/supermarketBrand/index.vue

@@ -100,7 +100,7 @@
 
 <script setup lang="ts" name="systemSupermarketBrand">
 import { BasicTableProps, useTable } from "/@/hooks/table"
-import { fetchList, delObjs } from "/@/api/supermarket/supermarketBrand"
+import { fetchList, delObjs } from "/src/api/supermarketerp/supermarketBrand"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 

src/views/supermarketerp/supermarketCategory/form.vue

@@ -56,7 +56,7 @@
 <script setup lang="ts" name="SupermarketCategoryDialog">
 import { useDict } from "/@/hooks/dict"
 import { useMessage } from "/@/hooks/message"
-import { getObj, addObj, putObj } from "/@/api/supermarket/supermarketCategory"
+import { getObj, addObj, putObj } from "/src/api/supermarketerp/supermarketCategory"
 import { rule } from "/@/utils/validate"
 const emit = defineEmits(["refresh"])
 

src/views/supermarketerp/supermarketCategory/index.vue

@@ -101,7 +101,7 @@
 
 <script setup lang="ts" name="systemSupermarketCategory">
 import { BasicTableProps, useTable } from "/@/hooks/table"
-import { fetchList, delObjs } from "/@/api/supermarket/supermarketCategory"
+import { fetchList, delObjs } from "/src/api/supermarketerp/supermarketCategory"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 

src/views/supermarketerp/supermarketSpu/form.vue

@@ -67,21 +67,26 @@
 								<upload-img v-model:imageUrl="form.picUrl"></upload-img>
 							</el-form-item>
 						</el-col>
-						<el-col :span="24" class="mb20">
+<!--						<el-col :span="24" class="mb20">
 							<el-form-item label="商品轮播图" prop="sliderPicUrls">
 								<upload-imgs v-model:imageUrl="form.sliderPicUrls"></upload-imgs>
 							</el-form-item>
-						</el-col>
+						</el-col>-->
 						<el-col :span="12" class="mb20">
 							<el-form-item label="排序字段" prop="sort">
 								<el-input-number :min="0" :max="1000" :precision="0" v-model="form.sort" />
 							</el-form-item>
 						</el-col>
-						<el-col :span="12" class="mb20">
+            <el-col :span="12" class="mb20">
+              <el-form-item label="总库存" prop="stock">
+                <el-input-number v-model="form.stock" :min="0" :precision="0" />
+              </el-form-item>
+            </el-col>
+<!--						<el-col :span="12" class="mb20">
 							<el-form-item label="单位" prop="unit">
 								<el-input v-model="form.unit" placeholder="请输入单位" />
 							</el-form-item>
-						</el-col>
+						</el-col>-->
 						<el-col :span="24" class="mb20">
 							<el-form-item label="商品状态" prop="status">
 								<el-radio-group v-model="form.status">
@@ -96,16 +101,11 @@
 						<!--								<el-input-number v-model="form.costPrice" placeholder="请输入成本单价，单位:分"></el-input-number>-->
 						<!--							</el-form-item>-->
 						<!--						</el-col>-->
-						<el-col :span="12" class="mb20">
-							<el-form-item label="库存" prop="stock">
-								<el-input-number v-model="form.stock" :min="0" :precision="0" />
-							</el-form-item>
-						</el-col>
-						<el-col :span="12" class="mb20">
+<!--						<el-col :span="12" class="mb20">
 							<el-form-item label="赠送积分" prop="giveIntegral">
 								<el-input-number v-model="form.giveIntegral" :min="0" :precision="0" />
 							</el-form-item>
-						</el-col>
+						</el-col>-->
 						<!--						<el-col :span="12" class="mb20">-->
 						<!--							<el-form-item label="规格" prop="specification">-->
 						<!--								<el-input v-model="form.specification" placeholder="请输入规格" />-->
@@ -171,11 +171,11 @@
 								<el-input type="textarea" v-model="form.introduction" rows="4" placeholder="请输入商品简介" maxlength="400" show-word-limit />
 							</el-form-item>
 						</el-col> -->
-						<el-col :span="24" class="mb20">
+<!--						<el-col :span="24" class="mb20">
 							<el-form-item label="商品详情" prop="description">
 								<editor v-if="visible" v-model:get-html="form.description" placeholder="请输入商品详情"></editor>
 							</el-form-item>
-						</el-col>
+						</el-col>-->
 						<el-col :span="12" class="mb20">
 							<el-form-item label="库存上限" prop="inventoryUpperLimit">
 								<el-input-number v-model="form.inventoryUpperLimit" :min="0" :precision="0" />
@@ -218,15 +218,15 @@
 </template>
 
 <script setup lang="ts">
-import { useDict } from "/@/hooks/dict"
-import { useMessage } from "/@/hooks/message"
-import { getObj, addObj, putObj, getSupermarketCategory, getSupermarketBrand } from "/@/api/supermarket/supermarketSpu"
-import { getSupplierTypeOptions } from "/@/api/supermarketerp/smErpSupplier"
-import { rule } from "/@/utils/validate"
+import { useDict } from "/src/hooks/dict"
+import { useMessage } from "/src/hooks/message"
+import { getObj, addObj, putObj, getSupermarketCategory, getSupermarketBrand } from "/src/api/supermarketerp/supermarketSpu"
+import { getSupplierTypeOptions } from "/src/api/supermarketerp/smErpSupplier"
+import { rule } from "/src/utils/validate"
 import supermarketAuxiliaryCode from "./components/supermarketAuxiliaryCode/index.vue"
 import supermarketUnit from "./components/supermarketUnit/index.vue"
 import { TabPaneName } from "element-plus"
-import { displayPrice, storePrice } from "/@/utils/formatMoney"
+import { displayPrice, storePrice } from "/src/utils/formatMoney"
 
 const emit = defineEmits(["refresh"])
 
@@ -283,7 +283,7 @@ const dataRules = {
 	productCode: [{ required: true, message: "货号不能为空", trigger: "blur" }],
 	barcode: [{ required: true, message: "自编码/条码不能为空", trigger: "blur" }],
 	productName: [{ required: true, message: "商品名称不能为空", trigger: "blur" }],
-	unit: [{ required: true, message: "单位不能为空", trigger: "blur" }],
+	stock: [{ required: true, message: "单位不能为空", trigger: "blur" }],
 	categoryId: [{ required: true, message: "商品分类不能为空", trigger: "blur" }],
 	brandId: [{ required: true, message: "品牌不能为空", trigger: "blur" }],
 	picUrl: [{ required: true, message: "商品封面图不能为空", trigger: "blur" }],

src/views/supermarketerp/supermarketSpu/index.vue

@@ -134,10 +134,10 @@
 </template>
 
 <script setup lang="ts" name="systemSupermarketSpu">
-import { BasicTableProps, useTable } from "/@/hooks/table"
-import { fetchList, delObjs, getSupermarketCategory, getSupermarketBrand } from "/@/api/supermarket/supermarketSpu"
-import { useMessage, useMessageBox } from "/@/hooks/message"
-import { useDict } from "/@/hooks/dict"
+import { BasicTableProps, useTable } from "/src/hooks/table"
+import { fetchList, delObjs, getSupermarketCategory, getSupermarketBrand } from "/src/api/supermarketerp/supermarketSpu"
+import { useMessage, useMessageBox } from "/src/hooks/message"
+import { useDict } from "/src/hooks/dict"
 const imageBaseUrl = import.meta.env.VITE_IMAGE_BASE_PATH
 
 // 引入组件

src/views/supermarketerp/supermarketUnit/form.vue

@@ -52,8 +52,8 @@
 </template>
 
 <script setup lang="ts" name="SupermarketAuxiliaryCodeDialog">
-import { useMessage } from '/@/hooks/message';
-import { getObj, addObj, putObj } from '/@/api/supermarket/supermarketUnit';
+import { useMessage } from '/src/hooks/message';
+import { getObj, addObj, putObj } from '/src/api/supermarketerp/supermarketUnit';
 const emit = defineEmits(['refresh']);
 
 // 定义变量内容

src/views/supermarketerp/supermarketUnit/index.vue

@@ -86,9 +86,9 @@
 </template>
 
 <script setup lang="ts" name="systemSupermarketAuxiliaryCode">
-import { BasicTableProps, useTable } from '/@/hooks/table';
-import { fetchList, delObjs } from '/@/api/supermarket/supermarketUnit';
-import { useMessage, useMessageBox } from '/@/hooks/message';
+import { BasicTableProps, useTable } from '/src/hooks/table';
+import { fetchList, delObjs } from '/src/api/supermarketerp/supermarketUnit';
+import { useMessage, useMessageBox } from '/src/hooks/message';
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import('./form.vue'));