1.完善机器设备生成与作价等功能

src/views/assets/workbench/calculate/baseInfo.vue

@@ -50,6 +50,14 @@ export default {
     computed: {
         ...mapStores(assetsProjectInfo),
     },
+    created() {
+        if(this.projectStore.calculateProgress) {
+            this.baseInfo.id = this.projectStore.calculateProgress.id;
+            this.baseInfo.projectId = this.projectStore.projectInfo.id;
+            this.baseInfo.calculateName = this.projectStore.calculateProgress.calculateName;
+            this.baseInfo.valuationBasisDate = this.projectStore.calculateProgress.valuationBasisDate;
+        }
+    },
     methods: {
         // 创建测算表,填写测算表基础信息
         createCalculate() {

src/views/assets/workbench/calculate/eqptBaseInfo.vue

@@ -49,7 +49,7 @@
 import { mapStores } from 'pinia'
 import { assetsProjectInfo } from '@/stores/assetsProjectStore';
 import { hasImportedEquipment } from '@/api/assetsCalculateEqptData';
-import { updateCalculateBaseInfo } from '@/api/assetsCalculate';
+import { updateCalculateBaseInfo, getCalculateBaseInfo } from '@/api/assetsCalculate';
 
 export default {
     data() {
@@ -69,11 +69,14 @@ export default {
                 managementExpenseRatio: [
                     { required: true, message: '请输入建设单位管理费率', trigger: 'blur' }
                 ]
-            }
+            },
+            needUpdateStore: true
         }
     },
     created() {
-
+        if(this.projectStore.calculateProgress) {
+            this.getBaseInfo();
+        }
     },
     computed: {
         ...mapStores(assetsProjectInfo),
@@ -94,12 +97,24 @@ export default {
                                 type: 'success'
                             })
                             // 更新本地缓存的测算表进度
-                            this.projectStore.calculateProgress.progress = 'IMPORT';
+                            if (this.needUpdateStore) {
+                                this.projectStore.calculateProgress.progress = 'IMPORT';
+                            }
                             this.$router.push('/home/assets/workbench/calculate/importInfo');
                         }
                     })
                 }
             })
+        },
+        // 获取测算表基础信息
+        getBaseInfo() {
+            getCalculateBaseInfo(this.projectStore.calculateProgress.id).then(res => {
+                if (res.data) {
+                    this.eqptBaseInfo = JSON.parse(res.data);
+                    // 返回不为空说明该步骤以前已经完成了,不需要更新本地缓存
+                    this.needUpdateStore = false;
+                }
+            })
         }
     }
 }

src/views/assets/workbench/calculate/importInfo.vue

@@ -15,7 +15,7 @@
                 :auto-upload="false" :http-request="importEqptExcelData">
                 <el-icon class="el-icon--upload"><upload-filled /></el-icon>
                 <div class="el-upload__text">
-                    拖拽文件 <em>或点击上传</em>
+                    拖拽文件 <em>或点击上传</em> 申报表
                 </div>
                 <template #tip>
                     <div class="el-upload__tip">
@@ -424,7 +424,7 @@
                     <template #default="{ row }">
                         <el-form-item prop="sortId">
                             <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.sortId" />
+                                <el-input v-model="row.sortId" disabled/>
                             </el-form>
                         </el-form-item>
                     </template>
@@ -433,7 +433,7 @@
                     <template #default="{ row }">
                         <el-form-item prop="equipmentName">
                             <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.equipmentName" placeholder="请输入设备名称" />
+                                <el-input v-model="row.equipmentName" placeholder="设备名称" disabled/>
                             </el-form>
                         </el-form-item>
                     </template>
@@ -442,7 +442,7 @@
                     <template #default="{ row }">
                         <el-form-item prop="model">
                             <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.model" placeholder="请输入规格型号" />
+                                <el-input v-model="row.model" placeholder="规格型号" disabled/>
                             </el-form>
                         </el-form-item>
                     </template>
@@ -451,7 +451,7 @@
                     <template #default="{ row }">
                         <el-form-item prop="manufacturer">
                             <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.manufacturer" placeholder="请输入生产厂家" />
+                                <el-input v-model="row.manufacturer" placeholder="生产厂家" disabled/>
                             </el-form>
                         </el-form-item>
                     </template>
@@ -460,7 +460,7 @@
                     <template #default="{ row }">
                         <el-form-item prop="unitOfMeasurement">
                             <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.unitOfMeasurement" placeholder="请输入计量单位" />
+                                <el-input v-model="row.unitOfMeasurement" placeholder="计量单位" disabled/>
                             </el-form>
                         </el-form-item>
                     </template>
@@ -469,7 +469,7 @@
                     <template #default="{ row }">
                         <el-form-item prop="quantity">
                             <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.quantity" placeholder="请输入数量" />
+                                <el-input v-model="row.quantity" placeholder="数量" disabled/>
                             </el-form>
                         </el-form-item>
                     </template>
@@ -478,7 +478,7 @@
                     <template #default="{ row }">
                         <el-form-item prop="purchaseDate">
                             <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.purchaseDate" placeholder="请输入购置日期" />
+                                <el-input v-model="row.purchaseDate" placeholder="购置日期" disabled/>
                             </el-form>
                         </el-form-item>
                     </template>
@@ -487,7 +487,7 @@
                     <template #default="{ row }">
                         <el-form-item prop="activationDate">
                             <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.activationDate" placeholder="请输入启用日期" />
+                                <el-input v-model="row.activationDate" placeholder="=启用日期" disabled/>
                             </el-form>
                         </el-form-item>
                     </template>
@@ -496,7 +496,7 @@
                     <template #default="{ row }">
                         <el-form-item prop="originalValue">
                             <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.bookOriginalValue" placeholder="请输入账面原值" />
+                                <el-input v-model="row.bookOriginalValue" placeholder="账面原值" disabled/>
                             </el-form>
                         </el-form-item>
                     </template>
@@ -688,7 +688,7 @@
                     <template #default="{ row }">
                         <el-form-item prop="sortId">
                             <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.sortId" />
+                                <el-input v-model="row.sortId" disabled/>
                             </el-form>
                         </el-form-item>
                     </template>
@@ -706,7 +706,7 @@
                     <template #default="{ row }">
                         <el-form-item prop="equipmentName">
                             <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.equipmentName" />
+                                <el-input v-model="row.equipmentName" disabled/>
                             </el-form>
                         </el-form-item>
                     </template>
@@ -715,7 +715,7 @@
                     <template #default="{ row }">
                         <el-form-item prop="model">
                             <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.model" />
+                                <el-input v-model="row.model" disabled/>
                             </el-form>
                         </el-form-item>
                     </template>
@@ -724,7 +724,7 @@
                     <template #default="{ row }">
                         <el-form-item prop="manufacturer">
                             <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.manufacturer" />
+                                <el-input v-model="row.manufacturer" disabled/>
                             </el-form>
                         </el-form-item>
                     </template>
@@ -742,7 +742,7 @@
                     <template #default="{ row }">
                         <el-form-item prop="unitOfMeasurement">
                             <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.unitOfMeasurement" />
+                                <el-input v-model="row.unitOfMeasurement" disabled/>
                             </el-form>
                         </el-form-item>
                     </template>
@@ -751,7 +751,7 @@
                     <template #default="{ row }">
                         <el-form-item prop="quantity">
                             <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.quantity" />
+                                <el-input v-model="row.quantity" disabled/>
                             </el-form>
                         </el-form-item>
                     </template>
@@ -760,7 +760,7 @@
                     <template #default="{ row }">
                         <el-form-item prop="purchaseDate">
                             <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.purchaseDate" />
+                                <el-input v-model="row.purchaseDate" disabled/>
                             </el-form>
                         </el-form-item>
                     </template>
@@ -769,7 +769,7 @@
                     <template #default="{ row }">
                         <el-form-item prop="activationDate">
                             <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.activationDate" />
+                                <el-input v-model="row.activationDate" disabled/>
                             </el-form>
                         </el-form-item>
                     </template>
@@ -779,7 +779,7 @@
                         <template #default="{ row }">
                             <el-form-item prop="bookOriginalValue">
                                 <el-form :model="row" @submit.native.prevent>
-                                    <el-input v-model="row.bookOriginalValue" />
+                                    <el-input v-model="row.bookOriginalValue" disabled/>
                                 </el-form>
                             </el-form-item>
                         </template>
@@ -788,7 +788,7 @@
                         <template #default="{ row }">
                             <el-form-item prop="bookNetValue">
                                 <el-form :model="row" @submit.native.prevent>
-                                    <el-input v-model="row.bookNetValue" />
+                                    <el-input v-model="row.bookNetValue" disabled/>
                                 </el-form>
                             </el-form-item>
                         </template>
@@ -798,7 +798,7 @@
                     <template #default="{ row }">
                         <el-form-item prop="remark">
                             <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.remark" />
+                                <el-input v-model="row.remark" disabled/>
                             </el-form>
                         </el-form-item>
                     </template>
@@ -807,7 +807,7 @@
                     <template #default="{ row }">
                         <el-form-item prop="inquiryBasis">
                             <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.inquiryBasis" />
+                                <el-input v-model="row.inquiryBasis" disabled/>
                             </el-form>
                         </el-form-item>
                     </template>
@@ -816,7 +816,7 @@
                     <template #default="{ row }">
                         <el-form-item prop="inquiryLocation">
                             <el-form :model="row" @submit.native.prevent>
-                                <el-input v-model="row.inquiryLocation" />
+                                <el-input v-model="row.inquiryLocation" disabled/>
                             </el-form>
                         </el-form-item>
                     </template>