lihongxiao 2 jaren geleden
bovenliggende
commit
7c06e7da8b

+ 2 - 2
config/dev.env.js

@@ -8,12 +8,12 @@ module.exports = merge(prodEnv, {
 
   ENV_CONFIG:'"dev"',
   // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
-  BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
+  // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // 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.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/"',

+ 3 - 0
src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/InvoicingUnsettled.vue

@@ -110,6 +110,9 @@ export default {
         {
             type:'primary',
             label:'作废',
+            hide: (row) => {
+                return row.readyCommissionFeevalue ? true : false
+            },
             click:(row, index) => {return this.handVoid(row)},
         },
       ]

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

@@ -2,58 +2,51 @@
     <!--布局容器-->
     <div class="InvoicedAndSettled" style="width: 99%; margin-top: 0px">
         <templateTable :formList="formList" :searchData.sync="searchData" :tableConfig="tableConfig" :data="tableData"
-            @findPage="findPage" @handleSearchList="handleSearchList"  @resetForm="resetForm" :pagination="pageData" @getList="getList">
+            @findPage="findPage" @handleSearchList="handleSearchList" @resetForm="resetForm" :pagination="pageData"
+            @getList="getList">
             <template slot="data">
                 <yearMonthYay ref="yearMonthYay" @getYearData="getYearData" @getMonthData="getMonthData"
                     @getDayData="getDayData"></yearMonthYay>
             </template>
             <template slot="保司机构">
-        <el-cascader v-model="pageData.partnerCompaniesIdList" size="small" :show-all-levels="false" ize="small"
-          :options="ztreeNodes" :props='{
-            checkStrictly: true,
-            value: "id",
-            label: "name",
-            children: "children",
-        }' clearable filterable></el-cascader>
-      </template>
+                <el-cascader v-model="pageData.partnerCompaniesIdList" size="small" :show-all-levels="false" ize="small"
+                    :options="ztreeNodes" :props='{
+                        checkStrictly: true,
+                        value: "id",
+                        label: "name",
+                        children: "children",
+                    }' clearable filterable></el-cascader>
+            </template>
         </templateTable>
         <el-dialog title="详情" :visible.sync="dialogVisible" width="80%" :before-close="handleClose">
-            <templateTable ref="templateTable" :formList="formList1" @handleSearchList="handleSearchList1" :tableConfig="tableConfigDetail" :data="formTableData"
-                @findPage="findPageDetail">
+            <templateTable ref="templateTable" :formList="formList1" @handleSearchList="handleSearchList1"
+                :tableConfig="tableConfigDetail" :data="formTableData" @findPage="findPageDetail">
             </templateTable>
             <span slot="footer" class="dialog-footer">
                 <el-button size="small" @click="dialogVisible = false">取消</el-button>
             </span>
         </el-dialog>
-        <el-dialog
-      title="结算"
-      :visible.sync="dialogVisiblebalance"
-      width="20%"
-      :before-close="handleClosebalance">
-      <el-form ref="form" :model="form" label-width="85px">
-        <el-form-item label="进账金额:">
-          <el-input v-model="form.settlementAmount" style="width:220px"></el-input>
-        </el-form-item>
-        <el-form-item label="进账日期:">
-          <el-date-picker
-            v-model="form.settlementTime"
-            type="date"
-            placeholder="选择日期"
-            value-format="yyyy-MM-dd">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="上传凭证:" >
-              <el-upload  action="#" class="upload-demo"  :limit="1" :auto-upload="false"
-                :on-change="drivingupload"  ref="upload3"  accept=".png, .jpg, .jpeg" :file-list="fileList">
-                <el-button size="small" type="primary">点击上传</el-button>
-              </el-upload>
-          </el-form-item>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-      <el-button  size="small" @click="dialogVisiblebalance = false">取消</el-button>
-      <el-button type="primary" size="small" @click="balanceSumbit">确实</el-button>
-    </span>
-  </el-dialog>
+        <el-dialog title="结算" :visible.sync="dialogVisiblebalance" width="20%" :before-close="handleClosebalance">
+            <el-form ref="form" :model="form" label-width="85px">
+                <el-form-item label="进账金额:">
+                    <el-input v-model="form.settlementAmount" style="width:220px"></el-input>
+                </el-form-item>
+                <el-form-item label="进账日期:">
+                    <el-date-picker v-model="form.settlementTime" type="date" placeholder="选择日期" value-format="yyyy-MM-dd">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="上传凭证:">
+                    <el-upload action="#" class="upload-demo" :limit="1" :auto-upload="false" :on-change="drivingupload"
+                        ref="upload3" accept=".png, .jpg, .jpeg" :file-list="fileList">
+                        <el-button size="small" type="primary">点击上传</el-button>
+                    </el-upload>
+                </el-form-item>
+            </el-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button size="small" @click="dialogVisiblebalance = false">取消</el-button>
+                <el-button type="primary" size="small" @click="balanceSumbit">确实</el-button>
+            </span>
+        </el-dialog>
     </div>
 </template>
 <script>
@@ -73,31 +66,31 @@ export default {
     },
     data() {
         return {
-      ztreeNodes:[],
-      fileList:[],
-            dialogVisiblebalance:false,
-            form:{},
+            ztreeNodes: [],
+            fileList: [],
+            dialogVisiblebalance: false,
+            form: {},
             formTableData: [],
             dialogVisible: false,
             tableConfigDetail: {
                 columns: [
-          {
-            prop: "invoicId",
-            label: "开票号",
-            type: "text"
-          },
-          {
-            prop: "invoicCommissionFeevalue",
-            label: "开票金额",
-            type: "text"
-          },
-          {
-            prop: "invoicTime",
-            label: "开票时间",
-            type: "text"
-          },
-         
-        ],
+                    {
+                        prop: "invoicId",
+                        label: "开票号",
+                        type: "text"
+                    },
+                    {
+                        prop: "invoicCommissionFeevalue",
+                        label: "开票金额",
+                        type: "text"
+                    },
+                    {
+                        prop: "invoicTime",
+                        label: "开票时间",
+                        type: "text"
+                    },
+
+                ],
                 loading: true,
                 optBtns: [
                     {
@@ -106,10 +99,13 @@ export default {
                         click: (row, index) => { return this.balanceFun(row) },
                     },
                     {
-            type:'primary',
-            label:'作废',
-            click:(row, index) => {return this.handVoid(row)},
-        },
+                        type: 'primary',
+                        label: '作废',
+                        hide: (row) => {
+                            return row.readyCommissionFeevalue ? true : false
+                        },
+                        click: (row, index) => { return this.handVoid(row) },
+                    },
                 ]
             },
             searchData: {},
@@ -123,12 +119,12 @@ export default {
                     label: "合作公司名称",
                     name: "保司机构",
                     type: "slot",
-                    },
+                },
                 {
                     label: "年月日",
                     name: "data",
                     type: "slot",
-                    },
+                },
             ],
             formList1: [
                 {
@@ -145,7 +141,7 @@ export default {
                         },
                     ]
                 },
-               
+
             ],
             tableConfig: {
                 columns: [
@@ -193,36 +189,36 @@ export default {
                 handlingFeesStatus: '0'
             },
             formData: {},
-            formDetail:{},
-            batchData:{}
+            formDetail: {},
+            batchData: {}
         };
     },
     created() {
-        this.$api.insCompany.findLeftInsTree( {
-        classname: "",
-        type: '1',
+        this.$api.insCompany.findLeftInsTree({
+            classname: "",
+            type: '1',
         }).then((res) => {
-      this.ztreeNodes = res.data;
-    });
+            this.ztreeNodes = res.data;
+        });
         this.findPage();
     },
     methods: {
-        drivingupload(file, fileList){
-      this.fileList=[]
-      const params = new FormData(); // 声明formData数据类型
-      params.append("multipartFile", file.raw);
-      params.append("type", "image");
-      this.$api.letter.uploadFile(params).then(res => {
-        if (res.code == "200") {
-          this.batchData =res.data
-          this.fileList = fileList
-        }
-        else{
-          this.fileList=[]
-          this.$message.error(res.msg)
-        }
-      });
-    },
+        drivingupload(file, fileList) {
+            this.fileList = []
+            const params = new FormData(); // 声明formData数据类型
+            params.append("multipartFile", file.raw);
+            params.append("type", "image");
+            this.$api.letter.uploadFile(params).then(res => {
+                if (res.code == "200") {
+                    this.batchData = res.data
+                    this.fileList = fileList
+                }
+                else {
+                    this.fileList = []
+                    this.$message.error(res.msg)
+                }
+            });
+        },
         getYearData(val) {
             this.formData.year = val
         },
@@ -236,35 +232,35 @@ export default {
             this.dialogVisible = true
             this.findPageDetail(row)
         },
-        handleSearchList1(data){
-            this.findPageDetail({...this.formDetail,...data})
+        handleSearchList1(data) {
+            this.findPageDetail({ ...this.formDetail, ...data })
         },
-        handVoid(row){
-      this.$api.task
-                .yaidlnvoicing({id:row.id})
+        handVoid(row) {
+            this.$api.task
+                .yaidlnvoicing({ id: row.id })
                 .then(res => {
-                    if (res.code==200) {
-                        this.dialogVisible=false
+                    if (res.code == 200) {
+                        this.dialogVisible = false
                         this.$message({
-                            message: res.msg ||'操作成功',
+                            message: res.msg || '操作成功',
                             type: 'success'
                         })
                     }
-                    else{
+                    else {
                         this.$message.error(res.msg)
                     }
                 });
-    },
+        },
         findPageDetail(data) {
             this.tableConfigDetail.loading = true
             this.$api.task
-                .invicdetai({ 
-                    partnerCompaniesId:data.partnerCompaniesId,
+                .invicdetai({
+                    partnerCompaniesId: data.partnerCompaniesId,
                     agreementType: '2',
                     isNotCar: '1',
-                    isNotDocumentary : '0',
-                    handlingFeesStatus:'0',
-                    settlementStatus:data.settlementStatus,
+                    isNotDocumentary: '0',
+                    handlingFeesStatus: '0',
+                    settlementStatus: data.settlementStatus,
                 })
                 .then(res => {
                     if (res.code == 200) {
@@ -285,7 +281,7 @@ export default {
             this.findPage();
         },
         resetForm() {
-            this.formData={}
+            this.formData = {}
             this.$refs.yearMonthYay.clear()
         },
         //列表数据
@@ -299,7 +295,7 @@ export default {
                 .totalBxAmount({ ...this.pageData, ...this.formData })
                 .then(res => {
                     if (res.code == 200) {
-                        this.tableData = res.data? res.data:[]
+                        this.tableData = res.data ? res.data : []
                         // this.pageData.pageNum = res.data.pageNum;
                         // this.pageData.pageSize = res.data.pageSize;
                         // this.pageData.totalSize = res.data.totalSize;
@@ -316,36 +312,38 @@ export default {
         },
 
         balanceSumbit() {
-      this.$api.task
-        .batchBxBalance({...this.openBalanceDetail,
-          otherFeevalue:this.formDetail.otherFeevalue,
-          partnerCompaniesId:this.formDetail.partnerCompaniesId,
-          companyId:this.formDetail.companyId,
-          isNotCar:'1',
-          handlingFeesStatus:'1',
-          settlementImageId:this.batchData.id,
-          ...this.form})
-        .then(res => {
-          if (res.code==200) {
-            this.haldDetail(this.formDetail)
-            this.dialogVisiblebalance=false
-            this.$message({
-                message: res.msg ||'操作成功',
-                type: 'success'
-            })
-          }
-          else{
-            this.$message.error(res.msg)
-          }
-        });
-    }, 
-    handleClosebalance() {
-      this.dialogVisiblebalance = false;
-    },
+            this.$api.task
+                .batchBxBalance({
+                    ...this.openBalanceDetail,
+                    otherFeevalue: this.formDetail.otherFeevalue,
+                    partnerCompaniesId: this.formDetail.partnerCompaniesId,
+                    companyId: this.formDetail.companyId,
+                    isNotCar: '1',
+                    handlingFeesStatus: '1',
+                    settlementImageId: this.batchData.id,
+                    ...this.form
+                })
+                .then(res => {
+                    if (res.code == 200) {
+                        this.haldDetail(this.formDetail)
+                        this.dialogVisiblebalance = false
+                        this.$message({
+                            message: res.msg || '操作成功',
+                            type: 'success'
+                        })
+                    }
+                    else {
+                        this.$message.error(res.msg)
+                    }
+                });
+        },
+        handleClosebalance() {
+            this.dialogVisiblebalance = false;
+        },
         // 结算
         balanceFun(row) {
-            this.openBalanceDetail=row
-            this.dialogVisiblebalance=true
+            this.openBalanceDetail = row
+            this.dialogVisiblebalance = true
             // this.$api.task
             //     .batchBxBalance({
             //         ...row,