lxf 1 year ago
parent
commit
d37bc31e0d

+ 1 - 37
src/views/group/finance/summary/index.vue

@@ -8,16 +8,6 @@
         :loading="loading"
         :loading="loading"
         :searchConfig="searchConfig"
         :searchConfig="searchConfig"
         highlight-current-row
         highlight-current-row
-        :table-events="{
-          select: selectRow,
-          'select-all': selectRow,
-        }"
-        :action-list="[
-          {
-            text: '批量打印',
-            action: () => clickBatchPrinting(),
-          },
-        ]"
         @get-list="getList"
         @get-list="getList"
         @clickReset="clickReset">
         @clickReset="clickReset">
       </byTable>
       </byTable>
@@ -78,12 +68,6 @@ const searchConfig = computed(() => {
 const config = computed(() => {
 const config = computed(() => {
   return [
   return [
     {
     {
-      type: "selection",
-      attrs: {
-        checkAtt: "isCheck",
-      },
-    },
-    {
       attrs: {
       attrs: {
         label: "维度",
         label: "维度",
         prop: "dimensionality",
         prop: "dimensionality",
@@ -145,14 +129,7 @@ const config = computed(() => {
 const getDemandData = () => {
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = departmentList.value;
     }
     }
   });
   });
 };
 };
@@ -188,10 +165,6 @@ getList();
 const clickReset = () => {
 const clickReset = () => {
   getList("", true);
   getList("", true);
 };
 };
-const selectData = ref([]);
-const selectRow = (data) => {
-  selectData.value = data;
-};
 const openPrint = ref(false);
 const openPrint = ref(false);
 const idGroupConcat = ref("");
 const idGroupConcat = ref("");
 const activeName = ref("sku");
 const activeName = ref("sku");
@@ -200,15 +173,6 @@ const clickPrint = (row) => {
   idGroupConcat.value = row.idGroupConcat;
   idGroupConcat.value = row.idGroupConcat;
   openPrint.value = true;
   openPrint.value = true;
 };
 };
-const clickBatchPrinting = () => {
-  if (selectData.value && selectData.value.length > 0) {
-    idGroupConcat.value = selectData.value.map((item) => item.idGroupConcat).join(",");
-    activeName.value = "sku";
-    openPrint.value = true;
-  } else {
-    return ElMessage("请选择需要批量操作的数据");
-  }
-};
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>

+ 12 - 14
src/views/group/finance/summary/printBOM.vue

@@ -3,8 +3,6 @@
     <el-card style="height: calc(100vh - 168px); overflow-y: auto; overflow-x: hidden" v-loading="loading">
     <el-card style="height: calc(100vh - 168px); overflow-y: auto; overflow-x: hidden" v-loading="loading">
       <div id="tableId">
       <div id="tableId">
         <el-table :data="tableData" border :row-style="{ height: '35px' }" header-row-class-name="tableHeader" show-summary :summary-method="getSummaries">
         <el-table :data="tableData" border :row-style="{ height: '35px' }" header-row-class-name="tableHeader" show-summary :summary-method="getSummaries">
-          <el-table-column label="维度" prop="dimensionality" width="120" />
-          <el-table-column label="客户" prop="departmentName" width="160" />
           <el-table-column label="E10品号" prop="bomSpecCode" width="140" />
           <el-table-column label="E10品号" prop="bomSpecCode" width="140" />
           <el-table-column label="SKU品名" prop="bomSpecName" min-width="220" />
           <el-table-column label="SKU品名" prop="bomSpecName" min-width="220" />
           <el-table-column label="数量(PCS)" align="center" prop="quantity" width="130" />
           <el-table-column label="数量(PCS)" align="center" prop="quantity" width="130" />
@@ -57,18 +55,18 @@ onMounted(() => {
   }
   }
 });
 });
 const labelList = ref({
 const labelList = ref({
-  4: "quantity",
-  6: "laserLogoSummary",
-  7: "laserMitochondrialSummary",
-  8: "lssueFeeSummary",
-  9: "deliveryMaterialsFeeSummary",
-  10: "packingLaborSummary",
-  11: "subtotal",
-  12: "total",
+  2: "quantity",
+  4: "laserLogoSummary",
+  5: "laserMitochondrialSummary",
+  6: "lssueFeeSummary",
+  7: "deliveryMaterialsFeeSummary",
+  8: "packingLaborSummary",
+  9: "subtotal",
+  10: "total",
 });
 });
 const textList = ref({
 const textList = ref({
-  3: "胜德体育总经理:",
-  6: "申请日期:",
+  1: "胜德体育总经理:",
+  2: "申请日期:",
 });
 });
 const getSummaries = ({ columns, data }) => {
 const getSummaries = ({ columns, data }) => {
   const sums = [];
   const sums = [];
@@ -92,7 +90,7 @@ const getSummaries = ({ columns, data }) => {
       return;
       return;
     } else {
     } else {
       sums[index] = h("div", { class: "" }, [
       sums[index] = h("div", { class: "" }, [
-        [1, 2, 3, 5].includes(index)
+        [1, 3].includes(index)
           ? h("div", {
           ? h("div", {
               style: {
               style: {
                 "text-align": "center",
                 "text-align": "center",
@@ -140,7 +138,7 @@ const getSummaries = ({ columns, data }) => {
           },
           },
           innerHTML: ".",
           innerHTML: ".",
         }),
         }),
-        [3, 6].includes(index)
+        [1, 2].includes(index)
           ? h("div", { style: { "font-size": "16px", "font-weight": 700, padding: "0 12px", "text-align": "left" }, innerHTML: textList.value[index] })
           ? h("div", { style: { "font-size": "16px", "font-weight": 700, padding: "0 12px", "text-align": "left" }, innerHTML: textList.value[index] })
           : h("div", {
           : h("div", {
               style: {
               style: {

+ 4 - 8
src/views/group/finance/summary/printOrder.vue

@@ -11,8 +11,6 @@
           :summary-method="getSummaries"
           :summary-method="getSummaries"
           :span-method="objectSpanMethod"
           :span-method="objectSpanMethod"
           max-height="calc(100vh - 79px)">
           max-height="calc(100vh - 79px)">
-          <el-table-column label="维度" prop="dimensionality" width="120" />
-          <el-table-column label="客户" prop="departmentName" width="160" />
           <el-table-column label="订单时间" prop="wlnCreateTime" align="center" width="160" />
           <el-table-column label="订单时间" prop="wlnCreateTime" align="center" width="160" />
           <el-table-column label="订单号" prop="code" width="180" />
           <el-table-column label="订单号" prop="code" width="180" />
           <el-table-column label="万里牛单号" prop="wlnCode" width="140" />
           <el-table-column label="万里牛单号" prop="wlnCode" width="140" />
@@ -74,8 +72,6 @@ onMounted(() => {
                   for (let x = 0; x < res[i].skuSpecList[j].bomSpecList.length; x++) {
                   for (let x = 0; x < res[i].skuSpecList[j].bomSpecList.length; x++) {
                     list.push({
                     list.push({
                       orderId: res[i].orderId,
                       orderId: res[i].orderId,
-                      dimensionality: res[i].dimensionality,
-                      departmentName: res[i].departmentName,
                       wlnCreateTime: res[i].wlnCreateTime,
                       wlnCreateTime: res[i].wlnCreateTime,
                       code: res[i].code,
                       code: res[i].code,
                       wlnCode: res[i].wlnCode,
                       wlnCode: res[i].wlnCode,
@@ -141,8 +137,8 @@ const mergeRow = (list) => {
   return list;
   return list;
 };
 };
 const textList = ref({
 const textList = ref({
-  3: "胜德体育总经理:",
-  6: "申请日期:",
+  4: "胜德体育总经理:",
+  7: "申请日期:",
 });
 });
 const getSummaries = ({ columns, data }) => {
 const getSummaries = ({ columns, data }) => {
   const sums = [];
   const sums = [];
@@ -166,7 +162,7 @@ const getSummaries = ({ columns, data }) => {
       return;
       return;
     } else {
     } else {
       sums[index] = h("div", { class: "" }, [
       sums[index] = h("div", { class: "" }, [
-        index !== 19
+        index !== 17
           ? h("div", {
           ? h("div", {
               style: {
               style: {
                 "text-align": "center",
                 "text-align": "center",
@@ -214,7 +210,7 @@ const getSummaries = ({ columns, data }) => {
           },
           },
           innerHTML: ".",
           innerHTML: ".",
         }),
         }),
-        [3, 6].includes(index)
+        [4, 7].includes(index)
           ? h("div", { style: { "font-size": "16px", "font-weight": 700, padding: "0 12px", "text-align": "left" }, innerHTML: textList.value[index] })
           ? h("div", { style: { "font-size": "16px", "font-weight": 700, padding: "0 12px", "text-align": "left" }, innerHTML: textList.value[index] })
           : h("div", {
           : h("div", {
               style: {
               style: {

+ 6 - 8
src/views/group/finance/summary/printSKU.vue

@@ -3,8 +3,6 @@
     <el-card style="height: calc(100vh - 168px); overflow-y: auto; overflow-x: hidden" v-loading="loading">
     <el-card style="height: calc(100vh - 168px); overflow-y: auto; overflow-x: hidden" v-loading="loading">
       <div id="tableId">
       <div id="tableId">
         <el-table :data="tableData" border :row-style="{ height: '35px' }" header-row-class-name="tableHeader" show-summary :summary-method="getSummaries">
         <el-table :data="tableData" border :row-style="{ height: '35px' }" header-row-class-name="tableHeader" show-summary :summary-method="getSummaries">
-          <el-table-column label="维度" prop="dimensionality" width="140" />
-          <el-table-column label="客户" prop="departmentName" width="180" />
           <el-table-column label="SKU品号" prop="skuSpecCode" width="180" />
           <el-table-column label="SKU品号" prop="skuSpecCode" width="180" />
           <el-table-column label="SKU品名" prop="skuSpecName" min-width="220" />
           <el-table-column label="SKU品名" prop="skuSpecName" min-width="220" />
           <el-table-column label="数量(PCS)" align="center" prop="quantity" width="160" />
           <el-table-column label="数量(PCS)" align="center" prop="quantity" width="160" />
@@ -52,12 +50,12 @@ onMounted(() => {
   }
   }
 });
 });
 const labelList = ref({
 const labelList = ref({
-  4: "quantity",
-  7: "total",
+  2: "quantity",
+  5: "total",
 });
 });
 const textList = ref({
 const textList = ref({
-  3: "胜德体育总经理:",
-  4: "申请日期:",
+  1: "胜德体育总经理:",
+  2: "申请日期:",
 });
 });
 const getSummaries = ({ columns, data }) => {
 const getSummaries = ({ columns, data }) => {
   const sums = [];
   const sums = [];
@@ -81,7 +79,7 @@ const getSummaries = ({ columns, data }) => {
       return;
       return;
     } else {
     } else {
       sums[index] = h("div", { class: "" }, [
       sums[index] = h("div", { class: "" }, [
-        [1, 2, 3, 5, 6].includes(index)
+        [1, 3, 4].includes(index)
           ? h("div", {
           ? h("div", {
               style: {
               style: {
                 "text-align": "center",
                 "text-align": "center",
@@ -129,7 +127,7 @@ const getSummaries = ({ columns, data }) => {
           },
           },
           innerHTML: ".",
           innerHTML: ".",
         }),
         }),
-        [1, 2, 5, 6, 7].includes(index)
+        [3, 4, 5].includes(index)
           ? h("div", {
           ? h("div", {
               style: {
               style: {
                 "text-align": "center",
                 "text-align": "center",