|
@@ -413,14 +413,7 @@
|
|
|
|
|
|
|
|
<el-col :span="12">
|
|
<el-col :span="12">
|
|
|
<el-form-item label="邮箱" prop="yx">
|
|
<el-form-item label="邮箱" prop="yx">
|
|
|
- <el-input
|
|
|
|
|
- style="width: 100%;"
|
|
|
|
|
- v-model="form.yx"
|
|
|
|
|
- size="small"
|
|
|
|
|
- :disabled="editSave"
|
|
|
|
|
- clearable
|
|
|
|
|
- placeholder="请输入邮箱"
|
|
|
|
|
- >
|
|
|
|
|
|
|
+ <el-input style="width: 100%;" v-model="form.yx" size="small" :disabled="editSave" clearable placeholder="请输入邮箱">
|
|
|
</el-input>
|
|
</el-input>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
@@ -677,8 +670,10 @@
|
|
|
>转换成人民币
|
|
>转换成人民币
|
|
|
</el-checkbox>
|
|
</el-checkbox>
|
|
|
<!-- <el-checkbox v-model="appendType" :disabled="editSave" false-label="检索" true-label="追加">追加</el-checkbox> -->
|
|
<!-- <el-checkbox v-model="appendType" :disabled="editSave" false-label="检索" true-label="追加">追加</el-checkbox> -->
|
|
|
- <el-button type="primary" size="small" :disabled="editSave||form.srcType=='对账'" plain @click="retrievalfun(appendType)">提取费用 </el-button>
|
|
|
|
|
- <el-button size="small" :disabled="tableData.length > 0||form.srcType=='对账'" @click="ResetFilter">重置条件 </el-button>
|
|
|
|
|
|
|
+ <el-button type="primary" size="small" :disabled="editSave || form.srcType == '对账'" plain @click="retrievalfun(appendType)"
|
|
|
|
|
+ >提取费用
|
|
|
|
|
+ </el-button>
|
|
|
|
|
+ <el-button size="small" :disabled="tableData.length > 0 || form.srcType == '对账'" @click="ResetFilter">重置条件 </el-button>
|
|
|
<el-button icon="el-icon-arrow-down" type="text" size="small" v-if="!showForm" @click="showForm = true">展开</el-button>
|
|
<el-button icon="el-icon-arrow-down" type="text" size="small" v-if="!showForm" @click="showForm = true">展开</el-button>
|
|
|
<el-button icon="el-icon-arrow-up" type="text" size="small" v-if="showForm" @click="showForm = false">收缩</el-button>
|
|
<el-button icon="el-icon-arrow-up" type="text" size="small" v-if="showForm" @click="showForm = false">收缩</el-button>
|
|
|
</div>
|
|
</div>
|
|
@@ -686,7 +681,7 @@
|
|
|
</trade-card>
|
|
</trade-card>
|
|
|
<el-card style="margin-top: 10px">
|
|
<el-card style="margin-top: 10px">
|
|
|
<el-tabs v-model="activeName" @tab-click="handleClick">
|
|
<el-tabs v-model="activeName" @tab-click="handleClick">
|
|
|
- <el-tab-pane label="查询结果" name="1" v-if="!(form.srcType=='对账')">
|
|
|
|
|
|
|
+ <el-tab-pane label="查询结果" name="1" v-if="!(form.srcType == '对账')">
|
|
|
<query-fininvoicesitems
|
|
<query-fininvoicesitems
|
|
|
ref="fininvoicesitems"
|
|
ref="fininvoicesitems"
|
|
|
:queryData="queryData"
|
|
:queryData="queryData"
|
|
@@ -708,7 +703,7 @@
|
|
|
</template>
|
|
</template>
|
|
|
</query-fininvoicesitems>
|
|
</query-fininvoicesitems>
|
|
|
</el-tab-pane>
|
|
</el-tab-pane>
|
|
|
- <el-tab-pane label="选定数据" name="2" v-if="!(form.srcType=='对账')">
|
|
|
|
|
|
|
+ <el-tab-pane label="选定数据" name="2" v-if="!(form.srcType == '对账')">
|
|
|
<fininvoicesitems
|
|
<fininvoicesitems
|
|
|
ref="fininvoicesitems"
|
|
ref="fininvoicesitems"
|
|
|
:tableData="tableData"
|
|
:tableData="tableData"
|
|
@@ -779,7 +774,9 @@
|
|
|
</el-tab-pane>
|
|
</el-tab-pane>
|
|
|
<el-tab-pane label="开票明细" name="3">
|
|
<el-tab-pane label="开票明细" name="3">
|
|
|
<div style="margin-bottom: 10px;display: flex;">
|
|
<div style="margin-bottom: 10px;display: flex;">
|
|
|
- <el-button size="small" :disabled="editSave||form.srcType=='对账'" type="danger" @click="invoicingBatchDelete">一键删除</el-button>
|
|
|
|
|
|
|
+ <el-button size="small" :disabled="editSave || form.srcType == '对账'" type="danger" @click="invoicingBatchDelete"
|
|
|
|
|
+ >一键删除</el-button
|
|
|
|
|
+ >
|
|
|
<span style="font-size: 18px;font-weight: 600;margin-left: 100px;">
|
|
<span style="font-size: 18px;font-weight: 600;margin-left: 100px;">
|
|
|
<span style="color: #67C23A;"> CNY:¥{{ amountSubSum }}元 </span>
|
|
<span style="color: #67C23A;"> CNY:¥{{ amountSubSum }}元 </span>
|
|
|
</span>
|
|
</span>
|
|
@@ -790,7 +787,7 @@
|
|
|
@handleSelectionChange="invoicingCheckboxChange"
|
|
@handleSelectionChange="invoicingCheckboxChange"
|
|
|
@deletefun="invoiceDeletionfun"
|
|
@deletefun="invoiceDeletionfun"
|
|
|
@savefun="invoiceSavefun"
|
|
@savefun="invoiceSavefun"
|
|
|
- :disabled="form.srcType=='对账'"
|
|
|
|
|
|
|
+ :disabled="form.srcType == '对账'"
|
|
|
>
|
|
>
|
|
|
</fininvoiceitemdetail>
|
|
</fininvoiceitemdetail>
|
|
|
</el-tab-pane>
|
|
</el-tab-pane>
|
|
@@ -888,6 +885,7 @@ import dicSelect from "@/components/dicSelect/main";
|
|
|
import { finstlbillslistAccBillByCorp } from "@/api/iosBasicData/finstlbills";
|
|
import { finstlbillslistAccBillByCorp } from "@/api/iosBasicData/finstlbills";
|
|
|
import { getMonthDate, getYearDate } from "@/util/date";
|
|
import { getMonthDate, getYearDate } from "@/util/date";
|
|
|
import cashierItem from "./assembly/cashierItem.vue";
|
|
import cashierItem from "./assembly/cashierItem.vue";
|
|
|
|
|
+import { isEmail } from "@/util/validate";
|
|
|
export default {
|
|
export default {
|
|
|
components: {
|
|
components: {
|
|
|
SearchQuery,
|
|
SearchQuery,
|
|
@@ -1112,7 +1110,7 @@ export default {
|
|
|
},
|
|
},
|
|
|
allClick(name) {
|
|
allClick(name) {
|
|
|
if (name == "指示") {
|
|
if (name == "指示") {
|
|
|
- this.$refs.cashier.openDialog(this.form,this.tableData,'auto');
|
|
|
|
|
|
|
+ this.$refs.cashier.openDialog(this.form, this.tableData, "auto");
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
updateCashier() {
|
|
updateCashier() {
|
|
@@ -1602,6 +1600,11 @@ export default {
|
|
|
editCustomer(type) {
|
|
editCustomer(type) {
|
|
|
this.$refs.form.validate(valid => {
|
|
this.$refs.form.validate(valid => {
|
|
|
if (!valid) return;
|
|
if (!valid) return;
|
|
|
|
|
+ if (this.form.yx) {
|
|
|
|
|
+ if (!isEmail(this.form.yx)) {
|
|
|
|
|
+ return this.$message.error("请正确输入邮箱格式");
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
if (!this.generateStatus) {
|
|
if (!this.generateStatus) {
|
|
|
if (!this.form.id) {
|
|
if (!this.form.id) {
|
|
|
// 是否选择从表数据
|
|
// 是否选择从表数据
|
|
@@ -1930,8 +1933,8 @@ export default {
|
|
|
this.pageLoading = true;
|
|
this.pageLoading = true;
|
|
|
fininvoicesDetail(id)
|
|
fininvoicesDetail(id)
|
|
|
.then(res => {
|
|
.then(res => {
|
|
|
- if(res.data.data.srcType=='对账'){
|
|
|
|
|
- this.activeName='3'
|
|
|
|
|
|
|
+ if (res.data.data.srcType == "对账") {
|
|
|
|
|
+ this.activeName = "3";
|
|
|
}
|
|
}
|
|
|
this.form = res.data.data;
|
|
this.form = res.data.data;
|
|
|
if (
|
|
if (
|