From 101684103f9cd940438427f0c14a75e468f82e59 Mon Sep 17 00:00:00 2001
From: myTest383 <address>
Date: Wed, 20 Nov 2024 14:55:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E9=A1=B9=E7=9B=AE=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue     |    6 +-
 src/settings.js                      |    2 +-
 src/views/commodity/commodityAdd.vue |  624 ++++++-------
 src/views/commodity/index.vue        |  577 ++++++------
 src/views/invoiceReview/index.vue    | 1222 +++++++++++++-------------
 src/views/login/login.vue            |    4 +-
 src/views/print/index - 副本.vue   |    2 +-
 7 files changed, 1215 insertions(+), 1222 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index dcb89b9..b5e6257 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,15 +1,15 @@
 <template>
   <div>
     <div class="navbar">
-     <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>汇融惠享管理平台</p>
-     <!-- <h3 class="breadcrumb-container">汇融银行供应链贷后监管平台</h3> -->
+     <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>惠享管理平台</p>
+     <!-- <h3 class="breadcrumb-container">银行供应链贷后监管平台</h3> -->
       <div class="right-menu">
 <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
        <!-- <p>欢迎您，{{name}}</p>
         <p class="dy" @click="logout()"><img src="@/assets/images/dy.png"></p> -->
       </div>
     </div>
-    <el-footer class="footer" height="40px">Copyright © {{ year }} 汇融惠享管理平台 All Rights Reserved</el-footer>
+    <el-footer class="footer" height="40px">Copyright © {{ year }} 惠享管理平台 All Rights Reserved</el-footer>
   </div>
 </template>
 
diff --git a/src/settings.js b/src/settings.js
index efcba56..03a773e 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-  title: '汇融惠享',
+  title: '惠享',
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/commodity/commodityAdd.vue b/src/views/commodity/commodityAdd.vue
index 278ad5a..71bc729 100644
--- a/src/views/commodity/commodityAdd.vue
+++ b/src/views/commodity/commodityAdd.vue
@@ -1,344 +1,350 @@
 <template>
-	<div>
+    <div>
 
-		<div class="tab-header webtop">
-			<!-- 标题 -->
-			<div>商品信息</div>
-			<!-- start 添加修改按钮 -->
-			<div>
-				<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
-				<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
-			</div>
-			<!-- end 添加修改按钮 -->
-			<!-- end 详情按钮 -->
-		</div>
+        <div class="tab-header webtop">
+            <!-- 标题 -->
+            <div>商品信息</div>
+            <!-- start 添加修改按钮 -->
+            <div>
+                <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+                <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+            </div>
+            <!-- end 添加修改按钮 -->
+            <!-- end 详情按钮 -->
+        </div>
 
-		<div class="listconadd">
+        <div class="listconadd">
 
-			<el-card class="box-card">
-				<div class="item">
-					<span class="item_text">选择菜窖分类：</span>
-					<el-select v-model="formobj.brandId" placeholder="请选择菜窖分类" class="item_input"
-						@change="selectBrandChange">
-						<el-option v-for="item in brandList" :key="item.id" :label="item.name" :value="item.id" />
-					</el-select>
-				</div>
-				<div class="item">
-					<span class="item_text">选择商品分类：</span>
-					<el-select v-model="formobj.categoryId" placeholder="请选择商品分类" class="item_input"
-						@change="selectCateChange">
-						<el-option v-for="item in cateList" :key="item.id" :label="item.name" :value="item.id" />
-					</el-select>
-				</div>
-				<div class="item">
-					<span class="item_text">名称：</span>
-					<el-input v-model="formobj.name" placeholder="" class="item_input" clearable />
-				</div>
-				<div class="item">
-					<span class="item_text">编码：</span>
-					<el-input v-model="formobj.code" placeholder="" class="item_input" clearable
-						oninput="value=value.replace(/[^A-Za-z0-9]/g, '')" />
-				</div>
-				<div class="item">
-					<span class="item_text">条码：</span>
-					<el-input v-model="formobj.barcode" placeholder="" class="item_input" clearable
-						oninput="value=value.replace(/[^0-9]/g,'')" />
-				</div>
-				<div class="item">
-					<span class="item_text">价格 (元/斤)：</span>
-					<el-input v-model="formobj.price" placeholder="" class="item_input" clearable
-						oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
-				</div>
-				<div class="item">
-					<span class="item_text">阶梯重量(斤)：</span>
-					<el-input v-model="formobj.stepWeight" placeholder="" class="item_input" clearable
-						oninput="value=value.replace(/[^0-9]/g,'')" />
-				</div>
-				<div class="item">
-					<span class="item_text">阶梯价格 (元/斤)：</span>
-					<el-input v-model="formobj.stepPrice" placeholder="" class="item_input" clearable
-						oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
-				</div>
-				<div class="item">
-					<span class="item_text">商品单位：</span>
-					<el-input v-model="formobj.specificationUnit" placeholder="例如：斤/瓶/袋/箱/盒" class="item_input"
-						clearable />
-				</div>
-				<div class="item">
-					<span class="item_text">规格 (斤/份)：</span>
-					<el-input v-model="formobj.weight" placeholder="例如：30" class="item_input" clearable
-						oninput="value=value.replace(/[^0-9]/g,'')" />
-				</div>
-				<div class="item">
-					<span class="item_text">规格单位：</span>
-					<el-input v-model="formobj.unitName" placeholder="例如：份" :readonly="true" class="item_input"
-						clearable />
-				</div>
-				<div class="item">
-					<span class="item_text">规格描述：</span>
-					<el-input v-model="formobj.remarks" placeholder="例如：一份30斤" class="item_input" clearable />
-				</div>
-				<div class="item">
-					<span class="item_text">提货截止日：</span>
-					<el-date-picker v-model="formobj.periodValidity" type="date" class="item_input"
-						value-format="yyyy-MM-dd" placeholder="选择日期">
-					</el-date-picker>
-				</div>
-				<div class="item">
-					<span class="item_text">商品简介：</span>
-					<el-input v-model="formobj.content" placeholder="商品简介" class="item_input" clearable />
-				</div>
+            <el-card class="box-card">
+                <div class="item">
+                    <span class="item_text">选择菜窖分类：</span>
+                    <el-select v-model="formobj.brandId" placeholder="请选择菜窖分类" class="item_input"
+                        @change="selectBrandChange">
+                        <el-option v-for="item in brandList" :key="item.id" :label="item.name" :value="item.id" />
+                    </el-select>
+                </div>
+                <div class="item">
+                    <span class="item_text">选择商品分类：</span>
+                    <el-select v-model="formobj.categoryId" placeholder="请选择商品分类" class="item_input"
+                        @change="selectCateChange">
+                        <el-option v-for="item in cateList" :key="item.id" :label="item.name" :value="item.id" />
+                    </el-select>
+                </div>
+                <div class="item">
+                    <span class="item_text">名称：</span>
+                    <el-input v-model="formobj.name" placeholder="" class="item_input" clearable />
+                </div>
+                <div class="item">
+                    <span class="item_text">编码：</span>
+                    <el-input v-model="formobj.code" placeholder="" class="item_input" clearable
+                        oninput="value=value.replace(/[^A-Za-z0-9]/g, '')" />
+                </div>
+                <div class="item">
+                    <span class="item_text">条码：</span>
+                    <el-input v-model="formobj.barcode" placeholder="" class="item_input" clearable
+                        oninput="value=value.replace(/[^0-9]/g,'')" />
+                </div>
+                <div class="item">
+                    <span class="item_text">价格 (元/斤)：</span>
+                    <el-input v-model="formobj.price" placeholder="" class="item_input" clearable
+                        oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+                </div>
+                <div class="item">
+                    <span class="item_text">阶梯重量(斤)：</span>
+                    <el-input v-model="formobj.stepWeight" placeholder="" class="item_input" clearable
+                        oninput="value=value.replace(/[^0-9]/g,'')" />
+                </div>
+                <div class="item">
+                    <span class="item_text">阶梯价格 (元/斤)：</span>
+                    <el-input v-model="formobj.stepPrice" placeholder="" class="item_input" clearable
+                        oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+                </div>
+                <div class="item">
+                    <span class="item_text">商品单位：</span>
+                    <el-input v-model="formobj.specificationUnit" placeholder="例如：斤/瓶/袋/箱/盒" class="item_input"
+                        clearable />
+                </div>
+                <div class="item">
+                    <span class="item_text">规格 (斤/份)：</span>
+                    <el-input v-model="formobj.weight" placeholder="例如：30" class="item_input" clearable
+                        oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+                </div>
+                <div class="item">
+                    <span class="item_text">规格单位：</span>
+                    <el-input v-model="formobj.unitName" placeholder="例如：份" class="item_input" clearable />
+                </div>
+                <div class="item">
+                    <span class="item_text">规格描述：</span>
+                    <el-input v-model="formobj.remarks" placeholder="例如：一份30斤" class="item_input" clearable />
+                </div>
+                <div class="item">
+                    <span class="item_text">提货截止日：</span>
+                    <el-date-picker v-model="formobj.periodValidity" type="date" class="item_input"
+                        value-format="yyyy-MM-dd" placeholder="选择日期">
+                    </el-date-picker>
+                </div>
+                <div class="item">
+                    <span class="item_text">商品简介：</span>
+                    <el-input v-model="formobj.content" placeholder="商品简介" class="item_input" clearable />
+                </div>
+                <div class="item">
+                    <span class="item_text">商品排序：</span>
+                    <el-input v-model="formobj.sort" placeholder="商品排序" class="item_input" clearable
+                        oninput="value=value.replace(/[^0-9]/g,'')" />
+                </div>
 
-				<div class="item" style="margin-bottom: 100px;margin-top: 100px;">
-					<span class="item_text">图片：</span>
-					<upload ref="uploadImg2" v-model="imgList" style="margin-top: 20px;" class="item_input" :limit="1"
-						bucket="map" :class="{ hide: hideUploadBtn }" :upload-data="{ type: '0001' }"
-						@change="backData" />
-				</div>
+                <div class="item" style="margin-bottom: 100px;margin-top: 100px;">
+                    <span class="item_text">图片：</span>
+                    <upload ref="uploadImg2" v-model="imgList" style="margin-top: 20px;" class="item_input" :limit="1"
+                        bucket="map" :class="{ hide: hideUploadBtn }" :upload-data="{ type: '0001' }"
+                        @change="backData" />
+                </div>
 
-				<div>
-					<span class="item_text">商品详情：</span>
-					<editor :height="300" :min-height="100" :value="formobj.appContent" @input="editinput" />
-				</div>
+                <div>
+                    <span class="item_text">商品详情：</span>
+                    <editor :height="300" :min-height="100" :value="formobj.appContent" @input="editinput" />
+                </div>
 
-			</el-card>
+            </el-card>
 
-		</div>
+        </div>
 
-	</div>
+    </div>
 </template>
 
 <script>
-	import req from '@/api/commodity/commodity.js'
-	import upload from '@/components/uploadFile/upload_yanchejianchaTuBiao.vue'
-	import Editor from '@/components/Editor'
-	import reqMall from '@/api/adminmallapi.js'
+    import req from '@/api/commodity/commodity.js'
+    import upload from '@/components/uploadFile/upload_yanchejianchaTuBiao.vue'
+    import Editor from '@/components/Editor'
+    import reqMall from '@/api/adminmallapi.js'
 
-	export default {
-		components: {
-			upload,
-			Editor
-		},
-		data() {
-			return {
-				imgList: [
+    export default {
+        components: {
+            upload,
+            Editor
+        },
+        data() {
+            return {
+                imgList: [
 
-				],
-				submitdisabled: false,
-				formobj: {
-					sid: '',
-					name: '',
-					code: '',
-					barcode: '',
-					price: '',
-					stepWeight: '',
-					stepPrice: '',
-					unitName: '份',
-					specificationUnit: '',
-					weight: '',
-					remarks: '',
-					content: '',
-					picUrl: '',
-					brandId: null,
-					brandName: '',
-					categoryId: null,
-					categoryName: '',
-					periodValidity: ""
-				},
-				brandList: [],
-				cateList: [],
-				hideUploadBtn: false
-			}
-		},
-		created() {
-			this.initData()
-		},
-		methods: {
-			initData() {
-				reqMall.listAllBrand().then(resp => {
-					this.brandList = resp.data
-				})
-				reqMall.listAllCategory().then(resp => {
-					this.cateList = resp.data
-				})
-			},
-			backData(value) {
-				console.log('backData》》》》', value)
-				console.log('imgList', this.imgList)
+                ],
+                submitdisabled: false,
+                formobj: {
+                    sid: '',
+                    name: '',
+                    code: '',
+                    barcode: '',
+                    price: '',
+                    stepWeight: '',
+                    stepPrice: '',
+                    unitName: '份',
+                    specificationUnit: '',
+                    weight: '',
+                    remarks: '',
+                    content: '',
+                    sort: '',
+                    picUrl: '',
+                    brandId: '',
+                    brandName: '',
+                    categoryId: '',
+                    categoryName: '',
+                    periodValidity: ""
+                },
+                brandList: [],
+                cateList: [],
+                hideUploadBtn: false
+            }
+        },
+        created() {
+            this.initData()
+        },
+        methods: {
+            initData() {
+                reqMall.listAllBrand().then(resp => {
+                    this.brandList = resp.data
+                })
+                reqMall.listAllCategory().then(resp => {
+                    this.cateList = resp.data
+                })
+            },
+            backData(value) {
+                console.log('backData》》》》', value)
+                console.log('imgList', this.imgList)
 
-				if (this.imgList.length > 0) {
-					this.formobj.picUrl = this.imgList[0].url
-				} else {
-					this.formobj.picUrl = ''
-				}
+                if (this.imgList.length > 0) {
+                    this.formobj.picUrl = this.imgList[0].url
+                } else {
+                    this.formobj.picUrl = ''
+                }
 
-				this.hideUploadBtn = this.imgList.length != 0
-				console.log('this.hideUploadBtn', this.hideUploadBtn)
-			},
+                this.hideUploadBtn = this.imgList.length != 0
+                console.log('this.hideUploadBtn', this.hideUploadBtn)
+            },
 
-			saveOrUpdate() {
-				console.log('>>>>>>>>>saveOrUpdate', this.formobj)
-				req.saveGoods(this.formobj)
-					.then(resp => {
-						if (resp.success) {
-							this.$message({
-								showClose: true,
-								type: 'success',
-								message: resp.msg
-							})
-							this.handleReturn('true')
-						} else {
-							// 根据resp.code进行异常情况处理
-						}
-					})
-					.catch(() => {})
-			},
-			handleReturn(isreload) {
-				if (isreload === 'true') this.$emit('reloadlist')
-				this.imgList = []
-				this.hideUploadBtn = true
-				this.formobj = {
-					sid: '',
-					name: '',
-					code: '',
-					barcode: '',
-					price: '',
-					stepWeight: '',
-					stepPrice: '',
-					unitName: '份',
-					specificationUnit: '',
-					weight: '',
-					remarks: '',
-					content: '',
-					picUrl: '',
-					appContent: '',
-					periodValidity: ""
-				}
-				this.$emit('doback')
-			},
-			showAdd() {
-				console.log(this.imgList, 88888888)
-				this.hideUploadBtn = this.imgList.length != 0
-			},
-			showEdit(row) {
-				req.goodsInit(row.sid)
-					.then(resp => {
-						if (resp.success) {
-							this.formobj = resp.data
-							this.imgList = []
-							if (resp.data.picUrl != '') {
-								this.imgList.push({
-									url: resp.data.picUrl
-								})
-							}
+            saveOrUpdate() {
+                console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+                req.saveGoods(this.formobj)
+                    .then(resp => {
+                        if (resp.success) {
+                            this.$message({
+                                showClose: true,
+                                type: 'success',
+                                message: resp.msg
+                            })
+                            this.handleReturn('true')
+                        } else {
+                            // 根据resp.code进行异常情况处理
+                        }
+                    })
+                    .catch(() => {})
+            },
+            handleReturn(isreload) {
+                if (isreload === 'true') this.$emit('reloadlist')
+                this.imgList = []
+                this.hideUploadBtn = true
+                this.formobj = {
+                    sid: '',
+                    name: '',
+                    code: '',
+                    barcode: '',
+                    price: '',
+                    stepWeight: '',
+                    stepPrice: '',
+                    unitName: '份',
+                    specificationUnit: '',
+                    weight: '',
+                    remarks: '',
+                    content: '',
+                    sort: '',
+                    picUrl: '',
+                    appContent: '',
+                    periodValidity: ""
+                }
+                this.$emit('doback')
+            },
+            showAdd() {
+                console.log(this.imgList, 88888888)
+                this.hideUploadBtn = this.imgList.length != 0
+            },
+            showEdit(row) {
+                req.goodsInit(row.sid)
+                    .then(resp => {
+                        if (resp.success) {
+                            this.formobj = resp.data
+                            this.imgList = []
+                            if (resp.data.picUrl != '') {
+                                this.imgList.push({
+                                    url: resp.data.picUrl
+                                })
+                            }
 
-							this.hideUploadBtn = this.imgList.length != 0
-							console.log('this.hideUploadBtn', this.hideUploadBtn)
-						}
-					})
-					.catch(e => {
-						this.formobj = row
-						this.imgList = []
-						// 						if (resp.data.picUrl != '') {
-						//  this.imgList.push({
-						// 								url: formobj.picUrl
-						// 							})
-						// }
+                            this.hideUploadBtn = this.imgList.length != 0
+                            console.log('this.hideUploadBtn', this.hideUploadBtn)
+                        }
+                    })
+                    .catch(e => {
+                        this.formobj = row
+                        this.imgList = []
+                        // 						if (resp.data.picUrl != '') {
+                        //  this.imgList.push({
+                        // 								url: formobj.picUrl
+                        // 							})
+                        // }
 
-						// 						this.hideUploadBtn = this.imgList.length != 0
-						console.log('this.hideUploadBtn', this.hideUploadBtn)
-					})
-			},
-			editinput(text) {
-				this.formobj.appContent = text
-			},
-			selectBrandChange(val) {
-				for (var i = 0; i < this.brandList.length; i++) {
-					if (val === this.brandList[i].id) {
-						this.formobj.brandName = this.brandList[i].name
-						break
-					}
-				}
-			},
-			selectCateChange(val) {
-				for (var i = 0; i < this.cateList.length; i++) {
-					if (val === this.cateList[i].id) {
-						this.formobj.categoryName = this.cateList[i].name
-						break
-					}
-				}
-			}
-		}
-	}
+                        // 						this.hideUploadBtn = this.imgList.length != 0
+                        console.log('this.hideUploadBtn', this.hideUploadBtn)
+                    })
+            },
+            editinput(text) {
+                this.formobj.appContent = text
+            },
+            selectBrandChange(val) {
+                for (var i = 0; i < this.brandList.length; i++) {
+                    if (val === this.brandList[i].id) {
+                        this.formobj.brandName = this.brandList[i].name
+                        break
+                    }
+                }
+            },
+            selectCateChange(val) {
+                for (var i = 0; i < this.cateList.length; i++) {
+                    if (val === this.cateList[i].id) {
+                        this.formobj.categoryName = this.cateList[i].name
+                        break
+                    }
+                }
+            }
+        }
+    }
 </script>
 <style lang="scss" scoped>
-	// 隐藏上传组件
+    // 隐藏上传组件
 
-	::v-deep .hide {
-		.el-upload--picture-card {
-			display: none !important;
-		}
-	}
+    ::v-deep .hide {
+        .el-upload--picture-card {
+            display: none !important;
+        }
+    }
 
-	.box-card {
-		margin-left: 60px;
-		margin-right: 60px;
-		min-width: 70%;
-		margin-top: 20px;
+    .box-card {
+        margin-left: 60px;
+        margin-right: 60px;
+        min-width: 70%;
+        margin-top: 20px;
 
-		.item {
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			margin-top: 15px;
-			height: 40px;
-			line-height: 40px;
+        .item {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            margin-top: 15px;
+            height: 40px;
+            line-height: 40px;
 
-			.item_text {
-				flex: 0.8;
-				font-size: 18px;
-				text-align: right;
-			}
+            .item_text {
+                flex: 0.8;
+                font-size: 18px;
+                text-align: right;
+            }
 
-			.item_input {
-				flex: 4;
-				font-size: 16px;
-				margin-left: 10px;
-				margin-right: 80px;
-			}
+            .item_input {
+                flex: 4;
+                font-size: 16px;
+                margin-left: 10px;
+                margin-right: 80px;
+            }
 
-			.item_left_input {
-				width: 20%;
-			}
+            .item_left_input {
+                width: 20%;
+            }
 
-			.item_left_text {
-				height: 30px;
-				margin-left: 20px;
-				line-height: 30px;
-				color: #018AD2;
-				padding: 0px 15px;
-				border: 1.5px solid #018AD2;
-				border-radius: 5px;
+            .item_left_text {
+                height: 30px;
+                margin-left: 20px;
+                line-height: 30px;
+                color: #018AD2;
+                padding: 0px 15px;
+                border: 1.5px solid #018AD2;
+                border-radius: 5px;
 
-			}
+            }
 
-			.item_right {
-				flex: 1;
-				justify-items: center;
+            .item_right {
+                flex: 1;
+                justify-items: center;
 
-				.item_right_list_text {
-					font-size: 16px;
-				}
+                .item_right_list_text {
+                    font-size: 16px;
+                }
 
-				.item_right_list_delect {
-					color: #5E94FF;
-					margin-left: 20px;
-					font-size: 16px;
-					text-decoration: underline;
-				}
-			}
+                .item_right_list_delect {
+                    color: #5E94FF;
+                    margin-left: 20px;
+                    font-size: 16px;
+                    text-decoration: underline;
+                }
+            }
 
-		}
+        }
 
-	}
+    }
 </style>
\ No newline at end of file
diff --git a/src/views/commodity/index.vue b/src/views/commodity/index.vue
index 33874da..7cbe520 100644
--- a/src/views/commodity/index.vue
+++ b/src/views/commodity/index.vue
@@ -1,318 +1,293 @@
 <template>
-  <div class="app-container">
-    <div v-show="viewState == 1">
-      <button-bar ref="btnbar" view-title="商品列表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
-      <div class="main-content">
-        <div class="searchcon">
-          <el-button size="small" class="searchbtn" @click="clicksearchShow">
-            {{ searchxianshitit }}
-          </el-button>
-          <div v-show="isSearchShow" class="search">
-            <el-form :inline="true" class="tab-header">
-              <el-form-item label="商品名称">
-                <el-input v-model="queryParams.params.name" placeholder="" clearable />
-              </el-form-item>
+    <div class="app-container">
+        <div v-show="viewState == 1">
+            <button-bar ref="btnbar" view-title="商品列表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+            <div class="main-content">
+                <div class="searchcon">
+                    <el-button size="small" class="searchbtn" @click="clicksearchShow">
+                        {{ searchxianshitit }}
+                    </el-button>
+                    <div v-show="isSearchShow" class="search">
+                        <el-form :inline="true" class="tab-header">
+                            <el-form-item label="商品名称">
+                                <el-input v-model="queryParams.params.name" placeholder="" clearable />
+                            </el-form-item>
 
-            </el-form>
-            <div class="btn" style="text-align: center;">
-              <el-button
-                type="primary"
-                size="small"
-                icon="el-icon-search"
-                @click="dosearch"
-              >查询</el-button>
-              <el-button
-                type="primary"
-                size="small"
-                icon="el-icon-refresh"
-                @click="resetQuery"
-              >重置</el-button>
-            </div>
-          </div>
-        </div>
-        <!-- Start 项目列表头部 -->
-        <div class="listtop">
-          <div class="tit">商品列表</div>
-        </div>
-        <!-- End 项目列表头部 -->
-        <!-- Start 项目列表 -->
-        <div class="">
-          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
-            <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
-            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-            <el-table-column label="操作" align="center" width="180">
-              <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">编辑</el-button>
-                <!-- <el-button type="primary" size="mini" @click="toRelevancyInfo(scope.row)">删除</el-button> -->
-              </template>
-            </el-table-column>
-            <el-table-column label="小程序自选商品" align="center" width="140">
-              <template slot-scope="scope">
-                <el-switch
-                  v-model="scope.row.useTo"
-                  active-text="是"
-                  inactive-text="否"
-                  active-value="1"
-                  inactive-value="2"
-                  @change="enableChange1(scope.row.sid,scope.row.useTo)"
-                />
-              </template>
-            </el-table-column>
-            <el-table-column label="商品上架" align="center" width="140">
-              <template slot-scope="scope">
-                <el-switch
-                  v-model="scope.row.isAppletGrounding"
-                  active-text="上架"
-                  inactive-text="下架"
-                  active-value="1"
-                  inactive-value="2"
-                  @change="enableChange2(scope.row.sid,scope.row.isAppletGrounding)"
-                />
-              </template>
-            </el-table-column>
-            <el-table-column prop="name" label="商品名称" align="center" />
-            <el-table-column label="商品图片" align="center">
-              <template slot-scope="scope">
-                <el-popover placement="left" trigger="click" width="300">
-                  <img :src="scope.row.picUrl" width="100%">
-                  <img
-                    slot="reference"
-                    :src="scope.row.picUrl"
-                    :alt="scope.row.picUrl"
-                    style="max-height: 70px;max-width: 70px; padding: 5px"
-                  >
-                </el-popover>
-                <!-- <span v-for="(item,index) in scope.row.picUrl" :key="index">
+                        </el-form>
+                        <div class="btn" style="text-align: center;">
+                            <el-button type="primary" size="small" icon="el-icon-search"
+                                @click="dosearch">查询</el-button>
+                            <el-button type="primary" size="small" icon="el-icon-refresh"
+                                @click="resetQuery">重置</el-button>
+                        </div>
+                    </div>
+                </div>
+                <!-- Start 项目列表头部 -->
+                <div class="listtop">
+                    <div class="tit">商品列表</div>
+                </div>
+                <!-- End 项目列表头部 -->
+                <!-- Start 项目列表 -->
+                <div class="">
+                    <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
+                        <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
+                        <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+                        <el-table-column label="操作" align="center" width="180">
+                            <template slot-scope="scope">
+                                <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">编辑</el-button>
+                                <!-- <el-button type="primary" size="mini" @click="toRelevancyInfo(scope.row)">删除</el-button> -->
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="小程序自选商品" align="center" width="140">
+                            <template slot-scope="scope">
+                                <el-switch v-model="scope.row.useTo" active-text="是" inactive-text="否" active-value="1"
+                                    inactive-value="2" @change="enableChange1(scope.row.sid,scope.row.useTo)" />
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="商品上架" align="center" width="140">
+                            <template slot-scope="scope">
+                                <el-switch v-model="scope.row.isAppletGrounding" active-text="上架" inactive-text="下架"
+                                    active-value="1" inactive-value="2"
+                                    @change="enableChange2(scope.row.sid,scope.row.isAppletGrounding)" />
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="name" label="商品名称" align="center" />
+                        <el-table-column label="商品图片" align="center">
+                            <template slot-scope="scope">
+                                <el-popover placement="left" trigger="click" width="300">
+                                    <img :src="scope.row.picUrl" width="100%">
+                                    <img slot="reference" :src="scope.row.picUrl" :alt="scope.row.picUrl"
+                                        style="max-height: 70px;max-width: 70px; padding: 5px">
+                                </el-popover>
+                                <!-- <span v-for="(item,index) in scope.row.picUrl" :key="index">
 						      <el-popover placement="left" trigger="click" width="300">
 						        <img :src="item.url" width="100%" />
 						        <img slot="reference" :src="item.url" :alt="item.url"
 						          style="max-height: 70px;max-width: 70px; padding: 5px" />
 						      </el-popover>
 						    </span> -->
-              </template>
-            </el-table-column>
-            <el-table-column prop="code" label="商品编码" align="center" />
-            <el-table-column prop="barcode" label="商品条码" align="center" />
-            <el-table-column prop="price" label="单价" align="center" />
-            <el-table-column prop="unitName" label="标准单位" align="center" />
-          </el-table>
-        </div>
-        <!-- End 项目列表 -->
-        <div class="pages">
-          <div class="tit" />
-          <!--  翻页  -->
-          <pagination
-            v-show="dataList.length > 0"
-            :total="queryParams.total"
-            :page.sync="queryParams.current"
-            :limit.sync="queryParams.size"
-            class="pagination"
-            @pagination="loadList"
-          />
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="code" label="商品编码" align="center" />
+                        <el-table-column prop="barcode" label="商品条码" align="center" />
+                        <el-table-column prop="price" label="单价" align="center" />
+                        <el-table-column prop="unitName" label="标准单位" align="center" />
+                        <el-table-column prop="brandName" label="所属菜窖" align="center" />
+                        <el-table-column prop="categoryName" label="所属分类" align="center" />
+                        <el-table-column prop="sort" label="排序" align="center" />
+                        <el-table-column prop="createTime" label="创建日期" align="center" />
+                    </el-table>
+                </div>
+                <!-- End 项目列表 -->
+                <div class="pages">
+                    <div class="tit" />
+                    <!--  翻页  -->
+                    <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
+                        :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+                </div>
+            </div>
         </div>
-      </div>
+        <!-- End 查询和其列表部分 -->
+        <!-- 新增修改部分组件 -->
+        <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
     </div>
-    <!-- End 查询和其列表部分 -->
-    <!-- 新增修改部分组件 -->
-    <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
-  </div>
 </template>
 
 <script>
-	import req from '@/api/commodity/commodity.js'
-	import ButtonBar from '@/components/ButtonBar'
-	import Pagination from '@/components/pagination'
-	import pageye from '@/components/pagination/pageye'
-	import divAdd from './commodityAdd.vue'
-	export default {
-		name: 'SupplierBankInfoIndex',
-		components: {
-			ButtonBar,
-			Pagination,
-			pageye,
-			divAdd
-		},
-		data() {
-			return {
-				btndisabled: false,
-				viewState: 1, // 1、列表 2、添加 3、修改 4、查看
-				isSearchShow: false,
-				searchxianshitit: '显示查询条件',
-				tableLoading: false,
-				dataList: [],
-				btnList: [{
-						type: 'primary',
-						size: 'small',
-						icon: 'plus',
-						btnKey: 'toAdd',
-						btnLabel: '新增'
-					},
-					{
-						type: 'info',
-						size: 'small',
-						icon: 'cross',
-						btnKey: 'doClose',
-						btnLabel: '关闭'
-					}
-				],
-				queryParams: {
-					current: 1,
-					size: 10,
-					total: 0,
-					params: {
-						name: ''
-					}
-				},
-				sids: []
-			}
-		},
-		mounted() {
-			this.$refs['btnbar'].setButtonList(this.btnList)
-		},
-		created() {
-			this.loadList()
-		},
-		methods: {
-			// 搜索条件效果
-			clicksearchShow() {
-				this.isSearchShow = !this.isSearchShow
-				if (this.isSearchShow) {
-					this.searchxianshitit = '隐藏查询条件'
-				} else {
-					this.searchxianshitit = '显示查询条件'
-				}
-			},
-			btnHandle(btnKey) {
-				switch (btnKey) {
-					case 'toAdd':
-						this.toAdd()
-						break
-					case 'doClose':
-						this.doClose()
-						break
-					default:
-						break
-				}
-			},
-			loadList() {
-				this.tableLoading = true
-				req.goodsListPage(this.queryParams).then((resp) => {
-					this.tableLoading = false
-					if (resp.success) {
-						const data = resp.data
-						this.queryParams.total = data.total
-						this.dataList = data.records
-					} else {
-						// 根据resp.code进行异常情况处理
-						this.dataList = []
-						this.queryParams.total = 0
-					}
-				}).catch(() => {
-					this.tableLoading = false
-				})
-			},
+    import req from '@/api/commodity/commodity.js'
+    import ButtonBar from '@/components/ButtonBar'
+    import Pagination from '@/components/pagination'
+    import pageye from '@/components/pagination/pageye'
+    import divAdd from './commodityAdd.vue'
+    export default {
+        name: 'SupplierBankInfoIndex',
+        components: {
+            ButtonBar,
+            Pagination,
+            pageye,
+            divAdd
+        },
+        data() {
+            return {
+                btndisabled: false,
+                viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+                isSearchShow: false,
+                searchxianshitit: '显示查询条件',
+                tableLoading: false,
+                dataList: [],
+                btnList: [{
+                        type: 'primary',
+                        size: 'small',
+                        icon: 'plus',
+                        btnKey: 'toAdd',
+                        btnLabel: '新增'
+                    },
+                    {
+                        type: 'info',
+                        size: 'small',
+                        icon: 'cross',
+                        btnKey: 'doClose',
+                        btnLabel: '关闭'
+                    }
+                ],
+                queryParams: {
+                    current: 1,
+                    size: 10,
+                    total: 0,
+                    params: {
+                        name: ''
+                    }
+                },
+                sids: []
+            }
+        },
+        mounted() {
+            this.$refs['btnbar'].setButtonList(this.btnList)
+        },
+        created() {
+            this.loadList()
+        },
+        methods: {
+            // 搜索条件效果
+            clicksearchShow() {
+                this.isSearchShow = !this.isSearchShow
+                if (this.isSearchShow) {
+                    this.searchxianshitit = '隐藏查询条件'
+                } else {
+                    this.searchxianshitit = '显示查询条件'
+                }
+            },
+            btnHandle(btnKey) {
+                switch (btnKey) {
+                    case 'toAdd':
+                        this.toAdd()
+                        break
+                    case 'doClose':
+                        this.doClose()
+                        break
+                    default:
+                        break
+                }
+            },
+            loadList() {
+                this.tableLoading = true
+                req.goodsListPage(this.queryParams).then((resp) => {
+                    this.tableLoading = false
+                    if (resp.success) {
+                        const data = resp.data
+                        this.queryParams.total = data.total
+                        this.dataList = data.records
+                    } else {
+                        // 根据resp.code进行异常情况处理
+                        this.dataList = []
+                        this.queryParams.total = 0
+                    }
+                }).catch(() => {
+                    this.tableLoading = false
+                })
+            },
 
-			// 序号
-			indexMethod(index) {
-				var pagestart = (this.queryParams.current - 1) * this.queryParams.size
-				var pageindex = index + 1 + pagestart
-				return pageindex
-			},
-			dosearch() {
-				this.queryParams.current = 1
-				this.loadList()
-			},
-			resetQuery() {
-				this.queryParams = {
-					current: 1,
-					size: 10,
-					total: 0,
-					params: {
-						name: ''
-					}
-				}
-				this.loadList()
-			},
-			toAdd() {
-				this.viewState = 2
-				this.$refs['divadd'].showAdd()
-			},
+            // 序号
+            indexMethod(index) {
+                var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+                var pageindex = index + 1 + pagestart
+                return pageindex
+            },
+            dosearch() {
+                this.queryParams.current = 1
+                this.loadList()
+            },
+            resetQuery() {
+                this.queryParams = {
+                    current: 1,
+                    size: 10,
+                    total: 0,
+                    params: {
+                        name: ''
+                    }
+                }
+                this.loadList()
+            },
+            toAdd() {
+                this.viewState = 2
+                this.$refs['divadd'].showAdd()
+            },
 
-	doClose() {
-			  this.$store.dispatch('tagsView/delView', this.$route)
-			  this.$router.go(-1)
-			},
-			toRelevancy(row) {
-				this.viewState = 3
-				this.$refs['divadd'].showEdit(row)
-			},
-			toRelevancyInfo(row) {
-				const tip = '请确认是否删除所选商品?'
-				this.$confirm(tip, '提示', {
-					confirmButtonText: '确定',
-					cancelButtonText: '取消',
-					type: 'warning'
-				}).then(() => {
-					const loading = this.$loading({
-						lock: true,
-						text: 'Loading',
-						spinner: 'el-icon-loading',
-						background: 'rgba(0, 0, 0, 0.7)'
-					})
-					req.deleteGoods(row.sid).then((resp) => {
-						loading.close()
-						if (resp.success) {
-							this.$message({
-								type: 'success',
-								message: resp.msg,
-								showClose: true
-							})
-							this.loadList()
-						} else {
-							// 根据resp.code进行异常情况处理
-						}
-					}).catch(e => {
-						loading.close()
-					})
-				}).catch(() => {})
-			},
-			resetState() {
-				this.viewState = 1
-			},
-			enableChange1(sid, state) {
-				console.log('sid', sid)
-				console.log('state', state)
-				req.updateAppletUseTo(sid, state).then((resp) => {
-					if (resp.success) {
-						this.$message({
-							type: 'success',
-							message: '状态已更新',
-							showClose: true
-						})
-					} else { // 根据resp.code进行异常情况处理
-					}
-				}).catch(e => {
-					console.log(e)
-				})
-			},
-			enableChange2(sid, state) {
-				console.log('sid', sid)
-				console.log('state', state)
-				req.updateIsEnable(sid, state).then((resp) => {
-					if (resp.success) {
-						this.$message({
-							type: 'success',
-							message: '状态已更新',
-							showClose: true
-						})
-					} else { // 根据resp.code进行异常情况处理
-					}
-				}).catch(e => {
-					console.log(e)
-				})
-			}
-		}
-	}
+            doClose() {
+                this.$store.dispatch('tagsView/delView', this.$route)
+                this.$router.go(-1)
+            },
+            toRelevancy(row) {
+                this.viewState = 3
+                this.$refs['divadd'].showEdit(row)
+            },
+            toRelevancyInfo(row) {
+                const tip = '请确认是否删除所选商品?'
+                this.$confirm(tip, '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    const loading = this.$loading({
+                        lock: true,
+                        text: 'Loading',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(0, 0, 0, 0.7)'
+                    })
+                    req.deleteGoods(row.sid).then((resp) => {
+                        loading.close()
+                        if (resp.success) {
+                            this.$message({
+                                type: 'success',
+                                message: resp.msg,
+                                showClose: true
+                            })
+                            this.loadList()
+                        } else {
+                            // 根据resp.code进行异常情况处理
+                        }
+                    }).catch(e => {
+                        loading.close()
+                    })
+                }).catch(() => {})
+            },
+            resetState() {
+                this.viewState = 1
+            },
+            enableChange1(sid, state) {
+                console.log('sid', sid)
+                console.log('state', state)
+                req.updateAppletUseTo(sid, state).then((resp) => {
+                    if (resp.success) {
+                        this.$message({
+                            type: 'success',
+                            message: '状态已更新',
+                            showClose: true
+                        })
+                    } else { // 根据resp.code进行异常情况处理
+                    }
+                }).catch(e => {
+                    console.log(e)
+                })
+            },
+            enableChange2(sid, state) {
+                console.log('sid', sid)
+                console.log('state', state)
+                req.updateIsEnable(sid, state).then((resp) => {
+                    if (resp.success) {
+                        this.$message({
+                            type: 'success',
+                            message: '状态已更新',
+                            showClose: true
+                        })
+                    } else { // 根据resp.code进行异常情况处理
+                    }
+                }).catch(e => {
+                    console.log(e)
+                })
+            }
+        }
+    }
 </script>
 <style scoped>
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/invoiceReview/index.vue b/src/views/invoiceReview/index.vue
index 4401a48..f72f14b 100644
--- a/src/views/invoiceReview/index.vue
+++ b/src/views/invoiceReview/index.vue
@@ -1,614 +1,626 @@
 <template>
-	<div class="app-container">
-		<div v-show="viewState == 1">
-			<button-bar ref="btnbar" view-title="发票列表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
-			<div class="main-content">
-				<div class="searchcon">
-					<el-button size="small" class="searchbtn" @click="clicksearchShow">
-						{{ searchxianshitit }}
-					</el-button>
-					<div v-show="isSearchShow" class="search">
-						<el-form :inline="true" class="tab-header">
-							<el-form-item label="发票抬头">
-								<el-input v-model="queryParams.params.name" placeholder="" clearable />
-							</el-form-item>
-
-						</el-form>
-						<div class="btn" style="text-align: center;">
-							<el-button type="primary" size="small" icon="el-icon-search"
-								@click="dosearch">查询</el-button>
-							<el-button type="primary" size="small" icon="el-icon-refresh"
-								@click="resetQuery">重置</el-button>
-						</div>
-					</div>
-				</div>
-				<!-- Start 项目列表头部 -->
-				<div class="listtop">
-					<div class="tit">发票列表</div>
-				</div>
-				<!-- End 项目列表头部 -->
-				<!-- Start 项目列表 -->
-				<div class="">
-					<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
-						<!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
-						<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-						<el-table-column label="操作" align="center" width="120">
-							<template slot-scope="scope">
-								<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">审核</el-button>
-								<!-- <el-button type="primary" size="mini" @click="toRelevancyInfo(scope.row)">删除</el-button> -->
-							</template>
-						</el-table-column>
-						<el-table-column prop="nick" label="提交人" width="150" align="center" />
-						<el-table-column prop="mobile" label="联系电话" width="150" align="center" />
-						<el-table-column prop="createTime" label="提交时间" width="180" align="center" />
-						<el-table-column label="订单编号" align="center">
-							<template slot-scope="scope">
-								<div style="color: #1890FF; text-decoration: underline ;"
-									@click="showOrder(scope.row.orderSid)">{{ scope.row.outTradeNo }}</div>
-							</template>
-						</el-table-column>
-						<el-table-column prop="invoiceType" label="发票类型" width="150" align="center" />
-						<el-table-column prop="headingType" label="抬头类型" width="150" align="center" />
-						<el-table-column prop="invoiceHeader" label="发票抬头" align="center" />
-						<el-table-column prop="totalTee" label="发票金额" width="150" align="center" />
-
-					</el-table>
-				</div>
-				<!-- End 项目列表 -->
-				<div class="pages">
-					<div class="tit" />
-					<!--  翻页  -->
-					<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
-						:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
-				</div>
-			</div>
-		</div>
-		<!-- End 查询和其列表部分 -->
-		<!-- 新增修改部分组件 -->
-		<!-- <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" /> -->
-
-		<el-dialog title="审核发票" :visible.sync="dialogVisible" :before-close="handleClose">
-			<el-form ref="dataForm1" class="formadd" style="margin-top: -40px;":model="itemInfo">
-
-				<el-row class="first_row">
-					<el-col :span="4" class="trightb">
-						<el-form-item class="trightb_item">
-							<span slot="label">发票类型</span>
-						</el-form-item>
-					</el-col>
-					<el-col :span="8">
-						<el-form-item class="trightb_item">
-							<span slot="label">{{itemInfo.invoiceType}}</span>
-						</el-form-item>
-					</el-col>
-					<el-col :span="4" class="trightb">
-						<el-form-item class="trightb_item">
-							<span slot="label">抬头类型</span>
-						</el-form-item>
-					</el-col>
-					<el-col :span="8">
-						<el-form-item class="trightb_item">
-							<span slot="label">{{itemInfo.headingType}}</span>
-						</el-form-item>
-					</el-col>
-				</el-row>
-
-				<el-row>
-					<el-col :span="4" class="trightb">
-						<el-form-item class="trightb_item">
-							<span slot="label">发票抬头</span>
-						</el-form-item>
-					</el-col>
-					<el-col :span="8">
-						<el-form-item class="trightb_item">
-							<span slot="label">{{itemInfo.invoiceHeader}}</span>
-						</el-form-item>
-					</el-col>
-					<el-col :span="4" class="trightb">
-						<el-form-item class="trightb_item">
-							<span slot="label">税号</span>
-						</el-form-item>
-					</el-col>
-					<el-col :span="8">
-						<el-form-item class="trightb_item">
-							<span slot="label">{{itemInfo.dutyParagraph}}</span>
-						</el-form-item>
-					</el-col>
-				</el-row>
-
-				<el-row>
-					<el-col :span="4" class="trightb">
-						<el-form-item class="trightb_item">
-							<span slot="label">开户银行</span>
-						</el-form-item>
-					</el-col>
-					<el-col :span="8">
-						<el-form-item class="trightb_item">
-							<span slot="label">{{itemInfo.bankOfDeposit}}</span>
-						</el-form-item>
-					</el-col>
-					<el-col :span="4" class="trightb">
-						<el-form-item class="trightb_item">
-							<span slot="label">银行账号</span>
-						</el-form-item>
-					</el-col>
-					<el-col :span="8">
-						<el-form-item class="trightb_item">
-							<span slot="label">{{itemInfo.bankAccount}}</span>
-						</el-form-item>
-					</el-col>
-				</el-row>
-
-				<el-row>
-					<el-col :span="4" class="trightb">
-						<el-form-item class="trightb_item">
-							<span slot="label">企业地址</span>
-						</el-form-item>
-					</el-col>
-					<el-col :span="8">
-						<el-form-item class="trightb_item">
-							<span slot="label">{{itemInfo.enterpriseAddress}}</span>
-						</el-form-item>
-					</el-col>
-					<el-col :span="4" class="trightb">
-						<el-form-item class="trightb_item">
-							<span slot="label">企业电话</span>
-						</el-form-item>
-					</el-col>
-					<el-col :span="8">
-						<el-form-item class="trightb_item">
-							<span slot="label">{{itemInfo.enterprisePhone}}</span>
-						</el-form-item>
-					</el-col>
-				</el-row>
-				<el-row>
-					<el-col :span="4" class="trightb">
-						<el-form-item class="trightb_item">
-							<span slot="label">发票金额</span>
-						</el-form-item>
-					</el-col>
-					<el-col :span="4">
-						<el-form-item class="trightb_item">
-							<span slot="label">{{itemInfo.totalTee}}</span>
-						</el-form-item>
-					</el-col>
-					<el-col :span="4" class="trightb">
-						<el-form-item class="trightb_item">
-							<span slot="label">订单编号</span>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item class="trightb_item">
-							<span style="color: #1890FF; text-decoration: underline ;"
-								@click="showOrder(itemInfo.orderSid)">{{itemInfo.outTradeNo}}</span>
-						</el-form-item>
-					</el-col>
-				</el-row>
-
-			</el-form>
-			<el-form ref="dataForm2" class="formadd" :model="formobj">
-				<el-row class="first_row">
-					<el-col :span="8" class="trightb">
-						<el-form-item class="trightb_item">
-							<span slot="label">审核结果</span>
-						</el-form-item>
-					</el-col>
-					<el-col :span="16">
-						<el-form-item class="trightb_item">
-							<el-radio-group v-model="formobj.state" size="small" @change="changeTheme">
-								<el-radio :label="2">同意</el-radio>
-								<el-radio :label="3">拒绝</el-radio>
-							</el-radio-group>
-						</el-form-item>
-					</el-col>
-				</el-row>
-				<el-row>
-					<el-col :span="8" class="trightb">
-						<el-form-item class="trightb_item">
-							<span slot="label">审核意见</span>
-						</el-form-item>
-					</el-col>
-					<el-col :span="16">
-						<el-form-item class="trightb_item">
-							<el-input v-model="formobj.remarks" placeholder="请填写审核意见" class="addinputw"
-								style="width:100%" clearable />
-						</el-form-item>
-					</el-col>
-				</el-row>
-			</el-form>
-
-
-			<div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
-				<el-button type="primary" style="margin-top: 20px;" @click="saveExamine">确 定</el-button>
-			</div>
-
-		</el-dialog>
-
-
-
-		<el-dialog title="订单详情" :visible.sync="dialogVisible2" :before-close="handleClose2">
-			<el-form ref="dataForm1" class="formadd" style="margin-top: -40px;" :model="orderInfo">
-				<div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
-					<div>订单信息</div>
-				</div>
-				<el-row class="first_row">
-					<el-col :span="4" class="trightb">
-						<el-form-item class="trightb_item">
-							<span slot="label">订单编号</span>
-						</el-form-item>
-					</el-col>
-					<el-col :span="20">
-						<el-form-item class="trightb_item">
-							<span slot="label">{{orderInfo.outTradeNo}}</span>
-						</el-form-item>
-					</el-col>
-					
-				</el-row>
-				<el-row>
-				<el-col :span="4" class="trightb">
-					<el-form-item class="trightb_item">
-						<span slot="label">下单时间</span>
-					</el-form-item>
-				</el-col>
-				<el-col :span="8">
-					<el-form-item class="trightb_item">
-						<span slot="label">{{orderInfo.createTime}}</span>
-					</el-form-item>
-				</el-col>
-				
-				<el-col :span="4" class="trightb">
-					<el-form-item class="trightb_item">
-						<span slot="label">付款时间</span>
-					</el-form-item>
-				</el-col>
-				<el-col :span="8">
-					<el-form-item class="trightb_item">
-						<span slot="label">{{orderInfo.payTime}}</span>
-					</el-form-item>
-				</el-col>
-				</el-row>
-				<el-row>
-					<el-col :span="4" class="trightb">
-						<el-form-item class="trightb_item">
-							<span slot="label">支付方式</span>
-						</el-form-item>
-					</el-col>
-					<el-col :span="8">
-						<el-form-item class="trightb_item">
-							<span slot="label">{{orderInfo.payType}}</span>
-						</el-form-item>
-					</el-col>
-					<el-col :span="4" class="trightb">
-						<el-form-item class="trightb_item">
-							<span slot="label">实付金额</span>
-						</el-form-item>
-					</el-col>
-					<el-col :span="8">
-						<el-form-item class="trightb_item">
-							<span slot="label">{{orderInfo.meet}}</span>
-						</el-form-item>
-					</el-col>
-
-				</el-row>
-
-				<el-collapse v-model="activeNames" style="margin-top: 20px;">
-					<el-collapse-item name="1" title="商品列表">
-						<!-- <template slot="title">
+    <div class="app-container">
+        <div v-show="viewState == 1">
+            <button-bar ref="btnbar" view-title="发票列表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+            <div class="main-content">
+                <div class="searchcon">
+                    <el-button size="small" class="searchbtn" @click="clicksearchShow">
+                        {{ searchxianshitit }}
+                    </el-button>
+                    <div v-show="isSearchShow" class="search">
+                        <el-form :inline="true" class="tab-header">
+                            <el-form-item label="发票抬头">
+                                <el-input v-model="queryParams.params.name" placeholder="" clearable />
+                            </el-form-item>
+
+                        </el-form>
+                        <div class="btn" style="text-align: center;">
+                            <el-button type="primary" size="small" icon="el-icon-search"
+                                @click="dosearch">查询</el-button>
+                            <el-button type="primary" size="small" icon="el-icon-refresh"
+                                @click="resetQuery">重置</el-button>
+                        </div>
+                    </div>
+                </div>
+                <!-- Start 项目列表头部 -->
+                <div class="listtop">
+                    <div class="tit">发票列表</div>
+                </div>
+                <!-- End 项目列表头部 -->
+                <!-- Start 项目列表 -->
+                <div class="">
+                    <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
+                        <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
+                        <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+                        <el-table-column label="操作" align="center" width="120">
+                            <template slot-scope="scope">
+                                <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">审核</el-button>
+                                <!-- <el-button type="primary" size="mini" @click="toRelevancyInfo(scope.row)">删除</el-button> -->
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="nick" label="提交人" width="150" align="center" />
+                        <el-table-column prop="mobile" label="联系电话" width="150" align="center" />
+                        <el-table-column prop="createTime" label="提交时间" width="180" align="center" />
+                        <el-table-column label="订单编号" align="center">
+                            <template slot-scope="scope">
+                                <div style="color: #1890FF; text-decoration: underline ;"
+                                    @click="showOrder(scope.row.orderSid)">{{ scope.row.outTradeNo }}</div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="invoiceType" label="发票类型" width="150" align="center" />
+                        <el-table-column prop="headingType" label="抬头类型" width="150" align="center" />
+                        <el-table-column prop="invoiceHeader" label="发票抬头" align="center" />
+                        <el-table-column prop="totalTee" label="发票金额" width="150" align="center" />
+
+                    </el-table>
+                </div>
+                <!-- End 项目列表 -->
+                <div class="pages">
+                    <div class="tit" />
+                    <!--  翻页  -->
+                    <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
+                        :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+                </div>
+            </div>
+        </div>
+        <!-- End 查询和其列表部分 -->
+        <!-- 新增修改部分组件 -->
+        <!-- <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" /> -->
+
+        <el-dialog title="审核发票" :visible.sync="dialogVisible" :before-close="handleClose">
+            <el-form ref="dataForm1" class="formadd" style="margin-top: -40px;" :model="itemInfo">
+
+                <el-row class="first_row">
+                    <el-col :span="4" class="trightb">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">发票类型</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">{{itemInfo.invoiceType}}</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="4" class="trightb">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">抬头类型</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">{{itemInfo.headingType}}</span>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row>
+                    <el-col :span="4" class="trightb">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">发票抬头</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">{{itemInfo.invoiceHeader}}</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="4" class="trightb">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">税号</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">{{itemInfo.dutyParagraph}}</span>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row>
+                    <el-col :span="4" class="trightb">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">开户银行</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">{{itemInfo.bankOfDeposit}}</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="4" class="trightb">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">银行账号</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">{{itemInfo.bankAccount}}</span>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="4" class="trightb">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">电子邮箱</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">{{itemInfo.email}}</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="4" class="trightb">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">企业电话</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">{{itemInfo.enterprisePhone}}</span>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="4" class="trightb">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">企业地址</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="20">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">{{itemInfo.enterpriseAddress}}</span>
+                        </el-form-item>
+                    </el-col>
+
+                </el-row>
+                <el-row>
+                    <el-col :span="4" class="trightb">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">发票金额</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="4">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">{{itemInfo.totalTee}}</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="4" class="trightb">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">订单编号</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item class="trightb_item">
+                            <span style="color: #1890FF; text-decoration: underline ;"
+                                @click="showOrder(itemInfo.orderSid)">{{itemInfo.outTradeNo}}</span>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+            </el-form>
+            <el-form ref="dataForm2" class="formadd" :model="formobj">
+                <el-row class="first_row">
+                    <el-col :span="8" class="trightb">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">审核结果</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="16">
+                        <el-form-item class="trightb_item">
+                            <el-radio-group v-model="formobj.state" size="small" @change="changeTheme">
+                                <el-radio :label="2">同意</el-radio>
+                                <el-radio :label="3">拒绝</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="8" class="trightb">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">审核意见</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="16">
+                        <el-form-item class="trightb_item">
+                            <el-input v-model="formobj.remarks" placeholder="请填写审核意见" class="addinputw"
+                                style="width:100%" clearable />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+
+
+            <div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
+                <el-button type="primary" style="margin-top: 20px;" @click="saveExamine">确 定</el-button>
+            </div>
+
+        </el-dialog>
+
+
+
+        <el-dialog title="订单详情" :visible.sync="dialogVisible2" :before-close="handleClose2">
+            <el-form ref="dataForm1" class="formadd" style="margin-top: -40px;" :model="orderInfo">
+                <div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
+                    <div>订单信息</div>
+                </div>
+                <el-row class="first_row">
+                    <el-col :span="4" class="trightb">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">订单编号</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="20">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">{{orderInfo.outTradeNo}}</span>
+                        </el-form-item>
+                    </el-col>
+
+                </el-row>
+                <el-row>
+                    <el-col :span="4" class="trightb">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">下单时间</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">{{orderInfo.createTime}}</span>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="4" class="trightb">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">付款时间</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">{{orderInfo.payTime}}</span>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="4" class="trightb">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">支付方式</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">{{orderInfo.payType}}</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="4" class="trightb">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">实付金额</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item class="trightb_item">
+                            <span slot="label">{{orderInfo.meet}}</span>
+                        </el-form-item>
+                    </el-col>
+
+                </el-row>
+
+                <el-collapse v-model="activeNames" style="margin-top: 20px;">
+                    <el-collapse-item name="1" title="商品列表">
+                        <!-- <template slot="title">
 							商品列表<span class="span" @click.stop="add()">添加</span>
 						</template> -->
-						<el-table v-loading="listLoading" :data="orderInfo.ordOrderDetails" border style="width: 100%;"
-							:row-style="{height: '40px'}">
-							<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
-							<el-table-column label="商品图片" align="center">
-								<template slot-scope="scope">
-									<el-popover placement="left" trigger="click" width="300">
-										<img :src="scope.row.picUrl" width="100%" />
-										<img slot="reference" :src="scope.row.picUrl" :alt="scope.row.picUrl"
-											style="max-height: 70px;max-width: 70px; padding: 5px" />
-									</el-popover>
-								</template>
-							</el-table-column>
-							<el-table-column label="商品名称" prop="goodsName" align="center" />
-							<el-table-column label="份数" prop="partNumber" align="center" />
-							<el-table-column label="单价" prop="priceUnit" align="center" />
-							<el-table-column label="单位" prop="specificationUnit" align="center" />
-							<el-table-column label="规格" prop="unitName" align="center" />
-							<el-table-column label="金额" prop="pricePart" align="center" />
-						</el-table>
-
-					</el-collapse-item>
-				</el-collapse>
-
-			</el-form>
-
-
-			<div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
-				<el-button type="primary" style="margin-top: 20px;" @click="handleClose2">确 定</el-button>
-			</div>
-
-		</el-dialog>
-
-
-	</div>
+                        <el-table v-loading="listLoading" :data="orderInfo.ordOrderDetails" border style="width: 100%;"
+                            :row-style="{height: '40px'}">
+                            <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
+                            <el-table-column label="商品图片" align="center">
+                                <template slot-scope="scope">
+                                    <el-popover placement="left" trigger="click" width="300">
+                                        <img :src="scope.row.picUrl" width="100%" />
+                                        <img slot="reference" :src="scope.row.picUrl" :alt="scope.row.picUrl"
+                                            style="max-height: 70px;max-width: 70px; padding: 5px" />
+                                    </el-popover>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="商品名称" prop="goodsName" align="center" />
+                            <el-table-column label="份数" prop="partNumber" align="center" />
+                            <el-table-column label="单价" prop="priceUnit" align="center" />
+                            <el-table-column label="单位" prop="specificationUnit" align="center" />
+                            <el-table-column label="规格" prop="unitName" align="center" />
+                            <el-table-column label="金额" prop="pricePart" align="center" />
+                        </el-table>
+
+                    </el-collapse-item>
+                </el-collapse>
+
+            </el-form>
+
+
+            <div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
+                <el-button type="primary" style="margin-top: 20px;" @click="handleClose2">确 定</el-button>
+            </div>
+
+        </el-dialog>
+
+
+    </div>
 </template>
 
 <script>
-	import req from '@/api/invoiceReview/invoiceReview.js'
-	import ButtonBar from '@/components/ButtonBar'
-	import Pagination from '@/components/pagination'
-	import pageye from '@/components/pagination/pageye'
-	// import divAdd from './appletNoticeAdd.vue'
-	export default {
-		name: 'SupplierBankInfoIndex',
-		components: {
-			ButtonBar,
-			Pagination,
-			pageye,
-			// divAdd
-		},
-		data() {
-			return {
-				activeNames: ['1'],
-				listLoading: false,
-				formobj: {
-					sid: "",
-					state: "",  //2申请通过  3不通过
-					remarks: ''
-				},
-				dialogVisible: false,
-				dialogVisible2: false,
-				btndisabled: false,
-				viewState: 1, // 1、列表 2、添加 3、修改 4、查看
-				isSearchShow: false,
-				searchxianshitit: '显示查询条件',
-				tableLoading: false,
-				dataList: [],
-				btnList: [
-					// {
-					// 	type: 'primary',
-					// 	size: 'small',
-					// 	icon: 'plus',
-					// 	btnKey: 'toAdd',
-					// 	btnLabel: '新增'
-					// },
-					{
-						type: 'info',
-						size: 'small',
-						icon: 'cross',
-						btnKey: 'doClose',
-						btnLabel: '关闭'
-					}
-				],
-				queryParams: {
-					current: 1,
-					size: 10,
-					total: 0,
-					params: {
-						name: ''
-					}
-				},
-				sids: [],
-				itemInfo: {},
-				orderInfo: {}
-			}
-		},
-		mounted() {
-			this.$refs['btnbar'].setButtonList(this.btnList)
-		},
-		created() {
-			this.loadList()
-		},
-		methods: {
-			// 搜索条件效果
-			clicksearchShow() {
-				this.isSearchShow = !this.isSearchShow
-				if (this.isSearchShow) {
-					this.searchxianshitit = '隐藏查询条件'
-				} else {
-					this.searchxianshitit = '显示查询条件'
-				}
-			},
-			btnHandle(btnKey) {
-				switch (btnKey) {
-					case 'toAdd':
-						this.toAdd()
-						break
-					case 'doClose':
-						this.doClose()
-						break
-					default:
-						break
-				}
-			},
-			loadList() {
-				this.tableLoading = true
-				req.listPage(this.queryParams).then((resp) => {
-					this.tableLoading = false
-					if (resp.success) {
-						const data = resp.data
-						this.queryParams.total = data.total
-						this.dataList = data.records
-					} else {
-						// 根据resp.code进行异常情况处理
-						this.dataList = []
-						this.queryParams.total = 0
-					}
-				}).catch(() => {
-					this.tableLoading = false
-				})
-			},
-
-			// 序号
-			indexMethod(index) {
-				var pagestart = (this.queryParams.current - 1) * this.queryParams.size
-				var pageindex = index + 1 + pagestart
-				return pageindex
-			},
-			dosearch() {
-				this.queryParams.current = 1
-				this.loadList()
-			},
-			resetQuery() {
-				this.queryParams = {
-					current: 1,
-					size: 10,
-					total: 0,
-					params: {
-						name: ''
-					}
-				}
-				this.loadList()
-			},
-			toAdd() {
-				this.viewState = 2
-				this.$refs['divadd'].showAdd()
-			},
-
-			doClose() {
-				this.$store.dispatch('tagsView/delView', this.$route)
-				this.$router.go(-1)
-			},
-			toRelevancy(row) {
-				this.dialogVisible = true
-				this.formobj.sid = row.sid
-				this.itemInfo = row
-			},
-			changeTheme(val) {
-
-			},
-			handleClose() {
-				this.dialogVisible = false
-			},
-			handleClose2() {
-				this.dialogVisible2 = false
-			},
-			saveExamine() {
-				console.log("saveExamine", this.formobj);
-
-				if (this.formobj.state == '') {
-					this.$message({
-						type: 'warning',
-						message: '请选择审核结果',
-						showClose: true
-					})
-
-					return
-				}
-
-				if (this.formobj.state == 2 && this.formobj.remarks == '') {
-					this.$message({
-						type: 'warning',
-						message: '请填写审核意见',
-						showClose: true
-					})
-
-					return
-				}
-
-				req.toExamine(this.formobj).then((resp) => {
-					
-					this.$message({
-						type: 's',
-						message: '审核完成',
-						showClose: true
-					})
-					
-					this.loadList()
-					this.formobj = {
-						sid: "",
-						state: "",
-						remarks: ''
-					}
-					this.dialogVisible = false
-				}).catch(e => {
-
-				})
-
-
-			},
-			toRelevancyInfo(row) {
-				const tip = '请确认是否删除所选商品?'
-				this.$confirm(tip, '提示', {
-					confirmButtonText: '确定',
-					cancelButtonText: '取消',
-					type: 'warning'
-				}).then(() => {
-					const loading = this.$loading({
-						lock: true,
-						text: 'Loading',
-						spinner: 'el-icon-loading',
-						background: 'rgba(0, 0, 0, 0.7)'
-					})
-					req.deleteGoods(row.sid).then((resp) => {
-						loading.close()
-						if (resp.success) {
-							this.$message({
-								type: 'success',
-								message: resp.msg,
-								showClose: true
-							})
-							this.loadList()
-						} else {
-							// 根据resp.code进行异常情况处理
-						}
-					}).catch(e => {
-						loading.close()
-					})
-				}).catch(() => {})
-			},
-			resetState() {
-				this.viewState = 1
-			},
-
-			showOrder(sid) {
-				console.log("showOrder", sid);
-
-				if (sid != this.orderInfo.sid) {
-					req.getOrderDetails(sid).then((resp) => {
-
-						this.orderInfo = resp.data
-
-						this.tableLoading = false
-
-						this.dialogVisible2 = true
-					}).catch(() => {
-						this.tableLoading = false
-					})
-
-				} else {
-					this.dialogVisible2 = true
-				}
-
-			},
-
-		}
-	}
+    import req from '@/api/invoiceReview/invoiceReview.js'
+    import ButtonBar from '@/components/ButtonBar'
+    import Pagination from '@/components/pagination'
+    import pageye from '@/components/pagination/pageye'
+    // import divAdd from './appletNoticeAdd.vue'
+    export default {
+        name: 'SupplierBankInfoIndex',
+        components: {
+            ButtonBar,
+            Pagination,
+            pageye,
+            // divAdd
+        },
+        data() {
+            return {
+                activeNames: ['1'],
+                listLoading: false,
+                formobj: {
+                    sid: "",
+                    state: "", //2申请通过  3不通过
+                    remarks: ''
+                },
+                dialogVisible: false,
+                dialogVisible2: false,
+                btndisabled: false,
+                viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+                isSearchShow: false,
+                searchxianshitit: '显示查询条件',
+                tableLoading: false,
+                dataList: [],
+                btnList: [
+                    // {
+                    // 	type: 'primary',
+                    // 	size: 'small',
+                    // 	icon: 'plus',
+                    // 	btnKey: 'toAdd',
+                    // 	btnLabel: '新增'
+                    // },
+                    {
+                        type: 'info',
+                        size: 'small',
+                        icon: 'cross',
+                        btnKey: 'doClose',
+                        btnLabel: '关闭'
+                    }
+                ],
+                queryParams: {
+                    current: 1,
+                    size: 10,
+                    total: 0,
+                    params: {
+                        name: ''
+                    }
+                },
+                sids: [],
+                itemInfo: {},
+                orderInfo: {}
+            }
+        },
+        mounted() {
+            this.$refs['btnbar'].setButtonList(this.btnList)
+        },
+        created() {
+            this.loadList()
+        },
+        methods: {
+            // 搜索条件效果
+            clicksearchShow() {
+                this.isSearchShow = !this.isSearchShow
+                if (this.isSearchShow) {
+                    this.searchxianshitit = '隐藏查询条件'
+                } else {
+                    this.searchxianshitit = '显示查询条件'
+                }
+            },
+            btnHandle(btnKey) {
+                switch (btnKey) {
+                    case 'toAdd':
+                        this.toAdd()
+                        break
+                    case 'doClose':
+                        this.doClose()
+                        break
+                    default:
+                        break
+                }
+            },
+            loadList() {
+                this.tableLoading = true
+                req.listPage(this.queryParams).then((resp) => {
+                    this.tableLoading = false
+                    if (resp.success) {
+                        const data = resp.data
+                        this.queryParams.total = data.total
+                        this.dataList = data.records
+                    } else {
+                        // 根据resp.code进行异常情况处理
+                        this.dataList = []
+                        this.queryParams.total = 0
+                    }
+                }).catch(() => {
+                    this.tableLoading = false
+                })
+            },
+
+            // 序号
+            indexMethod(index) {
+                var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+                var pageindex = index + 1 + pagestart
+                return pageindex
+            },
+            dosearch() {
+                this.queryParams.current = 1
+                this.loadList()
+            },
+            resetQuery() {
+                this.queryParams = {
+                    current: 1,
+                    size: 10,
+                    total: 0,
+                    params: {
+                        name: ''
+                    }
+                }
+                this.loadList()
+            },
+            toAdd() {
+                this.viewState = 2
+                this.$refs['divadd'].showAdd()
+            },
+
+            doClose() {
+                this.$store.dispatch('tagsView/delView', this.$route)
+                this.$router.go(-1)
+            },
+            toRelevancy(row) {
+                this.dialogVisible = true
+                this.formobj.sid = row.sid
+                this.itemInfo = row
+            },
+            changeTheme(val) {
+
+            },
+            handleClose() {
+                this.dialogVisible = false
+            },
+            handleClose2() {
+                this.dialogVisible2 = false
+            },
+            saveExamine() {
+                console.log("saveExamine", this.formobj);
+
+                if (this.formobj.state == '') {
+                    this.$message({
+                        type: 'warning',
+                        message: '请选择审核结果',
+                        showClose: true
+                    })
+
+                    return
+                }
+
+                if (this.formobj.state == 2 && this.formobj.remarks == '') {
+                    this.$message({
+                        type: 'warning',
+                        message: '请填写审核意见',
+                        showClose: true
+                    })
+
+                    return
+                }
+
+                req.toExamine(this.formobj).then((resp) => {
+
+                    this.$message({
+                        type: 's',
+                        message: '审核完成',
+                        showClose: true
+                    })
+
+                    this.loadList()
+                    this.formobj = {
+                        sid: "",
+                        state: "",
+                        remarks: ''
+                    }
+                    this.dialogVisible = false
+                }).catch(e => {
+
+                })
+
+
+            },
+            toRelevancyInfo(row) {
+                const tip = '请确认是否删除所选商品?'
+                this.$confirm(tip, '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    const loading = this.$loading({
+                        lock: true,
+                        text: 'Loading',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(0, 0, 0, 0.7)'
+                    })
+                    req.deleteGoods(row.sid).then((resp) => {
+                        loading.close()
+                        if (resp.success) {
+                            this.$message({
+                                type: 'success',
+                                message: resp.msg,
+                                showClose: true
+                            })
+                            this.loadList()
+                        } else {
+                            // 根据resp.code进行异常情况处理
+                        }
+                    }).catch(e => {
+                        loading.close()
+                    })
+                }).catch(() => {})
+            },
+            resetState() {
+                this.viewState = 1
+            },
+
+            showOrder(sid) {
+                console.log("showOrder", sid);
+
+                if (sid != this.orderInfo.sid) {
+                    req.getOrderDetails(sid).then((resp) => {
+
+                        this.orderInfo = resp.data
+
+                        this.tableLoading = false
+
+                        this.dialogVisible2 = true
+                    }).catch(() => {
+                        this.tableLoading = false
+                    })
+
+                } else {
+                    this.dialogVisible2 = true
+                }
+
+            },
+
+        }
+    }
 </script>
 <style scoped>
-	.trightb {
-		display: flex;
-		align-items: center;
-		text-align: center;
-		justify-content: center;
-	}
-
-	.trightb_item {
-		padding-top: 5px;
-	}
-
-	/deep/.el-form {}
-	
-	/deep/.el-collapse-item__header {
-		height: 40px;
-		padding: 10px;
-		font-weight: bold;
-		font-size: 20px;
-		text-align: left;
-		color: #ffffff;
-		background-color: #0294d7;
-	}
-	
-	/deep/.el-collapse-item__content {
-		padding-bottom: 0;
-	}
+    .trightb {
+        display: flex;
+        align-items: center;
+        text-align: center;
+        justify-content: center;
+    }
+
+    .trightb_item {
+        padding-top: 5px;
+    }
+
+    /deep/.el-form {}
+
+    /deep/.el-collapse-item__header {
+        height: 40px;
+        padding: 10px;
+        font-weight: bold;
+        font-size: 20px;
+        text-align: left;
+        color: #ffffff;
+        background-color: #0294d7;
+    }
+
+    /deep/.el-collapse-item__content {
+        padding-bottom: 0;
+    }
 </style>
\ No newline at end of file
diff --git a/src/views/login/login.vue b/src/views/login/login.vue
index d478e77..44e6839 100644
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -2,8 +2,8 @@
   <div class="login">
     <div class="logoTitle" style="margin-left: 50px;margin-top: 50px;">
      <!-- <img src="../../assets/loginImg/shgf.png"
-        style="width: 50px;height: 50px; margin-right: 10px;" /><span>汇融惠享</span>
-      <p class="title" style="margin-top: 5px;">汇融惠享管理平台</p> -->
+        style="width: 50px;height: 50px; margin-right: 10px;" /><span>惠享</span>
+      <p class="title" style="margin-top: 5px;">惠享管理平台</p> -->
     </div>
     <div class="main">
       <div class="content">
diff --git a/src/views/print/index - 副本.vue b/src/views/print/index - 副本.vue
index 311d228..7330ae0 100644
--- a/src/views/print/index - 副本.vue	
+++ b/src/views/print/index - 副本.vue	
@@ -63,7 +63,7 @@
 							fontWeight: 400,
 							x: 88,
 							y: 3,
-							default: '汇融惠享礼包卡',
+							default: '惠享礼包卡',
 							fontSize: '5', // 字体大小
 							fontFamily: '微软雅黑', // 字体类型   默认 '微软雅黑'
 							fontWeight: null, // 字体宽度