lihongxiao 2 anos atrás
pai
commit
ba58fb3dd5

+ 2 - 2
config/dev.env.js

@@ -12,8 +12,8 @@ module.exports = merge(prodEnv, {
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
   // BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
-  BASE_URL: '"http:///192.168.0.253:8080/"',//田智
-  // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
+  // BASE_URL: '"http:///192.168.0.253:8080/"',//田智
+  BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http://192.168.1.101:8080/"',
   // BASE_URL: '"http:///192.168.0.22:8080/"',//郝宇
   // BASE_URL: '"http:///192.168.0.103:8080/"',//霍续亮

+ 65 - 14
src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/HandlingFees.vue

@@ -79,13 +79,48 @@
   :visible.sync="dialogVisibleBatch"
   width="35%"
   :before-close="handleCloseBatch">
-  <p >开票号 :<el-input style="width: 200px;" v-model="invoicId" placeholder="请输入开票号"></el-input></p>
-  <p >总手续费 :{{ batchData.totalAmount }}</p>
-  <el-upload style="margin-top:20px" action="#" class="upload-demo"  :limit="1" :auto-upload="false"
-        :on-change="drivingupload"  ref="upload3"  :file-list="fileList">
-        <el-button size="small" type="primary">点击上传</el-button>
-        <!-- <div slot="tip" class="el-upload__tip">只能上传jpg/png文件,且不超过500kb</div> -->
-  </el-upload>
+  <el-form :model="InvoicingData" :rules="rules" ref="InvoicingData" size="small" label-width="90px">
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="开票方式" prop="invoicingMethod">
+              <el-select v-model="InvoicingData.invoicingMethod" placeholder="请选择">
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="税点" prop="taxPoints">
+              <el-input v-model="InvoicingData.taxPoints"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" v-if="InvoicingData.invoicingMethod=='1'">
+            <el-form-item label="开票号" prop="invoicId">
+              <el-input v-model="InvoicingData.invoicId"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label=""  label-width="20px">
+            <span >总手续费 :{{ batchData.totalAmount }}</span>
+          </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="" label-width="20px">
+              <el-upload style="margin-top:20px" action="#" class="upload-demo"  :limit="1" :auto-upload="false"
+                :on-change="drivingupload"  ref="upload3"  :file-list="fileList">
+                <el-button size="small" type="primary">点击上传</el-button>
+              </el-upload>
+          </el-form-item>
+          </el-col>
+        
+        </el-row>
+      </el-form>
+  <!-- <p >开票号 :<el-input style="width: 200px;" v-model="invoicId" placeholder="请输入开票号"></el-input></p> -->
+
     <el-table
     v-if="batchData.resultList"
         border
@@ -130,11 +165,18 @@ export default {
   data() {
     return {
       dialogVisibleBatch:false,
+      InvoicingData:{},
+      options:[{
+        label: "保司开票",
+        value: "0",
+      },{
+        label: "掌柜开票",
+        value: "1",
+      }],
       fileList:[],
       formDataList:{},
       dialogVisible:false,
       formDataId:'',
-      invoicId:'',
       batchData:{},
       moneyList:{},
       searchData:{},
@@ -175,10 +217,6 @@ export default {
           label: "商业保单号",
           prop: "syPolicyno",
           type: "input",
-        }, {
-          label: "非车保单号:",
-          prop: "noPolicyno",
-          type: "input",
         },
         {
           label: "结算日期",
@@ -322,6 +360,10 @@ export default {
             label: "修改人",
             type: "text"
           },{
+          label: "对接人",
+          prop: "dockingPerson",
+          type: "text",
+        },{
             prop: "handlingFeesStatus",
             label: "结算状态",
             type: "statMap",
@@ -337,7 +379,7 @@ export default {
             }]
           }
         ],
-        operationWidth:'200',
+        operationWidth:'100',
         loading:true,
         isPaginationShow:true,
         isShowIndex: true,
@@ -429,7 +471,14 @@ export default {
       });
     },
     handleSumbit(){
-      this.$api.task.batchInvoicing( {ids:this.batchData.ids,invoicId:this.invoicId})
+      let data={
+        ...this.InvoicingData,
+        totalAmount:this.batchData.totalAmount,
+        agreementId:this.batchData.agreementId,
+        partnerCompaniesId:this.batchData.partnerCompaniesId,
+        companyId:this.batchData.companyId,
+      }
+      this.$api.task.batchInvoicing(data)
           .then(res => {
             if (res.code==200) {
               this.$message({
@@ -556,6 +605,8 @@ export default {
     balanceFunPro(){
       // this.assembly('batchInvoicing',2)
       this.fileList=[]
+      this.batchData={}
+      this.InvoicingData={}
       this.dialogVisibleBatch=true
     },
     templateDownload(){

+ 1 - 1
src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/InvoicingUnsettled.vue

@@ -186,7 +186,7 @@ export default {
         agreementType: '2',
         isNotCar: '0',
         isNotDocumentary : '0',
-        handlingFeesStatus:data.handlingFeesStatus
+        handlingFeesStatus:'0'
     })
     .then(res => {
         if (res.code==200) {

+ 61 - 8
src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/HandlingFees.vue

@@ -39,12 +39,46 @@
   :visible.sync="dialogVisibleBatch"
   width="30%"
   :before-close="handleCloseBatch">
-  <p >开票号 :<el-input style="width: 200px;" v-model="invoicId" placeholder="请输入开票号"></el-input></p>
-  <p >总手续费 :{{ batchData.totalAmount }}</p>
-  <el-upload style="margin-top:20px" action="#" class="upload-demo"  :limit="1" :auto-upload="false"
-        :on-change="drivingupload"  ref="upload3"  :file-list="fileList">
-        <el-button size="small" type="primary">点击上传</el-button>
-      </el-upload>
+  <el-form :model="InvoicingData" :rules="rules" ref="InvoicingData" size="small" label-width="90px">
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="开票方式" prop="invoicingMethod">
+              <el-select v-model="InvoicingData.invoicingMethod" placeholder="请选择">
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="税点" prop="taxPoints">
+              <el-input v-model="InvoicingData.taxPoints"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" v-if="InvoicingData.invoicingMethod=='1'">
+            <el-form-item label="开票号" prop="invoicId">
+              <el-input v-model="InvoicingData.invoicId"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label=""  label-width="20px">
+            <span >总手续费 :{{ batchData.totalAmount }}</span>
+          </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="" label-width="20px">
+              <el-upload style="margin-top:20px" action="#" class="upload-demo"  :limit="1" :auto-upload="false"
+                :on-change="drivingupload"  ref="upload3"  :file-list="fileList">
+                <el-button size="small" type="primary">点击上传</el-button>
+              </el-upload>
+          </el-form-item>
+          </el-col>
+        
+        </el-row>
+      </el-form>
       <el-table
       v-if="batchData.resultList"
         border
@@ -86,7 +120,14 @@ export default {
     return {
       moneyList:{},
       searchData:{},
-      invoicId:'',
+      InvoicingData:{},
+      options:[{
+        label: "保司开票",
+        value: "0",
+      },{
+        label: "掌柜开票",
+        value: "1",
+      }],
       formList:[
        {
           label: "车牌号",
@@ -291,6 +332,10 @@ export default {
             label: "修改人",
             type: "text"
           },{
+          label: "对接人",
+          prop: "dockingPerson",
+          type: "text",
+        },{
             prop: "handlingFeesStatus",
             label: "结算状态",
             type: "statMap",
@@ -516,7 +561,15 @@ export default {
       this.dialogVisibleBatch=true
   },
   handleSumbit(){
-      this.$api.task.batchInvoicing( {ids:this.batchData.ids,invoicId:this.invoicId})
+    let data={
+        ...this.InvoicingData,
+        totalAmount:this.batchData.totalAmount,
+        agreementId:this.batchData.agreementId,
+        partnerCompaniesId:this.batchData.partnerCompaniesId,
+        companyId:this.batchData.companyId,
+      }
+      // this.$api.task.batchInvoicing( {ids:this.batchData.ids,invoicId:this.invoicId})
+      this.$api.task.batchInvoicing( data)
           .then(res => {
             if (res.code==200) {
               this.$message({

+ 1 - 1
src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/InvoicingUnsettled.vue

@@ -175,7 +175,7 @@ export default {
                     agreementType: '2',
                     isNotCar: '0',
                     isNotDocumentary : '0',
-                    handlingFeesStatus:data.handlingFeesStatus
+                    handlingFeesStatus:'0'
                 })
                 .then(res => {
                     if (res.code == 200) {