diff --git a/components.d.ts b/components.d.ts index 443565a..db94f87 100644 --- a/components.d.ts +++ b/components.d.ts @@ -8,14 +8,23 @@ export {} declare module 'vue' { export interface GlobalComponents { Breadcrumb: typeof import('./src/components/Breadcrumb/index.vue')['default'] + ElBadge: typeof import('element-plus/es')['ElBadge'] + 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'] + ElCountdown: typeof import('element-plus/es')['ElCountdown'] 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'] @@ -23,11 +32,16 @@ declare module 'vue' { ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElOption: typeof import('element-plus/es')['ElOption'] + ElPageHeader: typeof import('element-plus/es')['ElPageHeader'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm'] ElProgress: typeof import('element-plus/es')['ElProgress'] + ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] + ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] 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/assets/img/home/swiper01.png b/src/assets/img/home/swiper01.png new file mode 100644 index 0000000..56f0d6c Binary files /dev/null and b/src/assets/img/home/swiper01.png differ diff --git a/src/assets/img/home/swiper02.png b/src/assets/img/home/swiper02.png new file mode 100644 index 0000000..1f47fa3 Binary files /dev/null and b/src/assets/img/home/swiper02.png differ diff --git a/src/http/api/sourcing/index.ts b/src/http/api/sourcing/index.ts index ef324fd..860cc2d 100644 --- a/src/http/api/sourcing/index.ts +++ b/src/http/api/sourcing/index.ts @@ -23,4 +23,8 @@ export const deleteLeaseInfoApi = (data: any) => { // 接单列表查询 export const getAcceptOrdersListApi = (data: any) => { return get('/material-mall/ma-lease/rentList', data) +} +// 接单审核 +export const maLeaseAuditApi = (data: any) => { + return post('/material-mall/ma-lease/audit', data) } \ No newline at end of file diff --git a/src/views/demand-details/index.vue b/src/views/demand-details/index.vue index 6f072a7..7dfabdf 100644 --- a/src/views/demand-details/index.vue +++ b/src/views/demand-details/index.vue @@ -35,7 +35,7 @@ -
参考图片/样式:
+
需求清单:
@@ -46,6 +46,35 @@
+ + 装备需求信息 +
+ + + 装备类目: + + + {{ item.groupName }} + + + + 预估数量: + + + {{ item.leaseNum }} + + +
参考图片/样式:
+ + + + + +
@@ -82,13 +111,13 @@
立即接单 @@ -117,6 +146,7 @@ const route = useRoute() const router = useRouter() const store: any = mainStore() const userId = store.userInfo.userId +const companyId = store.userInfo.companyId //设备简略基本信息 const equipBaseInfoList = reactive([ @@ -124,10 +154,10 @@ const equipBaseInfoList = reactive([ label: '需求编号', key: 'leaseCode', }, - { - label: '装备类目', - key: 'groupName', - }, + // { + // label: '装备类目', + // key: 'groupName', + // }, { label: '联系人', key: 'person', @@ -140,10 +170,10 @@ const equipBaseInfoList = reactive([ label: '所属地市', key: 'areaName', }, - { - label: '预估数量', - key: 'leaseNum', - }, + // { + // label: '预估数量', + // key: 'leaseNum', + // }, { label: '预估租赁天数', key: 'leaseDay', @@ -536,6 +566,7 @@ onMounted(() => { .item_btn { width: 110px; height: 36px; + margin-top: 80px; line-height: 36px; border-radius: 4px; font-size: 14px; @@ -578,4 +609,17 @@ onMounted(() => { } } } + +.demand-info-list { + padding: 6px 0; + box-sizing: content-box; + + .label { + font-size: 14px; + font-family: PingFangSC, PingFang SC; + // font-weight: 600; + color: #8e8e8e; + // margin-right: 15px; + } +} diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 2a45b8d..175b4a5 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -9,6 +9,8 @@ import { reactive, ref } from 'vue' import baseData from '@/assets/baseInformation.json' import imgSrc from '../../assets/img/home/nw.png' +import swiper_1 from '../../assets/img/home/swiper01.png' +import swiper_2 from '../../assets/img/home/swiper02.png' const router: any = useRouter() @@ -23,6 +25,8 @@ const loopList = ref([ 'https://zlpt-1259760603.cos.ap-nanjing.myqcloud.com/488bab245180ebf9f1f3d7db5301be4.png', // 'https://jmy-pic.baidu.com/0/pic/-1857035387_-1067811148_-1621691324.png', imgSrc, + swiper_1, + swiper_2, ]) // 获取商品分类 const getGoodsClassList = async () => { diff --git a/src/views/parity/index.vue b/src/views/parity/index.vue index 7c94531..6eee448 100644 --- a/src/views/parity/index.vue +++ b/src/views/parity/index.vue @@ -126,7 +126,7 @@
预估数量
-
{{ item.leaseNum }}
+
{{ item.leaseTotalNum }}
预估租期(天)
@@ -185,7 +185,9 @@ border: none; border-radius: 0; " - :disabled="userId == item.publishUser" + :disabled=" + userId == item.publishUser || companyId == item.publishCompany + " :style="userId == item.publishUser ? 'opacity:0.5;color:#fff' : ''" @click="onAcceptOrders(item.id)" > @@ -227,6 +229,7 @@ const router = useRouter() const route: any = useRoute() const store: any = mainStore() const userId = store.userInfo.userId +const companyId = store.userInfo.companyId const leaseList = ref([]) //筛选条件列表数据 @@ -334,9 +337,9 @@ getTypeListData() // 获取设备所在地 const getCompanyAddressListData = async () => { const res: any = await getCompanyListApi() - const result: any = await getAreaApi() + const result: any = await getAreaApi(34) const addressList = result.data.map((e: any) => { - return { ...e, name: e.areaName, value: e.areaId, isChecked: false, index: 1 } + return { ...e, name: e.areaName, value: e.areaCode, isChecked: false, index: 1 } }) const companyList = res.data.map((e: any) => { return { ...e, name: e.companyName, value: e.companyId, isChecked: false, index: 2 } @@ -353,7 +356,7 @@ const getLeaseListData = async (keyWord: any = '') => { companyId: '', typeId: '', level: '', - areaId: '', + cityCode: '', startTime: optionActive.value == 0 ? screenOptionList[optionActive.value].sort : '', rentDay: optionActive.value == 1 ? screenOptionList[optionActive.value].sort : '', endTime: optionActive.value == 2 ? screenOptionList[optionActive.value].sort : '', @@ -368,7 +371,7 @@ const getLeaseListData = async (keyWord: any = '') => { } if (index == 1 && j.isChecked) { - searchParams.areaId = j.value + searchParams.cityCode = j.value } if (index == 2 && j.isChecked) { searchParams.companyId = j.value diff --git a/src/views/user/accept-orders/index.vue b/src/views/user/accept-orders/index.vue index f0eacc3..7b195e4 100644 --- a/src/views/user/accept-orders/index.vue +++ b/src/views/user/accept-orders/index.vue @@ -116,6 +116,7 @@ + - + - + @@ -261,17 +242,17 @@ - + @@ -279,17 +260,17 @@ - + @@ -297,12 +278,12 @@ - + @@ -356,19 +337,6 @@ /> - - @@ -403,12 +371,11 @@ height="100px" :multiple="true" :autoUpload="true" - :minLimit="minLimit" + :minLimit="addOrEditForm.fileInfoList.length" :actionUrl="uploadUrl" listType="picture-card" @onFileChange="onFileChange" :acceptTypeList="['.jpg', '.png']" - :fileListN="addOrEditForm.fileInfoList" >