Browse Source

已读未读逻辑修改、表头修改、下线流程跳转详情改为spucode作为标识

lucky 2 years ago
parent
commit
d275d4987b

+ 1 - 1
src/views/goodStore/goodsOffline/columns.js

@@ -18,7 +18,7 @@ const columns = [
     // },
     {
       prop: "spuCode",
-      label: "成本商品编号",
+      label: "商品成本编号",
       minWidth: "155px",
     },
     {

+ 1 - 1
src/views/goodStore/goodsOffline/detail.vue

@@ -76,7 +76,7 @@ export default {
       //数据
       list:{},
       parmValue:{
-        id:this.$route.query.id
+        spuCode:this.$route.query.id
       },
       activeName: '1',
       newTime: "",  

+ 1 - 1
src/views/goodStore/goodsOffline/index.vue

@@ -82,7 +82,7 @@
         >
           <i
             class="el-icon-view tb-icon"
-            @click="getRouter('goodsOfflineDetail', scope.row.id)"
+            @click="getRouter('goodsOfflineDetail', scope.row.spuCode)"
           ></i>
         </el-tooltip>
     

+ 56 - 2
src/views/process/columns.js

@@ -65,7 +65,7 @@ const routerList = [
     name: "商品下线流程",
     type: "GOL",
     toRouter: "/goodStore/goodsOfflineDetail",
-    to: "id",
+    to: "code",
   },
   {
     name: "活动流程",
@@ -195,4 +195,58 @@ const columns = [
     width: "50",
   }
 ]
-export { routerList, columns }
+
+const readUnRead =[
+  {
+    type: "selection",
+    fixed: "left",
+    _noset_: true,
+  },
+  {
+    prop: "orderCode",
+    label: "业务编号",
+    minWidth:"155px",
+  },
+  {
+    prop: "process_name",
+    label: "流程名称",
+    minWidth:"155px",
+    // sortable: true,
+  },
+  {
+    prop: "order_type",
+    label: "流程类型",
+    minWidth:"155px",
+    // sortable: true,
+  },
+
+  {
+    prop: "content",
+    minWidth:"155px",
+    label: "内容",
+  },
+
+
+  {
+    prop: "uname",
+    minWidth:"95px",
+    label: "用户",
+  },
+
+  {
+    prop: "addtime",
+    minWidth:"155px",
+    label: "申请时间",
+  },
+  {
+    prop: "",
+    label: "操作",
+    fixed: "right",
+    _noset_: true,
+    _slot_: "operation",
+    width: "50",
+  }
+]
+
+
+export { routerList, columns,readUnRead }

+ 6 - 3
src/views/process/read/index.vue

@@ -90,7 +90,7 @@
         >
           <i
             class="el-icon-view tb-icon"
-            @click="getRouter(scope.row.toRouter, scope.row.queryId)"
+            @click="getRouter(scope.row.toRouter, scope.row.orderCode)"
           ></i>
         </el-tooltip>
       </template>
@@ -103,7 +103,7 @@ import asyncRequest from "@/apis/service/process/read";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";
 import resToken from "@/mixins/resToken";
-import { routerList, columns } from "@/views/process/columns";
+import { routerList, columns ,readUnRead} from "@/views/process/columns";
 export default {
   name: "role",
   mixins: [mixinPage, resToken],
@@ -147,7 +147,7 @@ export default {
         total: 0,
       },
       // 表格 - 列参数
-      columns: columns,
+      columns:  readUnRead,
     };
   },
   mounted() {
@@ -165,7 +165,10 @@ export default {
     this.searchList();
   },
   methods: {
+
     getRouter(toRouter, queryId) {
+      console.log(this.tableData)
+      console.log(toRouter, queryId)
       if (toRouter && queryId) {
         let model = {
           type: "view",

+ 10 - 9
src/views/process/unRead/index.vue

@@ -5,7 +5,7 @@
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
       :table="table"
       :data="tableData"
-      :columns="columns"
+      :columns="readUnRead"
       :page="pageInfo"
       :size="size"
       @page-curr-change="handlePageChange"
@@ -120,7 +120,7 @@ import asyncRequest from "@/apis/service/process/unRead";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";
 import resToken from "@/mixins/resToken";
-import { routerList, columns } from "@/views/process/columns";
+import { routerList, columns,readUnRead } from "@/views/process/columns";
 export default {
   name: "role",
   mixins: [mixinPage, resToken],
@@ -171,8 +171,11 @@ export default {
           fixed: "left",
           _noset_: true,
         },
+        
         ...columns,
       ],
+
+      readUnRead,
     };
   },
   mounted() {
@@ -192,13 +195,10 @@ export default {
   methods: {
     getRouter(toRouter, queryId) {
       if (toRouter && queryId) {
-        
-
         let model = {
           type: "view",
           id: queryId,
         };
-
          let routerModel = {
           options: JSON.parse(JSON.stringify(this.parmValue)),
           router: this.$route.path,
@@ -281,13 +281,14 @@ export default {
     },
 
     async wentRead(item) {
-      // console.log(item)
+      console.log(item)
       // return;
-      const { toRouter, queryId, id } = item;
+      const { toRouter, queryId, id ,orderCode} = item;
+
       const { code, data, message } = await asyncRequest.detail({ id: id });
       if (code === 0) {
         console.log(toRouter)
-        this.getRouter(toRouter, queryId);
+        this.getRouter(toRouter, orderCode);
       } else if (code >= 100 && code <= 104) {
         await this.logout();
       } else {
@@ -301,7 +302,7 @@ export default {
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
-              // console.log("2222222222",this.tableData)
+        
 
         this.tableData.forEach((v, i) => {
           let index = this.process_router_list.findIndex(