From e0c58a500b00c5b116f1b9bc82b6a21abc3c8770 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Tue, 18 Feb 2025 14:01:18 +0800
Subject: [PATCH 1/2] 1

---
 src/api/supermarket/smErpCgDd.ts          |  41 +++++
 src/views/supermarket/smErpCgDd/form.vue  | 200 ++++++++++++++++++++++
 src/views/supermarket/smErpCgDd/index.vue | 132 ++++++++++++++
 3 files changed, 373 insertions(+)
 create mode 100644 src/api/supermarket/smErpCgDd.ts
 create mode 100644 src/views/supermarket/smErpCgDd/form.vue
 create mode 100644 src/views/supermarket/smErpCgDd/index.vue

diff --git a/src/api/supermarket/smErpCgDd.ts b/src/api/supermarket/smErpCgDd.ts
new file mode 100644
index 0000000..59f40a9
--- /dev/null
+++ b/src/api/supermarket/smErpCgDd.ts
@@ -0,0 +1,41 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+  return request({
+    url: '/supermarket/smErpCgDd/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function addObj(obj?: Object) {
+  return request({
+    url: '/supermarket/smErpCgDd',
+    method: 'post',
+    data: obj
+  })
+}
+
+export function getObj(id?: string) {
+  return request({
+    url: '/supermarket/smErpCgDd/' + id,
+    method: 'get'
+  })
+}
+
+export function delObjs(ids?: Object) {
+  return request({
+    url: '/supermarket/smErpCgDd',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function putObj(obj?: Object) {
+  return request({
+    url: '/supermarket/smErpCgDd',
+    method: 'put',
+    data: obj
+  })
+}
+
diff --git a/src/views/supermarket/smErpCgDd/form.vue b/src/views/supermarket/smErpCgDd/form.vue
new file mode 100644
index 0000000..3d3442a
--- /dev/null
+++ b/src/views/supermarket/smErpCgDd/form.vue
@@ -0,0 +1,200 @@
+<template>
+    <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible"
+      :close-on-click-modal="false" draggable>
+      <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+       <el-row :gutter="24">
+    <el-col :span="12" class="mb20">
+      <el-form-item label="编号" prop="code">
+        <el-input v-model="form.code" placeholder="请输入编号"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="单据日期" prop="dDate">
+      <el-date-picker type="date" placeholder="请选择单据日期" v-model="form.dDate" :value-format="dateStr"></el-date-picker>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="仓库id" prop="warehouseId">
+        <el-input v-model="form.warehouseId" placeholder="请输入仓库id"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="经办人id" prop="handlerUserId">
+          <el-select v-model="form.handlerUserId" placeholder="请选择经办人id">
+            <el-option label="请选择">0</el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="审批状态" prop="checkStatus">
+        <el-input v-model="form.checkStatus" placeholder="请输入审批状态"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="审批人id" prop="checkUserId">
+          <el-select v-model="form.checkUserId" placeholder="请选择审批人id">
+            <el-option label="请选择">0</el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="审核日期" prop="checkTime">
+        <el-input v-model="form.checkTime" placeholder="请输入审核日期"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="商户编号" prop="merchantId">
+        <el-input v-model="form.merchantId" placeholder="请输入商户编号"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="部门id" prop="deptId">
+        <el-input v-model="form.deptId" placeholder="请输入部门id"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="出入库数量" prop="quantity">
+        <el-input v-model="form.quantity" placeholder="请输入出入库数量"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="累计进货数量" prop="totalNumber">
+        <el-input v-model="form.totalNumber" placeholder="请输入累计进货数量"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="累计总金额" prop="totalAmount">
+        <el-input v-model="form.totalAmount" placeholder="请输入累计总金额"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="货商" prop="supplierId">
+        <el-input v-model="form.supplierId" placeholder="请输入货商"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="form.remark" placeholder="请输入备注"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="订单编号" prop="orderNumber">
+        <el-input v-model="form.orderNumber" placeholder="请输入订单编号"/>
+      </el-form-item>
+      </el-col>
+
+			</el-row>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="visible = false">取消</el-button>
+          <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+        </span>
+      </template>
+    </el-dialog>
+</template>
+
+<script setup lang="ts" name="SmErpCgDdDialog">
+import { useDict } from '/@/hooks/dict';
+import { useMessage } from "/@/hooks/message";
+import { getObj, addObj, putObj } from '/@/api/supermarket/smErpCgDd'
+import { rule } from '/@/utils/validate';
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+const { check_status } = useDict('check_status')
+
+// 提交表单数据
+const form = reactive({
+		id:'',
+	  code: '',
+	  dDate: '',
+	  warehouseId: '',
+	  handlerUserId: '',
+	  checkStatus: '',
+	  checkUserId: '',
+	  checkTime: '',
+	  merchantId: '',
+	  deptId: '',
+	  quantity: '',
+	  totalNumber: '',
+	  totalAmount: '',
+	  supplierId: '',
+	  remark: '',
+	  orderNumber: '',
+});
+
+// 定义校验规则
+const dataRules = ref({
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+
+  // 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields();
+	});
+
+  // 获取smErpCgDd信息
+  if (id) {
+    form.id = id
+    getsmErpCgDdData(id)
+  }
+};
+
+// 提交
+const onSubmit = async () => {
+	const valid = await dataFormRef.value.validate().catch(() => {});
+	if (!valid) return false;
+
+	try {
+    loading.value = true;
+		form.id ? await putObj(form) : await addObj(form);
+		useMessage().success(form.id ? '修改成功' : '添加成功');
+		visible.value = false;
+		emit('refresh');
+	} catch (err: any) {
+		useMessage().error(err.msg);
+	} finally {
+    loading.value = false;
+  }
+};
+
+
+// 初始化表单数据
+const getsmErpCgDdData = (id: string) => {
+  // 获取数据
+  loading.value = true
+  getObj(id).then((res: any) => {
+    Object.assign(form, res.data)
+  }).finally(() => {
+    loading.value = false
+  })
+};
+
+// 暴露变量
+defineExpose({
+  openDialog
+});
+</script>
\ No newline at end of file
diff --git a/src/views/supermarket/smErpCgDd/index.vue b/src/views/supermarket/smErpCgDd/index.vue
new file mode 100644
index 0000000..15469a4
--- /dev/null
+++ b/src/views/supermarket/smErpCgDd/index.vue
@@ -0,0 +1,132 @@
+<template>
+  <div class="layout-padding">
+    <div 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="formDialogRef.openDialog()"
+            v-auth="'supermarket_smErpCgDd_add'">
+            新 增
+          </el-button>
+          <el-button plain :disabled="multiple" icon="Delete" type="primary"
+            v-auth="'supermarket_smErpCgDd_del'" @click="handleDelete(selectObjs)">
+            删除
+          </el-button>
+          <right-toolbar v-model:showSearch="showSearch" :export="'supermarket_smErpCgDd_export'"
+                @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
+            @queryTable="getDataList"></right-toolbar>
+        </div>
+      </el-row>
+      <el-table :data="state.dataList" v-loading="state.loading" border 
+        :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
+				@selection-change="selectionChangHandle"
+        @sort-change="sortChangeHandle">
+        <el-table-column type="selection" width="40" align="center" />
+        <el-table-column type="index" label="#" width="40" />
+          <el-table-column prop="code" label="编号"  show-overflow-tooltip/>
+          <el-table-column prop="dDate" label="单据日期"  show-overflow-tooltip/>
+          <el-table-column prop="warehouseId" label="仓库id"  show-overflow-tooltip/>
+          <el-table-column prop="handlerUserId" label="经办人id"  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="checkUserId" label="审批人id"  show-overflow-tooltip/>
+          <el-table-column prop="checkTime" label="审核日期"  show-overflow-tooltip/>
+          <el-table-column prop="merchantId" label="商户编号"  show-overflow-tooltip/>
+          <el-table-column prop="deptId" label="部门id"  show-overflow-tooltip/>
+          <el-table-column prop="quantity" label="出入库数量"  show-overflow-tooltip/>
+          <el-table-column prop="totalNumber" label="累计进货数量"  show-overflow-tooltip/>
+          <el-table-column prop="totalAmount" 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="orderNumber" label="订单编号"  show-overflow-tooltip/>
+        <el-table-column label="操作" width="150">
+          <template #default="scope">
+            <el-button icon="edit-pen" text type="primary" v-auth="'supermarket_smErpCgDd_edit'"
+              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
+            <el-button icon="delete" text type="primary" v-auth="'supermarket_smErpCgDd_del'" @click="handleDelete([scope.row.id])">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+    </div>
+
+    <!-- 编辑、新增  -->
+    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+
+  </div>
+</template>
+
+<script setup lang="ts" name="systemSmErpCgDd">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import { fetchList, delObjs } from "/@/api/supermarket/smErpCgDd";
+import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useDict } from '/@/hooks/dict';
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+// 定义查询字典
+
+const { check_status } = useDict('check_status')
+// 定义变量内容
+const formDialogRef = ref()
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+  queryForm: {},
+  pageList: fetchList
+})
+
+//  table hook
+const {
+  getDataList,
+  currentChangeHandle,
+  sizeChangeHandle,
+  sortChangeHandle,
+  downBlobFile,
+	tableStyle
+} = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+  // 清空搜索条件
+  queryRef.value?.resetFields()
+  // 清空多选
+  selectObjs.value = []
+  getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+  downBlobFile('/supermarket/smErpCgDd/export', Object.assign(state.queryForm, { ids: selectObjs }), 'smErpCgDd.xlsx')
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+  selectObjs.value = objs.map(({ id }) => id);
+  multiple.value = !objs.length;
+};
+
+// 删除操作
+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>
\ No newline at end of file

From 4b3b88d20ecc6fbd0448a864c7d88a512762175a Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 18 Feb 2025 14:04:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hard/hard-order/index.vue | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/views/hard/hard-order/index.vue b/src/views/hard/hard-order/index.vue
index 680191b..ce38ec0 100644
--- a/src/views/hard/hard-order/index.vue
+++ b/src/views/hard/hard-order/index.vue
@@ -34,13 +34,23 @@
 					</el-form-item>
 				</el-row>
 			</el-form>
-			<el-tabs v-if="tabList && tabList.length" v-model="activeName" @tab-click="handleClick">
-				<div v-for="v in tabList" :key="v.value">
-					<el-tab-pane :label="v.label" :name="v.value">
-						<div></div>
-					</el-tab-pane>
-				</div>
-			</el-tabs>
+			<div class="flex justify-between items-center">
+				<el-tabs class="flex-1" v-if="tabList && tabList.length" v-model="activeName" @tab-click="handleClick">
+					<div v-for="v in tabList" :key="v.value">
+						<el-tab-pane :label="v.label" :name="v.value">
+							<div></div>
+						</el-tab-pane>
+					</div>
+				</el-tabs>
+				<right-toolbar
+					v-model:showSearch="showSearch"
+					:export="'sys_audit_export'"
+					@exportExcel="exportExcel"
+					class="ml10"
+					style="float: right; margin-right: 20px"
+					@queryTable="getDataList"
+				/>
+			</div>
 			<el-table
 				:data="state.dataList"
 				v-loading="state.loading"