fix：设备相关7字段，

从报价移动到设备合同处

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: '"3.7.3"'
+  currentVersion: '"3.8.9"'
 }

src/pages/contractStart/add-car.vue

@@ -90,15 +90,85 @@
                   placeholder="请输入开票日期"
                 >
               </item>
+              <item>
+                <div slot="name" >是否上牌</div>
+                <input
+                  slot="content"
+                  v-model="info.register_flag_n"
+                  readonly
+                  placeholder="请选择"
+                  @click="showPicker('register_flag')"
+                >
+              </item>
+              <item>
+                <div slot="name" >是否挂靠</div>
+                <input
+                  slot="content"
+                  v-model="info.associate_flag_n"
+                  readonly
+                  placeholder="请选择"
+                  @click="showPicker('associate_flag')"
+                >
+              </item>
+              <item>
+                <div slot="name" :class="info.associate_flag==='Y'?'required':''">挂靠单位全称</div>
+                <input
+                  slot="content"
+                  v-model="info.associate_company"
+                  placeholder="请输入"
+                >
+              </item>
+              <item>
+                <div slot="name" >是否提供挂靠协议</div>
+                <input
+                  slot="content"
+                  v-model="info.associate_agreement_n"
+                  readonly
+                  placeholder="请选择"
+                  @click="showPicker('associate_agreement')"
+                >
+              </item>
+              <item>
+                <div slot="name" >租赁物是否办理抵押</div>
+                <input
+                  slot="content"
+                  v-model="info.lease_mortgage_n"
+                  readonly
+                  placeholder="请选择"
+                  @click="showPicker('lease_mortgage')"
+                >
+              </item>
+              <item>
+                <div slot="name" class="required">GPS是否安装</div>
+                <input
+                  slot="content"
+                  v-model="info.gps_flag_n"
+                  readonly
+                  placeholder="请选择"
+                  @click="showPicker('gps_flag')"
+                >
+              </item>
+              <item>
+                <div slot="name" >设备是否购买保险</div>
+                <input
+                  slot="content"
+                  v-model="info.insurance_flag_n"
+                  readonly
+                  placeholder="请选择"
+                  @click="showPicker('insurance_flag')"
+                >
+              </item>
               <!-- <item :showArrow="true" @click.native="showModalValue=true">
                 <div slot="name">产品参数</div>
                 <input slot="content" v-model="info.bank_branch_name" placeholder="请选择产品参数" @click="changeHeight">
               </item>-->
             </list-item>
           </div>
+          <div class="add-card-button">
             <button v-if="!flag" @click="isSave">保存</button>
           </div>
         </div>
+      </div>
     </transition>
     <h-header :proportion="[5, 1, 1]" class="bar-custom">
       <div slot="left" class="h-header-btn" @click="$routeGo()" >
@@ -390,13 +460,19 @@
         </div>
       </div>
     </div>
+    <ActionSheet
+      v-model="picker_show" :actions="actions" :close-on-click-action="true" :closeable="false"
+      title="请选择" @select="onSelect" />
   </h-view>
 </template>
 <script>
 import Tab from '@/pages/carConfirm/tab'
+import { ActionSheet } from 'vant'
+import 'vant/lib/action-sheet/style'
 export default {
   components: {
     Tab,
+    ActionSheet,
   },
   filters: {
     lengthCheck: function (value) {
@@ -441,6 +517,19 @@ export default {
         certificate_number: '',
         departure_date: '',
         invoice_date: '',
+        register_flag_n: '',
+        register_flag_: '',
+        associate_flag_n: '',
+        associate_flag: '',
+        associate_company: '',
+        associate_agreement_n: '',
+        associate_agreement: '',
+        lease_mortgage_n: '',
+        lease_mortgage: '',
+        gps_flag_n: '',
+        gps_flag: '',
+        insurance_flag_n: '',
+        insurance_flag: '',
       },
       detail: {
         product_num: '',
@@ -463,6 +552,10 @@ export default {
       vehicleImg: '',
       vehicleImgUpload: '',
       generateContractFlag: false,
+      YesNoType: [], // 是否类型
+      now_nodeName: '', // 当前点击的名称
+      picker_show: false, // 选择面板控制
+      actions: [], // 选择组
     }
   },
   computed: {
@@ -505,6 +598,7 @@ export default {
         vm.read = true
         vm.getDetail()
         vm.getEquipment()
+        vm.getDropBox()
         if (
           vm.$route.query.car_start_status === 'REJECTED' ||
           vm.$route.query.car_start_status === 'NEW'
@@ -517,6 +611,35 @@ export default {
     })
   },
   methods: {
+    onSelect (value) {
+      let val = value.name
+      this.info[this.now_nodeName + '_n'] = val
+      let arr = this.YesNoType.filter(item => item.code_name === val)
+      this.info[this.now_nodeName] = arr[0].code
+    },
+    showPicker (flag, index) {
+      // console.log(this.flag);
+      if (this.flag) return
+      this.now_nodeName = flag
+      this.actions = this.YesNoType.map(item => ({name: item.code_name}))
+      this.picker_show = true
+    },
+    // 下拉框数据获取
+    async  getDropBox () {
+      let url = process.env.basePath + 'app_get_syscode'
+      let param = {
+        'YES_NO': 'YES_NO',
+
+      }
+
+      hlsPopup.showLoading('请稍候')
+      let res = await this.$post(url, param)
+      this.hlsPopup.hideLoading()
+      if (res.return_status === 'S') {
+        this.YesNoType = res.YES_NO
+      }
+    },
+
     // 同步电子签
     handSave () {
       // hlsPopup.showLongCenter('保存成功！')
@@ -934,6 +1057,10 @@ export default {
         hlsPopup.showLongCenter('请输入发车日期')
       } else if (!this.info.invoice_date) {
         hlsPopup.showLongCenter('请输入开票日期')
+      } else if (this.info.associate_flag === 'Y' && !this.info.associate_company) {
+        hlsPopup.showLongCenter('请输入挂靠单位全称')
+      } else if (!this.info.gps_flag) {
+        hlsPopup.showLongCenter('请选择gps是否安裝')
       } else {
         this.hlsPopup.showConfirm({
           title: '提示',
@@ -1387,6 +1514,7 @@ export default {
       z-index: 999;
       background-size: 301px 24.7px;
       background-color: #fff;
+      overflow-y: auto;
     }
     .top {
       width: 100%;
@@ -1440,6 +1568,15 @@ export default {
       background-color: #0041c4;
       border-radius: 4px;
     }
+    .add-card-button{
+      width:100%;
+      display: flex;
+      justify-content: center;
+      margin: 2vh 0;
+      button{
+        position: static;
+      }
+    }
   }
   .userInfo {
     height: 45px;