Merge branch 'liuin' into uat

src/pages/contractCreate/sales-info.vue

@@ -65,7 +65,6 @@
             type="text"
             readonly
             placeholder="请选择"
-            @click="selectFactory"
           >
         </item>
         <item>
@@ -179,20 +178,20 @@ export default {
     }
   },
   watch: {
-    'salesInfo.factory': {
-      handler (newVal, oldVal) {
-        this.factoty.forEach(i => {
-          if (i.bp_factory_id === this.salesInfo['factory']) {
-            this.inflow_line = i.inflow_line
-            this.inflow_used = i.inflow_used
-            this.inflow_reset = i.inflow_reset
-            this.salesInfo.credit_id = i.credit_id
-            window.localStorage.setItem('credit_id', i.credit_id)
-          }
-        })
-      },
-      immediate: true,
-    },
+    // 'salesInfo.factory': {
+    //   handler (newVal, oldVal) {
+    //     this.factoty.forEach(i => {
+    //       if (i.bp_factory_id === this.salesInfo['factory']) {
+    //         this.inflow_line = i.inflow_line
+    //         this.inflow_used = i.inflow_used
+    //         this.inflow_reset = i.inflow_reset
+    //         this.salesInfo.credit_id = i.credit_id
+    //         window.localStorage.setItem('credit_id', i.credit_id)
+    //       }
+    //     })
+    //   },
+    //   immediate: true,
+    // },
     // '$route' (to, from) {
     //   debugger
     //   if (from.fullPath !== '/contract-create-list' && to.fullPath === '/sales-info') {
@@ -236,8 +235,8 @@ export default {
         }
         vm.businessQuery().then(res => {
           vm.agentQuery().then(res => {
-            vm.factoryQuery().then(res => {
-            })
+            // vm.factoryQuery().then(res => {
+            // })
           })
         })
       } else if (from.name === 'CreateBaseInfo') {
@@ -344,18 +343,28 @@ export default {
       let vm = this
       let url = process.env.basePath + 'prj_factory_list'
       let param = {
+        office_id: vm.salesInfo.office_id,
         phone: window.localStorage.getItem('user_phone'),
       }
       vm.hlsPopup.showLoading('请稍候')
-      return vm.hlsHttp.post(url, param).then(function (res) {
+      vm.hlsHttp.post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
-        vm.factoty = res.lists
+        // vm.factoty = res.lists
         if (res.result === 'S') {
-          vm.factoryLists = res.lists.map(item => {
-            return {
-              code: item.bp_factory_id,
-              code_name: item.bp_factory_name,
-            }
+          // vm.factoryLists = res.lists.map(item => {
+          //   return {
+          //     code: item.bp_factory_id,
+          //     code_name: item.bp_factory_name,
+          //   }
+          // })
+          res.lists.forEach(i => {
+            vm.inflow_line = i.inflow_line
+            vm.inflow_used = i.inflow_used
+            vm.inflow_reset = i.inflow_reset
+            vm.salesInfo.factory = i.bp_factory_id
+            vm.salesInfo.credit_id = i.credit_id
+            vm.factory_name = i.bp_factory_name
+            window.localStorage.setItem('credit_id', i.credit_id)
           })
         }
       })
@@ -439,6 +448,7 @@ export default {
         returnItem: function (index, obj) {
           vm.salesInfo.office_id = obj.office_type
           vm.office_name = obj.office_type_n
+          vm.factoryQuery()
         },
       })
     },

src/pages/pay/firstPay/pay-entry.vue

@@ -97,7 +97,7 @@
       <div class="info">
         <div class="info-item">
           <span>还款金额</span>
-          <span>¥{{ parseFloat(money).toFixed(2) |currency }}</span>
+          <span>{{ parseFloat(money).toFixed(2) |currency }}</span>
         </div>
         <div class="interest">
           <span>本次交易收取{{ rate }}%手续费</span>