需求变更

config/uat.env.js

@@ -11,5 +11,5 @@ module.exports = {
   ocrPath:'"http://180.104.121.66:8088/r/api"',
   fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
   appId: '"com.xcmg.app.dev"',
-  currentVersion: '"2.8.9"'
+  currentVersion: '"2.9.0"'
 }

src/pages/contractStart/add-car.vue

@@ -106,7 +106,9 @@
         <span>合同明细</span>
       </div>
     </h-header>
+    <Tab :title="text" @getTabNum="getTabNum" />
     <h-content>
+      <div v-show="tabNum===0">
         <div class="userInfo">承租人信息</div>
         <list-item :item-height="44">
           <item v-if="!read" :showArrow="true">
@@ -309,9 +311,36 @@
             <img src="@/assets/contractStart/into.png" >
           </div>
         </div>
+      </div>
+      <div v-show="tabNum===1">
+        <list-item
+          :item-height="56"
+          class="contract-text"
+          style="background-color:rgb(250,250,250);"
+        >
+          <item v-for="(item,index) in attachArray" :proportion="[7,1]" :key="index">
+            <div slot="name" class="aguremrnt-list">
+              <img src="@/assets/constractSigning/npack.png" alt class="pics" >
+              <p class="second first">{{ item.attachment_file }}</p>
+              <img v-if="item.read_status === 'N'" class="unread" src="@/assets/constractSigning/unread.png" >
+              <img v-if="item.read_status === 'Y'" class="unread" src="@/assets/constractSigning/read.png" >
+              <div
+                v-if="item.template_code === 'PRE_ABC_PAYMENT'"
+                class="wrap-img"
+                @click="entryInfo"
+              >
+                <img src="@/assets/constractSigning/scan.png" >
+              </div>
+            </div>
+            <div slot="content" class="in-detail" @click="goContent(item,index)">
+              <img src="@/assets/constractSigning/detail.png" alt >
+            </div>
+          </item>
+        </list-item>
+      </div>
     </h-content>
     <bottom-tab v-if="!flag">
-      <!-- <tab-button class="save" @click.native="handSave">同步电子签</tab-button> -->
+      <tab-button class="save" @click.native="generateContract">生成合同文本</tab-button>
       <tab-button
         class="approve" @click.native="checkStatus"
       >融租合同创建</tab-button
@@ -364,7 +393,11 @@
   </h-view>
 </template>
 <script>
+import Tab from '@/pages/carConfirm/tab'
 export default {
+  components: {
+    Tab,
+  },
   filters: {
     lengthCheck: function (value) {
       if (value.toString().length === 1) {
@@ -390,7 +423,13 @@ export default {
       productLine: [],
       productPlan: [],
       contract: [],
+      tabNum: 0,
+      attachArray: [],
       agent: [],
+      text: {
+        first: '合同详情',
+        second: '合同文本',
+      },
       info: {
         contract_id: '',
         frame_number: '',
@@ -464,6 +503,7 @@ export default {
         vm.read = true
         vm.getDetail()
         vm.getEquipment()
+        vm.getAttachment()
         if (
           vm.$route.query.car_start_status === 'REJECTED' ||
           vm.$route.query.car_start_status === 'NEW'
@@ -495,6 +535,32 @@ export default {
         }
       })
     },
+    goContent (item, index) {
+      // 详情
+      // 合同状态更新保存
+      let vm = this
+      vm.attachFlag = true
+      vm.attachUrl = item.attachment_file_path
+      let url = process.env.basePath + 'prj_content_check_status_save'
+      let param = {
+        master: {
+          content_id: item.content_id,
+          check_status: 'Y',
+        },
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.hlsHttp.post(url, param).then(res => {
+        hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          let temp = vm.attachArray[index]
+          temp.read_status = 'Y'
+          vm.$router.push({name: 'previewPdf', params: {attachUrl: vm.attachUrl}})
+          vm.attachArray.splice(vm.attachArray[index], 1, temp)
+        } else {
+          vm.hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
     goPlan () {
       let vm = this
       vm.$router.push({
@@ -555,6 +621,9 @@ export default {
         },
       })
     },
+    getTabNum (i) {
+      this.tabNum = i
+    },
     // ocr识别入口
     ocrShow () {
       let vm = this
@@ -870,6 +939,42 @@ export default {
         })
       }
     },
+    generateContract () {
+      // 生成合同文本
+      let vm = this
+      let url = process.env.basePath + 'car_create_all_content'
+      let param = {
+        project_id: vm.project_id,
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.hlsHttp.post(url, param).then(res => {
+        hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          hlsPopup.showLongCenter('提交成功！')
+          vm.getAttachment()
+        } else {
+          vm.hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
+    // 合同文本详情附件查询
+    getAttachment () {
+      let vm = this
+      let url = process.env.basePath + 'get_content_app_agent'
+      let param = {
+        project_id: vm.project_id,
+        data_class: 'LEASE_ITEM',
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.hlsHttp.post(url, param).then(res => {
+        hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.attachArray = res.attachments
+        } else {
+          vm.hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
     checkStatus () {
       let mantained = this.equip.filter((i) => {
         return i.lease_status === 'N'
@@ -1116,6 +1221,111 @@ export default {
 </script>
 <style lang="less" scoped>
 #addCar {
+  .aguremrnt-list {
+    display: flex;
+    display: -webkit-flex;
+    align-items: center;
+    -webkit-align-items: center;
+    width: 100%;
+    height: 100%;
+    .unread {
+      width: 34px;
+      height: 20px;
+      margin: 0 10px;
+    }
+    .wrap-img {
+      width: 12%;
+      height: 100%;
+      display: flex;
+      display: -webkit-flex;
+      align-items: center;
+      -webkit-align-items: center;
+      justify-content: center;
+      -webkit-justify-content:center;
+      background: rgb(254, 251, 233);
+      img {
+        width: 22px;
+        height: 20px;
+      }
+    }
+    .pic {
+      margin-left: -3px;
+    }
+
+    .pics {
+      //    width: 21px;
+      height: 30px;
+    }
+
+    .read {
+      height: 16px;
+      margin-top: 8px;
+      margin-left: 6px;
+    }
+
+    .second {
+      font-family: PingFangSC-Regular;
+      font-size: 14px;
+      margin-left: 16px;
+      color: #383f45;
+      letter-spacing: 0.43px;
+    }
+
+    .first {
+      margin-left: 13px;
+      width: 60%;
+    }
+  }
+  .contract-text {
+    .border-red {
+      border: 2px solid rgba(255, 0, 0, 0.4);
+    }
+
+    .hls-item {
+      margin-top: 8px;
+      background-color: #fff;
+    }
+
+    .contents {
+      padding: 0;
+    }
+
+    .in-detail {
+      background-color: rgba(0, 70, 156, 0.08);
+      width: 48px;
+      height: 56px;
+      text-align: center;
+      line-height: 65px;
+
+      img {
+        width: 16px;
+      }
+    }
+
+    .in-all {
+      //width: 96px;
+      display: flex;
+
+      img {
+        width: 16px;
+      }
+
+      div {
+        width: 48px;
+        height: 56px;
+        text-align: center;
+        line-height: 65px;
+      }
+
+      div:first-child {
+        background-color: rgba(252, 200, 0, 0.1);
+      }
+
+      div:nth-child(2) {
+        background-color: rgba(0, 70, 156, 0.08);
+      }
+    }
+  }
   input::placeholder {
     color: #888c8f;
   }

src/pages/contractStart/start-list.vue

@@ -146,10 +146,6 @@ export default {
     },
     goAdd () {
       hlsPopup.showLongCenter('暂不支持无关联进件的车辆发送')
-
-      // this.$router.push({
-      //   name: 'AddCar',
-      // })
     },
     changePage (e) {
       this.$router.push({