Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud

src/api/admin/user.ts

@@ -115,10 +115,10 @@ export function validateUsername(rule: any, value: any, callback: any, isEdit: b
 	if (isEdit) {
 		return callback()
 	}
-	const flag = new RegExp(/^([a-z\d]+?)$/).test(value)
-	if (!flag) {
-		callback(new Error("用户名支持小写英文、数字"))
-	}
+	// const flag = new RegExp(/^([a-z\d]+?)$/).test(value)
+	// if (!flag) {
+	// 	callback(new Error("用户名支持小写英文、数字"))
+	// }
 	getDetails({ username: value }).then((response) => {
 		const result = response.data
 		if (result !== null) {

src/api/supermarketerp/smErpSupplier.ts

@@ -40,7 +40,7 @@ export function putObj(obj?: Object) {
 }
 
 // 获取货商下拉列表
-export function getSupplierSimpleAll(params: any): any {
+export function getSupplierSimpleAll(params?: any): any {
 	return request({
 		url: "/supermarket/smErpSupplier/selectSimpleAll",
 		method: "get",

src/components/Select/SelectHandlerUser.vue

@@ -1,5 +1,7 @@
 <template>
+	<span v-if="isDisplayName">{{ state.options.find((item: any) => item.id == selectId)?.nameWithMobile }}</span>
 	<el-select
+		v-else
 		style="width: 100%"
 		v-model="state.selectId"
 		:placeholder="props.placeholder"
@@ -32,9 +34,11 @@ const selectId = defineModel()
 
 export type Props = {
 	placeholder?: string
+	isDisplayName?: boolean
 }
 const props = withDefaults(defineProps<Props>(), {
 	placeholder: "请选择",
+	isDisplayName: false,
 })
 
 const queryForm = reactive<any>({})

src/components/Select/SelectSupplier.vue

@@ -1,5 +1,7 @@
 <template>
+	<span v-if="isDisplayName">{{ state.options.find((item: any) => item.supplierId == selectId)?.supplierName }}</span>
 	<el-select
+		v-else
 		style="width: 100%"
 		v-model="state.selectId"
 		:placeholder="props.placeholder"
@@ -32,9 +34,11 @@ const selectId = defineModel()
 
 export type Props = {
 	placeholder?: string
+	isDisplayName?: boolean
 }
 const props = withDefaults(defineProps<Props>(), {
 	placeholder: "请选择",
+	isDisplayName: false,
 })
 
 const queryForm = reactive<any>({})

src/components/processDrawer/types.ts

@@ -12,6 +12,7 @@ export interface TaskData {
 	taskId: string
 	processInstanceId: string
 	flowId: string
+	nodeId?: string
 }
 
 export interface TaskSubmitParam {

src/hooks/smProcessTableAction.ts

@@ -36,6 +36,7 @@ export function useSmProcessTableAction(
 		processFormState.showForm = false
 		processFormState.formId = undefined
 		processFormState.formDisabled = true
+		fetchList()
 	}
 	// 点击开始处理
 	const deal = (row: tableRow) => {

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

@@ -10,7 +10,7 @@
 				<el-row :gutter="20">
 					<el-col :span="12" class="mb20">
 						<el-form-item :label="$t('sysuser.username')" prop="username">
-							<el-input :disabled="dataForm.userId !== ''" placeholder="请输入用户名" v-model.trim="dataForm.username"></el-input>
+							<el-input :disabled="dataForm.userId !== ''" placeholder="请输入用户名" v-model.trim="dataForm.username" />
 						</el-form-item>
 					</el-col>
 					<el-col :span="12" class="mb20">
@@ -157,12 +157,12 @@ const dataRules = ref({
 		{ required: true, message: "用户名不能为空", trigger: "blur" },
 		{ min: 5, max: 60, message: "用户名称长度必须介于5-20个字符之间", trigger: "blur" },
 		{ pattern: /^[^\u4e00-\u9fa5]+$/, message: "用户名称不能包含中文", trigger: "blur" },
-		// {
-		// 	validator: (rule: any, value: any, callback: any) => {
-		// 		validateUsername(rule, value, callback, dataForm.userId !== "")
-		// 	},
-		// 	trigger: "blur",
-		// },
+		{
+			validator: (rule: any, value: any, callback: any) => {
+				validateUsername(rule, value, callback, dataForm.userId !== "")
+			},
+			trigger: "blur",
+		},
 	],
 	password: [
 		{ required: true, message: "密码不能为空", trigger: "blur" },

src/views/canteenDailyDishes/index.vue

@@ -226,7 +226,7 @@ const getDishByType = async () => {
 					// foodData.breakfast = r.dailyMenuVOS
 					break
 				case 2:
-					foodData.lunch = r.dailyMenuVOS.filter((v: any, index: number) => index < 15)
+					foodData.lunch = r.dailyMenuVOS.filter((v: any, index: number) => index < 11)
 					break
 				case 3:
 					// foodData.dinner = r.dailyMenuVOS

src/views/supermarketerp/components/linkCodeDialog.vue

@@ -51,9 +51,21 @@
 			<vxe-column type="checkbox" width="60" align="center"></vxe-column>
 			<vxe-column field="unit" title="包装单位" align="center" width="200"></vxe-column>
 			<vxe-column field="quantity" title="数量" align="center" width="100"></vxe-column>
-			<vxe-column field="purchasePrice" title="进价" align="center" width="100"></vxe-column>
-			<vxe-column field="unitPrice" title="单价" align="center" width="100"></vxe-column>
-			<vxe-column field="totalAmount" title="累计总金额" align="center" width="100"></vxe-column>
+			<vxe-column field="purchasePrice" title="进价" align="center" width="100">
+				<template #default="{ row }">
+					{{ displayPrice(row.purchasePrice) }}
+				</template>
+			</vxe-column>
+			<vxe-column field="unitPrice" title="单价" align="center" width="100">
+				<template #default="{ row }">
+					{{ displayPrice(row.unitPrice) }}
+				</template>
+			</vxe-column>
+			<vxe-column field="totalAmount" title="累计总金额" align="center" width="100">
+				<template #default="{ row }">
+					{{ displayPrice(row.totalAmount) }}
+				</template>
+			</vxe-column>
 			<vxe-column field="remark" title="备注" show-overflow align="center" min-width="100"></vxe-column>
 		</vxe-table>
 
@@ -71,6 +83,7 @@ import { ref } from "vue"
 import { VxeTableEvents } from "vxe-table"
 import { getSimpleUserAll } from "/@/api/admin/user"
 import { useDict } from "/@/hooks/dict"
+import { displayPrice } from "/@/utils/formatMoney"
 
 const { check_status } = useDict("check_status")
 const linkCodeDialogVisible = defineModel()

src/views/supermarketerp/purchaseManagement/smErpCgDd/index.vue

@@ -50,14 +50,29 @@
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
-						<el-button v-if="scope.row.checkStatus == '2'" icon="MessageBox" text type="success" @click="edit(scope.row)">详情</el-button>
+						<el-button
+							v-if="scope.row.checkStatus == '2' || scope.row.checkStatus == '3'"
+							icon="MessageBox"
+							text
+							type="success"
+							@click="edit(scope.row)"
+						>
+							详情
+						</el-button>
 						<el-button v-else icon="edit-pen" text type="primary" v-auth="'supermarket_smErpCgDd_edit'" @click="edit(scope.row)">
 							编辑
 						</el-button>
 						<el-button icon="delete" text type="primary" v-auth="'supermarket_smErpCgDd_del'" @click="handleDelete([scope.row.id])">
 							删除
 						</el-button>
-						<el-button type="primary" size="small" v-if="scope.row.checkStatus != '2'" link icon="VideoPlay" @click="deal(scope.row)">
+						<el-button
+							type="primary"
+							size="small"
+							v-if="scope.row.checkStatus != '2' && scope.row.taskId"
+							link
+							icon="VideoPlay"
+							@click="deal(scope.row)"
+						>
 							开始处理
 						</el-button>
 					</template>