From 95fd47be4366220f6652741d3d50b83746f98aba Mon Sep 17 00:00:00 2001
From: shengchanzhe <179998674@qq.com>
Date: Sun, 23 Jul 2023 23:18:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/junziqian.js                         |   3 +
 components/company/company.vue           | 122 +++++++++++++----------
 pages/oaHome/oaHome.vue                  |  19 +++-
 pages/oaMy/oaMy.vue                      |   4 +-
 subpkg/contract/contract.vue             |  11 +-
 subpkg/contractDetail/contractDetail.vue |   2 +-
 6 files changed, 97 insertions(+), 64 deletions(-)
 create mode 100644 api/junziqian.js

diff --git a/api/junziqian.js b/api/junziqian.js
new file mode 100644
index 0000000..37983c2
--- /dev/null
+++ b/api/junziqian.js
@@ -0,0 +1,3 @@
+import oahttp from "@/utils/oahttp.js";
+//获取合同链接
+export const download_file = (data) => oahttp.get('/junziqian/download_file', data)
diff --git a/components/company/company.vue b/components/company/company.vue
index 76c8a89..2998ea9 100644
--- a/components/company/company.vue
+++ b/components/company/company.vue
@@ -15,10 +15,45 @@
               </view>
             </view>
           </view>
-          <view class="bottom"><uni-icons type="location"></uni-icons><text class="location">负责区域:</text></view>
+          <view class="bottom"><uni-icons type="location"></uni-icons><text class="location">区域:{{company.address}}</text></view>
         </view>
       </block>
     </view>
+	<view class="item">
+	  <u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%" rowsHeight="56"></u-skeleton>
+	  <block v-if="!skeleton">
+	    <view class="title">电子合同</view>
+	    <view class="card">
+	      <view class="one">
+	        <view class="info">
+				<view class="info_item">甲方：{{contract.party_a_name}}</view>
+	          <view class="info_item">乙方：{{contract.party_b_name}}</view>
+	          <view class="info_item">合同类型：{{contract.contract_type_name}}</view>
+	          <view class="info_item">合同编号：{{contract.contract_no}}</view>
+	        </view>
+	      </view>
+	      <u-line color="#999999FF" style="margin: 31rpx 0;"></u-line>
+	      <view class="contract">
+	        <view class="left">
+	          <image class="contract_img" src="../../static/img/contract/pdf.png"></image>
+	          <view class="text">
+	            <view class="name">合同</view>
+	            <view>
+	              <!-- <text class="nickname">张郭郭</text> -->
+	              <text>{{contract.create_time}}</text>
+	            </view>
+	          </view>
+	        </view>
+	        <view class="right"
+	          @click="naviTo(contract.contract_no)">
+	          <!-- <image class="icon"></image> -->
+	          <uni-icons type="paperclip" color="#3274F9"></uni-icons>
+	          <view>查看</view>
+	        </view>
+	      </view>
+	    </view>
+	  </block>
+	</view>
     <view class="item">
       <u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%" rowsHeight="56"></u-skeleton>
       <block v-if="!skeleton">
@@ -38,61 +73,31 @@
           </view>
           <view style="height: 32rpx;"></view>
           <view class="one" v-for="(other, index) in company.other_contacts" :key="index">
-            <view class="linkman">其他联系人</view>
-            <view class="info">
-              <view class="info_item">姓名：{{other.name}}</view>
-              <view class="info_item">职位：{{other.position}}</view>
-              <view class="info_item">联系电话：{{other.phone}}</view>
-              <view class="info_item">邮箱：{{other.email}}</view>
-            </view>
+				<view v-if="other.name!=''">
+					<view class="linkman">其他联系人</view>
+					<view class="info">
+					  <view class="info_item">姓名：{{other.name}}</view>
+					  <view class="info_item">职位：{{other.position}}</view>
+					  <view class="info_item">联系电话：{{other.phone}}</view>
+					  <view class="info_item">邮箱：{{other.email}}</view>
+					</view>
+				</view>
           </view>
         </view>
       </block>
       
     </view>
-    <view class="item">
+    <view class="item" >
       <u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%" rowsHeight="56"></u-skeleton>
-      <block v-if="!skeleton">
+      <block v-if="!skeleton" >
         <view class="title">资质信息</view>
-        <view class="image_box">
-          <image class="top" @click="priview(company.qualification.bank_account)" :src="company.qualification.bank_account"></image>
-          <image class="bottom" @click="priview(company.qualification.business_license)" :src="company.qualification.business_license"></image>
-        </view>
-      </block>
-    </view>
-    <view class="item">
-      <u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%" rowsHeight="56"></u-skeleton>
-      <block v-if="!skeleton">
-        <view class="title">电子合同</view>
-        <view class="card">
-          <view class="one">
-            <view class="linkman">{{contract.party_a_name}}</view>
-            <view class="info">
-              <view class="info_item">签约对象：{{contract.party_b_name}}</view>
-              <view class="info_item">合同类型：{{contract.contract_type_name}}</view>
-              <view class="info_item">合同编号：{{contract.contract_no}}</view>
-            </view>
-          </view>
-          <u-line color="#999999FF" style="margin: 31rpx 0;"></u-line>
-          <view class="contract">
-            <view class="left">
-              <image class="contract_img" src="../../static/img/contract/pdf.png"></image>
-              <view class="text">
-                <view class="name">合同</view>
-                <view>
-                  <!-- <text class="nickname">张郭郭</text> -->
-                  <text>{{contract.create_time}}</text>
-                </view>
-              </view>
-            </view>
-            <view class="right"
-              @click="naviTo('/subpkg/pdfView/pdfView?url=' + contract.file)">
-              <!-- <image class="icon"></image> -->
-              <uni-icons type="paperclip" color="#3274F9"></uni-icons>
-              <view>查看</view>
-            </view>
-          </view>
-        </view>
+        <view class="image_box" style="background-color: #fff;border-radius: 7px 7px 7px 7px;">
+<image class="bottom" @click="priview(company.qualification.business_license)" :src="company.qualification.business_license" v-if="company.qualification.business_license"></image>
+		  <image class="bottom" @click="priview(company.qualification.business_licenseB)" :src="company.qualification.business_licenseB" v-if="company.qualification.business_licenseB"></image>
+        <image class="top" @click="priview(company.qualification.bank_account)" :src="company.qualification.bank_account" v-if="company.qualification.bank_account"></image>
+        <image class="top" @click="priview(company.qualification.bank_accountB)" :src="company.qualification.bank_accountB" v-if="company.qualification.bank_accountB"></image>
+        
+		</view>
       </block>
     </view>
   </view>
@@ -101,6 +106,8 @@
 <script>
   import { contractView } from "@/api/contract.js"
   import { companyView } from "@/api/company.js"
+  import { download_file } from "@/api/junziqian.js"
+  
   export default {
     name:"company",
     data() {
@@ -125,11 +132,16 @@
       this.initContract(this.$props.id, this.$props.type||null);
     },
     methods: {
-      naviTo(url) {
-        url ?
-          uni.navigateTo({
-            url: url
-          }) : Toast('暂未开放')
+      naviTo(contract_no) {
+		  download_file({applyNo:contract_no}).then(res=>{
+			  if(res.code!=1){
+				  Toast(res.msg)
+			  }
+			  uni.navigateTo({
+			    url: `/subpkg/pdfView/pdfView?url=${res.data.url}`
+			  }) 
+		  })
+
       },
       naviBack(){
         uni.navigateBack()
@@ -180,7 +192,7 @@
 <style lang="scss" scoped>
 .item {
       padding: 31.5rpx 28rpx;
-  
+		
       .title {
         margin-bottom: 21rpx;
         font-size: 35rpx;
diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index 385b871..e7b17d7 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -25,8 +25,9 @@
             
           </view>
           <view class="duty">
-            所属公司:<text class="" v-if="myOaInfo.admin.company">{{ myOaInfo.admin.company.company_name }}</text>
+            <!-- 所属公司:<text class="" v-if="myOaInfo.admin.company">{{ myOaInfo.admin.company.company_name }}</text> -->
             <!-- ({{ myOaInfo.did_name }}){{myOaInfo.label_name}} -->
+			电话:{{myOaInfo.account}}
           </view>
         </view>
       </view>
@@ -61,7 +62,7 @@
 
     <view class="fast_track">
       <block v-for="(item,index) in oaHomeData" :key="index">
-        <view class="track_item" @click="navTo(item.url)">
+        <view class="track_item" @click="navTwo(item.url,index)">
           <u--image :showLoading="true" :src="item.icon" width="77.19rpx" height="77.19rpx"></u--image>
           <view class="title">{{ item.text }}</view>
         </view>
@@ -236,6 +237,20 @@
             url: url,
           }) : Toast('暂未开放')
       },
+	  navTwo(url,key) {
+		  let role_id=this.$store.state.app.userInfo.admin.role_id
+		  var arr = [3,6];
+
+		  if(role_id && role_id[0]==9){
+				if(arr.indexOf(key)==-1){
+					Toast('请先成立公司后开放')
+					return false
+				}
+		  }		 
+	      uni.navigateTo({
+	        url: url,
+	      })
+	  },
       // 点击公告
       clickNotice(e){
         uni.navigateTo({
diff --git a/pages/oaMy/oaMy.vue b/pages/oaMy/oaMy.vue
index a970b88..580a0ed 100644
--- a/pages/oaMy/oaMy.vue
+++ b/pages/oaMy/oaMy.vue
@@ -31,7 +31,9 @@
                 <!-- <text class="omit" v-if="oaUserInfo.admin.company">所属公司:{{ oaUserInfo.admin.company.company_name }}</text> -->
               </view>
               <view class="work">
-                所属公司:<text class="omit" v-if="oaUserInfo.admin.company">{{ oaUserInfo.admin.company.company_name }}</text>
+				  电话:{{oaUserInfo.account}}
+				
+                <!-- 所属公司:<text class="omit" v-if="oaUserInfo.admin.company">{{ oaUserInfo.admin.company.company_name }}</text> -->
                 <!-- {{ oaUserInfo.did_name }}({{ oaUserInfo.label_name }}) -->
               </view>
             </view>
diff --git a/subpkg/contract/contract.vue b/subpkg/contract/contract.vue
index 1ce2137..8616ff1 100644
--- a/subpkg/contract/contract.vue
+++ b/subpkg/contract/contract.vue
@@ -12,18 +12,19 @@
     <view class="contract_list">
       <view class="item" v-for="(item,index) in list" :key="item.id">
         <view class="top">
-          <image src="../../static/img/contract/contract.png"></image>
+          <image src="../../static/img/contract/pdf.png" style="height: 140rpx; width: 140rpx;"></image>
           <view class="text">
             <view class="name">
               <view class="title">
                 <text v-if="item.company">{{item.company.company_name}}</text>
               </view>
-              <view class="number">合同编号{{item.contract_no}}</view>
             </view>
             <view class="date">
               <!-- <text class="time">2023-04-27 至 2024-04-28 </text> -->
+			  <view class="number">合同编号:{{item.contract_no}}</view>
+			  <view class="number">合同类型:{{item.company.contract_type_name}}</view>
+			  
               <text class="time">修改时间:{{item.update_time}}</text>
-              <!-- <text class="expire">365天后到期</text> -->
             </view>
           </view>
         </view>
@@ -155,7 +156,7 @@
 
       .top {
         display: flex;
-
+		margin-bottom: 10rpx;
         image {
           width: 87.6rpx;
           height: 87.6rpx;
@@ -212,7 +213,7 @@
       .bottom {
         display: flex;
         justify-content: space-between;
-
+		margin-top: 10rpx;
         .left {
           font-size: 28rpx;
           font-weight: 400;
diff --git a/subpkg/contractDetail/contractDetail.vue b/subpkg/contractDetail/contractDetail.vue
index 7fb71ca..74b7c1d 100644
--- a/subpkg/contractDetail/contractDetail.vue
+++ b/subpkg/contractDetail/contractDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="">
     <company :id="id" type="contract"></company>
-    <button class="back_btn" @click="naviBack">返回</button>
+    <!-- <button class="back_btn" @click="naviBack">返回</button> -->
     <!-- <button class="stop_btn">终止合同</button> -->
   </view>
 </template>