From c087ec6d6473e977e3a1a6ab38d9ae83663cacd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Mon, 6 Mar 2023 13:01:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/sunVillage_info/fixedAssets.js        |   9 ++
 src/views/agriculturalTrusteeship/login.vue   |  26 ++--
 .../agriculturalTrusteeship/shop/shopList.vue |   2 +-
 src/views/sunVillage_info/list_signature.vue  |   2 +-
 .../sunVillage_info/list_signature_add.vue    | 116 +++++-------------
 5 files changed, 56 insertions(+), 99 deletions(-)

diff --git a/src/api/sunVillage_info/fixedAssets.js b/src/api/sunVillage_info/fixedAssets.js
index 20ad130f..e6f20fac 100644
--- a/src/api/sunVillage_info/fixedAssets.js
+++ b/src/api/sunVillage_info/fixedAssets.js
@@ -655,3 +655,12 @@ export function signFirst(data,id) {
     data: data
   })
 }
+
+//甲方合同网签详情
+export function contractGet(query,id) {
+  return request({
+    url: '/transaction/contract/get/'+id,
+    method: 'get',
+    params:query
+  })
+}
diff --git a/src/views/agriculturalTrusteeship/login.vue b/src/views/agriculturalTrusteeship/login.vue
index ed78c668..4f53f7df 100644
--- a/src/views/agriculturalTrusteeship/login.vue
+++ b/src/views/agriculturalTrusteeship/login.vue
@@ -11,7 +11,7 @@
       </div>
       <div class="tit">
         <p>大托管服务中心</p>
-        <p>{{loginType=='mj'?'买家':loginType=='fwzz'?'社会化服务组织':loginType=='bxjg'?'保险机构':loginType=='dkjg'?'贷款机构':loginType=='ndjg'?'农担机构':''}}登录{{loginType!='mj'?'注册':''}}</p>
+        <p>{{loginType=='mj'?'会员登录':loginType=='fwzz'?'社会化服务组织':loginType=='bxjg'?'保险机构':loginType=='dkjg'?'金融机构':loginType=='ndjg'?'农担机构':'登录注册'}}</p>
       </div>
     </div>
     <!--  头部结束  -->
@@ -19,44 +19,44 @@
     <!--  登陆选择开始  -->
     <div class="main" :style="{'display': navDis}">
       <div class="nav">
-        <div class="nav_content" @click="loginType = 'mj',navDis = 'none',loginDis = 'block'" >
+        <div class="nav_content" style="padding: 12.5px 0;" @click="loginType = 'mj',navDis = 'none',loginDis = 'block'" >
           <div>
-            <p class="nav_name_01">买家登录</p>
-            <p class="nav_text">登录后支持下单操作</p>
+            <p class="nav_name_01">会员登录</p>
+<!--            <p class="nav_text">登录后支持下单操作</p>-->
           </div>
           <i class="go"></i>
         </div>
       </div>
 
       <div class="nav">
-        <div class="nav_content" @click="loginType = 'fwzz',navDis = 'none',loginDis = 'block'" >
+        <div class="nav_content" style="padding: 12.5px 0;" @click="loginType = 'fwzz',navDis = 'none',loginDis = 'block'" >
           <div>
             <p class="nav_name_02">社会化服务组织登录</p>
-            <p class="nav_text">登录发布社会化服务及相关产品</p>
+<!--            <p class="nav_text">登录发布社会化服务及相关产品</p>-->
           </div>
           <i class="go"></i>
         </div>
       </div>
 
       <div class="nav">
-        <div class="nav_content" @click="financialType = '2' ,loginType = 'bxjg',navDis = 'none',loginDis = 'block'">
+        <div class="nav_content" style="padding: 12.5px 0 30px;" @click="financialType = '2' ,loginType = 'bxjg',navDis = 'none',loginDis = 'block'">
           <div>
             <p class="nav_name_03">保险机构登录</p>
-            <p class="nav_text">登录可发布保险产品</p>
+<!--            <p class="nav_text">登录可发布保险产品</p>-->
           </div>
           <i class="go"></i>
         </div>
-        <div class="nav_content" style="padding:12.5PX 0;margin:12.5PX 0;border-top: 1px solid #D5D8DE;border-bottom: 1px solid #D5D8DE;" @click="financialType = '1' ,loginType = 'dkjg',navDis = 'none',loginDis = 'block'">
+        <div class="nav_content" style="padding: 30px 0 ;border-top: 1px solid #D5D8DE;border-bottom: 1px solid #D5D8DE;" @click="financialType = '1' ,loginType = 'dkjg',navDis = 'none',loginDis = 'block'">
           <div>
-            <p class="nav_name_04">贷款机构登录</p>
-            <p class="nav_text">登录可发布贷款产品</p>
+            <p class="nav_name_04">金融机构登录</p>
+<!--            <p class="nav_text">登录可发布贷款产品</p>-->
           </div>
           <i class="go"></i>
         </div>
-        <div class="nav_content" @click="financialType = '3' ,loginType = 'ndjg',navDis = 'none',loginDis = 'block'">
+        <div class="nav_content" style="padding: 30px 0 12.5px;" @click="financialType = '3' ,loginType = 'ndjg',navDis = 'none',loginDis = 'block'">
           <div>
             <p class="nav_name_05">农担机构登录</p>
-            <p class="nav_text">登录可发布农担产品</p>
+<!--            <p class="nav_text">登录可发布农担产品</p>-->
           </div>
           <i class="go"></i>
         </div>
diff --git a/src/views/agriculturalTrusteeship/shop/shopList.vue b/src/views/agriculturalTrusteeship/shop/shopList.vue
index cde006db..9597eb7a 100644
--- a/src/views/agriculturalTrusteeship/shop/shopList.vue
+++ b/src/views/agriculturalTrusteeship/shop/shopList.vue
@@ -76,7 +76,7 @@
     <!--  内容开始  -->
     <div class="main">
       <van-tabs v-model="active" sticky animated>
-        <van-tab title="售卖中">
+        <van-tab title="服务中">
 
           <img src="../../../../static/images/agriculturalTrusteeship/insurance/shop_icon_add.png" style="margin: 0 auto;display: block;width: 94%;" @click="$router.push({name:'agriculturalTrusteeshipShopAdd'})">
 
diff --git a/src/views/sunVillage_info/list_signature.vue b/src/views/sunVillage_info/list_signature.vue
index 7ec25eb4..fd3a4ec3 100644
--- a/src/views/sunVillage_info/list_signature.vue
+++ b/src/views/sunVillage_info/list_signature.vue
@@ -18,7 +18,7 @@
       >
         <!----1-->
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index" >
-          <div class="item" @click="goDetail(1)">
+          <div class="item" @click="goDetail(item.id)">
             <div class="info">
               <div class="title">
                 <i class="icon_box" v-if="item.firstSigning==null"></i>
diff --git a/src/views/sunVillage_info/list_signature_add.vue b/src/views/sunVillage_info/list_signature_add.vue
index d4bee639..eaa58791 100644
--- a/src/views/sunVillage_info/list_signature_add.vue
+++ b/src/views/sunVillage_info/list_signature_add.vue
@@ -7,46 +7,45 @@
     </div>
     <div class="list_main">
       <van-divider>合同信息</van-divider>
-      <van-field label="合同编号" placeholder="合同编号" input-align="right" :border="false" />
-      <van-field label="合同名称" placeholder="合同名称" input-align="right" :border="false" />
-      <van-field label="合同类别" placeholder="合同类别" input-align="right" :border="false" />
-      <van-field label="甲方" placeholder="甲方" input-align="right" :border="false" />
-      <van-field label="乙方" placeholder="乙方" input-align="right" :border="false" />
-      <van-field label="合同金额" placeholder="合同金额" input-align="right" :border="false" />
-      <van-field label="登记日期" placeholder="登记日期" input-align="right" :border="false" />
-      <van-field label="开始日期" placeholder="开始日期" input-align="right" :border="false" />
-      <van-field label="结束日期" placeholder="结束日期" input-align="right" :border="false" />
-      <van-field label="合同备注" placeholder="合同备注" input-align="right" :border="false" />
-      <van-field label="是否有效" placeholder="是否有效" input-align="right" :border="false" />
-      <van-field label="签订方式" placeholder="签订方式" input-align="right" :border="false" />
-      <van-field label="签订状态" placeholder="签订状态" input-align="right" :border="false" />
+      <van-field v-model="form.contractCode" label="合同编号" placeholder="合同编号" input-align="right" :border="false" />
+      <van-field v-model="form.contractName" label="合同名称" placeholder="合同名称" input-align="right" :border="false" />
+      <van-field v-model="form.contractType" label="合同类别" placeholder="合同类别" input-align="right" :border="false" />
+      <van-field v-model="form.firstParty" label="甲方" placeholder="甲方" input-align="right" :border="false" />
+      <van-field v-model="form.secondParty" label="乙方" placeholder="乙方" input-align="right" :border="false" />
+      <van-field v-model="form.contractMoney" label="合同金额" placeholder="合同金额" input-align="right" :border="false" />
+      <van-field v-model="form.contractDate" label="登记日期" placeholder="登记日期" input-align="right" :border="false" />
+      <van-field v-model="form.startTime" label="开始日期" placeholder="开始日期" input-align="right" :border="false" />
+      <van-field v-model="form.endTime" label="结束日期" placeholder="结束日期" input-align="right" :border="false" />
+      <van-field v-model="form.contractRemark" label="合同备注" placeholder="合同备注" input-align="right" :border="false" />
+      <van-field v-model="form.status" label="是否有效" placeholder="是否有效" input-align="right" :border="false" />
+      <van-field v-model="form.signingMode" label="签订方式" placeholder="签订方式" input-align="right" :border="false" />
+      <van-field v-model="form.signingStatus" label="签订状态" placeholder="签订状态" input-align="right" :border="false" />
 
       <van-divider>甲方信息</van-divider>
-      <van-field label="甲方已签" placeholder="甲方已签" input-align="right" :border="false" />
-      <van-field label="甲方签字日期" placeholder="甲方签字日期" input-align="right" :border="false" />
-      <van-field label="甲方签字" placeholder="甲方签字" input-align="right" :border="false" />
+      <van-field v-model="form.firstIsSign" label="甲方已签" placeholder="甲方已签" input-align="right" :border="false" />
+      <van-field v-model="form.firstPartyAt" label="甲方签字日期" placeholder="甲方签字日期" input-align="right" :border="false" />
+      <van-field label="甲方签字" input-align="right" :border="false" />
+      <img :src="'/api'+form.firstSigning" width="100%" alt="" v-if="form.firstSigning">
 
       <van-divider>乙方信息</van-divider>
-      <van-field label="乙方已签" placeholder="乙方已签" input-align="right" :border="false" />
-      <van-field label="乙方签字日期" placeholder="乙方签字日期" input-align="right" :border="false" />
-      <van-field label="乙方签字" placeholder="乙方签字" input-align="right" :border="false" />
+      <van-field v-model="form.secondIsSign" label="乙方已签" placeholder="乙方已签" input-align="right" :border="false" />
+      <van-field v-model="form.secondPartyAt" label="乙方签字日期" placeholder="乙方签字日期" input-align="right" :border="false" />
+      <van-field label="乙方签字" input-align="right" :border="false" />
+      <img :src="'/api'+form.secondSigning" width="100%" alt="" v-if="form.secondSigning">
     </div>
   </div>
 </template>
 
 <script>
-  import { commonUpload , majorEventOpenAdd } from "@/api/sunVillage_info/fixedAssets";
+  import { contractGet } from "@/api/sunVillage_info/fixedAssets";
   import Cookies from "js-cookie";
-  import request from '@/utils/request'
   export default {
     name: "certificateList",
     data() {
       return {
         showBuildTime:false,
         form:{
-          openDate:this.format(new Date(),'yyyy-MM-dd'),
-          openPic:'',
-          openFile:'',
+
         },
         openPic:[],
         fileList:[],
@@ -76,71 +75,20 @@
       this.type = this.$route.query.type;
       this.queryParams.bookId = Cookies.get('bookId');
       this.queryParams.deptId = Cookies.get('deptId');
+      this.getDetail();
     },
     methods: {
-      onSubmit(){
-        var that = this;
-        that.form.openFile = that.openFile2.join(',')
-        that.form.openPic = that.openPic2.join(',')
-        majorEventOpenAdd(that.form).then((r1) => {
-          if (r1.code == 200){
-            that.$notify({ type: 'success', message: '新增成功' });
-            setTimeout(function(){
-              history.back(-1);
-            },2000)
+      getDetail(){
+        let query = {
+          translate_dict:1
+        }
+        contractGet(query,this.$route.query.id).then((res) => {
+          if (res.code == 200){
+            this.form = res.data;
           }
         })
       },
-      onConfirmOpenNy(data){
-        this.form.openNy = this.format(data,'yyyy-MM');
-        this.openNy = data;
-        this.showBuildTime = false;
-      },
-      deleteFile1(detail){
-        this.openPic2.splice(detail.index,1)
-        // this.form.openPic.splice(index,1);
-      },
-      deleteWord(index){
-        this.openFileList.splice(index,1);
-        this.openFile2.splice(index,1);
-      },
-      afterRead(file) {
-        // 此时可以自行将文件上传至服务器
-        if (file instanceof Array){//判断是否为数组，单张图片为array，多张为数组，数组返回true否则为false
-          file.map(res=>{
-            this.openPic.push(res.file);
-            let params1 = new FormData();
-            params1.append("file", res.file);
-            commonUpload(params1).then((r1) => {
-              this.openPic2.push(r1.fileName);
-            })
-          })
-        }else{
-          this.openPic.push(file);
-          let params1 = new FormData();
-          params1.append("file", file.file);
-          commonUpload(params1).then((r1) => {
-            this.openPic2.push(r1.fileName);
-          })
-        }
-      },
-      afterReadOpenFile(file){
-        console.log(file)
-        let params1 = new FormData();
-        params1.append("file", file.file);
-        commonUpload(params1).then((r1) => {
-          this.openFile2.push(r1.fileName);
-        })
-        let name = file.file.name;
-        let type = '';
-        if (name.indexOf('.doc') > -1){
-          type = 'word';
-        }else if(name.indexOf('.xls') > -1){
-          type = 'excel';
-        }
-        this.openFileList.push({name:file.file.name,type:type})
-        this.openFile.push(file.file);
-      }
+
     },
   }
 </script>