Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-mes into dev

src/api/produceOrder/index.js

@@ -89,3 +89,21 @@ export async function reportCount (params) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+// 详情页-tab列表
+export async function reportPage (data) {
+  const res = await request.get('/mes/workreport/page', { params: data });
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+// 获取详情页数据
+export async function getInfoById (id) {
+  const res = await request.get(`/mes/workreport/getById/${id}`);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/views/produceOrder/components/progressBox.vue

@@ -7,10 +7,10 @@
           :key="index"
           :class="{ active: active >= index }"
         >
-          <p class="text">{{ item.label }}</p>
+          <p class="text">{{ item.taskTypeName }}</p>
           <div
             class="progress-box"
-            :style="`backgroundImage:linear-gradient(to top, var(--color-primary), var(--color-primary) ${'20%'},#fff ${'20%'}, #fff);`"
+            :style="`backgroundImage:linear-gradient(to top, var(--color-primary), var(--color-primary) ${item.percent},#fff ${item.percent}, #fff);`"
           ></div>
           <p class="num">{{ index + 1 }}</p>
         </li>
@@ -25,23 +25,37 @@
       active: {
         type: [Number, String],
         default: 3
-      }
+      },
+		list:{
+			type: Array,
+			default: []
+		},
+		total:{
+			type:Number,
+			default:1
+		}
     },
     data () {
       return {
-        stepList: [
-          { label: '挤压成型', type: '1' },
-          { label: '自然干燥', type: '2' },
-          { label: '升温干燥', type: '3' },
-          { label: '半加定长', type: '4' },
-          { label: '备炉', type: '5' },
-          { label: '烧结', type: '6' },
-          { label: '深加工', type: '7' },
-          { label: '包装', type: '8' },
-          { label: '预缴库', type: '9' }
-        ]
+        stepList: []
       };
-    }
+    },
+	watch: {
+	  list: {
+	    handler () {
+	      if (this.list.length) {
+	        this.stepList = this.list
+	        this.stepList.map((item,index)=>{
+				item.percent = ( item.number / this.total)*100  + '%'
+			})
+	      }
+	    },
+	    immediate: true
+	  }
+	},
+	methods:{
+		
+	}
   };
 </script>
 

src/views/produceOrder/detail.vue

@@ -7,50 +7,42 @@
         </div>
       </el-page-header>
     </div>
-    <progressBox />
+    <progressBox v-if="tabList.length" :list="tabList" :total="infoData.formingNum"/>
     <el-card>
       <el-descriptions title="" direction="vertical" :column="7" border>
-        <el-descriptions-item label="工单号">kooriookami</el-descriptions-item>
-        <el-descriptions-item label="生产版本"
-          >18100000000</el-descriptions-item
-        >
-        <el-descriptions-item label="工单类型">苏州市</el-descriptions-item>
-        <el-descriptions-item label="产线">苏州市</el-descriptions-item>
-        <el-descriptions-item label="工艺路线版本">苏州市</el-descriptions-item>
-        <el-descriptions-item label="计划编号">苏州市</el-descriptions-item>
-        <el-descriptions-item label="计划类型">苏州市</el-descriptions-item>
-        <el-descriptions-item label="产品编码">苏州市</el-descriptions-item>
-        <el-descriptions-item label="产品名称">苏州市</el-descriptions-item>
-        <el-descriptions-item label="牌号 | 型号">苏州市</el-descriptions-item>
-        <el-descriptions-item label="要求成型数量(PCS)"
-          >苏州市</el-descriptions-item
-        >
-        <el-descriptions-item label="要求成型重量(KG)"
-          >苏州市</el-descriptions-item
-        >
-        <el-descriptions-item label="计划开始时间">苏州市</el-descriptions-item>
-        <el-descriptions-item label="实际开始时间">苏州市</el-descriptions-item>
-        <el-descriptions-item label="已成型数量(PCS)"
-          >苏州市</el-descriptions-item
-        >
-        <el-descriptions-item label="已成型重量(KG)"
-          >苏州市</el-descriptions-item
-        >
-        <el-descriptions-item label="已交付数量(PCS)"
-          >苏州市</el-descriptions-item
-        >
-        <el-descriptions-item label="已交付重量(KG)"
-          >苏州市</el-descriptions-item
-        >
-        <el-descriptions-item label="工单状态">苏州市</el-descriptions-item>
-        <el-descriptions-item label="完成时间">苏州市</el-descriptions-item>
-        <el-descriptions-item label="生产周期">苏州市</el-descriptions-item>
+        <el-descriptions-item label="工单号">{{infoData.code}}</el-descriptions-item>
+        <el-descriptions-item label="生产版本" >{{infoData.produceVersionName}}</el-descriptions-item >
+        <!-- <el-descriptions-item label="工单类型">苏州市</el-descriptions-item> -->
+        <el-descriptions-item label="产线">{{infoData.productLine}}</el-descriptions-item>
+        <el-descriptions-item label="工艺路线版本">{{infoData.routingVersion}}</el-descriptions-item>
+        <el-descriptions-item label="计划编号">{{infoData.productionPlanCode}}</el-descriptions-item>
+        <el-descriptions-item label="计划类型">{{typeList[infoData.planType]}}</el-descriptions-item>
+        <el-descriptions-item label="产品编码">{{infoData.productCode}}</el-descriptions-item>
+        <el-descriptions-item label="产品名称">{{infoData.productName}}</el-descriptions-item>
+        <el-descriptions-item label="牌号 | 型号">{{infoData.brandNo}} | {{infoData.model}}</el-descriptions-item>
+        <el-descriptions-item label="要求成型数量(PCS)">{{infoData.formingNum}}</el-descriptions-item>
+        <el-descriptions-item label="要求成型重量(KG)">{{infoData.formingWeight}}</el-descriptions-item>
+        <el-descriptions-item label="计划开始时间">{{infoData.planStartTime}}</el-descriptions-item>
+        <el-descriptions-item label="实际开始时间">{{infoData.startTime}}</el-descriptions-item>
+        <el-descriptions-item label="已成型数量(PCS)">{{infoData.formedNum}}</el-descriptions-item>
+        <el-descriptions-item label="已成型重量(KG)">{{infoData.formedWeight}}</el-descriptions-item>
+        <el-descriptions-item label="已交付数量(PCS)">{{infoData.deliveredQuantity}}</el-descriptions-item>
+        <el-descriptions-item label="已交付重量(KG)">{{infoData.deliveredWeight}}</el-descriptions-item>
+        <el-descriptions-item label="工单状态">{{statusList[infoData.status]}}</el-descriptions-item>
+       <el-descriptions-item label="完成时间">{{infoData.completionTime}}</el-descriptions-item>
+        <el-descriptions-item label="生产周期">{{infoData.productionCycle}}</el-descriptions-item>
       </el-descriptions>
     </el-card>
 
-    <el-card>
+    <el-card v-if="tabList.length">
       <el-tabs v-model="activeName" type="card">
-        <el-tab-pane label="挤压成型" name="1"> </el-tab-pane>
+		  <el-tab-pane
+		    :label="item.taskTypeName"
+		    :name="item.taskTypeName"
+		    v-for="item in tabList"
+		    :key="item.taskCode"
+		  ></el-tab-pane>
+<!--        <el-tab-pane label="挤压成型" name="1"> </el-tab-pane>
         <el-tab-pane label="自然干燥" name="2"></el-tab-pane>
         <el-tab-pane label="升温干燥" name="3"></el-tab-pane>
         <el-tab-pane label="半加定长" name="4"></el-tab-pane>
@@ -58,17 +50,19 @@
         <el-tab-pane label="烧结" name="6"></el-tab-pane>
         <el-tab-pane label="深加工" name="7"></el-tab-pane>
         <el-tab-pane label="包装" name="8"></el-tab-pane>
-        <el-tab-pane label="入库" name="9"></el-tab-pane>
+        <el-tab-pane label="入库" name="9"></el-tab-pane> -->
       </el-tabs>
       <ele-pro-table
-        :columns="columnOpt[activeName]"
-        :datasource="[]"
+        :columns="columnOpt[activeName] || columnOpt['深加工'] "
+        :datasource="datasource"
         :key="activeName"
         :cache-key="`produceDetal${activeName}`"
+		:initLoad="false"
+		ref="table"
       >
         <template v-slot:toolbar>
           <div class="tips-box">
-            <ul v-if="activeName == 1">
+            <ul v-if="activeName == '挤压成型'">
               <li>
                 <span class="label">累计合格品数量</span>
                 1500PCS
@@ -82,7 +76,7 @@
                 1500PCS
               </li>
             </ul>
-            <ul v-else-if="['2', '3', '4'].includes(activeName)">
+            <ul v-else-if="['自然干燥', '升温干燥', '半加定长'].includes(activeName)">
               <li>
                 <span class="label">累计合格品数量</span>
                 1500PCS
@@ -96,7 +90,7 @@
                 1500PCS
               </li>
             </ul>
-            <ul v-else-if="['5'].includes(activeName)">
+            <ul v-else-if="['备炉'].includes(activeName)">
               <li>
                 <span class="label">累计交接数量</span>
                 1500PCS
@@ -106,7 +100,7 @@
                 1500PCS
               </li>
             </ul>
-            <ul v-else-if="['6', '7', '8'].includes(activeName)">
+            <ul v-else-if="['烧结', '质检', '深加工'].includes(activeName)">
               <li>
                 <span class="label">累计合格品数量</span>
                 1500PCS
@@ -120,7 +114,7 @@
                 1500PCS
               </li>
             </ul>
-            <ul v-else-if="['9'].includes(activeName)">
+            <ul v-else-if="['包装'].includes(activeName)">
               <li>
                 <span class="label">累计交接数量</span>
                 1500PCS
@@ -138,7 +132,7 @@
                 1500PCS
               </li>
             </ul>
-            <ul v-else-if="['10'].includes(activeName)">
+            <ul v-else-if="['缴库'].includes(activeName)">
               <li>
                 <span class="label">累计交接数量</span>
                 1500PCS
@@ -152,9 +146,9 @@
                 1500PCS
               </li>
             </ul>
-            <el-link type="primary" v-if="activeName == 1" @click="openOther"
+<!--            <el-link type="primary" v-if="activeName == 1" @click="openOther"
               >其他任务记录</el-link
-            >
+            > -->
           </div>
         </template>
         <template v-slot:action>
@@ -169,6 +163,8 @@
 <script>
   import progressBox from './components/progressBox';
   import otherMission from './components/otherMission';
+  import { getTaskListById } from '@/api/mainData/index.js';
+  import { reportPage , getInfoById } from '@/api/produceOrder/index.js';
   export default {
     components: {
       otherMission,
@@ -176,556 +172,623 @@
     },
     data () {
       return {
+		infoData:{},
         descriptionsShow: true,
-        activeName: '1',
+        activeName: '挤压成型',
+		tabList:[],
         columnOpt: {
-          1: [
+          挤压成型: [
             {
               label: '序号',
-              type: 'index'
+              type: 'index',
+			  width: 55
             },
             {
               label: '投料时间',
-              prop: 'index'
+              prop: 'feedingTime'
             },
             {
               label: '投料重量',
-              prop: 'index'
+              prop: 'feedingWeight'
             },
             {
               label: '投料执行人',
-              prop: 'index'
+              prop: 'feedingOperator'
             },
             {
               label: '设备编码',
-              prop: 'index'
+              prop: 'deviceCode'
             },
             {
               label: '设备名称',
-              prop: 'index'
+              prop: 'deviceName'
             },
             {
               label: '报工时间',
-              prop: 'index'
+              prop: 'reportWorkTime'
             },
             {
               label: '报工执行人',
-              prop: 'index'
+              prop: 'reportingOperator'
             },
             {
               label: '周转车编码',
-              prop: 'index'
+              prop: 'transferCarCode'
             },
             {
               label: '合格品数量',
-              prop: 'index'
+              prop: 'standardNum'
             },
             {
               label: '合格品重量',
-              prop: 'index'
+              prop: 'standardWeight'
             },
             {
               label: '不合格品数量',
-              prop: 'index'
+              prop: 'noStandardNum'
             },
             {
               label: '不合格品重量',
-              prop: 'index'
+              prop: 'noStandardWeight'
             },
             {
               label: '副产品重量',
-              prop: 'index'
+              prop: 'secondaryProductWeight'
             },
             {
               label: '操作',
               slot: 'action'
             }
           ],
-          2: [
+          自然干燥: [
             {
               label: '序号',
-              type: 'index'
+              type: 'index',
+			  width: 55
             },
             {
               label: '投料时间',
-              prop: 'index'
+              prop: 'feedingTime'
             },
             {
               label: '投料执行人',
-              prop: 'index'
+              prop: 'feedingOperator'
             },
             {
               label: '产品数量',
-              prop: 'index'
+              prop: 'productNum'
             },
             {
               label: '周转车编码',
-              prop: 'index'
+              prop: 'transferCarCode'
             },
             {
               label: '区域编码',
-              prop: 'index'
+              prop: 'areaCode'
             },
             {
               label: '干燥时长',
-              prop: 'index'
+              prop: 'dryingDuration'
             },
             {
               label: '报工时间',
-              prop: 'index'
+              prop: 'reportWorkTime'
             },
             {
               label: '报工执行人',
-              prop: 'index'
+              prop: 'reportingOperator'
             },
             {
               label: '合格品数量',
-              prop: 'index'
+              prop: 'standardNum'
             },
             {
               label: '合格品重量',
-              prop: 'index'
+              prop: 'standardWeight'
             },
             {
               label: '不合格品数量',
-              prop: 'index'
+              prop: 'noStandardNum'
             },
             {
               label: '不合格品重量',
-              prop: 'index'
+              prop: 'noStandardWeight'
             },
             {
               label: '副产品重量',
-              prop: 'index'
+              prop: 'secondaryProductWeight'
             },
             {
               label: '操作',
               slot: 'action'
             }
           ],
-          3: [
+          升温干燥: [
             {
               label: '序号',
-              type: 'index'
+              type: 'index',
+			  width: 55
             },
             {
               label: '投料时间',
-              prop: 'index'
+              prop: 'feedingTime'
             },
             {
               label: '投料执行人',
-              prop: 'index'
+              prop: 'feedingOperator'
             },
             {
               label: '产品数量',
-              prop: 'index'
+              prop: 'productNum'
             },
             {
               label: '周转车编码',
-              prop: 'index'
+              prop: 'transferCarCode'
             },
             {
               label: '设备编码',
-              prop: 'index'
+              prop: 'deviceCode'
             },
             {
               label: '设备名称',
-              prop: 'index'
+              prop: 'deviceName'
             },
             {
               label: '升温曲线',
-              prop: 'index'
+              prop: 'temperatureRamp'
             },
             {
               label: '报工时间',
-              prop: 'index'
+              prop: 'reportWorkTime'
             },
             {
               label: '报工执行人',
-              prop: 'index'
+              prop: 'reportingOperator'
             },
             {
               label: '合格品数量',
-              prop: 'index'
+              prop: 'standardNum'
             },
             {
               label: '合格品重量',
-              prop: 'index'
+              prop: 'standardWeight'
             },
             {
               label: '不合格品数量',
-              prop: 'index'
+              prop: 'noStandardNum'
             },
             {
               label: '不合格品重量',
-              prop: 'index'
+              prop: 'noStandardWeight'
             },
             {
               label: '副产品重量',
-              prop: 'index'
+              prop: 'secondaryProductWeight'
             },
             {
               label: '操作',
               slot: 'action'
             }
           ],
-          4: [
+          半加定长: [
             {
               label: '序号',
-              type: 'index'
+              type: 'index',
+			  width: 55
             },
             {
               label: '投料时间',
-              prop: 'index'
+              prop: 'feedingTime'
             },
             {
               label: '投料执行人',
-              prop: 'index'
+              prop: 'feedingOperator'
             },
             {
               label: '产品数量',
-              prop: 'index'
+              prop: 'productNum'
             },
             {
               label: '周转车编码',
-              prop: 'index'
+              prop: 'transferCarCode'
             },
             {
               label: '设备编码',
-              prop: 'index'
+              prop: 'deviceCode'
             },
             {
               label: '设备名称',
-              prop: 'index'
+              prop: 'deviceName'
             },
             {
               label: '报工时间',
-              prop: 'index'
+              prop: 'reportWorkTime'
             },
             {
               label: '报工执行人',
-              prop: 'index'
+              prop: 'reportingOperator'
             },
             {
               label: '合格品数量',
-              prop: 'index'
+              prop: 'standardNum'
             },
             {
               label: '合格品重量',
-              prop: 'index'
+              prop: 'standardWeight'
             },
             {
               label: '不合格品数量',
-              prop: 'index'
+              prop: 'noStandardNum'
             },
             {
               label: '不合格品重量',
-              prop: 'index'
+              prop: 'noStandardWeight'
             },
             {
               label: '副产品重量',
-              prop: 'index'
+              prop: 'secondaryProductWeight'
             },
             {
               label: '操作',
               slot: 'action'
             }
           ],
-          5: [
+          备炉: [
             {
               label: '序号',
-              type: 'index'
+              type: 'index',
+			  width: 55
             },
             {
               label: '交接时间',
-              prop: 'index'
+              prop: 'handoverTime'
             },
             {
               label: '交接执行人',
-              prop: 'index'
+              prop: 'handoverOperator'
             },
             {
               label: '交接数量',
-              prop: 'index'
+              prop: 'handoverQuantity'
             },
             {
               label: '实际数量',
-              prop: 'index'
+              prop: 'actualQuantity'
             },
             {
               label: '执行时间',
-              prop: 'index'
+              prop: 'executionTime'
             },
             {
               label: '执行人',
-              prop: 'index'
+              prop: 'executor'
             },
             {
               label: '设备编码',
-              prop: 'index'
+              prop: 'deviceCode'
             },
             {
               label: '设备名称',
-              prop: 'index'
+              prop: 'deviceName'
             },
             {
               label: '烧结曲线',
-              prop: 'index'
+              prop: 'sinteringCurve'
             },
             {
               label: '操作',
               slot: 'action'
             }
           ],
-          6: [
+          烧结: [
             {
               label: '序号',
-              type: 'index'
+              type: 'index',
+			  width: 55
             },
             {
               label: '报工时间',
-              prop: 'index'
+              prop: 'reportWorkTime'
             },
             {
               label: '报工执行人',
-              prop: 'index'
+              prop: 'reportingOperator'
             },
             {
               label: '合格品数量',
-              prop: 'index'
+              prop: 'standardNum'
             },
             {
               label: '合格品重量',
-              prop: 'index'
+              prop: 'standardWeight'
             },
             {
               label: '不合格品数量',
-              prop: 'index'
+              prop: 'noStandardNum'
             },
             {
               label: '不合格品重量',
-              prop: 'index'
+              prop: 'noStandardWeight'
             },
             {
               label: '副产品重量',
-              prop: 'index'
+              prop: 'secondaryProductWeight'
             },
             {
               label: '操作',
               slot: 'action'
             }
           ],
-          7: [
+          质检: [
             {
               label: '序号',
-              type: 'index'
+              type: 'index',
+			  width: 55
             },
             {
               label: '报工时间',
-              prop: 'index'
+              prop: 'reportWorkTime'
             },
             {
               label: '报工执行人',
-              prop: 'index'
+              prop: 'reportingOperator'
             },
             {
               label: '合格品数量',
-              prop: 'index'
+              prop: 'standardNum'
             },
             {
               label: '合格品重量',
-              prop: 'index'
+              prop: 'standardWeight'
             },
             {
               label: '不合格品数量',
-              prop: 'index'
+              prop: 'noStandardNum'
             },
             {
               label: '不合格品重量',
-              prop: 'index'
+              prop: 'noStandardWeight'
             },
             {
               label: '副产品重量',
-              prop: 'index'
+              prop: 'secondaryProductWeight'
             },
             {
               label: '操作',
               slot: 'action'
             }
           ],
-          8: [
+          深加工: [
             {
               label: '序号',
-              type: 'index'
+              type: 'index',
+			  width: 55
             },
             {
               label: '交接时间',
-              prop: 'index'
+              prop: 'handoverTime'
             },
             {
               label: '交接执行人',
-              prop: 'index'
+              prop: 'handoverOperator'
             },
             {
               label: '交接数量',
-              prop: 'index'
+              prop: 'handoverQuantity'
             },
             {
               label: '实际数量',
-              prop: 'index'
+              prop: 'actualQuantity'
             },
             {
               label: '投料时间',
-              prop: 'index'
+              prop: 'feedingTime'
             },
             {
               label: '投料执行人',
-              prop: 'index'
+              prop: 'feedingOperator'
             },
             {
               label: '设备编码',
-              prop: 'index'
+              prop: 'deviceCode'
             },
             {
               label: '设备名称',
-              prop: 'index'
+              prop: 'deviceName'
             },
             {
               label: '报工时间',
-              prop: 'index'
+              prop: 'reportWorkTime'
             },
             {
               label: '报工执行人',
-              prop: 'index'
+              prop: 'reportingOperator'
             },
             {
               label: '合格品数量',
-              prop: 'index'
+              prop: 'standardNum'
             },
             {
               label: '合格品重量',
-              prop: 'index'
+              prop: 'standardWeight'
             },
             {
               label: '不合格品数量',
-              prop: 'index'
+              prop: 'noStandardNum'
             },
             {
               label: '不合格品重量',
-              prop: 'index'
+              prop: 'noStandardWeight'
             },
             {
               label: '副产品重量',
-              prop: 'index'
+              prop: 'secondaryProductWeight'
             },
             {
               label: '操作',
               slot: 'action'
             }
           ],
-          9: [
+          包装: [
             {
               label: '序号',
-              type: 'index'
+              type: 'index',
+			  width: 55
             },
             {
               label: '交接时间',
-              prop: 'index'
+              prop: 'handoverTime'
             },
             {
               label: '交接执行人',
-              prop: 'index'
+              prop: 'handoverOperator'
             },
             {
               label: '交接数量',
-              prop: 'index'
+              prop: 'handoverQuantity'
             },
             {
               label: '实际数量',
-              prop: 'index'
+              prop: 'actualQuantity'
             },
             {
               label: '报工时间',
-              prop: 'index'
+              prop: 'reportWorkTime'
             },
             {
               label: '报工执行人',
-              prop: 'index'
+              prop: 'reportingOperator'
             },
             {
               label: '包装数量',
-              prop: 'index'
+              prop: 'packagingQuantity'
             },
             {
               label: '包装产品数量',
-              prop: 'index'
+              prop: 'packagedProductQuantity'
             },
             {
               label: '尾料数量',
-              prop: 'index'
+              prop: 'tailingsQuantity'
             },
             {
               label: '物料清单',
-              prop: 'index'
+              prop: 'materialList'
             },
             {
               label: '操作',
               slot: 'action'
             }
           ],
-          10: [
+          缴库: [
             {
               label: '序号',
-              type: 'index'
+              type: 'index',
+			  width: 55
             },
             {
               label: '交接时间',
-              prop: 'index'
+              prop: 'handoverTime'
             },
             {
               label: '交接执行人',
-              prop: 'index'
+              prop: 'handoverOperator'
             },
             {
               label: '交接数量',
-              prop: 'index'
+              prop: 'handoverQuantity'
             },
             {
               label: '实际数量',
-              prop: 'index'
+              prop: 'actualQuantity'
             },
             {
               label: '报工时间',
-              prop: 'index'
+              prop: 'reportWorkTime'
             },
             {
               label: '报工执行人',
-              prop: 'index'
+              prop: 'reportingOperator'
             },
             {
               label: '批次数量',
-              prop: 'index'
+              prop: 'batchQuantity'
             },
             {
               label: '入库数量',
-              prop: 'index'
+              prop: 'inboundQuantity'
             },
             {
               label: '交货仓库',
-              prop: 'index'
+              prop: 'deliveryWarehouse'
             },
             {
               label: '操作',
               slot: 'action'
             }
           ]
-        }
+        },
+		workOrderId:'',
+		taskCode:'',
+		typeList:{
+			1:'内销订单',
+			2:'外销订单',
+			3:'预制订单'
+		},
+		statusList:{
+			4:'待生产',
+			5:'生产中',
+			6:'已完成',
+			7:'已延期'
+		}
       };
     },
+	created () {
+	  this.workOrderId  = this.$route.query.id
+	  this.getInfo(this.workOrderId)
+	},
     methods: {
-      openOther () {
-        this.$refs.otherMissionRef.open();
-      }
+		 datasource({ page, limit,where }) {
+			return reportPage({ ...where, pageNum:page, size:limit });
+		 },
+		 /* 刷新表格 */
+		 reload (where) {
+		   this.$nextTick(() =>
+		     this.$refs.table.reload({ page: 1, limit: 10, where })
+		   );
+		 },
+		async getInfo(id){
+			const res = await getInfoById(id)
+			this.infoData = res
+			if(typeof res.taskTypeProcessDiagrams == 'string' ){
+				this.tabList = []
+			}else{
+				this.tabList = res.taskTypeProcessDiagrams
+			}
+			this.activeName = this.tabList[0]?.taskTypeName || ''
+			this.taskCode = this.tabList[0]?.taskCode || ''
+			this.reload({workOrderId:this.workOrderId, taskCode:this.taskCode})
+		},
+		// async getTab (id) {
+		//   const res = await getTaskListById(id);
+		//   this.tabList = res;
+		//   this.activeName = res[0]?.taskTypeName || '';
+		//   this.getTabList(res[0].taskCode)
+		// },
+		// async getTabList(code){
+		// 	const data = {
+		// 		pageNum:1,
+		// 		size:10,
+		// 		taskCode:code,
+		// 		workOrderId:this.workOrderId
+		// 	}
+		// 	const res = await reportPage(data)
+		// 	console.log('res',res)
+		// },
+		  openOther () {
+			this.$refs.otherMissionRef.open();
+		  }
+		  
     }
   };
 </script>

src/views/produceOrder/index.vue

@@ -399,7 +399,8 @@
         this.$router.push({
           path: '/produceOrder/detail',
           query: {
-            id: row.id
+            id: row.id,
+			produceVersionId: row.produceVersionId
           }
         });
       },