feat: 徐工初步开发

config/dev.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_DEV&apiName="',
   appId: '"com.xcmg.app.dev"',
-  currentVersion: '"3.5.9"'
+  currentVersion: '"3.6.6"'
 }

package.json

@@ -21,7 +21,7 @@
     "ionic-plugin-keyboard": "^2.2.1",
     "js-base64": "^2.5.1",
     "pdfjs-dist": "2.2.228",
-    "vant": "^2.12.54",
+    "vant": "2.10.11",
     "vue": "^2.5.2",
     "vue-router": "^3.0.1",
     "vuex": "^2.1.1",

src/pages/contractSigning/contract-signing.vue

@@ -27,7 +27,7 @@
           <div class="pro-code" @click="goDetails(item)">
             <img src="@/assets/distributorSign/fileIcon.png" alt class="file-icon" >
             <p>
-              <span>合同号</span>
+              <span>方案号</span>
               <span>{{ item.project_number }}</span>
             </p>
             <img v-if="item.read_check === 'N'" src="@/assets/constractSigning/unread.png" alt class="unread" >
@@ -54,11 +54,11 @@
                 <p>{{ item.bp_name }}</p>
               </div>
               <div>
-                <p>合同名称</p>
+                <p>方案名称</p>
                 <p>{{ item.project_name }}</p>
               </div>
               <div>
-                <p>合同租金</p>
+                <p>方案总租金</p>
                 <p class="money">{{ item.total_price | currency }}</p>
               </div>
               <div>

src/pages/financingApply/components/Appendix.vue

 <!-- 附件 -->
 <template>
   <div style="width: 100%;">
-    <p class="notice">tips：点击上传目录即可上传，点击文件即可下载。</p>
+    <p class="notice">tips：点击上传目录即可上传，点击文件即可下载或预览。</p>
 
     <div class="table-box">
       <table class="att_table">
@@ -38,9 +38,10 @@ export default {
       if (/.png|.jpg$/.test(attObj.fileName)) {
         this.showBigPicture(picUrl)
       } else {
+        console.log(hlsUtil.convertImageUrl(picUrl));
         window.open(hlsUtil.convertImageUrl(picUrl))
       }
-      console.log(attObj.attachId);
+      console.log(attObj);
     },
 
     // 上传窗口
@@ -80,7 +81,7 @@ export default {
             fileName: ''
           }]
 
-          save_file(list)
+          vm.save_file(list)
         }
       }
       let error = function () {
@@ -111,7 +112,7 @@ export default {
             fileName: ''
           }]
 
-          save_file(list)
+          vm.save_file(list)
         }
       }
       let error = function () {
@@ -123,6 +124,7 @@ export default {
     // 图片保存
     save_file(list) {
       let vm = this
+      let upView = vm.debounce(function () { vm.$emit("upData") }, 1500)
       if (list.length) {
         // hlsPopup.showLoading('图片上传请稍候')
         var alreadyUploadNum = 0
@@ -141,10 +143,10 @@ 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
                 }
               }
+              upView()
             } else {
               hlsPopup.hideLoading()
             }
@@ -164,6 +166,19 @@ export default {
       let vm = this
       vm.hlsPopup.showBigPicture({ imgUrl: picUrl, width: '100%', })
     },
+    debounce(func, wait) {
+      let timer;
+      return function () {
+        let context = this; // 注意 this 指向
+        let args = arguments; // arguments中存着e
+
+        if (timer) clearTimeout(timer);
+
+        timer = setTimeout(() => {
+          func.apply(this, args)
+        }, wait)
+      }
+    }
   }
 }
 </script>

src/pages/financingApply/financingApply-detail.vue

@@ -47,7 +47,7 @@
         <Partner :bplist="bplist"></Partner>
       </div>
       <div v-if="tabNum === 4" class="z100">
-        <Appendix :appendixData="appendixData"></Appendix>
+        <Appendix :appendixData="appendixData" @upData="getData"></Appendix>
         <div class="approveBottom">
           <span> 审批意见 </span>
           <textarea v-model="confirm_note" cols="8" rows="5" placeholder="请输入" />

src/router/index.js

@@ -107,8 +107,8 @@ const RepayPlan = resolve => require.ensure([], () => { resolve(require('@/pages
 const StartList = resolve => require.ensure([], () => { resolve(require('@/pages/contractStart/start-list')) }, 'contractStart')
 const AddCar = resolve => require.ensure([], () => { resolve(require('@/pages/contractStart/add-car')) }, 'contractStart')
 const financingApplyList = resolve => require.ensure([], () => { resolve(require('@/pages/financingApply/financingApply-list')) }, 'financingApply-list')
-const financingApplyDetail = resolve => require.ensure([], () => { resolve(require('@/pages/financingApply/financingApply-detail')) }, 'financingApply-list')
-const financingApplyFinancing = resolve => require.ensure([], () => { resolve(require('@/pages/financingApply/financingApply-financing')) }, 'financingApply-list')
+const financingApplyDetail = resolve => require.ensure([], () => { resolve(require('@/pages/financingApply/financingApply-detail')) }, 'financingApply-detail')
+const financingApplyFinancing = resolve => require.ensure([], () => { resolve(require('@/pages/financingApply/financingApply-financing')) }, 'financingApply-financing')
 
 // 合同签订
 const ConfirmDetail = resolve => require.ensure([], () => { resolve(require('@/pages/carConfirm/confirm-detail')) }, 'carConfirm')

yarn.lock

@@ -169,15 +169,10 @@
   resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24"
   integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==
 
-"@vant/icons@^1.7.1":
-  version "1.8.0"
-  resolved "https://registry.npmmirror.com/@vant/icons/-/icons-1.8.0.tgz#36b13f2e628b533f6523a93a168cf02f07056674"
-  integrity sha512-sKfEUo2/CkQFuERxvkuF6mGQZDKu3IQdj5rV9Fm0weJXtchDSSQ+zt8qPCNUEhh9Y8shy5PzxbvAfOOkCwlCXg==
-
-"@vant/popperjs@^1.1.0":
-  version "1.3.0"
-  resolved "https://registry.npmmirror.com/@vant/popperjs/-/popperjs-1.3.0.tgz#e0eff017124b5b2352ef3b36a6df06277f4400f2"
-  integrity sha512-hB+czUG+aHtjhaEmCJDuXOep0YTZjdlRR+4MSmIFnkCQIxJaXLQdSsR90XWvAI2yvKUI7TCGqR8pQg2RtvkMHw==
+"@vant/icons@1.3.2":
+  version "1.3.2"
+  resolved "https://registry.npmmirror.com/@vant/icons/-/icons-1.3.2.tgz#f0930010e7aaa9b06b03636fe9b5bc6477ea224b"
+  integrity sha512-uP0nUWw0pyMMGt3L9BO5fEacz/Cn7QIea0/gFoC/jPLv9ufvUxjPsV9HSyyUJsqMJ3qlYLAI/SxZDbmMZA814A==
 
 "@vue/babel-helper-vue-jsx-merge-props@^1.0.0":
   version "1.4.0"
@@ -8477,14 +8472,13 @@ vanilla-masker@^1.2.0:
   resolved "https://registry.yarnpkg.com/vanilla-masker/-/vanilla-masker-1.2.0.tgz#c2830e9d994a5fecd2261506477c2707fe589756"
   integrity sha1-woMOnZlKX+zSJhUGR3wnB/5Yl1Y=
 
-vant@^2.12.54:
-  version "2.12.54"
-  resolved "https://registry.npmmirror.com/vant/-/vant-2.12.54.tgz#0bc52d80414422987cdb9b7e7c101a66d3647d8d"
-  integrity sha512-t7DCiLxNosDrg0Jm5EY9p0A5cAMo5OadmizbYtPEc0ru+OJKEa3kcfxtKIK5on7ZPqoOkyYJt8e6BQ1VDMPsrg==
+vant@2.10.11:
+  version "2.10.11"
+  resolved "https://registry.npmmirror.com/vant/-/vant-2.10.11.tgz#150e0fcbed558e3aa799ebbada704eba9ef2e6b2"
+  integrity sha512-uhaFqQKeiyCCQZy3Tc2SRzLN5R7O+R6kV9KYsmf6TLcvBnNb7AkNyD12RIvdK2X7MNi/wEct842CQI+hmIqybw==
   dependencies:
     "@babel/runtime" "7.x"
-    "@vant/icons" "^1.7.1"
-    "@vant/popperjs" "^1.1.0"
+    "@vant/icons" "1.3.2"
     "@vue/babel-helper-vue-jsx-merge-props" "^1.0.0"
     vue-lazyload "1.2.3"