7.14的代码

src/layout/components/Sidebar/index.vue

@@ -33,7 +33,8 @@
     },
   data(){
       return{
-        logo:logo
+        logo:logo,
+				checked:''
       }
     },
     computed: {

src/router/index.js

@@ -77,23 +77,30 @@ export const constantRoutes = [
        path: '/detail',
        name: 'detail',
       component: () => import('@/views/contracts/detail'),
-      meta: { title: '汇票详情'},
+      meta: { title: '合同详情'},
       hidden:true,
       },
      {
        path: 'contracts/addcontract',
-       name: 'Table',
+       name: 'addcontract',
       component: () => import('@/views/contracts/addcontract'),
       meta: { title: '上传合同' },
       hidden:true
      },
     {
       path: 'contracts/addnewbill',
-      name: 'Table',
+      name: 'addnewbill',
      component: () => import('@/views/contracts/addnewbill'),
      meta: { title: '新增汇票' },
      hidden:true
     },
+		{
+		  path: 'contracts/billDetail',
+		  name: 'billDetail',
+		 component: () => import('@/views/contracts/billDetail'),
+		 meta: { title: '汇票详情' },
+		 hidden:true
+		},
 
    ]
  },

src/views/contracts/billDetail.vue

@@ -0,0 +1,44 @@
+<template>
+	<el-descriptions title="汇票详情">
+	    <el-descriptions-item label="汇票名">{{list[0].name}}</el-descriptions-item>
+	    <el-descriptions-item label="汇票编号">{{list[0].draftNo}}</el-descriptions-item>
+	    <el-descriptions-item label="承兑人">{{list[0].acceptorName}}</el-descriptions-item>
+		<el-descriptions-item label="出票人">{{list[0].drawersName}}</el-descriptions-item>
+		<el-descriptions-item label="金额">{{list[0].money}}</el-descriptions-item>
+		<el-descriptions-item label="服务费率">{{list[0].serviceRate}}</el-descriptions-item>
+		<el-descriptions-item label="服务费">{{list[0].serviceMoney}}</el-descriptions-item>
+		<el-descriptions-item label="利率">{{list[0].interestRate}}</el-descriptions-item>
+		<el-descriptions-item label="利息">{{list[0].interest}}</el-descriptions-item>
+		<el-descriptions-item label="acceptDate">{{list[0].acceptDate}}</el-descriptions-item>
+	    <!-- <el-descriptions-item label="备注">
+	      <el-tag size="small">学校</el-tag>
+	    </el-descriptions-item> -->
+	    <el-descriptions-item label="expectDiscountDate">{{list[0].expectDiscountDate}}</el-descriptions-item>
+		<el-descriptions-item label="picList">
+		<el-image style="width: 100px; height: 100px" :src="list[0].picList" :preview-src-list="list[0].picList">
+		</el-image>
+		</el-descriptions-item>
+	</el-descriptions>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				list:[],
+			}
+		},
+		mounted() {
+			this.$request({
+				url:'/api/Contract/contractDraft/23',
+				method:'get'
+			}).then((res)=>{
+				this.list.push(res.data)
+				console.log(this.list)
+			})
+		}
+	}
+</script>
+
+<style>
+</style>

src/views/contracts/detail.vue

@@ -6,21 +6,21 @@
           <span style="font-weight: 600;">合同基础信息</span>
           <div class="titlein">
             <span class="titlename">合同名称</span>
-            <span class="meatatitle">中科公司第二期项目第一期采购合同</span>
+            <span class="meatatitle">{{contract.name}}</span>
           </div>
           <div class="titlein">
             <span class="titlename">合同编号</span>
-            <span class="meatatitle">ADG1254BFG4</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" :src="url" :preview-src-list="srcList">
+                <el-image style="width: 100px; height: 100px" :src="url[0]" :preview-src-list="srcList[0]">
                 </el-image>
               </div>
               <div class="imgbox">
-                <el-image style="width: 100px; height: 100px" :src="url" :preview-src-list="srcList">
+                <el-image style="width: 100px; height: 100px" :src="url[1]" :preview-src-list="srcList[1]">
                 </el-image>
               </div>
             </div>
@@ -29,11 +29,11 @@
             <span class="titlename">发票附件</span>
             <div style="display: flex;">
               <div class="imgbox">
-                <el-image style="width: 100px; height: 100px" :src="url" :preview-src-list="srcList">
+                <el-image style="width: 100px; height: 100px" :src="url[1]" :preview-src-list="srcList[1]">
                 </el-image>
               </div>
               <div class="imgbox">
-                <el-image style="width: 100px; height: 100px" :src="url" :preview-src-list="srcList">
+                <el-image style="width: 100px; height: 100px" :src="url[1]" :preview-src-list="srcList[1]">
                 </el-image>
               </div>
             </div>
@@ -47,11 +47,11 @@
             <span class="titlename">贸易合同</span>
             <div style="display: flex;">
               <div class="imgbox">
-                <el-image style="width: 100px; height: 100px" :src="url" :preview-src-list="srcList">
+                <el-image style="width: 100px; height: 100px" :src="url[0]" :preview-src-list="srcList[0]">
                 </el-image>
               </div>
               <div class="imgbox">
-                <el-image style="width: 100px; height: 100px" :src="url" :preview-src-list="srcList">
+                <el-image style="width: 100px; height: 100px" :src="url[1]" :preview-src-list="srcList[1]">
                 </el-image>
               </div>
             </div>
@@ -63,7 +63,7 @@
             </el-tag> -->
             <div class="boxas">
               <span style="color: #fff;">合同状态：</span>
-              <span style="color: #D05C39;">待审核</span>
+              <span style="color: #D05C39;">{{contract.statusText}}</span>
             </div>
             <span class="aoiisp">审核结果：<p style="color: #D8AB5A;">审核通过</p></span>
           </div>
@@ -81,11 +81,11 @@
               <span class="sah">审核截图：</span>
               <div style="display: flex;justify-content: flex-end;">
                 <div class="imgbox">
-                  <el-image style="width: 100px; height: 100px" :src="url" :preview-src-list="srcList">
+                  <el-image style="width: 100px; height: 100px" :src="url[0]" :preview-src-list="srcList">
                   </el-image>
                 </div>
                 <div class="imgbox">
-                  <el-image style="width: 100px; height: 100px" :src="url" :preview-src-list="srcList">
+                  <el-image style="width: 100px; height: 100px" :src="url[1]" :preview-src-list="srcList">
                   </el-image>
                 </div>
               </div>
@@ -96,61 +96,56 @@
     </el-card>
     <el-card class="box-card">
       <div slot="" class="clearfix">
-        <!-- <span>卡片名称</span> -->
+		  
          <el-button type="danger"  style="float: right; ">删除</el-button>
-          <el-button type="warning"  style="float: right;margin-right: 10px; " @click="addNewBill">新增</el-button>
-
+          <el-button type="primary"  style="float: right;margin-right: 10px; " @click="addNewBill" v-if="checked==1">新增</el-button>
           <el-button type="primary" style="float: right; ">导出</el-button>
+		  <el-button type="warning"  style="float: right; ">审核失败</el-button>
+		  <el-button type="success"  style="float: right; ">审核成功</el-button>
       </div>
     </el-card>
     <el-card class="box-card">
-     <el-table v-loading="listLoading" :data="list" element-loading-text="Loading" border fit highlight-current-row>
-     <el-table-column align="center" label="" width="55">
-       <template slot-scope="scope">
-        <el-checkbox v-model="checked"></el-checkbox>
-       </template>
+     <el-table v-loading="listLoading" :data="list" element-loading-text="Loading" border fit highlight-current-row @select="onSelet">
+     <el-table-column align="center" label="" width="55" type="selection">
+       
      </el-table-column>
-     <el-table-column label="汇票名称"  align="center">
-       <template slot-scope="scope">
+     <el-table-column label="汇票名称"  align="center" prop="name">
+       <!-- <template slot-scope="scope">
          汇票名称
-       </template>
+       </template> -->
      </el-table-column>
-     <el-table-column label="汇票编号"  align="center">
-       <template slot-scope="scope">
+     <el-table-column label="汇票编号"  align="center" prop="draftNo">
+      <!-- <template slot-scope="scope">
          <span>合同编号</span>
-       </template>
+       </template> -->
      </el-table-column>
-     <el-table-column label="承兑人"  align="center">
-       <template slot-scope="scope">
+     <el-table-column label="承兑人"  align="center" prop="acceptorName">
+       <!-- <template slot-scope="scope">
          承兑人
-       </template>
+       </template> -->
      </el-table-column>
      <el-table-column label="金额" width="170" align="center">
        <template slot-scope="scope">
-         金额
+         {{scope.row.money}}
        </template>
      </el-table-column>
      <el-table-column label="服务费" width="180" align="center">
        <template slot-scope="scope">
-         服务费
+         {{scope.row.serviceMoney}}
        </template>
      </el-table-column>
-     <el-table-column label="汇票状态" width="180" align="center">
-       <template slot-scope="scope">
-         汇票状态
-       </template>
+     <el-table-column label="汇票状态" width="180" align="center" prop="status">
      </el-table-column>
      <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="380">
        <template slot-scope="scope">
-         <el-tag type="success" style="cursor: pointer;margin-right: 15px;" @click="tapDetail">查看详情</el-tag>
-        <el-tag type="warning" style="margin-right: 15px;cursor: pointer;">复原</el-tag>
-         <el-tag type="info">删除</el-tag>
+         <el-tag type="primary" style="cursor: pointer;margin-right: 15px;" @click="tapDetail">查看详情</el-tag>
+        <el-tag type="success" style="margin-right: 15px;cursor: pointer;">复原</el-tag>
+         <el-tag type="danger" style="margin-right: 15px;cursor: pointer;">删除</el-tag>
        </template>
      </el-table-column>
      </el-table>
@@ -175,33 +170,57 @@
   export default {
     data() {
       return {
-         list: null,
-          listLoading: true,
-        form: '暂无',
-        url: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
+        list: [],
+		contract:{},
+        listLoading: false,
+		checked:'',
+        form: '',
+        // url: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
+		url:[],
         srcList: [
-          'https://fuss10.elemecdn.com/8/27/f01c15bb73e1ef3793e64e6b7bbccjpeg.jpeg',
-          'https://fuss10.elemecdn.com/1/8e/aeffeb4de74e2fde4bd74fc7b4486jpeg.jpeg'
+          // 'https://fuss10.elemecdn.com/8/27/f01c15bb73e1ef3793e64e6b7bbccjpeg.jpeg',
+          // 'https://fuss10.elemecdn.com/1/8e/aeffeb4de74e2fde4bd74fc7b4486jpeg.jpeg'
         ]
       }
     },
     created() {
-      this.fetchData()
+      // this.fetchData()
     },
+	mounted(){
+		this.checked=this.$store.state.user.checked
+		this.$request({
+			url:'/api/Contract/17',
+			method:'get'
+		}).then((res)=>{
+			this.contract=res.data
+			this.url=this.contract.invoicePicList
+			this.srcList=this.contract.picList
+			console.log(this.srcList)
+		})
+		this.$request({
+			url:'/api/Contract/contractDraft/23',
+			method:'get'
+		}).then((res)=>{
+			this.list.push(res.data)
+		})
+	},
     methods: {
       addNewBill(){
         this.$router.push({path:'contracts/addnewbill'})
       },
       tapDetail(){
-
+		this.$router.push({path:'contracts/billDetail',query:{}})
       },
-      fetchData() {
-        this.listLoading = true
-        getList().then(response => {
-          this.list = response.data.items
-          this.listLoading = false
-        })
-      }
+	  onSelet(){
+		  
+	  }
+      // fetchData() {
+      //   this.listLoading = true
+      //   getList().then(response => {
+      //     this.list = response.data.items
+      //     this.listLoading = false
+      //   })
+      // }
     }
   }
 </script>

src/views/contracts/index.vue

@@ -63,9 +63,9 @@
       </el-col> -->
       <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="7">
         <div class="grid-content bg-purple" style="display: flex;justify-content: flex-end;">
-           <el-button type="primary" @click="addNewContract">新增</el-button>
-           <el-button type="primary">审核失败</el-button>
-            <el-button type="primary">审核成功</el-button>
+           <el-button type="primary" @click="addNewContract" v-if="checked==1">上传合同</el-button>
+           <el-button type="primary" v-if="checked==0">审核失败</el-button>
+            <el-button type="primary" v-if="checked==0">审核成功</el-button>
           <el-button type="primary">导出</el-button>
             <el-button type="success">复原</el-button>
             <el-button type="danger">删除</el-button>
@@ -99,20 +99,20 @@
           出票人
         </template> -->
       </el-table-column>
-      <el-table-column label="汇票状态" width="190" align="center" prop="draftStatus">
-        <!-- <template slot-scope="scope">
-          汇票状态
-        </template> -->
+      <el-table-column label="汇票状态" width="190" align="center" >
+        <template slot-scope="scope">
+          正常
+        </template>
       </el-table-column>
       <el-table-column label="合同状态" width="180" align="center" >
         <template slot-scope="scope">
           正常
         </template>
       </el-table-column>
-      <el-table-column class-name="status-col" label="审核状态" width="155" align="center">
-        <template slot-scope="scope">
+      <el-table-column class-name="status-col" label="审核状态" width="155" align="center" prop="statusText">
+        <!-- <template slot-scope="scope">
           <el-tag :type="scope.row.status | statusFilter">{{ scope.row.status }}</el-tag>
-        </template>
+        </template> -->
       </el-table-column>
       <el-table-column align="center"  label="时间" prop="createdAt">
         <!-- <template slot-scope="scope">
@@ -157,6 +157,7 @@
       }
     },
     mounted() {
+			this.checked=this.$store.state.user.checked
          this.$request({
             url: '/api/Contract/search',
             method: 'post',
@@ -177,7 +178,7 @@
         status: '',
         hpstatus:'',
         input4:'',
-        checked:false,
+        checked:'',
         pickerOptions: {
           shortcuts: [{
             text: '最近一周',

src/views/management/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-row  style="">
       <el-col :xs="24" :sm="24" :md="24" :lg="10" :xl="6">
-        <div class="grid-content bg-purple" style="margin-left: 25px;">
+        <div class="grid-content bg-purple" style="margin-left: 10px;">
           <el-input
               placeholder="业务管理员名称搜索"
               v-model="input4" style="width: 80%;">
@@ -48,12 +48,8 @@
           </el-dropdown>
         </div>
       </el-col>
-
-     <!-- <el-col :span="1">
-        <div class="grid-content bg-purple"></div>
-      </el-col> -->
       <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="7">
-        <div class="grid-content bg-purple" style="display: flex;justify-content: flex-end;">
+        <div class="grid-content bg-purple" style="display: flex;justify-content: flex-end;margin-left: 10px;">
           <el-button type="primary">审核成功</el-button>
           <el-button type="primary">审核失败</el-button>
           <el-button type="primary">禁用</el-button>

src/views/mine/index.vue

@@ -72,13 +72,13 @@
 		      </span>
 		    </el-form-item>
 		    <el-form-item label="姓名" :rules="[{  message: '姓名不能为空不能为空'}]">
-		      <el-input v-model="form.name" class="ipwidth" />
+		      <el-input v-model="form.realName" class="ipwidth" />
 		    </el-form-item>
 		    <el-form-item label="账号" :rules="[{ message: '账号不能为空'}]">
-		      <el-input v-model="form.socialCode" class="ipwidth" />
+		      <el-input v-model="form.account" class="ipwidth" />
 		    </el-form-item>
 		    <el-form-item label="联系电话" :rules="[{  message: '联系电话不能为空'}]">
-		      <el-input v-model="form.legalPerson" class="ipwidth" />
+		      <el-input v-model="form.mobile" class="ipwidth" />
 		    </el-form-item>
 		  </el-form>
 		  <el-collapse v-model="activeNames" @change="handleChange" style="width: 90%;float: right;">
@@ -118,14 +118,22 @@
     },
 	mounted(){
 		that=this
-		// let checked=that.$store.state.user.checked
 		this.checked=that.$store.state.user.checked
-		this.$request({
-			url:'/api/Supplier/4',
-			method:'get'
-		}).then((res)=>{
-			this.form=res.data
-		})
+		if(this.checked==1){
+			this.$request({
+				url:'/api/Supplier/4',
+				method:'get'
+			}).then((res)=>{
+				this.form=res.data
+			})
+		}else if(this.checked==0){
+			this.$request({
+				url:'/api/Account',
+				method:'get'
+			}).then((res)=>{
+				this.form=res.data
+			})
+		}
 	},
     methods: {
       handleChange(){

src/views/shipments/shipments2.vue

@@ -202,7 +202,6 @@
         this.$request({
           url:'/api/Report/export/contractReport?contractName=&startDate=&endDate=',
           method:'get',
-
         }).then((res)=>{
         console.log(res)
       })

src/views/table/index.vue

@@ -74,15 +74,15 @@
           <span>XXX</span>
         </template> -->
       </el-table-column>
-      <el-table-column align="center"  label="服务费率" prop="serviceRate">
-       <!-- <template slot-scope="scope">
-          <span>XXX</span>
-        </template> -->
+      <el-table-column align="center"  label="服务费率" >
+       <template slot-scope="scope">
+          {{scope.row.serviceRate}}%
+        </template>
       </el-table-column>
       <el-table-column align="center"  label="利率" prop="interest">
-       <!-- <template slot-scope="scope">
-          <span>XXX</span>
-        </template> -->
+       <template slot-scope="scope">
+		  {{scope.row.interest}}%
+        </template>
       </el-table-column>
       <el-table-column align="center"  label="状态" >
         <!-- <template slot-scope="scope">