Merge branch 'greenUrgent' into allTestUrgent

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

@@ -1,21 +1,24 @@
 <template>
   <div>
-    <div style="display:flex;justify-content: space-between;">
-      <table-detail ref="tableRef" :layout="tablecols" :data="list" :opwidth="200" :custom="true" style="margin-top: 10px" @rowClick="rowClick">
-        <template v-slot:customcol="scope">
-          <div v-if="scope.column.columnname == 'status'">
-            <div :style="tool.getStatusColor(scope.column.data[scope.column.columnname])">{{scope.column.data[scope.column.columnname]}}</div>
-          </div>
-          <div v-else>{{scope.column.data[scope.column.columnname]}}</div>
-        </template>
-      </table-detail>
-      <div style="width: 45%" id="gantt222">
-        <ganttChart :data="list" style="margin-top: 10px" ref="chartRef" clickCan="可以点击" @taskDetail="taskDetail"></ganttChart>
+    <div v-if="list.length > 0">
+      <div style="display:flex;justify-content: space-between;padding-right: 10px" >
+        <table-detail ref="tableRef" :layout="tablecols" :data="list" :opwidth="200" :custom="true" style="margin-top: 10px;margin-right: 10px;width: 50%" @rowClick="rowClick">
+          <template v-slot:customcol="scope">
+            <div v-if="scope.column.columnname == 'status'">
+              <div :style="tool.getStatusColor(scope.column.data[scope.column.columnname])">{{scope.column.data[scope.column.columnname]}}</div>
+            </div>
+            <div v-else>{{scope.column.data[scope.column.columnname]}}</div>
+          </template>
+        </table-detail>
+        <div style="width: 50%;" id="gantt222">
+          <ganttChart :data="list" style="margin-top: 10px;" ref="chartRef" clickCan="可以点击" @taskDetail="taskDetail"></ganttChart>
+        </div>
+      </div>
+      <div style="margin-top: 20px">
+        <actionDetail v-if="detailShow" ref="actionRef" :data="selectData" :mainData="mainData" @recordSet="recordSet" @onSuccess="onSuccess"></actionDetail>
       </div>
     </div>
-    <div style="margin-top: 20px">
-      <actionDetail v-if="detailShow" ref="actionRef" :data="selectData" :mainData="mainData" @recordSet="recordSet" @onSuccess="onSuccess"></actionDetail>
-    </div>
+    <el-empty v-else description="暂无数据"></el-empty>
   </div>
 </template>
 

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

@@ -9,8 +9,8 @@
         </div>
         <div v-else-if="scope.column.columnname === 'billno'">
 <!--          <drawerDetail :btn_title="scope.column.data[[scope.column.columnname]]" :data="scope.column.data"></drawerDetail>-->
-<!--          <el-button type="text" size="small" @click="goDetail(scope.column.data)">{{scope.column.data[[scope.column.columnname]]}}</el-button>-->
-          <span>{{scope.column.data[[scope.column.columnname]]}}</span>
+          <el-button type="text" size="small" @click="goDetail(scope.column.data)">{{scope.column.data[[scope.column.columnname]]}}</el-button>
+<!--          <span>{{scope.column.data[[scope.column.columnname]]}}</span>-->
         </div>
         <div v-else>
           {{ scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation' ? scope.column.data[[scope.column.columnname]] : '--' }}

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

@@ -6,7 +6,7 @@
         <div>{{scope.column.data[scope.column.columnname]}}</div>
       </template>
     </table-detail>
-    <ganttChart :data="list" style="margin-top: 10px" ref="chartRef"></ganttChart>
+    <ganttChart v-if="list.length > 0" :data="list" style="margin-top: 10px" ref="chartRef"></ganttChart>
   </div>
 </template>
 

src/HDrpManagement/serviceImprovement/modules/detail.vue

@@ -143,7 +143,6 @@ import serviceImprovement from '@/HDrpManagement/serviceImprovement/components/s
 import edit from './edit'
 import refundOrder from '@/components/dialogTemplate/index2'
 export default {
-  name: "detail",
   components:{
     serviceApplication,
     serviceWorkOrder,

src/HDrpManagement/serviceImprovement/modules/detail2.vue

@@ -130,7 +130,7 @@
         </div>
       </div>
       <div slot="slot2" >
-        <serviceImprovement :mainData="mainData" :someUserid="someUserid" @Success="queryMainData"></serviceImprovement>
+        <serviceImprovement v-if="isShowSer"  :mainData="mainData" :someUserid="someUserid" @Success="queryMainData"></serviceImprovement>
       </div>
     </basicDetails>
   </div>
@@ -143,7 +143,6 @@ import serviceImprovement from '@/HDrpManagement/serviceImprovement/components/s
 import edit from './edit'
 import refundOrder from '@/components/dialogTemplate/index2'
 export default {
-  name: "detail2",
   components:{
     serviceApplication,
     serviceWorkOrder,
@@ -172,10 +171,16 @@ export default {
           },
         ],
       },
-      personList:[]
+      personList:[],
+      isShowSer:false
     }
   },
   methods:{
+    isShow(){
+      setTimeout(()=>{
+        this.isShowSer = true
+      },500)
+    },
     async queryMainData(){
       const res = await this.$api.requested({
         "id": 2026013111234002,
@@ -189,6 +194,9 @@ export default {
           this.someUserid = true
         }
       })
+      this.$nextTick(()=>{
+        this.isShow()
+      })
       this.changeDataStructure()
     },
     changeDataStructure(){