11

src/views/statisticalanalysis/components/echart/tableforms.vue

@@ -1088,7 +1088,7 @@
           </el-table-column>
         </el-table>
       </template>
-      <template v-if="tableList.length && action == 12">
+      <!-- <template v-if="tableList.length && action == 12">
         <el-table
           :data="tableList"
           style="width: 100%"
@@ -1129,14 +1129,14 @@
           </el-table-column>
           <el-table-column
             prop="codeNum"
-            label="绑图前条码数"
+            label="龙门架扫码数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
             :align="tableColumnProperty.align"
           >
           </el-table-column>
           <el-table-column
             prop="reCodeNum"
-            label="绑图前重复条码数据"
+            label="龙门架扫码重复条码数"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
             :align="tableColumnProperty.align"
           >
@@ -1164,7 +1164,7 @@
           </el-table-column>
           <el-table-column
             prop="piclvs"
-            label="绑图前重码率"
+            label="龙门架重码率"
             :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
             :align="tableColumnProperty.align"
           >
@@ -1191,123 +1191,27 @@
           >
           </el-table-column>
         </el-table>
-      </template>
-      <template v-if="tableList.length && action == 13">
-        <el-table
-          :data="tableList"
-          style="width: 100%"
-          :row-style="rowStyle"
-          :style="dataTableContentStyle"
-          height="calc(100vh - 190px)"
-          max-height="calc(100vh - 190px)"
-          :stripe="tableProps.stripe"
-          :border="tableProps.border"
-          :row-key="tableProps.rowKey"
-          :highlight-current-row="tableProps.highlightCurrentRow"
-          :header-cell-class-name="tableProps.headerCellClassName"
-          :tooltip-effect="tableProps.tooltipEffect"
-          :summary-method="totalOutPrice"
-          :show-summary="tableProps.showSummary"
-        >
-          <el-table-column
-            prop="indexs"
-            label="序号"
-            :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
-            :align="tableColumnProperty.align"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="dat"
-            label="日期"
-            width="100"
-            :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
-            :align="tableColumnProperty.align"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="cargoCompany"
-            label="代理人"
-            :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
-            :align="tableColumnProperty.align"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="ChannelId"
-            label="通道"
-            :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
-            :align="tableColumnProperty.align"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="codeNum"
-            label="绑图前条码数"
-            :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
-            :align="tableColumnProperty.align"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="reCodeNum"
-            label="绑图前重复条码数据"
-            :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
-            :align="tableColumnProperty.align"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="accNum"
-            label="加货条码数量"
-            :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
-            :align="tableColumnProperty.align"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="reAccNum"
-            label="加货重复条码数量"
-            :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
-            :align="tableColumnProperty.align"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="pcs"
-            label="加货记录的该通道运单件数"
-            :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
-            :align="tableColumnProperty.align"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="piclvs"
-            label="绑图前重码率"
-            :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
-            :align="tableColumnProperty.align"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="acclvs"
-            label="加货重码率"
-            :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
-            :align="tableColumnProperty.align"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="readlvs"
-            label="识读率"
-            :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
-            :align="tableColumnProperty.align"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="oklvs"
-            label="加货准确率"
-            :show-overflow-tooltip="tableColumnProperty.showOverflowTooltip"
-            :align="tableColumnProperty.align"
-          >
-          </el-table-column>
-        </el-table>
-      </template>
+      </template> -->
+      <SimpleTable
+        v-show="tableList.length && action == 12"
+        ref="tableRef"
+        height="calc(100vh - 190px)"
+        :data="tableList"
+        :columns="tableColumn"
+      />
+      <SimpleTable
+        v-show="tableList.length && action == 13"
+        ref="tableRef"
+        height="calc(100vh - 190px)"
+        :data="tableList"
+        :columns="tableColumns"
+      />
     </div>
   </div>
 </template>
 
 <script>
+import SimpleTable from "@/components/SimpleTable/index.vue";
 export default {
   props: {
     tableList: {
@@ -1355,6 +1259,126 @@ export default {
         align: "center",
         headerAlign: "",
       },
+      tableColumns: [
+        {
+          columnName: "indexs",
+          columnLabel: "序号",
+        },
+        {
+          columnName: "dat",
+          width: 100,
+          columnLabel: "日期",
+        },
+        {
+          columnName: "cargoCompany",
+          columnLabel: "代理人",
+          needFilters: 0,
+          needSort: 1,
+        },
+        {
+          columnName: "ChannelId",
+          columnLabel: "通道",
+          needFilters: 1,
+          needSort: 1,
+        },
+        {
+          columnName: "codeNum",
+          columnLabel: "龙门架扫码数",
+        },
+        {
+          columnName: "reCodeNum",
+          columnLabel: "龙门架扫码重复条码数",
+        },
+        {
+          columnName: "accNum",
+          columnLabel: "加货条码数量",
+        },
+        {
+          columnName: "reAccNum",
+          columnLabel: "加货重复条码数量",
+        },
+        {
+          columnName: "pcs",
+          columnLabel: "加货记录的该通道运单件数",
+        },
+        {
+          columnName: "piclvs",
+          columnLabel: "龙门架重码率",
+          needSort: 1,
+        },
+        {
+          columnName: "acclvs",
+          columnLabel: "加货重码率",
+          needSort: 1,
+        },
+        {
+          columnName: "readlvs",
+          columnLabel: "识读率",
+          needSort: 1,
+        },
+        {
+          columnName: "oklvs",
+          columnLabel: "加货准确率",
+          needSort: 1,
+        },
+      ],
+      tableColumn: [
+        {
+          columnName: "indexs",
+          columnLabel: "序号",
+        },
+        {
+          columnName: "dat",
+          width: 100,
+          columnLabel: "日期",
+        },
+        {
+          columnName: "ChannelId",
+          columnLabel: "通道",
+          needFilters: 1,
+          needSort: 1,
+        },
+        {
+          columnName: "codeNum",
+          columnLabel: "龙门架扫码数",
+        },
+        {
+          columnName: "reCodeNum",
+          columnLabel: "龙门架扫码重复条码数",
+        },
+        {
+          columnName: "accNum",
+          columnLabel: "加货条码数量",
+        },
+        {
+          columnName: "reAccNum",
+          columnLabel: "加货重复条码数量",
+        },
+        {
+          columnName: "pcs",
+          columnLabel: "加货记录的该通道运单件数",
+        },
+        {
+          columnName: "piclvs",
+          columnLabel: "龙门架重码率",
+          needSort: 1,
+        },
+        {
+          columnName: "acclvs",
+          columnLabel: "加货重码率",
+          needSort: 1,
+        },
+        {
+          columnName: "readlvs",
+          columnLabel: "识读率",
+          needSort: 1,
+        },
+        {
+          columnName: "oklvs",
+          columnLabel: "加货准确率",
+          needSort: 1,
+        },
+      ],
     };
   },
   watch: {
@@ -1432,6 +1456,9 @@ export default {
     //   this.$emit("load", true);
     // };
   },
+  components: {
+    SimpleTable,
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/statisticalanalysis/gantryframe/index.vue

@@ -210,9 +210,14 @@ export default {
               item.readlvs = ((item.codeNum * 100) / item.pcs).toFixed(2);
             }
             if (item.pcs === 0) {
-              item.oklvs = ((item.reAccNum * 100) / 1).toFixed(2);
+              item.oklvs = (((item.accNum - item.reAccNum) * 100) / 1).toFixed(
+                2
+              );
             } else {
-              item.oklvs = ((item.reAccNum * 100) / item.pcs).toFixed(2);
+              item.oklvs = (
+                ((item.accNum - item.reAccNum) * 100) /
+                item.pcs
+              ).toFixed(2);
             }
             if (isNaN(item.piclvs)) {
               item.piclvs = "0%";
@@ -279,12 +284,16 @@ export default {
           }
           if (this.listall.pcsall === 0) {
             this.listall.oklvall =
-              ((this.listall.reAccNumall * 100) / 1).toFixed(2) + "%";
+              (
+                ((this.listall.accNumall - this.listall.reAccNumall) * 100) /
+                1
+              ).toFixed(2) + "%";
           } else {
             this.listall.oklvall =
-              ((this.listall.reAccNumall * 100) / this.listall.pcsall).toFixed(
-                2
-              ) + "%";
+              (
+                ((this.listall.accNumall - this.listall.reAccNumall) * 100) /
+                this.listall.pcsall
+              ).toFixed(2) + "%";
           }
           this.tableListcop.forEach((item, index) => {
             item.indexs = index + 1;