jeshi

config/dev.env.js

@@ -13,5 +13,5 @@ module.exports = merge(prodEnv, {
   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"',
   appId: '"com.xcmg.app.dev"',
-  currentVersion: '"1.7.9"',
+  currentVersion: '"1.8.1"',
 })

config/index.js

@@ -28,13 +28,13 @@ module.exports = {
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
     proxyTable: {
-      '/xcmg_file': {
-      target: 'http://lichee.iask.in',
-      changeOrigin: true,
-      pathRewrite: {
-        '^/xcmg_file': '/xcmg_file'
-      }
-    },
+    //   '/xcmg_file': {
+    //   target: 'http://lichee.iask.in',
+    //   changeOrigin: true,
+    //   pathRewrite: {
+    //     '^/xcmg_file': '/xcmg_file'
+    //   }
+    // },
   },
 
     // Various Dev Server settings

config/uat.env.js

@@ -11,5 +11,5 @@ module.exports = {
   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"',
-  currentVersion: '"1.3.2"'
+  currentVersion: '"1.3.3"'
 }

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

@@ -152,22 +152,22 @@
               <div slot="name" class="required">设备价值</div>
               <span slot="content">{{ saveInfo.equip_value }}</span>
             </item>
-            <item v-if="!fromPutted" class="check" @click.native="checkedMort=!checkedMort">
+            <item v-if="!fromPutted&&npFlag" 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">
+            <item v-if="fromPutted&&npFlag" 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">
+            <item v-if="!fromPutted" class="check" @click.native="checked=!checked">
               <div slot="name" class="required">农行代扣</div>
               <img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" >
               <span v-if="!checked" slot="content" />
             </item>
-            <item v-if="fromPutted&&showSpecialFlag&&project_status==='REJECT'" class="check">
+            <item v-if="fromPutted" class="check">
               <div slot="name" class="required">农行代扣</div>
               <img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" >
               <span v-if="!checked" slot="content" />
@@ -309,12 +309,12 @@
               <div slot="name" class="required">设备价值</div>
               <input slot="content" v-model="saveInfo.equip_value" placeholder="请选择" readonly >
             </item>
-            <item v-if="!fromPutted&&showSpecialFlag&&project_status==='REJECT'" class="check" @click.native="checked=!checked">
+            <item v-if="!fromPutted" class="check" @click.native="checked=!checked">
               <div slot="name">农行代扣</div>
               <img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" >
               <span v-if="!checked" slot="content" />
             </item>
-            <item v-if="fromPutted&&showSpecialFlag&&project_status==='REJECT'" class="check">
+            <item v-if="fromPutted" class="check">
               <div slot="name" class="required">农行代扣</div>
               <img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" >
               <span v-if="!checked" slot="content" />
@@ -398,6 +398,7 @@ export default {
       checked: false, // 农行代扣
       checkedApproved: false, // 是否特批
       checkedMort: false, // 是否抵押
+      npFlag: false,
       bp_class: '',
       showModalValue: false,
       showSpecialFlag: false,
@@ -526,12 +527,21 @@ export default {
       vm.bp_class = window.localStorage.bp_class_tenant
       vm.status = window.localStorage.contractReadonly
       vm.saveInfo['project_id'] = window.localStorage.project_id // 重新赋值，防止缓存
+      console.log('showSpecialFlag == ' + vm.showSpecialFlag)
+      console.log('project_status == ' + vm.project_status)
+      if (window.localStorage.bp_class === 'NP') {
+        vm.npFlag = true
+      } else {
+        vm.npFlag = false
+      }
       if (from.name === 'SalesInfo') {
         vm.salesEnter = 'SalesInfo'
         vm.fromPutted = false
         vm.checked = false // 农行代扣
         vm.checkedApproved = false // 是否特批
+        vm.showSpecialFlag = false
         vm.isClick = false
+
         Object.keys(vm.saveInfo).forEach(i => {
           if (
             i !== 'project_id' &&

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

@@ -73,29 +73,29 @@
       </div>
       <div class="userInfo">补充资料</div>
       <div class="house">
-        <p class="titles">抵押证书</p>
+        <p v-if="npFlag" class="titles">抵押证书</p>
         <!--抵押 待上传图片列表-->
         <div
           v-for="(item, index) in mort_upload_list"
-          v-if="item.check_id === mortId"
+          v-if="item.check_id === mortId && npFlag"
           :key="index+'info'"
           class="card-upload"
         >
           <img :src="item.picture" @click="showBigPicture(item.picture)" >
-          <div class="close" @click="remove_pic(item.attachment_id,index)">
+          <div class="close" @click="remove_pic(item.attachment_id,index,'mort')">
             <img src="@/assets/userBind/deleteIcon.png" >
           </div>
         </div>
         <!--抵押 下载的图片-->
-        <div v-for="(pic, index) in dowload_list" :key="index+'i'">
+        <div v-for="(pic, index) in dowload_list" v-if="npFlag" :key="index+'i'">
           <div v-if="pic.check_id===mortId" :key="index+'info1'" class="card-upload">
             <img :src="pic.url" @click="showBigPicture(pic.url)" >
-            <div class="close" @click="delete_pic(pic.attachment_id)">
+            <div class="close" @click="delete_pic(pic.attachment_id,'mort')">
               <img src="@/assets/userBind/deleteIcon.png" >
             </div>
           </div>
         </div>
-        <div v-if="!isReadOnly" class="card-upload plus" @click="ocrShow('抵押证书',checkId)">
+        <div v-if="!isReadOnly" class="card-upload plus" @click="ocrShow('抵押证书',mortId,'mort')">
           <img src="@/assets/userBind/camera.png" class="upload-btn" >
         </div>
       </div>
@@ -103,26 +103,26 @@
         <p class="titles">特批申请书</p>
         <!--待上传图片列表-->
         <div
-          v-for="(item, index) in upload_list"
+          v-for="(item, index) in spec_upload_list"
           v-if="item.check_id === checkId"
           :key="index+'info2'"
           class="card-upload"
         >
           <img :src="item.picture" @click="showBigPicture(item.picture)" >
-          <div class="close" @click="remove_pic(item.attachment_id,index)">
+          <div class="close" @click="remove_pic(item.attachment_id,index,'spec')">
             <img src="@/assets/userBind/deleteIcon.png" >
           </div>
         </div>
-        <!--从服务器上下载的图片-->
-        <div v-for="(pic, index) in dowload_list" :key="index+'info4'">
+        <!--特批 从服务器上下载的图片-->
+        <div v-for="(pic, index) in spec_dowload_list" :key="index+'info4'">
           <div v-if="pic.check_id==checkId" :key="index+'info3'" class="card-upload">
             <img :src="pic.url" @click="showBigPicture(pic.url)" >
-            <div class="close" @click="delete_pic(pic.attachment_id)">
+            <div class="close" @click="delete_pic(pic.attachment_id,'spec')">
               <img src="@/assets/userBind/deleteIcon.png" >
             </div>
           </div>
         </div>
-        <div v-if="!isReadOnly" class="card-upload plus" @click="ocrShow('特批申请书',checkId)">
+        <div v-if="!isReadOnly" class="card-upload plus" @click="ocrShow('特批申请书',checkId,'spec')">
           <img src="@/assets/userBind/camera.png" class="upload-btn" >
         </div>
       </div>
@@ -145,6 +145,8 @@ export default {
       upload_list: [],
       mort_upload_list: [], // 抵押上传数组
       mort_dowload_list: [],
+      spec_dowload_list: [], // 特批
+      spec_upload_list: [],
       dowload_list: [], // 下载图片列表
       idCardFrontCheck_id: '', // 承租人身份证正面
       idCardBackCheck_id: '', // 承租人身份证背面
@@ -152,6 +154,7 @@ export default {
       idCardBackUrlFlag: false,
       houseFlag: false,
       carFlag: false,
+      npFlag: false,
       licenseFlag: false,
       idCardFront: '', // 身份证图片
       idCardBack: '',
@@ -182,12 +185,19 @@ export default {
         vm.licenseImg = ''
         vm.upload_list = []
         vm.mort_upload_list = []
+        vm.spec_upload_list = []
         vm.dowload_list = []
         vm.mort_dowload_list = []
+        vm.spec_dowload_list = []
         vm.cddItemList = []
         vm.bpClass = window.localStorage.bp_class
         vm.status = window.localStorage.user_bp_status
         vm.fromPage = window.localStorage.fromPage
+        if (window.localStorage.bp_class === 'NP') {
+          vm.npFlag = true
+        } else {
+          vm.npFlag = false
+        }
         vm.loadItemList()
         vm.queryCheckId()
         vm.queryMortId()
@@ -282,8 +292,7 @@ export default {
               '&access_token=' +
               window.localStorage.access_token
           })
-          vm.dowload_list = res.lists
-          console.log('下载图片', vm.dowload_list)
+          vm.spec_dowload_list = res.lists
         }
       })
     },
@@ -296,27 +305,27 @@ export default {
       })
     },
     // ocr识别入口
-    ocrShow (desc, checkId) {
+    ocrShow (desc, id, code) {
       let vm = this
       hlsPopup.showActionSheet({
         titleText: '请选择照片',
         buttonArray: ['拍照', '从相册取'],
         callback: index => {
           if (index === 0) {
-            vm.openCamera(desc, checkId)
+            vm.openCamera(desc, id, code)
           } else {
-            vm.takePicture(desc, checkId)
+            vm.takePicture(desc, id, code)
           }
         },
       })
     },
-    openCamera (desc, checkId) {
+    openCamera (desc, id, code) {
       let vm = this
       let obj = {
-        'pkvalue': checkId,
+        'pkvalue': id,
         'source_type': 'PRJ_CDD_ITEM_CHECK',
         'picture': '',
-        'check_id': checkId,
+        'check_id': id,
         'filePath': '',
         'attachment_id': '',
         'user_id': 1,
@@ -331,14 +340,14 @@ export default {
         let list = []
         list.push(obj)
         // 拍完一张立马执行保存图片逻辑
-        vm.save_picture(list)
+        vm.save_picture(list, code)
       }
       let error = function () {
         hlsPopup.showLongCenter('请拍照')
       }
       hlsUtil.openCamera(cameraoptions, success, error)
     },
-    takePicture (desc, checkId) {
+    takePicture (desc, checkId, code) {
       let vm = this
       let cameraoptions = {
         quality: 100,
@@ -360,14 +369,14 @@ export default {
           obj.filePath = imgUrl[i]
           list.push(obj)
         }
-        vm.save_picture(list)
+        vm.save_picture(list, code)
       }
       let error = function () {
       }
       vm.hlsUtil.takePicture(cameraoptions, success, error)
     },
     // 图片保存
-    save_picture (list) {
+    save_picture (list, code) {
       let vm = this
       if (list.length) {
         // hlsPopup.showLoading('图片上传请稍候')
@@ -387,8 +396,13 @@ export default {
               for (var j = 0; j < list.length; j++) {
                 if (list[j].filePath === res.response.filePath) {
                   list[j].attachment_id = res.response.attachment_id
-                  vm.upload_list.push(list[j])
-                  break
+                  if (code === 'spec') {
+                    vm.spec_upload_list.push(list[j])
+                    break
+                  } else if (code === 'mort') {
+                    vm.mort_upload_list.push(list[j])
+                    break
+                  }
                 }
               }
             } else {
@@ -405,7 +419,7 @@ export default {
       }
     },
     // 移除图片
-    remove_pic (attachment_id, index) {
+    remove_pic (attachment_id, index, code) {
       let vm = this
       var delete_list = []
       let obj = {'attachment_id': attachment_id}
@@ -419,21 +433,26 @@ export default {
         hlsPopup.hideLoading()
         if (res.result === 'S') {
           hlsPopup.showLongCenter('删除成功!')
-          vm.remove_upload_list(attachment_id, index)
+          vm.remove_upload_list(attachment_id, index, code)
         } else if (res.result === 'E') {
           hlsPopup.showShortCenter(res.message)
         }
       })
     },
-    remove_upload_list (attachment_id, index) {
+    remove_upload_list (attachment_id, index, code) {
       let vm = this
-      vm.upload_list.remove(index)
-      vm.upload_list.sort()
+      if (code === 'spec') {
+        vm.spec_upload_list.remove(index)
+        vm.spec_upload_list.sort()
+      } else if (code === 'mort') {
+        vm.mort_upload_list.remove(index)
+        vm.mort_upload_list.sort()
+      }
     },
     // 删除图片
-    delete_pic (attachment_id) {
+    delete_pic (attachment_id, code) {
       let vm = this
-      var delete_list = []
+      let delete_list = []
       let obj = {'attachment_id': attachment_id}
       delete_list.push(obj)
       let url = process.env.basePath + 'app_delete_attment' // 附件删除
@@ -445,18 +464,24 @@ export default {
         hlsPopup.hideLoading()
         if (res.result === 'S') {
           hlsPopup.showLongCenter('删除成功!')
-          vm.remove_dowload_list(attachment_id)
+          vm.remove_dowload_list(attachment_id, code)
         } else if (res.result === 'E') {
           hlsPopup.showShortCenter(res.message)
         }
       })
     },
-    remove_dowload_list (attachment_id) {
+    remove_dowload_list (attachment_id, code) {
       console.log('attachment_id', attachment_id)
       let vm = this
-      vm.dowload_list = vm.dowload_list.filter(item => {
-        return item.attachment_id !== attachment_id
-      })
+      if (code === 'spec') {
+        vm.spec_dowload_list = vm.spec_dowload_list.filter(item => {
+          return item.attachment_id !== attachment_id
+        })
+      } else if (code === 'mort') {
+        vm.mort_dowload_list = vm.mort_dowload_list.filter(item => {
+          return item.attachment_id !== attachment_id
+        })
+      }
     },
     loadItemList () {
       let vm = this

src/pages/pwd-forgotten.vue

@@ -27,7 +27,7 @@
           <img slot="left-icon" src="../assets/login/passwordConfirm.png" class="left-icon">
           <div slot="name" class="required">设置密码</div>
           <input
-            slot="content" v-model="user_password" type="password" placeholder="请输入6~20位密码"
+            slot="content" v-model="user_password" type="password" placeholder="请输入6~20位非纯数字密码"
             maxlength="20" @blur="passwordCheck">
         </item>
         <item :proportion="[2,2]">

src/pages/regiester2.vue

@@ -31,7 +31,7 @@
             <input
               v-model="user_password"
               :type="pwdType"
-              placeholder="请输入6~20位密码"
+              placeholder="请输入6~20位非纯数字密码"
               maxlength="20"
               oninput="value=value.replace(/[\u4E00-\u9FA5]/g,'')"
 

www/index.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.813fb585b434370087b9bd24247694c0.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.9516a64f4eb2c109f0d8.js></script><script type=text/javascript src=./static/js/app.d1f3d6a5cac3e638d101.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.052b9171a88c6606acbe2f51d137bdaf.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.0d8bd95bc2f770a2a180.js></script><script type=text/javascript src=./static/js/app.cbd31b04915b1885518b.js></script></body></html>
\ No newline at end of file