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

冲突合并

This commit is contained in:
songyang 2023-12-08 15:31:51 +08:00
parent b527b37517 ba14cd12e5
commit 3ee01f9594
2 changed files with 53 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/EnterpriseCertification.vue
View File

@ -412,7 +412,7 @@
</div>
</div>
<el-table border :data="bankTableList">
<!-- <el-table border :data="bankTableList">
<el-table-column align="center" label="开户行">
<template #default="{ row }">
<el-input v-model="row.v_kaihu"></el-input>
@ -446,16 +446,13 @@
listType="picture-card"
:acceptTypeList="['.jpg', '.jpeg', '.png']"
height="30px">
<template v-slot:default>
<!-- <el-icon size="48" color="#aaa"><Plus /></el-icon> -->
上传附件
</template>
<template v-slot:default>上传附件</template>
</uploadComponent>
</a>
</template>
</el-table-column>
</el-table>
</div>
</div> -->
<el-row style="padding-top: 15px">
<el-form-item>
<el-button type="success" @click="handlerSubmitBtn">提 交</el-button>

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

@ -33,11 +33,14 @@
}
/* 查看按钮 */
const clickPreviewDetails = (row:any) => {
console.log('查看',row)
router.push({ name: 'orderDetails',query:{
orderId:row.orderId
} })
const clickPreviewDetails = (row: any) => {
console.log('查看', row)
router.push({
name: 'orderDetails',
query: {
orderId: row.orderId
}
})
}
/* 续租按钮 */
@ -47,12 +50,15 @@
}
/* 确认收货 */
const clickConfirmReceipt = (row:any) => {
const clickConfirmReceipt = (row: any) => {
console.log('确认收货')
router.push({ name: 'orderDetails',query:{
orderId:row.orderId,
confirm:"true"
} })
router.push({
name: 'orderDetails',
query: {
orderId: row.orderId,
confirm: 'true'
}
})
}
const time = ref([])
@ -89,37 +95,40 @@
</el-form-item>
</el-form>
<!-- 表格 -->
<el-table
:data="tableData"
style="width: 100%"
:header-cell-style="{
background: '#3E98FF',
color: '#fff'
}">
<el-table-column align="center" prop="code" label="订单编号" />
<el-table-column align="center" prop="supplierCompany" label="供应商" />
<el-table-column align="center" prop="createTime" label="订单创建日期" />
<el-table-column align="center" prop="payType" label="装备类型" />
<el-table-column align="center" prop="deviceName" label="装备名称" />
<el-table-column align="center" prop="orderStatus" label="订单状态" />
<el-table-column align="center" prop="name" label="操作" width="320px">
<template #default="scope">
<el-button size="small" type="primary" @click="clickPreviewDetails(scope.row)">
查看
</el-button>
<el-button size="small" type="danger" @click="clickRentingTermination">
退租
</el-button>
<el-button size="small" type="warning" @click="clickRenewalOfLease">
续租
</el-button>
<el-button size="small" type="success" @click="clickConfirmReceipt(scope.row)">
确认收货
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 表格 -->
<el-table
:data="tableData"
style="width: 100%"
:header-cell-style="{
background: '#3E98FF',
color: '#fff'
}">
<el-table-column align="center" prop="code" label="订单编号" />
<el-table-column align="center" prop="supplierCompany" label="供应商" />
<el-table-column align="center" prop="time" label="订单创建日期" />
<el-table-column align="center" prop="payType" label="装备类型" />
<el-table-column align="center" prop="deviceName" label="装备名称" />
<el-table-column align="center" prop="orderStatus" label="订单状态">
<template #default="{ row }">
<el-tag v-if="row.orderStatus === 31">待确认</el-tag>
<el-tag v-if="row.orderStatus === 32">待合同上传</el-tag>
<el-tag v-if="row.orderStatus === 35">待收货</el-tag>
<el-tag v-if="row.orderStatus === 36">进行中</el-tag>
</template>
</el-table-column>
<el-table-column align="center" prop="name" label="操作" width="320px">
<template #default="scope">
<el-button size="small" type="primary" @click="clickPreviewDetails">查看</el-button>
<el-button size="small" type="danger" @click="clickRentingTermination">
退租
</el-button>
<el-button size="small" type="warning" @click="clickRenewalOfLease">续租</el-button>
<el-button size="small" type="success" @click="clickConfirmReceipt">
确认收货
</el-button>
</template>
</el-table-column>
</el-table>
<PagingComponent
@getList="getList"