合并代码

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

@@ -123,14 +123,14 @@
           <div slot="name" class="required">产品数量</div>
           <input slot="content" v-model="saveInfo.product_num" :readonly="isReadOnly" placeholder="请输入产品数量">
         </item>
-        <!-- <item class="check" @click.native="saveInfo.if_sent_car=!saveInfo.if_sent_car">
+        <item class="check" @click.native="saveInfo.if_sent_car=!saveInfo.if_sent_car">
           <div slot="name" class="required">是否已发车</div>
           <img v-if="saveInfo.if_sent_car" slot="content" src="@/assets/contractCreate/selected.png" >
           <span v-if="!saveInfo.if_sent_car" slot="content" />
-        </item> -->
+        </item>
       </list-item>
-      <!-- <div v-if="saveInfo.if_sent_car">
-        <div class="userInfo" v-if="saveInfo.if_sent_car">租赁物信息<img v-if="!fromPutted" src="@/assets/contractCreate/add.png" @click="downNum=true;resetRent()"></div>
+      <div v-if="saveInfo.if_sent_car">
+        <div v-if="saveInfo.if_sent_car" class="userInfo">租赁物信息<img v-if="!fromPutted" src="@/assets/contractCreate/add.png" @click="downNum=true;resetRent()"></div>
         <item-option v-for="(item,index) in leaseList" ref="underTake" :key="index" class="mySlider">
           <list-item :item-height="68" @click.native="downNum=true;getRent(item.project_lease_item_id)">
             <item>
@@ -145,10 +145,10 @@
             </item>
           </list-item>
           <div slot="buttons">
-              <option-button type="delete" text @click.native="delete_release(item.project_lease_item_id,index)"></option-button>
+            <option-button type="delete" text @click.native="delete_release(item.project_lease_item_id,index)"/>
           </div>
         </item-option>
-      </div> -->
+      </div>
       <div class="userInfo">融资信息</div>
       <div class="hint-info">
         <img src="@/assets/contractCreate/hint.png">提示 以下为单个设备商务政策