bonus
/
Zlpt_Portal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

冲突合并

This commit is contained in:
BianLzhaoMin 2024-11-28 10:04:51 +08:00
parent 0592ff5ea1 c6577dd0b9
commit 078f56595f
6 changed files with 635 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
components.d.ts vendored
View File

@ -3,41 +3,15 @@
// @ts-nocheck
// Generated by unplugin-vue-components
// Read more: https://github.com/vuejs/core/pull/3399
export {}
export { }
declare module 'vue' {
export interface GlobalComponents {
Breadcrumb: typeof import('./src/components/Breadcrumb/index.vue')['default']
ElButton: typeof import('element-plus/es')['ElButton']
ElCarousel: typeof import('element-plus/es')['ElCarousel']
ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
ElCascader: typeof import('element-plus/es')['ElCascader']
ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
ElCol: typeof import('element-plus/es')['ElCol']
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
ElDialog: typeof import('element-plus/es')['ElDialog']
ElEmpty: typeof import('element-plus/es')['ElEmpty']
ElForm: typeof import('element-plus/es')['ElForm']
ElFormItem: typeof import('element-plus/es')['ElFormItem']
ElIcon: typeof import('element-plus/es')['ElIcon']
ElImage: typeof import('element-plus/es')['ElImage']
ElInput: typeof import('element-plus/es')['ElInput']
ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
ElMenu: typeof import('element-plus/es')['ElMenu']
ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
ElOption: typeof import('element-plus/es')['ElOption']
ElPagination: typeof import('element-plus/es')['ElPagination']
ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
ElProgress: typeof import('element-plus/es')['ElProgress']
ElRow: typeof import('element-plus/es')['ElRow']
ElSelect: typeof import('element-plus/es')['ElSelect']
ElTable: typeof import('element-plus/es')['ElTable']
ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
ElTabPane: typeof import('element-plus/es')['ElTabPane']
ElTabs: typeof import('element-plus/es')['ElTabs']
ElTag: typeof import('element-plus/es')['ElTag']
ElUpload: typeof import('element-plus/es')['ElUpload']
EquipCard: typeof import('./src/components/equipCard.vue')['default']
EquipCardHall: typeof import('./src/components/equipCardHall/index.vue')['default']
EquipCardNew: typeof import('./src/components/equipCardNew/index.vue')['default']

5
env/.env.dev vendored
View File

@ -7,8 +7,13 @@ VITE_API_URL = '/proxyApi'
# 开发环境接口地址
# VITE_proxyTarget = 'http://10.40.92.74:8080' #盛旭
<<<<<<< HEAD
VITE_proxyTarget = 'http://localhost:18080' # 马帅
# VITE_proxyTarget = 'http://192.168.0.244:28580' # 马帅
=======
# VITE_proxyTarget = 'http://192.168.2.246:28080' # 马帅
VITE_proxyTarget = 'http://192.168.0.244:28580' # 马帅
>>>>>>> dev-sy
# VITE_proxyTarget = 'http://192.168.2.129:18080' # 马帅
# VITE_proxyTarget = 'http://10.40.92.185:9206' # 赵福海 ( 设备类型)

2
src/http/api/usercenter/goodsmang.ts
View File

@ -32,7 +32,7 @@ export const getCompanyListApi = () => {
// 删除接口
export const removeDeviceApi = (data: any) => {
return post('/zlpt-equip/dev/remove', data)
return post('/material-mall/dev/remove', data)
}
// 上下架（批量）

12
src/router/index.ts
View File

@ -228,6 +228,18 @@ const routes: Array<RouteRecordRaw> = [
isLogin: true
},
},
/* 订单管理（订单详情） */
{
path: 'orderManagementInfo',
name: 'orderManagementInfo',
component: () => import('@/views/user/orderManagement/detail.vue'),
meta: {
title: '订单详情',
keepAlive: true,
AuthFlag: false,
isLogin: false
},
},
/* 订单管理（退租） */
{
path: 'rentinTermination',

39
src/views/user/goodsManagement/index.vue
View File

@ -112,7 +112,6 @@
console.log(queryParams.value.pageNum, '***9999', queryParams.value.pageSize)
const res: any = await getEquipmentListApi(queryParams.value)
console.log(res, '列表数据**--**')
total.value = res.total
tableData.value = res.rows.filter((item: any) => item !== null)
}
@ -164,22 +163,23 @@
isEditDisabled.value = false
}
// 删除按钮
const deleteRowInfo = async (row: any) => {
const deleteRowInfo = async (row: any) => {
ElMessageBox.confirm('是否确定删除？', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
const res: any = removeDeviceApi([row.maId])
if (res.code === 200) {
ElMessage({
type: 'success',
message: '删除成功'
})
getList()
}
return removeDeviceApi([row.maId])
}).then((res) => {
if (res.code === 200) {
ElMessage({
type: 'success',
message: '删除成功'
})
getList()
}
}).catch(() => {})
}
}
//获取详情接口
const getDetailData = async(row: any) => {
console.log(row,"----row----")
@ -236,13 +236,14 @@
ElMessage({type: 'error',message: '请选择要操作的数据'})
return
}
const res: any = updateUpDownApi({maIds,maStatus})
if (res.code === 200) {
return updateUpDownApi({maIds,maStatus})
}).then((res) => {
if (res.code == 200) {
ElMessage({
type: 'success',
message: '操作成功'
})
queryTableList()
getList()
}
}).catch(() => {})
}
@ -736,8 +737,8 @@
<el-table-column align="center" label="装备状态" width="80px">
<template #default="{ row }">
<el-tag v-if="row.maStatus == 0" size="small" type="info">草稿状态</el-tag>
<el-tag v-if="row.maStatus == 1" size="small" type="warning">上架</el-tag>
<el-tag v-if="row.maStatus == 2" size="small" type="success">下架</el-tag>
<el-tag v-if="row.maStatus == 1" size="small" type="warning">下架</el-tag>
<el-tag v-if="row.maStatus == 2" size="small" type="success">上架</el-tag>
<el-tag v-if="row.maStatus == 3" size="small" type="danger">在租</el-tag>
</template>
</el-table-column>

451
src/views/user/orderManagement/index.vue
View File

@ -119,9 +119,9 @@ const clickConfirmReceipt = (row: any) => {
}
const settleinTitle = ref('')
/* 编辑 */
/* 编辑 **********/
const isEditDisabled = ref(false)
// 装备入驻弹框显示隐藏
// 退租检修弹框显示隐藏
const dialogFormVisibleSettlein: any = ref(false)
const equipmentDeploymentParams: any = ref({
/* 设备名称 */
@ -269,9 +269,128 @@ const handleViewBack = () => {
insureList: [],
picList: [],
}
// 打开入驻弹框
dialogFormVisibleSettlein.value = true
}
const settlemoneyTitle = ref('')
const moneyParams1: any = ref({
/* 设备名称 */
deviceName: '',
deviceTypeList: [],
deviceCount: 1,
unitName: '',
})
const moneyParams2: any = ref({
/* 设备名称 */
deviceName: '',
deviceTypeList: [],
deviceCount: 1,
unitName: '',
})
const moneyParams3: any = ref({
/* 设备名称 */
deviceName: '',
deviceTypeList: [],
deviceCount: 1,
unitName: '',
})
const tableData: any = ref([
{
name1:'测试1',
name2:'测试1-1',
name3:'测试1-2',
jy1:'外观1-1',
jy2:'故障1-2',
jy3:'外观1-2',
jy4:'故障1-2',
jy5:'外观1-3',
jy6:'故障1-3',
jy7:'',
jy8:'',
remark:'备注1',
},
{
name1:'测试2',
name2:'测试2-1',
name3:'测试2-2',
jy1:'外观2-1',
jy2:'故障2-2',
jy3:'外观2-2',
jy4:'故障2-2',
jy5:'外观2-3',
jy6:'故障2-3',
jy7:'',
jy8:'',
remark:'备注2',
}
])
const partItems1: any = ref([{}])
const partItems2: any = ref([{}])
const partItems3: any = ref([{}])
// 费用结算弹框显示隐藏
const dialogFormVisibleSettlemoney: any = ref(false)
//费用结算
const handleViewMoney = () => {
settlemoneyTitle.value = '费用结算'
moneyParams1.value = {
/* 设备状态 */
maStatus: 15,
detectionList: [],
insureList: [],
picList: []
}
moneyParams2.value = {
/* 设备状态 */
maStatus: 15,
detectionList: [],
insureList: [],
picList: []
}
moneyParams3.value = {
/* 设备状态 */
maStatus: 15,
detectionList: [],
insureList: [],
picList: []
}
// 打开退组检修弹框
dialogFormVisibleSettlemoney.value = true
}
//维修费用
const addPartItem1=()=> {
partItems1.value.push({ partType: "", num: "", isCharge: "" });
}
const removePartItem1 =(index:number)=> {
if (partItems1.value.length > 1) {
partItems1.value.splice(index, 1);
}
}
//报废费用
const addPartItem2=()=> {
partItems2.value.push({ partType: "", num: "", isCharge: "" });
}
const removePartItem2 =(index:number)=> {
if (partItems2.value.length > 1) {
partItems2.value.splice(index, 1);
}
}
//报废费用 修改
//报废费用 修改
//报废费用 修改
//报废费用 修改
const addPartItem3=()=> {
partItems3.value.push({ partType: "", num: "", isCharge: "" });
}
const removePartItem3 =(index:number)=> {
if (partItems3.value.length > 1) {
partItems3.value.splice(index, 1);
}
}
</script>
<template>
@ -623,7 +742,7 @@ const handleViewBack = () => {
退租检修
</el-button>
<el-button
@click="handleViewOrder(j)"
@click="handleViewMoney(j)"
type="text"
size="mini"
style="color: #blue; font-weight: bold"
@ -904,6 +1023,326 @@ const handleViewBack = () => {
</template>
</el-dialog>
</div>
<!-- 费用结算弹框 -->
<el-dialog
v-model="dialogFormVisibleSettlemoney"
:title="settlemoneyTitle"
width="60%"
align-center
:close-on-click-modal="false"
>
<div style="height: 80px">
<div
class="info"
style="margin-top: 5px; margin-bottom: 8px; display: flex; flex-wrap: wrap"
>
<div
class="item"
style="
width: 30%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 16px;
margin-left: 40px;
"
>
<span>订单编号：10000212135656</span>
</div>
<div
class="item"
style="width: 30%; flex-shrink: 0; margin-bottom: 5px; font-size: 16px"
>
<span>装备套数：2套</span>
</div>
<div
class="item"
style="width: 30%; flex-shrink: 0; margin-bottom: 5px; font-size: 16px"
>
<span>退租时间：2024-10-10 10:00:00</span>
</div>
</div>
<div class="info" style="margin-top: 5px; display: flex; flex-wrap: wrap">
<div
class="item"
style="
width: 30%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 16px;
margin-left: 40px;
"
>
<span>结算单位：安徽送变电公司</span>
</div>
<div
class="item"
style="width: 30%; flex-shrink: 0; margin-bottom: 5px; font-size: 16px"
>
<span>租赁天数：30{{ '/天' }}</span>
</div>
<div
class="item"
style="width: 30%; flex-shrink: 0; margin-bottom: 5px; font-size: 16px"
>
<span>租赁费用(元)：1800</span>
</div>
</div>
<div class="title">
<span class="title-sign"></span>
<span class="title-text">退租检测信息</span>
</div>
</div>
<!-- 表格 -->
<el-table
:data="tableData"
class="table"
style="margin-left: 50px; width: 1100px"
row-key="id"
show-overflow-tooltip
:header-cell-style="{ background: 'white', color: 'black' }"
>
<el-table-column label="序号" align="center" width="80" type="index"></el-table-column>
<el-table-column align="center" prop="name1" label="机具名称" />
<el-table-column align="center" prop="name2" label="规格型号" />
<el-table-column align="center" prop="name3" label="装备编码" />
<el-table-column align="center" prop="typeName" label="检验内容">
<el-table-column label="外观检验" align="center" prop="jy1" />
<el-table-column label="故障检验" align="center" prop="jy2" />
</el-table-column>
<el-table-column align="center" prop="typeName" label="维修内容">
<el-table-column label="外观检验" align="center" prop="jy3" />
<el-table-column label="故障检验" align="center" prop="jy4" />
</el-table-column>
<el-table-column align="center" prop="typeName" label="金额">
<el-table-column label="外观检验" align="center" prop="jy5" />
<el-table-column label="故障检验" align="center" prop="jy6" />
</el-table-column>
<el-table-column align="center" prop="typeName" label="附件">
<el-table-column label="外观检验" align="center" prop="jy7" />
<el-table-column label="故障检验" align="center" prop="jy8" />
</el-table-column>
<el-table-column align="center" label="备注" prop="remark" width="80px">
</el-table-column>
</el-table>
<div class="title">
<span class="title-sign"></span>
<span class="title-text">费用结算</span>
</div>
<div>
<span style="color: #ff9900; margin-left: 100px">● </span>
<span class="title-text">维修费用</span>
</div>
<el-form label-width="240" ref="ruleFormRef2" :model="moneyParams1">
<div v-for="(item, index) in partItems1" :key="index" class="dynamic-item">
<div
style="
margin-top: 10px;
margin-left: 180px;
margin-bottom: 5px;
font-size: 18px;
"
>
设备：{{ index + 1 }}
</div>
<el-row>
<el-form-item label="关联装备" prop="partType">
<el-select
v-model="item.device"
placeholder="请选择"
clearable
style="width: 300px"
>
<el-option label="设备1" value="0"></el-option>
<el-option label="设备2" value="1"></el-option>
<el-option label="设备3" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="维修数量" prop="partNum">
<el-input
v-model="item.partNum"
placeholder="请输入"
maxlength="20"
style="width: 300px"
>
</el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="维修费用" prop="partNum">
<el-input
v-model="item.partNum"
placeholder="请输入"
maxlength="20"
style="width: 300px"
>
</el-input>
</el-form-item>
<el-form-item label="维修类型" prop="isCharge">
<el-select
v-model="item.isCharge"
placeholder="请选择"
filterable
clearable
style="width: 300px"
>
<el-option label="维修类型1" value="0"></el-option>
<el-option label="维修类型2" value="1"></el-option>
<el-option label="维修类型3" value="2"></el-option>
</el-select>
</el-form-item>
</el-row>
<el-row>
<div style="margin-left: 130px">
<el-button @click="addPartItem1" type="success"> 增加维修设备</el-button>
<el-button @click="removePartItem1(index)" v-if="index != 0" type="danger">
删除维修设备</el-button
>
</div>
</el-row>
</div>
</el-form>
<div style="margin-top: 10px">
<span style="color: #ff9900; margin-left: 100px">● </span>
<span class="title-text">报废费用</span>
</div>
<el-form label-width="240" ref="ruleFormRef3" :model="moneyParams2">
<div v-for="(item, index) in partItems2" :key="index" class="dynamic-item">
<div
style="
margin-top: 10px;
margin-left: 180px;
margin-bottom: 5px;
font-size: 18px;
"
>
设备：{{ index + 1 }}
</div>
<el-row>
<el-form-item label="关联装备" prop="partType">
<el-select
v-model="item.device"
placeholder="请选择"
clearable
style="width: 300px"
>
<el-option label="设备1" value="0"></el-option>
<el-option label="设备2" value="1"></el-option>
<el-option label="设备3" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="报废数量" prop="partNum">
<el-input
v-model="item.partNum"
placeholder="请输入"
maxlength="20"
style="width: 300px"
>
</el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="报废费用" prop="partNum">
<el-input
v-model="item.partNum"
placeholder="请输入"
maxlength="20"
style="width: 300px"
>
</el-input>
</el-form-item>
<el-form-item label="报废原因" prop="isCharge">
<el-input
v-model="item.isCharg"
placeholder="请输入"
maxlength="20"
style="width: 300px"
>
</el-input>
</el-form-item>
</el-row>
<el-row>
<div style="margin-left: 130px">
<el-button @click="addPartItem2" type="success"> 增加报废设备</el-button>
<el-button @click="removePartItem2(index)" v-if="index != 0" type="danger">
删除报废设备</el-button
>
</div>
</el-row>
</div>
</el-form>
<div style="margin-top: 10px">
<span style="color: #ff9900; margin-left: 100px">● </span>
<span class="title-text">丢失费用</span>
</div>
<el-form label-width="240" ref="ruleFormRef4" :model="moneyParams3">
<div v-for="(item, index) in partItems3" :key="index" class="dynamic-item">
<div
style="
margin-top: 10px;
margin-left: 180px;
margin-bottom: 5px;
font-size: 18px;
"
>
设备：{{ index + 1 }}
</div>
<el-row>
<el-form-item label="关联装备" prop="partType">
<el-select
v-model="item.device"
placeholder="请选择"
clearable
style="width: 300px"
>
<el-option label="设备1" value="0"></el-option>
<el-option label="设备2" value="1"></el-option>
<el-option label="设备3" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="丢失数量" prop="partNum">
<el-input
v-model="item.partNum"
placeholder="请输入"
maxlength="20"
style="width: 300px"
>
</el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="丢失费用" prop="partNum">
<el-input
v-model="item.partNum"
placeholder="请输入"
maxlength="20"
style="width: 300px"
>
</el-input>
</el-form-item>
</el-row>
<el-row>
<div style="margin-left: 130px">
<el-button @click="addPartItem3" type="success"> 增加丢失设备</el-button>
<el-button @click="removePartItem3(index)" v-if="index != 0" type="danger">
删除丢失设备</el-button
>
</div>
</el-row>
</div>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button type="primary" @click="closeDialogBtn">关 闭</el-button>
<el-button @click="submitBtn" type="success"> 保存 </el-button>
</span>
</template>
</el-dialog>
</template>
<style lang="scss" scoped>