'测试问题修复'

src/pages/carConfirm/confirm-detail.vue

@@ -80,7 +80,7 @@
           <input slot="content" v-model="info.bp_name" readonly placeholder="暂无数据" >
         </item>
         <item>
-          <div slot="name">产品线</div>
+          <div slot="name">产品名称</div>
           <input slot="content" v-model="info.division_n" readonly placeholder="暂无数据" >
         </item>
         <item>

src/pages/carConfirm/confirm-list.vue

@@ -8,7 +8,7 @@
     </h-header>
     <Tab @getTabNum="getTabNum" />
     <div class="search has-header">
-      <input v-model="keyWord" placeholder="请输入合同号/产品线/承租人名称" >
+      <input v-model="keyWord" placeholder="请输入合同号/产品名称/承租人名称" >
     </div>
     <scroll ref="scroll" :updateData="[showList]" :pullUp="true" @pullingUp="getList">
       <div v-for="(item,index) in showList" :key="index" class="item" @click="changePage(item)">
@@ -29,7 +29,7 @@
                 <span>{{ item.bp_name }}</span>
               </li>
               <li>
-                产品线
+                产品名称
                 <span>{{ item.division_n }}</span>
               </li>
               <li>

src/pages/contractInquire/repay-detail.vue

@@ -34,7 +34,7 @@
           <div slot="content">{{ detailInfo.bp_name }}</div>
         </item>
         <item>
-          <div slot="name">产品线</div>
+          <div slot="name">产品名称</div>
           <div slot="content">{{ detailInfo.division_n }}</div>
         </item>
         <item>

src/pages/contractRepayment/repay-details.vue

@@ -22,7 +22,7 @@
           <div slot="content">{{ detailInfo.bp_name }}</div>
         </item>
         <item>
-          <div slot="name">产品线</div>
+          <div slot="name">产品名称</div>
           <div slot="content">{{ detailInfo.division_n?detailInfo.division_n:"暂无数据" }}</div>
         </item>
         <item>

src/pages/contractSigning/contract-detail.vue

@@ -245,7 +245,7 @@
           <input slot="content" v-model="info.product_code" readonly >
         </item>
         <item>
-          <div slot="name" class="font-color">产品线</div>
+          <div slot="name" class="font-color">产品名称</div>
           <input slot="content" v-model="info.product_name" readonly >
         </item>
         <item>

src/pages/contractSigning/contract-signing.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-12-17 11:23:24
+ * @LastEditTime: 2019-12-19 11:11:37
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -40,7 +40,9 @@
           </div>
           <div class="box">
             <div><p>承租人</p><p>{{ item.bp_name }}</p></div>
+            <div><p>合同名称</p><p>{{ item.project_name }}</p></div>
             <div><p>合同租金</p><p class="money">{{ item.total_price|currency }}</p></div>
+            <div><p>产品名称</p><p>{{ item.division_n }}</p></div>
             <div><p>申请时间</p><p>{{ dateConverse(item.confirm_start_date) }}</p></div>
           </div>
         </div>
@@ -464,7 +466,7 @@ export default {
           }
         }
         .box {
-          height: 96px;
+          height: 156px;
           margin-left: 50px;
           margin-right: 19px;
           div {

src/pages/contractStart/add-car.vue

@@ -108,16 +108,16 @@
           >
         </item>
         <item v-if="!read" :showArrow="true">
-          <div slot="name">产品线</div>
+          <div slot="name">产品名称</div>
           <input
             slot="content"
             v-model="detail.division_n"
-            placeholder="请选择产品线"
+            placeholder="请选择产品名称"
             @click="selectProductLine"
           >
         </item>
         <item v-if="read">
-          <div slot="name">产品线</div>
+          <div slot="name">产品名称</div>
           <input slot="content" v-model="detail.division_n" readonly placeholder="暂无数据" >
         </item>
         <item>
@@ -184,7 +184,7 @@
               <img src="@/assets/contractStart/delete.png" @click="hideBox" >
             </div>
             <div class="bottom-top">
-              <input placeholder="请输入产品线" >
+              <input placeholder="请输入产品名称" >
               <img src="@/assets/contractStart/delete.png" >
               <input placeholder="请输入参数项" >
               <img src="@/assets/contractStart/delete.png" >
@@ -201,7 +201,7 @@
               <div class="right">
                 <ul>
                   <li>
-                    <span class="name">产品线</span>&ensp; &ensp; 挖掘机
+                    <span class="name">产品名称</span>&ensp; &ensp; 挖掘机
                     <span class="to-right">
                       <span class="name">产品种类</span>&ensp; &ensp; *****
                     </span>
@@ -423,7 +423,7 @@ export default {
       let url = process.env.ocrPath + '/baidu/ocr/vehicle_certificate'
       hlsUtil.baiduOcr(fileUrl, url, function (res) {
         hlsPopup.hideLoading()
-        console.log('$$$$$$$$$$$$$$$'+ JSON.stringify(res))
+        console.log('$$$$$$$$$$$$$$$' + JSON.stringify(res))
         let result = res.result.words_result
         vm.info.frame_number = result.VinNo // 车架号
         vm.info.engine = result.EngineNo // 发动机号

src/pages/contractStart/start-list.vue

@@ -8,7 +8,7 @@
     </h-header>
     <Tab @getTabNum="getTabNum" />
     <div class="search has-header">
-      <input v-model="keyWord" placeholder="请输入合同号/产品线/承租人名称" >
+      <input v-model="keyWord" placeholder="请输入合同号/产品名称/承租人名称" >
     </div>
     <scroll
       ref="scroll"
@@ -35,7 +35,7 @@
                 <span>{{ item.bp_name }}</span>
               </li>
               <li>
-                产品线
+                产品名称
                 <span>{{ item.division_n }}</span>
               </li>
               <li>

src/pages/distributorSign/contract-details.vue

@@ -131,7 +131,7 @@
           <input slot="content" v-model="info.product_code" readonly>
         </item>
         <item>
-          <div slot="name" class="font-color">产品线</div>
+          <div slot="name" class="font-color">产品名称</div>
           <input slot="content" v-model="info.product_name" readonly>
         </item>
         <item>

src/pages/distributorSign/contract-list.vue

@@ -38,7 +38,9 @@
           </div>
           <div class="box">
             <div><p>承租人</p><p>{{ item.bp_name }}</p></div>
+            <div><p>合同名称</p><p>{{ item.project_name }}</p></div>
             <div><p>合同租金</p><p class="money">{{ item.total_price|currency }}</p></div>
+            <div><p>产品名称</p><p>{{ item.division_n }}</p></div>
             <div><p>申请时间</p><p>{{ dateConverse(item.confirm_start_date) }}</p></div>
           </div>
         </div>
@@ -441,7 +443,7 @@ export default {
           }
         }
         .box {
-          height: 96px;
+          height: 156px;
           margin-left: 50px;
           margin-right: 19px;
           div {

src/pages/productQuery/product-list.vue

@@ -86,7 +86,7 @@ export default {
   },
   methods:
  {
-   // 根据产品线查询列表
+   // 根据产品名称查询列表
    proQuery () {
      let vm = this
      let url = $config.basePath + 'prd_product_list'

src/pages/productQuery/query-home.vue

@@ -15,7 +15,7 @@
     </h-header>
     <!-- 搜索 -->
     <div class="search has-header">
-      <input v-model="searchInput" type="text" placeholder="请输入产品类别/产品线">
+      <input v-model="searchInput" type="text" placeholder="请输入产品类别/产品名称">
     </div>
     <scroll
       ref="scrollLists"