Bladeren bron

生产设备台账

quwangxin 3 jaren geleden
bovenliggende
commit
e1df68ecdb

+ 30 - 36
src/views/ledgerAssets/equipment/components/equipment-list.vue

@@ -23,9 +23,15 @@
         </el-button>
       </template>
       <!-- 编码列 -->
-      <template v-slot:code="{ row }">
-        <el-link @click="details(row)">
-          {{ row.code }}
+      <!-- 操作列 -->
+      <template v-slot:action="{ row }">
+        <el-link
+          type="primary"
+          :underline="false"
+          icon="el-icon-edit"
+          @click="handEdit(row)"
+        >
+          编辑
         </el-link>
       </template>
     </ele-pro-table>
@@ -57,71 +63,59 @@
             fixed: 'left'
           },
           {
-            prop: 'code',
-            label: '类别编码',
+            prop: 'assetCode',
+            label: '设备编码',
             showOverflowTooltip: true,
             minWidth: 110,
             slot: 'code'
           },
           {
-            prop: 'name',
-            label: '类别名称',
-            showOverflowTooltip: true,
-            minWidth: 110
-          },
-          {
-            prop: 'module',
-            label: '型号',
-            showOverflowTooltip: true,
-            minWidth: 110
-          },
-          {
-            prop: 'specification',
-            label: '规格',
+            prop: 'assetName',
+            label: '设备名称',
             showOverflowTooltip: true,
             minWidth: 110
           },
           {
-            prop: 'angle',
-            label: '角度',
+            prop: 'fixAssetCode',
+            label: '固资编码',
             showOverflowTooltip: true,
             minWidth: 110
           },
           {
-            prop: 'width',
-            label: '长*宽*高',
+            prop: 'module',
+            label: '型号',
             showOverflowTooltip: true,
             minWidth: 110
           },
           {
-            prop: 'categoryLevelPath',
-            label: '分类',
+            prop: 'specification',
+            label: '规格',
             showOverflowTooltip: true,
             minWidth: 110
           },
           {
-            prop: 'inUseSum',
-            label: '在用',
+            prop: 'location',
+            label: '位置',
             showOverflowTooltip: true,
             minWidth: 110
           },
           {
-            prop: 'inLibrarySum',
-            label: '在库',
+            prop: 'source',
+            label: '生命周期',
             showOverflowTooltip: true,
             minWidth: 110
           },
           {
-            prop: 'consumeSum',
-            label: '消耗',
+            prop: 'networkStatus',
+            label: '网络状态',
             showOverflowTooltip: true,
             minWidth: 110
           },
           {
-            prop: 'totalSum',
-            label: '总数量',
-            showOverflowTooltip: true,
-            minWidth: 110
+            columnKey: 'action',
+            slot: 'action',
+            label: '操作',
+            minWidth: 60
           }
         ]
       };
@@ -144,7 +138,7 @@
       },
 
       // 跳转到详情页
-      details ({ id }) {
+      handEdit ({ id }) {
         this.$router.push({
           path: '/ledgerAssets/boat/detail',
           query: {

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

@@ -8,12 +8,12 @@
   >
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="设备编码:" label-width="50px">
+        <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="50px">
+        <el-form-item label="固资编码:" label-width="100px">
           <el-input
             clearable
             v-model="where.fixAssetCode"
@@ -22,12 +22,12 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="设备名称:" label-width="50px">
+        <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="50px">
+        <el-form-item label="规格/型号:" label-width="100px">
           <el-input
             clearable
             v-model="where.spaceModule"