refactor: 重构设备搜索组件并新增列字段

将多个资产模块的搜索组件统一为 equipment-search，并使用 seekPage 组件重构；
新增制造厂、制造日期、建账日期等表格列；
更新日期选择器事件为 blur 并调整默认宽度。

src/components/seekPage.vue

@@ -37,23 +37,45 @@
             <div v-if="item.type == 'date'">
               <el-date-picker
                 v-model="defaultWhere[item.value]"
-                @visible-change="change"
+                @blur="change"
                 :type="item.dateType || 'daterange'"
                 range-separator="至"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                :style="{ width: item.width ? item.width + 'px' : '220px' }"
+                :value-format="item.valueFormat || 'yyyy-MM-dd HH:mm:ss'"
+                :style="{
+                  width: item.width ? item.width + 'px' : '230px'
+                }"
               >
               </el-date-picker>
             </div>
+            <div v-if="item.type == 'DictSelection'">
+              <dict-selection
+                v-model="defaultWhere[item.value]"
+                :placeholder="item.placeholder || '请选择内容'"
+                :multiple="item.multiple ? item.multiple : false"
+                :style="{
+                  width: item.width ? item.width + 'px' : '220px'
+                }"
+                :dictName="item.dictName"
+              >
+              </dict-selection>
+            </div>
             <div v-if="item.type == 'personSelect'">
               <personSelect
-              v-model="defaultWhere[item.value]"
+                v-model="defaultWhere[item.value]"
                 :style="{ width: item.width ? item.width + 'px' : '220px' }"
               ></personSelect>
             </div>
           </div>
+          <div v-if="item.type == 'DeptSelect'">
+            <DeptSelect
+              v-model="defaultWhere[item.value]"
+              :style="{
+                width: item.width ? item.width + 'px' : '220px'
+              }"
+            ></DeptSelect>
+          </div>
         </el-form-item>
       </el-form-item>
 
@@ -124,13 +146,43 @@
                           range-separator="至"
                           start-placeholder="开始日期"
                           end-placeholder="结束日期"
-                          value-format="yyyy-MM-dd HH:mm:ss"
+                          :value-format="
+                            item.valueFormat || 'yyyy-MM-dd HH:mm:ss'
+                          "
                           :style="{
-                            width: item.width ? item.width + 'px' : '220px'
+                            width: item.width ? item.width + 'px' : '230px'
                           }"
                         >
                         </el-date-picker>
                       </div>
+                      <div v-if="item.type == 'DictSelection'">
+                        <dict-selection
+                          v-model="defaultWhere[item.value]"
+                          :placeholder="item.placeholder || '请选择内容'"
+                          :multiple="item.multiple ? item.multiple : false"
+                          :style="{
+                            width: item.width ? item.width + 'px' : '220px'
+                          }"
+                          :dictName="item.dictName"
+                        >
+                        </dict-selection>
+                      </div>
+                      <div v-if="item.type == 'personSelect'">
+                        <personSelect
+                          v-model="defaultWhere[item.value]"
+                          :style="{
+                            width: item.width ? item.width + 'px' : '220px'
+                          }"
+                        ></personSelect>
+                      </div>
+                      <div v-if="item.type == 'DeptSelect'">
+                        <DeptSelect
+                          v-model="defaultWhere[item.value]"
+                          :style="{
+                            width: item.width ? item.width + 'px' : '220px'
+                          }"
+                        ></DeptSelect>
+                      </div>
                     </el-form-item>
                   </el-form-item>
                 </el-form>
@@ -159,6 +211,7 @@
 
 <script>
   import personSelect from '@/components/CommomSelect/person-select.vue';
+  import DeptSelect from '@/components/CommomSelect/dept-select.vue';
 
   let defaultWhere = {};
   export default {
@@ -173,7 +226,7 @@
       }
     },
 
-    components: { personSelect },
+    components: { personSelect, DeptSelect },
     watch: {
       seekList: {
         handler(val) {

src/views/ledgerAssets/accountingLedger/components/list.vue

@@ -171,8 +171,7 @@
     sourceStatus
   } from '@/utils/dict/warehouse';
 
-  import EquipmentSearch from './search.vue';
-
+  import EquipmentSearch from '@/views/ledgerAssets/equipment/components/equipment-search.vue';
   import { getAssetList, getNetworkCount, batchDel } from '@/api/ledgerAssets';
   import dictMixins from '@/mixins/dictMixins';
   import axios from 'axios';
@@ -196,8 +195,7 @@
     props: {
       // 类别id
       categoryId: [Number, String],
-      rootId: [Number, String],
- 
+      rootId: [Number, String]
     },
     data() {
       return {
@@ -282,6 +280,24 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
+          {
+            prop: 'manufacturer',
+            label: '制造厂',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'manufactureTime',
+            label: '制造日期',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'createAccountsTime',
+            label: '建账日期',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'postName',
             label: '使用单位',
@@ -605,7 +621,6 @@
     watch: {
       // 监听类别id变化
       categoryId(val) {
-      
         this.reload();
       }
     }

src/views/ledgerAssets/boat/components/boat-list.vue

@@ -9,7 +9,7 @@
     <!-- 数据表格 -->
     <ele-pro-table
       ref="table"
-:pageSizes="tablePageSizes"
+      :pageSizes="tablePageSizes"
       :columns="columns"
       :datasource="datasource"
       height="calc(100vh - 500px)"
@@ -95,7 +95,9 @@
         >
           编辑
         </el-link>
-        <el-link type="primary" @click="$refs.accountingLedgerListRef.open(row)">表计BOM</el-link>
+        <el-link type="primary" @click="$refs.accountingLedgerListRef.open(row)"
+          >表计BOM</el-link
+        >
       </template>
     </ele-pro-table>
     <print ref="printRef"></print>
@@ -120,7 +122,8 @@
     networkStatus,
     sourceStatus
   } from '@/utils/dict/warehouse';
-  import BoatSearch from './boat-search.vue';
+  import BoatSearch from '@/views/ledgerAssets/equipment/components/equipment-search.vue';
+
   import {
     getBoatList,
     downloadCategory,
@@ -198,7 +201,7 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
-   
+
           {
             prop: 'codeNumber',
             label: '编号',
@@ -217,7 +220,25 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
-            {
+          {
+            prop: 'manufacturer',
+            label: '制造厂',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'manufactureTime',
+            label: '制造日期',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'createAccountsTime',
+            label: '建账日期',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
             prop: 'postName',
             label: '使用单位',
             showOverflowTooltip: true,

src/views/ledgerAssets/equipment/components/detailedList.vue

@@ -354,7 +354,8 @@
           pageNum: page,
           size: limit,
           id: this.attributeData.id,
-          bomType: this.attributeData.bomType
+          bomType: this.attributeData.bomType,
+          status: '1'
         });
       },
       open(row) {

src/views/ledgerAssets/equipment/components/equipment-list.vue

@@ -135,7 +135,9 @@
           编辑
         </el-link>
         <el-link type="primary" @click="handelBOM(row)">BOM</el-link>
-        <el-link type="primary" @click="$refs.accountingLedgerListRef.open(row)">表计BOM</el-link>
+        <el-link type="primary" @click="$refs.accountingLedgerListRef.open(row)"
+          >表计BOM</el-link
+        >
       </template>
     </ele-pro-table>
 
@@ -299,6 +301,24 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
+          {
+            prop: 'manufacturer',
+            label: '制造厂',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'manufactureTime',
+            label: '制造日期',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'createAccountsTime',
+            label: '建账日期',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'postName',
             label: '使用单位',

src/views/ledgerAssets/equipment/components/equipment-search.vue

@@ -1,196 +1,110 @@
-<!-- 搜索表单 -->
 <template>
-  <el-form
-    label-width="77px"
-    class="ele-form-search"
-    @keyup.enter.native="search"
-    @submit.native.prevent
-  >
-    <el-row type="flex" :gutter="15">
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="编码:" label-width="100px">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
-        </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="名称:" label-width="100px">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
-        </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="固资编码:" label-width="100px">
-          <el-input clearable v-model="where.fixCode" placeholder="请输入" />
-        </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="使用单位:" label-width="100px">
-          <DeptSelect v-model="where.postId" @input="selectChange" />
-        </el-form-item>
-      </el-col>
-    </el-row>
-
-    <el-row type="flex" :gutter="15">
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="型号:" label-width="100px">
-          <el-input clearable v-model="where.module" placeholder="请输入" />
-        </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="编号:" label-width="100px">
-          <el-input clearable v-model="where.codeNumber" placeholder="请输入" />
-        </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="网络状态:" label-width="100px">
-          <DictSelection
-            dictName="网络状态"
-            clearable
-            v-model="where.networkStatus"
-          >
-          </DictSelection>
-        </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="生命周期:" label-width="100px">
-          <!-- <DictSelection
-            dictName="生命周期"
-            clearable
-            v-model="where.lifeCycle"
-          >
-          </DictSelection> -->
-          <el-select v-model="where.lifeCycle" size="small" style="width: 100%">
-            <el-option
-              v-for="item in sourceStatus"
-              :value="item.code"
-              :label="item.label"
-              :key="item.code"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row type="flex" :gutter="15">
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="有效期结束" label-width="100px">
-          <el-date-picker
-            style="width: 100%"
-            v-model="where.endTime"
-            value-format="yyyy-MM"
-            type="month"
-            placeholder="选择有效期结束时间"
-          >
-          </el-date-picker>
-        </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="状态" label-width="100px">
-          <el-select v-model="where.status" size="small" style="width: 100%">
-            <el-option
-              v-for="(item, index) in businessStatus"
-              :value="item.code"
-              :key="item.code"
-              :label="item.label"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="级别" label-width="100px">
-          <el-select v-model="where.level" size="small" style="width: 100%">
-            <el-option
-              v-for="(item, index) in assetLevel"
-              :value="item.id"
-              :key="item.code"
-              :label="item.name"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <!--  <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="组织机构:" label-width="100px">
-          <auth-selection data-type="Array" v-model="where.deptIds" style="width: 100%"></auth-selection>
-        </el-form-item>
-      </el-col> -->
-    </el-row>
-    <el-row type="flex" :gutter="15">
-      <el-col v-bind="styleResponsive ? { lg: 24, md: 24 } : { span: 24 }">
-        <div class="ele-form-actions">
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            class="ele-btn-icon"
-            @click="search"
-            size="small"
-          >
-            查询
-          </el-button>
-          <el-button
-            @click="reset"
-            icon="el-icon-refresh-left"
-            size="small"
-            type="primary"
-            >重置</el-button
-          >
-        </div>
-      </el-col>
-    </el-row>
-    <!-- <el-row type="flex">
-      <el-col v-bind="styleResponsive ? { lg: 24, md: 24 } : { span: 24 }">
-        <div class="ele-status">
-          <el-checkbox v-model="consumption">显示已消耗</el-checkbox>
-          <span class="op"
-            >在线：<span>{{ networkCounts.online }}</span></span
-          >
-          <span class="op"
-            >离线：<span>{{ networkCounts.offline }}</span></span
-          >
-        </div>
-      </el-col>
-    </el-row> -->
-  </el-form>
+  <seek-page
+    :seekList="seekList"
+    @search="handleSearch"
+    @reset="handleReset"
+    :formLength="3"
+  />
 </template>
 
 <script>
   import { getByCode } from '@/api/system/dictionary-data';
   import { businessStatus, sourceStatus } from '@/utils/dict/warehouse';
-  import DeptSelect from '@/components/CommomSelect/dept-select.vue';
+
   export default {
     props: ['networkCounts'],
     data() {
-      // 默认表单数据
-      const defaultWhere = {
-        name: '',
-        code: '',
-        endTime: '',
-        networkStatus: '',
-        status: '',
-        fixCode: '',
-        lifeCycle: '',
-        module: '',
-        space: '',
-        postId: ''
-      };
       return {
         assetLevel: [],
         businessStatus,
         sourceStatus: Object.keys(sourceStatus).map((key) => {
           return {
-            code: key,
+            value: key,
             label: sourceStatus[key]
           };
         }),
-        // 表单数据
-        where: { ...defaultWhere },
         consumption: false
       };
     },
-    components: {
-      DeptSelect
-    },
     computed: {
-      // 是否开启响应式布局
-      styleResponsive() {
-        return this.$store.state.theme.styleResponsive;
+      seekList() {
+        return [
+          {
+            label: '编码',
+            value: 'code',
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '名称',
+            value: 'name',
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '使用单位',
+            value: 'postId',
+            type: 'DeptSelect',
+            placeholder: '请选择'
+          },
+          {
+            label: '固资编码',
+            value: 'fixCode',
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '型号',
+            value: 'module',
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '编号',
+            value: 'codeNumber',
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '网络状态',
+            value: 'networkStatus',
+            type: 'DictSelection',
+            dictName: '网络状态',
+            placeholder: '请选择'
+          },
+          {
+            label: '生命周期',
+            value: 'lifeCycle',
+            type: 'select',
+            placeholder: '请选择',
+            selectList: this.sourceStatus
+          },
+          {
+            label: '有效期结束',
+            value: 'endTime',
+            type: 'date',
+            valueFormat: 'yyyy-MM',
+            dateType: 'month',
+            placeholder: '选择有效期结束时间'
+          },
+          {
+            label: '状态',
+            value: 'status',
+            type: 'select',
+            placeholder: '请选择',
+            selectList: this.businessStatus.map((item) => ({
+              value: item.code,
+              label: item.label
+            }))
+          },
+          {
+            label: '级别',
+            value: 'level',
+            type: 'select',
+            placeholder: '请选择',
+            selectList: this.assetLevel
+          }
+        ];
       }
     },
     created() {
@@ -204,48 +118,22 @@
           data.length > 0
             ? data.map((item) => {
                 return {
-                  name: Object.keys(item)[0],
-                  id: item[Object.keys(item)[0]]
+                  label: Object.keys(item)[0],
+                  value: item[Object.keys(item)[0]]
                 };
               })
             : [];
       },
-      /* 清空 */
-      selectChange(value) {
-        if (!value) {
-          this.where.postId = '';
-        }
-      },
+
       /* 搜索 */
-      search() {
-        // if (!this.where.endTime) {
-        //   this.where.endTime = '';
-        // }
-        this.$emit('search', this.where);
+      handleSearch(where) {
+        this.$emit('search', where);
       },
-      /*  重置 */
-      reset() {
-        this.where = { ...this.defaultWhere };
-        this.search();
+
+      /* 重置 */
+      handleReset() {
+        this.$emit('reset');
       }
     }
   };
 </script>
-
-<style lang="scss" scoped>
-  .ele-form-actions {
-    text-align: right;
-  }
-  .ele-status {
-    display: flex;
-    align-content: center;
-    justify-content: flex-end;
-    padding: 0 10px 10px 10px;
-    .op {
-      margin-left: 20px;
-      span {
-        color: #0000ff;
-      }
-    }
-  }
-</style>

src/views/ledgerAssets/material/components/material-list.vue

@@ -9,7 +9,7 @@
     <!-- 数据表格 -->
     <ele-pro-table
       ref="table"
-:pageSizes="tablePageSizes"
+      :pageSizes="tablePageSizes"
       :columns="columns"
       :datasource="datasource"
       height="calc(100vh - 500px)"
@@ -75,7 +75,9 @@
         >
           编辑
         </el-link>
-        <el-link type="primary" @click="$refs.accountingLedgerListRef.open(row)">表计BOM</el-link>
+        <el-link type="primary" @click="$refs.accountingLedgerListRef.open(row)"
+          >表计BOM</el-link
+        >
       </template>
     </ele-pro-table>
     <batchSetDialog ref="batchSetRef" @success="sucesstion" />
@@ -92,7 +94,8 @@
     networkStatus,
     sourceStatus
   } from '@/utils/dict/warehouse';
-  import MaterialSearch from './material-search.vue';
+  import MaterialSearch from '@/views/ledgerAssets/equipment/components/equipment-search.vue';
+
   import {
     getBoatList,
     downloadCategory,
@@ -101,7 +104,12 @@
   import batchSetDialog from '@/views/ledgerAssets/equipment/components/batchSetDialog.vue';
   import DialogMoveto from '@/views/ledgerAssets/equipment/components/DialogMoveTo.vue';
   export default {
-    components: { MaterialSearch, DialogMoveto, batchSetDialog, accountingLedgerList },
+    components: {
+      MaterialSearch,
+      DialogMoveto,
+      batchSetDialog,
+      accountingLedgerList
+    },
     props: {
       // 类别id
       categoryId: [Number, String],
@@ -183,6 +191,24 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
+          {
+            prop: 'manufacturer',
+            label: '制造厂',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'manufactureTime',
+            label: '制造日期',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'createAccountsTime',
+            label: '建账日期',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'postName',
             label: '使用单位',

src/views/ledgerAssets/meter/components/equipment-list.vue

@@ -93,7 +93,9 @@
         >
           编辑
         </el-link>
-        <el-link type="primary" @click="$refs.accountingLedgerListRef.open(row)">表计BOM</el-link>
+        <el-link type="primary" @click="$refs.accountingLedgerListRef.open(row)"
+          >表计BOM</el-link
+        >
       </template>
     </ele-pro-table>
 
@@ -119,7 +121,8 @@
     networkStatus,
     sourceStatus
   } from '@/utils/dict/warehouse';
-  import EquipmentSearch from './equipment-search.vue';
+  import EquipmentSearch from '@/views/ledgerAssets/equipment/components/equipment-search.vue';
+
   import {
     getAssetList,
     downloadAsset,
@@ -235,7 +238,25 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
-            {
+          {
+            prop: 'manufacturer',
+            label: '制造厂',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'manufactureTime',
+            label: '制造日期',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'createAccountsTime',
+            label: '建账日期',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
             prop: 'postName',
             label: '使用单位',
             showOverflowTooltip: true,

src/views/ledgerAssets/mould/components/mould-list.vue

@@ -141,7 +141,8 @@
     networkStatus,
     sourceStatus
   } from '@/utils/dict/warehouse';
-  import MouldSearch from './mould-search.vue';
+  import MouldSearch from '@/views/ledgerAssets/equipment/components/equipment-search.vue';
+
   import { getAssetList, downloadAsset } from '@/api/ledgerAssets';
   import dictMixins from '@/mixins/dictMixins';
   import axios from 'axios';
@@ -242,7 +243,24 @@
             showOverflowTooltip: true,
             minWidth: 130
           },
-
+          {
+            prop: 'manufacturer',
+            label: '制造厂',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'manufactureTime',
+            label: '制造日期',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'createAccountsTime',
+            label: '建账日期',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'postName',
             label: '使用单位',

src/views/ledgerAssets/office/components/data-list.vue

@@ -114,7 +114,9 @@
         >
           编辑
         </el-link>
-        <el-link type="primary" @click="$refs.accountingLedgerListRef.open(row)">表计BOM</el-link>
+        <el-link type="primary" @click="$refs.accountingLedgerListRef.open(row)"
+          >表计BOM</el-link
+        >
       </template>
     </ele-pro-table>
     <print ref="printRef"></print>
@@ -139,7 +141,8 @@
     networkStatus,
     sourceStatus
   } from '@/utils/dict/warehouse';
-  import UserSearch from './user-search.vue';
+  import UserSearch from '@/views/ledgerAssets/equipment/components/equipment-search.vue';
+
   import { getAssetList, downloadAsset } from '@/api/ledgerAssets';
   import dictMixins from '@/mixins/dictMixins';
   import axios from 'axios';
@@ -246,6 +249,24 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
+          {
+            prop: 'manufacturer',
+            label: '制造厂',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'manufactureTime',
+            label: '制造日期',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'createAccountsTime',
+            label: '建账日期',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'postName',
             label: '使用单位',

src/views/ledgerAssets/sparepart/components/sparepart-list.vue

@@ -105,7 +105,9 @@
         >
           编辑
         </el-link>
-        <el-link type="primary" @click="$refs.accountingLedgerListRef.open(row)">表计BOM</el-link>
+        <el-link type="primary" @click="$refs.accountingLedgerListRef.open(row)"
+          >表计BOM</el-link
+        >
       </template>
     </ele-pro-table>
     <print ref="printRef"></print>
@@ -130,7 +132,8 @@
     networkStatus,
     sourceStatus
   } from '@/utils/dict/warehouse';
-  import SparepartSearch from './sparepart-search.vue';
+  import SparepartSearch from '@/views/ledgerAssets/equipment/components/equipment-search.vue';
+
   import { getAssetList, importCategorySparePart } from '@/api/ledgerAssets';
   import dictMixins from '@/mixins/dictMixins';
   import axios from 'axios';
@@ -213,6 +216,24 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
+          {
+            prop: 'manufacturer',
+            label: '制造厂',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'manufactureTime',
+            label: '制造日期',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'createAccountsTime',
+            label: '建账日期',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'postName',
             label: '使用单位',

src/views/ledgerAssets/turnoverCar/components/turnovercar-list.vue

@@ -9,7 +9,7 @@
     <!-- 数据表格 -->
     <ele-pro-table
       ref="table"
-:pageSizes="tablePageSizes"
+      :pageSizes="tablePageSizes"
       :columns="columns"
       :datasource="datasource"
       height="calc(100vh - 500px)"
@@ -102,7 +102,9 @@
         >
           编辑
         </el-link>
-        <el-link type="primary" @click="$refs.accountingLedgerListRef.open(row)">表计BOM</el-link>
+        <el-link type="primary" @click="$refs.accountingLedgerListRef.open(row)"
+          >表计BOM</el-link
+        >
       </template>
     </ele-pro-table>
     <print ref="printRef"></print>
@@ -127,7 +129,8 @@
     networkStatus,
     sourceStatus
   } from '@/utils/dict/warehouse';
-  import TurnovercarSearch from './turnovercar-search.vue';
+  import TurnovercarSearch from '@/views/ledgerAssets/equipment/components/equipment-search.vue';
+
   import { getAssetList, downloadAsset } from '@/api/ledgerAssets';
   import dictMixins from '@/mixins/dictMixins';
   // import { downloadAction } from '@/api/flowable/manage';
@@ -221,6 +224,24 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
+          {
+            prop: 'manufacturer',
+            label: '制造厂',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'manufactureTime',
+            label: '制造日期',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'createAccountsTime',
+            label: '建账日期',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'postName',
             label: '使用单位',

src/views/ledgerAssets/turnoverDisks/components/equipment-list.vue

@@ -8,7 +8,7 @@
     <!-- 数据表格 -->
     <ele-pro-table
       ref="table"
-:pageSizes="tablePageSizes"
+      :pageSizes="tablePageSizes"
       :columns="columns"
       :datasource="datasource"
       height="calc(100vh - 500px)"
@@ -94,7 +94,9 @@
         >
           编辑
         </el-link>
-        <el-link type="primary" @click="$refs.accountingLedgerListRef.open(row)">表计BOM</el-link>
+        <el-link type="primary" @click="$refs.accountingLedgerListRef.open(row)"
+          >表计BOM</el-link
+        >
       </template>
     </ele-pro-table>
     <print ref="printRef"></print>
@@ -115,7 +117,8 @@
   import printTg from '@/views/ledgerAssets/components/printTg';
   import { getByCode } from '@/api/system/dictionary-data';
   import { businessStatus, sourceStatus } from '@/utils/dict/warehouse';
-  import EquipmentSearch from './equipment-search.vue';
+  import EquipmentSearch from '@/views/ledgerAssets/equipment/components/equipment-search.vue';
+
 
   import {
     getAssetList,
@@ -216,7 +219,25 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
-            {
+          {
+            prop: 'manufacturer',
+            label: '制造厂',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'manufactureTime',
+            label: '制造日期',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'createAccountsTime',
+            label: '建账日期',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
             prop: 'postName',
             label: '使用单位',
             showOverflowTooltip: true,