Merge remote-tracking branch 'origin/master'

anrui-riskcenter-ui/src/views/unsecuredbusiness/unsecuredbusinessAdd.vue

@@ -20,7 +20,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="8">
+          <el-col :span="12">
             <div class="span-sty">家访考察结果</div>
             <el-form-item>
               <el-select class="addinputInfo" v-model="formobj.homeVisitKey" @change="homeVisitChange" placeholder="请选择" clearable filterable>
@@ -28,8 +28,34 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="12">
-            <div v-show="formobj.isHavTrailer && formobj.homeVisitKey == '001'">
+            <div class="span-sty">家访考察日期</div>
+            <el-form-item>
+              <el-date-picker class="addinputInfo" v-model="formobj.homeVisitDate" type="date" clearable format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择日期"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-show="formobj.homeVisitKey == '001'">
+          <el-col :span="12">
+            <div class="span-sty">车辆登记在</div>
+            <el-form-item>
+              <el-radio-group class="addinputInfo" style="font-size: 1px" v-model="formobj.type">
+                <el-radio label="1">客户名下</el-radio>
+                <el-radio label="2">挂靠公司名下</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div v-show="formobj.type == '2'" class="span-sty">选择挂靠运输公司</div>
+            <el-form-item v-show="formobj.type == '2'">
+              <el-select v-model="formobj.affiliatedCompany" class="addinputInfo" filterable clearable placeholder="" @change="changeBusiness">
+                <el-option v-for="item in business_list" :key="item.taxpayerNo" :label="item.businessName" :value="item.businessName"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-show="formobj.isHavTrailer && formobj.homeVisitKey == '001'">
+          <el-col :span="24">
             <div class="span-sty">挂车是否公司开票</div>
             <el-form-item>
               <el-radio-group class="addinputInfo" style="font-size: 1px" v-model="formobj.isCompInvoic">
@@ -37,13 +63,6 @@
                 <el-radio label="1">否</el-radio>
               </el-radio-group>
             </el-form-item>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">家访考察日期</div>
-            <el-form-item>
-              <el-date-picker class="addinputInfo" v-model="formobj.homeVisitDate" type="date" clearable format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择日期"/>
-            </el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -127,7 +146,7 @@
 
 <script>
 import req from '@/api/unsecuredbusiness/unsecuredbusiness'
-import { typeValues } from '@/api/Common/dictcommons'
+import { selectInvoingByOrgPath, typeValues } from '@/api/Common/dictcommons'
 import uploadImg from '@/components/uploadFile/uploadImg'
 
 export default {
@@ -140,10 +159,13 @@ export default {
       viewTitle: '',
       submitdisabled: false,
       result_list: [],
+      business_list: [],
       image_list1: [],
       image_list2: [],
       image_list3: [],
       formobj: {
+        affiliatedCompany: '',
+        affiliatedCompanySid: '',
         salesOrderSid: '',
         salesman: '',
         borrowerName: '',
@@ -160,6 +182,7 @@ export default {
         isLoanDate: '',
         isCompInvoic: '',
         isHavTrailer: false,
+        type: '',
         homeVisitFiles: [],
         creditReviewFiles: [],
         loanReviewFiles: []
@@ -172,6 +195,11 @@ export default {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
+      selectInvoingByOrgPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
+        if (res.success) {
+          this.business_list = res.data
+        }
+      })
       req.fetchBySid({ salesOrderSid: sid }).then((resp) => {
         if (resp.success) {
           this.formobj = resp.data
@@ -231,7 +259,19 @@ export default {
         this.formobj.loanReview = ''
       }
     },
+    changeBusiness(value) {
+      const choose = this.business_list.filter((item) => item.businessName === value)
+      if (choose.length > 0) {
+        this.formobj.affiliatedCompanySid = choose[0].sid
+      } else {
+        this.formobj.affiliatedCompanySid = ''
+      }
+    },
     saveOrUpdate() {
+      if (this.formobj.homeVisitKey === '001' && this.formobj.type === '') {
+        this.$message({ showClose: true, type: 'error', message: '因家访结果为通过,车辆登记不能为空' })
+        return
+      }
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.getUrl()

anrui-riskcenter-ui/src/views/unsecuredbusiness/unsecuredbusinessInfo.vue

@@ -19,21 +19,34 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="8">
+          <el-col :span="12">
             <div class="span-sty">家访考察结果</div>
             <el-form-item><span class="addinputInfo">{{ formobj.homeVisit }}</span></el-form-item>
           </el-col>
-          <el-col :span="8">
+
-            <div v-show="formobj.isHavTrailer && formobj.homeVisitKey == '001'">
+          <el-col :span="12">
-              <div class="span-sty">挂车是否公司开票</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.isCompInvoic == '0' ? '是' : '否' }}</span></el-form-item>
-            </div>
-          </el-col>
-          <el-col :span="8">
             <div class="span-sty">家访考察日期</div>
             <el-form-item><span class="addinputInfo">{{ formobj.homeVisitDate }}</span></el-form-item>
           </el-col>
         </el-row>
+        <el-row v-show="formobj.homeVisitKey == '001'">
+          <el-col :span="12">
+            <div class="span-sty">车辆登记在</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.type == '1' ? '客户名下' : '挂靠公司名下' }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div v-show="formobj.type == '2'">
+              <div class="span-sty">挂靠运输公司</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.affiliatedCompany }}</span></el-form-item>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row v-show="formobj.isHavTrailer && formobj.homeVisitKey == '001'">
+          <el-col :span="24">
+            <div class="span-sty">挂车是否公司开票</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.isCompInvoic == '0' ? '是' : '否' }}</span></el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="12">
             <div class="span-sty">资方信审终审结果</div>