diff --git a/src/AuthServer/AuthServer.Host/appsettings.json b/src/AuthServer/AuthServer.Host/appsettings.json
index ffb0644f..b3aadc3c 100644
--- a/src/AuthServer/AuthServer.Host/appsettings.json
+++ b/src/AuthServer/AuthServer.Host/appsettings.json
@@ -1,7 +1,8 @@
{
"ConnectionStrings": {
// "Default": "Server=114.116.225.148,13314;Database=ABP;User ID=sa;Password=Microsoft2020;",
- "Default": "Server=192.168.0.203;Database=ABP;User ID=sa;Password=Microsoft@2021;"
+ //"Default": "Server=192.168.0.203;Database=ABP;User ID=sa;Password=Microsoft@2021;"
+ "Default": "Server=182.61.150.130;Database=ABP;User ID=sa;Password=Microsoft@2008;"
},
"ElasticSearch": {
"Url": "http://localhost:9200"
diff --git a/src/Modules/BaseService/BaseService.Host/BaseServiceHostModule.cs b/src/Modules/BaseService/BaseService.Host/BaseServiceHostModule.cs
index 493a6035..0cc660b6 100644
--- a/src/Modules/BaseService/BaseService.Host/BaseServiceHostModule.cs
+++ b/src/Modules/BaseService/BaseService.Host/BaseServiceHostModule.cs
@@ -200,6 +200,7 @@ namespace BaseService
options.Authority = configuration["AuthServer:Authority"];
options.RequireHttpsMetadata = false;
options.Audience = "BaseService";
+ // options.TokenValidationParameters.ValidateIssuer = Convert.ToBoolean(configuration["AuthServer:ValidateIssuer"]);
});
}
diff --git a/vue/src/components/ImportExcel-base/index.vue b/vue/src/components/ImportExcel-base/index.vue
index 4c9318f0..5af0197d 100644
--- a/vue/src/components/ImportExcel-base/index.vue
+++ b/vue/src/components/ImportExcel-base/index.vue
@@ -283,21 +283,7 @@ export default {
showCancel() {
return this.stepsActive == 1;
},
- getMoudleDisable() {
- if (
- this.crmType == "priceList" ||
- this.crmType == "spareparts" ||
- this.crmType == "wmsOutputSum"
- ) {
- //只状态可用
- this.isEditYearMont = true;
- this.isEditFactory = true;
- this.isState = false;
- } else {
- this.isEditYearMont = false;
- this.isEditFactory = false;
- }
- },
+
crmTypeName() {
return (
{
@@ -487,6 +473,21 @@ export default {
},
mounted() {},
methods: {
+ getMoudleDisable() {
+ if (
+ this.crmType == "priceList" ||
+ this.crmType == "spareparts" ||
+ this.crmType == "wmsOutputSum"
+ ) {
+ //只状态可用
+ this.isEditYearMont = true;
+ this.isEditFactory = true;
+ this.isState = false;
+ } else {
+ this.isEditYearMont = false;
+ this.isEditFactory = false;
+ }
+ },
getAllYearMonth() {
this.$axios
.posts("/api/settleaccount/CentralizedControl/openlist")
diff --git a/vue/src/router/modules/custom_menu.js b/vue/src/router/modules/custom_menu.js
index 5a564d28..d4140c99 100644
--- a/vue/src/router/modules/custom_menu.js
+++ b/vue/src/router/modules/custom_menu.js
@@ -2,7 +2,7 @@
import Layout from '@/layout'
const customerOutOrderDataRouter = {
- path: '/cpat-order',
+ path: '/cpat-customer',
component: Layout,
redirect: 'pg',
name: '业务数据',
diff --git a/vue/src/router/modules/hq_out_order.js b/vue/src/router/modules/hq_out_order.js
index 8f99582b..e5a8e598 100644
--- a/vue/src/router/modules/hq_out_order.js
+++ b/vue/src/router/modules/hq_out_order.js
@@ -27,26 +27,26 @@ const hqOutOrderDataRouter = {
icon: '工厂'
}
},
- {
- path: 'hq-h-checkout',
- component: () => import('@/views/ux/vw/dataInput/hq_h_checkout'),
- name: 'SettleAccount',//命名路由
- meta: {
- title: '红旗备件出库单',
- roles: ['SettleAccount.WMSHQ'],//控制页面角色（可以设置多个角色）
- icon: '结算'
- }
- },
- {
- path: 'hq-y-outorder',
- component: () => import('@/views/ux/vw/dataInput/hq_y_outorder'),
- name: 'SettleAccount',//命名路由
- meta: {
- title: '一汽轿车出库单',
- roles: ['SettleAccount.WMSHQ'],//控制页面角色（可以设置多个角色）
- icon: '售后'
- }
- },
+ // {
+ // path: 'hq-h-checkout',
+ // component: () => import('@/views/ux/vw/dataInput/hq_h_checkout'),
+ // name: 'SettleAccount',//命名路由
+ // meta: {
+ // title: '红旗备件出库单',
+ // roles: ['SettleAccount.WMSHQ'],//控制页面角色（可以设置多个角色）
+ // icon: '结算'
+ // }
+ // },
+ // {
+ // path: 'hq-y-outorder',
+ // component: () => import('@/views/ux/vw/dataInput/hq_y_outorder'),
+ // name: 'SettleAccount',//命名路由
+ // meta: {
+ // title: '一汽轿车出库单',
+ // roles: ['SettleAccount.WMSHQ'],//控制页面角色（可以设置多个角色）
+ // icon: '售后'
+ // }
+ // },
{
path: 'hq-kb-outorder',
component: () => import('@/views/ux/vw/dataInput/hq_kb_output'),
diff --git a/vue/src/router/modules/onetimesale.js b/vue/src/router/modules/onetimesale.js
index e77b5b5b..bb51783f 100644
--- a/vue/src/router/modules/onetimesale.js
+++ b/vue/src/router/modules/onetimesale.js
@@ -2,7 +2,7 @@
import Layout from '@/layout'
const onetimesaleDataRouter = {
- path: '/cpat-order-onetimesale',
+ path: '/cpat-onetimesale',
component: Layout,
redirect: 'pg',
name: '业务数据',
diff --git a/vue/src/router/modules/vw_menu.js b/vue/src/router/modules/vw_menu.js
index 58157598..c2caf901 100644
--- a/vue/src/router/modules/vw_menu.js
+++ b/vue/src/router/modules/vw_menu.js
@@ -74,16 +74,16 @@ const vwMenudataRouter = {
icon: '工厂'
}
},
- {
- path: 'spare-part-90',
- component: () => import('@/views/ux/vw/dataInput/SparePart90'),
- name: 'SparePart90',//命名路由
- meta: {
- title: '大众备件结算调整',
- roles: ['SettleAccount.SparePart'],//控制页面角色（可以设置多个角色）
- icon: '工厂'
- }
- },
+ // {
+ // path: 'spare-part-90',
+ // component: () => import('@/views/ux/vw/dataInput/SparePart90'),
+ // name: 'SparePart90',//命名路由
+ // meta: {
+ // title: '大众备件结算调整',
+ // roles: ['SettleAccount.SparePart'],//控制页面角色（可以设置多个角色）
+ // icon: '工厂'
+ // }
+ // },
{
path: 'scrap-claims',
component: () => import('@/views/ux/vw/dataInput/ScrapClaims'),
diff --git a/vue/src/views/ux/backGroundWork/index.vue b/vue/src/views/ux/backGroundWork/index.vue
index 40b881db..354ddeeb 100644
--- a/vue/src/views/ux/backGroundWork/index.vue
+++ b/vue/src/views/ux/backGroundWork/index.vue
@@ -20,6 +20,19 @@
@click="searchALl()"
>查询全部任务信息
+
+ 点击下载系统导入模板
+
+ 说明：上传模板时，模板名后请加上当前日期，例如：红旗一轿手工出库单20220617！
@@ -679,7 +679,7 @@ export default {
page: 1,
dialogFormVisible: false,
multipleSelection: [],
- tableHeight: document.documentElement.clientHeight - 260,
+ tableHeight: document.documentElement.clientHeight - 210,
isEdit: false,
menuCateMap: [
{ label: "导出", value: "导出", cssName: "warning" },
@@ -1202,10 +1202,10 @@ export default {
if (this.formCount.materialGroupValue != "") {
this.listExportQuery.materialGroup = this.getmaterialGroupValue; //物料组车型
}
- this.listExportQuery.begin = this.startTime
- ? this.startTime
- : undefined;
- this.listExportQuery.end = this.endTime ? this.endTime : undefined;
+ // this.listExportQuery.begin = this.startTime
+ // ? this.startTime
+ // : undefined;
+ // this.listExportQuery.end = this.endTime ? this.endTime : undefined;
console.log(
"大众看板结算与交货核对明细表-导出条件：" +
JSON.stringify(this.listExportQuery)
diff --git a/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue
index 5c192ca2..303f89d7 100644
--- a/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue
+++ b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue
@@ -8,7 +8,9 @@
class="search-container"
@value-change="JobVersionValue"
>
+
确认出库单
+ 确认出库单
删除出库单(支持批量)
+ >出库单删除
-->
确认出库单
+ 确认出库单
删除出库单(支持批量)
+ >整单删除
+
@@ -107,7 +107,7 @@
-
+