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

src/pages/carConfirm/confirm-detail.vue

@@ -444,7 +444,7 @@ export default {
       let url = process.env.basePath + 'do_car_confirm'
       let param = {
         master: {
-          project_id: this.$route.params.project_id,
+          confirm_id: vm.confirm_id,
           confirm_status: 'APPROVED',
           confirm_note: '同意',
         },

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

@@ -7,7 +7,7 @@
       </div>
     </h-header>
     <h-content>
-      <div class="top">
+      <div v-if="!isReadOnly" class="top">
         <div class="item">
           <img src="@/assets/contractCreate/finished.png">
           <p>基本信息</p>
@@ -23,6 +23,22 @@
           <p>附件信息</p>
         </div>
       </div>
+      <div v-if="isReadOnly" class="top">
+        <div class="item">
+          <img src="@/assets/contractCreate/finished.png">
+          <p>基本信息</p>
+        </div>
+        <span class="line"/>
+        <div class="item">
+          <img src="@/assets/contractCreate/finished.png">
+          <p style="color: #383F45;">租赁信息</p>
+        </div>
+        <span class="line"/>
+        <div class="item">
+          <img src="@/assets/contractCreate/finished.png">
+          <p>附件信息</p>
+        </div>
+      </div>
       <div class="userInfo">租赁产品</div>
       <list-item :item-height="44">
         <item v-if="!isReadOnly" :showArrow="true" @click.native="selectProductLine">
@@ -368,6 +384,7 @@ export default {
       vm.divisionLists = []
       vm.pagenum = 1
       vm.pagenumPolicy = 1
+      vm.fromPage = window.localStorage.fromPage
       vm.saveInfo['project_id'] = window.localStorage.project_id // 重新赋值，防止缓存
       // vm.productInfo['project_id'] = window.localStorage.project_id // 重新赋值，防止缓存
       if (from.name === 'CreateBaseInfo') {

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

@@ -7,7 +7,7 @@
       </div>
     </h-header>
     <h-content>
-      <div class="top">
+      <div v-if="!fromPutted" class="top">
         <div class="item">
           <span>1</span>
           <p>基本信息</p>
@@ -23,6 +23,22 @@
           <p>附件信息</p>
         </div>
       </div>
+      <div v-if="fromPutted" class="top">
+        <div class="item">
+          <img src="@/assets/contractCreate/finished.png">
+          <p>基本信息</p>
+        </div>
+        <span class="line"/>
+        <div class="item">
+          <img src="@/assets/contractCreate/finished.png">
+          <p>租赁信息</p>
+        </div>
+        <span class="line"/>
+        <div class="item">
+          <img src="@/assets/contractCreate/finished.png">
+          <p>附件信息</p>
+        </div>
+      </div>
       <div class="create-content">
         <div v-if="bp_class==='NP'">
           <div class="userInfo">客户信息</div>
@@ -1028,6 +1044,9 @@ export default {
         color: #fff;
         background: #a4a4a4;
       }
+        img {
+          width: 18px;
+        }
       p {
         margin-top: 10px;
       }

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

@@ -19,7 +19,8 @@
         </div>
         <span class="line" />
         <div class="item">
-          <span>3</span>
+          <span v-if="!isReadOnly">3</span>
+          <img v-if="isReadOnly" src="@/assets/contractCreate/finished.png" >
           <p style="color: #383F45;">附件信息</p>
         </div>
       </div>
@@ -94,7 +95,7 @@
             </div>
           </div>
         </div>
-        <div class="card-upload plus" v-if="!isReadOnly" @click="ocrShow('特批申请书',checkId)">
+        <div v-if="!isReadOnly" class="card-upload plus" @click="ocrShow('特批申请书',checkId)">
           <img src="@/assets/userBind/camera.png" class="upload-btn" >
         </div>
       </div>

src/pages/contractCreate/sales-info.vue

@@ -86,7 +86,9 @@
         </item>
         <item @click.native="showTime('YYYY-MM-DD')">
           <div slot="name" class="font-color required">签约日期</div>
-          <input slot="content" v-model="salesInfo.sale_date" readonly>
+          <input
+            slot="content" v-model="salesInfo.sale_date"
+            readonly>
           <img src="@/assets/contractCreate/date.png" alt="" class="date-pic">
         </item>
       </list-item>
@@ -166,7 +168,7 @@ export default {
         office_id: '', // 办事处id
         factory: '', // 主机厂id
         manu_manager: '', // 办事处业务员
-        sale_date: '请选择',
+        sale_date: '请选择签约日期',
         project_id: '',
       },
     }