From df7a0a03abd0e3c16aebad2e9b3545c5feaa4b16 Mon Sep 17 00:00:00 2001
From: songyang <972986197@qq.com>
Date: Sat, 9 Dec 2023 21:54:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E4=B8=8A=E4=B8=8B=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/uploadComponent/index.vue | 4 +
src/http/api/usercenter/goodsmang.ts | 2 +-
src/views/user/goodsManagement/index.vue | 279 ++++++++++++++++-------
src/views/user/goodsUpdown/index.vue | 59 ++++-
4 files changed, 251 insertions(+), 93 deletions(-)
diff --git a/src/components/uploadComponent/index.vue b/src/components/uploadComponent/index.vue
index 8c1605e..9ee5a17 100644
--- a/src/components/uploadComponent/index.vue
+++ b/src/components/uploadComponent/index.vue
@@ -216,6 +216,10 @@
}
// 预览
const preview = (data: any) => {
+ console.log(data, '****预览文件')
+ window.open(data.response.msg)
+ return
+
const { url, response = {} } = data || {}
let name = data.name
const downLoadTypeList = props.downLoadTypeList
diff --git a/src/http/api/usercenter/goodsmang.ts b/src/http/api/usercenter/goodsmang.ts
index 3a86b79..cd1e01c 100644
--- a/src/http/api/usercenter/goodsmang.ts
+++ b/src/http/api/usercenter/goodsmang.ts
@@ -9,7 +9,7 @@ export const equipmentDeploymentApi = (data: any) => {
// 获取商品入驻列表
export const getEquipmentListApi = (data: any) => {
- return post('/zlpt-equip/dev/list', data)
+ return post('/zlpt-equip/dev/devList', data)
}
// 商品删除接口
diff --git a/src/views/user/goodsManagement/index.vue b/src/views/user/goodsManagement/index.vue
index afeb636..fb1e662 100644
--- a/src/views/user/goodsManagement/index.vue
+++ b/src/views/user/goodsManagement/index.vue
@@ -57,6 +57,12 @@
return store.deviceTypeSunList
})
+ /* 查看 */
+ const disabledForm = ref(false)
+
+ /* 编辑 */
+ const isEditDisabled = ref(false)
+
// 省级下拉框选中时获取市级
const changeProvince = (val: any) => {
// console.log(val, '省选择**')
@@ -77,17 +83,17 @@
// 设备类型大类
const changeDeviceType = (val: any) => {
- store.getDeviceTypeSonList(val.split(',')[0])
- deviceType[0] = val.split(',')[1]
+ store.getDeviceTypeSonList(val)
+ // deviceType[0] = val.split(',')[1]
}
// 设备类型子类
const changeDeviceTypeSon = (val: any) => {
- store.getDeviceTypeSunList(val.split(',')[0])
- deviceType[1] = val.split(',')[1]
+ store.getDeviceTypeSunList(val)
+ // deviceType[1] = val.split(',')[1]
}
// 设备类型小类
const changeDeviceTypeSun = (val: any) => {
- deviceType[2] = val.split(',')[1]
+ // deviceType[2] = val.split(',')[1]
}
/*
@@ -98,7 +104,6 @@
leaseScope: '',
/* 设备所在地 */
location: '',
-
/* 省 */
provinceId: '',
/* 市 */
@@ -144,23 +149,7 @@
/* 设备主图片 */
picUrl: '',
/* 检测信息 ,保险信息*/
- fileList: [
- /* 检测信息 */
- {
- id: '28',
- url: 'https://zlpt-1259760603.cos.ap-nanjing.myqcloud.com/488bab245180ebf9f1f3d7db5301be4.png'
- },
- /* 保险信息 */
- {
- id: '29',
- utr: 'https://zlpt-1259760603.cos.ap-nanjing.myqcloud.com/488bab245180ebf9f1f3d7db5301be4.png'
- },
- /* 设备图片 */
- {
- id: '20',
- utr: 'https://zlpt-1259760603.cos.ap-nanjing.myqcloud.com/488bab245180ebf9f1f3d7db5301be4.png'
- }
- ],
+ fileList: [],
/* 设备状态 */
maStatus: 15
})
@@ -188,10 +177,9 @@
// 编辑按钮
const editRowInfo = (row: any) => {
- console.log(row, '编辑当前数据')
-
- equipmentDeploymentParams.value = row
- dialogFormVisibleSettlein.value = true
+ getRowList(row)
+ isEditDisabled.value = true
+ disabledForm.value = false
}
// 删除按钮
const deleteRowInfo = async (row: any) => {
@@ -205,13 +193,60 @@
}
}
+ /* 查看按钮 */
+ const previewRowInfo = (row: any) => {
+ row.devPicList = []
+ row.fileList.map((item) => {
+ if (item.dicId == 28) {
+ row.jcUrl = item.fileUrl
+ }
+ if (item.dicId == 29) {
+ row.bsUrl = item.fileUrl
+ }
+ if (item.dicId == 20) {
+ row.devPicList.push(item.fileUrl)
+ }
+ })
+ getRowList(row)
+ disabledForm.value = true
+ isEditDisabled.value = false
+ }
+
+ const getRowList = (row: any) => {
+ equipmentDeploymentParams.value = row
+ equipmentDeploymentParams.value.cityId = equipmentDeploymentParams.value.cityId + ''
+ equipmentDeploymentParams.value.areaId = equipmentDeploymentParams.value.areaId + ''
+ equipmentDeploymentParams.value.provinceId = equipmentDeploymentParams.value.provinceId + ''
+ equipmentDeploymentParams.value.leaseScope = equipmentDeploymentParams.value.leaseScope + ''
+
+ equipmentDeploymentParams.value.companyId = equipmentDeploymentParams.value.companyId * 1
+ equipmentDeploymentParams.value.groupId = equipmentDeploymentParams.value.groupId * 1
+ equipmentDeploymentParams.value.typeId = equipmentDeploymentParams.value.typeId * 1
+
+ dialogFormVisibleSettlein.value = true
+ store.getprovinceList()
+ store.getmarketList(row.provinceId)
+ store.getareaList(row.cityId)
+
+ store.getDeviceTypeList()
+ store.getDeviceTypeSonList(row.companyId)
+ store.getDeviceTypeSunList(row.groupId)
+ }
+
// 装备入驻按钮
const equipmentDeployment = () => {
+ isEditDisabled.value = true
equipmentDeploymentParams.value = {
/* 租赁范围 */
leaseScope: '',
/* 设备所在地 */
location: '',
+ /* 省 */
+ provinceId: '',
+ /* 市 */
+ cityId: '',
+ /* 区 */
+ areaId: '',
/* 设备所在地 省 */
addressEconomize: '',
/* 设备所在地 市 */
@@ -248,29 +283,12 @@
jsDayPrice: '',
/* 详细说明 */
description: '',
- /* 设备图片 */
+ /* 设备主图片 */
picUrl: '',
/* 检测信息 ,保险信息*/
- fileList: [
- /* 检测信息 */
- {
- id: '28',
- url: ''
- },
- /* 保险信息 */
- {
- id: '29',
- utr: ''
- },
- /* 设备图片 */
- {
- id: '20',
- utr: ''
- }
- ],
+ fileList: [],
/* 设备状态 */
maStatus: 15
- /* 设备型号 */
}
// 打开入驻弹框
dialogFormVisibleSettlein.value = true
@@ -341,23 +359,26 @@
/* 检测信息图片地址 */
const successResultCallBackFnjc = (val: any) => {
- equipmentDeploymentParams.fileList.push({
- id: '28',
- url: val.msg
+ equipmentDeploymentParams.value.fileList.push({
+ dicId: '28',
+ fileUrl: val.msg
})
}
/* 保险信息图片地址 */
const successResultCallBackFnbs = (val: any) => {
- equipmentDeploymentParams.fileList.push({
- id: '29',
- url: val.msg
+ equipmentDeploymentParams.value.fileList.push({
+ dicId: '29',
+ fileUrl: val.msg
})
}
/* 设备图片信息地址 */
const successResultCallBackFnDevicePic = (val: any) => {
- equipmentDeploymentParams.fileList.push({
- id: '20',
- url: val.msg
+ if (!equipmentDeploymentParams.value.picUrl) {
+ equipmentDeploymentParams.value.picUrl = val.msg
+ }
+ equipmentDeploymentParams.value.fileList.push({
+ dicId: '20',
+ fileUrl: val.msg
})
}
@@ -371,18 +392,57 @@
-
-
- 待上架审批
- 待租
- 在租
- 下架
-
-
- 编辑
- 删除
-
-
+
+
+
+
+
+
+ {{ row.leaseScope == 329 ? '全平台' : '专区' }}
+
+
+
+
+
+
+
+ 待上架
+ 待租
+ 在租
+ 下架
+ 自有
+ 待审批
+ 上架驳回
+
+
+
+
+
+ 编辑
+
+ 删除
+
+ 查看
+
+
+
+ :rules="rules"
+ :disabled="disabledForm">
-
+
@@ -419,7 +480,7 @@
v-for="item in selProvinceList"
:key="item.id"
:label="item.name"
- :value="item.code">
+ :value="item.code + ''">
+ :value="item.code + ''">
+ :value="item.code + ''">
+ :value="item.typeId">
+ v-model="equipmentDeploymentParams.groupId">
+ :value="item.typeId">
-
+ clearable
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD" />
-
+
+
+
+
+ 查 看 附 件
+
+
-
+
+
+
+
+ 查 看 附 件
+
+
- 元/天
+ :successResultCallBack="successResultCallBackFnDevicePic"
+ :autoUpload="true"
+ :multiple="true">
- 至少一张,最多八张
- 设备图片格式为jpg、png、和gif,文件不得超过5M,否则将无法上传。请从前后左右四个方向以及从主要工作部件,内部结构等方面展示设备
+
+ 至少一张,最多八张
+ 设备图片格式为jpg、png、和gif,文件不得超过5M,否则将无法上传。请从前后左右四个方向以及从主要工作部件,内部结构等方面展示设备
+
+
+
+
+
+
diff --git a/src/views/user/goodsUpdown/index.vue b/src/views/user/goodsUpdown/index.vue
index 402481c..80a87de 100644
--- a/src/views/user/goodsUpdown/index.vue
+++ b/src/views/user/goodsUpdown/index.vue
@@ -165,14 +165,63 @@
- 批量上架
- 批量下架
+
-
+
+
+
+
+ {{ row.leaseScope == 329 ? '全平台' : '专区' }}
+
+
+
+
+
+
+
+ 待上架
+ 待租
+ 在租
+ 下架
+ 自有
+ 待审批
+ 上架驳回
+
+
+
+
+
+ 上架
+
+
+ 下架
+
+
+
+
+
+
+
+
-
+ -->