【埃驰-接口-new】新接口项目，业务开发

PC/InterFace.New/public/config.js

@@ -1,6 +1,6 @@
 // dev_win
-window.SITE_CONFIG['baseApi'] = 'http://192.168.1.75:60081'
+window.SITE_CONFIG['baseApi'] = 'http://dev.ccwin-in.com:20016'
-window.SITE_CONFIG['authApi'] = 'http://192.168.1.75:60080'
+window.SITE_CONFIG['authApi'] = 'http://dev.ccwin-in.com:20015'
 window.SITE_CONFIG['businessApi'] = 'http://dev.ccwin-in.com:20003'
 //是否登录配置信息【loginName】
 window.SITE_CONFIG['isConfigLogin'] = false
@@ -15,7 +15,7 @@ window.SITE_CONFIG['appClientId'] = 'InterFaceCenter_ScpWms'
 // 项目配置内部名称
 window.SITE_CONFIG['appClientScope'] = 'InterFaceCenter_ScpWms'
 // 浏览器名称
-window.SITE_CONFIG['browserTitle'] = '接口看板-NEV'
+window.SITE_CONFIG['browserTitle'] = 'WMS-SCP-接口中转中心'
 // 单点登录使用数据
 window.SITE_CONFIG['oidcLogin_url'] = 'http://dev.ccwin-in.com:20006',
 window.SITE_CONFIG['oidcLogin_clientId'] = 'InterfaceDash_App'

PC/InterFace.New/src/api/wms-api.js

@@ -174,4 +174,13 @@ export function ApiTypeDelete(id, url) {
     method: 'delete',
     params:{id:id}
   })
+}
+
+// 批量重发
+export function UpdateReceiptStatusWithNewDataAsync(ids, url) {
+  return request({
+    url: baseURL + url + '/UpdateReceiptStatusWithNewDataAsync',
+    method: 'post',
+    data:ids
+  })
 }

PC/InterFace.New/src/lang/en.js

@@ -28,7 +28,8 @@ export default {
         import:'导入',
         edit:'编辑',
         delete:'删除',
-        DetailedQuery:'所有明细查询'
+        DetailedQuery:'所有明细查询',
+        BatchRetry:'批量重发'
     },
     columNames:{
         CreationTime:'CreationTime',

PC/InterFace.New/src/lang/zh.js

@@ -12,7 +12,8 @@ export default {
         import:'导入',
         edit:'编辑',
         delete:'删除',
-        DetailedQuery:'所有明细查询'
+        DetailedQuery:'所有明细查询',
+        BatchRetry:'批量重发'
     },
     columNames:{
         CreationTime:'创建时间',

PC/InterFace.New/src/main.js

@@ -34,7 +34,8 @@ import {
   defaultFilterBtn,
   defaultImportBtn,
   defaultExportBtn,
-  defaultFilterForDetailBtn
+  defaultFilterForDetailBtn,
+  defaultUpReceiptStaManyBtn
 }  from '@/utils/defaultButtons';
 
 Vue.prototype.defaultFieldSettingBtn = defaultFieldSettingBtn;
@@ -44,6 +45,7 @@ Vue.prototype.defaultFilterBtn = defaultFilterBtn;
 Vue.prototype.defaultImportBtn = defaultImportBtn;
 Vue.prototype.defaultExportBtn = defaultExportBtn;
 Vue.prototype.defaultFilterForDetailBtn = defaultFilterForDetailBtn;
+Vue.prototype.defaultUpReceiptStaManyBtn = defaultUpReceiptStaManyBtn;
 
 import * as filters from './filters' // global filters
 

PC/InterFace.New/src/mixins/TableHeaderMixins.js

@@ -1,6 +1,7 @@
 import {
   getPageList,
   postExport,
+  UpdateReceiptStatusWithNewDataAsync
 }
 from "@/api/wms-api"
 export const TableHeaderMixins = {
@@ -111,6 +112,37 @@ export const TableHeaderMixins = {
       else if(val == 'custom'){
         item.customHandle()
       }
+      // 批量重推 /UpdateReceiptStatusWithNewDataAsync
+      else if(val == 'UpdateReceiptStatusMany'){
+        if(!this.multipleSelection || this.multipleSelection.length <= 0){
+          this.$warningMsg("请选择数据！")
+          return
+        }
+        this.$confirm('您确定要批量重发吗, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let _ids = []
+          this.multipleSelection.forEach(item=>{_ids.push(item.id)})
+          if(_ids.length <= 0 || this.Loading.tableLoading){return}
+          this.Loading.tableLoading = true
+          let _url = this.URLOption_base.slice(0,this.URLOption_base.indexOf('/'))
+          UpdateReceiptStatusWithNewDataAsync(_ids,_url)
+          .then(res=>{
+            this.Loading.tableLoading = false
+            this.$successMsg("重发成功！")
+            this.paging()
+            this.$refs.tablePagination_Ref.clearTableSelection();
+          })
+          .catch(err=>{
+            this.Loading.tableLoading = false
+            console.log(err)
+          })  
+        }).catch(() => {
+
+        });
+      }
     },
     // 明细筛选弹窗页面显隐控制
     changeFilterForDetailShow(data){

PC/InterFace.New/src/mixins/TableMixins.js

@@ -425,6 +425,10 @@ export const tableMixins = {
     // 点击抽屉，获取明细后全局通用操作
     inlineDialogCallback(){
       this.Loading.DrawerLoading = false
-    }
+    },
+    // 批量重发，可操作状态判断
+    selectionForUpdateReceiptStatusMany(data){
+      return data.receiptStatus == '2' || data.receiptStatus == '3'
+    },
   }
 }

PC/InterFace.New/src/utils/baseData/urlOption.js

@@ -1,3 +1,5 @@
+// 默认配置
+export const defalutMasterId = 'masterId'
 //开始------------------只有主表 FromScp_AsnDet------------------ 
 
 export const FromScp_AsnDet = { 

PC/InterFace.New/src/utils/defaultButtons.js

@@ -43,6 +43,18 @@ export function defaultExportBtn(option) {
     })
 }
 
+// 批量重发
+export function defaultUpReceiptStaManyBtn(option) {
+    return __defaultBtnOption(option,{
+        type: "warning",
+        icon: "el-icon-finished",
+        label: i18n.t('btns.BatchRetry'),
+        name: "UpdateReceiptStatusMany",
+        size: "mini",
+        isNoPermission:true
+    })
+}
+
 // 字段设置
 export function defaultFieldSettingBtn(option,source) {
     let _source = source ? source : 'list_api'

PC/InterFace.New/src/views/menuList/FromScp_AsnMstr.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="page-box" v-loading="Loading.tableLoading">
     <tablePagination
+      ref="tablePagination_Ref"
       v-if="apiColumns_Table"
       :currenButtonData="currenButtonData"
       :tableData="tableData"
@@ -25,6 +26,8 @@
       :httpOverallSearchData="httpOverallSearchData"
       :buttonOperationList_left="buttonOperationClick_leftBase"
       @buttonOperationClick_left="buttonOperationClick_left"
+      :tableSelection="true"
+      :selectionColumnHandle="selectionForUpdateReceiptStatusMany"
     ></tablePagination>
     <!-- :buttonOperationList_left="buttonOperationClick_leftBase"
       @buttonOperationClick_left="buttonOperationClick_left" -->
@@ -66,7 +69,6 @@ import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins";
 import { filterSelectMixins } from '@/mixins/filter-Select'
 
-
 export default {
   name: "FromScp_AsnMstr",
   mixins: [
@@ -86,6 +88,7 @@ export default {
           isRedundance:true,
           isDetailExport:true
         }),//导出
+        this.defaultUpReceiptStaManyBtn(),//批量重发
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选

PC/InterFace.New/src/views/menuList/FromScp_NoPoAsnMstr.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="page-box" v-loading="Loading.tableLoading">
     <tablePagination
+      ref="tablePagination_Ref"
       v-if="apiColumns_Table"
       :currenButtonData="currenButtonData"
       :tableData="tableData"
@@ -25,6 +26,8 @@
       :httpOverallSearchData="httpOverallSearchData"
       :buttonOperationList_left="buttonOperationClick_leftBase"
       @buttonOperationClick_left="buttonOperationClick_left"
+      :tableSelection="true"
+      :selectionColumnHandle="selectionForUpdateReceiptStatusMany"
     ></tablePagination>
     <!-- :buttonOperationList_left="buttonOperationClick_leftBase"
       @buttonOperationClick_left="buttonOperationClick_left" -->
@@ -66,7 +69,6 @@ import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins";
 import { filterSelectMixins } from '@/mixins/filter-Select'
 
-
 export default {
   name: "FromScp_NoPoAsnMstr",
   mixins: [
@@ -86,6 +88,7 @@ export default {
           isRedundance:true,
           isDetailExport:true
         }),//导出
+        this.defaultUpReceiptStaManyBtn(),//批量重发
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选

PC/InterFace.New/src/views/menuList/FromWms_Part.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="page-box" v-loading="Loading.tableLoading">
     <tablePagination
+      ref="tablePagination_Ref"
       v-if="apiColumns_Table"
       :currenButtonData="currenButtonData"
       :tableData="tableData"
@@ -25,6 +26,8 @@
       :httpOverallSearchData="httpOverallSearchData"
       :buttonOperationList_left="buttonOperationClick_leftBase"
       @buttonOperationClick_left="buttonOperationClick_left"
+      :tableSelection="true"
+      :selectionColumnHandle="selectionForUpdateReceiptStatusMany"
     ></tablePagination>
     <!-- :buttonOperationList_left="buttonOperationClick_leftBase"
       @buttonOperationClick_left="buttonOperationClick_left" -->
@@ -66,7 +69,6 @@ import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins";
 import { filterSelectMixins } from '@/mixins/filter-Select'
 
-
 export default {
   name: "FromWms_Part",
   mixins: [
@@ -86,6 +88,7 @@ export default {
           isRedundance:true,
           isDetailExport:true
         }),//导出
+        this.defaultUpReceiptStaManyBtn(),//批量重发
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选

PC/InterFace.New/src/views/menuList/FromWms_PoMstr.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="page-box" v-loading="Loading.tableLoading">
     <tablePagination
+      ref="tablePagination_Ref"
       v-if="apiColumns_Table"
       :currenButtonData="currenButtonData"
       :tableData="tableData"
@@ -25,6 +26,8 @@
       :httpOverallSearchData="httpOverallSearchData"
       :buttonOperationList_left="buttonOperationClick_leftBase"
       @buttonOperationClick_left="buttonOperationClick_left"
+      :tableSelection="true"
+      :selectionColumnHandle="selectionForUpdateReceiptStatusMany"
     ></tablePagination>
     <!-- :buttonOperationList_left="buttonOperationClick_leftBase"
       @buttonOperationClick_left="buttonOperationClick_left" -->
@@ -66,7 +69,6 @@ import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins";
 import { filterSelectMixins } from '@/mixins/filter-Select'
 
-
 export default {
   name: "FromWms_PoMstr",
   mixins: [
@@ -86,6 +88,7 @@ export default {
           isRedundance:true,
           isDetailExport:true
         }),//导出
+        this.defaultUpReceiptStaManyBtn(),//批量重发
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选

PC/InterFace.New/src/views/menuList/FromWms_ReceiptMstr.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="page-box" v-loading="Loading.tableLoading">
     <tablePagination
+      ref="tablePagination_Ref"
       v-if="apiColumns_Table"
       :currenButtonData="currenButtonData"
       :tableData="tableData"
@@ -25,6 +26,8 @@
       :httpOverallSearchData="httpOverallSearchData"
       :buttonOperationList_left="buttonOperationClick_leftBase"
       @buttonOperationClick_left="buttonOperationClick_left"
+      :tableSelection="true"
+      :selectionColumnHandle="selectionForUpdateReceiptStatusMany"
     ></tablePagination>
     <!-- :buttonOperationList_left="buttonOperationClick_leftBase"
       @buttonOperationClick_left="buttonOperationClick_left" -->
@@ -66,7 +69,6 @@ import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins";
 import { filterSelectMixins } from '@/mixins/filter-Select'
 
-
 export default {
   name: "FromWms_ReceiptMstr",
   mixins: [
@@ -86,6 +88,7 @@ export default {
           isRedundance:true,
           isDetailExport:true
         }),//导出
+        this.defaultUpReceiptStaManyBtn(),//批量重发
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选

PC/InterFace.New/src/views/menuList/FromWms_Vend.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="page-box" v-loading="Loading.tableLoading">
     <tablePagination
+      ref="tablePagination_Ref"
       v-if="apiColumns_Table"
       :currenButtonData="currenButtonData"
       :tableData="tableData"
@@ -25,6 +26,8 @@
       :httpOverallSearchData="httpOverallSearchData"
       :buttonOperationList_left="buttonOperationClick_leftBase"
       @buttonOperationClick_left="buttonOperationClick_left"
+      :tableSelection="true"
+      :selectionColumnHandle="selectionForUpdateReceiptStatusMany"
     ></tablePagination>
     <!-- :buttonOperationList_left="buttonOperationClick_leftBase"
       @buttonOperationClick_left="buttonOperationClick_left" -->
@@ -66,7 +69,6 @@ import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins";
 import { filterSelectMixins } from '@/mixins/filter-Select'
 
-
 export default {
   name: "FromWms_Vend",
   mixins: [
@@ -86,6 +88,7 @@ export default {
           isRedundance:true,
           isDetailExport:true
         }),//导出
+        this.defaultUpReceiptStaManyBtn(),//批量重发
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选