检验bug修改及优化

fe/PC/src/components/currenTable/index.vue

@@ -242,8 +242,9 @@
         </el-form-item>
         <!-- table表添加按钮事件 v-show="scope.row.number == 'PRJ202210060001'" -->
         <el-form-item v-if="item.type == 'button'" >
+          <!-- v-show="scope.row[item.prop]==undefined?true:false" -->
           <el-button
-            v-show="scope.row[item.prop]==undefined?true:false"
+            v-show="item.alwaysShow ? true : ((scope.row[item.prop]==undefined || scope.row[item.prop] == '' || !scope.row[item.prop])?false:true)"
             type="primary"
             size="mini"
             @click="buttonClick(scope.row, scope.$index, item.label)"

fe/PC/src/components/umyTable/index.vue

@@ -251,7 +251,7 @@
           <!-- v-show="scope.row[item.prop]==undefined?true:false" -->
           <div v-if="item.type == 'button'">
             <el-button
-              v-show="(scope.row[item.prop]==undefined || scope.row[item.prop] == '' || !scope.row[item.prop])?false:true"
+              v-show="item.alwaysShow ? true : ((scope.row[item.prop]==undefined || scope.row[item.prop] == '' || !scope.row[item.prop])?false:true)"
               type="primary"
               size="mini"
               @click="buttonClick(scope.row, scope.$index, item.label,item)"

fe/PC/src/router/index.js

@@ -142,21 +142,21 @@ export const constantRoutes = [
   // }, 
   
   // 开发中模拟路由
-  // {
+  {
-  //   path: '/',
+    path: '/',
-  //   component: Layout,
+    component: Layout,
-  //   redirect: '/TestSchool',
+    redirect: '/ceshi',
-  //   hidden: true,
+    hidden: true,
-  //   children: [{
+    children: [{
-  //     path: 'TestSchool',
+      path: 'ceshi',
-  //     component: () => import('@/views/interfaceBoard/TestSchool.vue'),
+      component: () => import('@/views/ceshi/ceshi.vue'),
-  //     name: 'TestSchool',
+      name: 'ceshi',
-  //     meta: {
+      meta: {
-  //       title: 'TestSchool',
+        title: 'ceshi',
-  //       icon: '拆分记录',
+        icon: '',
-  //     }
+      }
-  //   }]
+    }]
-  // },
+  },
   // {
   //   path: '/',
   //   component: Layout,

fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue

@@ -64,6 +64,7 @@
               type="primary"
               v-if="scope.row.summaryInspectStatus != 2"
               @click="buttonClick(scope.row)"
+              size="small"
             >检验详情</el-button>
             <span v-else style="color:#31bb99">质检已完成</span>
           </template>
@@ -158,7 +159,7 @@
     <el-dialog
         title="质检详情"
         v-loading="loading"
-        :visible.sync="inspectNoticeDetailsShow"
+        :visible="inspectNoticeDetailsShow"
         top="5vh"
         width="80%"
         :fullscreen="true"
@@ -197,7 +198,8 @@
               class="formTable-box"
               prop="details"
             >
-              <currenTable
+              <umyTable
+                :setUTableHeight="470"
                 :tableData="inspectNoticeDetailsFormData.details"
                 :tableColumns="inspectNoticeDetailsTableColumns"
                 :tableLoading = "inspectNoticeDetailsTableLoading"
@@ -206,7 +208,7 @@
                 :cellStyle = "cellStyle"
                 @buttonClick="inspectDetailsButtonClick"
               >
-              </currenTable>
+              </umyTable>
             </el-form-item>
           </template>
         </curren-Form>
@@ -488,8 +490,8 @@ export default {
         // { label: "单位", prop: "receiveUom", width:'100%' },
         { label: "收货数量", prop: "receiveQty", width:'100%' },
         { label: "状态", prop: "detailInspectStatus", type: "filter", filters: "detailInspectStatus", width:'100%' },
-        { type: "button", label: "检验", prop: "buttonHide", width:'100%' },
+        { type: "button", label: "检验", prop: "buttonHide",alwaysShow:true, width:'100%' },
-        { type: "button", label: "清除检验", width:'100%' },
+        { type: "button", label: "清除检验", alwaysShow:true,width:'100%' },
       ],
       //查询质检详情-表单数据
       QueryDetailsFormData: {
@@ -606,6 +608,9 @@ export default {
         this.$message.error('已完成质检')
         return
       }
+      // 展现 质检详情窗口
+      this.Loading.appMainLoading = true
+      setTimeout(()=>{
         this.inspectNoticeDetailsFormData.formFile = []
         this.inspectNoticeDetailsFormData = {
           warehouseCode: localStorage.getItem('warehouseCode'),
@@ -695,17 +700,20 @@ export default {
                   // })
                   }
                     this.loading = false
+                    this.Loading.appMainLoading = false
                 }).catch(err=>{
                   this.loading = false
+                  this.Loading.appMainLoading = false
                 })
               }
             }
           }
         }).catch(err=>{
           this.loading = false
+          this.Loading.appMainLoading = false
         })
-      // 展现 质检详情窗口
         this.inspectNoticeDetailsShow = true
+      },300)
     },
     // 质检合格不合格-删除按钮
     inspectButtonClick(row, index, label) {
@@ -827,6 +835,7 @@ export default {
           rd.readAsDataURL(this.inspectNoticeDetailsFormData.formFile[0])
           rd.onloadend = function(){
             var arrayBuffer = rd.result
+            that.inspectNoticeDetailsFormData.filesList = []
             that.inspectNoticeDetailsFormData.filesList.push(
               {
                 fileName: fileName,