fix:付款单页面字段改名,代理商“金牌”过滤调整,维保页面标签调整
parent
1735901ffe
commit
8be71600a2
|
|
@ -42,7 +42,7 @@
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row :gutter="20">
|
<el-row :gutter="20">
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<div class="detail-item">备注:
|
<div class="detail-item">单据来源:
|
||||||
<dict-tag :options="dict.type.payment_bill_type" :value="detail.paymentBillType"/>
|
<dict-tag :options="dict.type.payment_bill_type" :value="detail.paymentBillType"/>
|
||||||
</div>
|
</div>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
|
||||||
|
|
@ -41,8 +41,8 @@
|
||||||
@keyup.enter.native="handleQuery"
|
@keyup.enter.native="handleQuery"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="备注" prop="paymentBillType">
|
<el-form-item label="单据来源" prop="paymentBillType">
|
||||||
<el-select v-model="queryParams.paymentBillType" placeholder="请选择备注" clearable>
|
<el-select v-model="queryParams.paymentBillType" placeholder="请选择单据来源" clearable>
|
||||||
<el-option v-for="dict in dict.type.payment_bill_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
|
<el-option v-for="dict in dict.type.payment_bill_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
@ -167,7 +167,7 @@
|
||||||
<span :style="scope.row.totalPriceWithTax<0?{color:'red'}:{}">{{ formatCurrency(scope.row.totalPriceWithTax) }}</span>
|
<span :style="scope.row.totalPriceWithTax<0?{color:'red'}:{}">{{ formatCurrency(scope.row.totalPriceWithTax) }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="备注" align="center" width="100" prop="paymentBillType">
|
<el-table-column label="单据来源" align="center" width="100" prop="paymentBillType">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<dict-tag :options="dict.type.payment_bill_type" :value="scope.row.paymentBillType"/>
|
<dict-tag :options="dict.type.payment_bill_type" :value="scope.row.paymentBillType"/>
|
||||||
</template>
|
</template>
|
||||||
|
|
@ -233,7 +233,7 @@
|
||||||
size="mini"
|
size="mini"
|
||||||
type="text"
|
type="text"
|
||||||
icon="el-icon-refresh-right"
|
icon="el-icon-refresh-right"
|
||||||
v-if="canApplyRefund(scope.row)"
|
v-if="canApplyRefund(scope.row) && false"
|
||||||
@click="handleApplyRefund(scope.row)"
|
@click="handleApplyRefund(scope.row)"
|
||||||
>申请退款</el-button>
|
>申请退款</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
|
|
@ -345,8 +345,8 @@
|
||||||
<el-form-item label="税率">
|
<el-form-item label="税率">
|
||||||
<el-input :value="formatTaxRate(applyRefundTaxRate)" disabled />
|
<el-input :value="formatTaxRate(applyRefundTaxRate)" disabled />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="备注" prop="remark">
|
<el-form-item label="单据来源" prop="remark">
|
||||||
<el-input type="textarea" :rows="3" v-model="applyRefundForm.remark" placeholder="请输入备注" />
|
<el-input type="textarea" :rows="3" v-model="applyRefundForm.remark" placeholder="请输入单据来源" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<div slot="footer" class="dialog-footer">
|
<div slot="footer" class="dialog-footer">
|
||||||
|
|
|
||||||
|
|
@ -357,6 +357,7 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
|
document.title = '紫光汇智售后查询'
|
||||||
const sn = (this.$route.query.sn || '').trim()
|
const sn = (this.$route.query.sn || '').trim()
|
||||||
if (sn) {
|
if (sn) {
|
||||||
this.queryMode = 'single'
|
this.queryMode = 'single'
|
||||||
|
|
|
||||||
|
|
@ -339,7 +339,7 @@ export default {
|
||||||
systemUserName: [
|
systemUserName: [
|
||||||
{
|
{
|
||||||
validator: (rule, value, callback) => {
|
validator: (rule, value, callback) => {
|
||||||
if (this.form.level === '04') {
|
if (this.form.level === '04' || this.form.level === '03') {
|
||||||
callback();
|
callback();
|
||||||
} else {
|
} else {
|
||||||
if (!value) {
|
if (!value) {
|
||||||
|
|
@ -354,7 +354,7 @@ export default {
|
||||||
contactEmail: [
|
contactEmail: [
|
||||||
{
|
{
|
||||||
validator: (rule, value, callback) => {
|
validator: (rule, value, callback) => {
|
||||||
if (this.form.level === '04') {
|
if (this.form.level === '04' || this.form.level === '03') {
|
||||||
callback();
|
callback();
|
||||||
} else {
|
} else {
|
||||||
if (!value) {
|
if (!value) {
|
||||||
|
|
|
||||||
|
|
@ -457,10 +457,11 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
|
||||||
if (ProjectOrderInfo.OrderStatus.WAIT_APPROVE.getCode().equals(projectOrderInfo.getOrderStatus())) {
|
if (ProjectOrderInfo.OrderStatus.WAIT_APPROVE.getCode().equals(projectOrderInfo.getOrderStatus())) {
|
||||||
List<String> codeList = getPartnerCodeByProcessTemplate(projectOrderInfo);
|
List<String> codeList = getPartnerCodeByProcessTemplate(projectOrderInfo);
|
||||||
List<PartnerInfo> partnerInfos = partnerInfoService.selectPartnerInfoByCode(codeList);
|
List<PartnerInfo> partnerInfos = partnerInfoService.selectPartnerInfoByCode(codeList);
|
||||||
//线下合同不走省代审批,非认证渠道跳过
|
//线下合同不走省代审批,非认证渠道和金牌跳过
|
||||||
if (ProjectOrderInfo.ProcessTypeEnum.ONLINE.getCode().equals(projectOrderInfo.getProcessType())
|
if (ProjectOrderInfo.ProcessTypeEnum.ONLINE.getCode().equals(projectOrderInfo.getProcessType())
|
||||||
&& (CollUtil.isEmpty(partnerInfos) || StringUtils.isEmpty(partnerInfos.get(0).getSystemUserId()))
|
&& (CollUtil.isEmpty(partnerInfos) || StringUtils.isEmpty(partnerInfos.get(0).getSystemUserId()))
|
||||||
&& !ProjectOrderInfo.LevelEnum.NON_CERTIFIED.getCode().equals(projectOrderInfo.getLevel())) {
|
&& !ProjectOrderInfo.LevelEnum.NON_CERTIFIED.getCode().equals(projectOrderInfo.getLevel())
|
||||||
|
&& !ProjectOrderInfo.LevelEnum.GOLD_MEDAL.getCode().equals(projectOrderInfo.getLevel())) {
|
||||||
throw new ServiceException(StrUtil.format("代理商配置[{}]未指定系统用户,无法提交审批", existProjectOrderInfo.getPartnerName()));
|
throw new ServiceException(StrUtil.format("代理商配置[{}]未指定系统用户,无法提交审批", existProjectOrderInfo.getPartnerName()));
|
||||||
}
|
}
|
||||||
List<ProcessInstance> processInstanceList = todoService.listProcessInstance(existProjectOrderInfo.getOrderCode());
|
List<ProcessInstance> processInstanceList = todoService.listProcessInstance(existProjectOrderInfo.getOrderCode());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue