PG
/
Win.Sfs.SmartSettlementSystem.PG
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'branch_ccpg_220107' of http://dev.ccwin-in.com:6090/Win.Sfs.SmartSettlementSystem.PG into branch_ccpg_220107 

# Conflicts:
#	vue/src/components/ImportExcel-base/index.vue
branch_ccpg_220107
xunyu.guo 3 years ago
parent
4add46f29c 159fbf5978
commit
af0795a860
16 changed files with 91 additions and 70 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      vue/src/router/modules/hq_menu.js
  2. 22
      vue/src/router/modules/hq_out_order.js
  3. 15
      vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue
  4. 6
      vue/src/views/ux/vw/dataInput/hq_f_sparepart/index.vue
  5. 17
      vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue
  6. 9
      vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue
  7. 9
      vue/src/views/ux/vw/dataInput/hq_h_report/index.vue
  8. 6
      vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue
  9. 15
      vue/src/views/ux/vw/dataInput/hq_m_checkout/detail.vue
  10. 3
      vue/src/views/ux/vw/dataInput/hq_m_report/index.vue
  11. 6
      vue/src/views/ux/vw/dataInput/hq_m_sparepart/index.vue
  12. 15
      vue/src/views/ux/vw/dataInput/hq_y_checkout/detail.vue
  13. 8
      vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue
  14. 2
      vue/src/views/ux/vw/dataInput/hq_y_outorder/index.vue
  15. 6
      vue/src/views/ux/vw/dataInput/hq_y_report/index.vue
  16. 2
      vue/src/views/ux/vw/dataInput/hq_y_sparepart/index.vue

20
vue/src/router/modules/hq_menu.js
View File

@ -198,16 +198,16 @@ const hqMenudataRouter = {
icon: '文件' icon: '文件'
} }
}, },
{ // {
path: 'hq-Y-sparepart-export', // path: 'hq-Y-sparepart-export',
component: () => import('@/views/ux/vw/dataInput/hq_y_sparepart'), // component: () => import('@/views/ux/vw/dataInput/hq_y_sparepart'),
name: 'HQY',//命名路由 // name: 'HQY',//命名路由
meta: { // meta: {
title: '一汽轿车平台备件明细', // title: '一汽轿车平台备件明细',
roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色） // roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色）
icon: '文件' // icon: '文件'
} // }
}, // },
// { // {
// path: 'hq-Y-platform-export', // path: 'hq-Y-platform-export',
// component: () => import('@/views/ux/vw/dataInput/ScrapClaims'), // component: () => import('@/views/ux/vw/dataInput/ScrapClaims'),

22
vue/src/router/modules/hq_out_order.js
View File

@ -2,7 +2,7 @@
import Layout from '@/layout' import Layout from '@/layout'
const hqOutOrderDataRouter = { const hqOutOrderDataRouter = {
path: '/cpat-order', path: '/cpat-order-hq',
component: Layout, component: Layout,
redirect: 'pg', redirect: 'pg',
name: '业务数据', name: '业务数据',
@ -86,16 +86,16 @@ const hqOutOrderDataRouter = {
icon: '结算' icon: '结算'
} }
}, },
{ // {
path: 'hq-y-checkout', // path: 'hq-y-checkout',
component: () => import('@/views/ux/vw/dataInput/hq_y_checkout'), // component: () => import('@/views/ux/vw/dataInput/hq_y_checkout'),
name: 'SettleAccount',//命名路由 // name: 'SettleAccount',//命名路由
meta: { // meta: {
title: '一汽轿车平台备件出库单', // title: '一汽轿车平台备件出库单',
roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色） // roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色）
icon: '结算' // icon: '结算'
} // }
}, // },
// { // {
// path: 'hq-m-outorder', // path: 'hq-m-outorder',
// component: () => import('@/views/ux/billManage/kanbanOutOrder/index'), // component: () => import('@/views/ux/billManage/kanbanOutOrder/index'),

15
vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue
View File

@ -231,12 +231,12 @@ export default {
prop: "version", prop: "version",
width: 110, width: 110,
}); });
tempsTabs.push({ // tempsTabs.push({
label: "订货看板编号", // label: "订货看板编号",
prop: "kanban", // prop: "kanban",
width: 150, // width: 150,
}); // });
tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 110 }); // tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 110 });
tempsTabs.push({ label: "Sap编码", prop: "materialCode", width: 150 }); tempsTabs.push({ label: "Sap编码", prop: "materialCode", width: 150 });
tempsTabs.push({ tempsTabs.push({
label: "物料组(车型)", label: "物料组(车型)",
@ -244,7 +244,8 @@ export default {
width: 220, width: 220,
}); });
tempsTabs.push({ label: "发货零件号", prop: "extend1", width: 220 }); tempsTabs.push({ label: "发货零件号", prop: "extend1", width: 220 });
tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 }); //tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 });
tempsTabs.push({ label: "寄售库存", prop: "StockQty", width: 100 });
tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 }); tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 });
return tempsTabs; return tempsTabs;

6
vue/src/views/ux/vw/dataInput/hq_f_sparepart/index.vue
View File

@ -1126,7 +1126,7 @@ export default {
); );
this.$axios this.$axios
.posts( .posts(
"/api/settleaccount/ReportMakeService/HQHSettledDetailDiffExportService", "/api/settleaccount/ReportMakeService/HQFSettledDetailDiffExportService",
this.listExportQuery this.listExportQuery
) )
.then((res) => { .then((res) => {
@ -1260,10 +1260,10 @@ export default {
getList() { getList() {
this.listLoading = true; this.listLoading = true;
//导入界面中超链接过来的参数 //导入界面中超链接过来的参数
this.listQuery.name = "F平台备件明细"; this.listQuery.name = "F平台核对明细";
this.listQuery.type = this.JobversionValue; this.listQuery.type = this.JobversionValue;
this.$axios this.$axios
.posts("/api/settleaccount/ReportMakeService/HQFSharePartSettledDetailDiffExportService", this.listQuery) .posts("/api/settleaccount/Job/list", this.listQuery)
.then((response) => { .then((response) => {
this.list = response; this.list = response;
setTimeout(() => { setTimeout(() => {

17
vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue
View File

@ -231,20 +231,21 @@ export default {
prop: "version", prop: "version",
width: 110, width: 110,
}); });
tempsTabs.push({ // tempsTabs.push({
label: "订货看板编号", // label: "订货看板编号",
prop: "kanban", // prop: "kanban",
width: 150, // width: 150,
}); // });
tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 110 }); // tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 110 });
tempsTabs.push({ label: "Sap编码", prop: "materialCode", width: 150 }); tempsTabs.push({ label: "Sap编码", prop: "materialCode", width: 150 });
tempsTabs.push({ tempsTabs.push({
label: "物料组(车型)", label: "物料组(车型)",
prop: "materialGroup", prop: "materialGroup",
width: 220, width: 220,
}); });
tempsTabs.push({ label: "发货零件号", prop: "extend1", width: 220 }); tempsTabs.push({ label: "结算零件号", prop: "extend1", width: 220 });
tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 }); //tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 });
tempsTabs.push({ label: "寄售库存", prop: "StockQty", width: 100 });
tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 }); tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 });
return tempsTabs; return tempsTabs;

9
vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue
View File

@ -36,7 +36,7 @@
v-model="searchContent" v-model="searchContent"
clearable clearable
size="small" size="small"
placeholder="按照零件号搜索..." placeholder="按照看板号搜索..."
style="width: 230px" style="width: 230px"
class="search-container" class="search-container"
@keyup.enter.native="handleFilter" @keyup.enter.native="handleFilter"
@ -231,6 +231,11 @@ export default {
prop: "version", prop: "version",
width: 110, width: 110,
}); });
tempsTabs.push({
label: "订单号",
prop: "billNum",
width: 170,
});
tempsTabs.push({ tempsTabs.push({
label: "订货看板编号", label: "订货看板编号",
prop: "kanban", prop: "kanban",
@ -515,7 +520,7 @@ export default {
this.getList(); this.getList();
this.listQuery.Filters = []; this.listQuery.Filters = [];
if (this.searchContent != "") { if (this.searchContent != "") {
var column = "materialCode"; var column = "billNum";
let filter = { let filter = {
logic: 0, logic: 0,
column: column, column: column,

9
vue/src/views/ux/vw/dataInput/hq_h_report/index.vue
View File

@ -715,6 +715,14 @@ export default {
}); });
return; return;
} else { } else {
if(this.stateNameCateMap == Failed){
this.$message({
message:
"已经生成出库单的不能再确认！单号：" ,
type: "warning",
});
}else{
var params = []; var params = [];
let myalert = ""; //声明变量，其变量必须在此声明后使用 let myalert = ""; //声明变量，其变量必须在此声明后使用
if (row) { if (row) {
@ -757,6 +765,7 @@ export default {
message: "已取消操作", message: "已取消操作",
}); });
}); });
}
} }
}, },
//出库单 //出库单

6
vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue
View File

@ -1126,7 +1126,7 @@ export default {
); );
this.$axios this.$axios
.posts( .posts(
"/api/settleaccount/ReportMakeService/", "/api/settleaccount/ReportMakeService/HQHSharePartSettledDetailDiffExportService",
this.listExportQuery this.listExportQuery
) )
.then((res) => { .then((res) => {
@ -1260,10 +1260,10 @@ export default {
getList() { getList() {
this.listLoading = true; this.listLoading = true;
//导入界面中超链接过来的参数 //导入界面中超链接过来的参数
this.listQuery.name = "H平台备件明细"; this.listQuery.name = "H平台备件核对明细";
this.listQuery.type = this.JobversionValue; this.listQuery.type = this.JobversionValue;
this.$axios this.$axios
.posts("/api/settleaccount/ReportMakeService/HQHSharePartSettledDetailDiffExportService", this.listQuery) .posts("/api/settleaccount/Job/list", this.listQuery)
.then((response) => { .then((response) => {
this.list = response; this.list = response;
setTimeout(() => { setTimeout(() => {

15
vue/src/views/ux/vw/dataInput/hq_m_checkout/detail.vue
View File

@ -231,12 +231,12 @@ export default {
prop: "version", prop: "version",
width: 110, width: 110,
}); });
tempsTabs.push({ // tempsTabs.push({
label: "订货看板编号", // label: "订货看板编号",
prop: "kanban", // prop: "kanban",
width: 150, // width: 150,
}); // });
tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 110 }); // tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 110 });
tempsTabs.push({ label: "Sap编码", prop: "materialCode", width: 150 }); tempsTabs.push({ label: "Sap编码", prop: "materialCode", width: 150 });
tempsTabs.push({ tempsTabs.push({
label: "物料组(车型)", label: "物料组(车型)",
@ -244,7 +244,8 @@ export default {
width: 220, width: 220,
}); });
tempsTabs.push({ label: "发货零件号", prop: "extend1", width: 220 }); tempsTabs.push({ label: "发货零件号", prop: "extend1", width: 220 });
tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 }); //tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 });
tempsTabs.push({ label: "寄售库存", prop: "StockQty", width: 100 });
tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 }); tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 });
return tempsTabs; return tempsTabs;

3
vue/src/views/ux/vw/dataInput/hq_m_report/index.vue
View File

@ -570,6 +570,7 @@ export default {
multipleSelection: [], multipleSelection: [],
tableHeight: document.documentElement.clientHeight - 260, tableHeight: document.documentElement.clientHeight - 260,
isEdit: false, isEdit: false,
isEdit1: false,
menuCateMap: [ menuCateMap: [
{ label: "导出", value: "导出", cssName: "warning" }, { label: "导出", value: "导出", cssName: "warning" },
{ label: "消息", value: "消息", cssName: "info" }, { label: "消息", value: "消息", cssName: "info" },
@ -715,6 +716,7 @@ export default {
}); });
return; return;
} else { } else {
var params = []; var params = [];
let myalert = ""; //声明变量，其变量必须在此声明后使用 let myalert = ""; //声明变量，其变量必须在此声明后使用
if (row) { if (row) {
@ -757,6 +759,7 @@ export default {
message: "已取消操作", message: "已取消操作",
}); });
}); });
} }
}, },
//出库单 //出库单

6
vue/src/views/ux/vw/dataInput/hq_m_sparepart/index.vue
View File

@ -1126,7 +1126,7 @@ export default {
); );
this.$axios this.$axios
.posts( .posts(
"/api/settleaccount/ReportMakeService/", "/api/settleaccount/ReportMakeService/HQMSharePartSettledDetailDiffExportService",
this.listExportQuery this.listExportQuery
) )
.then((res) => { .then((res) => {
@ -1260,10 +1260,10 @@ export default {
getList() { getList() {
this.listLoading = true; this.listLoading = true;
//导入界面中超链接过来的参数 //导入界面中超链接过来的参数
this.listQuery.name = "M平台备件明细"; this.listQuery.name = "M平台备件核对明细";
this.listQuery.type = this.JobversionValue; this.listQuery.type = this.JobversionValue;
this.$axios this.$axios
.posts("/api/settleaccount/ReportMakeService/HQMSharePartSettledDetailDiffExportService", this.listQuery) .posts("/api/settleaccount/Job/list", this.listQuery)
.then((response) => { .then((response) => {
this.list = response; this.list = response;
setTimeout(() => { setTimeout(() => {

15
vue/src/views/ux/vw/dataInput/hq_y_checkout/detail.vue
View File

@ -231,12 +231,12 @@ export default {
prop: "version", prop: "version",
width: 110, width: 110,
}); });
tempsTabs.push({ // tempsTabs.push({
label: "订货看板编号", // label: "订货看板编号",
prop: "kanban", // prop: "kanban",
width: 150, // width: 150,
}); // });
tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 110 }); // tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 110 });
tempsTabs.push({ label: "Sap编码", prop: "materialCode", width: 150 }); tempsTabs.push({ label: "Sap编码", prop: "materialCode", width: 150 });
tempsTabs.push({ tempsTabs.push({
label: "物料组(车型)", label: "物料组(车型)",
@ -244,7 +244,8 @@ export default {
width: 220, width: 220,
}); });
tempsTabs.push({ label: "发货零件号", prop: "extend1", width: 220 }); tempsTabs.push({ label: "发货零件号", prop: "extend1", width: 220 });
tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 }); //tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 });
tempsTabs.push({ label: "寄售库存", prop: "StockQty", width: 100 });
tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 }); tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 });
return tempsTabs; return tempsTabs;

8
vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue
View File

@ -301,7 +301,7 @@ export default {
.then(() => { .then(() => {
this.$axios this.$axios
.posts( .posts(
"/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPut-Cancel", "/api/settleaccount/WmsHQCaroutput/WmsSharePartOutPut-Cancel",
this.listOutPutQuery this.listOutPutQuery
) )
.then((response) => { .then((response) => {
@ -340,7 +340,7 @@ export default {
.then(() => { .then(() => {
this.$axios this.$axios
.posts( .posts(
"/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPut-Pass", "/api/settleaccount/WmsHQCaroutput/WmsSharePartOutPut-Pass",
this.listOutPutQuery this.listOutPutQuery
) )
.then((response) => { .then((response) => {
@ -392,7 +392,7 @@ export default {
.then(() => { .then(() => {
this.$axios this.$axios
.posts( .posts(
"/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPut-Pass", "/api/settleaccount/WmsHQCaroutput/WmsSharePartOutPut-Pass",
this.listOutPutQuery this.listOutPutQuery
) )
.then((response) => { .then((response) => {
@ -493,7 +493,7 @@ export default {
console.log("查询条件：" + JSON.stringify(this.listQuery)); console.log("查询条件：" + JSON.stringify(this.listQuery));
this.$axios this.$axios
.posts( .posts(
"/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanDetailList", "/api/settleaccount/WmsHQCaroutput/WmsSharePartDetailList",
this.listQuery this.listQuery
) )
.then((response) => { .then((response) => {

2
vue/src/views/ux/vw/dataInput/hq_y_outorder/index.vue
View File

@ -277,7 +277,7 @@ export default {
this.listQuery.SkipCount = (this.page - 1) * 15; this.listQuery.SkipCount = (this.page - 1) * 15;
} }
this.$axios this.$axios
.posts("/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanList", this.listQuery) .posts("/api/settleaccount/WmsHQCaroutput/WmsSharePartList", this.listQuery)
.then((response) => { .then((response) => {
this.list = response.items; this.list = response.items;
//alert(JSON.stringify(response.Items)) //alert(JSON.stringify(response.Items))

6
vue/src/views/ux/vw/dataInput/hq_y_report/index.vue
View File

@ -737,7 +737,7 @@ export default {
.then(() => { .then(() => {
this.$axios this.$axios
.posts( .posts(
"/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPutAudit", "/api/settleaccount/WmsHQCaroutput/WmsSharePartOutPutAudit",
params params
) )
.then((response) => { .then((response) => {
@ -814,7 +814,7 @@ export default {
this.formLoading = true; this.formLoading = true;
this.$axios this.$axios
.posts( .posts(
"/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPut", "/api/settleaccount/WmsHQCaroutput/WmsSharePartOutPut",
this.listBillQuery this.listBillQuery
) )
.then((response) => { .then((response) => {
@ -1127,7 +1127,7 @@ export default {
); );
this.$axios this.$axios
.posts( .posts(
"/api/settleaccount/ReportMakeService/HQHSettledDetailDiffExportService", "/api/settleaccount/ReportMakeService/HQCarSettledDetailDiffExportService",
this.listExportQuery this.listExportQuery
) )
.then((res) => { .then((res) => {

2
vue/src/views/ux/vw/dataInput/hq_y_sparepart/index.vue
View File

@ -1260,7 +1260,7 @@ export default {
getList() { getList() {
this.listLoading = true; this.listLoading = true;
//导入界面中超链接过来的参数 //导入界面中超链接过来的参数
this.listQuery.name = "一汽轿车平台备件明细"; this.listQuery.name = "一汽轿车平台备件核对明细";
this.listQuery.type = this.JobversionValue; this.listQuery.type = this.JobversionValue;
this.$axios this.$axios
.posts("/api/settleaccount/ReportMakeService/HQHSettledDetailDiffExportService", this.listQuery) .posts("/api/settleaccount/ReportMakeService/HQHSettledDetailDiffExportService", this.listQuery)

Write Preview
Loading…
Cancel
Save