Merge remote-tracking branch 'origin/202306_content' into dev20230131_android

src/pages/carConfirm/batchSign.vue

@@ -43,10 +43,8 @@ export default {
   data () {
     return {
       prolists: [],
-      // title: this.$route.query.name === 'confirmList' ? '批量签署电子文件' : '批量签署电子文件',
-      // buttonName: this.$route.query.name === 'confirmList' ? '签署电子文件' : '签署电子文件',
-      title: this.$route.query.name === 'confirmList' ? '批量签署电子合同' : '批量签署征信授权书',
-      buttonName: this.$route.query.name === 'confirmList' ? '签署电子合同' : '签署征信授权',
+      title: this.$route.query.name === 'confirmList' ? '批量签署电子文件' : '批量签署电子文件',
+      buttonName: this.$route.query.name === 'confirmList' ? '签署电子文件' : '签署电子文件',
       list: JSON.parse(window.localStorage.getItem('handleContact')),
       checkList: [], // 需要进行签署的合同
 
@@ -65,9 +63,9 @@ export default {
         let url = process.env.basePath + 'batch_check_sign'
         let data_class = vm.$route.query.name === 'confirmList' ? 'LEASE_ITEM' : 'PRJ_CONFIRM'
         let param = { 'master': list.map(item => ({ confirm_id: item.confirm_id, data_class })) }
-        // let user_bp_type = JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')).bp_type
-        // console.log('~~~',user_bp_type === 'AGENT');
-        // if (user_bp_type === 'AGENT') param['content_type'] = 'PRODUCT_SALE_CONTRACT'
+        let user_bp_type = JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')).bp_type
+        console.log('~~~',user_bp_type === 'AGENT');
+        if (user_bp_type === 'AGENT') param['content_type'] = 'PRODUCT_SALE_CONTRACT'
         hlsPopup.showLoading('请稍候')
         let res = await vm.$post(url, param)
         vm.hlsPopup.hideLoading()
@@ -117,8 +115,8 @@ export default {
 
       let data_class = this.$route.query.name === 'confirmList' ? 'LEASE_ITEM' : 'PRJ_CONFIRM'
       let param = { 'master': this.list.map(item => ({ confirm_id: item.confirm_id, data_class })) }
-      // let user_bp_type = JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')).bp_type
-      // if (user_bp_type === 'AGENT') param['content_type'] = 'PRODUCT_SALE_CONTRACT'
+      let user_bp_type = JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')).bp_type
+      if (user_bp_type === 'AGENT') param['content_type'] = 'PRODUCT_SALE_CONTRACT'
       hlsPopup.showLoading('请稍候')
       let res = await this.$post(url, param)
       this.hlsPopup.hideLoading()
@@ -190,8 +188,8 @@ export default {
           bp_id: JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')).bp_id,
         },
       }
-      // let user_bp_type = JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')).bp_type
-      // if (user_bp_type === 'AGENT') param.master['content_type'] = 'PRODUCT_SALE_CONTRACT'
+      let user_bp_type = JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')).bp_type
+      if (user_bp_type === 'AGENT') param.master['content_type'] = 'PRODUCT_SALE_CONTRACT'
       hlsPopup.showLoading('请稍候')
       let res = await this.$post(url, param)
       this.hlsPopup.hideLoading()

src/pages/contractSigning/contract-signing.vue

@@ -82,8 +82,7 @@
           <span :style="{ color: chooseAll ? '#1d3fff' : 'rgb(212,214,212)' }">全选</span>
         </div>
         <button class="cancel" @click="cancelRadio">× 取消批量</button>
-        <!-- <button class="sign" @click="signContract">签订电子文件</button> -->
-        <button class="sign" @click="signContract">签订征信授权书</button>
+        <button class="sign" @click="signContract">签订电子文件</button>
       </div>
 
       <div v-show="num == 1 && !isRadio" class="button-box">