调整路由权限

src/router/index.js

@@ -138,20 +138,20 @@ export const asyncRouterMap = [
         path: 'index',
         name: 'Form',
         component: () => import('@/views/form/index'),
-        meta: { title: '出票人列表', icon: 'form', roles: ['salesman'] }
+        meta: { title: '出票人列表', icon: 'form', roles: ['admin', 'salesman'] }
       },
       {
         path: '/form/addTicketdrawer',
         name: 'addTicketdrawer',
         component: () => import('@/views/form/addTicketdrawer'),
-        meta: { title: '新增出票人', roles: ['salesman'] },
+        meta: { title: '新增出票人', roles: ['admin', 'salesman'] },
         hidden: true
       },
       {
         path: '/form/detail',
         name: 'detail',
         component: () => import('@/views/form/detail'),
-        meta: { title: '出票人详情', roles: ['salesman'] },
+        meta: { title: '出票人详情', roles: ['admin', 'salesman'] },
         hidden: true
       }
     ]
@@ -164,13 +164,13 @@ export const asyncRouterMap = [
         path: 'index',
         name: 'delivery',
         component: () => import('@/views/delivery/index'),
-        meta: { title: '供应商账号', icon: 'el-icon-s-promotion', roles: ['salesman'] }
+        meta: { title: '供应商账号', icon: 'el-icon-s-promotion', roles: ['admin', 'salesman'] }
       },
       {
         path: '/edit',
         name: 'edit',
         component: () => import('@/views/delivery/edit'),
-        meta: { title: '编辑', roles: ['salesman'] },
+        meta: { title: '编辑', roles: ['admin', 'salesman'] },
         hidden: true
       }
     ]
@@ -183,27 +183,27 @@ export const asyncRouterMap = [
         path: '/shipments/index',
         name: 'shipments',
         component: () => import('@/views/shipments/index'),
-        meta: { title: '报表统计', icon: 'el-icon-s-marketing', roles: ['salesman'] }
+        meta: { title: '报表统计', icon: 'el-icon-s-marketing', roles: ['admin', 'salesman'] }
       },
       {
         path: '/shipments1',
         name: 'shipments1',
         component: () => import('@/views/shipments/shipments1'),
-        meta: { title: '出票人分类报表', roles: ['salesman'] },
+        meta: { title: '出票人分类报表', roles: ['admin', 'salesman'] },
         hidden: true
       },
       {
         path: '/shipments2',
         name: 'shipments2',
         component: () => import('@/views/shipments/shipments2'),
-        meta: { title: '合同统计列表', roles: ['salesman'] },
+        meta: { title: '合同统计列表', roles: ['admin', 'salesman'] },
         hidden: true
       },
       {
         path: '/shipments3',
         name: 'shipments3',
         component: () => import('@/views/shipments/shipments3'),
-        meta: { title: '供应商统计列表', roles: ['salesman'] },
+        meta: { title: '供应商统计列表', roles: ['admin', 'salesman'] },
         hidden: true
       }
 
@@ -217,7 +217,7 @@ export const asyncRouterMap = [
         path: 'index',
         name: 'management',
         component: () => import('@/views/management/index'),
-        meta: { title: '业务管理员', icon: 'el-icon-s-management', roles: [] }
+        meta: { title: '业务管理员', icon: 'el-icon-s-management', roles: ['admin'] }
       }
     ]
   },
@@ -229,20 +229,20 @@ export const asyncRouterMap = [
         path: 'index',
         name: 'sucuirtyaudit',
         component: () => import('@/views/sucuirtyaudit/index'),
-        meta: { title: '安全审计', icon: 'el-icon-s-check', roles: [] }
+        meta: { title: '安全审计', icon: 'el-icon-s-check', roles: ['admin'] }
       },
       {
         path: '/annexList',
         name: 'annexList',
         component: () => import('@/views/sucuirtyaudit/annexList'),
-        meta: { title: '附件列表', roles: [] },
+        meta: { title: '附件列表', roles: ['admin'] },
         hidden: true
       },
       {
         path: '/logdetail',
         name: 'detail',
         component: () => import('@/views/sucuirtyaudit/detail'),
-        meta: { title: '审计日志详情', roles: [] },
+        meta: { title: '审计日志详情', roles: ['admin'] },
         hidden: true
       }
     ]

src/views/contracts/addcontract.vue

@@ -129,7 +129,6 @@
             <el-form-item label="利率" :rules="[{ message: '身份证不能为空'}]">
               <el-input v-model="form.count" class="ipwidth" placeholder="请填写利率" />
             </el-form-item>
-            </el-form-item>
           </el-form>
         </el-col>
         <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" style="padding:0 15px;">
@@ -148,7 +147,6 @@
               <el-input v-model="form.rate" class="ipwidth" placeholder="请填写利息" />
             </el-form-item>
 
-            </el-form-item>
           </el-form>
         </el-col>
         <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" style="padding:0 15px;">
@@ -156,14 +154,14 @@
 
             <el-form-item label="承兑人">
               <el-input v-model="form.accepetper" placeholder="请选择承兑人" class="ipwidth" />
-              <!-- <el-dropdown>
-							 <el-input v-model="form.accepetper" placeholder="请选择承兑人" class="ipwidth">
-							 </el-input>
-							  <el-dropdown-menu slot="dropdown">
-							    <el-dropdown-item command="承兑人杜甫">承兑人杜甫</el-dropdown-item>
-								<el-dropdown-item command="承兑人李白">承兑人李白</el-dropdown-item>
-								<el-dropdown-item command="新增承兑人" divided>新增承兑人	</el-dropdown-item>
-							  </el-dropdown-menu>
+            <!-- <el-dropdown>
+              <el-input v-model="form.accepetper" placeholder="请选择承兑人" class="ipwidth">
+              </el-input>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="承兑人杜甫">承兑人杜甫</el-dropdown-item>
+              <el-dropdown-item command="承兑人李白">承兑人李白</el-dropdown-item>
+              <el-dropdown-item command="新增承兑人" divided>新增承兑人	</el-dropdown-item>
+              </el-dropdown-menu>
 							</el-dropdown> -->
             </el-form-item>
             <el-form-item label="出票日期">

src/views/contracts/detail.vue

@@ -1,476 +1,540 @@
 <template>
-	<div>
-		<el-card class="box-card">
-			<el-col :xs="24" :sm="24" :md="10" :lg="10" :xl="12">
-				<div class="grid-content bg-purple ">
-					<span style="font-weight: 600;">合同基础信息</span>
-					<div class="titlein">
-						<span class="titlename">合同名称</span>
-						<span class="meatatitle">{{ contract.name }}</span>
-					</div>
-					<div class="titlein">
-						<span class="titlename">合同编号</span>
-						<span class="meatatitle">{{ contract.contractNo }}</span>
-					</div>
-					<div class="titlein">
-						<span class="titlename">合同附件</span>
-						<div style="display: flex;">
-							<div class="imgbox">
-								<el-image style="width: 100px; height: 100px" v-for="item in picList" :src="item"
-									/>
-							</div>
-						</div>
-					</div>
-					<div class="titlein">
-						<span class="titlename">发票附件</span>
-						<div style="display: flex;">
-							<div class="imgbox">
-								<el-image style="width: 100px; height: 100px" v-for="item in invoicePicList" :src="item"
-									 />
-							</div>
-						</div>
-					</div>
+  <div>
+    <el-card class="box-card">
+      <el-col :xs="24" :sm="24" :md="10" :lg="10" :xl="12">
+        <div class="grid-content bg-purple ">
+          <span style="font-weight: 600;">合同基础信息</span>
+          <div class="titlein">
+            <span class="titlename">合同名称</span>
+            <span class="meatatitle">{{ contract.name }}</span>
+          </div>
+          <div class="titlein">
+            <span class="titlename">合同编号</span>
+            <span class="meatatitle">{{ contract.contractNo }}</span>
+          </div>
+          <div class="titlein">
+            <span class="titlename">合同附件</span>
+            <div style="display: flex;">
+              <div class="imgbox">
+                <el-image
+                  v-for="(item,index) in picList"
+                  :key="index"
+                  style="width: 100px; height: 100px"
+                  :src="item"
+                />
+                <img
+                  v-for="(item,index) in picList"
+                  :key="index"
+                  style="width: 100px; height: 100px"
+                  :src="item"
+                >
+              </div>
+            </div>
+          </div>
+          <div class="titlein">
+            <span class="titlename">发票附件</span>
+            <div style="display: flex;">
+              <div class="imgbox">
+                <el-image
+                  v-for="(item,index) in invoicePicList"
+                  :key="index"
+                  style="width: 100px; height: 100px"
+                  :src="item"
+                />
+              </div>
+            </div>
+          </div>
 
-				</div>
-			</el-col>
-			<el-col :xs="24" :sm="24" :md="14" :lg="14" :xl="12">
-				<div class="jas">
-					<div class="titlein jas">
-						<span class="titlename">贸易合同</span>
-						<div style="display: flex;">
-							<div class="imgbox">
-								<el-image style="width: 100px; height: 100px" v-for="item in tradePicList" :src="item"
-									 />
-							</div>
-						</div>
-					</div>
-					<div class="yusa jas">
-						<div class="boxas">
-							<span style="color: #fff;">合同状态：</span>
-							<span style="color: #D05C39;">{{ contract.contractStatusText }}</span>
-						</div>
-						<span class="aoiisp">审核结果：<p style="color: #D8AB5A;">{{contract.statusText}}</p></span>
-					</div>
-					<div class="yusa">
-						<el-col :xs="24" :sm="24" :md="14" :lg="14" :xl="10" class="jas">
-							<el-form ref="form" :model="feed" label-width="0px">
-								<span class="sah">审核反馈：</span>
-								<el-form-item label="">
-									<el-input v-model="feed.feedback" type="textarea" />
-								</el-form-item>
+        </div>
+      </el-col>
+      <el-col :xs="24" :sm="24" :md="14" :lg="14" :xl="12">
+        <div class="jas">
+          <div class="titlein jas">
+            <span class="titlename">贸易合同</span>
+            <div style="display: flex;">
+              <div class="imgbox">
+                <el-image
+                  v-for="(item,index) in tradePicList"
+                  :key="index"
+                  style="width: 100px; height: 100px"
+                  :src="item"
+                />
+              </div>
+            </div>
+          </div>
+          <div class="yusa jas">
+            <div class="boxas">
+              <span style="color: #fff;">合同状态：</span>
+              <span style="color: #D05C39;">{{ contract.contractStatusText }}</span>
+            </div>
+            <span class="aoiisp">审核结果：<p style="color: #D8AB5A;">{{ contract.statusText }}</p></span>
+          </div>
+          <div class="yusa">
+            <el-col :xs="24" :sm="24" :md="14" :lg="14" :xl="10" class="jas">
+              <el-form ref="form" :model="feed" label-width="0px">
+                <span class="sah">审核反馈：</span>
+                <el-form-item label="">
+                  <el-input v-model="feed.feedback" type="textarea" />
+                </el-form-item>
 
-							</el-form>
-						</el-col>
-						<el-col :xs="24" :sm="24" :md="14" :lg="14" :xl="14" class="jas">
-							<span class="sah">审核截图：</span>
-							<div style="display: flex;justify-content: flex-end;">
-								<div class="imgbox">
-									<el-image style="width: 100px; height: 100px" v-for="item in feed.feedbackPicList" :src="item"
-										 />
-								</div>
-							</div>
-						</el-col>
-					</div>
-					<div slot="" class="clearfix">
-						<el-button type="primary" style="float: right; margin-left: 10px;" >导出
-						</el-button>
-						<el-button type="danger" style="float: right; " @click="deletedContract"
-							v-if="contract.contractStatus===0">删除</el-button>
+              </el-form>
+            </el-col>
+            <el-col :xs="24" :sm="24" :md="14" :lg="14" :xl="14" class="jas">
+              <span class="sah">审核截图：</span>
+              <div style="display: flex;justify-content: flex-end;">
+                <div class="imgbox">
+                  <el-image
+                    v-for="(item,index) in feed.feedbackPicList"
+                    :key="index"
+                    style="width: 100px; height: 100px"
+                    :src="item"
+                  />
+                </div>
+              </div>
+            </el-col>
+          </div>
+          <div slot="" class="clearfix">
+            <el-button type="primary" style="float: right; margin-left: 10px;">导出
+            </el-button>
+            <el-button
+              v-if="contract.contractStatus===0"
+              type="danger"
+              style="float: right; "
+              @click="deletedContract"
+            >删除</el-button>
 
-						<el-button type="primary" style="float: right; " @click="recoverContract"
-							v-if="contract.contractStatus===1">恢复
-						</el-button>
-						<el-button v-if="role===1" type="warning" style="float: right; " @click="failed">审核失败
-						</el-button>
-						<el-button v-if="role===1" type="success" style="float: right; " @click="success">审核成功
-						</el-button>
-					</div>
-				</div>
-			</el-col>
-		</el-card>
+            <el-button
+              v-if="contract.contractStatus===1"
+              type="primary"
+              style="float: right; "
+              @click="recoverContract"
+            >恢复
+            </el-button>
+            <el-button v-if="role===1" type="warning" style="float: right; " @click="failed">审核失败
+            </el-button>
+            <el-button v-if="role===1" type="success" style="float: right; " @click="success">审核成功
+            </el-button>
+          </div>
+        </div>
+      </el-col>
+    </el-card>
 
-		<el-card class="box-card">
-			<el-table v-loading="listLoading" :data="temporaryList" element-loading-text="Loading" border fit
-				highlight-current-row @select="handleSelectionChange" @select-all="handleAll">
-				<el-table-column align="center" label="" width="55" type="selection" />
-				<el-table-column label="汇票名称" align="center" prop="name" />
-				<el-table-column label="汇票编号" align="center" prop="draftNo" />
-				<el-table-column label="承兑人" align="center" prop="acceptorName" />
-				<el-table-column label="金额" align="center">
-					<template slot-scope="scope">
-						{{ scope.row.money }}
-					</template>
-				</el-table-column>
-				<el-table-column label="服务费" align="center">
-					<template slot-scope="scope">
-						{{ scope.row.serviceMoney }}
-					</template>
-				</el-table-column>
-				<el-table-column label="汇票状态" align="center" prop="draftStatusText" />
-				<el-table-column label="审核状态" align="center">
-					<template slot-scope="scope">
-						{{ scope.row.statusText }}
-					</template>
-				</el-table-column>
-				<el-table-column align="center" prop="created_at" label="操作" width="250">
-					<template slot-scope="scope">
-						<el-tag type="primary" style="cursor: pointer;margin-right: 15px;"
-							@click="tapDetail(scope.row.id)">查看详情</el-tag>
-						<el-tag type="success" style="margin-right: 15px;cursor: pointer;"
-							@click="recover(scope.row.id)" v-if="(scope.row.draftStatus==1)">恢复</el-tag>
-						<el-tag type="danger" style="margin-right: 15px;cursor: pointer;" @click="deleted(scope.row.id)"
-							v-if="(scope.row.draftStatus==0)">删除</el-tag>
-					</template>
-				</el-table-column>
-			</el-table>
+    <el-card class="box-card">
+      <el-table
+        v-loading="listLoading"
+        :data="temporaryList"
+        element-loading-text="Loading"
+        border
+        fit
+        highlight-current-row
+        @select="handleSelectionChange"
+        @select-all="handleAll"
+      >
+        <el-table-column align="center" label="" width="55" type="selection" />
+        <el-table-column label="汇票名称" align="center" prop="name" />
+        <el-table-column label="汇票编号" align="center" prop="draftNo" />
+        <el-table-column label="承兑人" align="center" prop="acceptorName" />
+        <el-table-column label="金额" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.money }}
+          </template>
+        </el-table-column>
+        <el-table-column label="服务费" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.serviceMoney }}
+          </template>
+        </el-table-column>
+        <el-table-column label="汇票状态" align="center" prop="draftStatusText" />
+        <el-table-column label="审核状态" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.statusText }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="created_at" label="操作" width="250">
+          <template slot-scope="scope">
+            <el-tag
+              type="primary"
+              style="cursor: pointer;margin-right: 15px;"
+              @click="tapDetail(scope.row.id)"
+            >查看详情</el-tag>
+            <el-tag
+              v-if="(scope.row.draftStatus==1)"
+              type="success"
+              style="margin-right: 15px;cursor: pointer;"
+              @click="recover(scope.row.id)"
+            >恢复</el-tag>
+            <el-tag
+              v-if="(scope.row.draftStatus==0)"
+              type="danger"
+              style="margin-right: 15px;cursor: pointer;"
+              @click="deleted(scope.row.id)"
+            >删除</el-tag>
+          </template>
+        </el-table-column>
+      </el-table>
 
-			<div class="pagesip">
-				<el-button v-if="role===2" type="primary" @click="addNewBill">
-					新增汇票</el-button>
-				<el-button type="success" style="float: right; " @click="recoverContractDraft">恢复
-				</el-button>
-				<el-button type="danger" style="float: right; " @click="deletedContractDraft">删除</el-button>
-				<el-button type="primary" style="float: right; margin-left: 10px;" @click="ExportsContractDraft">导出
-				</el-button>
-				<el-button type="primary" size="small"
-					style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px" @click="jumpFirstPage">首页
-				</el-button>
-				<el-pagination background layout="prev, pager, next" :total="list.length" :page-size="10"
-					prev-text="上一页" ref="pagination" next-text="下一页" :hide-on-single-page="false"
-					@current-change="handleCurrentChange" />
-				<el-button type="primary" size="small"
-					style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px" @click="jumpLastPage">尾页
-				</el-button>
-				<el-button type="primary" size="small" @click="back">返回
-				</el-button>
-			</div>
+      <div class="pagesip">
+        <el-button v-if="role===2" type="primary" @click="addNewBill">
+          新增汇票</el-button>
+        <el-button type="success" style="float: right; " @click="recoverContractDraft">恢复
+        </el-button>
+        <el-button type="danger" style="float: right; " @click="deletedContractDraft">删除</el-button>
+        <el-button type="primary" style="float: right; margin-left: 10px;" @click="ExportsContractDraft">导出
+        </el-button>
+        <el-button
+          type="primary"
+          size="small"
+          style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px"
+          @click="jumpFirstPage"
+        >首页
+        </el-button>
+        <el-pagination
+          ref="pagination"
+          background
+          layout="prev, pager, next"
+          :total="list.length"
+          :page-size="10"
+          prev-text="上一页"
+          next-text="下一页"
+          :hide-on-single-page="false"
+          @current-change="handleCurrentChange"
+        />
+        <el-button
+          type="primary"
+          size="small"
+          style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px"
+          @click="jumpLastPage"
+        >尾页
+        </el-button>
+        <el-button type="primary" size="small" @click="back">返回
+        </el-button>
+      </div>
 
-		</el-card>
-	</div>
+    </el-card>
+  </div>
 
 </template>
 
 <script>
-	import {
-		getList
-	} from '@/api/table'
-	import {
-		dataConversionUtil
-	} from '../../utils/Excel.js'
-	export default {
-		data() {
-			return {
-				role: '',
-				srcList: [],
-				temporaryList: [],
-				list: [],
-				listLoading:false,
-				contract: {},
-				currentPage: 1,
-				multipleSelection: [],
-				pagesize: 11,
-				form: '',
-				invoicePicList: [],
-				picList: [],
-				tradePicList:[],
-				feed: {
-					id: '',
-					feedback: '',
-					feedbackPicList: [],
-					approveStatus: ''
-				}
-			}
-		},
-		
-		mounted() {
-			this.role = this.$store.state.user.userInfo.type
-			console.log(this.$store.state.user.userInfo.type)
-			this.checked = this.$store.state.user.checked
-			this.getData()
-		},
-		methods: {
-			getData() {
-				const id = this.$route.query.id
-				this.$request({
-					url: '/api/Contract/' + id,
-					method: 'get'
-				}).then((res) => {
-					this.contract = res.data
-					console.log(res)
-					this.invoicePicList = this.contract.invoicePicList
-					this.picList = this.contract.picList
-					this.list = res.data.contractDraft.result
-					this.feed.feedbackPicList = this.contract.feedbackPics
-					this.tradePicList=this.contract.tradePicList
-					this.feed.id = this.$route.query.id
-					this.feed.feedback=this.contract.feedback
-					this.getPageData()
-				})
-			},
-			addNewBill() {
-				this.$router.push({
-					name: 'addnewbill'
-				})
-			},
-			tapDetail(id) {
-				this.$router.push({
-					name: 'billDetail',
-					query: {
-						id: id
-					}
-				})
-			},
-			handleAll(data) {
-				this.multipleSelection = data
-				console.log(this.multipleSelection)
-			},
-			handleSelectionChange(data) {
-				this.multipleSelection = data
-				console.log(this.multipleSelection)
-			},
-			handleCurrentChange(val) {
-				this.currentPage = val
-				this.getPageData()
-			},
-			jumpFirstPage() {
-				this.$refs.pagination.handleCurrentChange(1)
-				this.$emit('handleCurrentChange', 1)
-			},
-			jumpLastPage() {
-				const font = this.$refs.pagination
-				const cpage = Math.ceil(font.total / font.pageSize)
-				font.handleCurrentChange(cpage)
-			},
-			getPageData() {
-				const start = (this.currentPage - 1) * this.pagesize
-				const end = start + this.pagesize
-				this.srcList = this.list.slice(start, end)
-				this.temporaryList = this.srcList
-			},
-			ExportsContractDraft() {
-				if (this.multipleSelection == "") {
-					this.$message({
-						type: 'warning',
-						message: '请选择数据!'
-					})
-				} else {
-					var tableHeader = [
-						['序号', '汇票名称', '汇票编号', '承兑人', '金额', '服务费', '汇票状态', '审核状态'],
-					]
-					var dataList = []
-					this.multipleSelection.forEach((item, index) => {
-						dataList.push([index + 1, item.name, item.draftNo, item.acceptorName, item.money, item
-							.serviceMoney, item
-							.draftStatusText, item.statusText
-						]);
-					})
-					dataConversionUtil.dataToExcel('汇票列表', tableHeader, dataList)
-					this.$message.success('导出成功!');
-				}
-			},
-			success() {
-				// this.feed.feedbackPicList=this.picList
-				// this.feed.id=this.$route.query.id
-				this.feed.approveStatus = 1
-				this.$request({
-					url: '/api/Contract/approveContract',
-					method: 'post',
-					data: this.feed
-				}).then((res) => {
-					if (res.code == 200) {
-						this.$message({
-							type: 'success',
-							message: res.msg
-						})
-						this.getData()
-					} else {
-						this.$message({
-							type: 'error',
-							message: '提交失败'
-						})
-						this.getData()
-					}
-				})
-			},
-			failed() {
-				this.feed.approveStatus = 2
-				this.$request({
-					url: '/api/Contract/approveContract',
-					method: 'post',
-					data: this.feed
-				}).then((res) => {
-					if (res.code == 200) {
-						this.$message({
-							type: 'success',
-							message: res.msg
-						})
-						this.getData()
-					} else {
-						this.$message({
-							type: 'error',
-							message: '提交失败'
-						})
-						this.getData()
-					}
-				})
-			},
-			recoverContract() {
-				const id = this.$route.query.id
-				this.$request({
-					url: '/api/Contract/manage',
-					method: 'post',
-					data: {
-						ids: [id],
-						operateType: 2
-					}
-				}).then((res) => {
-					if (res.code == 200) {
-						this.$message({
-							type: 'success',
-							message: res.msg
-						})
-						this.getData()
-					} else {
-						this.$message({
-							type: 'error',
-							message: '提交失败'
-						})
-						this.getData()
-					}
-				})
-			},
-			deletedContract() {
-				const id = this.$route.query.id
-				this.$request({
-					url: '/api/Contract/manage',
-					method: 'post',
-					data: {
-						ids: [id],
-						operateType: 1
-					}
-				}).then((res) => {
-					if (res.code == 200) {
-						this.$message({
-							type: 'success',
-							message: res.msg
-						})
-						this.getData()
-					} else {
-						this.$message({
-							type: 'error',
-							message: '提交失败'
-						})
-						this.getData()
-					}
-				})
-			},
-			recoverContractDraft() {
-				let ids = Array.from(this.multipleSelection, ({
-					id
-				}) => id)
-				this.$request({
-					url: '/api/Contract/contractDraft/manager',
-					method: 'post',
-					data: {
-						ids: ids,
-						operateType: 2
-					}
-				}).then((res) => {
-					if (res.code == 200) {
-						this.$message({
-							type: 'success',
-							message: res.msg
-						})
-						this.getData()
-					} else {
-						this.$message({
-							type: 'error',
-							message: '提交失败'
-						})
-						this.getData()
-					}
-				})
-			},
-			deletedContractDraft() {
-				let ids = Array.from(this.multipleSelection, ({
-					id
-				}) => id)
-				this.$request({
-					url: '/api/Contract/contractDraft/manager',
-					method: 'post',
-					data: {
-						ids: ids,
-						operateType: 1
-					}
-				}).then((res) => {
-					if (res.code == 200) {
-						this.$message({
-							type: 'success',
-							message: res.msg
-						})
-						this.getData()
-					} else {
-						this.$message({
-							type: 'error',
-							message: '提交失败'
-						})
-						this.getData()
-					}
-				})
-			},
-			recover(id) {
-				this.$request({
-					url: '/api/Contract/contractDraft/manager',
-					method: 'post',
-					data: {
-						ids: [id],
-						operateType: 2
-					}
-				}).then((res) => {
-					if (res.code == 200) {
-						this.$message({
-							type: 'success',
-							message: res.msg
-						})
-						this.getData()
-					} else {
-						this.$message({
-							type: 'error',
-							message: '提交失败'
-						})
-						this.getData()
-					}
-				})
-			},
-			deleted(id) {
-				this.$request({
-					url: '/api/Contract/contractDraft/manager',
-					method: 'post',
-					data: {
-						ids: [id],
-						operateType: 1
-					}
-				}).then((res) => {
-					if (res.code == 200) {
-						this.$message({
-							type: 'success',
-							message: res.msg
-						})
-						this.getData()
-					} else {
-						this.$message({
-							type: 'error',
-							message: '提交失败'
-						})
-						this.getData()
-					}
-				})
-			},
-			back() {
-				this.$router.go(-1)
-			}
-		}
-	}
+import {
+  dataConversionUtil
+} from '../../utils/Excel.js'
+export default {
+  data() {
+    return {
+      role: '',
+      srcList: [],
+      temporaryList: [],
+      list: [],
+      listLoading: false,
+      contract: {},
+      currentPage: 1,
+      multipleSelection: [],
+      pagesize: 11,
+      form: '',
+      invoicePicList: [],
+      picList: [],
+      tradePicList: [],
+      feed: {
+        id: '',
+        feedback: '',
+        feedbackPicList: [],
+        approveStatus: ''
+      }
+    }
+  },
+
+  mounted() {
+    this.role = this.$store.state.user.userInfo.type
+    console.log(this.$store.state.user.userInfo.type)
+    this.checked = this.$store.state.user.checked
+    this.getData()
+  },
+  methods: {
+    getData() {
+      const id = this.$route.query.id
+      this.$request({
+        url: '/api/Contract/' + id,
+        method: 'get'
+      }).then((res) => {
+        this.contract = res.data
+        console.log(res)
+        console.log(this.contract.picList, 'this.contract.picList')
+
+        this.invoicePicList = this.contract.invoicePicList
+        this.picList = this.contract.picList
+        this.list = res.data.contractDraft.result
+        this.feed.feedbackPicList = this.contract.feedbackPics
+        this.tradePicList = this.contract.tradePicList
+        this.feed.id = this.$route.query.id
+        this.feed.feedback = this.contract.feedback
+        this.getPageData()
+      })
+    },
+    addNewBill() {
+      this.$router.push({
+        name: 'addnewbill'
+      })
+    },
+    tapDetail(id) {
+      this.$router.push({
+        name: 'billDetail',
+        query: {
+          id: id
+        }
+      })
+    },
+    handleAll(data) {
+      this.multipleSelection = data
+      console.log(this.multipleSelection)
+    },
+    handleSelectionChange(data) {
+      this.multipleSelection = data
+      console.log(this.multipleSelection)
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      this.getPageData()
+    },
+    jumpFirstPage() {
+      this.$refs.pagination.handleCurrentChange(1)
+      this.$emit('handleCurrentChange', 1)
+    },
+    jumpLastPage() {
+      const font = this.$refs.pagination
+      const cpage = Math.ceil(font.total / font.pageSize)
+      font.handleCurrentChange(cpage)
+    },
+    getPageData() {
+      const start = (this.currentPage - 1) * this.pagesize
+      const end = start + this.pagesize
+      this.srcList = this.list.slice(start, end)
+      this.temporaryList = this.srcList
+    },
+    ExportsContractDraft() {
+      if (this.multipleSelection === '') {
+        this.$message({
+          type: 'warning',
+          message: '请选择数据!'
+        })
+      } else {
+        var tableHeader = [
+          ['序号', '汇票名称', '汇票编号', '承兑人', '金额', '服务费', '汇票状态', '审核状态']
+        ]
+        var dataList = []
+        this.multipleSelection.forEach((item, index) => {
+          dataList.push([index + 1, item.name, item.draftNo, item.acceptorName, item.money, item
+            .serviceMoney, item
+            .draftStatusText, item.statusText
+          ])
+        })
+        dataConversionUtil.dataToExcel('汇票列表', tableHeader, dataList)
+        this.$message.success('导出成功!')
+      }
+    },
+    success() {
+      // this.feed.feedbackPicList=this.picList
+      // this.feed.id=this.$route.query.id
+      this.feed.approveStatus = 1
+      this.$request({
+        url: '/api/Contract/approveContract',
+        method: 'post',
+        data: this.feed
+      }).then((res) => {
+        if (res.code === 200) {
+          this.$message({
+            type: 'success',
+            message: res.msg
+          })
+          this.getData()
+        } else {
+          this.$message({
+            type: 'error',
+            message: '提交失败'
+          })
+          this.getData()
+        }
+      })
+    },
+    failed() {
+      this.feed.approveStatus = 2
+      this.$request({
+        url: '/api/Contract/approveContract',
+        method: 'post',
+        data: this.feed
+      }).then((res) => {
+        if (res.code === 200) {
+          this.$message({
+            type: 'success',
+            message: res.msg
+          })
+          this.getData()
+        } else {
+          this.$message({
+            type: 'error',
+            message: '提交失败'
+          })
+          this.getData()
+        }
+      })
+    },
+    recoverContract() {
+      const id = this.$route.query.id
+      this.$request({
+        url: '/api/Contract/manage',
+        method: 'post',
+        data: {
+          ids: [id],
+          operateType: 2
+        }
+      }).then((res) => {
+        if (res.code === 200) {
+          this.$message({
+            type: 'success',
+            message: res.msg
+          })
+          this.getData()
+        } else {
+          this.$message({
+            type: 'error',
+            message: '提交失败'
+          })
+          this.getData()
+        }
+      })
+    },
+    deletedContract() {
+      const id = this.$route.query.id
+      this.$request({
+        url: '/api/Contract/manage',
+        method: 'post',
+        data: {
+          ids: [id],
+          operateType: 1
+        }
+      }).then((res) => {
+        if (res.code === 200) {
+          this.$message({
+            type: 'success',
+            message: res.msg
+          })
+          this.getData()
+        } else {
+          this.$message({
+            type: 'error',
+            message: '提交失败'
+          })
+          this.getData()
+        }
+      })
+    },
+    recoverContractDraft() {
+      const ids = Array.from(this.multipleSelection, ({
+        id
+      }) => id)
+      this.$request({
+        url: '/api/Contract/contractDraft/manager',
+        method: 'post',
+        data: {
+          ids: ids,
+          operateType: 2
+        }
+      }).then((res) => {
+        if (res.code === 200) {
+          this.$message({
+            type: 'success',
+            message: res.msg
+          })
+          this.getData()
+        } else {
+          this.$message({
+            type: 'error',
+            message: '提交失败'
+          })
+          this.getData()
+        }
+      })
+    },
+    deletedContractDraft() {
+      const ids = Array.from(this.multipleSelection, ({
+        id
+      }) => id)
+      this.$request({
+        url: '/api/Contract/contractDraft/manager',
+        method: 'post',
+        data: {
+          ids: ids,
+          operateType: 1
+        }
+      }).then((res) => {
+        if (res.code === 200) {
+          this.$message({
+            type: 'success',
+            message: res.msg
+          })
+          this.getData()
+        } else {
+          this.$message({
+            type: 'error',
+            message: '提交失败'
+          })
+          this.getData()
+        }
+      })
+    },
+    recover(id) {
+      this.$request({
+        url: '/api/Contract/contractDraft/manager',
+        method: 'post',
+        data: {
+          ids: [id],
+          operateType: 2
+        }
+      }).then((res) => {
+        if (res.code === 200) {
+          this.$message({
+            type: 'success',
+            message: res.msg
+          })
+          this.getData()
+        } else {
+          this.$message({
+            type: 'error',
+            message: '提交失败'
+          })
+          this.getData()
+        }
+      })
+    },
+    deleted(id) {
+      this.$request({
+        url: '/api/Contract/contractDraft/manager',
+        method: 'post',
+        data: {
+          ids: [id],
+          operateType: 1
+        }
+      }).then((res) => {
+        if (res.code === 200) {
+          this.$message({
+            type: 'success',
+            message: res.msg
+          })
+          this.getData()
+        } else {
+          this.$message({
+            type: 'error',
+            message: '提交失败'
+          })
+          this.getData()
+        }
+      })
+    },
+    back() {
+      this.$router.go(-1)
+    }
+  }
+}
 </script>
 
 <style lang="scss">

src/views/contracts/index.vue

@@ -263,8 +263,7 @@ export default {
         acceptorName: '', // 承兑人
         contractStatusText: '', // 合同状态
         contractStatus: '',
-        draftStatus: '',
-        supplierName: ''
+        draftStatus: ''
       },
       srcList: [],
       list: [],

src/views/contracts/new_file.vue

@@ -285,8 +285,8 @@ export default {
       contractList: [],
       filesArray: [], // 汇票图片上传数组
       picsArray: [], // 合同图片上传数组
-	  invoicePicsArray: [], // 发票图片上传数组
-	  tradePicsArray: [], // 贸易图片上传数组
+      invoicePicsArray: [], // 发票图片上传数组
+      tradePicsArray: [], // 贸易图片上传数组
       file: '',
       form: {
         // 承兑人列表
@@ -439,7 +439,7 @@ export default {
     },
     /* 贸易附件上传 */
     handletradePics(res) {
-	   const { file } = res.data
+      const { file } = res.data
       this.tradePicsArray.push(file)
       this.form.tradePics = this.tradePicsArray
     },

src/views/delivery/edit.vue

@@ -1,60 +1,58 @@
 <template>
-	<div>
-		<el-descriptions title="供应商详情">
-		    <el-descriptions-item label="供应商名称">{{list.name}}</el-descriptions-item>
-			<el-descriptions-item label="id">{{list.id}}</el-descriptions-item>
-		    <el-descriptions-item label="社会统一信用代码">{{list.socialCode}}</el-descriptions-item>
-		    <el-descriptions-item label="账号">{{list.account}}</el-descriptions-item>
-			<el-descriptions-item label="创建时间">{{list.createdAt}}</el-descriptions-item>
-			<el-descriptions-item label="法人名称">{{list.legalPerson}}</el-descriptions-item>
-			<el-descriptions-item label="联系人">{{list.contacts}}</el-descriptions-item>
-			<el-descriptions-item label="电话">{{list.contactsMobile}}</el-descriptions-item>
-			<el-descriptions-item label="审核状态">{{list.statusText}}</el-descriptions-item>
-			<el-descriptions-item label="认证照片">
-				<el-image style="width: 100px; height: 100px" v-for="item in list.proxyFileList" :src="item">
-				</el-image>
-			</el-descriptions-item>
-			<el-descriptions-item label="授权委托书">
-				<el-image style="width: 100px; height: 100px" v-for="item in list.identifyPicList" :src="item">
-				</el-image>
-				</el-descriptions-item>
-		</el-descriptions>
-		<div style="display: flex;justify-content: center;">
-			<el-button type="primary" style="width: 100px; " @click="update">修改信息</el-button>
-			<el-button type='primary' style="width: 100px; " @click="back">返回</el-button>
-		</div>
-		
-	</div>
-	
+  <div>
+    <el-descriptions title="供应商详情">
+      <el-descriptions-item label="供应商名称">{{ list.name }}</el-descriptions-item>
+      <el-descriptions-item label="id">{{ list.id }}</el-descriptions-item>
+      <el-descriptions-item label="社会统一信用代码">{{ list.socialCode }}</el-descriptions-item>
+      <el-descriptions-item label="账号">{{ list.account }}</el-descriptions-item>
+      <el-descriptions-item label="创建时间">{{ list.createdAt }}</el-descriptions-item>
+      <el-descriptions-item label="法人名称">{{ list.legalPerson }}</el-descriptions-item>
+      <el-descriptions-item label="联系人">{{ list.contacts }}</el-descriptions-item>
+      <el-descriptions-item label="电话">{{ list.contactsMobile }}</el-descriptions-item>
+      <el-descriptions-item label="审核状态">{{ list.statusText }}</el-descriptions-item>
+      <el-descriptions-item label="认证照片">
+        <el-image v-for="(item,index) in list.proxyFileList" :key="index" style="width: 100px; height: 100px" :src="item" />
+      </el-descriptions-item>
+      <el-descriptions-item label="授权委托书">
+        <el-image v-for="(item,index) in list.identifyPicList" :key="index" style="width: 100px; height: 100px" :src="item" />
+      </el-descriptions-item>
+    </el-descriptions>
+    <div style="display: flex;justify-content: center;">
+      <el-button type="primary" style="width: 100px; " @click="update">修改信息</el-button>
+      <el-button type="primary" style="width: 100px; " @click="back">返回</el-button>
+    </div>
+
+  </div>
+
 </template>
 
 <script>
-	export default{
-		data(){
-			return{
-				list:[],
-			}
-		},
-		mounted() {
-			let id=this.$route.query.id
-			this.$request({
-				url:'/api/Supplier/'+id,
-				method:'get'
-			}).then((res)=>{
-				this.list=res.data
-				console.log(this.list)
-			})
-		},
-		methods:{
-			back(){
-				this.$router.go (-1)
-			},
-			update(){
-				console.log("更新信息")
-			}
-		}
-	}
+export default {
+  data() {
+    return {
+      list: []
+    }
+  },
+  mounted() {
+    const id = this.$route.query.id
+    this.$request({
+      url: '/api/Supplier/' + id,
+      method: 'get'
+    }).then((res) => {
+      this.list = res.data
+      console.log(this.list)
+    })
+  },
+  methods: {
+    back() {
+      this.$router.go(-1)
+    },
+    update() {
+      console.log('更新信息')
+    }
+  }
+}
 </script>
 
 <style>
-</style>
+</style>