Merge branch '202306_content' of...

Merge branch '202306_content' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into 202306_content

src/pages/carConfirm/batchSign.vue

@@ -116,14 +116,9 @@ 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 })) }
-<<<<<<< Updated upstream
-      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'
       param['bp_id'] = JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')).bp_id
->>>>>>> Stashed changes
       hlsPopup.showLoading('请稍候')
       let res = await this.$post(url, param)
       this.hlsPopup.hideLoading()