Merge remote-tracking branch 'origin/master'
This commit is contained in:
zjf committed
commit
a9bc955fcf
10 files changed
+60
-352
No files matched your search
+4
-4
@@ -8,17 +8,17 @@ VITE_OPEN = true
|
||||
ENV = 'development'
|
||||
|
||||
# ADMIN 服务地址
|
||||
# VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 测试线上
|
||||
VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 测试线上
|
||||
# VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/
|
||||
# VITE_ADMIN_PROXY_PATH = http://localhost:9999/
|
||||
VITE_ADMIN_PROXY_PATH = http://192.168.101.125:9999/ # 邓-本地
|
||||
# VITE_ADMIN_PROXY_PATH = http://192.168.101.125:9999/ # 邓-本地
|
||||
# VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境线上
|
||||
|
||||
# 图片访问基础地址
|
||||
# VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api/ # 测试线上
|
||||
VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api/ # 测试线上
|
||||
# VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc
|
||||
# VITE_IMAGE_BASE_PATH = http://localhost:9999
|
||||
VITE_IMAGE_BASE_PATH = http://192.168.101.125:9999 # 邓-本地
|
||||
# VITE_IMAGE_BASE_PATH = http://192.168.101.125:9999 # 邓-本地
|
||||
# VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境线上
|
||||
|
||||
# 代码生成服务地址
|
||||
|
||||
@@ -1,5 +1,15 @@
|
||||
import request from "/@/utils/request"
|
||||
|
||||
/**
|
||||
* 同步用户食堂信息
|
||||
*/
|
||||
export const syncDeptMch = () => {
|
||||
return request({
|
||||
url: "/admin/user/sync-user-canteen",
|
||||
method: "post",
|
||||
})
|
||||
}
|
||||
|
||||
export const list = () => {
|
||||
return request({
|
||||
url: "/admin/user/list",
|
||||
|
||||
@@ -128,6 +128,7 @@
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="所属商户" prop="merchantName" show-overflow-tooltip min-width="150" />
|
||||
<el-table-column
|
||||
v-auths="['sys_user_edit', 'userFace_sysUserFace_view', 'sys_user_del']"
|
||||
label="操作"
|
||||
|
||||
@@ -112,9 +112,9 @@
|
||||
<el-tooltip effect="dark" content="保存并返回列表页面" placement="top">
|
||||
<el-button type="primary" plain @click="onSave">保存</el-button>
|
||||
</el-tooltip>
|
||||
<el-tooltip effect="dark" content="打印清单" placement="top">
|
||||
<!-- <el-tooltip effect="dark" content="打印清单" placement="top">
|
||||
<el-button type="success" plain @click="">打印</el-button>
|
||||
</el-tooltip>
|
||||
</el-tooltip> -->
|
||||
</el-row>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,112 +0,0 @@
|
||||
<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-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="receiveAmount">
|
||||
<el-input v-model="form.receiveAmount" placeholder="请输入收款金额" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-form>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts" name="CanteenInventoryRecordsDialog">
|
||||
import { useDict } from "/@/hooks/dict"
|
||||
import { useMessage } from "/@/hooks/message"
|
||||
const emit = defineEmits(["refresh"])
|
||||
|
||||
// 定义变量内容
|
||||
const dataFormRef = ref()
|
||||
const visible = ref(false)
|
||||
const loading = ref(false)
|
||||
// 定义字典
|
||||
const { canteen_inventory_type } = useDict("canteen_inventory_type")
|
||||
|
||||
// 提交表单数据
|
||||
const form = reactive({
|
||||
id: "",
|
||||
inventoryCode: "",
|
||||
inventoryDate: "",
|
||||
inventoryType: "",
|
||||
linkCode: "",
|
||||
handlerUserId: "",
|
||||
checkStatus: "",
|
||||
checkUserId: "",
|
||||
checkTime: "",
|
||||
merchantId: "",
|
||||
deptId: "",
|
||||
supplierId: "",
|
||||
remark: "",
|
||||
orderType: "",
|
||||
totalAmount: "",
|
||||
receiveAmount: "",
|
||||
processInstanceId: "",
|
||||
checkReason: "",
|
||||
})
|
||||
|
||||
// 定义校验规则
|
||||
const dataRules = ref({
|
||||
inventoryCode: [{ required: true, message: "单据编号(规则生成，出入库编号)不能为空", trigger: "blur" }],
|
||||
inventoryDate: [{ required: true, message: "单据日期不能为空", trigger: "blur" }],
|
||||
inventoryType: [{ required: true, message: "单据类型(字典inventory_type)采购入库不能为空", trigger: "blur" }],
|
||||
})
|
||||
|
||||
// 打开弹窗
|
||||
const openDialog = (id: string) => {
|
||||
visible.value = true
|
||||
form.id = ""
|
||||
|
||||
// 重置表单数据
|
||||
nextTick(() => {
|
||||
dataFormRef.value?.resetFields()
|
||||
})
|
||||
|
||||
// 获取canteenInventoryRecords信息
|
||||
if (id) {
|
||||
form.id = id
|
||||
getcanteenInventoryRecordsData(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 getcanteenInventoryRecordsData = (id: string) => {
|
||||
// 获取数据
|
||||
loading.value = true
|
||||
getObj(id)
|
||||
.then((res: any) => {
|
||||
Object.assign(form, res.data)
|
||||
})
|
||||
.finally(() => {
|
||||
loading.value = false
|
||||
})
|
||||
}
|
||||
|
||||
// 暴露变量
|
||||
defineExpose({
|
||||
openDialog,
|
||||
})
|
||||
</script>
|
||||
@@ -67,7 +67,9 @@
|
||||
<!-- <el-table-column prop="checkTime" 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 prop="checkReason" label="审核原因" show-overflow-tooltip /> -->
|
||||
<el-table-column label="操作" width="150">
|
||||
<template #default="scope">
|
||||
@@ -97,10 +99,9 @@
|
||||
import { BasicTableProps, useTable } from "/@/hooks/table"
|
||||
import { fetchList, delObjs } from "/@/api/canteen/canteenInventoryRecords"
|
||||
import { useMessage, useMessageBox } from "/@/hooks/message"
|
||||
import { useDict } from "/@/hooks/dict"
|
||||
import { displayPrice } from "/@/utils/formatMoney"
|
||||
|
||||
const CtForm = defineAsyncComponent(() => import("./form.vue"))
|
||||
const { canteen_inventory_type } = useDict("canteen_inventory_type")
|
||||
|
||||
const queryRef = ref()
|
||||
const showSearch = ref(true)
|
||||
|
||||
@@ -1,209 +0,0 @@
|
||||
<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="单据类型(字典inventory_type)" prop="inventoryType">
|
||||
<el-input v-model="form.inventoryType" placeholder="请输入单据类型(字典inventory_type)"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="12" class="mb20">
|
||||
<el-form-item label="原料id" prop="erpMaterialId">
|
||||
<el-input v-model="form.erpMaterialId" placeholder="请输入原料id"/>
|
||||
</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="unitPrice">
|
||||
<el-input v-model="form.unitPrice" 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="taxRate">
|
||||
<el-input v-model="form.taxRate" placeholder="请输入税率%"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="12" class="mb20">
|
||||
<el-form-item label="税前金额" prop="taxAmount">
|
||||
<el-input v-model="form.taxAmount" 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="订单类型(1入库 2出库)" prop="orderType">
|
||||
<el-input v-model="form.orderType" placeholder="请输入订单类型(1入库 2出库)"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="12" class="mb20">
|
||||
<el-form-item label="出入库关联id" prop="inventoryId">
|
||||
<el-input v-model="form.inventoryId" placeholder="请输入出入库关联id"/>
|
||||
</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="accountNumber">
|
||||
<el-input v-model="form.accountNumber" placeholder="请输入账面数量"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="12" class="mb20">
|
||||
<el-form-item label="实际数量" prop="realNumber">
|
||||
<el-input v-model="form.realNumber" placeholder="请输入实际数量"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="12" class="mb20">
|
||||
<el-form-item label="实际单价" prop="realPrice">
|
||||
<el-input v-model="form.realPrice" 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="CanteenInventoryRecordsItemDialog">
|
||||
import { useDict } from '/@/hooks/dict';
|
||||
import { useMessage } from "/@/hooks/message";
|
||||
import { getObj, addObj, putObj } from '/@/api/canteen/canteenInventoryRecordsItem'
|
||||
import { rule } from '/@/utils/validate';
|
||||
const emit = defineEmits(['refresh']);
|
||||
|
||||
// 定义变量内容
|
||||
const dataFormRef = ref();
|
||||
const visible = ref(false)
|
||||
const loading = ref(false)
|
||||
// 定义字典
|
||||
|
||||
// 提交表单数据
|
||||
const form = reactive({
|
||||
id:'',
|
||||
inventoryType: '',
|
||||
erpMaterialId: '',
|
||||
merchantId: '',
|
||||
deptId: '',
|
||||
quantity: '',
|
||||
unitPrice: '',
|
||||
totalAmount: '',
|
||||
taxRate: '',
|
||||
taxAmount: '',
|
||||
supplierId: '',
|
||||
remark: '',
|
||||
orderType: '',
|
||||
inventoryId: '',
|
||||
totalNumber: '',
|
||||
accountNumber: '',
|
||||
realNumber: '',
|
||||
realPrice: '',
|
||||
});
|
||||
|
||||
// 定义校验规则
|
||||
const dataRules = ref({
|
||||
})
|
||||
|
||||
// 打开弹窗
|
||||
const openDialog = (id: string) => {
|
||||
visible.value = true
|
||||
form.id = ''
|
||||
|
||||
// 重置表单数据
|
||||
nextTick(() => {
|
||||
dataFormRef.value?.resetFields();
|
||||
});
|
||||
|
||||
// 获取canteenInventoryRecordsItem信息
|
||||
if (id) {
|
||||
form.id = id
|
||||
getcanteenInventoryRecordsItemData(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 getcanteenInventoryRecordsItemData = (id: string) => {
|
||||
// 获取数据
|
||||
loading.value = true
|
||||
getObj(id).then((res: any) => {
|
||||
Object.assign(form, res.data)
|
||||
}).finally(() => {
|
||||
loading.value = false
|
||||
})
|
||||
};
|
||||
|
||||
// 暴露变量
|
||||
defineExpose({
|
||||
openDialog
|
||||
});
|
||||
</script>
|
||||
@@ -35,19 +35,19 @@
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col v-show="form.types == '2' && form.supType == '20'" :span="24" class="mb20">
|
||||
<el-col v-if="form.types == '2' && form.supType == '20'" :span="24" class="mb20">
|
||||
<el-form-item label="合作状态：" prop="cooperationStatus">
|
||||
<el-radio-group v-model="form.cooperationStatus">
|
||||
<el-radio border :label="item.value" v-for="(item, index) in yes_no_type" :key="index">{{ item.label }}</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col v-show="form.types == '2' && form.supType == '20'" :span="24" class="mb20">
|
||||
<el-col v-if="form.types == '2' && form.supType == '20'" :span="24" class="mb20">
|
||||
<el-form-item label="品牌：" prop="parentId">
|
||||
<select-mch v-model="form.parentId" :apiParams="{ types: '2', supType: '10' }" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col v-show="form.types == '2'" :span="24" class="mb20">
|
||||
<el-col v-if="form.types == '2'" :span="24" class="mb20">
|
||||
<el-form-item label="分类：" prop="catgoryId">
|
||||
<select-mch-catory v-model="form.catgoryId" :apiParams="{ bizType: form.types }" />
|
||||
</el-form-item>
|
||||
@@ -179,33 +179,17 @@ const jobTime = reactive<{
|
||||
const merchantTypeRadioDisabled = ref(false)
|
||||
|
||||
// 定义校验规则
|
||||
const dataRulesArr = {
|
||||
const dataRules = {
|
||||
name: [{ required: true, message: "商户名不能为空", trigger: "change" }],
|
||||
types: [{ required: true, message: "请选择商户类型", trigger: "change" }],
|
||||
logoPic: [{ required: true, message: "请上传商户logo", trigger: "change" }],
|
||||
swiperPic: [{ required: true, message: "请上传商户轮播图", trigger: "change" }],
|
||||
rangeDate: [{ required: true, message: "请选择营业时间", trigger: "change" }],
|
||||
deptId: [{ required: true, message: "请选择部门", trigger: "change" }],
|
||||
sort: [{ required: true, message: "请输入排序", trigger: "change" }],
|
||||
catgoryId: [{ required: true, message: "请选择分类", trigger: "change" }],
|
||||
supType: [{ required: true, message: "请选择合作商家类型", trigger: "change" }],
|
||||
cooperationStatus: [{ required: true, message: "请选择合作状态", trigger: "change" }],
|
||||
}
|
||||
const dataRules = computed(() => {
|
||||
if (form.types == "2" && form.supType == "20") {
|
||||
return {
|
||||
...dataRulesArr,
|
||||
supType: [{ required: true, message: "请选择合作商家类型", trigger: "change" }],
|
||||
cooperationStatus: [{ required: true, message: "请选择合作状态", trigger: "change" }],
|
||||
// parentId: [{ required: true, message: "请选择品牌", trigger: "change" }],
|
||||
}
|
||||
} else if (form.types == "2") {
|
||||
return {
|
||||
...dataRulesArr,
|
||||
supType: [{ required: true, message: "请选择合作商家类型", trigger: "change" }],
|
||||
}
|
||||
} else {
|
||||
return dataRulesArr
|
||||
}
|
||||
})
|
||||
|
||||
// 打开弹窗
|
||||
const openDialog = async (id: string) => {
|
||||
@@ -241,6 +225,7 @@ watch(
|
||||
const onSubmit = async () => {
|
||||
const valid = await dataFormRef.value.validate().catch(() => {})
|
||||
if (!valid) return false
|
||||
|
||||
const _pa = {
|
||||
...form,
|
||||
isSyncZy: form.isSyncZy ? "1" : "0",
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
<template>
|
||||
<div class="w-full">
|
||||
<div class="layout-padding-auto layout-padding-view">
|
||||
<div></div>
|
||||
<div class="flex items-center" v-auth="'wallet_setting_edit'">
|
||||
<el-button type="primary" @click="doSyncDeptCanteen" :disabled="syncDeptCanteenLoading">同步用户食堂信息</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<script setup lang="ts" name="userSetting">
|
||||
import { useMessage } from "/@/hooks/message"
|
||||
|
||||
import * as userApi from "/@/api/admin/user"
|
||||
|
||||
// 定义变量内容
|
||||
const syncDeptCanteenLoading = ref(false)
|
||||
|
||||
const doSyncDeptCanteen = async () => {
|
||||
syncDeptCanteenLoading.value = true
|
||||
try {
|
||||
userApi.syncDeptMch()
|
||||
} catch (err: any) {
|
||||
useMessage().error(err.msg)
|
||||
} finally {
|
||||
syncDeptCanteenLoading.value = false
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -15,6 +15,7 @@
|
||||
<Code v-if="activeName == 40" />
|
||||
<off-line v-if="activeName == 50" />
|
||||
<third-zy v-if="activeName == 60" />
|
||||
<user-setting v-if="activeName == 70" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -27,6 +28,7 @@ const Refund = defineAsyncComponent(() => import("./components/refund/index.vue"
|
||||
const OffLine = defineAsyncComponent(() => import("./components/off-line/index.vue"))
|
||||
const ExtraPrice = defineAsyncComponent(() => import("./components/extra-price/index.vue"))
|
||||
const ThirdZy = defineAsyncComponent(() => import("./components/third-zy/index.vue"))
|
||||
const UserSetting = defineAsyncComponent(() => import("./components/user/index.vue"))
|
||||
|
||||
const data = {
|
||||
tabList: [
|
||||
@@ -36,6 +38,7 @@ const data = {
|
||||
{ id: 40, label: "二维码配置" },
|
||||
{ id: 50, label: "离线配置" },
|
||||
{ id: 60, label: "正元同步配置" },
|
||||
{ id: 70, label: "用户同步配置" },
|
||||
],
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user