Merge branch 'liuxin' into develop

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

@@ -322,6 +322,7 @@ export default {
       if (window.localStorage.contractReadonly === 'true' && this.fromPage === 'list') {
         return true
       } else {
+        debugger
         return false
       }
     },

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

@@ -276,6 +276,7 @@
           <img v-if="!fromPutted" src="@/assets/contractCreate/add.png" @click="addPerson">
         </div>
       </div>
+      <div v-if="!fromPutted" >
         <item-option v-for="(item,index) in selectUdertake" :key="index" class="mySlider">
           <list-item :item-height="68">
             <item>
@@ -285,7 +286,7 @@
                 <br >证件号
               </div>
               <div slot="content">
-              <input v-model="item.bp_name" placeholder="暂无信息" readonly >
+                <input v-model="item.bp_guta_name" placeholder="暂无信息" readonly >
                 <input v-model="item.id_card_no" placeholder="暂无信息" readonly >
               </div>
             </item>
@@ -294,6 +295,20 @@
             <option-button type="warn" text @click.native="deleteFun(item)" />
           </div>
         </item-option>
+      </div>
+      <list-item v-if="fromPutted" :item-height="68">
+        <item v-for="(item,index) in selectUdertake" :key="index">
+          <span slot="left-icon" class="left-icon">{{ index+1 }}</span>
+          <div slot="name">
+            担保人{{ index+1 }}姓名
+            <br >证件号
+          </div>
+          <div slot="content">
+            <input v-model="item.bp_guta_name" placeholder="暂无信息" readonly >
+            <input v-model="item.id_card_no" placeholder="暂无信息" readonly >
+          </div>
+        </item>
+      </list-item>
     </h-content>
     <bottom-tab class="add-box">
       <tab-button class="before" @click.native="$routeGo()">上一步</tab-button>
@@ -321,7 +336,7 @@ export default {
       bp_agent_id: '',
       pageNum: 1,
       pageNumSearch: 1,
-      status: window.localStorage.contractReadonly,
+      status: '', // 是否为已提交
       BussinessSituationList: [], // 行业情况
       jobSituationList: [], // 职业情况
       houseInfonList: [], // 房产信息
@@ -365,6 +380,26 @@ export default {
       },
       immediate: true,
     },
+    'saveInfo.abc_deduction_flag': {
+      handler (newVal, oldVal) {
+        if (newVal === 'N') {
+          this.checked = false
+        } else if (newVal === 'Y') {
+          this.checked = true
+        }
+      },
+      immediate: true,
+    },
+    'saveInfo.special_flag': {
+      handler (newVal, oldVal) {
+        if (newVal === 'N') {
+          this.checkedApproved = false
+        } else if (newVal === 'Y') {
+          this.checkedApproved = true
+        }
+      },
+      immediate: true,
+    },
     'checkedApproved': {
       handler (newVal, oldVal) {
         if (newVal === false) {
@@ -384,20 +419,21 @@ export default {
       vm.salesEnter = ''
       vm.saveTed = false
       vm.showModalValue = false
-      vm.checked = false // 农行代扣
-      vm.checkedApproved = false // 是否特批
       vm.pageNum = 1
       vm.pageNumSearch = 1
       vm.undertakeList = []
       vm.bp_class = window.localStorage.bp_class_tenant
+      vm.status = window.localStorage.contractReadonly
       vm.saveInfo['project_id'] = window.localStorage.project_id // 重新赋值，防止缓存
       if (from.name === 'SalesInfo') {
         vm.salesEnter = 'SalesInfo'
         vm.fromPutted = false
+        vm.checked = false // 农行代扣
+        vm.checkedApproved = false // 是否特批
         Object.keys(vm.saveInfo).forEach(i => {
           if (i !== 'project_id' && i !== 'bp_id' && i !== 'bp_class' && i !== 'abc_deduction_flag' && i !== 'special_flag') {
             vm.saveInfo[i] = ''
-          } else if (i === 'abc_deduction_flag' && i === 'special_flag') {
+          } else if (i === 'abc_deduction_flag' || i === 'special_flag') {
             vm.saveInfo[i] = 'N'
           } else if (i === 'bp_id') {
             vm.saveInfo[i] = window.localStorage.bp_id_tenant
@@ -823,7 +859,7 @@ export default {
     deleteFun (e) {
       let deleteIndex
       this.selectUdertake.forEach((i, index, arr) => {
-        if (arr[index].bp_name.indexOf(e.bp_name) !== -1) {
+        if (arr[index].bp_name.indexOf(e.bp_guta_name) !== -1) {
           deleteIndex = index
         }
       })

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

@@ -101,7 +101,7 @@
     </h-content>
     <bottom-tab class="add-box">
       <tab-button class="before" @click.native="handSave">保存</tab-button>
-      <tab-button class="next" @click.native="handleSubmit">提交</tab-button>
+      <tab-button class="next" @click.native="isSubmit">提交</tab-button>
     </bottom-tab>
   </h-view>
 </template>
@@ -500,23 +500,36 @@ export default {
     handSave () {
       hlsPopup.showLongCenter('保存成功！')
     },
+    isSubmit () {
+      let vm = this
+      this.hlsPopup.showConfirm({
+        title: '提示',
+        content: '您确定提交吗？',
+        onConfirm: data => {
+          if (data === 1) {
+            this.handleSubmit()
+          }
+        },
+      })
+    },
     // 项目提交审批
     handleSubmit () {
       let vm = this
       let url = process.env.basePath + 'prj_project_submit'
       let param = {
         project_id: window.localStorage.project_id,
-        phone:window.localStorage.getItem('user_phone'),
+        phone: window.localStorage.getItem('user_phone'),
       }
       vm.hlsPopup.showLoading('请稍候')
       vm.hlsHttp.post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
-        console.log('项目提交审批', res)
         if (res.result === 'S') {
+          vm.hlsPopup.showSuccess('提交成功')
           vm.$router.push({
-            name: 'MyInfo',
+            name: 'ContractCreateList',
           })
-          // vm.showLists = res.lists
+        } else {
+          vm.hlsPopup.showLongCenter(res.message)
         }
       })
     },

src/pages/contractStart/add-car.vue

@@ -472,11 +472,11 @@ export default {
       hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
-        if (res.result === 'S') {
+        if (res.code === '00') {
           vm.hlsPopup.showSuccess('保存成功')
-          vm.getEquipment()
           setTimeout(() => {
             vm.downNum = false
+            vm.getEquipment()
           }, 2000)
         } else {
           hlsPopup.showLongCenter(res.message)