xiongchao 3 жил өмнө
parent
commit
763909290a

+ 1 - 0
src/views/repair/application-form/RepairApplicationForm.vue

@@ -42,6 +42,7 @@
         :data="loadData"
         :alert="options.alert"
         :rowSelection="options.rowSelection"
+        :scroll="{x: 1000, y: BaseTool.Constant.scrollY }"
         showPagination="auto"
       >
         <span slot="action" slot-scope="record">

+ 1 - 1
src/views/repair/application-form/RepairCheckForm.vue

@@ -114,7 +114,7 @@ export default {
         {
           title: '报修人',
           checked: true,
-          dataIndex: 'userName'
+          dataIndex: 'actualUser'
         },
         {
           title: '维修人',

+ 11 - 9
src/views/repair/application-form/RepairForm.vue

@@ -42,6 +42,7 @@
         :data="loadData"
         :alert="options.alert"
         :rowSelection="options.rowSelection"
+        :scroll="{x: 1000, y: BaseTool.Constant.scrollY }"
         showPagination="auto"
       >
         <span slot="action" slot-scope="record">
@@ -140,7 +141,7 @@ export default {
           title: '报修人',
           checked: true,
           width: '200px',
-          dataIndex: 'userName'
+          dataIndex: 'actualUser'
         },
         {
           title: '报修来源',
@@ -174,24 +175,25 @@ export default {
             return this.BaseTool.Object.getField(this.needStopMap, text)
           }
         }, */
+        {
+          title: '创建日期',
+          width: '200px',
+          dataIndex: 'createdTime'
+        },
         {
           title: '报修状态',
           checked: true,
-          width: '200px',
+          width: '100px',
+          fixed: 'right',
           dataIndex: 'status',
           scopedSlots: { customRender: 'status' }
         },
-
-        {
-          title: '创建日期',
-          width: '200px',
-          dataIndex: 'createdTime'
-        },
         {
           title: '操作',
           checked: true,
+          fixed: 'right',
           key: 'action',
-          width: '200px',
+          width: '150px',
           align: 'center',
           scopedSlots: { customRender: 'action' }
         }

+ 1 - 1
src/views/repair/application-form/modules/Detail.vue

@@ -21,7 +21,7 @@
             <detail-list-item term="使用位置">{{ model.sbCph }}</detail-list-item>
             <!--<detail-list-item term="部件名称">{{ model.partName }}</detail-list-item>-->
             <detail-list-item term="是否停机">{{ BaseTool.Object.getField(needStopMap,model.needStop) }}</detail-list-item>
-            <detail-list-item term="报修人">{{ model.userName }}</detail-list-item>
+            <detail-list-item term="报修人">{{ model.actualUser }}</detail-list-item>
             <detail-list-item term="报修来源">{{ BaseTool.Object.getField(this.sourceMap, model.source) }}</detail-list-item>
             <detail-list-item term="紧急等级"><badge :text="BaseTool.Object.getField(levelMap,model.level)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_LEVEL[model.applicationLevel]"/></detail-list-item>
             <detail-list-item term="报修时间">{{ model.applyTime }}</detail-list-item>

+ 1 - 1
src/views/repair/application-form/modules/DetailCheck.vue

@@ -21,7 +21,7 @@
             <detail-list-item term="使用位置">{{ model.sbCph }}</detail-list-item>
             <!--<detail-list-item term="部件名称">{{ model.partName }}</detail-list-item>-->
             <detail-list-item term="是否停机">{{ BaseTool.Object.getField(needStopMap,model.needStop) }}</detail-list-item>
-            <detail-list-item term="报修人">{{ model.userName }}</detail-list-item>
+            <detail-list-item term="报修人">{{ model.actualUser }}</detail-list-item>
             <detail-list-item term="报修来源">{{ BaseTool.Object.getField(this.sourceMap, model.source) }}</detail-list-item>
             <detail-list-item term="紧急等级"><badge :text="BaseTool.Object.getField(levelMap,model.level)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_LEVEL[model.applicationLevel]"/></detail-list-item>
             <detail-list-item term="报修时间">{{ model.applyTime }}</detail-list-item>

+ 1 - 1
src/views/repair/application-form/modules/DetailExamine.vue

@@ -21,7 +21,7 @@
             <detail-list-item term="使用位置">{{ model.sbCph }}</detail-list-item>
             <!--<detail-list-item term="部件名称">{{ model.partName }}</detail-list-item>-->
             <detail-list-item term="是否停机">{{ BaseTool.Object.getField(needStopMap,model.needStop) }}</detail-list-item>
-            <detail-list-item term="报修人">{{ model.userName }}</detail-list-item>
+            <detail-list-item term="报修人">{{ model.actualUser }}</detail-list-item>
             <detail-list-item term="报修来源">{{ BaseTool.Object.getField(this.sourceMap, model.source) }}</detail-list-item>
             <detail-list-item term="紧急等级"><badge :text="BaseTool.Object.getField(levelMap,model.level)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_LEVEL[model.applicationLevel]"/></detail-list-item>
             <detail-list-item term="报修时间">{{ model.applyTime }}</detail-list-item>