完善付款申请

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue

@@ -28,8 +28,8 @@
           </el-row>
           <el-row>
             <el-col :span="6">
-              <div class="span-sty">品牌</div>
+              <div class="span-sty"><span class="icon">*</span>品牌</div>
-              <el-form-item>
+              <el-form-item prop="carBrandName">
                 <el-select class="addinputInfo" v-model="formobj.carBrandName" filterable placeholder="请选择" @change="changeCarBrand" clearable>
                   <el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
                 </el-select>
@@ -53,7 +53,7 @@
             </el-col>
             <el-col :span="6">
               <div class="span-sty"><span class="icon">*</span>是否涉及车辆</div>
-              <el-form-item>
+              <el-form-item prop="isVeh">
                 <el-radio-group class="addinputInfo" v-model="formobj.isVeh">
                   <el-radio label="1">是</el-radio>
                   <el-radio label="0">否</el-radio>
@@ -63,8 +63,8 @@
           </el-row>
           <el-row>
             <el-col :span="8">
-              <div class="span-sty">付款单位</div>
+              <div class="span-sty"><span class="icon">*</span>付款单位</div>
-              <el-form-item>
+              <el-form-item prop="payCompany">
                 <el-select class="addinputInfo" v-model="formobj.payCompany" filterable placeholder="请选择" @change="changePayCompany" clearable>
                   <el-option v-for="item in payCompany_list" :key="item.companyInvoicingSid" :label="item.companyInvoicingName" :value="item.companyInvoicingName"/>
                 </el-select>
@@ -78,7 +78,7 @@
             </el-col>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>是否事业部领导审批</div>
-              <el-form-item>
+              <el-form-item prop="isLeaderSp">
                 <el-radio-group class="addinputInfo" v-model="formobj.isLeaderSp">
                   <el-radio label="1">是</el-radio>
                   <el-radio label="0">否</el-radio>
@@ -313,7 +313,12 @@ export default {
         detailsList: [],
         vehicleList: []
       },
-      rules: {},
+      rules: {
+        carBrandName: [{ required: true, message: '品牌不能为空', trigger: 'change' }],
+        isVeh: [{ required: true, message: '是否涉及车辆不能为空', trigger: 'change' }],
+        payCompany: [{ required: true, message: '付款单位不能为空', trigger: 'change' }],
+        isLeaderSp: [{ required: true, message: '是否事业部领导审批不能为空', trigger: 'change' }]
+      },
       paymentVisible: false, // 付款明细表 -- 新增付款信息弹框
       paymentBtn: false, // 付款明细表 -- 新增付款信息弹框 -- 页面按钮是否显示隐藏
       paymentInformation: { // 关联付款信息列表
@@ -657,9 +662,13 @@ export default {
       })
     },
     submitVehicleApply() {
-      if (this.formobj.isVeh === '') {
+      if (this.formobj.vehicleList.length > 0) {
-        this.$message({ showClose: true, type: 'error', message: '是否涉及车辆请选择是或否' })
+        for (var i = 0; i < this.formobj.vehicleList.length; i++) {
-        return
+          if (this.formobj.vehicleList[i].isSettle === '') {
+            this.$message({ showClose: true, type: 'error', message: '车辆列表中是否申请买断不能为空' })
+            return
+          }
+        }
       }
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue

@@ -28,7 +28,7 @@
           <el-row>
             <el-col :span="6">
               <div class="span-sty">品牌</div>
-              <el-form-item>
+              <el-form-item prop="carBrandName">
                 <el-select class="addinputInfo" v-model="formobj.carBrandName" filterable placeholder="请选择" @change="changeCarBrand" clearable>
                   <el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
                 </el-select>
@@ -52,7 +52,7 @@
             </el-col>
             <el-col :span="6">
               <div class="span-sty"><span class="icon">*</span>是否涉及车辆</div>
-              <el-form-item>
+              <el-form-item prop="isVeh">
                 <el-radio-group class="addinputInfo" v-model="formobj.isVeh">
                   <el-radio label="1">是</el-radio>
                   <el-radio label="0">否</el-radio>
@@ -62,8 +62,8 @@
           </el-row>
           <el-row>
             <el-col :span="8">
-              <div class="span-sty">付款单位</div>
+              <div class="span-sty"><span class="icon">*</span>付款单位</div>
-              <el-form-item>
+              <el-form-item prop="payCompany">
                 <el-select class="addinputInfo" v-model="formobj.payCompany" filterable placeholder="请选择" @change="changePayCompany" clearable>
                   <el-option v-for="item in payCompany_list" :key="item.companyInvoicingSid" :label="item.companyInvoicingName" :value="item.companyInvoicingName"/>
                 </el-select>
@@ -77,7 +77,7 @@
             </el-col>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>是否事业部领导审批</div>
-              <el-form-item>
+              <el-form-item prop="isLeaderSp">
                 <el-radio-group class="addinputInfo" v-model="formobj.isLeaderSp">
                   <el-radio label="1">是</el-radio>
                   <el-radio label="0">否</el-radio>
@@ -312,7 +312,12 @@ export default {
         detailsList: [],
         vehicleList: []
       },
-      rules: {},
+      rules: {
+        carBrandName: [{ required: true, message: '品牌不能为空', trigger: 'change' }],
+        isVeh: [{ required: true, message: '是否涉及车辆不能为空', trigger: 'change' }],
+        payCompany: [{ required: true, message: '付款单位不能为空', trigger: 'change' }],
+        isLeaderSp: [{ required: true, message: '是否事业部领导审批不能为空', trigger: 'change' }]
+      },
       paymentVisible: false, // 付款明细表 -- 新增付款信息弹框
       paymentBtn: false, // 付款明细表 -- 新增付款信息弹框 -- 页面按钮是否显示隐藏
       paymentInformation: { // 关联付款信息列表
@@ -655,9 +660,13 @@ export default {
       })
     },
     submitVehicleApply() {
-      if (this.formobj.isVeh === '') {
+      if (this.formobj.vehicleList.length > 0) {
-        this.$message({ showClose: true, type: 'error', message: '是否涉及车辆请选择是或否' })
+        for (var i = 0; i < this.formobj.vehicleList.length; i++) {
-        return
+          if (this.formobj.vehicleList[i].isSettle === '') {
+            this.$message({ showClose: true, type: 'error', message: '车辆列表中是否申请买断不能为空' })
+            return
+          }
+        }
       }
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {