Browse Source

资产下拉组件增加资产编码

ljb 5 months ago
parent
commit
79356dba39

+ 1 - 1
src/components/asset-select/index.vue

@@ -12,7 +12,7 @@
     <el-option
       v-for="item in listData"
       :key="item.value"
-      :label="item.title"
+      :label="`${item.title} (${item.zcbm || '-'})`"
       :value="item.value">
     </el-option>
   </el-select>

+ 1 - 0
src/views/basic-resource/comp-basic-info/ky-asset-list.vue

@@ -340,6 +340,7 @@ export default window.$crudCommon({
   res: ({ data }) => {
     data.records = data.records.map(item => {
       item.jcz = new Decimal(item.jcz || 0).mul(new Decimal(100));
+      item.gl = item.gl === '' ? undefined : item.gl;
       return item;
     });
     return data;

+ 1 - 1
src/views/project-manage/components/apply-form.vue

@@ -215,7 +215,7 @@
                 <div class="year-list-item" v-for="year of yearList" :key="year" :style="{ height: yearList.length == 1 ? '51px' : '32px', lineHeight: yearList.length == 1 ? '51px' : '32px' }">
                   <div class="year" >{{ year }}</div>
                   <div class="year-input">
-                    <input v-if="!isPrintPage" v-model="formData[year]" type="number" @input="handleYearInput" style="padding: 0 6px;" :disabled="isDisabled" />
+                    <input v-if="!isPrintPage" v-model="formData[year]" type="number" @input="handleYearInput" style="padding: 0 0 0 4px; box-sizing: border-box;" :disabled="isDisabled" />
                     <span v-else style="padding-left: 12px;">{{ formData[year] }}万元</span>
                   </div>
                 </div>

+ 0 - 2
src/views/project-manage/components/zjfyycqdtfy-cost.vue

@@ -79,8 +79,6 @@ import moment from "moment";
 import Decimal from "decimal.js";
 import assetSelect from "@/components/asset-select";
 
-
-
 export default window.$crudCommon({
   props: {
     projectId: [String, Number],