暂停记录temp

pages/order/monitoring/api.js

@@ -31,7 +31,11 @@ export default {
     },
     getentryproductcode(params){//更加工单id获取产品号
         return Api.get(`${PlanUrl}/orderexecutequalityrecord/getentryproductcode`, params);
-    }
+    },
+    pauseCauseGetpaged(params){//获取工单暂停记录
+        return Api.get(`${PlanUrl}/orderexecutepausecause/getpaged`, params);
+    },
+    
     // getplantdepartments(params) {// 组织为”车间“的部门
     //     return Api.get(`${systemUrl}/department/getplantdepartments`, params);
     // },

pages/order/monitoring/index.vue

@@ -28,7 +28,7 @@
       <Record :eid="recordId" />
     </Modal>
     <Modal v-model="SpeedModal" title="工单信息" fullscreen footer-hide class="recordM">
-      <Speed :result="result" :load="loading"   :executeId="dispatchExecuteId" :orderId="orderId" :detailId="detailId"/>
+      <Speed :result="result" :load="loading"   :executeId="dispatchExecuteId" :orderId="orderId" />
     </Modal>
   </div>
 </template>
@@ -362,7 +362,7 @@ export default {
           render: (h, params) => {
             return h("div", { class: "action" }, [
               h(
-                params.row.status == 5 ? "Button" : "", //订单状态暂停，启动
+                params.row.status == 5&&params.row.upSplitId==0 ? "Button" : "", //订单状态暂停，启动
                 {
                   props: {
                     type: "error",
@@ -385,7 +385,7 @@ export default {
                 ""
               ),
               h(
-                params.row.status == 6 ? "Button" : "", //订单状态执行中，暂停
+                params.row.status == 6&&params.row.upSplitId==0 ? "Button" : "", //订单状态执行中，暂停
                 {
                   props: {
                     type: "success",

pages/order/monitoring/record.vue

@@ -5,7 +5,13 @@
         <DataGrid :columns="columns" ref="grid" :action="action" :tool="false" :height="tdHeight"></DataGrid>
       </TabPane>
       <TabPane label="工单暂停记录" name="name2">
-        <DataGrid :columns="columnsProcess" ref="gridProcess" :tool="false" :height="tdHeight"></DataGrid>
+        <DataGrid
+          :columns="columnsProcess"
+          ref="gridProcess"
+          :data="list"
+          :tool="false"
+          :height="tdHeight"
+        ></DataGrid>
       </TabPane>
     </Tabs>
     <Modal v-model="detailModal" title="详情" width="800">
@@ -122,67 +128,53 @@ export default {
       ],
       columnsProcess: [
         {
-          key: "productName",
+          key: "dispatch_id",
           title: "工序Id",
           align: "left",
           width: 90
         },
         {
-          key: "productName",
+          key: "dispatch_id",
           title: "工序号",
           align: "left",
           width: 90
         },
         {
-          key: "productName",
+          key: "dispatch_id",
           title: "工序名称",
           align: "left",
-          width: 350,
+          width: 350
         },
 
         {
-          key: "remark",
+          key: "desc",
           title: "暂停原因",
           align: "left"
         },
         {
-          key: "productName",
+          key: "creatorUserId",
           title: "暂停人",
           align: "left",
           high: true,
-          width: 180
+          width: 180,
+          type: "user"
         },
         {
-          key: "productName",
+          key: "creationTime",
           title: "暂停时间",
           align: "left",
           width: 180
-        },
-        {
-          key: "productName",
-          title: "恢复人",
-          align: "left",
-          width: 180
-        },
-        {
-          key: "productName",
-          title: "恢复时间",
-          align: "left",
-          width: 180
-        },
-        {
-          key: "productName",
-          title: "相关人",
-          align: "left",
-          width: "180"
         }
-      ]
+      ],
+      list: []
     };
   },
   props: {
     eid: Number
   },
   mounted() {
+    this.$refs.grid.reload(this.easySearch);
+    this.loadList()
     window.onresize = () => {
       ///浏览器窗口大小变化
       return (() => {
@@ -198,6 +190,29 @@ export default {
     await store.dispatch("loadDictionary"); // 加载数据字典
   },
   methods: {
+    // tabClick(tabIndex) {
+    //   if (tabIndex == 2) {
+    //     this.loadList();
+    //   } else {
+    //     this.$refs.grid.reload(this.easySearch);
+    //   }
+    // },
+    loadList() {
+      let params = {
+        FilterText: "dispatch_id=104"
+      };
+      Api.pauseCauseGetpaged(params)
+        .then(res => {
+          if (res.success) {
+            this.list = res.result.items;
+          } else {
+            this.$Message.error("获取数据失败");
+          }
+        })
+        .catch(err => {
+          this.$Message.error("连接失败");
+        });
+    },
     search() {
       this.$refs.grid.reload(this.easySearch);
     },

pages/order/monitoring/speed.vue

@@ -7,7 +7,7 @@
       <DataGrid :columns="columns" :data="result" border :tool="false" :height="820" :page="false"></DataGrid>
     </div>
     <Modal v-model="workOrderPauseModal" title="工单暂停原因" width="800" footer-hide class="suspend">
-      <EntryPause @on-close="cancel" @on-ok="pauseOk" ref="addBug" :info="info" />
+      <EntryPause  @on-ok="pauseOk" ref="addBug" :info="info" />
     </Modal>
     <Modal v-model="modalSplit" title="订单分卡" width="650" footer-hide>
       <div slot="close">