Merge remote-tracking branch 'origin/master'

src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue

@@ -231,7 +231,7 @@ const dataRules = ref({
 })
 const validRules = ref<VxeTablePropTypes.EditRules<any>>({
 	unitId: [{ required: true, message: "必须选择" }],
-	quantity: [{ required: true, type: "number", min: 1, message: "必需大于等于0" }],
+	quantity: [{ required: true, type: "number", message: "必须填写" }],
 })
 
 // 合计总金额

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

@@ -102,8 +102,7 @@ import { BasicTableProps, useTable } from "/@/hooks/table"
 import { fetchList, delObjs } from "/@/api/supermarketerp/smErpInventoryRecords"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { displayPrice } from "/@/utils/formatMoney"
-
-const SmForm = defineAsyncComponent(() => import("./form.vue"))
+import SmForm from "./form.vue"
 
 const queryRef = ref()
 const showSearch = ref(true)

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

@@ -261,7 +261,7 @@ const dataRules = ref({
 // 可编辑表格校验规则
 const validRules = ref<VxeTablePropTypes.EditRules<any>>({
 	unitId: [{ required: true, message: "必须选择" }],
-	quantity: [{ required: true, type: "number", min: 1, message: "必需大于等于0" }],
+	quantity: [{ required: true, type: "number", message: "必须填写" }],
 })
 
 // 初始化数据

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

@@ -1,11 +1,11 @@
 <template>
-	<div>暂无数据</div>
-
-	<div v-if="false" class="layout-padding">
+	<div class="layout-padding">
 		<div v-if="!processFormState.showForm" class="layout-padding-auto layout-padding-view">
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<el-button icon="folder-add" type="primary" class="ml10" @click="create" v-auth="'supermarket_smErpCgDd_add'">新 增</el-button>
+					<el-button disabled icon="folder-add" type="primary" class="ml10" @click="create" v-auth="'supermarket_smErpCgDd_add'">
+						新 增
+					</el-button>
 					<el-button
 						plain
 						:disabled="multiple"
@@ -101,8 +101,7 @@ import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 import ProcessDrawer from "/@/components/processDrawer/index.vue"
 import { getSupplierSimpleAll } from "/@/api/supermarketerp/smErpSupplier"
-
-const SmForm = defineAsyncComponent(() => import("./form.vue"))
+import SmForm from "./form.vue"
 
 const { check_status } = useDict("check_status")
 const showSearch = ref(true)

src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue

@@ -259,7 +259,7 @@ const dataRules = ref({
 })
 const validRules = ref<VxeTablePropTypes.EditRules<any>>({
 	selectedUnitObj: [{ required: true, message: "必须选择" }],
-	quantity: [{ required: true, type: "number", min: 1, message: "必需大于等于0" }],
+	quantity: [{ required: true, type: "number", message: "必须填写" }],
 })
 
 // 合计总金额

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

@@ -105,8 +105,7 @@ import { BasicTableProps, useTable } from "/@/hooks/table"
 import { fetchList, delObjs } from "/@/api/supermarketerp/smErpInventoryRecords"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { displayPrice } from "/@/utils/formatMoney"
-
-const SmForm = defineAsyncComponent(() => import("./form.vue"))
+import SmForm from "./form.vue"
 
 const queryRef = ref()
 const showSearch = ref(true)

src/views/supermarketerp/purchaseManagement/smErpCgPlan/form.vue

@@ -205,7 +205,7 @@ const dataRules = ref({
 // 可编辑表格校验规则
 const validRules = ref<VxeTablePropTypes.EditRules<any>>({
 	unitId: [{ required: true, message: "必须选择" }],
-	quantity: [{ required: true, type: "number", min: 0, message: "必需大于等于0" }],
+	quantity: [{ required: true, type: "number", message: "必须填写" }],
 })
 
 // 初始化数据

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

@@ -1,7 +1,5 @@
 <template>
-	<div>暂无数据</div>
-
-	<div v-if="false" class="layout-padding">
+	<div class="layout-padding">
 		<div v-if="!processFormState.showForm" class="layout-padding-auto layout-padding-view">
 			<el-row v-show="showSearch">
 				<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
@@ -11,14 +9,9 @@
 					<el-form-item label="单据日期" prop="planDate">
 						<el-date-picker v-model="state.queryForm.planDate" type="date" placeholder="请输入单据日期" value-format="YYYY-MM-DD" />
 					</el-form-item>
-					<el-form-item label="经办人" prop="handlerUserId">
+					<!-- <el-form-item label="经办人" prop="handlerUserId">
 						<SelectHandlerUser v-model.trim="state.queryForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
-					</el-form-item>
-					<el-form-item label="审批状态" prop="checkStatus">
-						<el-select v-model="state.queryForm.checkStatus" placeholder="请选择审批状态">
-							<el-option v-for="(item, index) in check_status" :key="index" :label="item.label" :value="item.value" />
-						</el-select>
-					</el-form-item>
+					</el-form-item> -->
 					<el-form-item>
 						<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
 						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -27,7 +20,7 @@
 			</el-row>
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<el-button icon="folder-add" type="primary" class="ml10" @click="create" v-auth="'supermarket_smErpCgPlan_add'">
+					<el-button disabled icon="folder-add" type="primary" class="ml10" @click="create" v-auth="'supermarket_smErpCgPlan_add'">
 						新 增
 					</el-button>
 					<el-button
@@ -66,39 +59,15 @@
 				<el-table-column prop="planDate" label="单据日期" show-overflow-tooltip />
 				<el-table-column prop="productName" label="商品信息" show-overflow-tooltip />
 				<el-table-column prop="handlerUserName" label="经办人" show-overflow-tooltip />
-				<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>
-					<template #default="{ row }">
-						<dict-tag :options="check_status" :value="row.checkStatus" />
-					</template>
-				</el-table-column>
 				<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' || 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_smErpCgPlan_edit'" @click="edit(scope.row)">
+						<el-button icon="edit-pen" text type="primary" v-auth="'supermarket_smErpCgPlan_edit'" @click="edit(scope.row)">
 							编辑
 						</el-button>
 						<el-button icon="delete" text type="primary" v-auth="'supermarket_smErpCgPlan_del'" @click="handleDelete([scope.row.id])">
 							删除
 						</el-button>
-						<el-button
-							type="primary"
-							size="small"
-							v-if="scope.row.checkStatus == '1' && scope.row.taskId"
-							link
-							icon="VideoPlay"
-							@click="deal(scope.row)"
-						>
-							开始处理
-						</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -106,9 +75,6 @@
 		</div>
 
 		<sm-form v-else :formId="processFormState.formId" :disabled="processFormState.formDisabled" @close="formClose" />
-
-		<!-- 审批抽屉 -->
-		<process-drawer ref="processDrawerRef" @task-submit-event="taskSubmitEvent" />
 	</div>
 </template>
 
@@ -116,12 +82,8 @@
 import { BasicTableProps, useTable } from "/@/hooks/table"
 import { fetchList, delObjs } from "/@/api/supermarketerp/smErpCgPlan"
 import { useMessage, useMessageBox } from "/@/hooks/message"
-import { useDict } from "/@/hooks/dict"
-import ProcessDrawer from "/@/components/processDrawer/index.vue"
+import SmForm from "./form.vue"
 
-const SmForm = defineAsyncComponent(() => import("./form.vue"))
-
-const { check_status } = useDict("check_status")
 // 搜索变量
 const queryRef = ref()
 const showSearch = ref(true)
@@ -133,7 +95,6 @@ const processFormState = reactive<{ formId: string | undefined; formDisabled: bo
 	formDisabled: true,
 	showForm: false,
 })
-const processDrawerRef = ref<InstanceType<typeof ProcessDrawer> | null>(null)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
@@ -167,16 +128,6 @@ const formClose = () => {
 	getDataList()
 }
 
-// 点击开始处理
-const deal = (row: tableRow) => {
-	if (!row.processInstanceId) return useMessage().warning("流程id不存在")
-	processDrawerRef.value && processDrawerRef.value.openProcessDrawer(row)
-}
-// 审批提交事件
-const taskSubmitEvent = () => {
-	getDataList()
-}
-
 // 删除操作
 const handleDelete = async (ids: string[]) => {
 	try {

src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue

@@ -293,7 +293,7 @@ const dataRules = ref({
 // 可编辑表格校验规则
 const validRules = ref<VxeTablePropTypes.EditRules<any>>({
 	unitId: [{ required: true, message: "必须选择" }],
-	quantity: [{ required: true, type: "number", min: 1, message: "必需大于等于0" }],
+	quantity: [{ required: true, type: "number", message: "必须填写" }],
 })
 
 // 收款金额表单校验规则

src/views/supermarketerp/retailManagement/smErpRetailBack/index.vue

@@ -1,8 +1,6 @@
 <template>
-	<div>暂无数据</div>
-
-	<div v-if="false" class="layout-padding">
-		<div v-if="!processFormState.showForm" class="layout-padding-auto layout-padding-view">
+	<div class="layout-padding">
+		<div v-if="!showForm" class="layout-padding-auto layout-padding-view">
 			<el-row v-show="showSearch">
 				<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
 					<el-form-item label="单据编号" prop="inventoryCode">
@@ -17,14 +15,14 @@
 							value-format="YYYY-MM-DD"
 						/>
 					</el-form-item>
-					<el-form-item label="经办人" prop="handlerUserId">
+					<!-- <el-form-item label="经办人" prop="handlerUserId">
 						<SelectHandlerUser v-model.trim="state.queryForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
 					</el-form-item>
 					<el-form-item label="审批状态" prop="checkStatus">
 						<el-select v-model="state.queryForm.checkStatus" placeholder="请选择审批状态">
 							<el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" />
 						</el-select>
-					</el-form-item>
+					</el-form-item> -->
 					<el-form-item>
 						<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
 						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -33,7 +31,7 @@
 			</el-row>
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<el-button icon="folder-add" type="primary" class="ml10" @click="create()" v-auth="'supermarket_smErpInventoryRecords_add'">
+					<el-button icon="folder-add" type="primary" class="ml10" @click="create" v-auth="'supermarket_smErpInventoryRecords_add'">
 						新 增
 					</el-button>
 					<el-button
@@ -71,34 +69,17 @@
 				<el-table-column prop="inventoryCode" label="单据编号" show-overflow-tooltip />
 				<el-table-column prop="inventoryDate" label="单据日期" show-overflow-tooltip />
 				<el-table-column prop="inventoryDate" label="入库商品" show-overflow-tooltip />
-				<el-table-column prop="handlerUserName" label="经办人" show-overflow-tooltip />
-				<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>
-					<template #default="scope">
-						<dict-tag :options="check_status" :value="scope.row.checkStatus"></dict-tag>
-					</template>
-				</el-table-column>
+				<!-- <el-table-column prop="handlerUserName" label="经办人" show-overflow-tooltip /> -->
 				<el-table-column prop="supplierId" label="货商" show-overflow-tooltip />
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
-				<el-table-column prop="totalAmount" label="入库总金额" show-overflow-tooltip />
+				<el-table-column prop="totalAmount" label="退货总金额" show-overflow-tooltip>
+					<template #default="{ row }">
+						{{ displayPrice(row.totalAmount) }}
+					</template>
+				</el-table-column>
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
-						<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_smErpInventoryRecords_edit'"
-							@click="edit(scope.row)"
-						>
+						<el-button icon="edit-pen" text type="primary" v-auth="'supermarket_smErpInventoryRecords_edit'" @click="edit(scope.row)">
 							编辑
 						</el-button>
 						<el-button
@@ -110,23 +91,13 @@
 						>
 							删除
 						</el-button>
-						<el-button
-							type="primary"
-							size="small"
-							v-if="scope.row.checkStatus == '1' && scope.row.taskId"
-							link
-							icon="VideoPlay"
-							@click="deal(scope.row)"
-						>
-							开始处理
-						</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
 			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 		</div>
 
-		<sm-form v-else :formId="processFormState.formId" :disabled="processFormState.formDisabled" @close="formClose" />
+		<sm-form v-else :formId="formId" :disabled="formDisabled" @close="formClose" />
 	</div>
 </template>
 
@@ -134,33 +105,62 @@
 import { BasicTableProps, useTable } from "/@/hooks/table"
 import { fetchList, delObjs } from "/@/api/supermarketerp/smErpInventoryRecords"
 import { useMessage, useMessageBox } from "/@/hooks/message"
-import { useDict } from "/@/hooks/dict"
-import ProcessDrawer from "/@/components/processDrawer/index.vue"
+import { displayPrice } from "/@/utils/formatMoney"
+import SmForm from "./form.vue"
 
-const SmForm = defineAsyncComponent(() => import("./form.vue"))
-
-const { check_status } = useDict("check_status")
-// 搜索变量
 const queryRef = ref()
 const showSearch = ref(true)
-// 多选变量
 const selectObjs = ref([]) as any
 const multiple = ref(true)
-const processFormState = reactive<{ formId: string | undefined; formDisabled: boolean; showForm: boolean }>({
-	formId: undefined,
-	formDisabled: true,
-	showForm: false,
-})
-const processDrawerRef = ref<InstanceType<typeof ProcessDrawer> | null>(null)
-
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {
-		inventoryType: "6",
+		inventoryType: "3",
 	},
 	pageList: fetchList,
 })
+const showForm = ref(false)
+const formDisabled = ref(false)
+const formId = ref("")
+
+// 新增
+const create = () => {
+	formDisabled.value = false
+	formId.value = ""
+	showForm.value = true
+}
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+	try {
+		await useMessageBox().confirm("此操作将永久删除")
+	} catch {
+		return
+	}
+
+	try {
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
+
+// 编辑
+const edit = (row: any) => {
+	if (!row.id) return useMessage().warning("清单id不存在")
+	formId.value = row.id
+	showForm.value = true
+}
+
+// 表单关闭
+const formClose = () => {
+	showForm.value = false
+	formId.value = ""
+	formDisabled.value = false
+	getDataList()
+}
 
-//  table hook
 const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
@@ -182,26 +182,4 @@ const selectionChangHandle = (objs: { id: string }[]) => {
 	selectObjs.value = objs.map(({ id }) => id)
 	multiple.value = !objs.length
 }
-
-const formClose = () => {
-	close()
-	getDataList()
-}
-
-// 删除操作
-const handleDelete = async (ids: string[]) => {
-	try {
-		await useMessageBox().confirm("此操作将永久删除")
-	} catch {
-		return
-	}
-
-	try {
-		await delObjs(ids)
-		getDataList()
-		useMessage().success("删除成功")
-	} catch (err: any) {
-		useMessage().error(err.msg)
-	}
-}
 </script>

src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue

@@ -229,7 +229,7 @@ const dataRules = ref({
 })
 const validRules = ref<VxeTablePropTypes.EditRules<any>>({
 	unitId: [{ required: true, message: "必须选择" }],
-	quantity: [{ required: true, type: "number", min: 1, message: "必需大于等于0" }],
+	quantity: [{ required: true, type: "number", message: "必须填写" }],
 })
 
 onMounted(() => {

src/views/supermarketerp/retailManagement/smErpRetailDelivery/index.vue

@@ -102,8 +102,7 @@ import { BasicTableProps, useTable } from "/@/hooks/table"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { fetchList, delObjs } from "/@/api/supermarketerp/smErpInventoryRecords"
 import { displayPrice } from "/@/utils/formatMoney"
-
-const SmForm = defineAsyncComponent(() => import("./form.vue"))
+import SmForm from "./form.vue"
 
 const queryRef = ref()
 const showSearch = ref(true)

src/views/supermarketerp/stockTaking/index.vue

@@ -73,8 +73,7 @@
 import { BasicTableProps, useTable } from "/@/hooks/table"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { fetchList, delObjs } from "/@/api/supermarketerp/smErpInventoryRecords"
-
-const SmForm = defineAsyncComponent(() => import("./form.vue"))
+import SmForm from "./form.vue"
 
 const queryRef = ref()
 const showSearch = ref(true)