更新

Merge branch 'master' of http://121.196.213.68:3000/caoliancun/wx_oms
2024-06-12 13:47:56 +08:00 · 2024-06-11 15:13:40 +08:00 · 2024-06-11 08:43:10 +08:00 · 2024-06-11 08:40:08 +08:00 · 2024-06-07 07:18:04 +00:00
8 changed files with 1249 additions and 936 deletions
--- a/api/financialCenter/invoice.js
+++ b/api/financialCenter/invoice.js
@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+export default {
+	getInvoicePoolPage(data = {}) {
+		return request({
+			url: '/oil-finance/internalCompany/getInvoicePoolPage',
+			method: 'post',
+			data: data
+		})
+	},
+}
--- a/customerManagement/companyManagement/detail.vue
+++ b/customerManagement/companyManagement/detail.vue
@@ -133,7 +133,15 @@
 		data() {
 			return {
 				rowDetails: {},
-				detailList: [],
+				detailList: [{
+					bankCardName: '',
+					bankCardNo: '',
+					bankName: '',
+					interBankCode: '',
+					disabledType: false,
+					commonMark: 1,
+					companyId: ''
+				}],
 				id: '',
 				indexNature: 0,
 				bankNatureList: [{
@@ -214,7 +222,10 @@
 			findDetail(id) {
 				companyManagement.getByCompanyId(id).then(res => {
 					if (res.code !== 20000) return
+					if (res.data && res.data.length > 0) {
 						this.detailList = res.data
+					}
+
 				})
 			},
 			seleoli(item, index) {
--- a/customerManagement/companyManagement/index.vue
+++ b/customerManagement/companyManagement/index.vue
@@ -78,7 +78,7 @@
 									<view class="flex" style="padding: 15rpx 0;">
 										共享总公司额度
 										<view style="margin: 0 10rpx;min-width: 150rpx;" class="blackcolor">
-											{{ item.shareParentAmt =='0'?'共享':'不共享' }}
+											{{ item.shareParentAmt =='0'?'不共享':'共享' }}
 										</view>
 									</view>
 								</view>
@@ -91,9 +91,7 @@
 										</view>
 										<view class="flex" style="padding: 15rpx 0;">
 											联动分油
-											<switch class="my-switch" :class="item.parentMark ==0?'disabledMark':''"
-												:disabled="item.parentMark ==0?true:false"
-												:checked="item.shareDistribute=='1'?true:false"
+											<switch class="my-switch" :checked="item.shareDistribute=='1'?true:false"
 												style="transform:scale(0.7)" @change=" changeDistribute(item)"></switch>
 										</view>
 										<view class="flex" style="padding: 15rpx 0;">
@@ -167,6 +165,11 @@
 			},
 			changeEnableMark(item) {
 				const data = [item]
+				if(item.enableMark ==1){
+					data[0].enableMark = 0
+				}else{
+					data[0].enableMark = 1
+				}
 				companyManagement.updateBatchEnable(data).then(res => {
 					if (res.code === 20000) {
 						uni.showToast({
@@ -182,6 +185,12 @@
 					id: item.id,
 					shareDistribute: item.shareDistribute
 				}
+				if(item.shareDistribute == '1'){
+					data.shareDistribute = '0'
+				}else{
+					data.shareDistribute = '1'
+				}
+				console.log(data,item,'............iitem...')
 				companyManagement.openShareDistribute(data).then(res => {
 					if (res.code === 20000) {
 						uni.showToast({
--- a/financialCenter/enterpriseRecharge/index.vue
+++ b/financialCenter/enterpriseRecharge/index.vue
@@ -7,7 +7,7 @@
 						<view class="seach_input">
 							<uni-easyinput :letfText='letfText' confirmType='search'
 								@confirm='getData.currentPage=1;getList()'
-								placeholder-style="color:#bbbbbb;font-weight: 100;" v-model="getData.params.siteName"
+								placeholder-style="color:#bbbbbb;font-weight: 100;" v-model="getData.params.companyName"
 								placeholder="企业名称">
 							</uni-easyinput>
 						</view>
@@ -97,7 +97,7 @@
 					currentPage: 1,
 					params: {
 						preTreatmentSign: '', //申请状态审核状态
-						siteName: '', //油站名称
+						companyName: '', //油站名称

 					}
 				},
@@ -124,6 +124,7 @@
 			this.getList()
 		},
 		onLoad() {
+			this.getData.currentPage = 1
 			this.getList()
 		},
 		methods: {
--- a/financialCenter/invoice/pool/index.vue
+++ b/financialCenter/invoice/pool/index.vue
@@ -0,0 +1,271 @@
+<template>
+	<view style="height: 100vh;display: flex;flex-direction: column; ">
+		<view class="header">
+			<view :style="{height:styles.top+'px'}" class="top"></view>
+			<uni-nav-bar @clickLeft='back' color='white' backgroundColor="rgba(0,0,0,0)" left-icon="back"
+				title="结算单管理" />
+
+		</view>
+		<view class="content" style="flex: 1;overflow: hidden;">
+			<view class="buttons">
+				<view>{{obtainMonth()}}月票池</view>
+				<view>
+					<view @click="screen('0')">进项</view>
+					<view @click="screen('1')">销项</view>
+				</view>
+			</view>
+			<view class="list">
+				<scroll-view style="height: 100%;" scroll-y="true" :refresher-enabled="true" :refresher-triggered="isRefresherTriggered" @refresherrefresh="refresherrefresh">
+					<view class="item" v-for="item,index in handleList" :key="index">
+						<view class="title">
+							<view>{{item.companyName}}</view>
+							<view v-if="item.outputLimit">{{item.outputLimit}}</view>
+						</view>
+						<view class="percentage">
+							<view :style="{
+									width:item.proportion +'%',
+									background:item.color,
+									color:item.proportion > 10 ? '#fff' :'#333'}">
+								{{item.text}}{{item.money}}
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	import serve from '@/api/financialCenter/invoice.js'
+	export default {
+
+		data() {
+			return {
+				isRefresherTriggered:false,
+				styles: {},
+				currentType: '0',
+				listData: [],
+				handleList: [],
+				userInfo: uni.getStorageSync('user'),
+
+			}
+		},
+
+		onLoad() {
+			this.styles = uni.getMenuButtonBoundingClientRect()
+			this.getInvoicePoolPage()
+		},
+
+		methods: {
+			obtainMonth() {
+				return new Date().getMonth() + 1
+			},
+			refresherrefresh() {
+					this.isRefresherTriggered = true
+					this.getInvoicePoolPage()
+			},
+			screen(type) {
+				let handle = {
+					0: (item) => {
+						return {
+							companyName: item.companyName,
+							money: item.sumZMoney || 0,
+							proportion: 100,
+							text: '进项金额：',
+							color: '#409eff',
+						}
+
+					},
+					1: (item) => {
+						let {
+							sumXMoney,
+							outputLimit
+						} = item
+
+						let money = 0
+						if (sumXMoney) {
+							let result = ((outputLimit * 10000 - sumXMoney * 10000) / 10000).toFixed(2)
+							money = result < 0 ? 0 : result
+						} else money = outputLimit || 0
+
+						let proportion = 0
+						if (sumXMoney) {
+							let numerator = ((outputLimit * 10000 - sumXMoney * 10000) / 10000).toFixed(2)
+							let result = (numerator / outputLimit).toFixed(2) * 100
+							proportion = result < 0 ? 0 : result > 100 ? 100 : result
+						} else proportion = 100
+
+						return {
+							companyName: item.companyName,
+							money,
+							proportion,
+							text: '可用：',
+							color: '#f56c6c',
+							outputLimit,
+						}
+					}
+				}
+
+				this.handleList = this.listData.map(item => {
+					let result = handle[type](item)
+					return result
+				})
+				console.log('this.handleList', this.handleList)
+			},
+			getInvoicePoolPage() {
+				serve.getInvoicePoolPage().then(res => {
+					this.isRefresherTriggered = false
+					if (res.code === 20000) {
+						this.listData = res.data
+						this.screen('0')
+					}
+				})
+			},
+			back() {
+				uni.navigateBack()
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #F0F2FF;
+	}
+
+	.uni-navbar--border {
+		border: 0px !important;
+	}
+
+	.header {
+		position: relative;
+		color: white;
+		height: 300rpx;
+		background: url('https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油admin小程序/sjbj.png') 100%/100%;
+	}
+
+	.uni-navbar__header-btns-right {
+		padding-right: 0 !important;
+		width: 120rpx !important;
+	}
+
+	.top {
+		height: var(--status-bar-height);
+	}
+
+	.content {
+		position: relative;
+		top: -80rpx;
+		left: 1%;
+		z-index: 100;
+		width: 98%;
+		background: #F0F2FF;
+		border-radius: 20rpx;
+
+		.buttons {
+			padding: 20rpx;
+
+			>view {
+				&:nth-of-type(1) {
+					text-align: center;
+					font-size: 35rpx;
+					font-weight: 550;
+				}
+
+				&:nth-of-type(2) {
+					margin-top: 20rpx;
+					display: flex;
+					justify-content: space-around;
+
+					>view {
+						width: 270rpx;
+						height: 70rpx;
+						line-height: 70rpx;
+						text-align: center;
+						color: #fff;
+						border-radius: 10rpx;
+
+						&:nth-of-type(1) {
+							background: #409eff;
+						}
+
+						&:nth-of-type(2) {
+							background: #f56c6c;
+						}
+					}
+
+				}
+			}
+		}
+	}
+
+	.list {
+		margin: 20rpx auto 0;
+		width: 98%;
+		height: 80%;
+		border: 1rpx solid #ddd;
+		border-radius: 10rpx;
+
+		.item {
+			margin-top: 30rpx;
+			padding-left: 3%;
+			&:nth-last-child(1) {
+				padding-bottom: 30rpx;
+			}
+			.title {
+				display: flex;
+				padding-right: 20rpx;
+				margin: 0;
+				height: 50rpx;
+
+				>view {
+					&:nth-of-type(1) {
+						flex: 1;
+						padding-left: 5rpx;
+						font-size: 28rpx;
+						font-weight: 550;
+					}
+
+					&:nth-of-type(2) {
+						width: 180rpx;
+						height: 50rpx;
+						line-height: 50rpx;
+						text-align: center;
+						background: #ddd;
+						color: #999;
+						border-radius: 5rpx;
+
+					}
+				}
+			}
+
+			.percentage {
+				overflow: hidden;
+				position: relative;
+				margin-top: 20rpx;
+				height: 50rpx;
+				width: 94%;
+				background: rgb(244, 244, 245);
+				border: 1px solid rgb(211, 212, 214);
+				border-radius: 20px;
+
+				>view {
+					position: absolute;
+					top: 0;
+					left: 0;
+					padding-left: 10rpx;
+					height: 50rpx;
+					line-height: 50rpx;
+					color: #fff;
+					font-size: 24rpx;
+					background: #409eff;
+					border-radius: 20rpx;
+					white-space: nowrap;
+				}
+			}
+		}
+	}
+</style>
--- a/pages.json
+++ b/pages.json
@@ -1,5 +1,6 @@
 {
-	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+  "pages": [
+    //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages

    {
      "path": "pages/starpage/starpage",
@@ -11,13 +12,13 @@
          "titleNView": false
        }
      }
-
    },
    {
      "path": "pages/index/newindex",
      "style": {
        "navigationStyle": "custom",
-				"app-plus": { //uni-app项目对应节点名称为"app-plus"
+        "app-plus": {
+          //uni-app项目对应节点名称为"app-plus"
          "titleNView": {
            "autoBackButton": false
          },
@@ -25,21 +26,22 @@
          "disableScroll": true
        },
        "navigationBarTitleText": ""
-
      }
    },
    {
      "path": "pages/index/index",
      "style": {
        "navigationStyle": "custom",
-				"app-plus": { //uni-app项目对应节点名称为"app-plus"
+        "app-plus": {
+          //uni-app项目对应节点名称为"app-plus"
          "titleNView": {
            "autoBackButton": false
          }
        },
        "navigationBarTitleText": ""
      }
-		}, {
+    },
+    {
      "path": "pages/login/login",
      "style": {
        "navigationStyle": "custom",
@@ -53,7 +55,6 @@
        "navigationBarTitleText": "",
        "enablePullDownRefresh": false
      }
-
    }

    // , {
@@ -92,104 +93,105 @@
    //        }

    //    }
-
  ],
-	"subPackages": [{
+  "subPackages": [
+    {
      "root": "salesRanking",
-			"pages": [{
+      "pages": [
+        {
          "path": "page/index/index",
          "style": {
            "navigationStyle": "custom",
            "navigationBarTitleText": "司机信息",
            "enablePullDownRefresh": true
-
          }
-			}, {
+        },
+        {
          "path": "page/enterpriseDetails/enterpriseDetails",
          "style": {
            "navigationBarTitleText": "动销详情",
            "enablePullDownRefresh": false
          }
-
-			}, {
+        },
+        {
          "path": "page/contribution/contribution",
          "style": {
            "navigationBarTitleText": "消费支出",
            "enablePullDownRefresh": false
          }
-
-			}, {
+        },
+        {
          "path": "page/rechargeRecord/rechargeRecord",
          "style": {
            "navigationBarTitleText": "充值记录",
            "enablePullDownRefresh": false
          }
-
-			}, {
+        },
+        {
          "path": "page/orderQuantity/orderQuantity",
          "style": {
            "navigationBarTitleText": "订单",
            "enablePullDownRefresh": false
          }
-
-			}, {
+        },
+        {
          "path": "page/distributeQuantity/distributeQuantity",
          "style": {
            "navigationBarTitleText": "自营分油记录",
            "enablePullDownRefresh": false
          }
-
-			}, {
+        },
+        {
          "path": "page/outDistributeQuantity/outDistributeQuantity",
          "style": {
            "navigationBarTitleText": "外请分油记录",
            "enablePullDownRefresh": false
          }
-
-			}, {
+        },
+        {
          "path": "page/index/enterpriseIndex",
          "style": {
            "navigationStyle": "custom",
            "navigationBarTitleText": "企业动销",
            "enablePullDownRefresh": true
          }
-
-			}]
+        }
+      ]
    },
    {
      "root": "driverManagement",
-			"pages": [{
+      "pages": [
+        {
          "path": "index/index",
          "style": {
            "navigationStyle": "custom",
            "navigationBarTitleText": "司机信息",
            "enablePullDownRefresh": true
          }
-
-				}, {
+        },
+        {
          "path": "company/company",
          "style": {
            "navigationBarTitleText": "选择所属公司",
            "navigationBarBackgroundColor": "#2866FF",
            "enablePullDownRefresh": false
          }
-
-				}, {
+        },
+        {
          "path": "driverDetails/driverDetails",
          "style": {
            "navigationStyle": "custom",
            "navigationBarTitleText": "",
            "enablePullDownRefresh": false
          }
-
-				}, {
+        },
+        {
          "path": "accountDetails/accountDetails",
          "style": {
            "navigationStyle": "custom",
            "navigationBarTitleText": "",
            "enablePullDownRefresh": false
          }
-
        },
        {
          "path": "addDiver/addDiver",
@@ -198,256 +200,246 @@
            "navigationBarTitleText": "司机新增",
            "enablePullDownRefresh": false
          }
-
-				}, {
+        },
+        {
          "path": "driverDetails/InformationModification",
          "style": {
            "navigationBarTitleText": "司机信息修改",
            "enablePullDownRefresh": false
          }
-
-				}, {
+        },
+        {
          "path": "addDiver/addOilCard",
          "style": {
            "navigationBarTitleText": "新增油卡",
            "enablePullDownRefresh": false
          }
-				}, {
+        },
+        {
          "path": "driverDetails/vehicleModification",
          "style": {
            "navigationBarTitleText": "车辆信息修改",
            "enablePullDownRefresh": false
          }
-
-				}, {
+        },
+        {
          "path": "seleDriver/seleDriver",
          "style": {
            "navigationBarTitleText": "司机选择",
            "enablePullDownRefresh": false
          }
-
-				}, {
+        },
+        {
          "path": "serviceStation/serviceStation",
          "style": {
            "navigationBarTitleText": "请选择油站",
            "enablePullDownRefresh": false
          }
-
        }
      ]
    },
    {
      "root": "oilDistribution",
      "pages": [
-
        {
          "path": "index/index",
          "style": {
            "navigationBarTitleText": "新增分发",
            "navigationStyle": "custom"
          }
-
        },
        {
          "path": "distribute/distribute",
          "style": {
            "navigationBarTitleText": "新增分发"
-
          }
-
-				}, {
+        },
+        {
          "path": "newSeleCompany/newSeleCompany",
          "style": {
            "navigationBarTitleText": "油品分发",
            "enablePullDownRefresh": false
          }
-
-				}, {
+        },
+        {
          "path": "newSeleDirver/newSeleDirver",
          "style": {
            "navigationBarTitleText": "油品分发",
            "enablePullDownRefresh": false
          }
-
        }
      ]
    },
    {
      "root": "orderList",
      "pages": [
-
        {
          "path": "index/index",
          "style": {
            "navigationBarTitleText": "订单列表",
            "navigationStyle": "custom"
          }
-
-				}, {
+        },
+        {
          "path": "orderDetails/orderDetails",
          "style": {
            "navigationBarTitleText": "订单详情",
            "enablePullDownRefresh": false
          }
-
-				}, {
+        },
+        {
          "path": "refundReview/index",
          "style": {
            "navigationBarTitleText": "退款审核",
            "navigationStyle": "custom"
          }
-
        }
      ]
    },
    {
      "root": "priceAdjustment",
      "pages": [
-
        {
          "path": "page/index/index",
          "style": {
            "navigationBarTitleText": "订单列表",
            "navigationStyle": "custom"
          }
-
-				}, {
+        },
+        {
          "path": "modify/modify",
          "style": {
            "navigationBarTitleText": "",
            "enablePullDownRefresh": false
          }
-
-				}, {
+        },
+        {
          "path": "page/addPrice/addPrice",
          "style": {
            "navigationBarTitleText": "新增调价",
            "enablePullDownRefresh": false
          }
-
        }
      ]
    },
    {
      "root": "priceAdjustmentTask",
      "pages": [
-
        {
          "path": "page/index",
          "style": {
            "navigationBarTitleText": "调价任务",
            "navigationStyle": "custom"
          }
-
-				}, {
+        },
+        {
          "path": "addTask/addTask",
          "style": {
            "navigationBarTitleText": "新增调价任务",
            "enablePullDownRefresh": false
          }
-
        }
      ]
    },
    {
      "root": "oilAccount",
-			"pages": [{
+      "pages": [
+        {
          "path": "page/accountRecharge/index",
          "style": {
            "navigationBarTitleText": "账户充值",
            "navigationStyle": "custom",
            "enablePullDownRefresh": false
          }
-
-			}, {
+        },
+        {
          "path": "page/companyRecharge/index",
          "style": {
            "navigationBarTitleText": "公司充值",
            "navigationStyle": "custom",
            "enablePullDownRefresh": false
          }
-
-			}, {
+        },
+        {
          "path": "page/companyRecharge/details",
          "style": {
            "navigationBarTitleText": "油站公司充值详情",
            "enablePullDownRefresh": false
          }
-
-			}, {
+        },
+        {
          "path": "page/companyRecharge/add",
          "style": {
            "navigationBarTitleText": "油站公司充值",
            "enablePullDownRefresh": false
          }
-
-			}, {
+        },
+        {
          "path": "page/accountRecharge/details",
          "style": {
            "navigationBarTitleText": "油站账户充值详情",
            "enablePullDownRefresh": false
          }
-
-			}, {
+        },
+        {
          "path": "page/accountRecharge/add",
          "style": {
            "navigationBarTitleText": "油站账户充值",
            "enablePullDownRefresh": false
          }
-
-			}]
+        }
+      ]
    },
    {
      "root": "financialCenter",
-			"pages": [{
+      "pages": [
+        {
          "path": "enterprise/account/index",
          "style": {
            "navigationBarTitleText": "企业账户管理",
            "navigationStyle": "custom",
            "enablePullDownRefresh": false
          }
-
-				}, {
+        },
+        {
          "path": "enterprise/account/detail",
          "style": {
            "navigationBarBackgroundColor": "#2866FF",
            "navigationBarTitleText": "企业账户管理",
            "enablePullDownRefresh": false
          }
-
-				}, {
+        },
+        {
          "path": "enterprise/recharge/index",
          "style": {
            "navigationBarTitleText": "企业充值",
            "navigationStyle": "custom",
            "enablePullDownRefresh": false
          }
-
-				}, {
+        },
+        {
          "path": "settlementDoc/manage/index",
          "style": {
            "navigationBarTitleText": "结算单管理",
            "navigationStyle": "custom",
            "enablePullDownRefresh": false
          }
-
-				}, {
+        },
+        {
          "path": "enterprise/recharge/selEnterprise",
          "style": {
            "navigationBarTitleText": "请选择公司",
            "enablePullDownRefresh": false
          }
-
-				}, {
+        },
+        {
          "path": "serviceStation/index",
          "style": {
            "navigationBarTitleText": "油站账户管理",
            "navigationStyle": "custom",
            "enablePullDownRefresh": false
          }
-
        },
-
        {
          "path": "serviceStation/detail",
          "style": {
@@ -455,37 +447,44 @@
            "navigationBarTitleText": "油站账户管理",
            "enablePullDownRefresh": false
          }
-
-				}, {
+        },
+        {
+          "path": "invoice/pool/index",
+          "style": {
+            "navigationBarBackgroundColor": "#2866FF",
+            "navigationBarTitleText": "发票池",
+            "navigationStyle": "custom",
+            "enablePullDownRefresh": false
+          }
+        },
+        {
          "path": "enterpriseRecharge/index",
          "style": {
            "navigationBarTitleText": "企业充值预处理",
            "navigationStyle": "custom",
            "enablePullDownRefresh": false
          }
-
-				}, {
+        },
+        {
          "path": "enterpriseRecharge/detail",
          "style": {
            "navigationBarTitleText": "企业充值预处理",
            "navigationStyle": "custom",
            "enablePullDownRefresh": false
          }
-
        }
-
      ]
    },
    {
      "root": "userManagement",
-			"pages": [{
+      "pages": [
+        {
          "path": "customer/index",
          "style": {
            "navigationBarTitleText": "客户运营系统用户信息",
            "navigationStyle": "custom",
            "enablePullDownRefresh": false
          }
-
        },
        {
          "path": "customer/detail",
@@ -494,7 +493,6 @@
            "navigationBarTitleText": "用户详情",
            "enablePullDownRefresh": false
          }
-
        },
        {
          "path": "customer/components/company",
@@ -502,7 +500,6 @@
            "navigationBarTitleText": "请选择公司",
            "enablePullDownRefresh": false
          }
-
        },
        {
          "path": "customer/components/auth",
@@ -510,18 +507,16 @@
            "navigationBarTitleText": "请选择权限",
            "enablePullDownRefresh": false
          }
-
-				}, {
+        },
+        {
          "path": "yunSite/index",
          "style": {
            "navigationBarTitleText": "星油云站用户信息",
            "navigationStyle": "custom",
            "enablePullDownRefresh": false
          }
-
        },

-
        {
          "path": "yunSite/detail",
          "style": {
@@ -529,7 +524,6 @@
            "navigationBarTitleText": "用户详情",
            "enablePullDownRefresh": false
          }
-
        },
        {
          "path": "yunSite/components/serviceStation",
@@ -537,7 +531,6 @@
            "navigationBarTitleText": "请选择油站",
            "enablePullDownRefresh": false
          }
-
        },
        {
          "path": "yunSite/components/auth",
@@ -545,92 +538,103 @@
            "navigationBarTitleText": "请选择权限",
            "enablePullDownRefresh": false
          }
-
        }
-
      ]
    },
    {
      "root": "customerManagement",
-			"pages": [{
+      "pages": [
+        {
          "path": "companyManagement/index",
          "style": {
            "navigationBarTitleText": "公司管理",
            "navigationStyle": "custom",
            "enablePullDownRefresh": false
          }
-			}, {
+        },
+        {
          "path": "companyManagement/detail",
          "style": {
            "navigationBarTitleText": "公司管理",
            "navigationStyle": "custom",
            "enablePullDownRefresh": false
          }
-			}, {
+        },
+        {
          "path": "companyManagement/companyEnterprise",
          "style": {
            "navigationBarTitleText": "请选择企业",
            "enablePullDownRefresh": false
          }
-
-			}, {
+        },
+        {
          "path": "companyManagement/enterprise",
          "style": {
            "navigationBarTitleText": "请选择总公司",
            "enablePullDownRefresh": false
          }
-			}, {
+        },
+        {
          "path": "companyManagement/bankNameEnterprise",
          "style": {
            "navigationBarTitleText": "请选择开户行",
            "enablePullDownRefresh": false
          }
-			}]
+        }
+      ]
    },
    {
      "root": "siteManagement",
-			"pages": [{
+      "pages": [
+        {
          "path": "OilSiteOilsPrice/index",
          "style": {
            "navigationBarTitleText": "油价管理",
            "navigationStyle": "custom",
            "enablePullDownRefresh": false
          }
-			}, {
+        },
+        {
          "path": "OilSiteOilsPrice/siteEnterprise",
          "style": {
            "navigationBarTitleText": "请选择油站",
            "enablePullDownRefresh": false
          }
-			}, {
+        },
+        {
          "path": "OilSiteOilsPrice/otherSiteEnterprise",
          "style": {
            "navigationBarTitleText": "请选择三方油站",
            "enablePullDownRefresh": false
          }
-			}]
+        }
+      ]
    },
    {
      "root": "contractManagement",
-			"pages": [{
+      "pages": [
+        {
          "path": "list/index",
          "style": {
            "navigationBarTitleText": "合同列表",
            "navigationStyle": "custom",
            "enablePullDownRefresh": false
          }
-			}, {
+        },
+        {
          "path": "list/details",
          "style": {
            "navigationBarTitleText": "合同详情",
            "navigationStyle": "custom",
            "enablePullDownRefresh": false
          }
-			}]
+        }
+      ]
    },
    {
      "root": "dataStatistics",
-			"pages": [{
+      "pages": [
+        {
          "path": "networkPoint/index",
          "style": {
            "navigationBarTitleText": "网点数据统计",
--- a/pages/index/menu.json
+++ b/pages/index/menu.json
@@ -63,7 +63,6 @@
        "lable": "oilOrder:info:list",
        "image": "../../static/newindex/oilOrderList.png"
      }
-			
    ]
  },
  {
@@ -166,6 +165,13 @@
        "lable": "finance:settlementDoc:manage",
        "image": "../../static/newindex/customerList.png"
      },
+      {
+        "icon": "iconxiugaijiage",
+        "name": "发票池",
+        "router": "/financialCenter/invoice/pool/index",
+        "lable": "finance:settlementDoc:manage",
+        "image": "../../static/newindex/distributeReverseList.png"
+      },
      {
        "icon": "iconxiugaijiage",
        "name": "企业充值预处理",
--- a/siteManagement/OilSiteOilsPrice/index.vue
+++ b/siteManagement/OilSiteOilsPrice/index.vue
@@ -142,21 +142,21 @@
 						value: 'SQL',
 						label: '叁仟里'
 					},
-					{
-						value: 'LV',
-						label: '老吕（找油网）'
-					},
 					{
 						value: 'TY',
 						label: '团油'
 					},
-					{
-						value: 'YDJY',
-						label: '一点加油（壳牌）'
-					},
 					{
 						value: 'ZDC',
 						label: '掌多车'
+					},
+					{
+						value: 'LV',
+						label: '老吕（找油网）'
+					},
+					{
+						value: 'YDJY',
+						label: '一点加油（壳牌）'
 					}
 				],
 				sitePriceData: {},
Author	SHA1	Message	Date
zhangyouji	081e27e8b1	更新	2024-06-12 13:47:56 +08:00
zhangyouji	5ba90f1c45	更新	2024-06-11 15:13:40 +08:00
xiaozhiyong	571e8e5ee2	Merge branch 'master' of http://121.196.213.68:3000/caoliancun/wx_oms	2024-06-11 08:43:10 +08:00
xiaozhiyong	69f63076c8	更新	2024-06-11 08:40:08 +08:00
zhangyouji	39b6283793	Merge pull request 'zyj' (#7 ) from zyj into master Reviewed-on: #7	2024-06-07 07:18:04 +00:00