解决冲突

src/pages/contractCreate/contract-create-list.vue

@@ -14,8 +14,8 @@
       </div>
     </h-header>
     <div class="tab-style has-header">
-      <div :class="{'done':num === 1,'undone':num !== 1}" @click="num = 1;"><img :src="num === 1?check1:uncheck1"><span>待签约</span></div>
-      <div :class="{'done':num === 2,'undone':num !== 2}" @click="num = 2;"><img :src="num === 2?check2:uncheck2"><span>已签约</span></div>
+      <div :class="{'done':num === 1,'undone':num !== 1}" @click="num = 1;"><img :src="num === 1?check1:uncheck1"><span>待提交</span></div>
+      <div :class="{'done':num === 2,'undone':num !== 2}" @click="num = 2;"><img :src="num === 2?check2:uncheck2"><span>已提交</span></div>
     </div>
     <!-- 搜索 -->
     <div class="search">
@@ -29,7 +29,7 @@
     >
       <div class="wrap">
         <div v-for="(item,index) in showLists" :key="index" class="contract-lists" >
-          <div class="pro-code">
+          <div class="pro-code" @click="changeBase">
             <img src="@/assets/distributorSign/fileIcon.png" alt="" class="file-icon">
             <p>
               <span>合同号</span>
@@ -338,8 +338,17 @@ export default {
         this.approvedearch()
       }
     },
-
-    changePage () {
+    changeBase () {
+      if (this.num === 1) {
+        window.localStorage.setItem('contractReadonly', false)
+      } else if (this.num === 2) {
+        window.localStorage.setItem('contractReadonly', true)
+      }
+      this.$router.push({
+        name: 'CreateBaseInfo',
+      })
+    },
+    goDetails () {
       this.$router.push({
         name: 'SalesInfo',
         params: {

src/pages/contractCreate/creat-rent-info.vue

@@ -304,14 +304,28 @@ export default {
       vm.pagenumSearch = 1
       vm.pagenumSearchPolicy = 1
       vm.policyKeyWord = ''
+      vm.keyWordProduct = ''
+      vm.businessLists = []
+      vm.divisionLists = []
+      vm.pagenum = 1
+      vm.pagenumPolicy = 1
       if (from.name === 'CreateBaseInfo') {
-        vm.businessLists = []
-        vm.pagenum = 1
-        vm.pagenumPolicy = 1
         vm.isComputed = false
-        vm.getProductLine() // 产品线查询
-        vm.repayPeriod()// 还款周期查询
-        vm.getPayWay()// 支付方式查询
+        Object.keys(vm.saveInfo).forEach(i => {
+          if (i !== 'project_id') {
+            vm.saveInfo[i] = ''
+          }
+        })
+        Object.keys(vm.productInfo).forEach(i => {
+          if (i !== 'project_id') {
+            vm.saveInfo[i] = ''
+          }
+        })
+        setTimeout(() => {
+          vm.getProductLine() // 产品线查询
+          vm.repayPeriod()// 还款周期查询
+          vm.getPayWay()// 支付方式查询
+        }, 0)
       }
     })
   },
@@ -336,6 +350,7 @@ export default {
       vm.saveInfo.int_rate = e.int_rate
       vm.saveInfo.int_rate_n = e.int_rate_n
       vm.saveInfo.penalty_rate_n = e.penalty_rate_n
+      vm.saveInfo.penalty_rate = e.penalty_rate
       vm.saveInfo.deposit_ratio = e.deposit_ratio
       vm.saveInfo.deposit_ratio_n = e.deposit_ratio_n
       setTimeout(() => {

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

@@ -281,6 +281,7 @@ export default {
       bp_agent_id: '',
       pageNum: 1,
       pageNumSearch: 1,
+      status: window.localStorage.contractReadonly,
       BussinessSituationList: [], // 行业情况
       jobSituationList: [], // 职业情况
       houseInfonList: [], // 房产信息
@@ -293,7 +294,7 @@ export default {
       ORGBaseInfo: {}, // 企业基本信息
       saveInfo: {// 需要保存的信息
         project_id: window.localStorage.project_id,
-        bp_id: window.localStorage.bp_id,
+        bp_id: window.localStorage.bp_id_tenant,
         bp_class: window.localStorage.bp_class,
         equip_num: '',
         equip_num_n: '',
@@ -344,8 +345,21 @@ export default {
       vm.showModalValue = false
       vm.pageNum = 1
       vm.pageNumSearch = 1
+      vm.undertakeList = []
       vm.bp_class = window.localStorage.bp_class
       if (from.name === 'SalesInfo') {
+        Object.keys(vm.saveInfo).forEach(i => {
+          if (i !== 'project_id' && i !== 'bp_id' && i !== 'bp_class' && i !== 'abc_deduction_flag' && i !== 'special_flag') {
+            vm.saveInfo[i] = ''
+          } else if (i === 'abc_deduction_flag' && i === 'special_flag') {
+            vm.saveInfo[i] = 'N'
+          }
+        })
+        vm.selectUdertake = []
+        setTimeout(() => {
+          vm.getBaseInfo()
+        }, 0)
+      } else if (from.name === 'SalesInfo' && !this.status) {
         vm.getBaseInfo()
       }
     })
@@ -447,7 +461,7 @@ export default {
       let randomString = Math.floor(Math.random() * 21)
       let url =
         process.env.basePath +
-        'car_confirm_list_query' +
+        'prj_bp_guta_query' +
         '&index' +
         `'${randomString}'`
       let param = {
@@ -487,7 +501,7 @@ export default {
       let randomString = Math.floor(Math.random() * 21)
       let url =
         process.env.basePath +
-        'car_confirm_list_query' +
+        'prj_bp_guta_query' +
         '&index' +
         `'${randomString}'`
       let param = {
@@ -526,7 +540,7 @@ export default {
       let vm = this
       let url = process.env.basePath + 'bp_np_info_query'
       let param = {
-        bp_id: window.localStorage.getItem('bp_id'),
+        bp_id: window.localStorage.getItem('bp_id_tenant'),
       }
       hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
@@ -542,7 +556,7 @@ export default {
       let vm = this
       let url = process.env.basePath + 'bp_org_info_query'
       let param = {
-        bp_id: window.localStorage.bp_id,
+        bp_id: window.localStorage.bp_id_tenant,
       }
       hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {

src/pages/contractCreate/sales-info.vue

@@ -426,6 +426,7 @@ export default {
       this.lessee = item.bp_name
       this.salesInfo.bp_id_tenant = item.bp_id
       this.showModal = false
+      window.localStorage.setItem('bp_id_tenant', this.salesInfo.bp_id_tenant)
     },
     hideModal () {
       this.showModal = false

src/pages/financingTrial/financing-details.vue

@@ -72,7 +72,7 @@
           <span v-if="equip_price" slot="content">{{ parseFloat(equip_price*info.down_payment_ratio_n.replace("%","")/100 + equip_price*info.deposit_ratio_n.replace("%","")/100 + (equip_price - equip_price*info.down_payment_ratio_n.replace("%","")/100)*(info.lease_charge_ratio_n.replace("%","")/100) + Number(gps_fee) + Number(insurance_fee)).toFixed(2) | currency }}</span>
         </item>
         <item @click.native="showTime('YYYY-MM-DD')">
-          <div slot="name" class="font-color">预计付款日</div>
+          <div slot="name" class="fo             nt-color">预计付款日</div>
           <div slot="content" class="autoColor">{{ price_date_to }}</div>
           <img src="@/assets/trial/date.png" alt="" class="date-pic">
         </item>