@@ -740,10 +750,10 @@ export default {
width: 140,
prop: 'req_status',
formatter: (cell, data, value) => {
- if (cell.is_substitute) {
+ if (cell.is_substitute && !cell.has_charge) {
return '无'
}
- if (cell.is_plan === 1) {
+ if (cell.is_plan === 1 && !cell.has_charge) {
return '无'
}
switch (value) {
@@ -1124,6 +1134,7 @@ export default {
form: {
name: "",
is_simple:0,
+ has_charge: 0,
supply: "",
money:0,
type: "",
@@ -1293,7 +1304,7 @@ export default {
columnIndex
}) {
if (column.property === 'req_status') {
- if (row.is_plan || row.is_substitute || row.is_simple) {
+ if ((row.is_plan || row.is_substitute || row.is_simple) && !row.has_charge) {
return {
'color': 'rgb(140,140,140)'
}
@@ -1748,6 +1759,7 @@ export default {
}),
is_substitute: this.form.is_substitute,
is_simple:this.form.is_simple,
+ has_charge: this.form.has_charge,
supply:this.form.supply,
money:this.form?.money,
status:this.form?.is_simple ? 2 : 1,
diff --git a/src/views/finance/components/addPropertyPlan.vue b/src/views/finance/components/addPropertyPlan.vue
index 62c8e97..90cae14 100644
--- a/src/views/finance/components/addPropertyPlan.vue
+++ b/src/views/finance/components/addPropertyPlan.vue
@@ -37,7 +37,7 @@
*
- 项目 :
+ 项目库选择 :