bug修复

src/HDrpManagement/serveWorkBill/modules/teamList/index.vue

@@ -44,7 +44,7 @@
         <el-table-column :label="$t('操作')">
           <template slot-scope="scope">
             <el-button
-              :disabled="mainData.status != '进行中' || scope.row.isleader ||  !mainData.isServerMag"
+              :disabled="(mainData.status != '进行中'  ||  (!mainData.isServerMag && !mainData.isleader)) || scope.row.isleader"
               class="inline-16"
               size="mini"
               type="text"
@@ -53,7 +53,7 @@
             >
             <el-button
               :disabled="
-                !mainData.isServerMag || scope.row.isleader || mainData.status != '进行中'
+                (mainData.status != '进行中'  ||  (!mainData.isServerMag && !mainData.isleader)) || scope.row.isleader
               "
               size="mini"
               type="text"

src/HDrpManagement/serviceImprovement/components/associatedImprovementOrder/index.vue

@@ -0,0 +1,91 @@
+<template>
+  <div>
+    <el-input style="width:200px;" :placeholder="$t('输入搜索内容')" :suffix-icon="param.content.where.condition?param.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" size="small" class="mt-10 input-with-select inline-16 layout_search__panel" clearable>
+    </el-input>
+    <table-detail :layout="tablecols" :data="list" :custom="true" :width="true" :height="tableHieght" minHeight="200px" fixedName="operation">
+      <template v-slot:customcol="scope">
+        <div v-if="scope.column.columnname === 'progress'">
+          {{Math.round((scope.column.data[[scope.column.columnname]] * 100) * 100)/100 + '%'}}
+        </div>
+        <div v-else-if="scope.column.columnname === 'billno'">
+          <el-button type="text" @click="goDetail(scope.column.data)">{{scope.column.data[[scope.column.columnname]]}}</el-button>
+        </div>
+        <div v-else>
+          {{ scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation' ? scope.column.data[[scope.column.columnname]] : '--' }}
+        </div>
+      </template>
+    </table-detail>
+    <div  class="container normal-panel" style="text-align:right;padding-bottom: 0!important;">
+      <el-pagination
+          background
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-sizes="[50, 100, 150, 200]"
+          :page-size="50"
+          layout="total,sizes, prev, pager, next, jumper"
+          :total="total">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "index",
+  data(){
+    return {
+      tableHieght:'calc(100vh - 380px)',
+      tablecols:[],
+      list:[],
+      currentPage:0,
+      total:0,
+      param:{
+        "id": 2026020215314702,
+        "content": {
+          "sa_service_improvementid": this.$route.query.id,
+          "pageNumber": 1,
+          "pageSize": 50,
+          "where": {
+            "condition": ""
+          }
+        },
+      }
+    }
+  },
+  methods:{
+    async listData(){
+      const res = await this.$api.requested(this.param)
+      this.list = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.param.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.param.content.pageNumber = val
+      this.listData()
+    },
+    goDetail(data){
+      this.$router.replace({
+        path: "/serviceImprovementDetail",
+        query: { id: data.sa_service_improvementid,rowindex: data.rowindex},
+      });
+    }
+  },
+  mounted() {
+    this.listData(this.param.content.pageNumber = 1)
+  },
+  created() {
+    this.tablecols = this.tool.tabelCol(this.$route.name).serviceImprovementRelationTable.tablecols
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/serviceImprovement/components/serviceImprovement/index.vue

@@ -8,17 +8,20 @@
       <el-tab-pane label="改善单信息" name="改善单信息">
         <detailInfo :more="true"  :data="detailInfo"></detailInfo>
       </el-tab-pane>
-      <el-tab-pane label="关联改善单" name="关联改善单">{{$t(`关联改善单`)}}</el-tab-pane>
+      <el-tab-pane label="关联改善单" name="关联改善单">
+        <associatedImprovementOrder></associatedImprovementOrder>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 
 <script>
 import detailInfo from '@/components/detailInfo/index'
+import associatedImprovementOrder from '../associatedImprovementOrder/index'
 export default {
   name: "index",
   props:['mainData'],
-  components:{detailInfo},
+  components:{detailInfo,associatedImprovementOrder},
   data(){
     return {
       activeName:'真因分析',