zianxin/pj_admin_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zjf committed 2025-02-27 15:17:12 +08:00
2 parents 1689eae8aa 1dd21a5061
commit 1793e3a92d
15 files changed
+349 -388
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/views/canteen/canteenSpu/form.vue
+6 -19
View File
@@ -2,11 +2,11 @@
<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="14" class="mb20">-->
<!-- <el-form-item label="商户" prop="merchantId">-->
<!-- <select-mch v-model="form.merchantId" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="14" class="mb20">-->
<!-- <el-form-item label="商户" prop="merchantId">-->
<!-- <select-mch v-model="form.merchantId" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="14" class="mb20">
<el-form-item label="商品名称" prop="name">
<el-input v-model.trim="form.name" placeholder="请输入商品名称" />
@@ -22,17 +22,6 @@
<upload-img v-model:imageUrl="form.picUrl" />
</el-form-item>
</el-col>
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="商品简介" prop="introduction">-->
<!-- <el-input type="textarea" v-model="form.introduction" placeholder="请输入商品简介" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="24" class="mb20">-->
<!-- <el-form-item label="商品轮播图" prop="sliderPicUrls">-->
<!-- <upload-imgs v-model:imageUrls="form.sliderPicUrls"></upload-imgs>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="14" class="mb20">
<el-form-item label="排序" prop="sort">
@@ -43,9 +32,7 @@
<el-col :span="14" class="mb20">
<el-form-item label="商品状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio :label="item.value" v-for="(item, index) in spu_status" border :key="index">{{
item.label
}}</el-radio>
<el-radio :label="item.value" v-for="(item, index) in spu_status" border :key="index">{{ item.label }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
src/views/canteen/merchantInfo/form.vue
+58 -58
View File
@@ -30,7 +30,7 @@
<el-col :span="24" class="mb20">
<el-form-item label="轮播图" prop="swiper">
<upload-imgs v-model:imageUrl="form.swiper" />
<upload-imgs v-model="form.swiper" />
</el-form-item>
</el-col>
@@ -72,105 +72,105 @@
</template>
<script setup lang="ts" name="MerchantInfoDialog">
import { useDict } from '/@/hooks/dict';
import { useMessage } from '/@/hooks/message';
import { getObj, addObj, putObj } from '/@/api/canteen/merchantInfo';
import { rule } from '/@/utils/validate';
import { deptTree } from '/@/api/admin/dept';
const emit = defineEmits(['refresh']);
import { useDict } from "/@/hooks/dict"
import { useMessage } from "/@/hooks/message"
import { getObj, addObj, putObj } from "/@/api/canteen/merchantInfo"
import { rule } from "/@/utils/validate"
import { deptTree } from "/@/api/admin/dept"
const emit = defineEmits(["refresh"])
// 定义变量内容
const dataFormRef = ref();
const visible = ref(false);
const loading = ref(false);
const dataFormRef = ref()
const visible = ref(false)
const loading = ref(false)
//定义业务变量内容
// 定义字典
const { merchant_type } = useDict('merchant_type');
const { merchant_type } = useDict("merchant_type")
// 提交表单数据
const form = reactive({
id: '',
merchantId: '',
deptId: '',
name: '',
merchantType: '',
logo: '',
collectMoneyCode: '',
swiper: '',
phone: '',
businessTime: '',
address: '',
jobStartTime: '',
id: "",
merchantId: "",
deptId: "",
name: "",
merchantType: "",
logo: "",
collectMoneyCode: "",
swiper: "",
phone: "",
businessTime: "",
address: "",
jobStartTime: "",
rangeDate: [],
jobEndTime: [],
});
})
// 定义校验规则
const dataRules = ref({
merchantId: [{ required: true, message: '商户不能为空', trigger: 'blur' }],
name: [{ required: true, message: '商户名不能为空', trigger: 'blur' }],
type: [{ required: true, message: '请选择商户类型', trigger: 'change' }],
logo: [{ required: true, message: '请上传商户logo', trigger: 'change' }],
swiper: [{ required: true, message: '请上传商户轮播图', trigger: 'change' }],
rangeDate: [{ required: true, message: '请选择营业时间', trigger: 'change' }],
deptId: [{ required: true, message: '请选择部门', trigger: 'change' }],
});
merchantId: [{ required: true, message: "商户不能为空", trigger: "blur" }],
name: [{ required: true, message: "商户名不能为空", trigger: "blur" }],
type: [{ required: true, message: "请选择商户类型", trigger: "change" }],
logo: [{ required: true, message: "请上传商户logo", trigger: "change" }],
swiper: [{ required: true, message: "请上传商户轮播图", trigger: "change" }],
rangeDate: [{ required: true, message: "请选择营业时间", trigger: "change" }],
deptId: [{ required: true, message: "请选择部门", trigger: "change" }],
})
// 打开弹窗
const openDialog = (id: string) => {
visible.value = true;
form.id = '';
visible.value = true
form.id = ""
// 重置表单数据
nextTick(() => {
dataFormRef.value?.resetFields();
});
dataFormRef.value?.resetFields()
})
// 获取merchantInfo信息
if (id) {
form.id = id;
getmerchantInfoData(id);
form.id = id
getmerchantInfoData(id)
}
};
}
// 提交
const onSubmit = async () => {
const valid = await dataFormRef.value.validate().catch(() => {});
if (!valid) return false;
const _pa = { ...form };
const valid = await dataFormRef.value.validate().catch(() => {})
if (!valid) return false
const _pa = { ...form }
if (_pa.rangeDate && _pa.rangeDate.length) {
_pa.jobStartTime = _pa.rangeDate[0];
_pa.jobEndTime = _pa.rangeDate[1];
_pa.jobStartTime = _pa.rangeDate[0]
_pa.jobEndTime = _pa.rangeDate[1]
}
try {
loading.value = true;
form.id ? await putObj(form) : await addObj(form);
useMessage().success(form.id ? '修改成功' : '添加成功');
visible.value = false;
emit('refresh');
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);
useMessage().error(err.msg)
} finally {
loading.value = false;
loading.value = false
}
};
}
// 初始化表单数据
const getmerchantInfoData = (id: string) => {
// 获取数据
loading.value = true;
loading.value = true
getObj(id)
.then((res: any) => {
Object.assign(form, res.data);
Object.assign(form, res.data)
})
.finally(() => {
loading.value = false;
});
};
loading.value = false
})
}
// 暴露变量
defineExpose({
openDialog,
});
})
</script>
src/views/hard/hard-order/admin-refund-dialog.vue
+3 -13
View File
@@ -11,30 +11,20 @@
<el-col :span="24" class="mb20">
<el-form-item label="退款原因" prop="applyReason">
<el-select v-model="form.applyReason">
<el-option
v-for="reason in state.setting.afterSaleRefundReasons"
:key="reason"
:label="reason"
:value="reason"
/>
<el-option v-for="reason in state.setting.afterSaleRefundReasons" :key="reason" :label="reason" :value="reason" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="补充凭证图片" prop="applyPicUrls">
<upload-imgs v-model:imageUrls="form.applyPicUrls" />
<upload-imgs v-model="form.applyPicUrls" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="相关描述" prop="applyDescription">
<el-input
v-model="form.applyDescription"
placeholder="请输入备注"
type="textarea"
:autosize="{ minRows: 6 }"
/>
<el-input v-model="form.applyDescription" placeholder="请输入备注" type="textarea" :autosize="{ minRows: 6 }" />
</el-form-item>
</el-col>
</el-row>
src/views/supermarket/smSpu/form.vue
+4 -2
View File
@@ -9,6 +9,7 @@
placeholder="请选择库存商品"
:value="form.erpSpuName"
readonly
:suffix-icon="Search"
@click="handleClickSelectSpu"
/>
</el-form-item>
@@ -16,7 +17,7 @@
<el-col :span="24" class="mb20">
<el-form-item label="商品轮播图" prop="sliderPicUrls">
<upload-imgs v-model:imageUrls="form.sliderPicUrls"></upload-imgs>
<upload-imgs v-model="form.sliderPicUrls" />
</el-form-item>
</el-col>
@@ -124,6 +125,7 @@ import { useMessage } from "/@/hooks/message"
import { getObj, addObj, putObj, getOnlineSpuPage } from "/@/api/supermarket/smSpu"
import { rule } from "/@/utils/validate"
import { BasicTableProps, useTable } from "/@/hooks/table"
import { Search } from "@element-plus/icons-vue"
const emit = defineEmits(["refresh"])
// 定义变量内容
@@ -138,7 +140,7 @@ const spuSelectDialogVisible = ref<boolean>(false)
const form = reactive({
id: "",
erpSpuId: "",
description: "",
description: "<p></p>",
sliderPicUrls: "",
sort: "",
status: "0",
src/views/supermarketerp/smErpCgBack/components/linkCgCodeDialog.vue
+2 -2
View File
@@ -55,8 +55,8 @@
<script setup lang="ts" name="linkCgCodeDialog">
import { ref } from "vue"
import { getCgddPage } from "/@/api/supermarketerp/smErpInventoryRecords"
import { VxeTableEvents } from "vxe-table"
import { getCgInventoryPage } from "/@/api/supermarketerp/smErpCgBack"
const linkCgCodeDialogVisible = defineModel()
const emit = defineEmits(["getSelectedCgPlan"])
@@ -74,7 +74,7 @@ const openLinkCodeDialog = async () => {
step.value = 0
linkCodeLoading.value = true
try {
const res = await getCgddPage().finally(() => (linkCodeLoading.value = false))
const res = await getCgInventoryPage({ inventoryType: "3" }).finally(() => (linkCodeLoading.value = false))
if (res.code === 0) {
cgddPage.value = res.data.records
}
src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue
+2 -2
View File
@@ -181,14 +181,14 @@
import { ref, reactive, computed, onMounted } from "vue"
import { useRouter, useRoute } from "vue-router"
import { useMessage } from "/@/hooks/message"
import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpInventoryRecords"
import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpCgBack"
import { getPlanCode, getErpSpuSimpleAll } from "/@/api/supermarketerp/common"
import { VxeTableEvents, VxeTablePropTypes, type VxeTableInstance } from "vxe-table"
import { getSupplierTypeOptions } from "/@/api/supermarketerp/smErpSupplier"
import { formatDate } from "/@/utils/formatTime"
import { Search } from "@element-plus/icons-vue"
import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue"
import linkCgCodeDialog from "/@/views/supermarketerp/smErpCgDd/components/linkCgCodeDialog.vue"
import linkCgCodeDialog from "/@/views/supermarketerp/smErpCgBack/components/linkCgCodeDialog.vue"
import { displayPrice } from "/@/utils/formatMoney"
const router = useRouter()
src/views/supermarketerp/smErpRetailBack/components/linkCgCodeDialog.vue
+2 -2
View File
@@ -55,8 +55,8 @@
<script setup lang="ts" name="linkCgCodeDialog">
import { ref } from "vue"
import { getCgddPage } from "/@/api/supermarketerp/smErpInventoryRecords"
import { VxeTableEvents } from "vxe-table"
import { getCgInventoryPage } from "/@/api/supermarketerp/smErpRetailBack"
const linkCgCodeDialogVisible = defineModel()
const emit = defineEmits(["getSelectedCgPlan"])
@@ -74,7 +74,7 @@ const openLinkCodeDialog = async () => {
step.value = 0
linkCodeLoading.value = true
try {
const res = await getCgddPage().finally(() => (linkCodeLoading.value = false))
const res = await getCgInventoryPage({ inventoryType: "5" }).finally(() => (linkCodeLoading.value = false))
if (res.code === 0) {
cgddPage.value = res.data.records
}
src/views/supermarketerp/smErpRetailBack/smErpRetailBackOption.vue
+1 -1
View File
@@ -219,7 +219,7 @@ import { getSupplierTypeOptions } from "/@/api/supermarketerp/smErpSupplier"
import { formatDate } from "/@/utils/formatTime"
import { Search } from "@element-plus/icons-vue"
import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue"
import linkCgCodeDialog from "/@/views/supermarketerp/smErpCgDd/components/linkCgCodeDialog.vue"
import linkCgCodeDialog from "/@/views/supermarketerp/smErpRetailBack/components/linkCgCodeDialog.vue"
import { displayPrice, storePrice } from "/@/utils/formatMoney"
import { useDict } from "/@/hooks/dict"
src/views/supermarketerp/supermarketSpu/form.vue
+15 -10
View File
@@ -244,7 +244,10 @@ const openDialog = async (id: string) => {
// 获取supermarketSpu信息
if (id) {
form.id = id
getsupermarketSpuData(id)
await getsupermarketSpuData(id)
// 设置基础包装单位单选行
supermarketUnitEntityListRef.value.setRadioRow(form.smErpUnitEntityList.findIndex((item: any) => item.isBase))
}
// 获取分类下拉选项 & 获取品牌下拉选项 & 获取货商下拉选项
@@ -268,17 +271,19 @@ const getsupermarketSpuData = async (id: string) => {
if (res.code === 0) {
res.data.smErpUnitEntityList = res.data.smErpUnitEntityList.map((item: any) => {
// 格式化数据
item.retailPrice = displayPrice(item.retailPrice, "")
item.promotionPrice = displayPrice(item.promotionPrice, "")
item.purchasePrice = displayPrice(item.purchasePrice, "")
item.costPrice = displayPrice(item.costPrice, "")
item.retailPrice = parseFloat(displayPrice(item.retailPrice, ""))
item.promotionPrice = parseFloat(displayPrice(item.promotionPrice, ""))
item.purchasePrice = parseFloat(displayPrice(item.purchasePrice, ""))
item.costPrice = parseFloat(displayPrice(item.costPrice, ""))
return item
})
Object.assign(form, res.data)
// 设置基础包装单位单选行
supermarketUnitEntityListRef.value.setRadioRow(form.smErpUnitEntityList.findIndex((item: any) => item.isBase))
Object.assign(form, {
...res.data,
costPrice: parseFloat(displayPrice(res.data.costPrice, "")),
purchasePrice: parseFloat(displayPrice(res.data.purchasePrice, "")),
retailPrice: parseFloat(displayPrice(res.data.retailPrice, "")),
})
console.log("获取的商品详情：", res.data)
}
@@ -338,7 +343,7 @@ const onSubmit = async () => {
console.log("提交的数据", form)
const valid = await dataFormRef.value.validate().catch(() => {})
// if (!valid) return useMessage().warning("基础信息必填项未填写完整")
if (!valid) return useMessage().warning("基础信息必填项未填写完整")
if (!form.smErpUnitEntityList || form.smErpUnitEntityList.length <= 0) return useMessage().warning("请添加包装单位")
if (!(await supermarketUnitEntityListRef.value.editableTableValidate())) return useMessage().warning("包装单位必填项未填写完整")
if (!supermarketUnitEntityListRef.value.getRadioEvent()) return useMessage().warning("请选择基础包装单位")
src/views/wallet/mch-manage/form.vue
+1 -1
View File
@@ -38,7 +38,7 @@
<el-col :span="24" class="mb20">
<el-form-item label="轮播图" prop="swiperPic">
<upload-imgs v-model:imageUrls="form.swiperPic" />
<upload-imgs v-model="form.swiperPic" />
</el-form-item>
</el-col>