解决冲突

src/pages/contractCreate/add-undertake.vue

@@ -16,7 +16,7 @@
             <br >证件号
           </div>
           <div slot="content">
-            <input v-model="item.bp_name" placeholder="暂无信息" readonly >
+            <input v-model="item.bp_guta_name" placeholder="暂无信息" readonly >
             <input v-model="item.id_card_no" placeholder="暂无信息" readonly >
           </div>
         </item>

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

@@ -522,11 +522,11 @@ export default {
       }
       vm.hlsPopup.showLoading('请稍候')
       vm.hlsHttp.post(url, param).then(function (res) {
-        vm.hlsPopup.hideLoading()
+        // vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.hlsPopup.showSuccess('提交成功')
           vm.$router.push({
-            name: 'ContractCreateList',
+            name: 'MyInfo',
           })
         } else {
           vm.hlsPopup.showLongCenter(res.message)

src/pages/contractCreate/sales-info.vue

@@ -16,11 +16,11 @@
     <h-content>
       <list-item :item-height="44" class="second-part">
         <item :showArrow="true" @click.native="picker">
-          <div slot="name" class="font-color">承租人</div>
+          <div slot="name" class="font-color required">承租人</div>
           <input slot="content" v-model="lessee" placeholder="请选择">
         </item>
         <item :showArrow="true">
-          <div slot="name" class="font-color">业务类型</div>
+          <div slot="name" class="font-color required">业务类型</div>
           <input
             slot="content"
             v-model="business"
@@ -31,12 +31,12 @@
           >
         </item>
         <item>
-          <div slot="name" class="font-color">经销商</div>
+          <div slot="name" class="font-color required">经销商</div>
           <input v-if="user_bp_type === 'AGENT'" slot="content" v-model="bp_agent_name" readonly>
           <input v-if="user_bp_type === 'OFFICE'" slot="content" placeholder="直销" readonly>
         </item>
         <item :showArrow="true">
-          <div slot="name" class="font-color">销售人员</div>
+          <div slot="name" class="font-color required">销售人员</div>
           <input
             slot="content"
             v-model="sales"
@@ -47,7 +47,7 @@
           >
         </item>
         <item :showArrow="true">
-          <div slot="name" class="font-color">办事处</div>
+          <div slot="name" class="font-color required">办事处</div>
           <input
             slot="content"
             v-model="office_name"
@@ -58,7 +58,7 @@
           >
         </item>
         <item :showArrow="true">
-          <div slot="name" class="font-color">主机厂</div>
+          <div slot="name" class="font-color required">主机厂</div>
           <input
             slot="content"
             v-model="factory_name"
@@ -69,23 +69,23 @@
           >
         </item>
         <item>
-          <div slot="name" class="font-color">主机厂业务员</div>
+          <div slot="name" class="font-color required">主机厂业务员</div>
           <input slot="content" v-model="salesInfo.manu_manager" placeholder="请输入业务员姓名">
         </item>
         <item v-if="user_bp_type === 'AGENT'">
-          <div slot="name" class="font-color">授信额度</div>
-          <CurrencyInput slot="content" v-model="inflow_line" :readonly="true" placeholder="授信额度"/>
+          <div slot="name" class="font-color required">授信额度</div>
+          <CurrencyInput slot="content" v-model="inflow_line" readonly placeholder="授信额度"/>
         </item>
         <item v-if="user_bp_type === 'AGENT'">
-          <div slot="name" class="font-color">已使用授信额度</div>
-          <CurrencyInput slot="content" v-model="inflow_used" :readonly="true" placeholder="已使用授信额度"/>
+          <div slot="name" class="font-color required">已使用授信额度</div>
+          <CurrencyInput slot="content" v-model="inflow_used" readonly placeholder="已使用授信额度"/>
         </item>
         <item v-if="user_bp_type === 'AGENT'">
-          <div slot="name" class="font-color">剩余授信额度</div>
-          <CurrencyInput slot="content" v-model="inflow_reset" :readonly="true" placeholder="剩余授信额度"/>
+          <div slot="name" class="font-color required">剩余授信额度</div>
+          <CurrencyInput slot="content" v-model="inflow_reset" readonly placeholder="剩余授信额度"/>
         </item>
         <item @click.native="showTime('YYYY-MM-DD')">
-          <div slot="name" class="font-color">签约日期</div>
+          <div slot="name" class="font-color required">签约日期</div>
           <input slot="content" v-model="salesInfo.sale_date" readonly>
           <img src="@/assets/contractCreate/date.png" alt="" class="date-pic">
         </item>
@@ -132,7 +132,7 @@
 </template>
 
 <script>
-  import CurrencyInput from '../../components/currencyInput'
+import CurrencyInput from '../../components/currencyInput'
 export default {
   components: {
     CurrencyInput,