质检+utable优化

fe/PC/public/version.json

@@ -1,3 +1,3 @@
 {
-    "version": "1.0.69"
+    "version": "1.0.70"
 }

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

@@ -2,21 +2,22 @@
   <!-- 解决el-table 数据量过大导致卡顿现象 -->  
   <u-table
     :id="_uid"
-    :key="isUpdate"
     v-loading="tableLoading"
     element-loading-text="拼命加载中..."
     @sort-change="sortChange"
     @selection-change="handleSelectionChange"
     ref="multipleTable"
     :data="tableData"
+    :height="uTableHeight"
     :row-key="rowKey"
     :border="tableBorder"
     style="width: 100%"
     :cell-style="cellStyle"
-    use-virtual
+    :key="isUpdate"
     :row-height="50"
-    :height="uTableHeight"
     header-row-class-name="uTableHeader"
+    use-virtual
+    :cell-class-name="cellClassName"
   >
     <!-- :tree-props="treeProps" 与 “height”  不能共存， 此组件暂不支持tree的格式-->
     <u-table-column v-if="selectionTable" fixed="left" type="selection" :reserve-selection="true" />
@@ -29,8 +30,8 @@
       :fixed="setItemFixed(item,index)"
       :show-overflow-tooltip="showOverflowTooltip"
       :width="item.width"
-      :align="item.tableAlign"
-      :header-align="item.tableHeaderAlign"
+      :align="item.tableAlign || tableAlign"
+      :header-align="item.tableHeaderAlign || tableHeaderAlign"
       v-if="item.istrue==null?true:item.istrue"
     >
       <template #header>
@@ -416,6 +417,14 @@ export default {
       type: Boolean,
       default: false,
     },
+    tableAlign:{
+      type: String,
+      default: 'left',
+    },
+    tableHeaderAlign:{
+      type: String,
+      default: 'left',
+    },
     // 是否为第一个浮动，如果是，则item中的fixed无效（应用场景：主列表，因为用户排序不定元素为第一项）
     firstFixed: {
       type: Boolean,
@@ -484,6 +493,12 @@ export default {
         return Function;
       }
     },
+    cellClassName: {
+      type: Function,
+      default: () => {
+        return Function;
+      }
+    },
     // 已app-main高度为100%  需要减掉的高度
     setUTableHeight: {
       type: Number,
@@ -898,4 +913,9 @@ span {
 .u-table::before {
   height: 0px;
 }
+.u-table{
+  td{
+    height: 50px;
+  }
+}
 </style>

fe/PC/src/router/index.js

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

fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue

@@ -159,10 +159,10 @@ export default {
         {label:'业务子类型',prop:'enumTransSubType',type:'filter',option:'transSubType'},
         {label:'对应接口',prop:'interFaceName',width:220},
         {label:'期初库存',prop:'firstQty'},
-        {label:'期末库存',prop:'lastQty'},
-        {label:'结存',prop:'nowQty'},
         {label:'入库',prop:'sumInQty'},
         {label:'出库',prop:'sumOutQty'},
+        {label:'结存',prop:'nowQty'},
+        {label:'期末库存',prop:'lastQty'},
       ],
       totalProps:['firstQty','lastQty','nowQty','sumInQty','sumOutQty'],// 小结显示的字段
       indexArray_item: [], //itemCode 存储所有合并的行号

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

@@ -205,7 +205,10 @@
                 :tableLoading = "inspectNoticeDetailsTableLoading"
                 :isShowIndex="true"
                 :selectionTable="false"
-                :cellStyle = "cellStyle"
+                :cellClassName="cellClassName"
+                :tableBorder="true"
+                :tableAlign="'center'"
+                :tableHeaderAlign="'center'"
                 @buttonClick="inspectDetailsButtonClick"
               >
               </umyTable>
@@ -843,7 +846,11 @@ export default {
               }
             )
             console.log(830,{id: that.masterID, summaryDetailId: that.inspectNoticeDetailsFormData.id }, that.inspectNoticeDetailsFormData)
-            completeSummaryDetailStatus({id: that.masterID, summaryDetailId: that.inspectNoticeDetailsFormData.id }, that.inspectNoticeDetailsFormData).then(res => {
+            completeSummaryDetailStatus(
+              {id: that.masterID, summaryDetailId: that.inspectNoticeDetailsFormData.id }, 
+              that.inspectNoticeDetailsFormData,
+              // 'http://dev.ccwin-in.com:60085/api/'
+            ).then(res => {
               // 更新数据============================================================
               that.inspectNoticeDetailsShow = false
               this.loading = false
@@ -1034,15 +1041,16 @@ export default {
       this.loadingPDF = false
     },
     //设置指定行、列、具体单元格颜色
-    cellStyle({row, column, rowIndex, columnIndex}){
+    cellClassName({row, column, rowIndex, columnIndex}){
       if (row.detailInspectStatus == 1 && columnIndex === 5) {
-        return 'background:#42a9b9;color:#fff' //默认合格
+        return 'cell-class-mrhg' //默认合格
       } else if (row.detailInspectStatus == 2 && columnIndex === 5) {
-        return 'background:#42b983;color:#fff'//合格
+        return 'cell-class-hg'//合格
       } else if (row.detailInspectStatus == 3 && columnIndex === 5) {
-        return 'background:#c3503e;color:#fff'//不合格
+        return 'cell-class-nohg'//不合格
+      }else{
+        return ''
       }
-      return ''
     },
     currenTabsChange(row){
       this.currentTagName = row.name
@@ -1110,6 +1118,18 @@ export default {
       }
   }
 }
+::v-deep .cell-class-mrhg{
+  background:#42a9b9 !important;
+  color:#fff !important
+}
+::v-deep .cell-class-hg{
+  background:#42b983 !important;
+  color:#fff !important
+}
+::v-deep .cell-class-nohg{
+  background:#c3503e !important;
+  color:#fff
+}
 </style>
 <style lang="scss">
 .upload-demo {