From 0b7fe3c0a2e9b5d2d85d3c3eae9bde87935c26e4 Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Thu, 28 Nov 2024 13:43:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=87=BA=E7=A7=9F=E6=96=B9=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2=E4=BB=A5=E5=8F=8A=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.ts | 6 + src/router/index.ts | 28 +- src/views/user/orderManagement/detail.vue | 26 +- src/views/user/orderManagement/index.vue | 1009 +++++++--- src/views/user/orderManagementCz/detail.vue | 296 +++ src/views/user/orderManagementCz/index.vue | 1998 +++++++++++++++++-- 6 files changed, 2893 insertions(+), 470 deletions(-) create mode 100644 src/views/user/orderManagementCz/detail.vue diff --git a/components.d.ts b/components.d.ts index 1c25140..4818588 100644 --- a/components.d.ts +++ b/components.d.ts @@ -8,9 +8,12 @@ export {} declare module 'vue' { export interface GlobalComponents { Breadcrumb: typeof import('./src/components/Breadcrumb/index.vue')['default'] + ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] + ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] 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'] @@ -18,6 +21,7 @@ declare module 'vue' { ElDialog: typeof import('element-plus/es')['ElDialog'] ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] + ElHeader: typeof import('element-plus/es')['ElHeader'] ElIcon: typeof import('element-plus/es')['ElIcon'] ElImage: typeof import('element-plus/es')['ElImage'] ElInput: typeof import('element-plus/es')['ElInput'] @@ -28,6 +32,8 @@ declare module 'vue' { ElProgress: typeof import('element-plus/es')['ElProgress'] ElRow: typeof import('element-plus/es')['ElRow'] ElSelect: typeof import('element-plus/es')['ElSelect'] + ElStep: typeof import('element-plus/es')['ElStep'] + ElSteps: typeof import('element-plus/es')['ElSteps'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] ElTag: typeof import('element-plus/es')['ElTag'] diff --git a/src/router/index.ts b/src/router/index.ts index ef4d61a..5432dd7 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -216,7 +216,7 @@ const routes: Array = [ }, }, - /* 订单管理（求租方） */ + /* 订单管理（承租方） */ { path: 'orderManagement', name: 'orderManagement', @@ -228,7 +228,31 @@ const routes: Array = [ isLogin: true }, }, - /* 订单管理（订单详情） */ + /* 订单管理（出租方） */ + { + path: 'orderManagementBuy', + name: 'orderManagementBuy', + component: () => import('@/views/user/orderManagementCz/index.vue'), + meta: { + title: '订单管理（求租）', + keepAlive: true, + AuthFlag: false, + isLogin: true + }, + }, + /* 订单管理（订单详情出租） */ + { + path: 'orderManagementInfoBuy', + name: 'orderManagementInfoBuy', + component: () => import('@/views/user/orderManagementCz/detail.vue'), + meta: { + title: '订单详情', + keepAlive: true, + AuthFlag: false, + isLogin: false + }, + }, + /* 订单管理（订单详情承租） */ { path: 'orderManagementInfo', name: 'orderManagementInfo', diff --git a/src/views/user/orderManagement/detail.vue b/src/views/user/orderManagement/detail.vue index 3c9dfd6..785fc36 100644 --- a/src/views/user/orderManagement/detail.vue +++ b/src/views/user/orderManagement/detail.vue @@ -6,7 +6,7 @@ import { getOrderListInfoApi } from 'http/api/usercenter/seekorder' const route = useRoute() /* 查询参数 */ const cardList = ref({}) -const orderStatusTemp = ref(0) +const orderStatusTemp = ref(0) const idTemp = ref('') const titleStaus = ref('') // 获取数据列表 @@ -19,21 +19,24 @@ const titleStaus = ref('') // 根据步骤的 Id 返回对应的标题 const getStepTitle = (stepId:number)=> { - if (orderStatusTemp.value === 1) { + if (orderStatusTemp.value === 2) { titleStaus.value= '待出库' ; return stepId === 1 ? '待出库' : ''; - } else if (orderStatusTemp.value === 2) { + } else if (orderStatusTemp.value === 3) { titleStaus.value= '待收货' ; return stepId === 1 ? '已出库' : stepId === 2 ? '待收货' : ''; - } else if (orderStatusTemp.value === 3) { + } else if (orderStatusTemp.value === 4) { titleStaus.value= '租赁中' ; return stepId === 1 ? '已出库' : stepId === 2 ? '已收货' : stepId === 3 ? '租赁中' : ''; - } else if (orderStatusTemp.value === 4) { - titleStaus.value= '发起费用结算' ; - return stepId === 1 ? '已出库' : stepId === 2 ? '已收货' : stepId === 3 ? '租赁结束' : stepId === 4 ? '发起费用结算' : ''; } else if (orderStatusTemp.value === 5) { + titleStaus.value= '已退租' ; + return stepId === 1 ? '已出库' : stepId === 2 ? '已收货' : stepId === 3 ? '租赁结束' : stepId === 4 ? '已退租' : ''; + } else if (orderStatusTemp.value === 6) { titleStaus.value= '已完成' ; return stepId === 1 ? '已出库' : stepId === 2 ? '已收货' : stepId === 3 ? '租赁结束' : stepId === 4 ? '已退租' : stepId === 5 ? '已完成' : ''; + } else if(orderStatusTemp.value === 7) { + titleStaus.value= '已驳回' ; + return stepId === 1 ? '已驳回' : ''; } titleStaus.value='' return ''; // 默认返回空字符串 @@ -70,7 +73,7 @@ const time = ref([])
- 订单管理 + 订单管理 订单明细
@@ -85,12 +88,12 @@ const time = ref([]) - + - +
@@ -179,6 +182,7 @@ const time = ref([])
{{"租赁中"}}
{{"已退租"}}
{{"已完成"}}
+
{{"已驳回"}}
@@ -210,7 +214,7 @@ const time = ref([]) diff --git a/src/views/user/orderManagementCz/index.vue b/src/views/user/orderManagementCz/index.vue index 5fd0b43..fe4e8cc 100644 --- a/src/views/user/orderManagementCz/index.vue +++ b/src/views/user/orderManagementCz/index.vue @@ -1,147 +1,1893 @@ - From 29bc0bdb6fc8f9f28ae00dbf28a4e3007238546f Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Thu, 28 Nov 2024 18:02:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=80=E6=9C=89=E7=9A=84=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.ts | 5 + env/.env.dev | 7 +- src/http/api/usercenter/seekorder.ts | 10 + src/views/user/orderManagement/detail.vue | 53 +- src/views/user/orderManagement/index.vue | 1146 ++----------------- src/views/user/orderManagementCz/detail.vue | 45 +- src/views/user/orderManagementCz/index.vue | 142 ++- 7 files changed, 303 insertions(+), 1105 deletions(-) diff --git a/components.d.ts b/components.d.ts index 4818588..433e700 100644 --- a/components.d.ts +++ b/components.d.ts @@ -19,16 +19,19 @@ declare module 'vue' { 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'] ElHeader: typeof import('element-plus/es')['ElHeader'] 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'] @@ -36,6 +39,8 @@ declare module 'vue' { ElSteps: typeof import('element-plus/es')['ElSteps'] 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'] diff --git a/env/.env.dev b/env/.env.dev index fa89272..99b99dd 100644 --- a/env/.env.dev +++ b/env/.env.dev @@ -7,13 +7,8 @@ VITE_API_URL = '/proxyApi' # 开发环境接口地址 # VITE_proxyTarget = 'http://10.40.92.74:8080' #盛旭 -<<<<<<< HEAD -VITE_proxyTarget = 'http://localhost:18080' # 马帅 +VITE_proxyTarget = 'http://localhost:28080' # 马帅 # 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' # 赵福海 ( 设备类型) diff --git a/src/http/api/usercenter/seekorder.ts b/src/http/api/usercenter/seekorder.ts index 6a7a9f2..dbed1b0 100644 --- a/src/http/api/usercenter/seekorder.ts +++ b/src/http/api/usercenter/seekorder.ts @@ -11,3 +11,13 @@ export const getOrderListApi = (data: any) => { export const getOrderListInfoApi = (data: any) => { return get('/material-mall/order/getOrderDetailsById',data) } + +//出库 +export const passApi = (data: any) => { + return post('/material-mall/order/updateOrderStatus',data) +} + +//驳回 +export const failApi = (data: any) => { + return post('/material-mall/order/updateOrderStatus',data) +} \ No newline at end of file diff --git a/src/views/user/orderManagement/detail.vue b/src/views/user/orderManagement/detail.vue index 785fc36..8eef986 100644 --- a/src/views/user/orderManagement/detail.vue +++ b/src/views/user/orderManagement/detail.vue @@ -9,14 +9,12 @@ const cardList = ref({}) const orderStatusTemp = ref(0) const idTemp = ref('') const titleStaus = ref('') -// 获取数据列表 -// const getList = async () => { -// const res: any = await getOrderListApi() -// console.log('获取数据列表***', res) -// tableData.value = res.rows -// total.value = res.total -// } - +//描述信息 +const operationDetails = ref({ + 1: { title: '已出库', preOutboundUser: '', preOutboundTime: '' }, + 2: { title: '已收货', takeOverUser: '', takeOverTime: '' }, + 3: { title: '租赁结束', rentOverUser: '', rentOverTime: '' }, + }) // 根据步骤的 Id 返回对应的标题 const getStepTitle = (stepId:number)=> { if (orderStatusTemp.value === 2) { @@ -42,6 +40,28 @@ const getStepTitle = (stepId:number)=> { return ''; // 默认返回空字符串 } + // 根据步骤的 Id 返回对应的描述 + const getDescription=(desId:number)=>{ + const operation = operationDetails.value[desId]; + if (operation.title=="已出库" && titleStaus.value!= "待出库" ) { + return ` + 操作人：${operation.preOutboundUser==null ? ' ': operation.preOutboundUser} + 操作时间：${operation.preOutboundTime==null ? ' ': operation.preOutboundTime} + `; + }else if(operation.title=="已收货" && titleStaus.value!= "待收货" && titleStaus.value!= "待出库"){ + return ` + 操作人：${operation.takeOverUser==null ? ' ': operation.takeOverUser} + 操作时间：${operation.takeOverTime==null ? ' ': operation.takeOverTime} + `; + }else if(operation.title=="租赁结束" && (titleStaus.value!= "待收货" && titleStaus.value!= "待出库" && titleStaus.value!= "租赁中")){ + return ` + 操作人：${operation.rentOverUser==null ? ' ': operation.rentOverUser} + 操作时间：${operation.rentOverTime==null ? ' ': operation.rentOverTime} + `; + } + return ''; // 默认返回空描述 + } + const getId = ()=>{ orderStatusTemp.value = Number(route.query.orderStatusTemp) idTemp.value = String(route.query.idTemp) @@ -55,6 +75,13 @@ const getList = async () => { const res: any = await getOrderListInfoApi(params) cardList.value = res.data + operationDetails.value[1].preOutboundUser = res.data.detailsList[0].preOutboundUser + operationDetails.value[1].preOutboundTime = res.data.detailsList[0].preOutboundTime + operationDetails.value[2].takeOverUser = res.data.detailsList[0].takeOverUser + operationDetails.value[2].takeOverTime = res.data.detailsList[0].takeOverTime + operationDetails.value[3].rentOverUser = res.data.detailsList[0].rentOverUser + operationDetails.value[3].rentOverTime = res.data.detailsList[0].rentOverTime + } onBeforeMount(()=>{ @@ -89,9 +116,9 @@ const time = ref([]) - - - + + + @@ -184,7 +211,7 @@ const time = ref([])
{{"已完成"}}
{{"已驳回"}}
- +
diff --git a/src/views/user/orderManagement/index.vue b/src/views/user/orderManagement/index.vue index 78483e5..302134b 100644 --- a/src/views/user/orderManagement/index.vue +++ b/src/views/user/orderManagement/index.vue @@ -2,11 +2,12 @@ import { ref } from 'vue' import PagingComponent from 'components/PagingComponent/index.vue' import { useRouter } from 'vue-router' -import { getOrderListApi } from 'http/api/usercenter/seekorder' +import { getOrderListApi,passApi } from 'http/api/usercenter/seekorder' import uploadComponent from 'components/uploadComponent/index.vue' import previewImg from './previewImg/index.vue' -import { ElMessage } from 'element-plus' +import { ElMessage,ElMessageBox } from 'element-plus' import { useStore } from 'store/user' +import type { FormInstance } from 'element-plus' const store = useStore() import { mainStore } from 'store/main' const store2 = mainStore() @@ -23,6 +24,8 @@ const queryParams: any = ref({ startTime: '', endTime: '', }) +const queryFormRef = ref() +const numberTemp = ref(0) const time = ref([]) const router = useRouter() const pageSize = 20 @@ -32,25 +35,35 @@ const cardList = ref([]) const status = 0 const statusList = [ { id: '2', name: '待出库' }, - { id: '3', name: '已出库' }, + { id: '3', name: '待收货' }, { id: '4', name: '租赁中' }, { id: '5', name: '已退租' }, { id: '6', name: '已完成' }, { id: '7', name: '已驳回' }, ] -// 获取数据列表 -// const getList = async () => { -// const res: any = await getOrderListApi() -// console.log('获取数据列表***', res) -// tableData.value = res.rows -// total.value = res.total + +// const dateTimeConvert=(param:string)=>{ +// const time = param; +// // 创建一个新的Date对象 +// const dateStart = new Date(time); + +// // 获取年、月和日 +// const year = dateStart.getUTCFullYear(); +// const month = (dateStart.getUTCMonth() + 1).toString().padStart(2, '0'); // 月份从0开始，需要加1 +// const day = dateStart.getUTCDate().toString().padStart(2, '0'); +// // 拼接成年月日格式 +// const dateString = `${year}-${month}-${day}` +// return dateString; // } + + /** 查询列表 */ const getList = async () => { if (time.value.length > 0) { - console.log('time', time) - queryParams.value.startTime = time.value[0] - queryParams.value.endTime = time.value[1] + const dateStart = new Date(time.value[0]); + const dateEnd = new Date(time.value[1]); + queryParams.value.startTime = dateStart.toLocaleDateString('en-CA') + queryParams.value.endTime = dateEnd.toLocaleDateString('en-CA') } else { queryParams.value.startTime = undefined queryParams.value.endTime = undefined @@ -74,12 +87,22 @@ onMounted(() => { // 查询按钮 const queryTableList = () => { + queryParams.value.pageNum=1 getList() } + +// 重置 +const resetTableList = (formEl: FormInstance | undefined) => { + if (!formEl) return + formEl.resetFields() + time.value = [] + queryTableList() +} + // 全选事件 const onChangeCompany = (e: boolean, index: number, item: any) => { cardList.value[index].detailsList.forEach((item:any)=>{ - if(item.orderStatus=="2"){ + if(item.orderStatus=="3"){ item.isChecked = e; } }) @@ -89,16 +112,53 @@ const onChangeCompany = (e: boolean, index: number, item: any) => { const onChangeGoods = (index: number) => { let flag = true; for (let item of cardList.value[index].detailsList) { - if (item.orderStatus == "2" && item.isChecked != true) { + if (item.orderStatus == "3" && item.isChecked != true) { flag = false; break; } } + console.log('2222222',cardList.value[index]) cardList.value[index].isChecked = flag; } - // 计算是否过期 - const isExpired=(goods:any)=> { +// 确认收获按钮 + const confirmReceipt = async (index: number) => { + let ids: number[] = []; + cardList.value[index].detailsList.forEach((item:any)=>{ + if(item.orderStatus=="3"&&item.isChecked==true){ + ids.push(item.id) + } + }) + if(ids.length==0){ + ElMessage({ + showClose: false, + message: '请选择装备', + type: 'error', + }) + return + }else{ + ElMessageBox.confirm('是否确定收获？', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + }).then(() => { + return passApi({'ids':ids,'orderStatus':4}) + }).then((res) => { + if (res.code === 200) { + ElMessage({ + type: 'success', + message: '确定收获成功' + }) + numberTemp.value = numberTemp.value+1; + getList() + } + }).catch(() => {}) + } + } + + +// 计算是否过期 +const isExpired=(goods:any)=> { // 获取当前日期并去掉时间部分 const today = new Date(); today.setHours(0, 0, 0, 0); @@ -110,202 +170,36 @@ const onChangeGoods = (index: number) => { return endTime < today; } -/* 退租按钮 */ -const clickRentingTermination = () => { - router.push({ name: 'rentinTermination' }) - console.log('退租') -} - -/* 查看按钮 */ -const clickPreviewDetails = (row: any) => { - console.log('查看', row) - router.push({ - name: 'orderDetails', - query: { - orderId: row.orderId, - }, - }) -} - -/* 续租按钮 */ -const clickRenewalOfLease = ({ row }: any) => { - console.log('续租', row) - router.push({ - name: 'renewalOfLease', - query: { - orderId: row.orderId, - }, - }) -} - -/* 确认收货 */ -const clickConfirmReceipt = (row: any) => { - console.log('确认收货') - router.push({ - name: 'orderDetails', - query: { - orderId: row.orderId, - confirm: 'true', - }, - }) -} - const settleinTitle = ref('') /* 编辑 **********/ const isEditDisabled = ref(false) -// 退租检修弹框显示隐藏 -const dialogFormVisibleSettlein: any = ref(false) -const equipmentDeploymentParams: any = ref({ - /* 设备名称 */ - deviceName: '', - deviceTypeList: [], - deviceCount: 1, - unitName: '', - code: '', - brand: '', - typeId: '', - companyId: '', - productionDate: '', - dayLeasePrice: '', - person: '', - personPhone: '', - deviceWeight: '', -}) -const mainFileList: any = ref([]) //检测文件1 -const detailsFileList: any = ref([]) //检测文件2 //图片查看弹窗 const dialogVisible: any = ref(false) const dialogImageUrl = ref('') -//上传 -const upload: any = ref({ - // 设置上传的请求头部 - headers: { Authorization: 'Bearer ' + store2.token }, - // 上传的地址 - url: import.meta.env.VITE_API_URL + '/file/upload', -}) -// 文件上传前处理-上传大小 -const beforeUpload = (file: any) => { - if (file.size / 1024 / 1024 > 2) { - ElMessage({ - type: 'error', - message: '上传文件大小不能超过2M!', - }) - // this.$message.error({ message: `上传文件大小不能超过2M!`,}); - return false - } -} -// 文件上传失败 -const uploadError = () => { - ElMessage({ - type: 'error', - message: '上传文件失败!', - }) - // this.$message.error({message: `上传文件失败!`}); -} -// 文件上传成功处理 -const handleFileSuccess = (response: any) => { - if (response.code == 200) { - let obj = { - // modelId:this.maId, - fileName: response.data.name.split('/')[4], - fileUrl: response.data.url, - } - console.log(obj) - mainFileList.value.push(obj) + +// 发起退租 +const handleViewBack = async (index: Number, row: any) => { + let ids: number[] = []; + ids.push(row.id) + ElMessageBox.confirm('是否确定发起退租？', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + }).then(() => { + return passApi({'ids':ids,'orderStatus':5}) + }).then((res) => { + if (res.code === 200) { ElMessage({ type: 'success', - message: '上传成功！', + message: '发起退租成功' }) - console.log(mainFileList.value) - } + numberTemp.value = numberTemp.value+1; + getList() + } + }).catch(() => {}) } -// 文件上传成功处理 -const handleFileSuccess2 = (response: any) => { - if (response.code == 200) { - let obj = { - // modelId:this.maId, - fileName: response.data.name.split('/')[4], - fileUrl: response.data.url, - } - console.log(obj) - detailsFileList.value.push(obj) - ElMessage({ - type: 'success', - message: '上传成功！', - }) - console.log(detailsFileList.value) - } -} -//退租检修 - const handleViewBack = () => { - settleinTitle.value = '退租检修' - isEditDisabled.value = true - equipmentDeploymentParams.value = { - /* 企业Id */ - // ownCo: mainStore().userInfo.companyId, - /* 租赁范围 */ - leaseScope: '', - /* 设备所在地 */ - location: '', - /* 省 */ - provinceId: '', - /* 市 */ - cityId: '', - /* 区 */ - areaId: '', - /* 设备所在地 省 */ - addressEconomize: '', - /* 设备所在地 市 */ - addressProvince: '', - /* 设备所在地 区 */ - addressArea: '', - /* 设备类型 */ - typeId: '', - /* 设备类型大类 */ - deviceType: '', - /* 设备类型子类 */ - deviceTypeSon: '', - /* 设备类型小类*/ - deviceTypeSun: '', - /* 设备品牌 */ - brand: '', - /* 设备型号 */ - modelName: '', - /* 出场日期 */ - productionDate: '', - /* 工作小时数 */ - workingHours: '', - /* 整机序列号 */ - serialNumber: '', - /* 月租金 */ - monthLeasePrice: '', - /* 日租金 */ - dayLeasePrice: '', - /* 是否提供机手 */ - isOperator: '', - /* 机手月费用 */ - jsMonthPrice: '', - /* 机手日费用 */ - jsDayPrice: '', - /* 详细说明 */ - description: '', - /* 设备主图片 */ - picUrl: '', - /* 检测信息 ，保险信息*/ - fileList: [], - /* 设备状态 */ - maStatus: 15, - detectionList: [], - insureList: [], - picList: [] - } - // 打开退组检修弹框 - dialogFormVisibleSettlein.value = true - } - -const settlemoneyTitle = ref('') const moneyParams1: any = ref({ /* 设备名称 */ deviceName: '', @@ -313,114 +207,6 @@ const moneyParams1: any = ref({ 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); - } - } - const settleListTitle = ref('') // 费用清单弹框显示隐藏 const dialogFormVisibleSettleList: any = ref(false) @@ -506,58 +292,12 @@ const tableData4: any = ref([ dialogFormVisibleSettleList.value = true } -const tableData5: 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 settleRepairTitle = ref('') -// 检修详情弹框显示隐藏 -const dialogFormVisibleSettleRepair: any = ref(false) - //检修详情 - const handleViewRepair = () => { - settleListTitle.value = '检修详情' - moneyParams1.value = { - /* 设备状态 */ - maStatus: 15, - detectionList: [], - insureList: [], - picList: [] - } - // 打开检修详情弹框 - dialogFormVisibleSettleRepair.value = true - }