Merge remote-tracking branch 'origin/master'

src/views/module_cmms/inspect/InspectList.vue

@@ -139,6 +139,7 @@
           {
             title:'工单编号',
             align:"center",
+            sorter: true,
             dataIndex: 'inspectcode'
           },
           {
@@ -191,7 +192,7 @@
           deleteBatch: "/cmmsInspect/cmmsInspect/deleteBatch",
           exportXlsUrl: "/cmmsInspect/cmmsInspect/exportXls",
           importExcelUrl: "cmmsInspect/cmmsInspect/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],

src/views/module_cmms/inspectContent/InspectContentList.vue

@@ -175,6 +175,7 @@
           {
             title:'巡检项目编号',
             align:"center",
+            sorter: true,
             dataIndex: 'contentcode'
           },
           {

src/views/module_cmms/inspectItem/InspectItemList.vue

@@ -167,6 +167,7 @@
           {
             title:'巡检标准编号',
             align:"center",
+            sorter: true,
             dataIndex: 'itemcode'
           },
           {
@@ -226,7 +227,7 @@
           deleteBatch: "/cmmsInspectItem/cmmsInspectItem/deleteBatch",
           exportXlsUrl: "/cmmsInspectItem/cmmsInspectItem/exportXls",
           importExcelUrl: "cmmsInspectItem/cmmsInspectItem/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],

src/views/module_cmms/inspectLine/InspectLineList.vue

@@ -139,6 +139,7 @@
           {
             title:'巡检路线编号',
             align:"center",
+            sorter: true,
             dataIndex: 'linecode'
           },
           {
@@ -166,7 +167,7 @@
           deleteBatch: "/cmmsInspectLine/cmmsInspectLine/deleteBatch",
           exportXlsUrl: "/cmmsInspectLine/cmmsInspectLine/exportXls",
           importExcelUrl: "cmmsInspectLine/cmmsInspectLine/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],

src/views/module_cmms/inspectPlan/InspectPlanList.vue

@@ -165,6 +165,7 @@
           {
             title:'巡检计划编号',
             align:"center",
+            sorter: true,
             dataIndex: 'plancode'
           },
           {
@@ -186,6 +187,7 @@
           {
             title:'任务数量',
             align:"center",
+            sorter: true,
             dataIndex: 'tasknum'
           },
           {
@@ -197,6 +199,7 @@
           {
             title:'开始时间',
             align:"center",
+            sorter: true,
             dataIndex: 'begintime',
             customRender:function (text) {
               return !text?"-":(text.length>10?text.substr(0,10):text)
@@ -231,6 +234,7 @@
           {
             title:'下次执行时间',
             align:"center",
+            sorter: true,
             dataIndex: 'nexttime',
             customRender:function (text) {
               return !text?"-":(text.length>10?text.substr(0,10):text)
@@ -239,6 +243,7 @@
           {
             title:'下次通知时间',
             align:"center",
+            sorter: true,
             dataIndex: 'noticetime',
             customRender:function (text) {
               return !text?"-":(text.length>10?text.substr(0,10):text)

src/views/module_cmms/inspectSpot/InspectSpotList.vue

@@ -139,6 +139,7 @@
           {
             title:'巡检点编号',
             align:"center",
+            sorter: true,
             dataIndex: 'contentcode'
           },
           {
@@ -166,7 +167,7 @@
           deleteBatch: "/cmmsInspectSpot/cmmsInspectSpot/deleteBatch",
           exportXlsUrl: "/cmmsInspectSpot/cmmsInspectSpot/exportXls",
           importExcelUrl: "cmmsInspectSpot/cmmsInspectSpot/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],

src/views/module_cmms/repairManage/RepairManageList.vue

@@ -209,12 +209,14 @@
           {
             title:'优先级',
             align:"center",
+            sorter: true,
             dataIndex: 'priority_dictText',
             scopedSlots: { customRender: 'priority' }
           },
           {
             title:'工单编号',
             align:"center",
+            sorter: true,
             dataIndex: 'repaircode',
             // customCell: (record, index)=>{ return this.customCellDetail(record, index, 'customerName')}
             customCell: this.customCellDetail
@@ -232,11 +234,13 @@
           {
             title:'设备编号',
             align:"center",
+            sorter: true,
             dataIndex: 'equipmentcode'
           },
           {
             title:'故障日期',
             align:"center",
+            sorter: true,
             dataIndex: 'faultdate',
             customRender:function (text) {
               return !text?"":(text.length>10?text.substr(0,10):text)
@@ -260,6 +264,7 @@
           {
             title:'维修时间',
             align:"center",
+            sorter: true,
             dataIndex: 'repairdate',
             customRender:function (text) {
               return !text?"":(text.length>10?text.substr(0,10):text)
@@ -302,6 +307,7 @@
           {
             title:'工单状态',
             align:"center",
+            sorter: true,
             dataIndex: 'repairstatus_dictText'
           },
           {
@@ -309,6 +315,7 @@
             align:"center",
             fixed:"right",
             width:80,
+            sorter: true,
             dataIndex: 'status_dictText',
             scopedSlots: { customRender: 'status' }
           },
@@ -383,7 +390,7 @@
         console.log(999,this.deviceOptions)
       },
       // 解决筛选后option不回显问题
-      filterOptions(input, option) {                    
+      filterOptions(input, option) {
         return this.deviceOptions
       },
       // 派单
@@ -431,7 +438,7 @@
             'color': "#1890ff",
             'cursor': "pointer",
           },
-          on: { 
+          on: {
             // 点击事件
             click: (event) => {
               this.$refs.drawerDetail.detail(record);

src/views/module_cmms/repairMy/RepairMyList.vue

@@ -136,7 +136,7 @@
           <a-tag v-if="record.status === '1' || record.status === '2'" color="blue">{{ text }}</a-tag>
           <a-tag v-if="record.status === '3' || record.status === '4'">{{ text }}</a-tag>
         </span>
-        
+
         <span slot="action" slot-scope="text, record">
           <a @click="handleFeedback(record)" :disabled="record.repairstatus === '1'">维修反馈</a>
           <!-- <a-divider type="vertical" /> -->
@@ -182,12 +182,14 @@
           {
             title:'优先级',
             align:"center",
+            sorter: true,
             dataIndex: 'priority_dictText',
             scopedSlots: { customRender: 'priority' }
           },
           {
             title:'工单编号',
             align:"center",
+            sorter: true,
             dataIndex: 'repaircode',
             // customCell: (record, index)=>{ return this.customCellDetail(record, index, 'customerName')}
             // customCell: this.customCellDetail
@@ -205,11 +207,13 @@
           {
             title:'设备编号',
             align:"center",
+            sorter: true,
             dataIndex: 'equipmentcode'
           },
           {
             title:'故障日期',
             align:"center",
+            sorter: true,
             dataIndex: 'faultdate',
             customRender:function (text) {
               return !text?"":(text.length>10?text.substr(0,10):text)
@@ -233,6 +237,7 @@
           {
             title:'维修时间',
             align:"center",
+            sorter: true,
             dataIndex: 'repairdate',
             customRender:function (text) {
               return !text?"":(text.length>10?text.substr(0,10):text)
@@ -297,7 +302,7 @@
         url: {
           list: "/cmmsRepair/cmmsRepair/listMy",
           // exportXlsUrl: "/cmmsRepairMy/cmmsRepairMy/exportXls",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
@@ -353,7 +358,7 @@
         console.log(999,this.deviceOptions)
       },
       // 解决筛选后option不回显问题
-      filterOptions(input, option) {                    
+      filterOptions(input, option) {
         return this.deviceOptions
       },
       handleFeedback(record){

src/views/module_cmms/spotcheck/SpotcheckList.vue

@@ -163,6 +163,7 @@
           {
             title:'点检内容编号',
             align:"center",
+            sorter: true,
             dataIndex: 'contentcode'
           },
           {
@@ -193,6 +194,7 @@
           {
             title:'点检时间',
             align:"center",
+            sorter: true,
             dataIndex: 'spotcheckdate'
           },
           {

src/views/module_cmms/spotcheckContent/SpotcheckContentList.vue

@@ -157,6 +157,7 @@
           {
             title:'点检内容编号',
             align:"center",
+            sorter: true,
             dataIndex: 'contentcode'
           },
           {

src/views/module_cmms/spotcheckItem/SpotcheckItemList.vue

@@ -178,6 +178,7 @@
           {
             title:'点检项编号',
             align:"center",
+            sorter: true,
             dataIndex: 'itemcode'
           },
           {

src/views/module_cmms/submission/SubmissionList.vue

@@ -188,6 +188,7 @@
           {
             title:'送检编号',
             align:"center",
+            sorter: true,
             dataIndex: 'sjcode',
             scopedSlots: { customRender: 'sjcode' }
           },

src/views/module_cmms/upkeepItem/UpkeepItemList.vue

@@ -170,11 +170,12 @@
           {
             title:'设备类型',
             align:"center",
-            dataIndex: 'equiptypeName'
+            dataIndex: 'equipdefid_dictText'
           },
           {
             title:'保养项编号',
             align:"center",
+            sorter: true,
             dataIndex: 'itemcode'
           },
           {
@@ -202,7 +203,7 @@
           deleteBatch: "/cmmsUpkeepItem/cmmsUpkeepItem/deleteBatch",
           exportXlsUrl: "/cmmsUpkeepItem/cmmsUpkeepItem/exportXls",
           importExcelUrl: "cmmsUpkeepItem/cmmsUpkeepItem/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],

src/views/module_cmms/upkeepPlan/UpkeepPlanList.vue

@@ -188,6 +188,7 @@
           {
             title:'计划编号',
             align:"center",
+            sorter: true,
             dataIndex: 'plancode'
           },
           {
@@ -248,6 +249,7 @@
           {
             title:'开始时间',
             align:"center",
+            sorter: true,
             dataIndex: 'begintime',
             // customRender:function (text) {
             //   return !text?"":(text.length>10?text.substr(0,10):text)
@@ -256,6 +258,7 @@
           {
             title:'重复间隔',
             align:"center",
+            sorter: true,
             dataIndex: 'repeatnum'
           },
           {
@@ -266,6 +269,7 @@
           {
             title:'提前通知时长',
             align:"center",
+            sorter: true,
             dataIndex: 'noticenum'
           },
           {
@@ -283,6 +287,7 @@
           {
             title:'下次执行时间',
             align:"center",
+            sorter: true,
             dataIndex: 'nexttime',
             // customRender:function (text) {
             //   return !text?"":(text.length>10?text.substr(0,10):text)
@@ -291,6 +296,7 @@
           {
             title:'下次通知时间',
             align:"center",
+            sorter: true,
             dataIndex: 'noticetime',
             // customRender:function (text) {
             //   return !text?"":(text.length>10?text.substr(0,10):text)
@@ -378,7 +384,7 @@
         console.log(999,this.deviceOptions)
       },
       // 解决筛选后option不回显问题
-      filterOptions(input, option) {                    
+      filterOptions(input, option) {
         return this.deviceOptions
       },
       initDictConfig(){