guarantee-lsq 2 years ago
parent
commit
ac2ce4c243
2 changed files with 27 additions and 2 deletions
  1. 25 1
      src/views/sb/info/SbInfoForPartInfo.vue
  2. 2 1
      src/views/sb/info/modules/Detail.vue

+ 25 - 1
src/views/sb/info/SbInfoForPartInfo.vue

@@ -44,7 +44,7 @@
       :data="loadData"
       :alert="options.alert"
       :rowSelection="options.rowSelection"
-      :scroll="{y: BaseTool.Constant.scrollY }"
+      :scroll="{x: 1500, y: BaseTool.Constant.scrollY}"
       showPagination="auto"
     >
       <span slot="action" slot-scope="record">
@@ -112,6 +112,7 @@ export default {
     return {
       // 查询参数
       queryParam: {
+        sbId: this.$route.query.id
       },
       depreciationTypeMap: {},
       levelMap: {},
@@ -170,6 +171,7 @@ export default {
           title: '设备原值',
           dataIndex: 'initialValue',
           width: 200,
+          checked: true,
           customRender: (text, record, index) => {
             return this.BaseTool.Amount.formatter(text)
           }
@@ -178,6 +180,7 @@ export default {
           title: '当前价值',
           dataIndex: 'currentValue',
           width: 200,
+          checked: true,
           customRender: (text, record, index) => {
             return this.BaseTool.Amount.formatter(text)
           }
@@ -186,6 +189,7 @@ export default {
           title: '已折旧价值',
           dataIndex: 'cutValue',
           width: 200,
+          checked: true,
           customRender: (text, record, index) => {
             return this.BaseTool.Amount.formatter(text)
           }
@@ -194,6 +198,7 @@ export default {
           title: '生产商',
           dataIndex: 'producerId',
           width: 200,
+          checked: true,
           customRender: (text, record, index) => {
             return record.producerName
           }
@@ -202,6 +207,7 @@ export default {
           title: '设备来源方式',
           dataIndex: 'sourceType',
           width: 200,
+          checked: true,
           customRender: (text, record, index) => {
             return this.BaseTool.Object.getField(this.sourceTypeMap, text)
           }
@@ -210,6 +216,7 @@ export default {
           title: '来源设备id',
           dataIndex: 'sourceSbId',
           width: 200,
+          checked: true,
           customRender: (text, record, index) => {
             return record.sourceSbName
           }
@@ -218,6 +225,7 @@ export default {
           title: '上级设备',
           dataIndex: 'parentId',
           width: 200,
+          checked: true,
           customRender: (text, record, index) => {
             return record.parentName
           }
@@ -226,6 +234,7 @@ export default {
           title: '计量单位',
           dataIndex: 'unit',
           width: 200,
+          checked: true,
           customRender: (text, record, index) => {
             return this.BaseTool.Object.getField(this.unitMap, text)
           }
@@ -234,6 +243,7 @@ export default {
           title: '设备位置',
           dataIndex: 'positionId',
           width: 200,
+          checked: true,
           customRender: (text, record, index) => {
             return record.positionName
           }
@@ -242,6 +252,7 @@ export default {
           title: '规格型号',
           dataIndex: 'guigeId',
           width: 200,
+          checked: true,
           customRender: (text, record, index) => {
             return record.guigeName
           }
@@ -249,41 +260,49 @@ export default {
         {
           title: '保管人',
           dataIndex: 'saveUser',
+          checked: true,
           width: 200
         },
         {
           title: '购置日期',
           dataIndex: 'buyDate',
+          checked: true,
           width: 200
         },
         {
           title: '投用日期',
           dataIndex: 'startDate',
+          checked: true,
           width: 200
         },
         {
           title: '下次检定日期',
           dataIndex: 'nextCheckDate',
+          checked: true,
           width: 200
         },
         {
           title: '保修截至日期',
           dataIndex: 'guaranteeDate',
+          checked: true,
           width: 200
         },
         {
           title: '预计工作年限',
           dataIndex: 'workYear',
+          checked: true,
           width: 200
         },
         {
           title: '预计报废日期',
           dataIndex: 'retirementDate',
+          checked: true,
           width: 200
         },
         {
           title: '折旧方式',
           dataIndex: 'depreciationType',
+          checked: true,
           width: 200,
           customRender: (text, record, index) => {
             return this.BaseTool.Object.getField(this.depreciationTypeMap, text)
@@ -292,6 +311,7 @@ export default {
         {
           title: '维保手册',
           dataIndex: 'wbFile',
+          checked: true,
           width: 200,
           scopedSlots: { customRender: 'wbFile' }
         },
@@ -299,12 +319,14 @@ export default {
           title: '使用手册',
           dataIndex: 'useFile',
           width: 200,
+          checked: true,
           scopedSlots: { customRender: 'useFile' }
         },
         {
           title: '验收文件',
           dataIndex: 'checkFile',
           width: 200,
+          checked: true,
           scopedSlots: { customRender: 'checkFile' }
         },
         {
@@ -317,11 +339,13 @@ export default {
         {
           title: '备注',
           dataIndex: 'remark',
+          checked: true,
           width: 200
         },
         {
           title: '创建日期',
           dataIndex: 'createdTime',
+          checked: true,
           width: 200
         },
         {

+ 2 - 1
src/views/sb/info/modules/Detail.vue

@@ -643,7 +643,8 @@ export default {
     partInfoListView () {
       // const modal = this.$refs.partInfoList
       // modal.base({ sbId: this.model.id }, { sbId: this.model.id })
-      const routeUrl = this.$router.resolve({ path: '/part/info', query: { id: this.model.id } })
+      // const routeUrl = this.$router.resolve({ path: '/part/info', query: { id: this.model.id } })
+      const routeUrl = this.$router.resolve({ path: '/sb/info/for/part/info', query: { id: this.model.id } })
       window.open(routeUrl.href, '_blank')
     },
     checkJobTableWaitDoListView () {