no message

src/components/Mall/Member/member-worker-order.vue

@@ -1,19 +1,20 @@
 <template>
   <div class="order-list">
     <div class="table">
-      <el-table
-        ref="orderTable"
-        v-loading="listLoading"
-        :data="dataList"
-        element-loading-text="Loading"
-      >
+      <el-table ref="orderTable" v-loading="listLoading" :data="dataList" element-loading-text="Loading">
         <el-table-column align="center" label="工单编号" prop="id" min-width="180"></el-table-column>
-        <el-table-column align="center" label="工单类型" prop="orderSmallTypeText" min-width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column
+          align="center"
+          label="工单类型"
+          prop="orderSmallTypeText"
+          min-width="200"
+          show-overflow-tooltip
+        ></el-table-column>
         <el-table-column align="center" label="工单状态" prop="orderStatusText"></el-table-column>
         <el-table-column align="center" label="预约上门时间" prop="appointmentTime" min-width="160"></el-table-column>
-		<el-table-column align="center" label="创建时间" prop="createTime" min-width="160"></el-table-column>
+        <el-table-column align="center" label="创建时间" prop="createTime" min-width="160"></el-table-column>
         <el-table-column align="center" label="操作" fixed="right">
-          <template slot-scope="{row}">
+          <template slot-scope="{ row }">
             <el-button type="primary" @click="goOrderDetail(row)" size="mini">详情</el-button>
           </template>
         </el-table-column>
@@ -28,7 +29,8 @@
           :page-sizes="[10, 20, 30, 50]"
           :page-size="10"
           layout="total, sizes, prev, pager, next, jumper"
-          :total="listTotal">
+          :total="listTotal"
+        >
         </el-pagination>
       </div>
     </div>
@@ -53,7 +55,7 @@ export default {
   },
   created() {
     let timer = setInterval(() => {
-      if(this.user.userId) {
+      if (this.user.userId) {
         this.getOrderList()
         clearInterval(timer)
       }
@@ -61,21 +63,21 @@ export default {
   },
   methods: {
     getOrderList() {
-      console.log(this.user);
-		let params = {
-			userId: this.user.userId,
-			pageNum: this.currentPage,
-			pageSize: this.pageSize
-		}
-		request({
-		  url: `/order/base/list/gene`,
-		  method: 'post',
-		  params
-		}).then(res=>{
-			this.dataList = res.data.records
-			this.listTotal = res.data.total
-			this.listLoading = false
-		})
+      console.log(this.user)
+      let params = {
+        userId: this.user.userId,
+        pageNum: this.currentPage,
+        pageSize: this.pageSize
+      }
+      request({
+        url: `/order/base/list/gene`,
+        method: 'post',
+        params
+      }).then(res => {
+        this.dataList = res.data.records
+        this.listTotal = res.data.total
+        this.listLoading = false
+      })
     },
     // 更改每页数量
     handleSizeChange(val) {
@@ -89,19 +91,17 @@ export default {
       this.getOrderList()
     },
     goOrderDetail(row) {
-		this.$router.push({
-			name: 'workOrderPool',
-			params: {
-				pageName: row.id,
-				pageType: 'detail',
-				pageCode: row.id,
-			},
-		})
+      this.$router.push({
+        name: window.isWorkOrderPoolPath,
+        params: {
+          pageName: row.id,
+          pageType: 'detail',
+          pageCode: row.id
+        }
+      })
     }
   }
 }
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

src/layout/components/Navbar.vue

@@ -413,7 +413,7 @@ export default {
           NOTICE: 'systemMessage',
           WBI: 'applicationWithoutFee',
           WBK: 'applicationWithoutFee',
-          CRE_ORDER: 'workOrderPool',
+          CRE_ORDER: window.isWorkOrderPoolPath,
           SEND_MALL: 'order_detail',
           RP_MALL: 'order_refund_detail',
           CR_SALES:

src/mixin/orderListColumn.js

@@ -55,7 +55,7 @@ export default {
           )
         }
       }
-      if (item.jname === 'id' && this.$route.name === 'workOrderPool') {
+      if (item.jname === 'id' && ['workOrderPool', 'workOrderPool2'].includes(this.$route.name)) {
         defaultData.render = (h, { row, index, column }) => {
           return (
             <div style="padding:0 6px;cursor: pointer;">
@@ -63,7 +63,7 @@ export default {
                 type="text"
                 onClick={() => {
                   this.$router.push({
-                    name: 'workOrderPool',
+                    name: window.isWorkOrderPoolPath,
                     params: {
                       pageName: row[column.columnAttributes.prop],
                       pageType: 'detail',

src/permission.js

@@ -17,6 +17,8 @@ const lay = {
   children: []
 }
 
+window.isWorkOrderPoolPath = ''
+
 import { pages } from './settings'
 
 // 递归找最后一级页面
@@ -146,6 +148,12 @@ router.afterEach(() => {
 
 function buildRoute(route, parentUrl = '', bool = true) {
   const { url, moduleName, icon, moduleId, code, type, fullUrl, status, isCache } = route
+  if (code == 'workOrderPool2') {
+    window.isWorkOrderPoolPath = code
+  } else if (!window.isWorkOrderPoolPath && code == 'workOrderPool') {
+    window.isWorkOrderPoolPath = code
+  }
+
   var item = {}
   var itemparent = null
   item.path = ~[3, 4].indexOf(type) ? fullUrl : parentUrl + url

src/views/engineeringMaintenance/basicData/index.vue

@@ -162,7 +162,7 @@ export default {
           btnType: 'text',
           click: ({ row, index, column }) => {
             this.$router.push({
-              name: 'workOrderPool',
+              name: window.isWorkOrderPoolPath,
               params: {
                 pageName: row.id,
                 pageType: 'rpProjectRepairId',

src/views/mallManagement/order/order_list/index.vue

@@ -1412,7 +1412,7 @@ export default {
   methods: {
     queryWorkOrder(id) {
       this.$router.push({
-        name: 'workOrderPool',
+        name: window.isWorkOrderPoolPath,
         params: {
           pageName: id,
           pageType: 'saleOrderId',

src/views/mallManagement/order/order_refund/index.vue

@@ -779,7 +779,7 @@ export default {
   methods: {
     queryWorkOrder(id) {
       this.$router.push({
-        name: 'workOrderPool',
+        name: window.isWorkOrderPoolPath,
         params: {
           pageName: id,
           pageType: 'saleOrderId',

src/views/valueAddedService/extendedWarrantyWork/index.vue

@@ -1,19 +1,28 @@
 <template>
-  <template-page ref="pageRef" :getList="getList" :operation="operation()" :exportList="exportList"
-    :columnParsing="columnParsing" :tableAttributes="tableAttributes" :tableEvents="tableEvents"
-    :screeningAnalysis="screeningAnalysis" :filterMethod="filterMethod" :replaceOrNotMap="true">
+  <template-page
+    ref="pageRef"
+    :getList="getList"
+    :operation="operation()"
+    :exportList="exportList"
+    :columnParsing="columnParsing"
+    :tableAttributes="tableAttributes"
+    :tableEvents="tableEvents"
+    :screeningAnalysis="screeningAnalysis"
+    :filterMethod="filterMethod"
+    :replaceOrNotMap="true"
+  >
   </template-page>
 </template>
 
 <script>
 import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
-import { orderBaseList, orderBaseListExport } from "@/api/workOrderPool.js"
-import orderListColumn from "@/mixin/orderListColumn"
+import { orderBaseList, orderBaseListExport } from '@/api/workOrderPool.js'
+import orderListColumn from '@/mixin/orderListColumn'
 import operation_mixin from '@/components/template/operation_mixin.js'
 export default {
   components: {
-    TemplatePage,
+    TemplatePage
   },
   mixins: [import_mixin, operation_mixin, orderListColumn],
   data() {
@@ -21,12 +30,12 @@ export default {
       // 表格属性
       tableAttributes: {
         // 启用勾选列
-        selectColumn: false,
+        selectColumn: false
       },
       // 表格事件
       tableEvents: {
         'selection-change': this.selectionChange
-      },
+      }
     }
   },
   methods: {
@@ -48,14 +57,11 @@ export default {
     getList(p, cb) {
       var pam = JSON.parse(JSON.stringify(p))
       try {
-        pam.params.push(
-          { "param": "a.order_status", "compare": "=", "value": ["YWG", "YJS"] }
-        )
+        pam.params.push({ param: 'a.order_status', compare: '=', value: ['YWG', 'YJS'] })
         pam.isYb = true
         cb && cb(pam)
         return orderBaseList(pam)
-      } catch (err) {
-      }
+      } catch (err) {}
     },
 
     // 列表导出函数
@@ -73,17 +79,17 @@ export default {
           btnType: 'text',
           click: ({ row, index, column }) => {
             this.$router.push({
-              name: 'workOrderPool',
+              name: window.isWorkOrderPoolPath,
               params: {
                 pageName: row.id,
                 pageType: 'detail',
-                pageCode: row.id,
-              },
+                pageCode: row.id
+              }
             })
           }
         }
       })
-    },
+    }
   }
 }
 </script>

src/views/valueAddedService/orderSettleManag/pages/collect.vue

@@ -227,7 +227,7 @@ export default {
           },
           click: ({ row, index, column }) => {
             this.$router.push({
-              name: 'workOrderPool',
+              name: window.isWorkOrderPoolPath,
               params: {
                 pageName: row.id,
                 pageType: 'pgIncreItemId',

src/views/valueAddedService/orderSettleManag/pages/offline.vue

@@ -387,7 +387,7 @@ export default {
           },
           click: ({ row, index, column }) => {
             this.$router.push({
-              name: 'workOrderPool',
+              name: window.isWorkOrderPoolPath,
               params: {
                 pageName: row.id,
                 pageType: 'pgIncreItemId',

src/views/workOrder/appraise/index.vue

@@ -85,7 +85,7 @@ export default {
                 style="color:#008dd4;"
                 onClick={() => {
                   this.$router.push({
-                    name: 'workOrderPool',
+                    name: window.isWorkOrderPoolPath,
                     params: {
                       pageName: row.id,
                       pageType: 'detail',

src/views/workOrder/basicEngineeringData/index.vue

@@ -1059,7 +1059,7 @@ export default {
         orderDetail: {
           click: ({ row, index, column }) => {
             this.$router.push({
-              name: 'workOrderPool',
+              name: window.isWorkOrderPoolPath,
               params: {
                 pageName: row.projectNo,
                 pageType: 'projectNo',

src/views/workOrder/orderHome/index.vue

@@ -113,7 +113,7 @@ export default {
     openOrder(type, name) {
       if (!type) {
         this.$router.push({
-          name: 'workOrderPool',
+          name: window.isWorkOrderPoolPath,
           query: {}
         })
       } else if (type == 'appraise') {
@@ -125,7 +125,7 @@ export default {
         })
       } else {
         this.$router.push({
-          name: 'workOrderPool',
+          name: window.isWorkOrderPoolPath,
           params: {
             pageName: name || '-',
             pageType: 'orderStatus',

src/views/workOrder/settleAccountsManagement/settleAccountsOrder/index.vue

@@ -205,7 +205,7 @@ export default {
                     })
                   } else {
                     this.$router.push({
-                      name: 'workOrderPool',
+                      name: window.isWorkOrderPoolPath,
                       params: {
                         pageName: row.orderBaseId,
                         pageType: 'detail',
@@ -264,7 +264,7 @@ export default {
               })
             } else {
               this.$router.push({
-                name: 'workOrderPool',
+                name: window.isWorkOrderPoolPath,
                 params: {
                   pageName: row.orderBaseId,
                   pageType: 'detail',

src/views/workOrder/workOrderPool/index.vue

@@ -648,7 +648,7 @@ export default {
         edit: {
           click: ({ row, index, column }) => {
             this.$router.push({
-              name: 'workOrderPool',
+              name: window.isWorkOrderPoolPath,
               params: {
                 pageName: row.id,
                 pageType: 'detail',
@@ -662,7 +662,7 @@ export default {
 
     handleClose(cb) {
       this.$router.push({
-        name: 'workOrderPool',
+        name: window.isWorkOrderPoolPath,
         params: {},
         query: {}
       })

src/views/workOrder/workOrderPool2/index.vue

@@ -651,7 +651,7 @@ export default {
         edit: {
           click: ({ row, index, column }) => {
             this.$router.push({
-              name: 'workOrderPool',
+              name: window.isWorkOrderPoolPath,
               params: {
                 pageName: row.id,
                 pageType: 'detail',
@@ -665,7 +665,7 @@ export default {
 
     handleClose(cb) {
       this.$router.push({
-        name: 'workOrderPool',
+        name: window.isWorkOrderPoolPath,
         params: {},
         query: {}
       })