From 35be4430851ee1233c1356974c0cb6de7f859d65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Thu, 29 Jun 2023 17:10:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9B=91=E6=8E=A7=E6=9A=82?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/api/wms-interface.js                |  24 +-
 fe/PC/src/api/wms-job.js                      |   4 +-
 fe/PC/src/main.js                             |   4 +-
 fe/PC/src/utils/tableColumns/index.js         |   7 +-
 fe/PC/src/utils/tabsDesTions/index.js         |  43 +++
 .../interfaceBoard/dataExchangeFromOut.vue    | 258 ++++++++++++++++--
 6 files changed, 317 insertions(+), 23 deletions(-)

diff --git a/fe/PC/src/api/wms-interface.js b/fe/PC/src/api/wms-interface.js
index 41f10698d..63adef412 100644
--- a/fe/PC/src/api/wms-interface.js
+++ b/fe/PC/src/api/wms-interface.js
@@ -1,6 +1,8 @@
 // 接口监控看板相关api
 import axios from 'axios'
-let interfaceBoard_api = localStorage.getItem('interfaceBoardUrl') + 'api/app/'
+import request from '@/utils/request'
+let base_api = localStorage.getItem('interfaceBoardUrl')
+let interfaceBoard_api = base_api + 'api/app/'
 // 转义传参
 const initParams = (data) => {
     return {
@@ -81,6 +83,24 @@ export function comingFromOut_file(data) {
     })
 }
 
+//外部数据转换新增、编辑
+export function dataExchangeFromOut_save(data,add) {
+    let _type = add  ? 'CreateModal' : 'EditModal'
+    return axios({
+        method:'post',
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
+        },
+        url: base_api + 'AppBusiness/OutgoingToExternal/OutgoingToExternal/'+_type,
+        data:data
+    })
+}
 
-
+//外部数据转换删除
+export function dataExchangeFromOut_delete(id) {
+    return axios({
+        method:'DELETE',
+        url: base_api + 'outgoing-to-external/' + id,
+    })
+}
 
diff --git a/fe/PC/src/api/wms-job.js b/fe/PC/src/api/wms-job.js
index 62e663b3c..249c75068 100644
--- a/fe/PC/src/api/wms-job.js
+++ b/fe/PC/src/api/wms-job.js
@@ -167,10 +167,10 @@ export function InspectJobHandle(data, params, url) {
 // }
 
 //人工发料任务 | 自动发料任务
-export function materialRequestByType(data, url, params) {
+export function materialRequestByType(data, url, params,includeDetails) {
   let _type = params.type?params.type:params.requestType
   return request({
-    url: baseURL + url + '/' + _type,
+    url: baseURL + url + '/' + _type + '?includeDetails=' + (includeDetails || false),
     method: 'post',
     params: params,
     data
diff --git a/fe/PC/src/main.js b/fe/PC/src/main.js
index 635c11016..46cbb8fa9 100644
--- a/fe/PC/src/main.js
+++ b/fe/PC/src/main.js
@@ -6,7 +6,7 @@ import App from './App'
 import store from './store'
 import router from './router'
 import watchLocal from '@/utils/watcLlocalstorage'//用于监听本地缓存
-// import i18n from './lang'
+import i18n from './lang'
 
 import "./utils/utils"
 
@@ -69,6 +69,6 @@ new Vue({
   el: '#app',
   router,
   store,
-  // i18n,
+  i18n,
   render: h => h(App)
 })
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 1e68b561c..5bb5f8b37 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -3486,7 +3486,12 @@ export const Department =  [
 // 接口监控看板
 // 外部数据转换
 export const dataExchangeFromOut = [
-  { label: _Dashboard.number, prop: "number" },
+  { 
+    label: _Dashboard.number, 
+    prop: "number",
+    fixed: "left",
+    type: "name"
+  },
   { label: _Public.remark, prop: "remark", type:"showDetail" },
   { label: _Dashboard.dataType, prop: "dataType", type:"showDetail" },
   { label: _Dashboard.tableType, prop: "tableType" },
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index c791c6b88..f24417a00 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -1,3 +1,8 @@
+import zh from '@/lang/zh'
+let _Public = zh.ColumsPublic // 字段通用
+let _Dashboard = zh.ColumsDashboard // 接口监控看板
+let _Names = zh.ColumsNames // 接口监控看板
+
 // 基础信息数据管理
 /**/
 // 物品基础信息 20230328
@@ -2683,4 +2688,42 @@ export const Department =  [
   // ************** 确认隐藏 ************************
   // { label: "ID", prop: 'id' },
   // ************** 确认隐藏 ************************
+]
+
+// 接口监控看板
+// 外部数据转换
+export const dataExchangeFromOut = [
+  { 
+    label: _Dashboard.number, 
+    prop: "number",
+    fixed: "left",
+    type: "name"
+  },
+  { label: _Public.remark, prop: "remark", type:"showDetail" },
+  { label: _Dashboard.dataType, prop: "dataType", type:"showDetail" },
+  { label: _Dashboard.tableType, prop: "tableType" },
+  { label: _Dashboard.dataAction, prop: "dataAction" },
+  { label: _Dashboard.effectiveDate, prop: "effectiveDate",type:'dateTime' },
+  { label: _Dashboard.status, prop: "status" },
+  { label: _Dashboard.sourceSystem, prop: "sourceSystem", type:"showDetail" },
+  { label: _Dashboard.sourceDataId, prop: "sourceDataId" },
+  { label: _Dashboard.sourceDataGroupCode, prop: "sourceDataGroupCode", type:"showDetail" },
+  { label: _Dashboard.sourceDataDetailCode, prop: "sourceDataDetailCode", type:"showDetail" },
+  { label: _Dashboard.sourceDataContent, prop: "sourceDataContent", type:"showJsonTable" },
+  { label: _Dashboard.writeTime, prop: "writeTime",type:'dateTime' },
+  { label: _Dashboard.writer, prop: "writer" },
+  { label: _Dashboard.destinationSystem, prop: "destinationSystem", type:"showDetail" },
+  { label: _Dashboard.destinationDataId, prop: "destinationDataId" },
+  { label: _Dashboard.destinationDataContent, prop: "destinationDataContent", type:"showJsonTable" },
+  { label: _Dashboard.readTime, prop: "readTime",type:'dateTime' },
+  { label: _Dashboard.reader, prop: "reader" },
+  { label: _Dashboard.errorCode, prop: "errorCode" },
+  { label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail" },
+  { label: _Dashboard.retryTimes, prop: "retryTimes" },
+// ************** 暂时隐藏 ************************
+  // { label: _Public.creationTime, prop: "creationTime",type:'dateTime' },
+  // { label: _Public.creatorId, prop: "creatorId" },
+  // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
+  // { label: _Public.lastModifierId, prop: "lastModifierId" },
+  // { label: _Public.ID, prop: "ID" },
 ]
\ No newline at end of file
diff --git a/fe/PC/src/views/interfaceBoard/dataExchangeFromOut.vue b/fe/PC/src/views/interfaceBoard/dataExchangeFromOut.vue
index 2bf7fcf43..0e69e73d3 100644
--- a/fe/PC/src/views/interfaceBoard/dataExchangeFromOut.vue
+++ b/fe/PC/src/views/interfaceBoard/dataExchangeFromOut.vue
@@ -24,52 +24,278 @@
         :httpOverallSearchData="httpOverallSearchData"
       >
       </tablePagination>
+      <!-- 新增与编辑 -->
+      <newAndEdiDialog
+        :loading="Loading.newAndEdiLoading"
+        :active="active"
+        :pageStatus="pageStatus"
+        :formReveal="formReveal"
+        :formTitle="formTitle"
+        :displayDialog="editDialog"
+        :FormData="formReveal ? CreateFormData : editFormData"
+        :Form="formReveal ? CreateForm : editForm"
+        :Options="editOptions"
+        :Handle="editHandle"
+        :Rules="formReveal ? editRules.cerateRule : editRules.editRule"
+        @FormSubmit="FormSubmit"
+        @close="FormClose"
+        @goBack="goBack"
+      ></newAndEdiDialog>
+      <curren-Drawer
+        :title="tableColumns"
+        :tableColumns="tableColumns"
+        :DrawerLoading="Loading.DrawerLoading"
+        :drawer="displayDialog.detailsDialog"
+        :dropdownData="dropdownData"
+        :propsData="propsData"
+        :tabsDesTions="tabsDesTions"
+        @drawerShut="(val) => (displayDialog.detailsDialog = val)"
+        @drawerbutton="drawerbutton"
+        @handleCommand="drawerHandle"
+        @close-value="closeValue"
+      ></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 { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
   import { mixins } from "@/mixins/mixins";
-  import { dataExchangeFromOut } from "@/api/wms-interface"
+  import { filterSelectMixins } from '@/mixins/filter-Select'
+  import { dataExchangeFromOut,dataExchangeFromOut_save,dataExchangeFromOut_delete } from "@/api/wms-interface"
+  import { getToken } from '@/utils/auth'
   
   export default {
     name: "dataExchangeFromOut",
     mixins: [
       tableMixins,
       LoadingMixins,
+      drawerMixins,
       TableHeaderMixins,
       mixins,
+      filterSelectMixins,
+      newAndEdiDialogMixins
     ],
+    computed: {
+      editDialog: {
+        get: function () {
+          return this.displayDialog.newDialog || this.displayDialog.editDialog;
+        },
+      },
+    },
     data() {
+      let _this = this
       return {
+        tableLoading:false,
         //常用按钮数据
         currenButtonData: [
+          // this.defaultAddBtn(),//新增
           this.defaultFieldSettingBtn(),//字段设置
           this.defaultFreshBtn(),//刷新
         //   this.defaultFilterBtn(),//筛选
         ],
+        //新增
+        CreateFormData: {
+          number: null,//数字+点*
+          remark: null,
+          dataType: null,
+          tableType: null,//数字+点*
+          dataAction: null,//数字+点*
+          effectiveDate: null,//*
+          status: null,//数字+点*
+          sourceSystem: null,
+          sourceDataId: null,
+          sourceDataGroupCode: null,
+          sourceDataDetailCode: null,
+          sourceDataContent: null,
+          writeTime: null,//*
+          writer: null,
+          destinationSystem: null,
+          destinationDataId: null,
+          destinationDataContent: null,
+          readTime: null,//*
+          reader: null,
+          errorCode: null,//数字+点*
+          errorMessage: null,
+          retryTimes: null,//数字+点*
+        },
+        //新增
+        editFormData: {
+          number: null,//数字+点*
+          remark: null,
+          dataType: null,
+          tableType: null,//数字+点*
+          dataAction: null,//数字+点*
+          effectiveDate: null,//*
+          status: null,//数字+点*
+          sourceSystem: null,
+          sourceDataId: null,
+          sourceDataGroupCode: null,
+          sourceDataDetailCode: null,
+          sourceDataContent: null,
+          writeTime: null,//*
+          writer: null,
+          destinationSystem: null,
+          destinationDataId: null,
+          destinationDataContent: null,
+          readTime: null,//*
+          reader: null,
+          errorCode: null,//数字+点*
+          errorMessage: null,
+          retryTimes: null,//数字+点*
+        },
+        CreateForm: [
+          { type: "input", label: _this.$t("ColumsDashboard.number"), prop: 'number', colSpan: 12, validType:'pointNumber' },
+          { type: "input", label: _this.$t("ColumsPublic.remark"), prop: 'remark', colSpan: 12, },
+          { type: "input", label: _this.$t("ColumsDashboard.dataType"), prop: 'dataType', colSpan: 12, },
+          { type: "input", label: _this.$t("ColumsDashboard.tableType"), prop: 'tableType', colSpan: 12, validType:'pointNumber' },
+          { type: "input", label: _this.$t("ColumsDashboard.dataAction"), prop: 'dataAction', colSpan: 12, validType:'pointNumber' },
+          { type: "dateTime", label: _this.$t("ColumsDashboard.effectiveDate"), prop: 'effectiveDate', colSpan: 12, },
+          { type: "input", label: _this.$t("ColumsDashboard.status"), prop: 'status', colSpan: 12, validType:'pointNumber' },
+          { type: "input", label: _this.$t("ColumsDashboard.sourceSystem"), prop: 'sourceSystem', colSpan: 12, },
+          { type: "input", label: _this.$t("ColumsDashboard.sourceDataId"), prop: 'sourceDataId', colSpan: 12, },
+          { type: "input", label: _this.$t("ColumsDashboard.sourceDataGroupCode"), prop: 'sourceDataGroupCode', colSpan: 12, },
+          { type: "input", label: _this.$t("ColumsDashboard.sourceDataDetailCode"), prop: 'sourceDataDetailCode', colSpan: 12, },
+          { type: "input", label: _this.$t("ColumsDashboard.sourceDataContent"), prop: 'sourceDataContent', colSpan: 12, },
+          { type: "dateTime", label: _this.$t("ColumsDashboard.writeTime"), prop: 'writeTime', colSpan: 12, },
+          { type: "input", label: _this.$t("ColumsDashboard.writer"), prop: 'writer', colSpan: 12, },
+          { type: "input", label: _this.$t("ColumsDashboard.destinationSystem"), prop: 'destinationSystem', colSpan: 12, },
+          { type: "input", label: _this.$t("ColumsDashboard.destinationDataId"), prop: 'destinationDataId', colSpan: 12, },
+          { type: "input", label: _this.$t("ColumsDashboard.destinationDataContent"), prop: 'destinationDataContent', colSpan: 12, },
+          { type: "dateTime", label: _this.$t("ColumsDashboard.readTime"), prop: 'readTime', colSpan: 12, },
+          { type: "input", label: _this.$t("ColumsDashboard.reader"), prop: 'reader', colSpan: 12, },
+          { type: "input", label: _this.$t("ColumsDashboard.errorCode"), prop: 'errorCode', colSpan: 12, validType:'pointNumber' },
+          { type: "input", label: _this.$t("ColumsDashboard.errorMessage"), prop: 'errorMessage', colSpan: 12, },
+          { type: "input", label: _this.$t("ColumsDashboard.retryTimes"), prop: 'retryTimes', colSpan: 12, validType:'pointNumber'},
+        ],
+        editForm: [
+          { type: "input", label: _this.$t("ColumsDashboard.number"), prop: 'number', colSpan: 12, validType:'pointNumber' },
+          { type: "input", label: _this.$t("ColumsPublic.remark"), prop: 'remark', colSpan: 12, },
+          { type: "input", label: _this.$t("ColumsDashboard.dataType"), prop: 'dataType', colSpan: 12, },
+          { type: "input", label: _this.$t("ColumsDashboard.tableType"), prop: 'tableType', colSpan: 12, validType:'pointNumber' },
+          { type: "input", label: _this.$t("ColumsDashboard.dataAction"), prop: 'dataAction', colSpan: 12, validType:'pointNumber' },
+          { type: "dateTime", label: _this.$t("ColumsDashboard.effectiveDate"), prop: 'effectiveDate', colSpan: 12, },
+          { type: "input", label: _this.$t("ColumsDashboard.status"), prop: 'status', colSpan: 12, validType:'pointNumber' },
+          { type: "input", label: _this.$t("ColumsDashboard.sourceSystem"), prop: 'sourceSystem', colSpan: 12, },
+          { type: "input", label: _this.$t("ColumsDashboard.sourceDataId"), prop: 'sourceDataId', colSpan: 12, },
+          { type: "input", label: _this.$t("ColumsDashboard.sourceDataGroupCode"), prop: 'sourceDataGroupCode', colSpan: 12, },
+          { type: "input", label: _this.$t("ColumsDashboard.sourceDataDetailCode"), prop: 'sourceDataDetailCode', colSpan: 12, },
+          { type: "input", label: _this.$t("ColumsDashboard.sourceDataContent"), prop: 'sourceDataContent', colSpan: 12, },
+          { type: "dateTime", label: _this.$t("ColumsDashboard.writeTime"), prop: 'writeTime', colSpan: 12, },
+          { type: "input", label: _this.$t("ColumsDashboard.writer"), prop: 'writer', colSpan: 12, },
+          { type: "input", label: _this.$t("ColumsDashboard.destinationSystem"), prop: 'destinationSystem', colSpan: 12, },
+          { type: "input", label: _this.$t("ColumsDashboard.destinationDataId"), prop: 'destinationDataId', colSpan: 12, },
+          { type: "input", label: _this.$t("ColumsDashboard.destinationDataContent"), prop: 'destinationDataContent', colSpan: 12, },
+          { type: "dateTime", label: _this.$t("ColumsDashboard.readTime"), prop: 'readTime', colSpan: 12, },
+          { type: "input", label: _this.$t("ColumsDashboard.reader"), prop: 'reader', colSpan: 12, },
+          { type: "input", label: _this.$t("ColumsDashboard.errorCode"), prop: 'errorCode', colSpan: 12, validType:'pointNumber' },
+          { type: "input", label: _this.$t("ColumsDashboard.errorMessage"), prop: 'errorMessage', colSpan: 12, },
+          { type: "input", label: _this.$t("ColumsDashboard.retryTimes"), prop: 'retryTimes', colSpan: 12, validType:'pointNumber'},
+        ],
+        editOptions: {},
+        editRules: {
+          cerateRule: {
+            number: [{ required: true, trigger: "blur", message: "不可为空" }],
+            // tableType: [{ required: true, trigger: "blur", message: "不可为空" }],
+            // dataAction: [{ required: true, trigger: "blur", message: "不可为空" }],
+            // effectiveDate: [{ required: true, trigger: "blur", message: "不可为空" }],
+            // status: [{ required: true, trigger: "blur", message: "不可为空" }],
+            // writeTime: [{ required: true, trigger: "blur", message: "不可为空" }],
+            // readTime: [{ required: true, trigger: "blur", message: "不可为空" }],
+            // errorCode: [{ required: true, trigger: "blur", message: "不可为空" }],
+            // retryTimes: [{ required: true, trigger: "blur", message: "不可为空" }],
+          },
+          editRule: {
+            number: [{ required: true, trigger: "blur", message: "不可为空" }],
+            tableType: [{ required: true, trigger: "blur", message: "不可为空" }],
+            dataAction: [{ required: true, trigger: "blur", message: "不可为空" }],
+            effectiveDate: [{ required: true, trigger: "blur", message: "不可为空" }],
+            status: [{ required: true, trigger: "blur", message: "不可为空" }],
+            writeTime: [{ required: true, trigger: "blur", message: "不可为空" }],
+            readTime: [{ required: true, trigger: "blur", message: "不可为空" }],
+            errorCode: [{ required: true, trigger: "blur", message: "不可为空" }],
+            retryTimes: [{ required: true, trigger: "blur", message: "不可为空" }],
+          }
+        },
       };
     },
     mounted() {
       this.paging();
     },
     methods: {
-        //渲染数据
-        paging(callback) {
-            this.Loading.tableLoading = true;
-            this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
-            dataExchangeFromOut(this.PageListParams)
-                .then(result => {
-                  let res = result.data
-                  this.tableData = res.items
-                  this.totalCount = res.totalCount
-                  this.pagingCallback(callback)
-                })
-                .catch(err => {
-                    this.Loading.tableLoading = false
-                })
-        },
+      //渲染数据
+      paging(callback) {
+        this.Loading.tableLoading = true;
+        this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
+        dataExchangeFromOut(this.PageListParams)
+          .then(result => {
+            let res = result.data
+            this.tableData = res.items
+            this.totalCount = res.totalCount
+            this.pagingCallback(callback)
+          })
+          .catch(err => {
+              this.Loading.tableLoading = false
+          })
+      },
+      //打开抽屉
+      inlineDialog(val) {
+        this.Loading.DrawerLoading = true
+        this.displayDialog.detailsDialog = true;
+        dataExchangeFromOut(this.PageListParams)
+          .then(result => {
+            this.propsData = result.data.items.filter(item=>{
+              return item.id == val.id
+            })[0]
+            this.inlineDialogCallback()
+          })
+          .catch(err => {
+            this.Loading.DrawerLoading = false
+          })
+      },
+      // 新增/编辑提交
+      FormSubmit(val){
+        this.Loading.tableLoading = true
+        const _data = new URLSearchParams();
+        for(let item in this.CreateFormData){
+          _data.append('ViewModel.'+item.slice(0,1).toUpperCase() +item.slice(1).toLowerCase(), this.CreateFormData[item])
+        }
+        // todo:1、接口302  2、token取值的问题
+        _data.append('__RequestVerificationToken',getToken())
+        // this.formReveal为真是新增
+        dataExchangeFromOut_save(_data,this.formReveal)
+          .then(result => {
+            this.Loading.tableLoading = false
+          })
+          .catch(err => {
+              this.Loading.tableLoading = false
+          })
+      },
+      // 重载抽屉 删除按钮
+      drawerHandle(val) {
+        if (val == 'delete') {
+          this.$confirm('此操作将永久删除该消息, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.Loading.appMainLoading = true
+            this.displayDialog.detailsDialog = false
+            // todo:1、接口302
+            dataExchangeFromOut_delete(this.propsData.id).then(res => {
+              this.$successMsg('删除成功!')
+              this.Loading.appMainLoading = false
+              this.paging()
+            }).catch(err => {
+              this.Loading.appMainLoading = false
+            })
+          }).catch(() => {
+            //取消操作
+          });
+        }
+      }
     }
   }
   </script>