Commit ca3c2ec7 authored by 华国豪's avatar 华国豪 🙄

发票新增字段

parent 0eace3a7
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
<li> <li>
<input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/> <input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/> <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" /> <!-- <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" /> -->
</li> </li>
</ul> </ul>
</div> </div>
......
...@@ -99,7 +99,8 @@ ...@@ -99,7 +99,8 @@
<li> <li>
<input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/> <input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/> <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click=""/></li> <!-- <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click=""/> -->
</li>
</ul> </ul>
</div> </div>
<div class="cm_content"> <div class="cm_content">
......
...@@ -96,7 +96,8 @@ ...@@ -96,7 +96,8 @@
<li> <li>
<input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/> <input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/> <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click=""/></li> <!-- <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click=""/> -->
</li>
</ul> </ul>
</div> </div>
<div class="cm_content"> <div class="cm_content">
......
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<li> <li>
<input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/> <input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/> <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" /> <!-- <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" /> -->
</li> </li>
</ul> </ul>
</div> </div>
......
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td rowspan="2">开具内容</td> <td rowspan="6">开具内容</td>
<td>公司名称 <td>公司名称
<el-select v-model="isChang" placeholder="" class="w150" @change="clearInfo"> <el-select v-model="isChang" placeholder="" class="w150" @change="clearInfo">
<el-option :key="1" :value='1' label='常用公司'></el-option> <el-option :key="1" :value='1' label='常用公司'></el-option>
...@@ -111,6 +111,30 @@ ...@@ -111,6 +111,30 @@
<span v-else>{{msg.DutyParagraph}}</span> <span v-else>{{msg.DutyParagraph}}</span>
</td> </td>
</tr> </tr>
<tr>
<td>地址</td>
<td colspan="2">
<el-input placeholder v-model="msg.Address"></el-input>
</td>
</tr>
<tr>
<td>电话</td>
<td colspan="2">
<el-input placeholder v-model="msg.CompanyPhone"></el-input>
</td>
</tr>
<tr>
<td>开户行</td>
<td colspan="2">
<el-input placeholder v-model="msg.OpeningBank"></el-input>
</td>
</tr>
<tr>
<td>账号</td>
<td colspan="2">
<el-input placeholder type="number" v-model="msg.BankNo"></el-input>
</td>
</tr>
<tr> <tr>
<td>备注</td> <td>备注</td>
<td colspan="3"> <td colspan="3">
...@@ -137,6 +161,10 @@ export default { ...@@ -137,6 +161,10 @@ export default {
InvoiceApplyState: 1, InvoiceApplyState: 1,
CustomerId: 0, CustomerId: 0,
IsDefaultInfo: 1, IsDefaultInfo: 1,
Address: '',
CompanyPhone: '',
OpeningBank: '',
BankNo: '',
}, },
DepartName: "", DepartName: "",
emName: "", emName: "",
...@@ -164,6 +192,10 @@ export default { ...@@ -164,6 +192,10 @@ export default {
Addiis: function () { // 新增接口 Addiis: function () { // 新增接口
if (this.msg.CompanyName === '') return this.$message.error('请填写公司名称!') if (this.msg.CompanyName === '') return this.$message.error('请填写公司名称!')
if (this.msg.DutyParagraph === '') return this.$message.error('请填写税号!') if (this.msg.DutyParagraph === '') return this.$message.error('请填写税号!')
if (this.msg.Address === '') return this.$message.error('请填写地址!')
if (this.msg.CompanyPhone === '') return this.$message.error('请填写电话!')
if (this.msg.OpeningBank === '') return this.$message.error('请填写开户行!')
if (this.msg.BankNo === '') return this.$message.error('请填写账号!')
if (this.checked) { if (this.checked) {
this.msg.IsDefaultInfo = 1 this.msg.IsDefaultInfo = 1
} else { } else {
......
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td rowspan="2">开具内容</td> <td rowspan="6">开具内容</td>
<td>公司名称</td> <td>公司名称</td>
<td colspan="2" class="font-weight"> <td colspan="2" class="font-weight">
{{detail.CompanyName}} {{detail.CompanyName}}
...@@ -97,6 +97,30 @@ ...@@ -97,6 +97,30 @@
{{detail.DutyParagraph}} {{detail.DutyParagraph}}
</td> </td>
</tr> </tr>
<tr>
<td>地址</td>
<td colspan="2">
{{detail.Address}}
</td>
</tr>
<tr>
<td>电话</td>
<td colspan="2">
{{detail.CompanyPhone}}
</td>
</tr>
<tr>
<td>开户行</td>
<td colspan="2">
{{detail.OpeningBank}}
</td>
</tr>
<tr>
<td>账号</td>
<td colspan="2">
{{detail.BankNo}}
</td>
</tr>
<tr> <tr>
<td>备注</td> <td>备注</td>
<td colspan="3"> <td colspan="3">
......
...@@ -1703,8 +1703,8 @@ ...@@ -1703,8 +1703,8 @@
<span v-if="item.isChargeLossOrders==1">恢复收损单</span> <span v-if="item.isChargeLossOrders==1">恢复收损单</span>
<span v-else>设为收损单</span> <span v-else>设为收损单</span>
</div> </div>
<!-- item.confirmFileList.length>0 && q --> <!-- v-if='item.confirmFileList.length>0 && ((item.receivableMoney - item.invoiceApplyTotal) > 0)' -->
<div v-if='item.confirmFileList.length>0 && ((item.receivableMoney - item.invoiceApplyTotal) > 0)' @click='goUrlAdd("invoicesManagerAdd", item.orderId, item.tcid, item.customerId)'>申请发票</div> <div @click='goUrlAdd("invoicesManagerAdd", item.orderId, item.tcid, item.customerId)'>申请发票</div>
<div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3')" <div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3')"
@click='deleteItem(item)'>取消 @click='deleteItem(item)'>取消
</div> </div>
......
...@@ -1739,6 +1739,7 @@ ...@@ -1739,6 +1739,7 @@
<div v-if="isUpdateOrder" @click='zhuanLoading = true,OPRemarkMsg.OrderId = item.orderId'>OP备注</div> <div v-if="isUpdateOrder" @click='zhuanLoading = true,OPRemarkMsg.OrderId = item.orderId'>OP备注</div>
<!-- v-if="item.isUpdateOrderCommission" --> <!-- v-if="item.isUpdateOrderCommission" -->
<div v-if="isUpdateOrderCommission" @click='TCMsg.OrderId = item.orderId, TCMsg.CommissionMinusRate = item.commissionMinusRate,TCMsg.LatestCommissionMoney=item.latestCommissionMoney, TiChengLoading = true'>修改提成</div> <div v-if="isUpdateOrderCommission" @click='TCMsg.OrderId = item.orderId, TCMsg.CommissionMinusRate = item.commissionMinusRate,TCMsg.LatestCommissionMoney=item.latestCommissionMoney, TiChengLoading = true'>修改提成</div>
<div v-if='item.confirmFileList.length>0 && ((item.receivableMoney - item.invoiceApplyTotal) > 0)' @click='goUrlAdd("invoicesManagerAdd", item.orderId, item.tcid, item.customerId)'>申请发票</div>
<div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2')" @click='setChargeLoss(item)'> <div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2')" @click='setChargeLoss(item)'>
<span v-if="item.isChargeLossOrders==1">恢复收损单</span> <span v-if="item.isChargeLossOrders==1">恢复收损单</span>
<span v-else>设为收损单</span> <span v-else>设为收损单</span>
...@@ -1819,6 +1820,18 @@ ...@@ -1819,6 +1820,18 @@
<span v-if="item.refundFinanceList.length===0" style="cursor: default;">暂无数据</span> <span v-if="item.refundFinanceList.length===0" style="cursor: default;">暂无数据</span>
</div> </div>
</div> </div>
<div>
<div>发票单据:</div>
<div>
<span v-for="(item2,index2) in item.invoiceApplyList" :key="index2">
<span v-if="item2.invoiceApplyState===6" class="groupTourOrder_tickets_blue" @click="goIisDetail(item2.id)">{{item2.id}}</span>
<span v-else-if="item2.invoiceApplyState===1" class="groupTourOrder_tickets_green" @click="goIisDetail(item2.id)">{{item2.id}}</span>
<span v-else-if="item2.invoiceApplyState===5" class="groupTourOrder_tickets_red" @click="goIisDetail(item2.id)">{{item2.id}}</span>
<span v-else-if="item2.invoiceApplyState===3" class="groupTourOrder_tickets_black" @click="goIisDetail(item2.id)">{{item2.id}}</span>
</span>
<span v-if="item.invoiceApplyList.length===0" style="cursor: default;">暂无数据</span>
</div>
</div>
</td> </td>
</tr> </tr>
</tbody> </tbody>
...@@ -2450,6 +2463,19 @@ export default { ...@@ -2450,6 +2463,19 @@ export default {
} }
}, },
methods: { methods: {
goIisDetail: function (id) { // 跳转发票详情页面
this.$router.push({
name: 'invoicesManagerDetail',
query: { id: id,noDetail: 1,blank: "y",}
});
},
// 申请发票
goUrlAdd: function (path, OrderId, TCID, customerId) {
this.$router.push({
name: path,
query: {OrderId: OrderId, TCID: TCID, customerId: customerId, blank: "y",}
});
},
//跳转 //跳转
goUrlTS (path, id, orderId, title) { goUrlTS (path, id, orderId, title) {
this.$router.push({ this.$router.push({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment