From 9bbe9d1808c84fb5066ecd09c84d2ce511b2e2b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Sat, 14 Sep 2024 17:21:16 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=9F=83=E9=A9=B0-=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E7=9C=8B=E6=9D=BF-new=E3=80=91=E9=9C=80=E6=B1=82=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PC/InterFace.New/public/config.js             |   2 +
 .../components/commonTabel-drawer/index.vue   |   2 +-
 .../src/components/rowDrop/index.vue          |   2 +
 PC/InterFace.New/src/filters/index.js         |   1 +
 PC/InterFace.New/src/mixins/TableMixins.js    |   2 +-
 .../src/utils/baseData/urlOption.js           |  88 ++++++---------
 .../src/views/menuList/FromEsb_ReceiptDet.vue | 106 ++++++++++++++++++
 .../menuList/FromEsb_UnplannedReceipt.vue     | 106 ++++++++++++++++++
 .../views/menuList/ToScp_UnplannedReceipt.vue | 102 +++++++++++++++++
 9 files changed, 357 insertions(+), 54 deletions(-)
 create mode 100644 PC/InterFace.New/src/views/menuList/FromEsb_ReceiptDet.vue
 create mode 100644 PC/InterFace.New/src/views/menuList/FromEsb_UnplannedReceipt.vue
 create mode 100644 PC/InterFace.New/src/views/menuList/ToScp_UnplannedReceipt.vue

diff --git a/PC/InterFace.New/public/config.js b/PC/InterFace.New/public/config.js
index 87c0f0b..961a5dc 100644
--- a/PC/InterFace.New/public/config.js
+++ b/PC/InterFace.New/public/config.js
@@ -1,6 +1,8 @@
 // dev_win
 window.SITE_CONFIG['baseApi'] = 'http://dev.ccwin-in.com:20016'
 window.SITE_CONFIG['authApi'] = 'http://dev.ccwin-in.com:20015'
+// window.SITE_CONFIG['baseApi'] = 'http://192.168.1.75:60081'
+// window.SITE_CONFIG['authApi'] = 'http://192.168.1.75:60080'
 window.SITE_CONFIG['businessApi'] = 'http://dev.ccwin-in.com:20003'
 //是否登录配置信息【loginName】
 window.SITE_CONFIG['isConfigLogin'] = false
diff --git a/PC/InterFace.New/src/components/commonTabel-drawer/index.vue b/PC/InterFace.New/src/components/commonTabel-drawer/index.vue
index 0686632..43c3b21 100644
--- a/PC/InterFace.New/src/components/commonTabel-drawer/index.vue
+++ b/PC/InterFace.New/src/components/commonTabel-drawer/index.vue
@@ -344,7 +344,7 @@ export default {
             this.masterColums = initApiColumnsForDto(this.propsData.masterInfo,_master_name,this)
           }
           // 明细可以为空数组，前端分页使用
-          if(this.propsData.details){
+          if(this.propsData.details && this.propsData.details.length > 0){
             this.initDropdownTabsData.push({
               label: "明细",
               name: 'mx'
diff --git a/PC/InterFace.New/src/components/rowDrop/index.vue b/PC/InterFace.New/src/components/rowDrop/index.vue
index d0eecf9..5300cac 100644
--- a/PC/InterFace.New/src/components/rowDrop/index.vue
+++ b/PC/InterFace.New/src/components/rowDrop/index.vue
@@ -123,6 +123,7 @@ export default {
     // 格式化表头数据
     formatData (val) {
       this.dataList = JSON.parse(JSON.stringify(val))
+      if(!this.dataList)return
       this.dataList.forEach(item => {
         if (item.istrue == undefined) {
             item.istrue = true
@@ -172,6 +173,7 @@ export default {
     },
     // 初始化当前全选状态
     initSelectSta(){
+      if(!this.dataList)return
       let _num = 0
       this.dataList.forEach(item=>{
         if(item.istrue){
diff --git a/PC/InterFace.New/src/filters/index.js b/PC/InterFace.New/src/filters/index.js
index 3eefcdc..46d29f5 100644
--- a/PC/InterFace.New/src/filters/index.js
+++ b/PC/InterFace.New/src/filters/index.js
@@ -103,6 +103,7 @@ export function DialogTable(DialogTable) {
 }
 export function isTableColumns(data) {
   let isData = JSON.parse(JSON.stringify(data))
+  if(!isData)return []
   isData.forEach(item => {
     if (!item.showProp) {
       if (item.sortable == false) {
diff --git a/PC/InterFace.New/src/mixins/TableMixins.js b/PC/InterFace.New/src/mixins/TableMixins.js
index 3af8e95..b5ca9d9 100644
--- a/PC/InterFace.New/src/mixins/TableMixins.js
+++ b/PC/InterFace.New/src/mixins/TableMixins.js
@@ -278,7 +278,7 @@ export const tableMixins = {
       this.tableDataDetails = JSON.parse(JSON.stringify(res))
       // 数据处理
       this.propsData = res
-      if (res.details) {
+      if (res.details && res.details.length > 0) {
         // 表头处理
         let _parentName = this.URLOption_detailList.substr(0,this.URLOption_detailList.indexOf('/'))
         this.apiColumns_DetailsTable = this.initTableColumns(initApiColumnsForDto(res.details[0],_parentName,this),'detail_api')
diff --git a/PC/InterFace.New/src/utils/baseData/urlOption.js b/PC/InterFace.New/src/utils/baseData/urlOption.js
index b525f57..cf46dde 100644
--- a/PC/InterFace.New/src/utils/baseData/urlOption.js
+++ b/PC/InterFace.New/src/utils/baseData/urlOption.js
@@ -1,5 +1,37 @@
 // 默认配置
 export const defalutMasterId = 'masterId'
+//开始------------------只有主表 FromEsb_ReceiptDet------------------ 
+
+export const FromEsb_ReceiptDet = { 
+
+    baseURL:'FromEsb_ReceiptDet/base',//主表-列表 
+
+    detailURL:'FromEsb_ReceiptDet/Base/Get-By-Id',//主表-明细 + 明细-查看主表 
+
+    hasDetail:false 
+
+} 
+
+//结束------------------------------------ 
+
+
+
+//开始------------------只有主表 FromEsb_UnplannedReceipt------------------ 
+
+export const FromEsb_UnplannedReceipt = { 
+
+    baseURL:'FromEsb_UnplannedReceipt/base',//主表-列表 
+
+    detailURL:'FromEsb_UnplannedReceipt/Base/Get-By-Id',//主表-明细 + 明细-查看主表 
+
+    hasDetail:false 
+
+} 
+
+//结束------------------------------------ 
+
+
+
 //开始------------------只有主表 FromScp_AsnDet------------------ 
 
 export const FromScp_AsnDet = { 
@@ -112,54 +144,6 @@ export const FromWms_PoMstr = {
 
 
 
-//开始------------------只有主表 FromWms_ReceiptDet------------------ 
-
-export const FromWms_ReceiptDet = { 
-
-    baseURL:'FromWms_ReceiptDet/base',//主表-列表 
-
-    detailURL:'FromWms_ReceiptDet/Base/Get-By-Id',//主表-明细 + 明细-查看主表 
-
-    hasDetail:false 
-
-} 
-
-//结束------------------------------------ 
-
-
-
-//开始------------------只有主表 FromWms_ReceiptMstr------------------ 
-
-export const FromWms_ReceiptMstr = { 
-
-    baseURL:'FromWms_ReceiptMstr/base',//主表-列表 
-
-    detailURL:'FromWms_ReceiptMstr/Base/Get-By-Id',//主表-明细 + 明细-查看主表 
-
-    hasDetail:false 
-
-} 
-
-//结束------------------------------------ 
-
-
-
-//开始------------------只有主表 FromWms_UnplannedReceipt------------------ 
-
-export const FromWms_UnplannedReceipt = { 
-
-    baseURL:'FromWms_UnplannedReceipt/base',//主表-列表 
-
-    detailURL:'FromWms_UnplannedReceipt/Base/Get-By-Id',//主表-明细 + 明细-查看主表 
-
-    hasDetail:false 
-
-} 
-
-//结束------------------------------------ 
-
-
-
 //开始------------------只有主表 FromWms_Vend------------------ 
 
 export const FromWms_Vend = { 
@@ -304,13 +288,13 @@ export const ToScp_ReceiptDet = {
 
 
 
-//开始------------------只有主表 ToScp_ReceiptMstr------------------ 
+//开始------------------只有主表 ToScp_UnplannedReceipt------------------ 
 
-export const ToScp_ReceiptMstr = { 
+export const ToScp_UnplannedReceipt = { 
 
-    baseURL:'ToScp_ReceiptMstr/base',//主表-列表 
+    baseURL:'ToScp_UnplannedReceipt/base',//主表-列表 
 
-    detailURL:'ToScp_ReceiptMstr/Base/Get-By-Id',//主表-明细 + 明细-查看主表 
+    detailURL:'ToScp_UnplannedReceipt/Base/Get-By-Id',//主表-明细 + 明细-查看主表 
 
     hasDetail:false 
 
diff --git a/PC/InterFace.New/src/views/menuList/FromEsb_ReceiptDet.vue b/PC/InterFace.New/src/views/menuList/FromEsb_ReceiptDet.vue
new file mode 100644
index 0000000..3ca6c5e
--- /dev/null
+++ b/PC/InterFace.New/src/views/menuList/FromEsb_ReceiptDet.vue
@@ -0,0 +1,106 @@
+<template>
+  <div class="page-box" v-loading="Loading.tableLoading">
+    <tablePagination
+      ref="tablePagination_Ref"
+      v-if="apiColumns_Table"
+      :currenButtonData="currenButtonData"
+      :tableData="tableData"
+      :tableLoading="Loading.tableLoading"
+      :tableColumns="apiColumns_Table"
+      @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"
+      :buttonOperationList_left="buttonOperationClick_leftBase"
+      @buttonOperationClick_left="buttonOperationClick_left"
+      :tableSelection="true"
+      :selectionColumnHandle="selectionForUpdateReceiptStatusMany"
+    ></tablePagination>
+    <!-- :buttonOperationList_left="buttonOperationClick_leftBase"
+      @buttonOperationClick_left="buttonOperationClick_left" -->
+    <curren-Drawer
+      ref="currenDrawer_Ref"
+      :title="apiColumns_DesTions"
+      @rowDrop="rowDrop"
+      :tableColumns="apiColumns_DetailsTable"
+      :tabsDesTions="apiColumns_DesTions"
+      :DrawerLoading="Loading.DrawerLoading"
+      :drawer="displayDialog.detailsDialog"
+      :propsData="propsData"
+      :Butttondata="[]"
+      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
+      @drawerbutton="drawerbutton"
+      @handleCommand="drawerHandle"
+      @close-value="closeValue"
+      :totalCount="totalCountDetails"
+      :currentPage="oldSkipCountDetails"
+      :MaxResultCount="MaxResultCountDetails"
+      @alterResultCountDetails="alterResultCountDetails"
+      @alertoldSkipCountDetails="alertoldSkipCountDetails"
+      :buttonOperationList_left="operationButtonsDetail"
+    ></curren-Drawer>
+    <!-- 导出弹窗 -->
+    <exportDrop 
+      v-if="displayDialog.exportDialog"
+      @closeDialog="closeExportDrop"
+      @exportDropSubmit="exportDropSubmit"
+    ></exportDrop>
+  </div>
+</template>
+<script>
+import { tableMixins } from "@/mixins/TableMixins";
+import { LoadingMixins } from "@/mixins/LoadingMixins";
+import { drawerMixins } from "@/mixins/drawerMixins"
+import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
+import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
+import { mixins } from "@/mixins/mixins";
+import { filterSelectMixins } from '@/mixins/filter-Select'
+
+
+export default {
+  name: "FromEsb_ReceiptDet",
+  mixins: [
+    tableMixins,
+    LoadingMixins,
+    drawerMixins,
+    TableHeaderMixins,
+    mixins,
+    filterSelectMixins,
+    newAndEdiDialogMixins
+  ],
+  data() {
+    return {
+      //常用按钮数据
+      currenButtonData: [
+        this.defaultExportBtn({
+          isRedundance:true,
+          isDetailExport:true
+        }),//导出
+        this.defaultUpReceiptStaManyBtn(),//批量重发
+        this.defaultFieldSettingBtn(),//字段设置
+        this.defaultFreshBtn(),//刷新
+        this.defaultFilterBtn(),//筛选
+      ],
+    };
+  },
+  mounted() {
+    this.paging();
+  },
+}
+</script>
+<style lang="scss" scoped>
+@import "@/styles/basicData.scss";
+</style>
\ No newline at end of file
diff --git a/PC/InterFace.New/src/views/menuList/FromEsb_UnplannedReceipt.vue b/PC/InterFace.New/src/views/menuList/FromEsb_UnplannedReceipt.vue
new file mode 100644
index 0000000..ee73915
--- /dev/null
+++ b/PC/InterFace.New/src/views/menuList/FromEsb_UnplannedReceipt.vue
@@ -0,0 +1,106 @@
+<template>
+  <div class="page-box" v-loading="Loading.tableLoading">
+    <tablePagination
+      ref="tablePagination_Ref"
+      v-if="apiColumns_Table"
+      :currenButtonData="currenButtonData"
+      :tableData="tableData"
+      :tableLoading="Loading.tableLoading"
+      :tableColumns="apiColumns_Table"
+      @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"
+      :buttonOperationList_left="buttonOperationClick_leftBase"
+      @buttonOperationClick_left="buttonOperationClick_left"
+      :tableSelection="true"
+      :selectionColumnHandle="selectionForUpdateReceiptStatusMany"
+    ></tablePagination>
+    <!-- :buttonOperationList_left="buttonOperationClick_leftBase"
+      @buttonOperationClick_left="buttonOperationClick_left" -->
+    <curren-Drawer
+      ref="currenDrawer_Ref"
+      :title="apiColumns_DesTions"
+      @rowDrop="rowDrop"
+      :tableColumns="apiColumns_DetailsTable"
+      :tabsDesTions="apiColumns_DesTions"
+      :DrawerLoading="Loading.DrawerLoading"
+      :drawer="displayDialog.detailsDialog"
+      :propsData="propsData"
+      :Butttondata="[]"
+      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
+      @drawerbutton="drawerbutton"
+      @handleCommand="drawerHandle"
+      @close-value="closeValue"
+      :totalCount="totalCountDetails"
+      :currentPage="oldSkipCountDetails"
+      :MaxResultCount="MaxResultCountDetails"
+      @alterResultCountDetails="alterResultCountDetails"
+      @alertoldSkipCountDetails="alertoldSkipCountDetails"
+      :buttonOperationList_left="operationButtonsDetail"
+    ></curren-Drawer>
+    <!-- 导出弹窗 -->
+    <exportDrop 
+      v-if="displayDialog.exportDialog"
+      @closeDialog="closeExportDrop"
+      @exportDropSubmit="exportDropSubmit"
+    ></exportDrop>
+  </div>
+</template>
+<script>
+import { tableMixins } from "@/mixins/TableMixins";
+import { LoadingMixins } from "@/mixins/LoadingMixins";
+import { drawerMixins } from "@/mixins/drawerMixins"
+import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
+import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
+import { mixins } from "@/mixins/mixins";
+import { filterSelectMixins } from '@/mixins/filter-Select'
+
+
+export default {
+  name: "FromEsb_UnplannedReceipt",
+  mixins: [
+    tableMixins,
+    LoadingMixins,
+    drawerMixins,
+    TableHeaderMixins,
+    mixins,
+    filterSelectMixins,
+    newAndEdiDialogMixins
+  ],
+  data() {
+    return {
+      //常用按钮数据
+      currenButtonData: [
+        this.defaultExportBtn({
+          isRedundance:true,
+          isDetailExport:true
+        }),//导出
+        this.defaultUpReceiptStaManyBtn(),//批量重发
+        this.defaultFieldSettingBtn(),//字段设置
+        this.defaultFreshBtn(),//刷新
+        this.defaultFilterBtn(),//筛选
+      ],
+    };
+  },
+  mounted() {
+    this.paging();
+  },
+}
+</script>
+<style lang="scss" scoped>
+@import "@/styles/basicData.scss";
+</style>
\ No newline at end of file
diff --git a/PC/InterFace.New/src/views/menuList/ToScp_UnplannedReceipt.vue b/PC/InterFace.New/src/views/menuList/ToScp_UnplannedReceipt.vue
new file mode 100644
index 0000000..43e3897
--- /dev/null
+++ b/PC/InterFace.New/src/views/menuList/ToScp_UnplannedReceipt.vue
@@ -0,0 +1,102 @@
+<template>
+  <div class="page-box" v-loading="Loading.tableLoading">
+    <tablePagination
+      v-if="apiColumns_Table"
+      :currenButtonData="currenButtonData"
+      :tableData="tableData"
+      :tableLoading="Loading.tableLoading"
+      :tableColumns="apiColumns_Table"
+      @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"
+      :buttonOperationList_left="buttonOperationClick_leftBase"
+      @buttonOperationClick_left="buttonOperationClick_left"
+    ></tablePagination>
+    <!-- :buttonOperationList_left="buttonOperationClick_leftBase"
+      @buttonOperationClick_left="buttonOperationClick_left" -->
+    <curren-Drawer
+      ref="currenDrawer_Ref"
+      :title="apiColumns_DesTions"
+      @rowDrop="rowDrop"
+      :tableColumns="apiColumns_DetailsTable"
+      :tabsDesTions="apiColumns_DesTions"
+      :DrawerLoading="Loading.DrawerLoading"
+      :drawer="displayDialog.detailsDialog"
+      :propsData="propsData"
+      :Butttondata="[]"
+      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
+      @drawerbutton="drawerbutton"
+      @handleCommand="drawerHandle"
+      @close-value="closeValue"
+      :totalCount="totalCountDetails"
+      :currentPage="oldSkipCountDetails"
+      :MaxResultCount="MaxResultCountDetails"
+      @alterResultCountDetails="alterResultCountDetails"
+      @alertoldSkipCountDetails="alertoldSkipCountDetails"
+      :buttonOperationList_left="operationButtonsDetail"
+    ></curren-Drawer>
+    <!-- 导出弹窗 -->
+    <exportDrop 
+      v-if="displayDialog.exportDialog"
+      @closeDialog="closeExportDrop"
+      @exportDropSubmit="exportDropSubmit"
+    ></exportDrop>
+  </div>
+</template>
+<script>
+import { tableMixins } from "@/mixins/TableMixins";
+import { LoadingMixins } from "@/mixins/LoadingMixins";
+import { drawerMixins } from "@/mixins/drawerMixins"
+import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
+import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
+import { mixins } from "@/mixins/mixins";
+import { filterSelectMixins } from '@/mixins/filter-Select'
+
+
+export default {
+  name: "ToScp_UnplannedReceipt",
+  mixins: [
+    tableMixins,
+    LoadingMixins,
+    drawerMixins,
+    TableHeaderMixins,
+    mixins,
+    filterSelectMixins,
+    newAndEdiDialogMixins
+  ],
+  data() {
+    return {
+      //常用按钮数据
+      currenButtonData: [
+        this.defaultExportBtn({
+          isRedundance:true,
+          isDetailExport:true
+        }),//导出
+        this.defaultFieldSettingBtn(),//字段设置
+        this.defaultFreshBtn(),//刷新
+        this.defaultFilterBtn(),//筛选
+      ],
+    };
+  },
+  mounted() {
+    this.paging();
+  },
+}
+</script>
+<style lang="scss" scoped>
+@import "@/styles/basicData.scss";
+</style>
\ No newline at end of file