fixConflict

config/dev.env.js

@@ -12,6 +12,11 @@ module.exports = merge(prodEnv, {
   rootPath: '"http://180.104.121.66:8088/r/api"',
   filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_DEV&apiName=file_view&"',
   ocrPath: '"http://180.104.121.66:8088/r/api"',
+<<<<<<< HEAD
   appId: '"com.xcmg.app"',
   currentVersion: '"1.7.6"',
+=======
+  appId: '"com.xcmg.app.dev"',
+  currentVersion: '"1.7.3"',
+>>>>>>> jeshi
 })

config/uat.env.js

@@ -10,6 +10,6 @@ module.exports = {
   filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"',
   ocrPath:'"http://180.104.121.66:8088/r/api"',
   fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
-  appId: '"com.xcmg.app.dev"',
-  currentVersion: '"1.2.1"'
+  appId: '"com.xcmg.app"',
+  currentVersion: '"1.2.4"'
 }

src/pages/contractCreate/create-base-info.vue

@@ -152,6 +152,16 @@
               <div slot="name" class="required">设备价值</div>
               <span slot="content">{{ saveInfo.equip_value }}</span>
             </item>
+            <item v-if="!fromPutted" class="check" @click.native="checkedMort=!checkedMort">
+              <div slot="name" class="required">是否抵押</div>
+              <img v-if="checkedMort" slot="content" src="@/assets/contractCreate/selected.png" >
+              <span v-if="!checkedMort" slot="content" />
+            </item>
+            <item v-if="fromPutted" class="check">
+              <div slot="name" class="required">是否抵押</div>
+              <img v-if="checkedMort" slot="content" src="@/assets/contractCreate/selected.png" >
+              <span v-if="!checkedMort" slot="content" />
+            </item>
             <item v-if="!fromPutted&&showSpecialFlag&&project_status==='REJECT'" class="check" @click.native="checked=!checked">
               <div slot="name" class="required">农行代扣</div>
               <img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" >
@@ -387,6 +397,7 @@ export default {
       saveTed: false, // 本页面数据是否保存标识
       checked: false, // 农行代扣
       checkedApproved: false, // 是否特批
+      checkedMort: false, // 是否抵押
       bp_class: '',
       showModalValue: false,
       showSpecialFlag: false,
@@ -421,6 +432,7 @@ export default {
         enterpriese_nature_n: '',
         abc_deduction_flag: '',
         special_flag: '',
+        mortgega_flag: '',
         special_matter: '',
         np_industry_exp: '',
         np_occupation: '',
@@ -469,6 +481,26 @@ export default {
       },
       immediate: true,
     },
+    'saveInfo.mortgega_flag': {
+      handler (newVal, oldVal) {
+        if (newVal === 'N') {
+          this.checkedMort = false
+        } else if (newVal === 'Y') {
+          this.checkedMort = true
+        }
+      },
+      immediate: true,
+    },
+    checkedMort: {
+      handler (newVal, oldVal) {
+        if (newVal === false) {
+          this.saveInfo.mortgega_flag = 'N'
+        } else if (newVal === true) {
+          this.saveInfo.mortgega_flag = 'Y'
+        }
+      },
+      immediate: true,
+    },
     checkedApproved: {
       handler (newVal, oldVal) {
         if (newVal === false) {
@@ -506,10 +538,11 @@ export default {
             i !== 'bp_id' &&
             i !== 'bp_class' &&
             i !== 'abc_deduction_flag' &&
-            i !== 'special_flag'
+            i !== 'special_flag' &&
+            i !== 'mortgega_flag'
           ) {
             vm.saveInfo[i] = ''
-          } else if (i === 'abc_deduction_flag' || i === 'special_flag') {
+          } else if (i === 'abc_deduction_flag' || i === 'special_flag' || i === 'mortgega_flag') {
             vm.saveInfo[i] = 'N'
           } else if (i === 'bp_id') {
             vm.saveInfo[i] = window.localStorage.bp_id_tenant

src/pages/contractCreate/create-enclosure-info.vue

@@ -72,6 +72,33 @@
         </div>
       </div>
       <div class="userInfo">补充资料</div>
+      <div class="house">
+        <p class="titles">抵押证书</p>
+        <!--抵押 待上传图片列表-->
+        <div
+          v-for="(item, index) in mort_upload_list"
+          v-if="item.check_id === mortId"
+          :key="index"
+          class="card-upload"
+        >
+          <img :src="item.picture" @click="showBigPicture(item.picture)" >
+          <div class="close" @click="remove_pic(item.attachment_id,index)">
+            <img src="@/assets/userBind/deleteIcon.png" >
+          </div>
+        </div>
+        <!--抵押 下载的图片-->
+        <div v-for="(pic, index) in dowload_list" :key="index">
+          <div v-if="pic.check_id==checkId" :key="index" class="card-upload">
+            <img :src="pic.url" @click="showBigPicture(pic.url)" >
+            <div class="close" @click="delete_pic(pic.attachment_id)">
+              <img src="@/assets/userBind/deleteIcon.png" >
+            </div>
+          </div>
+        </div>
+        <div v-if="!isReadOnly" class="card-upload plus" @click="ocrShow('抵押证书',checkId)">
+          <img src="@/assets/userBind/camera.png" class="upload-btn" >
+        </div>
+      </div>
       <div class="house">
         <p class="titles">特批申请书</p>
         <!--待上传图片列表-->
@@ -99,6 +126,7 @@
           <img src="@/assets/userBind/camera.png" class="upload-btn" >
         </div>
       </div>
+
     </h-content>
     <bottom-tab class="add-box">
       <tab-button v-if="!isReadOnly" class="before" @click.native="handSave">保存</tab-button>
@@ -112,8 +140,11 @@ export default {
   data () {
     return {
       checkId: '', // 特批申请书id
+      mortId: '', // 抵押证书id
       cddItemList: [],
       upload_list: [],
+      mort_upload_list: [], // 抵押上传数组
+      mort_dowload_list: [],
       dowload_list: [], // 下载图片列表
       idCardFrontCheck_id: '', // 承租人身份证正面
       idCardBackCheck_id: '', // 承租人身份证背面
@@ -150,7 +181,9 @@ export default {
         vm.marryImg = ''
         vm.licenseImg = ''
         vm.upload_list = []
+        vm.mort_upload_list = []
         vm.dowload_list = []
+        vm.mort_dowload_list = []
         vm.cddItemList = []
         vm.bpClass = window.localStorage.bp_class
         vm.status = window.localStorage.user_bp_status
@@ -741,12 +774,12 @@ export default {
           }
         }
   }
-  .house:last-child {
-    margin-top: 0;
-    div {
-      float: left;
-    }
-  }
+  // .house:last-child {
+  //   margin-top: 0;
+  //   div {
+  //     float: left;
+  //   }
+  // }
 
   .upload-box {
         display: flex;

src/pages/contractSigning/contract-detail.vue

@@ -899,11 +899,15 @@ export default {
       let flag = await this.signCheck()
       if (flag) {
         // 只有认证通过后方可进行签约操作
+        if (window.localStorage.bp_type === 'TENANT') {
           if (!this.bank_flag && this.abc_deduction_flag === 'Y') {
             this.isshow = true // 未查到农行卡给出提示且勾选农行代扣
           } else {
             this.showModalValue = true // 审批内容框显示
           }
+        } else {
+          this.showModalValue = true // 审批内容框显示
+        }
       }
     },
 

www/index.html

+<<<<<<< HEAD
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.bf12f36459a8557699346754da6efd18.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.5b23605dc2d9cfefc737.js></script><script type=text/javascript src=./static/js/vendor.64c4110c2ef75634c410.js></script><script type=text/javascript src=./static/js/app.dd5894f1024fda4ea85c.js></script></body></html>
+=======
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.52a70966e6418a8b3b97c93ce2dec949.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.75679805cfd6269119a3.js></script><script type=text/javascript src=./static/js/vendor.7278d929ed3c1f5073ab.js></script><script type=text/javascript src=./static/js/app.721099b2f6b67e7c6383.js></script></body></html>
+>>>>>>> jeshi