Skip to content

C
company_app
提交 66222606 作者: 毛细亚
操作

Merge branch 'release' into 1.1

上级 dac2f6ad f27b1a71
正在显示 包含 102 行增加 和 109 行删除
company_app/index.html
<!DOCTYPE html>
<html lang="">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="favicon.ico">
<!-- HTTP 1.1 -->
<meta http-equiv="pragma" content="no-cache">
<!-- HTTP 1.0 -->
<meta http-equiv="cache-control" content="no-cache">
<!-- Prevent caching at the proxy server -->
<meta http-equiv="expires" content="0">
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE9" />
<title>company_app</title>
<!-- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0,shrink-to-fit=no,user-scalable=no"> -->
<script src="https://g.alicdn.com/dingding/dinglogin/0.0.5/ddLogin.js"></script>
<script defer src="static/js/chunk-vendors.js"></script><script defer src="static/js/app.js"></script></head>
<body>
<noscript>
<strong>We're sorry but company_app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
</noscript>
<div id="app"></div>
</body>
</html>
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><meta http-equiv="pragma" content="no-cache"><meta http-equiv="cache-control" content="no-cache"><meta http-equiv="expires" content="0"><meta http-equiv="X-UA-Compatible" content="IE=EmulateIE9"/><title>company_app</title><script src="https://g.alicdn.com/dingding/dinglogin/0.0.5/ddLogin.js"></script><script defer="defer" src="static/js/chunk-vendors.fc0c503d.js"></script><script defer="defer" src="static/js/app.7f7f9292.js"></script><link href="static/css/chunk-vendors.8e901099.css" rel="stylesheet"><link href="static/css/app.2d27e365.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but company_app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
src/views/addressBook.vue deleted 100644 → 0
<template>
<div class="addressBook-content">
通讯录
</div>
</template>
<script>
export default {
name: 'AddressBook',
}
</script>
<style lang="scss" scoped>
.addressBook-content{
width: 100%;
height: 100%;
background: #fff;
}
</style>
\ No newline at end of file
src/views/components/ApplyRecords/AreaTransferApply.vue
<template>
<div class="terminaListArea">
<div class="terminaListArea" v-scroll="paperScroll">
<div class="addApply rowFlex spaceBetween">
<span></span>
<el-button
......@@ -44,10 +44,7 @@
</el-form-item>
</el-form>
<div
v-infinite-scroll="paperScroll"
:infinite-scroll-disabled="!isMoreRecord"
:infinite-scroll-immediate="false"
class="terminaListAreaScroll"
class="terminaListAreaList"
>
<!-- 举报申请 -->
<div class="scrollMain" v-if="terminaList.length > 0">
......@@ -377,6 +374,10 @@ export default {
this.$forceUpdate()
},
paperScroll() {
if (!this.isMoreRecord) {
console.log('没有更多数据了')
return false
}
this.requestNextPage()
},
requestNextPage(pageInfo) {
......@@ -457,6 +458,7 @@ export default {
width: 100%;
height: 100%;
overflow: auto;
overflow-x: hidden;
::v-deep .el-form-item__label{
font-weight: 400;
}
......@@ -516,7 +518,7 @@ export default {
}
}
.terminaListAreaScroll {
.terminaListAreaList {
width: 100%;
.scrollMain {
width: 100%;
......
src/views/components/ApplyRecords/TerminaTranfer.vue
<template>
<div class="TerminaTranfer">
<div class="TerminaTranferContent">
<div class="terminaListContent" v-scroll="paperScroll">
<div class="addApply rowFlex spaceBetween">
<span></span>
<el-button type="primary" icon="el-icon-plus" size="small"
@click="(showaddAreaTransfer = true, areaTransferItem = {})">新增转端申请</el-button>
<el-button
type="primary"
icon="el-icon-plus"
size="small"
@click="(showaddAreaTransfer = true,areaTransferItem = {})"
>新增转端申请</el-button>
</div>
<el-form ref="taskForm" :model="terminaForm" label-position="top" class="terminaListForm" label-width="85px">
<el-form
ref="taskForm"
:model="terminaForm"
label-position="top"
class="terminaListForm"
label-width="85px"
>
<el-form-item label="审批状态">
<el-select v-model="terminaForm.approval_status" style="width:95%;" clearable placeholder="请选择审批状态"
@change="filterChange">
<el-option v-for="item in approvalList" :key="item.value" :label="item.label" :value="item.value">
<el-select
v-model="terminaForm.approval_status"
style="width:95%;"
clearable
placeholder="请选择审批状态"
@change="filterChange"
>
<el-option
v-for="item in approvalList"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<selectDate :default-value="dateValue" :type="true" style="width: 95%" @result="createResult" />
<selectDate
:default-value="dateValue"
:type="true"
style="width: 95%"
@result="createResult"
/>
</el-form-item>
</el-form>
<div v-infinite-scroll="paperScroll" :infinite-scroll-disabled="!isMoreRecord" :infinite-scroll-immediate="false"
class="TerminaTranferScroll">
<div
class="terminaListContentList"
>
<!-- 举报申请 -->
<div v-if="terminaList.length > 0" class="scrollMain">
<div v-for="(item, index) in terminaList" :key="index" class="terminaContent"
@click="terminaProcess(item, index)">
<div v-if="terminaList.length>0" class="scrollMain">
<div
v-for="(item, index) in terminaList"
:key="index"
class="terminaContent"
@click="terminaProcess(item, index)"
>
<div class="terminaItem rowFlex spaceBetween columnCenter">
<div class="terminaItemLeft">
<p><span class="label">角色名称:</span><span class="value">{{ item.role_name }}</span></p>
......@@ -34,18 +64,7 @@
<p>
<span class="label">登记时间:</span><span class="value">{{ item.create_time || '' }}</span>
</p>
<p><span class="label">转端状态:</span><span class="value">{{ item.trans_check_status_text || '-' }}</span>
</p>
</div>
<div class="terminaItemRight columnFlex columnCenter">
<el-button v-if="item.approval_status == 3 && item.related_request_id == 0" type="primary" size="mini"
style="margin-bottom:15px;" @click.stop="resubmitApproval(item)">重新提交</el-button>
<img v-if="item.approval_status == 1" :src="shenpi1" class="icon" />
<img v-else-if="item.approval_status == 2" :src="shenpi2" class="icon" />
<img v-else-if="item.approval_status == 3" :src="shenpi6" class="icon" />
<img v-else-if="item.approval_status == 4" :src="shenpi4" class="icon" />
<img v-else-if="item.approval_status == 5" :src="shenpi5" class="icon" />
</div>
<p><span class="label">转端状态:</span><span class="value">{{ item.trans_check_status_text || '-' }}</span></p>
</div>
<!-- 审批进度 -->
<el-collapse-transition>
......@@ -130,11 +149,11 @@
</el-collapse-transition>
</div>
</div>
</div>
<div v-else class="noContent rowFlex allCenter">
<noContent />
</div>
</div>
</div>
<el-dialog :visible.sync="dialogRemarkVisible" append-to-body title="查看大图" custom-class="remake-dialog">
<div class="remake-box">
<div v-html="dialogRemake"></div>
......@@ -288,6 +307,10 @@ export default {
this.$forceUpdate()
},
paperScroll() {
if (!this.isMoreRecord) {
console.log('没有更多数据了')
return false
}
this.requestNextPage()
},
requestNextPage(pageInfo) {
......@@ -362,7 +385,7 @@ export default {
</script>
<style lang="scss" scoped>
.TerminaTranfer {
.terminaListContent {
width: 100%;
height: 100%;
.TerminaTranferContent{
......@@ -433,9 +456,8 @@ export default {
}
}
.TerminaTranferScroll {
.terminaListContentList {
width: 100%;
.scrollMain {
width: 100%;
height: auto;
......
src/views/components/ApplyRecords/errorHandle.vue
<template>
<div class="detailsErrorHandle columnFlex">
<div class="detailsErrorHandleContent">
<div class="detailsErrorHandleContent" v-scroll="requestOrderList">
<div class="addApply rowFlex spaceBetween">
<span></span>
<el-button
......@@ -32,7 +32,7 @@
<div class="list">
<!-- 过滤条件 -->
<!-- 订单列表 -->
<div v-infinite-scroll="requestOrderList" :infinite-scroll-disabled="!isloadMore" class="orderDetailsScroll">
<div class="orderDetailsScroll">
<div v-if="orderList.length>0" class="orderDetailsScrollContent">
<div v-for="(item,index) in orderList" :key="index" class="orderDetails">
<div class="orderDetailsList">
......
src/views/components/giftRecord/emailGift.vue
<template>
<div class="detailsGiftApply columnFlex">
<div class="detailsGiftApplyContent">
<div class="detailsGiftApplyContent" v-scroll="requestemailGiftList" v-loading="listLoading" >
<div class="detailsGiftApplyTitle rowFlex spaceBetween columnCenter">
<!-- <p>充值礼包</p> -->
<span></span>
......@@ -42,7 +42,7 @@
:name="item.value"></el-tab-pane>
</el-tabs>
<!-- 订单列表 -->
<div v-infinite-scroll="requestemailGiftList" v-loading="listLoading" :infinite-scroll-disabled="!isloadMore"
<div
class="email-gift-main-scroll">
<div v-if="emailGiftList.length > 0" style="height:auto;">
<div v-for="(item, index) in emailGiftList" :key="index" class="orderDetails">
......@@ -293,6 +293,7 @@ export default {
}
if (!this.isloadMore) {
console.log('没有更多数据了')
this.listLoading = false
return false
}
this.pageInfo.page += 1
......
src/views/components/order/refundLog.vue
<template>
<div class="detailsRefund columnFlex">
<div class="refundContent">
<div class="refundContent" v-scroll="requestOrderList">
<div class="filter-container">
<el-form class="filter-form" label-position="top" label-width="auto" :class="{ 'collapsed-form': isCollapsed }">
<div class="filter-header">
......@@ -57,10 +57,7 @@
</div>
<!-- 订单列表 -->
<div
v-infinite-scroll="requestOrderList"
v-loading="loading"
class="detailsRefundScroll"
:infinite-scroll-disabled="!isloadMore"
>
<div v-if="orderList.length > 0">
<div v-for="(item, index) in orderList" :key="index" class="orderDetails">
......@@ -482,9 +479,6 @@
width: 100%;
height: 100%;
background: #fff;
position: relative;
overflow: hidden;
.detailsTitle {
width: 100%;
padding: 0 vw(20);
......
src/views/mailList.vue
......@@ -89,6 +89,8 @@
<!-- 通讯录列表 -->
<div
ref="mailListScroll"
v-scroll="loadMoreMail"
class="contact-list"
>
<div
......
src/views/orderList.vue
......@@ -3,8 +3,14 @@
<div class="content">
<el-tabs v-model="activeTypeStr" @tab-click="handleTabClick" class="order-tabs">
<el-tab-pane v-for="(item, index) in orderTypeList" :key="index" :label="item.label" :name="String(item.value)">
</el-tab-pane>
</el-tabs>
<!-- 订单的一些信息 -->
<div v-show="activeType !== 3" class="order-info-content">
<div v-show="activeType !== 3" class="order-info-content" v-scroll="requestOrderList">
<div class="orderMoney rowFlex flexWarp">
<div class="orderMoneyItem rowFlex columnCenter" style="margin-right:20px;">
<span>总支付金额：</span>
......@@ -54,8 +60,7 @@
</el-form-item>
</el-form>
</div>
<div v-infinite-scroll="requestOrderList" v-loading="loading"
:infinite-scroll-disabled="!isloadMore" class="orderDetailsScroll">
<div class="orderDetailsScroll">
<div v-if="orderList.length > 0">
<div v-for="(item, index) in orderList" :key="index" class="orderDetails">
<div class="bridgeMain">
......@@ -151,14 +156,10 @@
</div>
<!-- 退款记录的搜做 -->
<div v-if="activeType == 3" class="refundLog">
<refundLog :active-type="activeType" />
<refundLog v-if="activeType == 3" :active-type="activeType" />
</div>
<!-- 订单列表 -->
</el-tab-pane>
</el-tabs>
</div>
<!-- 退款订单的申请 -->
<orderRefund :show.sync="showRefund" title="退款申请" :info="refundInfo" />
......@@ -379,8 +380,8 @@ export default {
console.log('Tab clicked:', tab.name, typeof tab.name);
// 确保activeTypeStr与tab.name同步
this.activeTypeStr = tab.name;
if (this.activeType !== 3) {
this.activeType = parseInt(tab.name);
if (this.activeType != 3) {
this.isloadMore = true
this.pageInfo = {
page: 0,
......@@ -400,12 +401,13 @@ export default {
})
},
requestOrderList: throttle(function (msg) {
console.log(12313, '开始展示', this)
console.log(12313, '开始展示',this.isloadMore)
if (this.accountSelect == '') {
this.$message.warning('暂无关联的账号，请先去关联账号!')
return false
}
if (!this.isloadMore) {
if (!this.isloadMore && !msg) {
// this.$message.warning('没有更多数据了')
console.log('没有更多数据了')
return false
}
......@@ -461,9 +463,10 @@ export default {
.refundLog {
width: 100%;
height: 100%;
height: calc(100% - 60px);
}
.detailsTitle {
width: 100%;
padding: 0 vw(20);
......@@ -485,6 +488,22 @@ export default {
height: 100%;
overflow: auto;
overflow-x: hidden;
::v-deep .el-tabs{
height: auto;
}
::v-deep .el-tab-pane{
height: auto;
}
::v-deep .el-tabs__content{
height: auto !important;
}
.order-info-content {
width: 100%;
height: calc(100% - 60px);
overflow: auto;
overflow-x: hidden;
}
.tabSelect {
width: 100%;
......@@ -755,12 +774,7 @@ export default {
margin-bottom: 15px;
}
.order-info-content {
width: 100%;
height: 100%;
overflow: auto;
overflow-x: hidden;
}
::v-deep .el-tabs__item {
height: 40px;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论