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

src/views/produce/components/footBtn.vue

@@ -39,7 +39,7 @@
             name: '首件两检',
             type: 'qualityInspection',
             bjColor: '#920077',
-            isShow: ''
+            isShow: 'mes:firstarticledualinspection'
           },
           {
             name: '产前准备',

src/views/produce/components/qualityInspection/index.vue

@@ -9,7 +9,7 @@
       <!-- <el-button type="primary" plain round @click="openMaintenancePlan">
         设备保养计划
       </el-button> -->
-      <div v-if="loading" class="step-list" v-loading="loading">
+      <div class="step-list" v-loading="loading">
         <ele-pro-table
           ref="table"
           row-key="id"
@@ -31,7 +31,6 @@
           </template>
         </ele-pro-table>
       </div>
-      <el-empty v-else></el-empty>
     </div>
     <template #footer>
       <el-button @click="handleUpdate" type="primary" :loading="butLoad"
@@ -59,7 +58,7 @@
     data() {
       return {
         dialogVisible: false,
-        loading: true,
+        loading: false,
         produceTaskInfo: null,
         workOrder: null,
         butLoad: false,
@@ -154,8 +153,10 @@
       },
       // 获取数据
       async getData() {
+        this.loading = true;
         const data = await pageFirstArticleDualInspectionRecord({});
         this.list = data.list || [];
+        this.loading = false;
       },
       handleClose() {
         this.dialogVisible = false;