zhaoyang/estate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

9/20

Browse Source
This commit is contained in:
Zy
2026-09-20 08:57:53 +08:00
parent 292ee1a6dd
commit f6a7eb1b4e
41 changed files with 864 additions and 608 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/system/ComplaintType/index.vue
View File

@@ -56,7 +56,7 @@
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column align="center" class-name="small-padding fixed-width" fixed="right" label="操作">
<el-table-column align="center" class-name="small-padding fixed-width" label="操作">
<template #default="scope">
<el-button v-has-permi="['complaintType:complaintType:edit']" link type="primary" @click="handleUpdate(scope.row)">编辑</el-button>
<el-button v-has-permi="['complaintType:complaintType:remove']" link type="primary" @click="handleDelete(scope.row)">删除</el-button>

1
src/views/system/ParkingCost/index.vue
View File

@@ -93,7 +93,6 @@ import { formatTimeDiff } from '@/utils/time';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { com_parking_charge } = toRefs<any>(proxy?.useDict('com_parking_charge'));
const { com_parking_payer_status } = toRefs<any>(proxy?.useDict('com_parking_payer_status'));
const { com_pay_method } = toRefs<any>(proxy?.useDict('com_pay_method'));
const router = useRouter();
interface ParkingCostType extends ParkingCostVO {

52
src/views/system/Sdb/SdbCashier/history.vue
View File

@@ -1,12 +1,12 @@
<template>
<el-card style="margin-top: 20px; height: 100%">
<div class="p-2 flex flex-col cashierbox h-full">
<div class="tablebox">
<div class="p-2 flex flex-col cashierBox h-full">
<div class="tableBox">
<div style="margin-bottom: 20px">
<el-button @click="printPiaoju" type="primary">打印票据</el-button>
<el-button type="primary" @click="printPiaoju">打印票据</el-button>
</div>
<el-table :data="tabledata" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table :data="tableData" @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="55" />
<el-table-column align="center" label="收费名称">
<template #default="scope">
<div>{{ scope.row.detailsName }}</div>
@@ -42,27 +42,27 @@
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
<pagination v-show="total > 0" v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNum" :total="total" @pagination="getList" />
</div>
</div>
<el-dialog :title="dialog_print.title" v-model="dialog_print.visible" width="1200px" append-to-body>
<el-dialog v-model="dialog_print.visible" :title="dialog_print.title" append-to-body width="1200px">
<template #header>
<div class="flex" style="justify-content: space-between; padding: 0 20px">
<div class="title">票据打印</div>
<el-button type="primary" :loading="isLoading" @click="confimPrint">打印</el-button>
<el-button :loading="isLoading" type="primary" @click="completePrint">打印</el-button>
<!-- <el-button type="primary" v-print="printOption">打印</el-button> -->
</div>
</template>
<div class="printBox" id="printBox-Bill">
<div id="printBox-Bill" class="printBox">
<div class="title">{{ print_form.title }}</div>
<div class="nav gridbox">
<div class="nav gridBox">
<div>单据日期：{{ print_form.printDate }}</div>
<div>房号：{{ print_form.HouseName }}</div>
<div>产权人：{{ print_form.residentName }}</div>
<div>No.</div>
</div>
<div class="tablebox">
<div class="tableBox">
<table border class="printTable">
<thead>
<tr>
@@ -103,8 +103,8 @@
<div class="flex-1">交款人：</div>
<div class="flex-1 flex flex-items-center">
<span style="white-space: nowrap">收款人： </span>
<el-input v-model="inHomelyUse" v-if="!isPrint" placeholder="请输入收款人姓名" style="width: 150px"></el-input>
<span style="white-space: nowrap" v-else> {{ inHomelyUse }}</span>
<el-input v-if="!isPrint" v-model="inHomelyUse" placeholder="请输入收款人姓名" style="width: 150px"></el-input>
<span v-else style="white-space: nowrap"> {{ inHomelyUse }}</span>
</div>
</div>
</div>
@@ -113,7 +113,7 @@
</el-card>
</template>
<script setup lang="ts">
<script lang="ts" setup>
import DictTag from '@/components/DictTag/index.vue';
import pagination from '@/components/Pagination/index.vue';
import { ref } from 'vue';
@@ -125,7 +125,7 @@ const { com_pay_status } = toRefs<any>(proxy?.useDict('com_pay_status'));
const { com_bill_charge_period } = toRefs<any>(proxy?.useDict('com_bill_charge_period'));
const { com_charge_item_unit } = toRefs<any>(proxy?.useDict('com_charge_item_unit'));
type querytype = {
type queryType = {
residentId: string;
residentName: string;
houseName: string;
@@ -133,7 +133,7 @@ type querytype = {
};
const props = defineProps({
query: {
type: Object as PropType<querytype>,
type: Object as PropType<queryType>,
default: () => {
return {
'residentId': '',
@@ -152,14 +152,14 @@ const queryParams = ref({
pageNum: 1,
pageSize: 10
});
const tabledata = ref<billlistType[]>([]);
const tableData = ref<billlistType[]>([]);
// 支付状态 0未缴纳 1已缴纳 2缴纳失败
const getList = () => {
billQuery({
residentId: props.query.residentId,
'payStatus': '1'
}).then((res) => {
tabledata.value = res.rows;
tableData.value = res.rows;
total.value = res.total;
});
};
@@ -210,7 +210,7 @@ function printPiaoju() {
});
}
const isLoading = ref(false);
function confimPrint() {
function completePrint() {
isLoading.value = true;
isPrint.value = true;
setTimeout(() => {
@@ -222,7 +222,7 @@ function confimPrint() {
}
</script>
<style scoped lang="scss">
<style lang="scss" scoped>
.printBox {
color: rgba(0, 0, 0, 1);
padding-top: 5px;
@@ -234,7 +234,7 @@ function confimPrint() {
}
.nav {
font-size: 12px;
&.gridbox {
&.gridBox {
display: grid;
grid-template-columns: 1fr 1fr 1fr 1fr;
grid-gap: 10px;
@@ -246,7 +246,7 @@ function confimPrint() {
justify-content: space-between;
}
}
.tablebox {
.tableBox {
font-size: 10px;
.printTable {
border-collapse: collapse;
@@ -261,7 +261,7 @@ function confimPrint() {
}
}
.cashierbox {
.cashierBox {
font-size: 0.8rem;
.el-button {
width: 100px;
@@ -269,10 +269,10 @@ function confimPrint() {
border-radius: 4px;
}
.actionsbox {
.actionsBox {
margin-top: 20px;
}
.tablebox {
.tableBox {
margin-top: 20px;
height: 100%;
.el-table {
@@ -280,7 +280,7 @@ function confimPrint() {
}
}
}
.payinfo {
.payInfo {
color: rgba(0, 0, 0, 1);
margin-top: 20px;
padding-bottom: 10px;

24
src/views/system/Sdb/SdbElectricityDevice/addSdbElectricityDevice.vue
View File

@@ -5,8 +5,8 @@
<div class="title">
<div>基本信息</div>
</div>
<div class="bodybox">
<el-form label-width="100px" label-position="right">
<div class="bodyBox">
<el-form label-position="right" label-width="100px">
<el-form-item label="设备编码" prop="deviceCode">
<el-input v-model="form.deviceCode" placeholder="请输入"></el-input>
</el-form-item>
@@ -15,12 +15,12 @@
</el-form-item>
<el-form-item label="分合状态">
<el-radio-group v-model="form.electricityRecord.status">
<el-radio v-for="(item, index) in com_electricity_readrecord_status" :key="index" :value="item.value" :label="item.label"></el-radio>
<el-radio v-for="(item, index) in com_electricity_readrecord_status" :key="index" :label="item.label" :value="item.value"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item>
<el-button type="primary">提交</el-button>
<el-button @click="routeback">返回</el-button>
<el-button @click="routeBack">返回</el-button>
</el-form-item>
</el-form>
</div>
@@ -28,7 +28,7 @@
</div>
</template>
<script setup lang="ts">
<script lang="ts" setup>
import { getElectricityDevice } from '@/api/system/SdbElectricityDevice';
import PageHeader from '@/components/Pageheader/index.vue';
import { ref } from 'vue';
@@ -49,11 +49,11 @@ const form = ref({
}
});
const editid = ref(null);
const editId = ref(null);
function init() {
if (route.query.id) {
editid.value = route.query.id;
getElectricityDevice(editid.value).then((res) => {
editId.value = route.query.id;
getElectricityDevice(editId.value).then((res) => {
form.value = {
...form.value,
...res.data
@@ -64,17 +64,17 @@ function init() {
init();
function routeback() {
function routeBack() {
router.back();
}
</script>
<style scoped lang="scss">
<style lang="scss" scoped>
.EditBody {
margin-top: 20px;
padding: 30px;
background-color: white;
.bodybox {
.bodyBox {
width: 600px;
margin: 20px auto 0;
}
@@ -89,7 +89,7 @@ function routeback() {
color: #000;
display: flex;
align-items: center;
.iconbox {
.iconBox {
width: 30px;
height: 30px;
margin-left: 5px;

13
src/views/system/Sdb/SdbElectricityDevice/index.vue
View File

@@ -79,8 +79,9 @@
:preview-src-list="[scope.row.url]"
:src="scope.row.url"
fit="cover"
lazy
preview-teleported
style="width: 90%; height: 100%"
style="width: 90%; height: 100%; max-width: 150px"
>
<template #toolbar>
<el-icon @click="download(scope.row.url)"><Download /></el-icon>
@@ -98,15 +99,17 @@
<template #default="scope">
<el-switch
v-if="scope.row.electricityRecord"
v-model="scope.row.electricityRecord.status"
:active-value="0"
:active-value="true"
:before-change="
() => {
const status = scope.row.status === 1 ? 0 : 1;
// 0 合闸 1 2 拉闸
// 0 合闸 传入 1 拉闸 传入 0
const status = scope.row.electricityRecord.status === 0 ? 1 : 0;
return handleChangeWater(status, scope.row);
}
"
:inactive-value="1"
:inactive-value="false"
:model-value="scope.row.electricityRecord.status === 0"
active-text="合闸"
inactive-text="拉闸"
></el-switch>

48
src/views/system/equipment/Archive/main.vue
View File

@@ -39,11 +39,14 @@
<div class="label">维护人员：</div>
<span class="value">{{ form.maintainUserListName }}</span>
</div>
<div class="info_item">
<div class="label">设备保质期：</div>
<span class="value">{{ form.shelfLife }}</span>
</div>
<div class="info_item">
<div class="label">添加时间：</div>
<span class="value">{{ form.createTime }}</span>
</div>
<div></div>
<div class="info_item">
<div class="label">备注：</div>
<span class="value">{{ form.remark }}</span>
@@ -55,17 +58,17 @@
<div class="title">维修记录</div>
<div class="addBuildingFormBody">
<el-table v-loading="loading" :data="deviceRepairList">
<el-table-column type="index" align="center" />
<el-table-column label="设备名称" align="center" prop="deviceName" />
<el-table-column label="设备编号" align="center" prop="deviceCode" />
<el-table-column label="维修人员" align="center" prop="maintainUserNames" />
<el-table-column label="故障描述" align="center" prop="faultDesc" />
<el-table-column label="维修结果" align="center" prop="repairResult">
<el-table-column align="center" type="index" />
<el-table-column align="center" label="设备名称" prop="deviceName" />
<el-table-column align="center" label="设备编号" prop="deviceCode" />
<el-table-column align="center" label="维修人员" prop="maintainUserNames" />
<el-table-column align="center" label="故障描述" prop="faultDesc" />
<el-table-column align="center" label="维修结果" prop="repairResult">
<template #default="scope">
<dict-tag :options="com_equipment_repair_status" :value="scope.row.repairResult"></dict-tag>
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
<el-table-column align="center" class-name="small-padding fixed-width" fixed="right" label="操作">
<template #default="scope">
<el-button link type="primary" @click="handleMain(scope.row)">详情</el-button>
<el-button link type="primary" @click="handleEdit(scope.row)">编辑</el-button>
@@ -73,13 +76,13 @@
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getlist" />
<pagination v-show="total > 0" v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNum" :total="total" @pagination="getList" />
</div>
</div>
</div>
</template>
<script setup lang="ts">
<script lang="ts" setup>
import { ref } from 'vue';
import PageHeader from '@/components/Pageheader/index.vue';
import { getDevice } from '@/api/system/equipment/archive';
@@ -100,6 +103,7 @@ const form = ref({
deviceModel: '', // 型号
area: '', // 区域
status: '0', // 区域
shelfLife: '', // 设备保质期
maintainUserIds: '', // 设备维护人员
maintainUserListName: '', // 设备维护人员
createTime: '', // 设备维护人员
@@ -109,7 +113,10 @@ const form = ref({
const userid = ref(null);
const total = ref(0);
const loading = ref(false);
const deviceRepairList = ref([]);
type DeviceRepairVOList = DeviceRepairVO & {
maintainUserNames?: string;
};
const deviceRepairList = ref<DeviceRepairVOList[]>([]);
const queryParams = ref({
pageNum: 1,
@@ -124,6 +131,7 @@ function init() {
id: res.data.id,
categoryName: res.data.categoryName,
deviceName: res.data.deviceName,
shelfLife: res.data.shelfLife,
deviceCode: res.data.deviceCode,
deviceModel: res.data.deviceModel,
area: res.data.area,
@@ -139,15 +147,19 @@ function init() {
.filter((it) => it !== null)
.join(',');
}
getlist();
getList();
});
}
}
init();
async function getlist() {
function getList() {
loading.value = true;
listDeviceRepair()
listDeviceRepair({
deviceId: form.value.id,
pageNum: queryParams.value.pageNum,
pageSize: queryParams.value.pageSize
})
.then((rows) => {
deviceRepairList.value = rows.rows;
deviceRepairList.value.forEach((item) => {
@@ -177,10 +189,10 @@ const handleDelete = async (row?: DeviceRepairVO) => {
await proxy?.$modal.confirm('是否确认删除维修工单？');
await delDeviceRepair(_ids);
proxy?.$modal.msgSuccess('删除成功');
getlist();
getList();
};
const handleMain = (row) => {
const handleMain = (row: DeviceRepairVO) => {
router.push({
path: '/equipment/equipmentRepairMain',
query: {
@@ -188,7 +200,7 @@ const handleMain = (row) => {
}
});
};
const handleEdit = (row) => {
const handleEdit = (row: DeviceRepairVO) => {
router.push({
path: '/equipment/editEquipmentRepair',
query: {
@@ -202,7 +214,7 @@ const cancelForm = () => {
};
</script>
<style scoped lang="scss">
<style lang="scss" scoped>
.AddBuildingBox {
padding: 15px;
height: 100%;

62
src/views/system/equipment/Category/index.vue
View File

@@ -4,9 +4,9 @@
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" label-width="100" :model="queryParams" :inline="true">
<el-form ref="queryFormRef" :inline="true" :model="queryParams" label-width="100">
<el-form-item label="设备分类名称" prop="categoryName">
<el-input maxlength="20" v-model="queryParams.categoryName" placeholder="请输入设备分类名称" clearable @keyup.enter="handleQuery" />
<el-input v-model="queryParams.categoryName" clearable maxlength="20" placeholder="请输入设备分类名称" @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleQuery">搜索</el-button>
@@ -24,8 +24,8 @@
:disable-delete="multiple"
:disable-edit="single"
:show-add="checkPermi(['warehouse:deviceCategory:add'])"
:show-edit="false"
:show-delete="checkPermi(['warehouse:deviceCategory:remove'])"
:show-edit="false"
@update:add="handleAdd"
@update:edit="handleUpdate()"
@update:delete="handleDelete()"
@@ -33,39 +33,36 @@
</el-row>
</template>
<el-table v-loading="loading" border :data="deviceCategoryList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="设备分类名称" align="center" prop="categoryName" />
<el-table-column label="状态" align="center" prop="status">
<el-table v-loading="loading" :data="deviceCategoryList" border @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="55" />
<el-table-column align="center" label="设备分类名称" prop="categoryName" />
<el-table-column align="center" label="状态" prop="status">
<template #default="scope">
<el-switch :inactive-value="1" :active-value="0" v-model="scope.row.status"></el-switch>
<el-switch
v-model="scope.row.status"
:active-value="0"
:before-change="() => updateDeviceSwitch(scope.row)"
:inactive-value="1"
></el-switch>
</template>
</el-table-column>
<el-table-column label="添加时间" align="center" prop="createTime" />
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
<el-table-column align="center" label="添加时间" prop="createTime" />
<el-table-column align="center" class-name="small-padding fixed-width" fixed="right" label="操作">
<template #default="scope">
<el-button link type="primary" @click="handleUpdate(scope.row)" v-has-permi="['warehouse:deviceCategory:edit']">编辑</el-button>
<el-button link type="primary" @click="handleDelete(scope.row)" v-has-permi="['warehouse:deviceCategory:remove']">删除</el-button>
<el-button v-has-permi="['warehouse:deviceCategory:edit']" link type="primary" @click="handleUpdate(scope.row)">编辑</el-button>
<el-button v-has-permi="['warehouse:deviceCategory:remove']" link type="primary" @click="handleDelete(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
<pagination v-show="total > 0" v-model:limit="queryParams.pageSize" v-model:page="queryParams.pageNum" :total="total" @pagination="getList" />
</el-card>
<!-- 添加或修改设备分类对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-dialog v-model="dialog.visible" :title="dialog.title" append-to-body width="500px">
<el-form ref="deviceCategoryFormRef" :model="form" :rules="rules" label-width="120px">
<el-form-item label="设备分类名称" prop="categoryName">
<el-input maxlength="20" show-word-limit v-model="form.categoryName" placeholder="请输入设备分类名称" />
<el-input v-model="form.categoryName" maxlength="20" placeholder="请输入设备分类名称" show-word-limit />
</el-form-item>
<el-form-item label="设备分类状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio v-for="(item, index) in com_equipment_device_category" :key="index" :value="Number(item.value)" :label="item.label"></el-radio>
</el-radio-group>
</el-form-item>
<!-- <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item> -->
</el-form>
<template #footer>
<div class="dialog-footer">
@@ -77,13 +74,12 @@
</div>
</template>
<script setup name="DeviceCategory" lang="ts">
<script lang="ts" name="DeviceCategory" setup>
import { listDeviceCategory, delDeviceCategory, addDeviceCategory, updateDeviceCategory } from '@/api/system/equipment/Category';
import { DeviceCategoryVO, DeviceCategoryQuery, DeviceCategoryForm } from '@/api/system/equipment/Category/type';
import { checkPermi } from '@/utils/permission';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { com_equipment_device_category } = toRefs<any>(proxy?.useDict('com_equipment_device_category'));
const deviceCategoryList = ref<DeviceCategoryVO[]>([]);
const buttonLoading = ref(false);
@@ -135,6 +131,22 @@ const getList = async () => {
});
};
function updateDeviceSwitch(row: DeviceCategoryVO): Promise<boolean> {
return new Promise((resolve, reject) => {
const obj = {
id: row.id,
status: row.status === 1 ? 0 : 1
};
updateDeviceCategory(obj)
.then(() => {
resolve(true);
})
.catch(() => {
reject(false);
});
});
}
/** 取消按钮 */
const cancel = () => {
reset();

101
src/views/system/equipment/Repair/add.vue
View File

@@ -4,43 +4,44 @@
<div class="AddBuildingBody">
<div class="title">基本信息</div>
<div class="addBuildingFormBody">
<el-form class="formBody" label-position="right" ref="formRef" :model="form" :rules="rules" label-width="130px">
<el-form-item label="维修设备" prop="deviceId">
<el-select v-model="form.deviceId">
<el-form ref="formRef" :model="form" :rules="rules" class="formBody" label-position="right" label-width="130px">
<el-form-item label="设备分类" prop="categoryId">
<el-select v-model="form.categoryId" @change="handleCategoryIdChange">
<el-option
v-for="(item, index) in deviceCategorylist"
v-for="(item, index) in deviceCategoryList"
:key="index"
:disabled="item.status === 1"
:value="item.id"
:label="item.categoryName"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="设备名称" prop="deviceName">
<el-input maxlength="20" v-model.trim="form.deviceName" placeholder="请输入设备名称" />
<el-form-item label="设备名称" prop="deviceId">
<el-select v-model="form.deviceId" filterable @change="handleDeviceChange">
<el-option v-for="(item, index) in deviceList" :key="index" :label="item.deviceName" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="设备编号" prop="deviceCode">
<el-input maxlength="20" v-model.trim="form.deviceCode" placeholder="请输入设备编号" />
<el-input v-model.trim="form.deviceCode" disabled maxlength="20" placeholder="请输入设备编号" />
</el-form-item>
<el-form-item label="设备型号" prop="deviceModel">
<el-input maxlength="20" v-model.trim="form.deviceModel" placeholder="请输入设备型号" />
<el-input v-model.trim="form.deviceModel" disabled maxlength="20" placeholder="请输入设备型号" />
</el-form-item>
<el-form-item label="位置区域" prop="area">
<el-input maxlength="100" show-word-limit type="textarea" :rows="2" v-model.trim="form.area" placeholder="请输入位置区域" />
<el-input v-model.trim="form.area" :rows="2" maxlength="100" placeholder="请输入位置区域" show-word-limit type="textarea" />
</el-form-item>
<el-form-item label="维护人员" prop="maintainUserIds">
<repairUser
userType="repair"
EquipmentMaintenance
:userid="checkoutuseid"
ref="repairUserRef"
returnvalue="*"
:is-multiple="true"
:userid="checkoutUseId"
returnvalue="*"
title-name="维护人员"
userType="repair"
@change="handleCheckoutUser"
>
<template #default>
<div class="checkoutuserbox flex flex-items-center justify-around" v-for="(item, index) in checkoutuser" :key="index">
<div v-for="(item, index) in checkoutUser" :key="index" class="checkoutUserBox flex flex-items-center justify-around">
<span>{{ item.nickName }}</span>
<div @click="handleDelete(item.id)">
<el-icon>
@@ -48,7 +49,7 @@
</el-icon>
</div>
</div>
<div class="checkoutuserbox add flex flex-items-center justify-center" @click="() => repairUserRef.open()">
<div class="checkoutUserBox add flex flex-items-center justify-center" @click="() => repairUserRef.open()">
<el-icon>
<Plus></Plus>
</el-icon>
@@ -58,15 +59,15 @@
</repairUser>
</el-form-item>
<el-form-item label="故障描述" prop="faultDesc">
<el-input maxlength="100" show-word-limit type="textarea" :rows="2" v-model.trim="form.faultDesc" placeholder="请输入" />
<el-input v-model.trim="form.faultDesc" :rows="2" maxlength="100" placeholder="请输入" show-word-limit type="textarea" />
</el-form-item>
<el-form-item label="维修结果" prop="repairResult">
<el-radio-group v-model.trim="form.repairResult">
<el-radio v-for="(item, index) in com_equipment_repair_status" :value="item.value" :label="item.label" :key="index"></el-radio>
<el-radio v-for="(item, index) in com_equipment_repair_status" :key="index" :label="item.label" :value="item.value"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input maxlength="200" show-word-limit type="textarea" :rows="5" v-model.trim="form.remark" placeholder="请输入" />
<el-input v-model.trim="form.remark" :rows="5" maxlength="200" placeholder="请输入" show-word-limit type="textarea" />
</el-form-item>
<el-form-item style="margin-top: 30px">
@@ -78,13 +79,14 @@
</div>
</div>
</template>
<script setup lang="ts">
<script lang="ts" setup>
import { ref } from 'vue';
import repairUser from '@/components/Holder/repairUser.vue';
import PageHeader from '@/components/Pageheader/index.vue';
import { listDeviceCategory } from '@/api/system/equipment/Category';
import { Delete, Plus } from '@element-plus/icons-vue';
import { addDeviceRepair, getDeviceRepair, updateDeviceRepair } from '@/api/system/equipment/Repair';
import { listDevice } from '@/api/system/equipment/archive';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { com_equipment_repair_status } = toRefs<any>(proxy?.useDict('com_equipment_repair_status'));
@@ -96,7 +98,8 @@ const formRef = ref();
const repairUserRef = ref();
const form = ref({
id: null,
deviceId: '', // 分类id、
categoryId: '', // 分类id、
deviceId: '', // 设备id
deviceName: '', // 设备名称
deviceCode: '', // 编号
deviceModel: '', // 型号
@@ -107,22 +110,40 @@ const form = ref({
remark: '' // 备注
});
const rules = ref({
deviceId: [{ required: true, message: '请选择 设备类型', trigger: 'blur' }],
categoryId: [{ required: true, message: '请选择 设备分类', trigger: 'blur' }],
deviceId: [{ required: true, message: '请选择 设备', trigger: 'blur' }],
deviceName: [{ required: true, message: '请输入 设备名称', trigger: 'blur' }],
faultDesc: [{ required: true, message: '请输入 故障描述', trigger: 'blur' }],
maintainUserIds: [{ required: true, message: '请选择 维修人员', trigger: 'blur' }]
});
const userid = ref(null);
const deviceCategorylist = ref([]);
// 设备列表
const deviceList = ref([]);
// 分类列表
const deviceCategoryList = ref([]);
function handleCategoryIdChange(val: string) {
listDevice({ categoryId: val, pageNum: 1, pageSize: undefined }).then((res) => {
deviceList.value = res.rows;
});
}
function handleDeviceChange(val: string) {
const find = deviceList.value.find((item) => item.id === val);
if (find) {
form.value.deviceName = find.deviceName;
form.value.deviceCode = find.deviceCode;
form.value.deviceModel = find.deviceModel;
}
}
function init() {
listDeviceCategory().then((res) => {
deviceCategorylist.value = res.rows;
deviceCategoryList.value = res.rows;
});
if (route.query.id) {
userid.value = route.query.id;
getDeviceRepair(userid.value).then((res) => {
form.value = {
categoryId: res.data.categoryId,
id: res.data.id,
deviceName: res.data.deviceName,
deviceCode: res.data.deviceCode,
@@ -131,38 +152,38 @@ function init() {
maintainUserIds: res.data.maintainUserIds,
area: res.data.area,
faultDesc: res.data.faultDesc,
repairResult: res.data.repairResult,
remark: res.data.remark
};
checkoutuser.value = [];
checkoutuser.value = res.data.maintainUserList ?? [];
// 根据 分类id 回显设备
handleCategoryIdChange(res.data.categoryId);
checkoutUser.value = [];
checkoutUser.value = res.data.maintainUserList ?? [];
});
}
}
init();
const checkoutuseid = computed(() => {
return checkoutuser.value
// 用于回显维修人员
const checkoutUseId = computed(() => {
return checkoutUser.value
.map((item) => item.userId)
.filter((item) => item)
.join(',');
});
const checkoutuser = ref([]);
function handleCheckoutUser(row) {
checkoutuser.value = row;
// 选择维修人员
const checkoutUser = ref([]);
function handleCheckoutUser(row: any[]) {
checkoutUser.value = row;
}
function handleDelete(id: string) {
checkoutuser.value = checkoutuser.value.filter((item) => item.id !== id);
checkoutUser.value = checkoutUser.value.filter((item) => item.id !== id);
}
// !== 提交 =============================================================================
// 提交
const submitForm = () => {
form.value.maintainUserIds = checkoutuser.value
.map((itme) => itme.userId)
form.value.maintainUserIds = checkoutUser.value
.map((item) => item.userId)
.filter((item) => item)
.join(',');
formRef.value?.validate(async (valid: boolean) => {
@@ -187,7 +208,7 @@ const cancelForm = () => {
};
</script>
<style scoped lang="scss">
<style lang="scss" scoped>
.AddBuildingBox {
padding: 15px;
height: 100%;
@@ -214,7 +235,7 @@ const cancelForm = () => {
width: 650px;
margin: 0 auto;
.checkoutuserbox {
.checkoutUserBox {
margin: 5px;
border: 1px solid #ccc;
padding: 5px 10px;

2
src/views/system/equipment/Repair/index.vue
View File

@@ -49,7 +49,7 @@
</template>
</el-table-column>
<el-table-column align="center" label="备注" prop="remark" />
<el-table-column align="center" class-name="small-padding fixed-width" fixed="right" label="操作" width="160">
<el-table-column align="center" class-name="small-padding fixed-width" fixed="right" label="操作" min-width="160">
<template #default="scope">
<el-button v-has-permi="['warehouse:deviceRepair:query']" link type="primary" @click="handleMain(scope.row)">查看详情</el-button>
<el-button v-has-permi="['warehouse:deviceRepair:edit']" link type="primary" @click="handleUpdate(scope.row)">编辑</el-button>

88
src/views/system/house/HouseDetails.vue
View File

@@ -7,39 +7,39 @@
<el-button v-if="HouseInfo.house" v-has-permi="['system:house:edit']" text type="primary" @click="editHouse">编辑</el-button>
</div>
<div v-if="HouseInfo.house" class="addBuildingFormBody">
<div class="descriptionsbox">
<div class="descriptionsBox">
<div class="label">房号:</div>
<div class="value">{{ HouseInfo.house?.buildingName }}-{{ HouseInfo.house?.unitNoName }}-{{ HouseInfo.house?.houseNo ?? '--' }}</div>
</div>
<div class="descriptionsbox">
<div class="descriptionsBox">
<div class="label">所属小区:</div>
<div class="value">{{ HouseInfo.house?.villageName ?? '--' }}</div>
</div>
<div class="descriptionsbox">
<div class="descriptionsBox">
<div class="label">楼栋:</div>
<div class="value">{{ HouseInfo.house?.buildingName ?? '--' }}</div>
</div>
<div class="descriptionsbox">
<div class="descriptionsBox">
<div class="label">单元:</div>
<div class="value">{{ HouseInfo.house?.unitNoName ?? '--' }}</div>
</div>
<div class="descriptionsbox">
<div class="descriptionsBox">
<div class="label">楼层:</div>
<div class="value">{{ HouseInfo.house?.floorNo ? HouseInfo.house?.floorNo + ' 层' : '--' }}</div>
</div>
<div class="descriptionsbox">
<div class="descriptionsBox">
<div class="label">建筑面积:</div>
<div class="value">{{ HouseInfo.house?.houseArea ? `${HouseInfo.house?.houseArea} ㎡` : '--' }}</div>
</div>
<div class="descriptionsbox">
<div class="descriptionsBox">
<div class="label">套内面积:</div>
<div class="value">{{ HouseInfo.house?.internalArea ? `${HouseInfo.house?.internalArea} ㎡` : '--' }}</div>
</div>
<div class="descriptionsbox">
<div class="descriptionsBox">
<div class="label">公摊面积:</div>
<div class="value">{{ HouseInfo.house?.shareArea ? `${HouseInfo.house?.shareArea} ㎡` : '--' }}</div>
</div>
<div class="descriptionsbox">
<div class="descriptionsBox">
<div class="label">户型:</div>
<div class="value">
{{ HouseInfo.house?.houseType ? HouseInfo.house?.houseType.split('')[0] : '--' }}室
@@ -60,31 +60,31 @@
</div>
<div v-if="HouseInfo.storeroom" class="">
<div class="addBuildingFormBody">
<div class="descriptionsbox">
<div class="descriptionsBox">
<div class="label">楼栋:</div>
<div class="value">{{ HouseInfo.storeroom?.buildingName ?? '--' }}</div>
</div>
<div class="descriptionsbox">
<div class="descriptionsBox">
<div class="label">单元:</div>
<div class="value">{{ HouseInfo.storeroom?.unitNoName ? `${HouseInfo.storeroom?.unitNoName} 单元` : '--' }}</div>
</div>
<div class="descriptionsbox">
<div class="descriptionsBox">
<div class="label">储藏室号:</div>
<div class="value">{{ HouseInfo.storeroom?.storeroomNo ? `${HouseInfo.storeroom?.storeroomNo}` : '--' }}</div>
</div>
<div class="descriptionsbox">
<div class="descriptionsBox">
<div class="label">建筑面积:</div>
<div class="value">{{ HouseInfo.storeroom?.houseArea ? HouseInfo.storeroom?.houseArea + ' ㎡' : '--' }}</div>
</div>
<div class="descriptionsbox">
<div class="descriptionsBox">
<div class="label">公摊面积:</div>
<div class="value">{{ HouseInfo.storeroom?.shareArea ? HouseInfo.storeroom?.shareArea + ' ㎡' : '--' }}</div>
</div>
<div class="descriptionsbox">
<div class="descriptionsBox">
<div class="label">实用面积:</div>
<div class="value">{{ HouseInfo.storeroom?.internalArea ? HouseInfo.storeroom?.internalArea + ' ㎡' : '--' }}㎡</div>
</div>
<div class="descriptionsbox" style="grid-column-start: 1; grid-column-end: 4">
<div class="descriptionsBox" style="grid-column-start: 1; grid-column-end: 4">
<div class="label">备注:</div>
<div class="value">{{ HouseInfo.storeroom?.remark ?? '--' }}</div>
</div>
@@ -141,12 +141,12 @@
<el-table-column label="收费项目" prop="itemName" />
<el-table-column label="收费标准" prop="name">
<template #default="scope">
<div class="flex">
<div v-if="scope.row.fixedPrice" class="flex">
<span>{{ scope.row.fixedPrice }}</span>
<span v-if="scope.row.fixedPrice && scope.row.unit">/</span>
<span v-else>---</span>
<dict-tag :options="com_charge_item_unit" :value="scope.row.unit"></dict-tag>
<span v-if="scope.row.unit">/</span>
<dict-tag v-if="scope.row.unit" :options="com_charge_item_unit" :value="scope.row.unit"></dict-tag>
</div>
<span v-else> --- </span>
</template>
</el-table-column>
<el-table-column label="开始时间" prop="createTime" />
@@ -178,7 +178,7 @@
<DictTag :options="com_resident_relationship" :value="scope.row.ownerRelationship"></DictTag>
</template>
</el-table-column>
<el-table-column label="备注" prop="name" />
<el-table-column label="备注" prop="remark" show-overflow-tooltip />
</el-table>
</div>
</div>
@@ -188,19 +188,16 @@
<span>缴费账单</span>
</div>
<div>
<el-table :data="HouseInfo.billResidentList" style="width: 100%">
<el-table-column label="账单编号" prop="billCode" />
<el-table-column label="账单名称" prop="billName" />
<el-table-column label="账单项目" prop="chargeTypeName" />
<el-table :data="billList" style="width: 100%">
<el-table-column label="账单名称" prop="detailsName" />
<el-table-column label="账单项目" prop="chargeItemName" />
<el-table-column label="金额" prop="money">
<template #default="scope">
<span v-if="scope.row.chargeTypeName === '水费' || scope.row.chargeTypeName === '电费'">--</span>
<span v-else>{{ scope.row.money }}</span>
<span>{{ scope.row.amount }}</span>
</template>
</el-table-column>
<el-table-column label="支付状态" prop="payStatus">
<template #default="scope">
<span v-if="scope.row.chargeTypeName === '水费' || scope.row.chargeTypeName === '电费'">--</span>
<DictTag :options="com_pay_status" :value="scope.row.payStatus ?? 0"></DictTag>
</template>
</el-table-column>
@@ -214,7 +211,8 @@
import { ref } from 'vue';
import DictTag from '@/components/DictTag/index.vue';
import PageHeader from '@/components/Pageheader/index.vue';
import { Data, getHouseMain } from '@/api/system/house';
import { Data, getHouseMain, House } from '@/api/system/house';
import { billlistType, billQuery } from '@/api/system/SdbCashier';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { com_resident_relationship } = toRefs<any>(proxy?.useDict('com_resident_relationship'));
@@ -226,7 +224,7 @@ const { com_charge_item_unit } = toRefs<any>(proxy?.useDict('com_charge_item_uni
const route = useRoute();
const router = useRouter();
const routeid = ref('');
let routeId = '';
const HouseInfo = ref<Data>({
billResidentList: [],
chargeItemList: [],
@@ -263,13 +261,35 @@ function handleEditUser(id: string) {
}
function init() {
if (route.query.id) {
routeid.value = route.query.id as string;
getHouseMain(routeid.value).then((res) => {
routeId = route.query.id as string;
getHouseMain(routeId).then((res) => {
HouseInfo.value = res.data;
getBillByHouse(res.data.house);
});
}
}
init();
const billList = ref<billlistType[]>([]);
const queryParams = ref({
pageSize: 10,
pageNum: 1
});
const total = ref(0);
function getBillByHouse(info: House) {
const obj = {
buildingId: info.buildingId,
houseId: info.houseId,
pageNum: queryParams.value.pageNum,
pageSize: queryParams.value.pageSize,
unitNoId: info.unitNoId,
payStatus: null,
villageId: info.villageId
};
billQuery(obj).then((res) => {
billList.value = res.rows;
total.value = res.total;
});
}
</script>
<style lang="scss" scoped>
@@ -300,10 +320,10 @@ init();
display: grid;
grid-template-columns: repeat(3, 1fr);
grid-template-rows: repeat(3, 1fr);
&.remarkbuildingformbody {
&.remarkBuildingFormBody {
display: block;
}
.descriptionsbox {
.descriptionsBox {
display: flex;
align-items: center;
margin: 10px 0;

59
src/views/system/inspection/Item/index2.vue
View File

@@ -47,9 +47,9 @@
></el-switch>
</template>
</el-table-column>
<el-table-column align="center" label="添加人" prop="createByName" width="120" />
<el-table-column align="center" label="添加时间" prop="createTime" width="120" />
<el-table-column align="center" class-name="small-padding fixed-width" fixed="right" label="操作" width="300">
<el-table-column align="center" label="添加人" prop="createByName" width="150" />
<el-table-column align="center" label="添加时间" prop="createTime" width="180" />
<el-table-column align="center" class-name="small-padding fixed-width" label="操作">
<template #default="scope">
<el-button v-has-permi="['inspection:item:edit']" link type="primary" @click="handleUpdate(scope.row)">编辑</el-button>
<el-button v-has-permi="['inspection:item:remove']" link type="primary" @click="handleDelete(scope.row)">删除</el-button>
@@ -63,14 +63,13 @@
</template>
<script lang="ts" name="Item" setup>
import { listItem, delItem, addItem, updateItem, updateItemStatus } from '@/api/system/InspectionItem/index';
import { listItem, delItem, updateItemStatus } from '@/api/system/InspectionItem';
import { ItemVO, ItemQuery, ItemForm } from '@/api/system/InspectionItem/type';
import { checkPermi } from '@/utils/permission';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const itemList = ref<ItemVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref<Array<string | number>>([]);
@@ -79,12 +78,6 @@ const multiple = ref(true);
const total = ref(0);
const queryFormRef = ref<ElFormInstance>();
const itemFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
const initFormData: ItemForm = {
id: undefined,
@@ -123,7 +116,7 @@ const data = reactive<PageData<ItemForm, ItemQuery>>({
}
});
const { queryParams, form, rules } = toRefs(data);
const { queryParams } = toRefs(data);
/** 查询巡检项目列表 */
const getList = async () => {
@@ -138,18 +131,6 @@ const getList = async () => {
});
};
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
};
/** 表单重置 */
const reset = () => {
form.value = { ...initFormData };
itemFormRef.value?.resetFields();
};
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
@@ -179,7 +160,7 @@ const handleAdd = () => {
};
/** 修改按钮操作 */
const handleUpdate = async (row?: ItemVO) => {
const handleUpdate = (row?: ItemVO) => {
const _ids = row?.id || ids.value[0];
router.push({
path: '/inspection/editItem',
@@ -204,23 +185,6 @@ const handleChange = (value: string, id: string) => {
});
};
/** 提交按钮 */
const submitForm = () => {
itemFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.id) {
await updateItem(form.value).finally(() => (buttonLoading.value = false));
} else {
await addItem(form.value).finally(() => (buttonLoading.value = false));
}
proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
await getList();
}
});
};
/** 删除按钮操作 */
const handleDelete = async (row?: ItemVO) => {
const _ids = row?.id || ids.value;
@@ -230,17 +194,6 @@ const handleDelete = async (row?: ItemVO) => {
await getList();
};
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download(
'system/item/export',
{
...queryParams.value
},
`item_${new Date().getTime()}.xlsx`
);
};
onMounted(() => {
getList();
});

2
src/views/system/notice/index.vue
View File

@@ -168,7 +168,7 @@ const data = reactive<PageData<NoticeForm, NoticeQuery>>({
const { queryParams, form, rules } = toRefs(data);
/** 查询公告列表╬╬╬╬╬ */
/** 查询公告列表 */
const getList = async () => {
loading.value = true;
listNotice(queryParams.value)

10
src/views/system/parking/addParking.vue
View File

@@ -172,6 +172,9 @@ const rules = ref({
//不能输入0
return callback(new Error('请输入不等于0的数字'));
}
if (val % 1 !== 0) {
return callback(new Error('请输入整数'));
}
return callback();
}
}
@@ -227,12 +230,13 @@ if (route.query.id) {
}
// ! 获取区域==================================================================================
const areaList = ref([]);
const getAreaList = async () => {
const res = await listArea({
const getAreaList = () => {
listArea({
pageSize: 99999,
pageNum: 1
}).then((res) => {
areaList.value = res.rows;
});
areaList.value = res.rows;
};
getAreaList();

1
src/views/system/parking/parkMain.vue
View File

@@ -386,6 +386,7 @@ getInfo();
.label {
font-weight: 600;
width: 120px;
min-width: 120px;
text-align: right;
padding-right: 10px;
}

2
src/views/system/report/agingDetailed.vue
View File

@@ -217,7 +217,7 @@ const handleExport = () => {
{ label: '截至应收账期', prop: 'cutoffPeriod' },
{ label: '小区项目', prop: 'villageName' },
{ label: '楼栋', prop: 'buildingName' },
{ label: '客户名称', prop: 'buildingName' },
{ label: '客户名称', prop: 'customerName' },
{ label: '房号编号', prop: 'roomNo' },
{ label: '欠费月数', prop: 'arrearsMonthsLabel' },
{ label: '≤6个月', prop: 'amountLe6' },

2
src/views/system/report/businessDailyReport.vue
View File

@@ -34,7 +34,7 @@
</div>
</template>
<el-table v-loading="loading" :data="AgingList" border>
<el-table-column v-if="activeName === 'first'" align="center" label="小区名称" prop="villageName" />
<el-table-column v-if="activeName === 'first'" align="center" label="项目" prop="villageName" />
<el-table-column v-else align="center" label="收费项目" prop="chargeItemName" />
<el-table-column v-for="(item, index) in rows" :key="index" :label="item.payTypeName" align="center">
<template #default="scope">

3
src/views/system/report/detailed.vue
View File

@@ -225,7 +225,8 @@ const handleExport = () => {
children: [
...dynamicColumns.value.map((item) => {
return { label: item, prop: `chargeItemAmounts.${item}` };
})
}),
{ label: '金额合计', prop: 'totalAmount' }
]
}
];

42
src/views/system/warehouse/IssueOut/Main.vue
View File

@@ -13,26 +13,26 @@
<table border>
<tbody>
<tr>
<td style="width: 60px">序号</td>
<td>物资名称</td>
<td>品牌</td>
<td>规格型号</td>
<td style="width: 80px">单位</td>
<td>供应商</td>
<td style="width: 100px">数量</td>
<td style="width: 150px">单价</td>
<td>合计</td>
<td>备注</td>
<td style="width: 85px">序号</td>
<td style="min-width: 75px">物资名称</td>
<td style="width: 75px">品牌</td>
<td style="width: 85px">规格型号</td>
<td style="width: 65px">单位</td>
<td style="min-width: 100px">供应商</td>
<td style="width: 65px">数量</td>
<td style="width: 65px">单价</td>
<td style="width: 65px">合计</td>
<td style="min-width: 200px; line-height: normal">备注</td>
</tr>
<tr v-for="(item, index) in form.items" :key="index">
<td style="width: 60px">{{ index + 1 }}</td>
<td>{{ index + 1 }}</td>
<td>{{ item.materialName }}</td>
<td>{{ item.brand }}</td>
<td>{{ item.model }}</td>
<td style="width: 80px">{{ item.unit }}</td>
<td>{{ item.unit }}</td>
<td>{{ form.supplierName }}</td>
<td style="width: 100px">{{ item.outNum }}</td>
<td style="width: 150px">{{ item.outPrice }}</td>
<td>{{ item.outNum }}</td>
<td>{{ item.outPrice }}</td>
<td>{{ item.totalPrice }}</td>
<td>{{ item.remark }}</td>
</tr>
@@ -122,6 +122,7 @@ const cancelForm = () => {
margin-bottom: 10px;
}
.formBody {
font-size: 15px;
.navtitle {
text-align: center;
height: 41px;
@@ -146,15 +147,15 @@ const cancelForm = () => {
td {
border: 1px solid #dddddd; /* 现代浅灰色边框 */
height: 50px;
line-height: 45px;
line-height: normal;
background-color: rgba(255, 255, 255, 1);
font-size: 1rem;
font-size: 14px;
text-align: center;
font-weight: 450;
}
&.footertr td {
height: 90px;
height: 60px;
}
}
}
@@ -162,8 +163,13 @@ const cancelForm = () => {
.foorter {
display: grid;
grid-template-columns: repeat(3, 1fr);
width: 100%;
gap: 30px;
margin: 30px auto 0;
margin: 20px auto 0;
}
.formark {
font-size: smaller;
margin-top: 10px;
}
}
}

20
src/views/system/warehouse/IssueOut/add.vue
View File

@@ -23,12 +23,28 @@
</el-form-item>
<el-form-item label="供应商" prop="supplierId">
<el-select v-model="form.supplierId" placeholder="请选择供应商">
<el-option v-for="(item, index) in supplierlist" :key="index" :label="item.supplierName" :value="item.id" />
<el-option v-for="(item, index) in supplierlist" :key="index" :label="item.supplierName" :value="item.id">
<span style="float: left">{{ item.supplierName }}</span>
<span style="float: right; color: var(--el-text-color-secondary); font-size: 13px">
{{ item.villageName }}
</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="出库仓库" prop="warehouseId">
<el-select v-model="form.warehouseId" placeholder="请选择出库仓库">
<el-option v-for="(item, index) in warehouselist" :key="index" :label="item.warehouseName" :value="item.id" />
<el-option
v-for="(item, index) in warehouselist"
:key="index"
:disabled="item.status === '1'"
:label="item.warehouseName"
:value="item.id"
>
<span style="float: left">{{ item.warehouseName }}</span>
<span style="float: right; color: var(--el-text-color-secondary); font-size: 13px">
{{ item.villageName }}
</span>
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="出库状态" prop="operateStatus">-->

2
src/views/system/warehouse/Material/addMaterial.vue
View File

@@ -18,7 +18,7 @@
<el-input v-model.trim="form.unit" maxlength="20" placeholder="请输入计量单位" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model.trim="form.remark" :rows="5" maxlength="200" placeholder="请输入备注" show-word-limit type="textarea" />
<el-input v-model.trim="form.remark" :rows="5" maxlength="30" placeholder="请输入备注" show-word-limit type="textarea" />
</el-form-item>
<el-form-item style="margin-top: 30px">
<el-button type="primary" @click="submitForm">提交</el-button>

37
src/views/system/warehouse/PurchaseIn/Main.vue
View File

@@ -2,7 +2,7 @@
<div class="h-full flex flex-col p-2">
<pageHeader></pageHeader>
<div class="mainbody">
<div class="actionsbox">
<div class="actionsBox">
<el-button icon="Printer" type="primary" @click="handlePrint">打印</el-button>
<el-button @click="cancelForm">返回</el-button>
</div>
@@ -13,16 +13,16 @@
<table border>
<tbody>
<tr>
<td style="width: 90px">序号</td>
<td>物资名称</td>
<td>品牌</td>
<td>规格型号</td>
<td style="width: 80px">单位</td>
<td>供应商</td>
<td style="width: 80px">数量</td>
<td style="width: 80px">单价</td>
<td>合计</td>
<td>备注</td>
<td style="width: 85px">序号</td>
<td style="min-width: 75px">物资名称</td>
<td style="width: 75px">品牌</td>
<td style="width: 85px">规格型号</td>
<td style="width: 65px">单位</td>
<td style="min-width: 100px">供应商</td>
<td style="width: 65px">数量</td>
<td style="width: 65px">单价</td>
<td style="width: 65px">合计</td>
<td style="min-width: 200px; line-height: normal">备注</td>
</tr>
<tr v-for="(item, index) in form.items" :key="index">
<td>{{ index + 1 }}</td>
@@ -30,7 +30,9 @@
<td>{{ item.brand }}</td>
<td>{{ item.model }}</td>
<td>{{ item.unit }}</td>
<td>{{ form.supplierName }}</td>
<td>
{{ form.supplierName }}
</td>
<td>{{ item.inNum }}</td>
<td>{{ item.costPrice }}</td>
<td>{{ item.totalPrice }}</td>
@@ -117,11 +119,12 @@ const cancelForm = () => {
background-color: #fff;
margin-top: 20px;
border-radius: 5px;
.actionsbox {
.actionsBox {
text-align: right;
margin-bottom: 10px;
}
.formBody {
font-size: 15px;
.navtitle {
text-align: center;
height: 41px;
@@ -146,15 +149,15 @@ const cancelForm = () => {
td {
border: 1px solid #dddddd; /* 现代浅灰色边框 */
height: 50px;
line-height: 45px;
line-height: normal;
background-color: rgba(255, 255, 255, 1);
font-size: 1rem;
font-size: 14px;
text-align: center;
font-weight: 450;
}
&.footertr td {
height: 90px;
height: 60px;
}
}
}
@@ -164,7 +167,7 @@ const cancelForm = () => {
grid-template-columns: repeat(3, 1fr);
width: 100%;
gap: 30px;
margin: 30px auto 0;
margin: 20px auto 0;
}
.formark {
font-size: smaller;

14
src/views/system/warehouse/PurchaseIn/add.vue
View File

@@ -23,7 +23,12 @@
</el-form-item>
<el-form-item label="供应商" prop="supplierId">
<el-select v-model="form.supplierId" placeholder="请选择供应商">
<el-option v-for="(item, index) in supplierlist" :key="index" :label="item.supplierName" :value="item.id" />
<el-option v-for="(item, index) in supplierlist" :key="index" :label="item.supplierName" :value="item.id">
<span style="float: left">{{ item.supplierName }}</span>
<span style="float: right; color: var(--el-text-color-secondary); font-size: 13px">
{{ item.villageName }}
</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="入库仓库" prop="warehouseId">
@@ -34,7 +39,12 @@
:disabled="item.status === '1'"
:label="item.warehouseName"
:value="item.id"
/>
>
<span style="float: left">{{ item.warehouseName }}</span>
<span style="float: right; color: var(--el-text-color-secondary); font-size: 13px">
{{ item.villageName }}
</span>
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="入库状态" prop="operateStatus">-->