yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
God 2 years ago
parent
606e83ed51 ea90329411
commit
9b168dfba8
5 changed files with 80 additions and 77 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundInfo.vue
  2. 10
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptInfo.vue
  3. 4
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue
  4. 10
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue
  5. 5
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

10
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundInfo.vue
View File

@ -86,7 +86,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-show="formobj.collectionTypeKey === '03'"> <el-row v-show="formobj.collectionTypeKey === '03' || formobj.collectionTypeKey === '05'">
<el-col :span="4" class="tleftb balanceStyle"> <el-col :span="4" class="tleftb balanceStyle">
<span>收款银行账号</span> <span>收款银行账号</span>
</el-col> </el-col>
@ -122,19 +122,19 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<span v-show="formobj.collectionTypeKey === '03'">付款账号后4位</span> <span v-show="formobj.collectionTypeKey === '03' || formobj.collectionTypeKey === '05'">付款账号后4位</span>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item> <el-form-item>
<span v-show="formobj.collectionTypeKey === '03'">{{ formobj.payAccount }}</span> <span v-show="formobj.collectionTypeKey === '03' || formobj.collectionTypeKey === '05'">{{ formobj.payAccount }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<span v-show="formobj.collectionTypeKey === '03'">付款银行</span> <span v-show="formobj.collectionTypeKey === '03' || formobj.collectionTypeKey === '05'">付款银行</span>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item> <el-form-item>
<span v-show="formobj.collectionTypeKey === '03'">{{ formobj.payBank }}</span> <span v-show="formobj.collectionTypeKey === '03' || formobj.collectionTypeKey === '05'">{{ formobj.payBank }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

10
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptInfo.vue
View File

@ -87,7 +87,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-show="formobj.collectionTypeKey === '03'"> <el-row v-show="formobj.collectionTypeKey === '03' || formobj.collectionTypeKey === '05'">
<el-col :span="4" class="tleftb balanceStyle"> <el-col :span="4" class="tleftb balanceStyle">
<span>收款银行账号</span> <span>收款银行账号</span>
</el-col> </el-col>
@ -123,19 +123,19 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<span v-show="formobj.collectionTypeKey === '03'">付款账号后4位</span> <span v-show="formobj.collectionTypeKey === '03' || formobj.collectionTypeKey === '05'">付款账号后4位</span>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item> <el-form-item>
<span v-show="formobj.collectionTypeKey === '03'">{{ formobj.payAccount }}</span> <span v-show="formobj.collectionTypeKey === '03' || formobj.collectionTypeKey === '05'">{{ formobj.payAccount }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<span v-show="formobj.collectionTypeKey === '03'">付款银行</span> <span v-show="formobj.collectionTypeKey === '03' || formobj.collectionTypeKey === '05'">付款银行</span>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item> <el-form-item>
<span v-show="formobj.collectionTypeKey === '03'">{{ formobj.payBank }}</span> <span v-show="formobj.collectionTypeKey === '03' || formobj.collectionTypeKey === '05'">{{ formobj.payBank }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

4
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue
View File

@ -229,7 +229,7 @@ export default {
createBySid: '', createBySid: '',
state: '', state: '',
orgPath: '', orgPath: '',
auditState: '' auditState: 1
}, },
total: 0 total: 0
} }
@ -335,7 +335,7 @@ export default {
createBySid: '', createBySid: '',
state: '', state: '',
orgPath: '', orgPath: '',
auditState: '' auditState: 1
}, },
total: 0 total: 0
} }

10
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue
View File

@ -96,7 +96,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-show="formobj.collectionTypeKey === '03'"> <el-row v-show="formobj.collectionTypeKey === '03' || formobj.collectionTypeKey === '05'">
<el-col :span="4" class="tleftb balanceStyle"> <el-col :span="4" class="tleftb balanceStyle">
<span>收款银行账号</span> <span>收款银行账号</span>
</el-col> </el-col>
@ -132,19 +132,19 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<span v-show="formobj.collectionTypeKey === '03'">付款账号后4位</span> <span v-show="formobj.collectionTypeKey === '03' || formobj.collectionTypeKey === '05'">付款账号后4位</span>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item> <el-form-item>
<span v-show="formobj.collectionTypeKey === '03'">{{ formobj.payAccount }}</span> <span v-show="formobj.collectionTypeKey === '03' || formobj.collectionTypeKey === '05'">{{ formobj.payAccount }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<span v-show="formobj.collectionTypeKey === '03'">付款银行</span> <span v-show="formobj.collectionTypeKey === '03' || formobj.collectionTypeKey === '05'">付款银行</span>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item> <el-form-item>
<span v-show="formobj.collectionTypeKey === '03'">{{ formobj.payBank }}</span> <span v-show="formobj.collectionTypeKey === '03' || formobj.collectionTypeKey === '05'">{{ formobj.payBank }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

5
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
View File

@ -177,7 +177,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
qw.eq("staffUserSid", query.getCreateBySid()); qw.eq("staffUserSid", query.getCreateBySid());
} }
} else { } else {
qw.ne("auditState", 0); if (StringUtils.isNotBlank(query.getAuditState())) {
qw.eq("auditState", query.getAuditState());
}
// qw.ne("auditState", 0);
} }
} }
qw.orderByDesc("id"); qw.orderByDesc("id");

Write Preview
Loading…
Cancel
Save