Merge remote-tracking branch 'origin/dev' into dev

src/api/business/report/summary.js

@@ -2,9 +2,18 @@ import request from "@/utils/request";
 
 export function LIST(data, params) {
   return request({
-    url: "/pu/priceApply/list",
+    url: "/log/summary/list",
     method: "POST",
     params: params,
     data: data,
   });
+}
+
+export function EXPORRT(data) {
+  return request({
+    url: "/log/summary/download",
+    method: "post",
+    data: data,
+    responseType: 'blob'
+  });
 }

src/views/expend/customerExpend/che-hui/index.vue

@@ -11,7 +11,8 @@ export default {
   },
   data() {
     return {
-      title: "撤回",
+      // title: "撤回",
+      title: "作废",
       loading: false,
     };
   },

src/views/expend/customerExpend/ti-jiao/index.vue

@@ -10,7 +10,8 @@ export default {
   },
   data() {
     return {
-      title: "提交",
+      // title: "提交",
+      title: "审批",
       loading: false,
     };
   },

src/views/purchase/DemandSummary/add/columns.js

@@ -6,7 +6,7 @@ export default function useColumns() {
       attr: {},
     },
     {
-      item: { key: "rowNo", title: "行号", hidden: false, },
+      item: { key: "rowNo", title: "行号", hidden: false, width: 60, },
       attr: {},
     },
     {
@@ -42,7 +42,7 @@ export default function useColumns() {
       attr: {},
     },
     {
-      item: { key: "closeQty", title: "关闭数量", hidden: false, },
+      item: { key: "closeQty", title: "关闭数量", hidden: false, width: 120, },
       attr: {},
     },
     {
@@ -50,7 +50,7 @@ export default function useColumns() {
       attr: {},
     },
     {
-      item: { key: "minPackage", title: "最小包装量", hidden: false, },
+      item: { key: "minPackage", title: "最小包装量", hidden: false, width: 120, },
       attr: {},
     },
     {
@@ -62,7 +62,7 @@ export default function useColumns() {
       attr: {},
     },
     {
-      item: { key: "updateByName", title: "修改人", hidden: false, },
+      item: { key: "updateByName", title: "修改人", hidden: false, width: 120, },
       attr: {},
     },
     {
@@ -74,15 +74,15 @@ export default function useColumns() {
       attr: {},
     },
     {
-      item: { key: "expiry", title: "有效期", hidden: false, },
+      item: { key: "expiry", title: "有效期", hidden: false, width: 120, },
       attr: {},
     },
     {
-      item: { key: "expiryUnit", title: "有效期单位", hidden: false, },
+      item: { key: "expiryUnit", title: "有效期单位", hidden: false, width: 120, },
       attr: {},
     },
     {
-      item: { key: "", title: "要求交货日期", hidden: false, },
+      item: { key: "", title: "要求交货日期", hidden: false, width: 120, },
       attr: {},
     },
     {
@@ -136,7 +136,7 @@ export default function useColumns() {
       attr: {},
     },
     {
-      item: { key: "approver", title: "审核人员", hidden: false, },
+      item: { key: "approver", title: "审核人员", hidden: false, width: 120, },
       attr: {},
     },
     {
@@ -147,11 +147,11 @@ export default function useColumns() {
       },
     },
     {
-      item: { key: "registrant", title: "注册人", hidden: false, },
+      item: { key: "registrant", title: "注册人", hidden: false, width: 120, },
       attr: {},
     },
     {
-      item: { key: "lastWarehouseQty", title: "末级供应仓库存量", hidden: false, },
+      item: { key: "lastWarehouseQty", title: "末级供应仓库存量", hidden: false, width: 120, },
       attr: {},
     },
     {
@@ -189,11 +189,11 @@ export default function useColumns() {
       attr: {},
     },
     {
-      item: { key: "updateTime", title: "修改时间", hidden: false, },
+      item: { key: "updateTime", title: "修改时间", hidden: false, width: 120, },
       attr: {},
     },
     {
-      item: { key: "puPeriod", title: "采购周期", hidden: false, },
+      item: { key: "puPeriod", title: "采购周期", hidden: false, width: 120, },
       attr: {},
     },
     {
@@ -222,34 +222,34 @@ export default function useColumns() {
       },
     },
     {
-      item: { key: "isBatchLock", title: "批号锁定标识", hidden: false, },
+      item: { key: "isBatchLock", title: "批号锁定标识", hidden: false, width: 120, },
       attr: {
         is: "el-select",
         dictName: "sys_yes_no",
       },
     },
     {
-      item: { key: "approveName", title: "采购需求审批人", hidden: false, },
+      item: { key: "approveName", title: "采购需求审批人", hidden: false, width: 120, },
       attr: {},
     },
     {
-      item: { key: "approverFinishTime", title: "需求单审批时间", hidden: false, },
+      item: { key: "approverFinishTime", title: "需求单审批时间", hidden: false, width: 120, },
       attr: {},
     },
     {
-      item: { key: "createTime", title: "需求单提交时间", hidden: false, },
+      item: { key: "createTime", title: "需求单提交时间", hidden: false, width: 120, },
       attr: {},
     },
     {
-      item: { key: "createByName", title: "需求提交人", },
+      item: { key: "createByName", title: "需求提交人", width: 120, },
       attr: {},
     },
     {
-      item: { key: "processTime", title: "需求处理时间", hidden: false, },
+      item: { key: "processTime", title: "需求处理时间", hidden: false, width: 120, },
       attr: {},
     },
     {
-      item: { key: "puManagerApproverDate", title: "处理审批时间", hidden: false, },
+      item: { key: "puManagerApproverDate", title: "处理审批时间", hidden: false, width: 120, },
       attr: {},
     },
     {

src/views/purchase/DemandSummary/add/index.vue

@@ -35,7 +35,14 @@ export default {
       selectData: [],
     };
   },
-  computed: {},
+  computed: {
+    height: {
+      get() {
+        return window.innerHeight - 150;
+      },
+      set() {},
+    },
+  },
   methods: {
     onHide() {
       this.visible = false;
@@ -131,53 +138,49 @@ export default {
       style="display: flex; justify-content: space-between; align-items: center"
     >
       <h3>{{ title }}</h3>
-      <el-button
-        v-if="!isEdit"
-        :size="$attrs.size"
-        :loading="loading"
-        @click="onHide"
-      >
-        返 回
-      </el-button>
-    </div>
+      <el-row class="my-4" style="text-align: right">
+        <el-col v-if="isEdit">
+          <el-button-group>
+            <el-button type="primary" :size="$attrs.size" @click="useSave"
+              >保 存</el-button
+            >
+            <el-button :size="$attrs.size" @click="useCancel">取 消</el-button>
+          </el-button-group>
+        </el-col>
 
-    <el-row class="my-4" style="text-align: right; padding: 0 20px">
-      <el-col v-if="isEdit">
-        <el-button-group>
-          <el-button :size="$attrs.size" @click="useCancel">取 消</el-button>
-          <el-button type="primary" :size="$attrs.size" @click="useSave"
-            >保 存</el-button
-          >
-        </el-button-group>
-      </el-col>
-
-      <el-col v-else>
-        <el-button-group>
-          <el-button type="primary" :size="$attrs.size" @click="useEdit"
-            >编 辑</el-button
-          >
-        </el-button-group>
+        <el-col v-else>
+          <el-button-group>
+            <el-button type="primary" :size="$attrs.size" @click="useEdit"
+              >编 辑</el-button
+            >
+          </el-button-group>
 
-        <el-button-group>
-          <close-line-btn
-            :size="$attrs.size"
-            :select-data="selectData"
-            @refresh="fetchItem"
-          ></close-line-btn>
-        </el-button-group>
-
-        <el-button-group>
-          <el-button :size="$attrs.size" @click="refetchBatch"
-            >重取批量</el-button
-          >
-        </el-button-group>
-      </el-col>
-    </el-row>
+          <el-button-group>
+            <close-line-btn
+              :size="$attrs.size"
+              :select-data="selectData"
+              @refresh="fetchItem"
+            ></close-line-btn>
+          </el-button-group>
 
+          <el-button-group>
+            <el-button :size="$attrs.size" @click="refetchBatch"
+              >重取批量</el-button
+            >
+          </el-button-group>
+          <el-button-group>
+            <el-button :size="$attrs.size" :loading="loading" @click="onHide">
+              返回
+            </el-button>
+          </el-button-group>
+        </el-col>
+      </el-row>
+    </div>
     <el-super-ux-table
       v-model="params"
-      :size="$attrs.size"
       :dict="dict"
+      :height="height"
+      :size="$attrs.size"
       :columns="TableColumns"
       index
       checkbox

src/views/purchase/DemandSummary/columns.js

@@ -188,12 +188,12 @@ export default function useColumns() {
       },
     },
     {
-      item: { key: "artificialAdjust", title: "人工调整数", width: 120, },
+      item: { key: "artificialAdjust", title: "人工调整数", width: 90, },
       attr: {
         isSummary: true,
         formatter: (prop) => {
           return prop.finalBuyQty - prop.suggestionPurchase
-        }
+        },
       },
     },
     {
@@ -201,7 +201,7 @@ export default function useColumns() {
       attr: {},
     },
     {
-      item: { key: "materialCode", title: "物料编码", },
+      item: { key: "materialCode", title: "物料编码", width: 120, },
       attr: {},
     },
     {
@@ -213,7 +213,7 @@ export default function useColumns() {
       attr: {},
     },
     {
-      item: { key: "unit", title: "单位", width: 100, },
+      item: { key: "unit", title: "单位", width: 80, },
       attr: {},
     },
     {
@@ -221,11 +221,11 @@ export default function useColumns() {
       attr: {},
     },
     {
-      item: { key: "demandNum", title: "需求单位量", width: 120, },
+      item: { key: "demandNum", title: "需求单位量", width: 100, },
       attr: {},
     },
     {
-      item: { key: "evensalesforyear", title: "近1月均销量", width: 120, },
+      item: { key: "evensalesforyear", title: "近1月均销量", width: 100, },
       attr: {
         formatter: (prop) => {
           return prop.evensalesforyear ? parseFloat(prop.evensalesforyear).toFixed(2) : "0.00"

src/views/purchase/DemandSummary/index.vue

@@ -52,7 +52,7 @@ export default {
     materialNum: {
       get() {
         const { materialCodeList } = this.params;
-        return materialCodeList ? materialCodeList.split(",").length : 0;
+        return materialCodeList ? materialCodeList.split(/,|，|\s+/).length : 0;
       },
       set() {},
     },
@@ -65,7 +65,7 @@ export default {
           ...params,
           ...page,
           materialCodeList: params.materialCodeList
-            ? params.materialCodeList.split(",")
+            ? params.materialCodeList.split(/,|，|\s+/)
             : null,
         };
         let { code, rows, total } = await getSummaryList(data);
@@ -173,13 +173,14 @@ export default {
     // 最终采购量
     changeFinalBuyQty({ $rowIndex }) {
       this.recordData.push($rowIndex);
+      // this.$refs.DemandSummaryTable.updateFooter();
     },
     // 采购员
     changeBuyerName({ $rowIndex }) {
       this.recordData.push($rowIndex);
     },
     changeMaterial(val) {
-      this.params.materialCodeList = val ? val.replaceAll(" ", ",") : null;
+      this.params.materialCodeList = val;
       this.useQuery(this.params, this.page);
     },
     openMaterial() {
@@ -314,6 +315,7 @@ export default {
       pagination
       showSummary
       convenitentOperation
+      ref="DemandSummaryTable"
       storage-key="DemandSummarySuperTable"
       @row-select="useSelect"
       @pagination="useQuery(params, page)"

src/views/report/summary-sheet/columns.js

@@ -1,88 +1,106 @@
 export default function useColumns() {
   const SearchColumns = [
     {
-      item: { key: "", title: "开始时间", },
+      item: { key: "dateStart", title: "开始时间", },
       attr: {
         is: "el-date-picker",
         type: "date",
         placeholder: "选择日期",
         valueFormat: "yyyy-MM-dd",
-        clearable: true,
       },
     },
     {
-      item: { key: "", title: "结束时间", },
+      item: { key: "dateOver", title: "结束时间", },
       attr: {
         is: "el-date-picker",
         type: "date",
         placeholder: "选择日期",
         valueFormat: "yyyy-MM-dd",
-        clearable: true,
       },
     },
     {
-      item: { key: "", title: "日志类型", },
+      item: { key: "logType", title: "日志类型", },
       attr: {
         is: "el-select",
-        clearable: true,
+        dictName: "log_type",
       },
     },
     {
-      item: { key: "", title: "员工", },
+      item: { key: "userName", title: "员工", },
       attr: {
         is: "el-popover-select-v2",
         referName: "CONTACTS_PARAM",
         valueKey: "name",
         dataMapping: {
-          // buyer: "code",
+          userCode: "code",
         },
       },
     },
-    // {
-    //   item: { key: "", title: "员工姓名", },
-    //   attr: {
-    //     is: "el-input",
-    //     clearable: true,
-    //   },
-    // },
+    {
+      item: { key: "deptName", title: "部门", },
+      attr: {
+        is: "el-popover-select-v2",
+        referName: "DEPT_PARAM",
+        valueKey: "name",
+        // dataMapping: {
+        //   deptCode: "code",
+        // },
+      },
+    },
   ];
 
   const TableColumns = [
     {
-      item: { key: "", title: "员工工号", },
+      item: { key: "userCode", title: "员工工号", width: 100, },
       attr: {},
     },
     {
-      item: { key: "", title: "员工姓名", },
+      item: { key: "userName", title: "员工姓名", width: 100, },
       attr: {},
     },
     {
-      item: { key: "", title: "一级部门", },
+      item: { key: "firstDepartment", title: "一级部门", },
       attr: {},
     },
     {
-      item: { key: "", title: "二级部门", },
+      item: { key: "secondDepartment", title: "二级部门", },
       attr: {},
     },
     {
-      item: { key: "", title: "三级部门", },
+      item: { key: "thirdDepartment", title: "三级部门", },
       attr: {},
     },
     {
-      item: { key: "", title: "应交份数", },
-      attr: {},
+      item: { key: "payableCopies", title: "应交份数", width: 100, },
+      attr: {
+        formatter: (prop) => {
+          return prop.payableCopies
+        },
+      },
     },
     {
-      item: { key: "", title: "实交份数", },
-      attr: {},
+      item: { key: "actualDeliveryCopies", title: "实交份数", width: 100, },
+      attr: {
+        formatter: (prop) => {
+          return prop.actualDeliveryCopies
+        },
+      },
     },
     {
-      item: { key: "", title: "缺交份数", },
-      attr: {},
+      item: { key: "lackCopies", title: "缺交份数", width: 100, },
+      attr: {
+        formatter: (prop) => {
+          return prop.lackCopies
+        },
+      },
     },
     {
-      item: { key: "", title: "休假", },
-      attr: {},
+      item: { key: "beFurlough", title: "休假", width: 100, },
+      attr: {
+        formatter: (prop) => {
+          return prop.beFurlough
+        },
+      },
     },
   ].map(({ item, attr }) => ({
     attr,

src/views/report/summary-sheet/index.vue

@@ -2,6 +2,7 @@
 <script>
 import { dicts } from "./dicts";
 import useColumns from "./columns";
+import { LIST, EXPORRT } from "@/api/business/report/summary";
 export default {
   name: "SummarySheet",
   dicts: [...dicts],
@@ -15,7 +16,12 @@ export default {
     const page = this.$init.page();
     return {
       page,
-      params,
+      params: {
+        ...params,
+        dateStart: new Date().Format("yyyy-MM-dd"),
+        dateOver: new Date().Format("yyyy-MM-dd"),
+        logType: "3",
+      },
       TableColumns,
       SearchColumns,
       size: "mini",
@@ -28,22 +34,50 @@ export default {
   methods: {
     // 重置
     useReset() {
-      this.params = this.$init.params(this.SearchColumns);
+      this.params = {
+        ...this.$init.params(this.SearchColumns),
+        dateStart: new Date().Format("yyyy-MM-dd"),
+        dateOver: new Date().Format("yyyy-MM-dd"),
+        logType: "3",
+      };
       this.page = this.$init.page();
       this.useQuery(this.params, this.page);
     },
-    useQuery(params, page) {
+    async useQuery(params, page) {
       try {
         this.loading = true;
+        let { code, rows, total } = await LIST({ ...params, ...page });
+        if (code == 200) {
+          this.tableData = rows;
+          this.page.total = total;
+        }
       } catch (error) {
       } finally {
         this.loading = false;
       }
     },
     // 导出
-    useExport() {
+    async useExport() {
       try {
-      } catch (error) {}
+        this.$modal.loading("处理中，请稍后...");
+        const res = await EXPORRT({ ...this.params });
+        if (res) {
+          const blob = new Blob([res], {
+            type: "application/vnd.ms-excel;charset=UTF-8",
+          });
+          const downloadElement = document.createElement("a");
+          const href = window.URL.createObjectURL(blob);
+          downloadElement.href = href;
+          downloadElement.download = `日志汇总查询${new Date().getTime()}.xlsx`;
+          document.body.appendChild(downloadElement);
+          downloadElement.click();
+          document.body.removeChild(downloadElement);
+          window.URL.revokeObjectURL(href);
+        }
+      } catch (error) {
+      } finally {
+        this.$modal.closeLoading();
+      }
     },
     useSelect(selection) {
       this.selectData = selection;