详情页修改提交

src/views/produceOrder/components/progressBox.vue

@@ -7,7 +7,9 @@
           :key="index"
           :class="{ active: active >= index }"
         >
-          <p class="text">{{ item.taskTypeName }}</p>
+		   <el-tooltip class="item" effect="dark" :content="item.taskTypeName" placement="top-start">
+			  <p>{{ item.taskTypeName }}</p>
+		   </el-tooltip>
           <div
             class="progress-box"
             :style="`backgroundImage:linear-gradient(to top, var(--color-primary), var(--color-primary) ${item.percent},#fff ${item.percent}, #fff);`"
@@ -66,10 +68,12 @@
 
 <style lang="scss" scoped>
   .progress-container {
+	  width: 100%;
+	  overflow-x: auto;
     ul {
       list-style: none;
       display: flex;
-      justify-content: space-around;
+      justify-content: flex-start;
       align-items: center;
       li {
         display: flex;
@@ -77,6 +81,7 @@
         justify-content: center;
         flex: 1;
         position: relative;
+		min-width: 110px;
         &::after {
           content: '';
           position: absolute;
@@ -101,6 +106,13 @@
             border-color: var(--color-primary);
           }
         }
+		.el-tooltip{
+		  width: 100%;
+		  text-align: center;
+		  white-space: nowrap; /* 不换行 */
+		  overflow: hidden; /* 超出部分隐藏 */
+		  text-overflow: ellipsis; /* 显示省略号 */
+		}
         .num,
         .text {
           width: 100%;

src/views/produceOrder/detail.vue

@@ -40,8 +40,8 @@
 	  >
 		  <el-tab-pane
 		    :label="item.taskTypeName"
-		    :name="item.taskTypeName"
-		    v-for="item in tabList"
+		    :name=" JSON.stringify(index) "
+		    v-for="(item,index) in tabList"
 		    :key="item.taskCode"
 		  ></el-tab-pane>
 <!--        <el-tab-pane label="挤压成型" name="1"> </el-tab-pane>
@@ -55,7 +55,7 @@
         <el-tab-pane label="入库" name="9"></el-tab-pane> -->
       </el-tabs>
       <ele-pro-table
-        :columns="columnOpt[activeName] || columnOpt['深加工'] "
+        :columns="columnOpt[ tabList[activeName].taskTypeName ] || columnOpt['深加工'] "
         :datasource="datasource"
         :key="activeName"
         :cache-key="`produceDetal${activeName}`"
@@ -64,7 +64,7 @@
       >
         <template v-slot:toolbar>
           <div class="tips-box">
-            <ul v-if="activeName == '挤压成型'">
+            <ul v-if="chooseItem == '挤压成型'">
               <li>
                 <span class="label">累计合格品数量</span>
                 {{countMsg.standardTotalNum}}PCS
@@ -78,7 +78,7 @@
                 {{countMsg.feedMaterielWeight}}PCS
               </li>
             </ul>
-            <ul v-else-if="['自然干燥', '升温干燥', '半加定长'].includes(activeName)">
+            <ul v-else-if="['自然干燥', '升温干燥', '半加定长'].includes(chooseItem)">
               <li>
                 <span class="label">累计合格品数量</span>
                 {{countMsg.standardTotalNum}}PCS
@@ -92,7 +92,7 @@
                 {{countMsg.feedProductWeight}}PCS
               </li>
             </ul>
-            <ul v-else-if="['备炉'].includes(activeName)">
+            <ul v-else-if="['备炉'].includes(chooseItem)">
               <li>
                 <span class="label">累计交接数量</span>
                 {{countMsg.joinTotalNum}}PCS
@@ -102,7 +102,7 @@
                 {{countMsg.joinTotalNum}}PCS
               </li>
             </ul>
-            <ul v-else-if="['烧结', '质检', '深加工'].includes(activeName)">
+            <ul v-else-if="['烧结', '质检', '深加工'].includes(chooseItem)">
               <li>
                 <span class="label">累计合格品数量</span>
                 {{countMsg.standardTotalNum}}PCS
@@ -116,7 +116,7 @@
                 {{countMsg.joinTotalNum}}PCS
               </li>
             </ul>
-            <ul v-else-if="['包装'].includes(activeName)">
+            <ul v-else-if="['包装'].includes(chooseItem)">
               <li>
                 <span class="label">累计交接数量</span>
                 {{countMsg.joinTotalNum}}PCS
@@ -134,7 +134,7 @@
                 {{countMsg.packProductTotalNum}}PCS
               </li>
             </ul>
-            <ul v-else-if="['缴库'].includes(activeName)">
+            <ul v-else-if="['缴库'].includes(chooseItem)">
               <li>
                 <span class="label">累计交接数量</span>
                 {{countMsg.joinTotalNum}}PCS
@@ -176,66 +176,91 @@
       return {
 		infoData:{},
         descriptionsShow: true,
-        activeName: '挤压成型',
+        activeName: '1',
 		tabList:[],
         columnOpt: {
           挤压成型: [
             {
               label: '序号',
               type: 'index',
-			  width: 55
+			  width: 55,
+			  align: 'center'
             },
             {
               label: '投料时间',
-              prop: 'feedingTime'
+              prop: 'feedingTime',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '投料重量',
-              prop: 'feedingWeight'
+              prop: 'feedingWeight',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '投料执行人',
-              prop: 'feedingOperator'
+              prop: 'feedingOperator',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '设备编码',
-              prop: 'deviceCode'
+              prop: 'deviceCode',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '设备名称',
-              prop: 'deviceName'
+              prop: 'deviceName',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '报工时间',
-              prop: 'reportWorkTime'
+              prop: 'reportWorkTime',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '报工执行人',
-              prop: 'reportingOperator'
-            },
-            {
-              label: '周转车编码',
-              prop: 'transferCarCode'
+              prop: 'reportingOperator',
+			  minWidth: 100,
+			  align: 'center'
             },
+            // {
+            //   label: '周转车编码',
+            //   prop: 'transferCarCode'
+            // },
             {
               label: '合格品数量',
-              prop: 'standardNum'
+              prop: 'standardNum',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '合格品重量',
-              prop: 'standardWeight'
+              prop: 'standardWeight',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '不合格品数量',
-              prop: 'noStandardNum'
+              prop: 'noStandardNum',
+			  minWidth: 120,
+			  align: 'center'
             },
             {
               label: '不合格品重量',
-              prop: 'noStandardWeight'
+              prop: 'noStandardWeight',
+			  minWidth: 120,
+			  align: 'center'
             },
             {
               label: '副产品重量',
-              prop: 'secondaryProductWeight'
+              prop: 'secondaryProductWeight',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '操作',
@@ -246,59 +271,84 @@
             {
               label: '序号',
               type: 'index',
-			  width: 55
+			  width: 55,
+			  align: 'center'
             },
             {
               label: '投料时间',
-              prop: 'feedingTime'
+              prop: 'feedingTime',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '投料执行人',
-              prop: 'feedingOperator'
+              prop: 'feedingOperator',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '产品数量',
-              prop: 'productNum'
-            },
-            {
-              label: '周转车编码',
-              prop: 'transferCarCode'
+              prop: 'productNum',
+			  minWidth: 100,
+			  align: 'center'
             },
+            // {
+            //   label: '周转车编码',
+            //   prop: 'transferCarCode'
+            // },
             {
               label: '区域编码',
-              prop: 'areaCode'
+              prop: 'areaCode',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '干燥时长',
-              prop: 'dryingDuration'
+              prop: 'dryingDuration',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '报工时间',
-              prop: 'reportWorkTime'
+              prop: 'reportWorkTime',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '报工执行人',
-              prop: 'reportingOperator'
+              prop: 'reportingOperator',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '合格品数量',
-              prop: 'standardNum'
+              prop: 'standardNum',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '合格品重量',
-              prop: 'standardWeight'
+              prop: 'standardWeight',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '不合格品数量',
-              prop: 'noStandardNum'
+              prop: 'noStandardNum',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '不合格品重量',
-              prop: 'noStandardWeight'
+              prop: 'noStandardWeight',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '副产品重量',
-              prop: 'secondaryProductWeight'
+              prop: 'secondaryProductWeight',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '操作',
@@ -309,63 +359,90 @@
             {
               label: '序号',
               type: 'index',
-			  width: 55
+			  width: 55,
+			  align: 'center'
             },
             {
               label: '投料时间',
-              prop: 'feedingTime'
+              prop: 'feedingTime',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '投料执行人',
-              prop: 'feedingOperator'
+              prop: 'feedingOperator',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '产品数量',
-              prop: 'productNum'
-            },
-            {
-              label: '周转车编码',
-              prop: 'transferCarCode'
+              prop: 'productNum',
+			  minWidth: 100,
+			  align: 'center'
             },
+            // {
+            //   label: '周转车编码',
+            //   prop: 'transferCarCode'
+            // },
             {
               label: '设备编码',
-              prop: 'deviceCode'
+              prop: 'deviceCode',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '设备名称',
-              prop: 'deviceName'
+              prop: 'deviceName',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '升温曲线',
-              prop: 'temperatureRamp'
+              prop: 'temperatureRamp',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '报工时间',
-              prop: 'reportWorkTime'
+              prop: 'reportWorkTime',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '报工执行人',
-              prop: 'reportingOperator'
+              prop: 'reportingOperator',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '合格品数量',
-              prop: 'standardNum'
+              prop: 'standardNum',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '合格品重量',
-              prop: 'standardWeight'
+              prop: 'standardWeight',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '不合格品数量',
-              prop: 'noStandardNum'
+              prop: 'noStandardNum',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '不合格品重量',
-              prop: 'noStandardWeight'
+              prop: 'noStandardWeight',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '副产品重量',
-              prop: 'secondaryProductWeight'
+              prop: 'secondaryProductWeight',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '操作',
@@ -376,59 +453,84 @@
             {
               label: '序号',
               type: 'index',
-			  width: 55
+			  width: 55,
+			  align: 'center'
             },
             {
               label: '投料时间',
-              prop: 'feedingTime'
+              prop: 'feedingTime',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '投料执行人',
-              prop: 'feedingOperator'
+              prop: 'feedingOperator',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '产品数量',
-              prop: 'productNum'
-            },
-            {
-              label: '周转车编码',
-              prop: 'transferCarCode'
+              prop: 'productNum',
+			  minWidth: 100,
+			  align: 'center'
             },
+            // {
+            //   label: '周转车编码',
+            //   prop: 'transferCarCode'
+            // },
             {
               label: '设备编码',
-              prop: 'deviceCode'
+              prop: 'deviceCode',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '设备名称',
-              prop: 'deviceName'
+              prop: 'deviceName',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '报工时间',
-              prop: 'reportWorkTime'
+              prop: 'reportWorkTime',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '报工执行人',
-              prop: 'reportingOperator'
+              prop: 'reportingOperator',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '合格品数量',
-              prop: 'standardNum'
+              prop: 'standardNum',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '合格品重量',
-              prop: 'standardWeight'
+              prop: 'standardWeight',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '不合格品数量',
-              prop: 'noStandardNum'
+              prop: 'noStandardNum',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '不合格品重量',
-              prop: 'noStandardWeight'
+              prop: 'noStandardWeight',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '副产品重量',
-              prop: 'secondaryProductWeight'
+              prop: 'secondaryProductWeight',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '操作',
@@ -439,43 +541,62 @@
             {
               label: '序号',
               type: 'index',
-			  width: 55
+			  width: 55,
+			  align: 'center'
             },
             {
               label: '交接时间',
-              prop: 'handoverTime'
+              prop: 'handoverTime',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '交接执行人',
-              prop: 'handoverOperator'
+              prop: 'handoverOperator',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '交接数量',
-              prop: 'handoverQuantity'
+              prop: 'handoverQuantity',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '实际数量',
-              prop: 'actualQuantity'
+              prop: 'actualQuantity',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '执行时间',
-              prop: 'executionTime'
+              prop: 'executionTime',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '执行人',
-              prop: 'executor'
+              prop: 'executor',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '设备编码',
-              prop: 'deviceCode'
+              prop: 'deviceCode',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '设备名称',
-              prop: 'deviceName'
+              prop: 'deviceName',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '烧结曲线',
-              prop: 'sinteringCurve'
+              prop: 'sinteringCurve',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '操作',
@@ -486,35 +607,50 @@
             {
               label: '序号',
               type: 'index',
-			  width: 55
+			  width: 55,
+			  align: 'center'
             },
             {
               label: '报工时间',
-              prop: 'reportWorkTime'
+              prop: 'reportWorkTime',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '报工执行人',
-              prop: 'reportingOperator'
+              prop: 'reportingOperator',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '合格品数量',
-              prop: 'standardNum'
+              prop: 'standardNum',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '合格品重量',
-              prop: 'standardWeight'
+              prop: 'standardWeight',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '不合格品数量',
-              prop: 'noStandardNum'
+              prop: 'noStandardNum',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '不合格品重量',
-              prop: 'noStandardWeight'
+              prop: 'noStandardWeight',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '副产品重量',
-              prop: 'secondaryProductWeight'
+              prop: 'secondaryProductWeight',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '操作',
@@ -525,35 +661,50 @@
             {
               label: '序号',
               type: 'index',
-			  width: 55
+			  width: 55,
+			  align: 'center'
             },
             {
               label: '报工时间',
-              prop: 'reportWorkTime'
+              prop: 'reportWorkTime',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '报工执行人',
-              prop: 'reportingOperator'
+              prop: 'reportingOperator',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '合格品数量',
-              prop: 'standardNum'
+              prop: 'standardNum',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '合格品重量',
-              prop: 'standardWeight'
+              prop: 'standardWeight',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '不合格品数量',
-              prop: 'noStandardNum'
+              prop: 'noStandardNum',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '不合格品重量',
-              prop: 'noStandardWeight'
+              prop: 'noStandardWeight',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '副产品重量',
-              prop: 'secondaryProductWeight'
+              prop: 'secondaryProductWeight',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '操作',
@@ -564,15 +715,20 @@
             {
               label: '序号',
               type: 'index',
-			  width: 55
+			  width: 55,
+			  align: 'center'
             },
             {
               label: '交接时间',
-              prop: 'handoverTime'
+              prop: 'handoverTime',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '交接执行人',
-              prop: 'handoverOperator'
+              prop: 'handoverOperator',
+			  minWidth: 120,
+			  align: 'center'
             },
             {
               label: '交接数量',
@@ -584,47 +740,69 @@
             },
             {
               label: '投料时间',
-              prop: 'feedingTime'
+              prop: 'feedingTime',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '投料执行人',
-              prop: 'feedingOperator'
+              prop: 'feedingOperator',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '设备编码',
-              prop: 'deviceCode'
+              prop: 'deviceCode',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '设备名称',
-              prop: 'deviceName'
+              prop: 'deviceName',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '报工时间',
-              prop: 'reportWorkTime'
+              prop: 'reportWorkTime',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '报工执行人',
-              prop: 'reportingOperator'
+              prop: 'reportingOperator',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '合格品数量',
-              prop: 'standardNum'
+              prop: 'standardNum',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '合格品重量',
-              prop: 'standardWeight'
+              prop: 'standardWeight',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '不合格品数量',
-              prop: 'noStandardNum'
+              prop: 'noStandardNum',
+			  minWidth: 120,
+			  align: 'center'
             },
             {
               label: '不合格品重量',
-              prop: 'noStandardWeight'
+              prop: 'noStandardWeight',
+			  minWidth: 120,
+			  align: 'center'
             },
             {
               label: '副产品重量',
-              prop: 'secondaryProductWeight'
+              prop: 'secondaryProductWeight',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '操作',
@@ -635,47 +813,68 @@
             {
               label: '序号',
               type: 'index',
-			  width: 55
+			  width: 55,
+			  align: 'center'
             },
             {
               label: '交接时间',
-              prop: 'handoverTime'
+              prop: 'handoverTime',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '交接执行人',
-              prop: 'handoverOperator'
+              prop: 'handoverOperator',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '交接数量',
-              prop: 'handoverQuantity'
+              prop: 'handoverQuantity',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '实际数量',
-              prop: 'actualQuantity'
+              prop: 'actualQuantity',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '报工时间',
-              prop: 'reportWorkTime'
+              prop: 'reportWorkTime',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '报工执行人',
-              prop: 'reportingOperator'
+              prop: 'reportingOperator',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '包装数量',
-              prop: 'packagingQuantity'
+              prop: 'packagingQuantity',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '包装产品数量',
-              prop: 'packagedProductQuantity'
+              prop: 'packagedProductQuantity',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '尾料数量',
-              prop: 'tailingsQuantity'
+              prop: 'tailingsQuantity',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '物料清单',
-              prop: 'materialList'
+              prop: 'materialList',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '操作',
@@ -686,43 +885,62 @@
             {
               label: '序号',
               type: 'index',
-			  width: 55
+			  width: 55,
+			  align: 'center'
             },
             {
               label: '交接时间',
-              prop: 'handoverTime'
+              prop: 'handoverTime',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '交接执行人',
-              prop: 'handoverOperator'
+              prop: 'handoverOperator',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '交接数量',
-              prop: 'handoverQuantity'
+              prop: 'handoverQuantity',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '实际数量',
-              prop: 'actualQuantity'
+              prop: 'actualQuantity',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '报工时间',
-              prop: 'reportWorkTime'
+              prop: 'reportWorkTime',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '报工执行人',
-              prop: 'reportingOperator'
+              prop: 'reportingOperator',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '批次数量',
-              prop: 'batchQuantity'
+              prop: 'batchQuantity',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '入库数量',
-              prop: 'inboundQuantity'
+              prop: 'inboundQuantity',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '交货仓库',
-              prop: 'deliveryWarehouse'
+              prop: 'deliveryWarehouse',
+			  minWidth: 100,
+			  align: 'center'
             },
             {
               label: '操作',
@@ -744,7 +962,8 @@
 			7:'已延期'
 		},
 		countMsg: {},
-		chooseIndex:0
+		chooseIndex:0,
+		chooseItem:''
       };
     },
 	created () {
@@ -756,7 +975,9 @@
 			if(this.chooseIndex != tab.index ){
 				this.chooseIndex = tab.index
 				const chooseItem = this.tabList[this.chooseIndex]
-				this.activeName = chooseItem.taskTypeName || ''
+				this.chooseItem = this.tabList[this.chooseIndex].taskTypeName
+				// this.activeName = chooseItem.taskTypeName || ''
+				this.activeName = tab.index
 				this.taskCode = chooseItem.taskCode || ''
 				this.reload({workOrderId:this.workOrderId, taskCode:this.taskCode})
 				this.getReportCount()
@@ -779,7 +1000,9 @@
 			}else{
 				this.tabList = res.taskTypeProcessDiagrams
 			}
-			this.activeName = this.tabList[0]?.taskTypeName || ''
+			// this.activeName = this.tabList[0]?.taskTypeName || ''
+			this.chooseItem = this.tabList[0]?.taskTypeName
+			this.activeName = 0 
 			this.taskCode = this.tabList[0]?.taskCode || ''
 			this.chooseIndex = 0 
 			this.reload({workOrderId:this.workOrderId, taskCode:this.taskCode})