解决冲突

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/creat-rent-info.vue

@@ -26,23 +26,23 @@
       <div class="userInfo">租赁产品</div>
       <list-item :item-height="44">
         <item v-if="!isReadOnly" :showArrow="true" @click.native="selectProductLine">
-          <div slot="name">产品线</div>
+          <div slot="name" class="required">产品线</div>
           <input slot="content" v-model="saveInfo.division_n" readonly placeholder="请选择">
         </item>
         <item v-if="isReadOnly">
-          <div slot="name">产品线</div>
+          <div slot="name" class="required">产品线</div>
           <input slot="content" v-model="saveInfo.division_n" readonly>
         </item>
         <item v-if="!isReadOnly" :showArrow="true" @click.native="getProduct">
-          <div slot="name">产品型号</div>
+          <div slot="name" class="required">产品型号</div>
           <input slot="content" v-model="saveInfo.product_id_n" readonly placeholder="请选择">
         </item>
         <item v-if="isReadOnly">
-          <div slot="name">产品型号</div>
+          <div slot="name" class="required">产品型号</div>
           <input slot="content" v-model="saveInfo.product_id_n" readonly>
         </item>
         <item>
-          <div slot="name">产品数量</div>
+          <div slot="name" class="required">产品数量</div>
           <input slot="content" v-model="saveInfo.product_num" :readonly="isReadOnly" placeholder="请输入产品数量">
         </item>
       </list-item>
@@ -52,97 +52,97 @@
       </div>
       <list-item :item-height="44">
         <item v-if="!isReadOnly" :showArrow="true" @click.native="getBusinessPolicy();showModalBusiness=true">
-          <div slot="name">商务政策</div>
+          <div slot="name" class="required">商务政策</div>
           <input slot="content" v-model="saveInfo.product_plan_name" readonly placeholder="请选择">
         </item>
         <item v-if="isReadOnly">
-          <div slot="name">商务政策</div>
+          <div slot="name" class="required">商务政策</div>
           <input slot="content" v-model="saveInfo.product_plan_name" readonly placeholder="请选择">
         </item>
         <item>
-          <div slot="name">设备单价</div>
+          <div slot="name" class="required">设备单价</div>
           <CurrencyInput slot="content" v-model="saveInfo.equip_price" :readonly="isReadOnly" placeholder="请输入设备单价"/>
         </item>
         <item>
-          <div slot="name">融资金额</div>
+          <div slot="name" class="required">融资金额</div>
           <CurrencyInput slot="content" v-model="finance_amount" :readonly="isReadOnly" placeholder="请输入融资信息"/>
         </item>
         <item>
-          <div slot="name">首付比例</div>
+          <div slot="name" class="required">首付比例</div>
           <input slot="content" v-model="saveInfo.down_payment_ratio_n" :readonly="isReadOnly" placeholder="%">
         </item>
         <item>
-          <div slot="name">首付款</div>
+          <div slot="name" class="required">首付款</div>
           <CurrencyInput
             slot="content" v-model="saveInfo.down_payment" :readonly="isReadOnly" placeholder="请输入首付款"
             @input="changeRatio"/>
         </item>
         <item>
-          <div slot="name">保证金比例</div>
+          <div slot="name" class="required">保证金比例</div>
           <input slot="content" v-model="saveInfo.deposit_ratio_n" :readonly="isReadOnly" placeholder="%">
         </item>
         <item>
-          <div slot="name">保证金</div>
+          <div slot="name" class="required">保证金</div>
           <CurrencyInput
             slot="content" v-model="saveInfo.deposit" :readonly="isReadOnly" placeholder="请输入保证金"
             @input="changeDeposit"/>
         </item>
         <item>
-          <div slot="name">手续费比例</div>
+          <div slot="name" class="required">手续费比例</div>
           <input slot="content" v-model="saveInfo.lease_charge_ratio_n" :readonly="isReadOnly" placeholder="%">
         </item>
         <item>
-          <div slot="name">手续费</div>
+          <div slot="name" class="required">手续费</div>
           <CurrencyInput
             slot="content" v-model="saveInfo.lease_charge" :readonly="isReadOnly" placeholder="请输入手续费"
             @input="changeLeaseCharge"/>
         </item>
         <item>
-          <div slot="name">GPS费用</div>
+          <div slot="name" class="required">GPS费用</div>
           <CurrencyInput slot="content" v-model="saveInfo.gps_fee" :readonly="isReadOnly" placeholder="请输入GPS费用"/>
         </item>
         <item>
-          <div slot="name">保险押金</div>
+          <div slot="name" class="required">保险押金</div>
           <CurrencyInput slot="content" v-model="saveInfo.insurance_fee" :readonly="isReadOnly" placeholder="请输入保险押金"/>
         </item>
         <item v-if="!isReadOnly" class="date-check" @click.native="showTime('YYYY-MM-DD')">
-          <div slot="name">预计付款日</div>
+          <div slot="name" class="required">预计付款日</div>
           <input slot="content" v-model="saveInfo.lease_start_date" readonly placeholder="请选择日期 ">
         </item>
         <item v-if="isReadOnly" class="date-check">
-          <div slot="name">预计付款日</div>
+          <div slot="name" class="required">预计付款日</div>
           <input slot="content" v-model="saveInfo.lease_start_date" readonly>
         </item>
         <item v-if="!isReadOnly" :showArrow="true" @click.native="periodPull">
-          <div slot="name">还款周期</div>
+          <div slot="name" class="required">还款周期</div>
           <input slot="content" v-model="saveInfo.annual_pay_times_n" readonly placeholder="请选择">
         </item>
         <item v-if="isReadOnly">
-          <div slot="name">还款周期</div>
+          <div slot="name" class="required">还款周期</div>
           <input slot="content" v-model="saveInfo.annual_pay_times_n" readonly placeholder="请选择">
         </item>
         <item>
-          <div slot="name">租赁期数</div>
+          <div slot="name" class="required">租赁期数</div>
           <input slot="content" v-model="saveInfo.lease_times" :readonly="isReadOnly" placeholder="请输入租赁期数">
         </item>
         <item>
-          <div slot="name">年利率</div>
+          <div slot="name" class="required">年利率</div>
           <input slot="content" v-model="saveInfo.int_rate_n" readonly placeholder="%">
         </item>
         <item v-if="!isReadOnly" :showArrow="true" @click.native="selectPayWay">
-          <div slot="name">支付方式</div>
+          <div slot="name" class="required">支付方式</div>
           <input slot="content" v-model="saveInfo.pay_type_n" readonly placeholder="请选择">
         </item>
         <item v-if="isReadOnly">
-          <div slot="name">支付方式</div>
+          <div slot="name" class="required">支付方式</div>
           <input slot="content" v-model="saveInfo.pay_type_n" readonly placeholder="请选择">
         </item>
         <item>
-          <div slot="name">逾期日利率</div>
+          <div slot="name" class="required">逾期日利率</div>
           <input slot="content" v-model="saveInfo.penalty_rate_n" readonly placeholder="%">
         </item>
         <item>
-          <div slot="name">留购价</div>
+          <div slot="name" class="required">留购价</div>
           <CurrencyInput slot="content" v-model="saveInfo.residual_value" :readonly="isReadOnly" placeholder="请输入留购价"/>
         </item>
         <item :showArrow="true" @click.native="goPlan">
@@ -154,6 +154,7 @@
     <bottom-tab class="add-box">
       <tab-button v-if="!isReadOnly && !calculeFlag" class="before" @click.native="save">计算</tab-button>
       <tab-button v-if="!isReadOnly && calculeFlag" class="before" @click.native="save">重新计算</tab-button>
+      <tab-button v-if="isReadOnly" class="before" @click.native="$routeGo()">上一步</tab-button>
       <tab-button class="next" @click.native="next">下一步</tab-button>
     </bottom-tab>
     <h-modal ref="modal" v-model="showModalValue" class="flow" position="bottom">
@@ -262,6 +263,7 @@ export default {
       fromPage: window.localStorage.fromPage,
       keyWordProduct: '',
       policyKeyWord: '',
+      isReadOnly: false, // 是否只读
       fromPutted: false,
       fromList: false, // 判断是否从列表过来
       pagenum: 1, // 产品型号页码
@@ -319,13 +321,15 @@ export default {
     'finance_amount' () { // 融资金额
       return parseFloat(this.saveInfo.equip_price - this.saveInfo.equip_price * this.saveInfo.down_payment_ratio_n.replace('%', '') / 100).toFixed(2)
     },
-    isReadOnly () {
-      if (window.localStorage.contractReadonly === 'true' && this.fromPage === 'list') {
-        return true
-      } else {
-        return false
-      }
-    },
+    // isReadOnly () {
+    //   if (window.localStorage.contractReadonly === 'true' && this.fromPage === 'list') {
+    //     debugger
+    //     return true
+    //   } else {
+    //     debugger
+    //     return false
+    //   }
+    // },
   },
   watch: {
     policyKeyWord (newVal, oldVal) {
@@ -345,6 +349,9 @@ export default {
     'saveInfo.down_payment_ratio_n' (newVal, oldVal) {
       this.saveInfo.down_payment = (this.saveInfo.equip_price * newVal.replace('%', '') / 100).toFixed(2)
     },
+    // 'saveInfo.down_payment' (newVal, oldVal) {
+    //   this.saveInfo.down_payment_ratio_n = `${(newVal / this.saveInfo.equip_price * 100).toFixed(2)}%`
+    // },
     'saveInfo.lease_charge_ratio_n' (newVal, oldVal) {
       this.saveInfo.lease_charge = parseFloat((this.saveInfo.equip_price - this.saveInfo.equip_price * this.saveInfo.down_payment_ratio_n.replace('%', '') / 100) * (this.saveInfo.lease_charge_ratio_n.replace('%', '') / 100)).toFixed(2)
     },
@@ -372,7 +379,13 @@ export default {
         vm.saveTed = false
         if (vm.fromPage === 'sale') {
           vm.fromList = false
+          vm.isReadOnly = false
         } else if (vm.fromPage === 'list') {
+          if (window.localStorage.contractReadonly === 'true') {
+            vm.isReadOnly = true
+          } else {
+            vm.isReadOnly = false
+          }
           vm.fromList = true
           vm.rentInfoQuery()
         }
@@ -435,11 +448,9 @@ export default {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           Object.assign(vm.saveInfo, res.info)
-          /*  vm.productInfo.product_num = res.info.product_num
-              vm.productInfo.product_id = res.info.product_id
-              vm.productInfo.product_id_n = res.info.product_id_n */
           vm.saveInfo.product_plan_name = res.info.product_plan_id_n
           vm.saveInfo.division_n = res.info.product_name
+          vm.saveInfo.down_payment = res.info.down_payment
         } else {
           hlsPopup.showLongCenter(res.message)
         }
@@ -566,8 +577,31 @@ export default {
         }
       })
     },
+    isComputedCheck () {
+      let vm = this
+      let url = process.env.basePath + 'prj_product_cal_status'
+      let param = {
+        master: {
+          project_id: vm.saveInfo.product_id,
+        },
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          if (res.info.success_flag === 'Y') {
+            vm.isComputed = true
+          } else {
+            vm.isComputed = false
+          }
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
     next () {
       let vm = this
+      vm.isComputedCheck()
       if (vm.isReadOnly) {
         vm.$router.push({
           name: 'CreateEnclosureInfo',
@@ -884,7 +918,7 @@ export default {
       let randomString = Math.floor(Math.random() * 21)
       let url =
           process.env.basePath +
-          'prd_product_list' +
+          'prj_product_list' +
           '&index' +
           `'${randomString}'`
       let param = {

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

@@ -81,71 +81,87 @@
           </div>
           <list-item :item-height="44">
             <item v-if="!fromPutted" :showArrow="true">
-              <div slot="name">行业情况</div>
+              <div slot="name" class="required">行业情况</div>
               <input
-                slot="content" v-model="saveInfo.np_industry_exp_n" readonly placeholder="请选择"
-                @click="selectBussinessSituation" >
+                slot="content"
+                v-model="saveInfo.np_industry_exp_n"
+                readonly
+                placeholder="请选择"
+                @click="selectBussinessSituation"
+              >
             </item>
             <item v-if="fromPutted">
-              <div slot="name">行业情况</div>
+              <div slot="name" class="required">行业情况</div>
               <span slot="content">{{ saveInfo.np_industry_exp_n }}</span>
             </item>
-            <item v-if="!fromPutted" :showArrow="true" >
-              <div slot="name">职业情况</div>
+            <item v-if="!fromPutted" :showArrow="true">
+              <div slot="name" class="required">职业情况</div>
               <input
-                slot="content" v-model="saveInfo.np_occupation_n" readonly placeholder="请选择"
-                @click="selectJobSituation" >
+                slot="content"
+                v-model="saveInfo.np_occupation_n"
+                readonly
+                placeholder="请选择"
+                @click="selectJobSituation"
+              >
             </item>
             <item v-if="fromPutted">
-              <div slot="name">职业情况</div>
+              <div slot="name" class="required">职业情况</div>
               <span slot="content">{{ saveInfo.np_occupation_n }}</span>
             </item>
             <item v-if="!fromPutted" :showArrow="true">
-              <div slot="name">房产信息</div>
+              <div slot="name" class="required">房产信息</div>
               <input
-                slot="content" v-model="saveInfo.house_type_n" readonly placeholder="请选择"
-                @click="selectHouseInfo">
+                slot="content"
+                v-model="saveInfo.house_type_n"
+                readonly
+                placeholder="请选择"
+                @click="selectHouseInfo"
+              >
             </item>
             <item v-if="fromPutted">
-              <div slot="name">房产信息</div>
+              <div slot="name" class="required">房产信息</div>
               <span slot="content">{{ saveInfo.house_type_n }}</span>
             </item>
             <item v-if="!fromPutted" :showArrow="true">
-              <div slot="name">设备价值</div>
+              <div slot="name" class="required">设备价值</div>
               <input
-                slot="content" v-model="saveInfo.equip_value" placeholder="请选择" readonly
-                @click="selectEquipInfo">
+                slot="content"
+                v-model="saveInfo.equip_value"
+                placeholder="请选择"
+                readonly
+                @click="selectEquipInfo"
+              >
             </item>
             <item v-if="fromPutted">
-              <div slot="name">设备价值</div>
+              <div slot="name" class="required">设备价值</div>
               <span slot="content">{{ saveInfo.equip_value }}</span>
             </item>
             <item v-if="!fromPutted" class="check" @click.native="checked=!checked">
-              <div slot="name">农行代扣</div>
+              <div slot="name" class="required">农行代扣</div>
               <img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" >
               <span v-if="!checked" slot="content" />
             </item>
             <item v-if="fromPutted" class="check">
-              <div slot="name">农行代扣</div>
+              <div slot="name" class="required">农行代扣</div>
               <img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" >
               <span v-if="!checked" slot="content" />
             </item>
             <item v-if="!fromPutted" class="check" @click.native="checkedApproved=!checkedApproved">
-              <div slot="name">是否特批</div>
+              <div slot="name" class="required">是否特批</div>
               <img v-if="checkedApproved" slot="content" src="@/assets/contractCreate/selected.png" >
               <span v-if="!checkedApproved" slot="content" />
             </item>
             <item v-if="fromPutted" class="check">
-              <div slot="name">是否特批</div>
+              <div slot="name" class="required">是否特批</div>
               <img v-if="checkedApproved" slot="content" src="@/assets/contractCreate/selected.png" >
               <span v-if="!checkedApproved" slot="content" />
             </item>
             <item v-if="checkedApproved&&!fromPutted">
-              <div slot="name">特批事项</div>
-              <input slot="content" v-model="saveInfo.special_matter" placeholder="暂无信息">
+              <div slot="name" class="required">特批事项</div>
+              <input slot="content" v-model="saveInfo.special_matter" placeholder="暂无信息" >
             </item>
             <item v-if="checkedApproved&&fromPutted">
-              <div slot="name">特批事项</div>
+              <div slot="name" class="required">特批事项</div>
               <span slot="content">{{ saveInfo.special_matter }}</span>
             </item>
           </list-item>
@@ -159,15 +175,30 @@
             </item>
             <item>
               <div slot="name">企业类型</div>
-              <input slot="content" v-model="ORGBaseInfo.enterprise_type" readonly placeholder="暂无信息" >
+              <input
+                slot="content"
+                v-model="ORGBaseInfo.enterprise_type"
+                readonly
+                placeholder="暂无信息"
+              >
             </item>
             <item>
               <div slot="name">营业执照号</div>
-              <input slot="content" v-model="ORGBaseInfo.organization_code" readonly placeholder="暂无信息" >
+              <input
+                slot="content"
+                v-model="ORGBaseInfo.organization_code"
+                readonly
+                placeholder="暂无信息"
+              >
             </item>
             <item>
               <div slot="name">注册资本</div>
-              <input slot="content" v-model="ORGBaseInfo.registered_capital" placeholder="暂无信息" readonly >
+              <input
+                slot="content"
+                v-model="ORGBaseInfo.registered_capital"
+                placeholder="暂无信息"
+                readonly
+              >
             </item>
             <item>
               <div slot="name">注册地址</div>
@@ -198,7 +229,12 @@
             </item>
             <item>
               <div slot="name">联系地址</div>
-              <input slot="content" v-model="ORGBaseInfo.living_address" placeholder="暂无信息" readonly >
+              <input
+                slot="content"
+                v-model="ORGBaseInfo.living_address"
+                placeholder="暂无信息"
+                readonly
+              >
             </item>
           </list-item>
           <div class="another-info">
@@ -206,77 +242,83 @@
           </div>
           <list-item :item-height="44">
             <item v-if="!fromPutted" :showArrow="true" @click.native="selectORGEquipInfo">
-              <div slot="name">设备保有量</div>
+              <div slot="name" class="required">设备保有量</div>
               <input slot="content" v-model="saveInfo.equip_num_n" readonly placeholder="请选择" >
             </item>
             <item v-if="fromPutted" :showArrow="true">
-              <div slot="name">设备保有量</div>
+              <div slot="name" class="required">设备保有量</div>
               <input slot="content" v-model="saveInfo.equip_num_n" readonly placeholder="请选择" >
             </item>
             <item v-if="!fromPutted" :showArrow="true" @click.native="selectORGEnge">
-              <div slot="name">工程合同</div>
+              <div slot="name" class="required">工程合同</div>
               <input slot="content" v-model="saveInfo.engineer_con_n" readonly placeholder="请选择" >
             </item>
             <item v-if="fromPutted" :showArrow="true">
-              <div slot="name">工程合同</div>
+              <div slot="name" class="required">工程合同</div>
               <input slot="content" v-model="saveInfo.engineer_con_n" readonly placeholder="请选择" >
             </item>
             <item v-if="!fromPutted" :showArrow="true" @click.native="selectORGnative">
-              <div slot="name">企业性质</div>
-              <input slot="content" v-model="saveInfo.enterpriese_nature_n" readonly placeholder="请选择" >
-            </item>
-            <item v-if="fromPutted" :showArrow="true">
-              <div slot="name">企业性质</div>
-              <input slot="content" v-model="saveInfo.enterpriese_nature_n" readonly placeholder="请选择" >
-            </item>
-            <item v-if="!fromPutted" :showArrow="true" @click.native="selectEquipInfo">
-              <div slot="name">设备价值</div>
+              <div slot="name" class="required">企业性质</div>
               <input
-                slot="content" v-model="saveInfo.equip_value" placeholder="请选择" readonly
+                slot="content"
+                v-model="saveInfo.enterpriese_nature_n"
+                readonly
+                placeholder="请选择"
               >
             </item>
             <item v-if="fromPutted" :showArrow="true">
-              <div slot="name">设备价值</div>
+              <div slot="name" class="required">企业性质</div>
               <input
-                slot="content" v-model="saveInfo.equip_value" placeholder="请选择" readonly
+                slot="content"
+                v-model="saveInfo.enterpriese_nature_n"
+                readonly
+                placeholder="请选择"
               >
             </item>
+            <item v-if="!fromPutted" :showArrow="true" @click.native="selectEquipInfo">
+              <div slot="name" class="required">设备价值</div>
+              <input slot="content" v-model="saveInfo.equip_value" placeholder="请选择" readonly >
+            </item>
+            <item v-if="fromPutted" :showArrow="true">
+              <div slot="name" class="required">设备价值</div>
+              <input slot="content" v-model="saveInfo.equip_value" placeholder="请选择" readonly >
+            </item>
             <item v-if="!fromPutted" class="check" @click.native="checked=!checked">
               <div slot="name">农行代扣</div>
               <img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" >
               <span v-if="!checked" slot="content" />
             </item>
             <item v-if="fromPutted" class="check">
-              <div slot="name">农行代扣</div>
+              <div slot="name" class="required">农行代扣</div>
               <img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" >
               <span v-if="!checked" slot="content" />
             </item>
             <item v-if="!fromPutted" class="check" @click.native="checkedApproved=!checkedApproved">
-              <div slot="name">是否特批</div>
+              <div slot="name" class="required">是否特批</div>
               <img v-if="checkedApproved" slot="content" src="@/assets/contractCreate/selected.png" >
               <span v-if="!checkedApproved" slot="content" />
             </item>
             <item v-if="fromPutted" class="check">
-              <div slot="name">是否特批</div>
+              <div slot="name" class="required">是否特批</div>
               <img v-if="checkedApproved" slot="content" src="@/assets/contractCreate/selected.png" >
               <span v-if="!checkedApproved" slot="content" />
             </item>
             <item v-if="checkedApproved&&!fromPutted">
-              <div slot="name">特批事项</div>
-              <input slot="content" v-model="saveInfo.special_matter" placeholder="暂无信息">
+              <div slot="name" class="required">特批事项</div>
+              <input slot="content" v-model="saveInfo.special_matter" placeholder="暂无信息" >
             </item>
             <item v-if="checkedApproved&&fromPutted">
-              <div slot="name">特批事项</div>
-              <input slot="content" v-model="saveInfo.special_matter" readonly placeholder="暂无信息">
+              <div slot="name" class="required">特批事项</div>
+              <input slot="content" v-model="saveInfo.special_matter" readonly placeholder="暂无信息" >
             </item>
           </list-item>
         </div>
         <div class="another-info">
           <img src="@/assets/contractCreate/undertake.png" >担保人信息
-          <img v-if="!fromPutted" src="@/assets/contractCreate/add.png" @click="addPerson">
+          <img v-if="!fromPutted" src="@/assets/contractCreate/add.png" @click="addPerson" >
         </div>
       </div>
-      <div v-if="!fromPutted" >
+      <div v-if="!fromPutted">
         <item-option v-for="(item,index) in selectUdertake" :key="index" class="mySlider">
           <list-item :item-height="68">
             <item>
@@ -314,7 +356,7 @@
       <tab-button class="before" @click.native="$routeGo()">上一步</tab-button>
       <tab-button class="next" @click.native="save">下一步</tab-button>
     </bottom-tab>
-    <AddUnderTake ref="addperson" :bp_agent_id="bp_agent_id" @addUnder="addUnder"/>
+    <AddUnderTake ref="addperson" :bp_agent_id="bp_agent_id" @addUnder="addUnder" />
   </h-view>
 </template>
 <script>
@@ -346,7 +388,8 @@ export default {
       selectUdertake: [], // 已选择的担保人列表
       NPBaseInfo: {}, // 自然人基本信息
       ORGBaseInfo: {}, // 企业基本信息
-      saveInfo: {// 需要保存的信息
+      saveInfo: {
+        // 需要保存的信息
         project_id: window.localStorage.project_id,
         bp_id: '',
         bp_class: window.localStorage.bp_class_tenant,
@@ -370,7 +413,7 @@ export default {
     }
   },
   watch: {
-    'checked': {
+    checked: {
       handler (newVal, oldVal) {
         if (newVal === false) {
           this.saveInfo.abc_deduction_flag = 'N'
@@ -400,7 +443,7 @@ export default {
       },
       immediate: true,
     },
-    'checkedApproved': {
+    checkedApproved: {
       handler (newVal, oldVal) {
         if (newVal === false) {
           this.saveInfo.special_flag = 'N'
@@ -431,14 +474,20 @@ export default {
         vm.checked = false // 农行代扣
         vm.checkedApproved = false // 是否特批
         Object.keys(vm.saveInfo).forEach(i => {
-          if (i !== 'project_id' && i !== 'bp_id' && i !== 'bp_class' && i !== 'abc_deduction_flag' && i !== 'special_flag') {
+          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'
           } else if (i === 'bp_id') {
             vm.saveInfo[i] = window.localStorage.bp_id_tenant
           }
-        //  vm.saveInfo['project_id'] = window.localStorage.project_id // 重新赋值，防止缓存
+          //  vm.saveInfo['project_id'] = window.localStorage.project_id // 重新赋值，防止缓存
         })
         vm.selectUdertake = []
         setTimeout(() => {
@@ -464,8 +513,7 @@ export default {
       }
     })
   },
-  mounted () {
-  },
+  mounted () {},
   methods: {
     // 自定义返回逻辑：第一次新建时返回判断是否保存数据，未保存提示保存
     routeGoCustom () {
@@ -486,6 +534,26 @@ export default {
         vm.$routeGo()
       }
     },
+    deleteGuta (e) {
+      let vm = this
+      let url = process.env.basePath + 'prj_bp_guta_delete'
+      let param = {
+        master: {
+          project_id: window.localStorage.project_id,
+          bp_guta_id: e.bp_guta_id,
+        },
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          Object.assign(vm.saveInfo, res.info)
+          vm.selectUdertake = res.lists
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
     getSaveInfo () {
       let vm = this
       let url = process.env.basePath + 'prj_base_info_query'
@@ -505,7 +573,7 @@ export default {
     },
     addUnder (e) {
       let index = this.selectUdertake.findIndex(item => {
-        if (item.bp_name === e.bp_name) {
+        if (item.bp_guta_name === e.bp_guta_name) {
           return true
         }
       })
@@ -549,7 +617,7 @@ export default {
       let vm = this
       let url = process.env.basePath + 'prj_base_info_save'
       let param = {
-        master: {...vm.saveInfo, ...vm.makeData()},
+        master: { ...vm.saveInfo, ...vm.makeData() },
       }
       hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
@@ -604,7 +672,7 @@ export default {
         let url = process.env.basePath + 'prj_base_info_save'
         let isEmpty = vm.hasEmpty()
         let param = {
-          master: {...vm.saveInfo, ...vm.makeData()},
+          master: { ...vm.saveInfo, ...vm.makeData() },
         }
         if (isEmpty) {
           hlsPopup.showLoading('请稍候')
@@ -882,11 +950,12 @@ export default {
     deleteFun (e) {
       let deleteIndex
       this.selectUdertake.forEach((i, index, arr) => {
-        if (arr[index].bp_name.indexOf(e.bp_guta_name) !== -1) {
+        if (arr[index].bp_guta_name.indexOf(e.bp_guta_name) !== -1) {
           deleteIndex = index
         }
       })
       this.selectUdertake.splice(deleteIndex, 1)
+      this.deleteGuta(e)
     },
   },
 }
@@ -899,8 +968,8 @@ export default {
       no-repeat;
     background-size: 20px 20px;
   }
-  .mySlider{
-   height:68px;
+  .mySlider {
+    height: 68px;
   }
   .hls-list-item {
     margin-bottom: 0px !important;
@@ -990,14 +1059,14 @@ export default {
     color: @headerColor;
     display: flex;
     align-items: center;
-    img:nth-of-type(1){
+    img:nth-of-type(1) {
       margin-left: 16px;
       width: 19px;
       margin-right: 10px;
     }
-    img:nth-of-type(2){
-      margin-left:58%;
-      width:19px;
+    img:nth-of-type(2) {
+      margin-left: 58%;
+      width: 19px;
     }
   }
   .userInfo：first-of-type {

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,