From f976a9d42838ef20aac2b5df0276512860b9e203 Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Thu, 18 Sep 2025 17:04:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=83=E6=98=9F=E5=85=B3=EF=BC=9A=E8=B5=84?=
=?UTF-8?q?=E6=BA=90=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/sunVillage_info/resourceAdd.vue | 74 +++++---
src/views/sunVillage_info/resourceDetail.vue | 76 +++++---
src/views/sunVillage_info/resourceEdit.vue | 172 ++++++++++---------
3 files changed, 187 insertions(+), 135 deletions(-)
diff --git a/src/views/sunVillage_info/resourceAdd.vue b/src/views/sunVillage_info/resourceAdd.vue
index 483942d8..140b4f14 100644
--- a/src/views/sunVillage_info/resourceAdd.vue
+++ b/src/views/sunVillage_info/resourceAdd.vue
@@ -100,31 +100,34 @@
/>
-
-
-
-
+ requiredx
+ remote-url="/open/zdzh/list/sys_normal_disable"
+ :on-remote-response="'data'"/>
+
+
+
+
+
+
+
+
@@ -252,7 +255,7 @@
addType:'1',
buildTime:this.format(new Date(),'yyyy-MM-dd'),
useType:'1',
- assetStatus:'1',
+ status:'0',
isMin:'Y',
isFormAsset:'N',
quantity:1.00,
@@ -268,7 +271,10 @@
netSalvage:0.00,
fixedValue:null,
perYearDepreciationValue:null,
- depreciationValue:0
+ depreciationValue:0,
+ utilizationStatus: "1",
+ useBy: null,
+ checkSituation: null,
},
//资产类别
assetType:'房屋及建筑物',
@@ -288,6 +294,9 @@
//资产状态
assetStatusOptions:[],
showAssetStatus:false,
+ utilizationStatusOptions: [],
+ showUtilizationStatus:false,
+ utilizationStatus: '已利用',
assetStatus:'正常',
//资产状态
depreciationTypeOptions:[],
@@ -311,21 +320,21 @@
};
},
created() {
- this.houseGetDicts("resource_sort").then((response) => {
+ /*this.houseGetDicts("resource_sort").then((response) => {
for(var i = 0 ; i < response.data.length ; i++){
this.resourceSortOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
}
- });
+ });*/
this.houseGetDicts("operation_type").then((response) => {
for(var i = 0 ; i < response.data.length ; i++){
this.operationTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
}
});
- this.houseGetDicts("add_type").then((response) => {
+ /*this.houseGetDicts("add_type").then((response) => {
for(var i = 0 ; i < response.data.length ; i++){
this.addTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
}
- });
+ });*/
this.houseGetDicts("use_type").then((response) => {
for(var i = 0 ; i < response.data.length ; i++){
this.useTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
@@ -336,10 +345,15 @@
this.assetStatusOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
}
});
- this.houseGetDicts("depreciation_type").then((response) => {
+ /* this.houseGetDicts("depreciation_type").then((response) => {
for(var i = 0 ; i < response.data.length ; i++){
this.depreciationTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
}
+ });*/
+ this.getDicts("utilization_status").then(response => {
+ for(var i = 0 ; i < response.data.length ; i++){
+ this.utilizationStatusOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+ }
});
// this.houseGetDicts("resource_farming_type").then((response) => {
// for(var i = 0 ; i < response.data.length ; i++){
@@ -426,7 +440,11 @@
this.form.status = data.value;
this.showAssetStatus = false;
},
-
+ onConfirmUtilizationStatus(data){
+ this.utilizationStatus = data.text;
+ this.form.utilizationStatus = data.value;
+ this.showUtilizationStatus = false;
+ },
onSubmit(){
addResource(this.form).then(response => {
if (response.code == 200){
diff --git a/src/views/sunVillage_info/resourceDetail.vue b/src/views/sunVillage_info/resourceDetail.vue
index 32cbe823..8b1fc879 100644
--- a/src/views/sunVillage_info/resourceDetail.vue
+++ b/src/views/sunVillage_info/resourceDetail.vue
@@ -51,28 +51,36 @@
remote-url="/open/zdzh/list/operation_type"
:on-remote-response="'data'"/>
-
+ remote-url="/open/zdzh/list/use_type"
+ :on-remote-response="'data'"/>
-
+ remote-url="/open/zdzh/list/sys_normal_disable"
+ :on-remote-response="'data'"/>
+
+
+
+
+
+
@@ -203,7 +211,7 @@
addType:'1',
buildTime:this.format(new Date(),'yyyy-MM-dd'),
useType:'1',
- assetStatus:'1',
+ status:'1',
isMin:'Y',
isFormAsset:'N',
quantity:1.00,
@@ -219,7 +227,10 @@
netSalvage:0.00,
fixedValue:null,
perYearDepreciationValue:null,
- depreciationValue:0
+ depreciationValue:0,
+ utilizationStatus: null,
+ useBy: null,
+ checkSituation: null,
},
//资产类别
assetType:'房屋及建筑物',
@@ -245,7 +256,9 @@
depreciationTypeOptions:[],
showDepreciationType:false,
depreciationType:'不折旧',
-
+ utilizationStatusOptions: [],
+ showUtilizationStatus:false,
+ utilizationStatus: '已利用',
showBuildTime:false,
auditStatus:[],
loading: false,
@@ -263,21 +276,26 @@
};
},
created() {
- this.houseGetDicts("resource_sort").then((response) => {
+ /* this.houseGetDicts("resource_sort").then((response) => {
for(var i = 0 ; i < response.data.length ; i++){
this.resourceSortOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
}
- });
+ });*/
this.houseGetDicts("operation_type").then((response) => {
for(var i = 0 ; i < response.data.length ; i++){
this.operationTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
}
});
- this.houseGetDicts("add_type").then((response) => {
+ this.getDicts("utilization_status").then(response => {
for(var i = 0 ; i < response.data.length ; i++){
- this.addTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+ this.utilizationStatusOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
}
});
+ /*this.houseGetDicts("add_type").then((response) => {
+ for(var i = 0 ; i < response.data.length ; i++){
+ this.addTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+ }
+ });*/
this.houseGetDicts("use_type").then((response) => {
for(var i = 0 ; i < response.data.length ; i++){
this.useTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
@@ -288,11 +306,11 @@
this.assetStatusOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
}
});
- this.houseGetDicts("depreciation_type").then((response) => {
+ /*this.houseGetDicts("depreciation_type").then((response) => {
for(var i = 0 ; i < response.data.length ; i++){
this.depreciationTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
}
- });
+ });*/
this.houseGetDicts("resource_type").then((response) => {
this.resourceTypeOptionsSelect = response.data;
for(var i = 0 ; i < response.data.length ; i++){
@@ -394,7 +412,11 @@
this.form.status = data.value;
this.showAssetStatus = false;
},
-
+ onConfirmUtilizationStatus(data){
+ this.utilizationStatus = data.text;
+ this.form.utilizationStatus = data.value;
+ this.showUtilizationStatus = false;
+ },
onSubmit(){
updateResource(this.form).then(response => {
if (response.code == 200){
diff --git a/src/views/sunVillage_info/resourceEdit.vue b/src/views/sunVillage_info/resourceEdit.vue
index e2c4c347..2de3c75a 100644
--- a/src/views/sunVillage_info/resourceEdit.vue
+++ b/src/views/sunVillage_info/resourceEdit.vue
@@ -77,51 +77,42 @@
remote-url="/open/zdzh/list/operation_type"
:on-remote-response="'data'"/>
-
-
-
-
+ :rulesx="[{ required: true }]"
+ requiredx
+ remote-url="/open/zdzh/list/use_type"
+ :on-remote-response="'data'"/>
-
-
-
-
+ :rulesx="[{ required: true }]"
+ requiredx
+ remote-url="/open/zdzh/list/sys_normal_disable"
+ :on-remote-response="'data'"/>
+
+
+
+
+
+
@@ -247,33 +238,40 @@
applicationList:[],
applicationListSecond:[],
form:{
- assetType:'151001',
+ assetType: null,
operationType: null,
- addType:'1',
- buildTime:this.format(new Date(),'yyyy-MM-dd'),
- useType:'1',
- assetStatus:'1',
- isMin:'Y',
- isFormAsset:'N',
- quantity:1.00,
- depreciationSubject:"152:累计折旧",
- fixedSubject:"153:固定资产清理",
- depreciationFeeSubject:"541005:管理费用-折旧及修理费",
- depreciationType:'3',
- expectedYears:1,
- depreciationYears:0,
- netValue:0.00,
- originalValue:0.00,
- residualsRate:1,
- netSalvage:0.00,
- fixedValue:null,
- perYearDepreciationValue:null,
- depreciationValue:0
+ addType: null,
+ buildTime: null,
+ useType: null,
+ assetStatus: null,
+ isMin: null,
+ isFormAsset: null,
+ quantity: null,
+ depreciationSubject: null,
+ fixedSubject: null,
+ depreciationFeeSubject:null,
+ depreciationType: null,
+ expectedYears: null,
+ depreciationYears: null,
+ netValue: null,
+ originalValue: null,
+ residualsRate: null,
+ netSalvage: null,
+ fixedValue: null,
+ perYearDepreciationValue: null,
+ depreciationValue: null,
+ utilizationStatus: null,
+ useBy: null,
+ checkSituation: null,
},
//资产类别
assetType:'房屋及建筑物',
showAssetType:false,
resourceSortOptions:[],
+ // 利用状况
+ utilizationStatusOptions: [],
+ showUtilizationStatus:false,
+ utilizationStatus: '已利用',
//经营属性
operationType:'经营性',
showOperationType:false,
@@ -312,21 +310,26 @@
};
},
created() {
- this.houseGetDicts("resource_sort").then((response) => {
+ /*this.houseGetDicts("resource_sort").then((response) => {
for(var i = 0 ; i < response.data.length ; i++){
this.resourceSortOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
}
- });
+ });*/
this.houseGetDicts("operation_type").then((response) => {
for(var i = 0 ; i < response.data.length ; i++){
this.operationTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
}
});
- this.houseGetDicts("add_type").then((response) => {
+ this.getDicts("utilization_status").then(response => {
for(var i = 0 ; i < response.data.length ; i++){
- this.addTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+ this.utilizationStatusOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
}
});
+/* this.houseGetDicts("add_type").then((response) => {
+ for(var i = 0 ; i < response.data.length ; i++){
+ this.addTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+ }
+ });*/
this.houseGetDicts("use_type").then((response) => {
for(var i = 0 ; i < response.data.length ; i++){
this.useTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
@@ -337,11 +340,11 @@
this.assetStatusOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
}
});
- this.houseGetDicts("depreciation_type").then((response) => {
+ /*this.houseGetDicts("depreciation_type").then((response) => {
for(var i = 0 ; i < response.data.length ; i++){
this.depreciationTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
}
- });
+ });*/
this.houseGetDicts("resource_type").then((response) => {
this.resourceTypeOptionsSelect = response.data;
for(var i = 0 ; i < response.data.length ; i++){
@@ -358,22 +361,29 @@
this.houseGetDicts("resources_unused_type").then((response) => {
this.unusedResourceTypeOptionsSelect = response.data;
});
+
this.getDetail();
},
methods: {
getDetail(){
getResource(this.$route.query.id).then(response => {
+ if (response.code == 200) {
+ this.form = response.data;
- this.form = response.data;
- this.resourceType = this.selectDictLabel(this.resourceTypeOptionsSelect, response.data.resourceType);
- if(response.data.resourceType == 1){
- this.resourceSort = this.selectDictLabel(this.farmingResourceTypeOptionsSelect, response.data.resourceSort);
- }
- if(response.data.resourceType == 2){
- this.resourceSort = this.selectDictLabel(this.buildResourceTypeOptionsSelect, response.data.resourceSort);
- }
- if(response.data.resourceType == 3){
- this.resourceSort = this.selectDictLabel(this.unusedResourceTypeOptionsSelect, response.data.resourceSort);
+ this.resourceType = this.selectDictLabel(this.resourceTypeOptionsSelect, response.data.resourceType);
+ if (response.data.resourceType == 1) {
+ this.resourceSort = this.selectDictLabel(this.farmingResourceTypeOptionsSelect, response.data.resourceSort);
+ }
+ if (response.data.resourceType == 2) {
+ this.resourceSort = this.selectDictLabel(this.buildResourceTypeOptionsSelect, response.data.resourceSort);
+ }
+ if (response.data.resourceType == 3) {
+ this.resourceSort = this.selectDictLabel(this.unusedResourceTypeOptionsSelect, response.data.resourceSort);
+ }
+ //this.operationType = this.selectDictLabel(this.operationTypeOptions, response.data.operationType);
+ //this.useType = this.selectDictLabel(this.useTypeOptions, response.data.useType);
+ //this.assetStatus = this.selectDictLabel(this.assetStatusOptions, response.data.status);
+ //this.utilizationStatus = this.selectDictLabel(this.utilizationStatusOptions, response.data.utilizationStatus);
}
});
@@ -425,8 +435,6 @@
});
}
-
-
},
onConfirmResourceSort(data){
this.resourceSort = data.text;
@@ -443,7 +451,11 @@
this.form.status = data.value;
this.showAssetStatus = false;
},
-
+ onConfirmUtilizationStatus(data){
+ this.utilizationStatus = data.text;
+ this.form.utilizationStatus = data.value;
+ this.showUtilizationStatus = false;
+ },
onSubmit(){
updateResource(this.form).then(response => {
if (response.code == 200){