|
|
@@ -32,19 +32,108 @@
|
|
|
<el-input v-model="InvoicingData.taxPoints"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="10">
|
|
|
+ <!-- <el-col :span="10">
|
|
|
<el-form-item label="开票金额" prop="settlementAmount">
|
|
|
<el-input v-model="InvoicingData.settlementAmount"></el-input>
|
|
|
</el-form-item>
|
|
|
- </el-col>
|
|
|
+ </el-col> -->
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
+ <el-table
|
|
|
+ show-summary
|
|
|
+ :data="multipleSelection"
|
|
|
+ border
|
|
|
+ style="width: 100%">
|
|
|
+ <el-table-column
|
|
|
+ prop="monthNumber"
|
|
|
+ label="月份">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="allTotalOtherFeevalue"
|
|
|
+ label="总金额">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="invoicCommissionFeevalue"
|
|
|
+ label="已开票">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="noInvoicCommissionFeevalue"
|
|
|
+ label="未开票">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="settlementAmount"
|
|
|
+ label="开票金额">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input v-model="scope.row.settlementAmount"></el-input>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
- <el-button size="small" @click="dialogVisible = false">取 消</el-button>
|
|
|
+ <el-button size="small" @click="dialogVisible = false;multipleSelection=[]">取 消</el-button>
|
|
|
<el-button size="small" type="primary" @click="submit('InvoicingData')">确 定</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
-
|
|
|
+ <el-dialog title="开票" :visible.sync="myDialogVisible" width="40%" @close="myClosdialogVisible">
|
|
|
+ 年度: <el-date-picker
|
|
|
+ size="small"
|
|
|
+ v-model="yeartsStart"
|
|
|
+ :picker-options="startDatePicker"
|
|
|
+ value-format="yyyy"
|
|
|
+ type="year"
|
|
|
+ style="width:150px"
|
|
|
+ placeholder="开始年份"
|
|
|
+ >
|
|
|
+ </el-date-picker>
|
|
|
+ ~
|
|
|
+ <el-date-picker
|
|
|
+ size="small"
|
|
|
+ v-model="yeartsEnd"
|
|
|
+ value-format="yyyy"
|
|
|
+ style="width:150px"
|
|
|
+ :picker-options="endDatePicker"
|
|
|
+ type="year"
|
|
|
+ placeholder="结束年份"
|
|
|
+ >
|
|
|
+ </el-date-picker>
|
|
|
+ <el-button type="primary" size="small" style="margin-left: 30px" @click="handleQuery()" >查询</el-button>
|
|
|
+ <el-button type="primary" size="small" style="margin-left: 20px;margin-bottom: 30px;" @click="handleMerge()" :disabled="multipleSelection.length==0">合并开票</el-button>
|
|
|
+ <el-table
|
|
|
+ :data="tableDataYear"
|
|
|
+ border
|
|
|
+ ref="multipleTable"
|
|
|
+ @selection-change="handleSelectionChange"
|
|
|
+ style="width: 100%">
|
|
|
+ <el-table-column
|
|
|
+ type="selection"
|
|
|
+ width="55">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="monthNumber"
|
|
|
+ label="月份">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="allTotalOtherFeevalue"
|
|
|
+ label="总金额">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="invoicCommissionFeevalue"
|
|
|
+ label="已开票">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="noInvoicCommissionFeevalue"
|
|
|
+ label="未开票">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ label="操作">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-button @click="handleMonth(scope.row)" type="primary" size="small">当月开票</el-button>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
+ <el-button size="small" @click="myDialogVisible = false">取 消</el-button>
|
|
|
+ </span>
|
|
|
+ </el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
<script>
|
|
|
@@ -64,6 +153,14 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ myDialogVisible:false,
|
|
|
+ yeartsStart:'',
|
|
|
+ tableDataYear:[],
|
|
|
+ multipleSelection:[],
|
|
|
+ yeartsEnd:'',
|
|
|
+ startDatePicker: this.beginDate(),
|
|
|
+ endDatePicker: this.processDate(),
|
|
|
+ isSingle:'1',
|
|
|
year: '',
|
|
|
searchData: {},
|
|
|
options:[{
|
|
|
@@ -133,7 +230,7 @@ export default {
|
|
|
tableData: [],
|
|
|
formData: {},
|
|
|
InvoicingData: {
|
|
|
- invoicingMethod:0
|
|
|
+ invoicingMethod:'0'
|
|
|
},
|
|
|
formDataList:{},
|
|
|
dialogVisible: false,
|
|
|
@@ -162,6 +259,45 @@ export default {
|
|
|
this.findPage();
|
|
|
},
|
|
|
methods: {
|
|
|
+ handleSelectionChange(val) {
|
|
|
+ this.multipleSelection = val;
|
|
|
+ },
|
|
|
+ handleMerge(){
|
|
|
+ this.dialogVisible =true
|
|
|
+ this.isSingle='2'
|
|
|
+ this.InvoicingData={
|
|
|
+ invoicingMethod:'0'
|
|
|
+ }
|
|
|
+ },
|
|
|
+ handleMonth(row){
|
|
|
+ this.multipleSelection = [row];
|
|
|
+ this.dialogVisible =true
|
|
|
+ this.isSingle='1'
|
|
|
+ this.InvoicingData={
|
|
|
+ invoicingMethod:'0'
|
|
|
+ }
|
|
|
+ },
|
|
|
+ beginDate() {
|
|
|
+ let self = this
|
|
|
+ return {
|
|
|
+ disabledDate(time) {
|
|
|
+ if (self.yeartsEnd !== '') {
|
|
|
+ let fixedTime = new Date(time)
|
|
|
+ return fixedTime.getFullYear() > self.yeartsEnd
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ // 提出结束时间必须大于提出开始时间
|
|
|
+ processDate() {
|
|
|
+ let self = this
|
|
|
+ return {
|
|
|
+ disabledDate(time) {
|
|
|
+ let fixedTime = new Date(time)
|
|
|
+ return fixedTime.getFullYear() < self.yeartsStart
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
getYearData(val){
|
|
|
this.formData.year=val
|
|
|
},
|
|
|
@@ -183,9 +319,6 @@ export default {
|
|
|
.then(res => {
|
|
|
if (res.code==200) {
|
|
|
this.tableData = res.data?res.data:[]
|
|
|
- // this.pageData.pageNum = res.data.pageNum;
|
|
|
- // this.pageData.pageSize = res.data.pageSize;
|
|
|
- // this.pageData.totalSize = res.data.totalSize;
|
|
|
this.tableConfig.loading = false;
|
|
|
}
|
|
|
else {
|
|
|
@@ -195,28 +328,57 @@ export default {
|
|
|
},
|
|
|
closdialogVisible() {
|
|
|
this.dialogVisible = false;
|
|
|
+ this.multipleSelection=[]
|
|
|
+ this.$refs.multipleTable.clearSelection();
|
|
|
+
|
|
|
+ },
|
|
|
+ myClosdialogVisible() {
|
|
|
+ this.myDialogVisible = false;
|
|
|
+ },
|
|
|
+ handleQuery(){
|
|
|
+ this.otherTimeDetail(this.formDataList)
|
|
|
},
|
|
|
-
|
|
|
// 开票
|
|
|
openBalanceFun(row) {
|
|
|
- this.dialogVisible=true
|
|
|
+ this.myDialogVisible=true
|
|
|
+ this.otherTimeDetail(row)
|
|
|
this.formDataList=row
|
|
|
- this.InvoicingData={
|
|
|
- invoicingMethod:'0'
|
|
|
+ },
|
|
|
+ otherTimeDetail(row){
|
|
|
+ let data={
|
|
|
+ partnerCompaniesId:row.partnerCompaniesId,
|
|
|
+ agreementType:2,
|
|
|
+ isNotCar:0,
|
|
|
+ isNotDocumentary:1,
|
|
|
+ yeartsStart:this.yeartsStart,
|
|
|
+ yeartsEnd:this.yeartsEnd,
|
|
|
}
|
|
|
+ this.$api.task.otherTimeDetail(data).then(res => {
|
|
|
+ if (res.code == "200") {
|
|
|
+ this.tableDataYear=res.data
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ this.$message.error(res.msg)
|
|
|
+ }
|
|
|
+ });
|
|
|
},
|
|
|
submit(formData) {
|
|
|
this.$refs[formData].validate((valid) => {
|
|
|
if (valid) {
|
|
|
- let data={ ...this.formDataList,...this.InvoicingData,isNotCar:0,handlingFeesStatus:'1'}
|
|
|
+ let data={
|
|
|
+ ...this.formDataList,...this.InvoicingData,isNotCar:0,handlingFeesStatus:'1',
|
|
|
+ yeartsStart:this.yeartsStart,
|
|
|
+ yeartsEnd:this.yeartsEnd,
|
|
|
+ multipleSelection:this.multipleSelection
|
|
|
+ }
|
|
|
this.$api.task.batchInvoic(data).then(res => {
|
|
|
if (res.code == "200") {
|
|
|
- this.findPage();
|
|
|
this.$message({
|
|
|
message: res.msg ||'操作成功',
|
|
|
type: 'success'
|
|
|
})
|
|
|
this.dialogVisible = false
|
|
|
+ this.otherTimeDetail(this.formDataList)
|
|
|
}
|
|
|
else {
|
|
|
this.$message.error(res.msg)
|
lihongxiao