财务管理-费用核对下面的一些页面修改

src/http/moudules/cost.js

@@ -127,6 +127,14 @@ export const receiveBatchNum= (id) => {
         method: "get",
     })
 }
+// 批量领取
+export const batchReceive= (data) => {
+    return axios({
+        url: "/api/inv/channelsExternalBillsDetails/batchReceive",
+        method: "post",
+        data
+    })
+}
 // 支付
 export const pay= (id) => {
     return axios({

src/views/FinancialManagement/CostVerification/BaoshiData.vue

@@ -1,7 +1,7 @@
 <template>
   <!--布局容器-->
   <div class="container" style="width: 99%; margin-top: 0px">
-    <templateTable :formList="formList" :searchData.sync="searchData" :tableConfig="tableConfig" :btnGroup="btnGroup"
+    <templateTable :formList="formList" :searchData.sync="searchData" :tableConfig="tableConfig" 
       :data="tableData" @getList="getList" @handleSearchList="handleSearchList" :pagination="queryBatchFrom">
       <template slot="excel导入" slot-scope="scope">
         <div style="display:inline-block;margin:0 5px">
@@ -12,24 +12,6 @@
         </div>
       </template>
       <template slot="operate" slot-scope="scope">
-        <!-- <div style="display: inline-block;">
-            <el-upload
-              class="upload"
-              ref="reUpload"
-              :show-file-list="false"
-              v-if="scope.row.importStatus == 0"
-              action="#"
-              :http-request="reCarfrontChange"
-              :multiple="false"
-            >
-              <el-button
-              style="margin-right:5px"
-                size="mini"
-                type="primary"
-                @click="reImportFun(scope.row)"
-              >重新导入</el-button>
-            </el-upload>
-          </div> -->
         <el-button size="mini" type="primary" @click="detailBatchFun(scope.row)">详情</el-button>
         <el-button
             v-if="scope.row.status == 0"
@@ -37,21 +19,6 @@
             type="primary"
             @click="mateFun(scope.row)"
           >匹配</el-button>
-          <!-- <el-button
-              size="mini"
-              type="primary"
-              @click="modifyFun(scope.row)"
-            >修改</el-button> -->
-        <!--   <el-button
-            size="mini"
-            type="primary"
-            @click="deleteFun(scope.row)"
-          >删除</el-button>
-          <el-button
-            size="mini"
-            type="primary"
-            @click="exportNum(scope.row)"
-          >导出</el-button> -->
       </template>
     </templateTable>
     <el-dialog v-dialogDrag title="修改" :visible.sync="dialogVisible" width="1200px" @close="closeVisible">
@@ -215,89 +182,90 @@
         class="demo-ruleForm"
         :inline="true"
         :model="mateform"
-        ref="userform"
-        label-width="160px"
+        :rules="mateRules"
+        ref="ruleForm"
+        label-width="170px"
       >
       <el-row>
           <el-col :span="12">
-            <el-form-item label="车牌号（保司）：">
+            <el-form-item label="车牌号（保司）：" prop="plateNum2">
               <el-input :disabled="true" v-model="mateform.plateNum2" size="small"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="车牌号（渠道）：">
+          <el-col :span="12" >
+            <el-form-item label="车牌号（渠道）："  prop="plateNum1">
               <el-input :disabled="true" v-model="mateform.plateNum1" size="small"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="商业保费（保司）：">
+            <el-form-item label="商业保费（保司）：" prop="cip2">
               <el-input :disabled="true" v-model="mateform.cip2" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="商业保费（渠道）：">
+            <el-form-item label="商业保费（渠道）：" prop="cip1">
               <el-input  v-model="mateform.cip1" size="small"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="交强保费（保司）：">
+            <el-form-item label="交强保费（保司）：" prop="mlifta2">
               <el-input :disabled="true" v-model="mateform.mlifta2" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="交强保费（渠道）：">
+            <el-form-item label="交强保费（渠道）：" prop="mlifta1">
               <el-input v-model="mateform.mlifta1" size="small"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="车船税保费（保司）：">
+            <el-form-item label="车船税保费（保司）：" prop="vavt2">
               <el-input :disabled="true" v-model="mateform.vavt2" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="车船税保费（渠道）：">
+            <el-form-item label="车船税保费（渠道）：" prop="vavt1">
               <el-input v-model="mateform.vavt1" size="small"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="商业费用（保司）：">
+            <el-form-item label="商业费用（保司）：" prop="cipCost2">
               <el-input :disabled="true" v-model="mateform.cipCost2" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="商业费用（渠道）：">
+            <el-form-item label="商业费用（渠道）：" prop="cipCost1">
               <el-input v-model="mateform.cipCost1" size="small"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="交强费用（保司）：">
+            <el-form-item label="交强费用（保司）：" prop="mliftaCost2">
               <el-input :disabled="true" v-model="mateform.mliftaCost2" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="交强费用（渠道）：">
+            <el-form-item label="交强费用（渠道）：" prop="mliftaCost1">
               <el-input v-model="mateform.mliftaCost1" size="small"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="车船税费用（保司）：">
+            <el-form-item label="车船税费用（保司）：" prop="vavtCost2">
               <el-input :disabled="true" v-model="mateform.vavtCost2" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="车船税费用（渠道）：">
+            <el-form-item label="车船税费用（渠道）：" prop="vavtCost1">
               <el-input v-model="mateform.vavtCost1" size="small"></el-input>
             </el-form-item>
           </el-col>
@@ -305,7 +273,7 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogBVatchUpdata = false">取消修改</el-button>
-        <el-button size="small" type="primary" @click="mateSave()">确定修改</el-button>
+        <el-button size="small" type="primary" @click="mateSave('ruleForm')">确定修改</el-button>
       </span>
     </el-dialog>
   </div>
@@ -413,7 +381,7 @@ export default {
       this.tableConfig.loading = true;
       this.$api.cost
         .getchanneQueryPageDetails({
-          ...this.queryBatchFrom, dto:data
+          ...this.queryBatchFrom, dto:{...data,classify:'保司'}
         })
         .then(res => {
           this.tableData = res.data.content;
@@ -529,12 +497,17 @@ export default {
     closdialogBVatchVisible(){
       this.dialogBVatch = false;
     },
-    mateSave(){
-      let obj={
+    mateSave(formName){
+      this.$refs[formName].validate((valid) => {
+          if (valid) {
+            let obj={
         cip:this.mateform.cip1,
         mlifta:this.mateform.mlifta1,
         vavt:this.mateform.vavt1,
-        id:this.mateform.id
+        id:this.mateform.id,
+        cipCost:this.mateform.mliftaCost1,
+        mliftaCost:this.mateform.mliftaCost1,
+        vavtCost:this.mateform.vavtCost1,
       }
       this.$api.cost
         .getchanneEdit(obj)
@@ -546,8 +519,29 @@ export default {
             });
             this.dialogBVatchUpdata = false;
             this.mate2(this.batchNumDetailId)
+            this.mate1(this.batchNumDetailId)
+          }
+          else{
+            this.$message.error(res.msg)
           }
         });
+          } else {
+            return false;
+          }
+        });
+    
+    },
+    confirmReceipt(){
+      this.$api.cost.batchReceive(this.batchNumDetailId).then(res => {
+        if (res.code == 200) {
+          this.dialogMateVisible=false
+          this.$message({
+              message: "领取成功",
+              type: "success"
+            });
+          this.getList();
+        }
+      });
     },
     tableCurrentmatch2Change(val) {
       this.matchPage2.pageNum = val;

src/views/FinancialManagement/CostVerification/Channel.vue

@@ -226,89 +226,90 @@
         class="demo-ruleForm"
         :inline="true"
         :model="mateform"
-        ref="userform"
-        label-width="160px"
+        :rules="mateRules"
+        ref="ruleForm"
+        label-width="170px"
       >
       <el-row>
           <el-col :span="12">
-            <el-form-item label="车牌号（保司）：">
+            <el-form-item label="车牌号（保司）：" prop="plateNum2">
               <el-input :disabled="true" v-model="mateform.plateNum2" size="small"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="车牌号（渠道）：">
+          <el-col :span="12" >
+            <el-form-item label="车牌号（渠道）："  prop="plateNum1">
               <el-input :disabled="true" v-model="mateform.plateNum1" size="small"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="商业保费（保司）：">
+            <el-form-item label="商业保费（保司）：" prop="cip2">
               <el-input :disabled="true" v-model="mateform.cip2" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="商业保费（渠道）：">
+            <el-form-item label="商业保费（渠道）：" prop="cip1">
               <el-input  v-model="mateform.cip1" size="small"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="交强保费（保司）：">
+            <el-form-item label="交强保费（保司）：" prop="mlifta2">
               <el-input :disabled="true" v-model="mateform.mlifta2" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="交强保费（渠道）：">
+            <el-form-item label="交强保费（渠道）：" prop="mlifta1">
               <el-input v-model="mateform.mlifta1" size="small"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="车船税保费（保司）：">
+            <el-form-item label="车船税保费（保司）：" prop="vavt2">
               <el-input :disabled="true" v-model="mateform.vavt2" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="车船税保费（渠道）：">
+            <el-form-item label="车船税保费（渠道）：" prop="vavt1">
               <el-input v-model="mateform.vavt1" size="small"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="商业费用（保司）：">
+            <el-form-item label="商业费用（保司）：" prop="cipCost2">
               <el-input :disabled="true" v-model="mateform.cipCost2" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="商业费用（渠道）：">
+            <el-form-item label="商业费用（渠道）：" prop="cipCost1">
               <el-input v-model="mateform.cipCost1" size="small"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="交强费用（保司）：">
+            <el-form-item label="交强费用（保司）：" prop="mliftaCost2">
               <el-input :disabled="true" v-model="mateform.mliftaCost2" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="交强费用（渠道）：">
+            <el-form-item label="交强费用（渠道）：" prop="mliftaCost1">
               <el-input v-model="mateform.mliftaCost1" size="small"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="车船税费用（保司）：">
+            <el-form-item label="车船税费用（保司）：" prop="vavtCost2">
               <el-input :disabled="true" v-model="mateform.vavtCost2" size="small"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="车船税费用（渠道）：">
+            <el-form-item label="车船税费用（渠道）：" prop="vavtCost1">
               <el-input v-model="mateform.vavtCost1" size="small"></el-input>
             </el-form-item>
           </el-col>
@@ -316,7 +317,7 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogBVatchUpdata = false">取消修改</el-button>
-        <el-button size="small" type="primary" @click="mateSave()">确定修改</el-button>
+        <el-button size="small" type="primary" @click="mateSave('ruleForm')">确定修改</el-button>
       </span>
     </el-dialog>
   </div>
@@ -433,7 +434,7 @@ export default {
       this.tableConfig.loading = true;
       this.$api.cost
         .getchanneQueryPageDetails({
-          ...this.queryBatchFrom, dto:data
+          ...this.queryBatchFrom, dto:{...data,classify:'渠道'}
         })
         .then(res => {
           this.tableData = res.data.content;
@@ -547,6 +548,18 @@ export default {
         }
       });
     },
+    confirmReceipt(){
+      this.$api.cost.batchReceive(this.batchNumDetailId).then(res => {
+        if (res.code == 200) {
+          this.dialogMateVisible=false
+          this.$message({
+              message: "领取成功",
+              type: "success"
+            });
+          this.getList();
+        }
+      });
+    },
     selectionChange(row){
       this.selectionIds=row
      
@@ -585,8 +598,10 @@ export default {
     closdialogBVatchVisible(){
       this.dialogBVatch = false;
     },
-    mateSave(){
-      let obj={
+    mateSave(formName){
+      this.$refs[formName].validate((valid) => {
+          if (valid) {
+            let obj={
         cip:this.mateform.cip1,
         mlifta:this.mateform.mlifta1,
         vavt:this.mateform.vavt1,
@@ -605,11 +620,17 @@ export default {
             });
             this.dialogBVatchUpdata = false;
             this.mate2(this.batchNumDetailId)
+            this.mate1(this.batchNumDetailId)
           }
           else{
             this.$message.error(res.msg)
           }
         });
+          } else {
+            return false;
+          }
+        });
+    
     },
     tableCurrentmatch2Change(val) {
       this.matchPage2.pageNum = val;

src/views/FinancialManagement/CostVerification/components/mixins.js

@@ -164,7 +164,6 @@ export const mixin = {
                         prop: "cip",
                         label: "商业保险费",
                         type: 'text',
-
                     },
                     {
                         name: "status",
@@ -206,7 +205,26 @@ export const mixin = {
                 click: () => {return this.batchMatching()}
             },
             ],
-
+            mateRules:{
+                  cip1: [
+                    { required: true, message: '请填写商业保费（渠道）', trigger: 'blur' }
+                  ],
+                  mlifta1: [
+                    { required: true, message: '请填写交强保费（渠道）', trigger: 'blur' }
+                  ],
+                  vavt1: [
+                    { required: true, message: '请填写车船税保费（渠道）', trigger: 'blur' }
+                  ],
+                  cipCost1: [
+                    { required: true, message: '请填写商业费用（渠道）', trigger: 'blur' }
+                  ],
+                  mliftaCost1: [
+                    { required: true, message: '请填写交强费用（渠道）', trigger: 'blur' }
+                  ],
+                  vavtCost1: [
+                    { required: true, message: '请填写车船税费用（渠道）', trigger: 'blur' }
+                  ],
+            }
         }
     },
     methods: {