From b2df23cb26cfc68c2545bf1463c18d7ff4fd5c69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Fri, 19 Jan 2024 17:27:59 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=9C=E9=98=B3=E3=80=91=E9=9D=9E?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=A2=86=E6=96=99=E4=BB=BB=E5=8A=A1=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=EF=BC=8C=E9=9D=9E=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/utils/detailsTableColumns/index.js  | 102 ++++++++++++++++++
 fe/PC/src/utils/tableColumns/index.js         |  60 +++++++++++
 fe/PC/src/utils/tabsDesTions/index.js         |  58 ++++++++++
 .../nonproductive/materialReturnJob.vue       |  98 +++++++++++++++++
 .../nonproductive/pickingJob.vue              |  98 +++++++++++++++++
 5 files changed, 416 insertions(+)
 create mode 100644 fe/PC/src/views/inventoryManage/nonproductive/materialReturnJob.vue
 create mode 100644 fe/PC/src/views/inventoryManage/nonproductive/pickingJob.vue

diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js
index 320771e1c..8c239c7bd 100644
--- a/fe/PC/src/utils/detailsTableColumns/index.js
+++ b/fe/PC/src/utils/detailsTableColumns/index.js
@@ -1921,6 +1921,57 @@ export const pickingApproval =  [
   // { label: "主表ID", prop: "masterID" },
   // ************** 确定隐藏 ************************
 ]
+// 非生产领料任务 20240119
+export const pickingJob = [
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
+  { label: "库存状态", prop: "status",type: "filter",  filters:"inventoryStage" },
+  { label: "单位", prop: "uom" },
+  { label: "标包数量", prop: 'stdPackQty' },
+  { label: "推荐数量", prop: "recommendQty" },
+  { label: "实际数量", prop: "handledQty" },
+  { label: "推荐箱码", prop: "recommendPackingCode" },
+  { label: "实际箱码", prop: "handledPackingCode" },
+  { label: "推荐供应商批次", prop: "recommendSupplierBatch" },
+  { label: "实际供应商批次", prop: "handledSupplierBatch" },
+  { label: "推荐到货时间", prop: "recommendArriveDate", type: "dateTime" },
+  { label: "实际到货时间", prop: "handledArriveDate", type: "dateTime" },
+  { label: "推荐生产时间", prop: "recommendProduceDate", type: "dateTime" },
+  { label: "实际生产时间", prop: "handledProduceDate", type: "dateTime" },
+  { label: "推荐过期时间", prop: "recommendExpireDate", type: "dateTime" },
+  { label: "实际过期时间", prop: "handledExpireDate", type: "dateTime" },
+  { label: "推荐批次", prop: "recommendLot" },
+  { label: "实际批次", prop: "handledLot" },
+  { label: "推荐库位", prop: 'recommendFromLocationCode' },
+  { label: "实际库位", prop: 'handledFromLocationCode' },
+  { label: "推荐区域", prop: 'recommendFromLocationArea' },
+  { label: "实际区域", prop: 'handledFromLocationArea' },
+  { label: "推荐分组", prop: 'recommendFromLocationGroup' },
+  { label: "实际分组", prop: 'handledFromLocationGroup' },
+  { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
+  { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
+  { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
+  { label: "实际仓库", prop: 'handledFromWarehouseCode' },
+  { label: "原因代码", prop: 'reasonCode' },
+  { label: "说明", prop: 'explain' },
+  { label: "专案代码", prop: 'caseCode' },
+  { label: "项目分类", prop: 'projCapacityCode' },
+  { label: "次交易码", prop: 'onceBusiCode' },
+  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
+  { label: "备注", prop: 'remark' },
+  // -----------------------------------------------------------------------
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "上次修改者ID", prop: 'lastModifierId' },
+  { label: "任务编号", prop: 'number' },
+  // ************** 确定隐藏 ************************
+  // { label: "status", prop: 'status' },
+  // { label: "ID", prop: 'id' },
+  // { label: "主表ID", prop: "masterID" },
+  // ************** 确定隐藏 ************************
+]
 // 非生产领料记录 20230417
 export const pickingNote =  [
   { label: "物品代码", prop: "itemCode" },
@@ -2058,6 +2109,57 @@ export const materialReturnApproval =  [
   // { label: "主表ID", prop: "masterID" },
   // ************** 确定隐藏 ************************
 ]
+// 非生产领料任务 20240119
+export const materialReturnJob = [
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
+  { label: "库存状态", prop: "status",type: "filter",  filters:"inventoryStage" },
+  { label: "单位", prop: "uom" },
+  { label: "标包数量", prop: 'stdPackQty' },
+  { label: "推荐数量", prop: "recommendQty" },
+  { label: "实际数量", prop: "handledQty" },
+  { label: "推荐箱码", prop: "recommendPackingCode" },
+  { label: "实际箱码", prop: "handledPackingCode" },
+  { label: "推荐供应商批次", prop: "recommendSupplierBatch" },
+  { label: "实际供应商批次", prop: "handledSupplierBatch" },
+  { label: "推荐到货时间", prop: "recommendArriveDate", type: "dateTime" },
+  { label: "实际到货时间", prop: "handledArriveDate", type: "dateTime" },
+  { label: "推荐生产时间", prop: "recommendProduceDate", type: "dateTime" },
+  { label: "实际生产时间", prop: "handledProduceDate", type: "dateTime" },
+  { label: "推荐过期时间", prop: "recommendExpireDate", type: "dateTime" },
+  { label: "实际过期时间", prop: "handledExpireDate", type: "dateTime" },
+  { label: "推荐批次", prop: "recommendLot" },
+  { label: "实际批次", prop: "handledLot" },
+  { label: "推荐库位", prop: 'recommendFromLocationCode' },
+  { label: "实际库位", prop: 'handledFromLocationCode' },
+  { label: "推荐区域", prop: 'recommendFromLocationArea' },
+  { label: "实际区域", prop: 'handledFromLocationArea' },
+  { label: "推荐分组", prop: 'recommendFromLocationGroup' },
+  { label: "实际分组", prop: 'handledFromLocationGroup' },
+  { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
+  { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
+  { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
+  { label: "实际仓库", prop: 'handledFromWarehouseCode' },
+  { label: "原因代码", prop: 'reasonCode' },
+  { label: "说明", prop: 'explain' },
+  { label: "专案代码", prop: 'caseCode' },
+  { label: "项目分类", prop: 'projCapacityCode' },
+  { label: "次交易码", prop: 'onceBusiCode' },
+  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
+  { label: "备注", prop: 'remark' },
+  // -----------------------------------------------------------------------
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "上次修改者ID", prop: 'lastModifierId' },
+  { label: "任务编号", prop: 'number' },
+  // ************** 确定隐藏 ************************
+  // { label: "status", prop: 'status' },
+  // { label: "ID", prop: 'id' },
+  // { label: "主表ID", prop: "masterID" },
+  // ************** 确定隐藏 ************************
+]
 // 非生产退料记录 20230417
 export const materialReturnNote =  [
   { label: "物品代码", prop: "itemCode" },
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 26f632ba3..9105e766e 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -2905,6 +2905,36 @@ export const pickingApproval =  [
   // { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
   // ************** 确认隐藏 ************************
 ]
+// 非生产领料任务 20240109
+export const pickingJob =  [
+  { 
+    label: "任务编号", 
+    prop: "number", 
+    fixed: "left",  
+    type: "name", 
+    width: orderWidth
+  },
+  // { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
+  { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
+  { label: "申请单号", prop: "unplannedIssueRequestNumber" },
+  // { label: "上游任务编号", prop: "upStreamJobNumber" },
+  // { label: "优先级", prop: 'priority',},
+  // { label: "优先级增量", prop: 'priorityIncrement',},
+  { label: "OA单号", prop: "oaNumber" },
+  { label: "领料类别", prop: 'unplannedIssueType', type: "filter", filters: "unplannedIssueType" },
+  { label: "建档日期", prop: "buildDate", type: "dateTime" },
+  { label: "操作员", prop: "worker" },
+  { label: "部门代码", prop: "deptCode" },
+  { label: "部门名称", prop: "deptName" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
+  // { label: "承接时间", prop: "acceptTime", type: "dateTime" },
+  // { label: "承接用户", prop: "acceptUserName" },
+  { label: "完成时间", prop: "completeTime",type: "dateTime" },
+  { label: "完成用户", prop: "completeUserName" },
+  // { label: "任务描述", prop: 'jobDescription' },
+  // { label: "备注", prop: 'remark' },
+]
 // 非生产领料记录 20230417
 export const pickingNote =  [
   { 
@@ -2993,6 +3023,36 @@ export const materialReturnApproval =  [
   // { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
   // ************** 确认隐藏 ************************
 ]
+// 非生产退料任务 20240109
+export const materialReturnJob =  [
+  { 
+    label: "任务编号", 
+    prop: "number", 
+    fixed: "left",  
+    type: "name", 
+    width: orderWidth
+  },
+  // { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
+  { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
+  { label: "申请单号", prop: "unplannedReceiptRequestNumber" },
+  // { label: "上游任务编号", prop: "upStreamJobNumber" },
+  // { label: "优先级", prop: 'priority',},
+  // { label: "优先级增量", prop: 'priorityIncrement',},
+  { label: "OA单号", prop: "oaNumber" },
+  { label: "退料类别", prop: 'unplannedReceiptType', type: "filter", filters: "unplannedReceiptType" },
+  { label: "建档日期", prop: "buildDate", type: "dateTime" },
+  { label: "操作员", prop: "worker" },
+  { label: "部门代码", prop: "deptCode" },
+  { label: "部门名称", prop: "deptName" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
+  // { label: "承接时间", prop: "acceptTime", type: "dateTime" },
+  // { label: "承接用户", prop: "acceptUserName" },
+  { label: "完成时间", prop: "completeTime",type: "dateTime" },
+  { label: "完成用户", prop: "completeUserName" },
+  // { label: "任务描述", prop: 'jobDescription' },
+  // { label: "备注", prop: 'remark' },
+]
 // 非生产退料记录 20230417
 export const materialReturnNote =  [
   { 
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index 891e268b8..d77ed0f6e 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -2115,6 +2115,35 @@ export const pickingApproval =  [
   // { label: "ID", prop: 'id' },
   // ************** 确认隐藏 ************************
 ]
+// 非生产领料任务 20240109
+export const pickingJob =  [
+  { 
+    label: "任务编号", 
+    prop: "number", 
+    fixed: "left",  
+    type: "name", 
+  },
+  // { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
+  { label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
+  { label: "申请单号", prop: "unplannedIssueRequestNumber" },
+  // { label: "上游任务编号", prop: "upStreamJobNumber" },
+  // { label: "优先级", prop: 'priority',},
+  // { label: "优先级增量", prop: 'priorityIncrement',},
+  { label: "OA单号", prop: "oaNumber" },
+  { label: "领料类别", prop: 'unplannedIssueType', type: "filter", filters: "unplannedIssueType" },
+  { label: "建档日期", prop: "buildDate", type: "dateTime" },
+  { label: "操作员", prop: "worker" },
+  { label: "部门代码", prop: "deptCode" },
+  { label: "部门名称", prop: "deptName" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
+  // { label: "承接时间", prop: "acceptTime", type: "dateTime" },
+  // { label: "承接用户", prop: "acceptUserName" },
+  { label: "完成时间", prop: "completeTime",type: "dateTime" },
+  { label: "完成用户", prop: "completeUserName" },
+  // { label: "任务描述", prop: 'jobDescription' },
+  // { label: "备注", prop: 'remark' },
+]
 // 非生产领料记录 20230417
 export const pickingNote =  [
   { label: "领料记录单号", prop: "number" },
@@ -2185,6 +2214,35 @@ export const materialReturnApproval =  [
   // { label: "ID", prop: 'id' },
   // ************** 确认隐藏 ************************
 ]
+// 非生产退料任务 20240109
+export const materialReturnJob =  [
+  { 
+    label: "任务编号", 
+    prop: "number", 
+    fixed: "left",  
+    type: "name", 
+  },
+  // { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
+  { label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
+  { label: "申请单号", prop: "unplannedReceiptRequestNumber" },
+  // { label: "上游任务编号", prop: "upStreamJobNumber" },
+  // { label: "优先级", prop: 'priority',},
+  // { label: "优先级增量", prop: 'priorityIncrement',},
+  { label: "OA单号", prop: "oaNumber" },
+  { label: "退料类别", prop: 'unplannedReceiptType', type: "filter", filters: "unplannedReceiptType" },
+  { label: "建档日期", prop: "buildDate", type: "dateTime" },
+  { label: "操作员", prop: "worker" },
+  { label: "部门代码", prop: "deptCode" },
+  { label: "部门名称", prop: "deptName" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
+  // { label: "承接时间", prop: "acceptTime", type: "dateTime" },
+  // { label: "承接用户", prop: "acceptUserName" },
+  { label: "完成时间", prop: "completeTime",type: "dateTime" },
+  { label: "完成用户", prop: "completeUserName" },
+  // { label: "任务描述", prop: 'jobDescription' },
+  // { label: "备注", prop: 'remark' },
+]
 // 非生产退料记录 20230417
 export const materialReturnNote =  [
   { label: "退料记录单号", prop: "number" },
diff --git a/fe/PC/src/views/inventoryManage/nonproductive/materialReturnJob.vue b/fe/PC/src/views/inventoryManage/nonproductive/materialReturnJob.vue
new file mode 100644
index 000000000..5f3984692
--- /dev/null
+++ b/fe/PC/src/views/inventoryManage/nonproductive/materialReturnJob.vue
@@ -0,0 +1,98 @@
+<template>
+  <div class="page-box" v-loading="Loading.appMainLoading">
+    <tablePagination
+      :currenButtonData="currenButtonData"
+      :tableData="tableData"
+      :tableLoading="Loading.tableLoading"
+      :tableColumns="tableColumns"
+      @rowDrop="rowDrop"
+      :totalCount="totalCount"
+      :multipleSelection="multipleSelection"
+      :MaxResultCount="PageListParams.MaxResultCount"
+      @topbutton="topbutton"
+      @inlineDialog="inlineDialog"
+      @sortChange="sortChange"
+      @alertoldSkipCount="alertoldSkipCount"
+      @alterResultCount="alterResultCount"
+      @handleSelectionChange="handleSelectionChange"
+      :currentPageProps="oldSkipCount"
+      :quicklySearchOption="quicklySearchOption"
+      @quicklySearchClick="quicklySearchClick"
+      @quicklySearchClear="quicklySearchClear"
+      :primarySearchOption="primarySearchOption"
+      @overallSearchFormClick="overallSearchFormClick"
+      :httpOverallSearchData="httpOverallSearchData"
+    >
+    </tablePagination>
+    <curren-Drawer
+      :title="tableColumns"
+      :DrawerLoading="Loading.DrawerLoading"
+      :drawer="displayDialog.detailsDialog"
+      :propsData="propsData"
+      :tabsDesTions="tabsDesTions"
+      :Butttondata="[]"
+      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
+      @drawerbutton="drawerbutton"
+      @close-value="closeValue"
+      :currenButtonData="currenButtonData"
+      :tableColumns="detailsTableColumns"
+      :totalCount="totalCountDetails"
+      :MaxResultCount="MaxResultCountDetails"
+      @alterResultCountDetails="alterResultCountDetails"
+      @alertoldSkipCountDetails="alertoldSkipCountDetails"
+    ></curren-Drawer>
+  </div>
+</template>
+<script>
+import { tableMixins } from "@/mixins/TableMixins"
+import { LoadingMixins } from "@/mixins/LoadingMixins"
+import { drawerMixins } from "@/mixins/drawerMixins"
+import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
+import { mixins } from "@/mixins/mixins"
+export default {
+  name: "materialReturnJob",
+  mixins: [
+    tableMixins,
+    LoadingMixins,
+    drawerMixins,
+    TableHeaderMixins,
+    mixins,
+  ],
+  computed: {
+    editDialog: {
+      get: function () {
+        return this.displayDialog.newDialog || this.displayDialog.editDialog;
+      },
+    },
+    hideButton: function () {
+      return function (val) {
+        let data = true
+        val.forEach(key => {
+          if (this.propsData.jobStatus == key) {
+            data = false
+          }
+        })
+        return data
+      }
+    },
+  },
+  data () {
+    return {
+      URL: 'wms/store/unplanned-receipt-job',
+      //常用按钮数据
+      currenButtonData: [
+        // this.defaultExportBtn(),//导出
+        this.defaultFieldSettingBtn(),//字段设置
+        this.defaultFreshBtn(),//刷新
+        this.defaultFilterBtn(),//筛选
+      ],
+    };
+  },
+  mounted () {
+    this.paging();
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "../../../styles/mainbasicData.scss";
+</style>
\ No newline at end of file
diff --git a/fe/PC/src/views/inventoryManage/nonproductive/pickingJob.vue b/fe/PC/src/views/inventoryManage/nonproductive/pickingJob.vue
new file mode 100644
index 000000000..51d03ffe8
--- /dev/null
+++ b/fe/PC/src/views/inventoryManage/nonproductive/pickingJob.vue
@@ -0,0 +1,98 @@
+<template>
+  <div class="page-box" v-loading="Loading.appMainLoading">
+    <tablePagination
+      :currenButtonData="currenButtonData"
+      :tableData="tableData"
+      :tableLoading="Loading.tableLoading"
+      :tableColumns="tableColumns"
+      @rowDrop="rowDrop"
+      :totalCount="totalCount"
+      :multipleSelection="multipleSelection"
+      :MaxResultCount="PageListParams.MaxResultCount"
+      @topbutton="topbutton"
+      @inlineDialog="inlineDialog"
+      @sortChange="sortChange"
+      @alertoldSkipCount="alertoldSkipCount"
+      @alterResultCount="alterResultCount"
+      @handleSelectionChange="handleSelectionChange"
+      :currentPageProps="oldSkipCount"
+      :quicklySearchOption="quicklySearchOption"
+      @quicklySearchClick="quicklySearchClick"
+      @quicklySearchClear="quicklySearchClear"
+      :primarySearchOption="primarySearchOption"
+      @overallSearchFormClick="overallSearchFormClick"
+      :httpOverallSearchData="httpOverallSearchData"
+    >
+    </tablePagination>
+    <curren-Drawer
+      :title="tableColumns"
+      :DrawerLoading="Loading.DrawerLoading"
+      :drawer="displayDialog.detailsDialog"
+      :propsData="propsData"
+      :tabsDesTions="tabsDesTions"
+      :Butttondata="[]"
+      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
+      @drawerbutton="drawerbutton"
+      @close-value="closeValue"
+      :currenButtonData="currenButtonData"
+      :tableColumns="detailsTableColumns"
+      :totalCount="totalCountDetails"
+      :MaxResultCount="MaxResultCountDetails"
+      @alterResultCountDetails="alterResultCountDetails"
+      @alertoldSkipCountDetails="alertoldSkipCountDetails"
+    ></curren-Drawer>
+  </div>
+</template>
+<script>
+import { tableMixins } from "@/mixins/TableMixins"
+import { LoadingMixins } from "@/mixins/LoadingMixins"
+import { drawerMixins } from "@/mixins/drawerMixins"
+import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
+import { mixins } from "@/mixins/mixins"
+export default {
+  name: "pickingJob",
+  mixins: [
+    tableMixins,
+    LoadingMixins,
+    drawerMixins,
+    TableHeaderMixins,
+    mixins,
+  ],
+  computed: {
+    editDialog: {
+      get: function () {
+        return this.displayDialog.newDialog || this.displayDialog.editDialog;
+      },
+    },
+    hideButton: function () {
+      return function (val) {
+        let data = true
+        val.forEach(key => {
+          if (this.propsData.jobStatus == key) {
+            data = false
+          }
+        })
+        return data
+      }
+    },
+  },
+  data () {
+    return {
+      URL: 'wms/store/unplanned-issue-job',
+      //常用按钮数据
+      currenButtonData: [
+        // this.defaultExportBtn(),//导出
+        this.defaultFieldSettingBtn(),//字段设置
+        this.defaultFreshBtn(),//刷新
+        this.defaultFilterBtn(),//筛选
+      ],
+    };
+  },
+  mounted () {
+    this.paging();
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "../../../styles/mainbasicData.scss";
+</style>
\ No newline at end of file