Browse Source

日常提交

branch_ccpg_220107
44673626 3 years ago
parent
commit
b96cda4762
  1. 9
      vue/src/components/ImportExcel-base/index.vue
  2. 95
      vue/src/router/modules/hq_out_order.js
  3. 10
      vue/src/router/modules/vw_menu.js
  4. 11
      vue/src/router/modules/wms_out_order.js
  5. 2
      vue/src/views/ux/billManage/IssuedUnsettled/index.vue
  6. 2
      vue/src/views/ux/billManage/UnSettledSum/index.vue
  7. 15
      vue/src/views/ux/billManage/kanbanOutOrder/detail.vue
  8. 82
      vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue
  9. 6
      vue/src/views/ux/billManage/kanbanWithOutOrder/index.vue
  10. 16
      vue/src/views/ux/billManage/sparepartOutOrder/detail.vue
  11. 15
      vue/src/views/ux/billManage/sparepartOutOrder90/detail.vue
  12. 1190
      vue/src/views/ux/billManage/unSparePart/index.vue
  13. 13
      vue/src/views/ux/billManage/vwOutOrder/detail.vue
  14. 14
      vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue
  15. 25
      vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue
  16. 11
      vue/src/views/ux/vw/dataInput/hq_kb_output/detail.vue
  17. 2
      vue/src/views/ux/vw/dataInput/hq_kb_output/index.vue
  18. 17
      vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue

9
vue/src/components/ImportExcel-base/index.vue

@ -284,7 +284,11 @@ export default {
return this.stepsActive == 1;
},
getMoudleDisable() {
if (this.crmType == "priceList" || this.crmType == "spareparts" || this.crmType == "wmsOutputSum" ) {
if (
this.crmType == "priceList" ||
this.crmType == "spareparts" ||
this.crmType == "wmsOutputSum"
) {
//
this.isEditYearMont = true;
this.isEditFactory = true;
@ -312,6 +316,7 @@ export default {
sparepartoutorder: "大众备件无单号出库单",
sparepartoutorder90: "大众备件有单号出库单",
kanbanoutorder: "大众看板出库单",
kanbanwithoutorder: "大众无条码看板出库单",
HQ_H_OUTORDER: "红旗批量出库单",
HQ_M_OUTORDER: "红旗M平台出库单",
HQ_Y_OUTORDER: "一汽轿车平台出库单",
@ -358,6 +363,8 @@ export default {
hqYPlatform: "/api/settleaccount/BT_Carlatform/ExcelImport", //轿
vwoutorder: "/api/settleaccount/wmsjitoutput/ExcelImport", //
kanbanoutorder: "/api/settleaccount/wmskanbanoutput/ExcelImport", //
kanbanwithoutorder:
"/api/settleaccount/wmskanbanoutputextend/ExcelImportWithOutKanban", //
HQ_H_OUTORDER: "/api/settleaccount/WmsHQHKanbanoutput/ExcelImport", //H
HQ_F_OUTORDER: "/api/settleaccount/WMSHQFKanbanoutput/ExcelImport", //F

95
vue/src/router/modules/hq_out_order.js

@ -37,46 +37,6 @@ const hqOutOrderDataRouter = {
icon: '结算'
}
},
// {
// path: 'hq-m-outorder',
// component: () => import('@/views/ux/vw/dataInput/hq_m_outorder'),
// name: 'SettleAccount',//命名路由
// meta: {
// title: 'M平台出库单',
// roles: ['SettleAccount.WMSHQ'],//控制页面角色(可以设置多个角色)
// icon: '零件'
// }
// },
// {
// path: 'hq-m-checkout',
// component: () => import('@/views/ux/vw/dataInput/hq_m_checkout'),
// name: 'SettleAccount',//命名路由
// meta: {
// title: 'M平台备件出库单',
// roles: ['SettleAccount.WMSHQ'],//控制页面角色(可以设置多个角色)
// icon: '客户'
// }
// },
// {
// path: 'hq-f-outorder',
// component: () => import('@/views/ux/vw/dataInput/hq_f_outorder'),
// name: 'SettleAccount',//命名路由
// meta: {
// title: 'F平台出库单',
// roles: ['SettleAccount.WMSHQ'],//控制页面角色(可以设置多个角色)
// icon: '批量'
// }
// },
// {
// path: 'hq-f-outorder-chickout',
// component: () => import('@/views/ux/vw/dataInput/hq_f_outorder_chickout'),
// name: 'SettleAccount',//命名路由
// meta: {
// title: 'F平台备件出库单',
// roles: ['SettleAccount.WMSHQ'],//控制页面角色(可以设置多个角色)
// icon: '器具'
// }
// },
{
path: 'hq-y-outorder',
component: () => import('@/views/ux/vw/dataInput/hq_y_outorder'),
@ -98,61 +58,6 @@ const hqOutOrderDataRouter = {
}
},
// {
// path: 'onetime-sale-outorder',
// component: () => import('@/views/ux/vw/dataInput/OnetimeSale'),
// name: 'WmsHQKBOutput',//命名路由
// meta: {
// title: '一次性寄售销售结算',
// roles: ['SettleAccount.WMSHQ'],//控制页面角色(可以设置多个角色)
// icon: '客户'
// }
// },
// {
// path: 'hq-y-checkout',
// component: () => import('@/views/ux/vw/dataInput/hq_y_checkout'),
// name: 'SettleAccount',//命名路由
// meta: {
// title: '一汽轿车平台备件出库单',
// roles: ['SettleAccount.SettleAccounts'],//控制页面角色(可以设置多个角色)
// icon: '结算'
// }
// },
// {
// path: 'hq-m-outorder',
// component: () => import('@/views/ux/billManage/kanbanOutOrder/index'),
// name: 'SettleAccount',//命名路由
// meta: {
// title: '大众看板出库单',
// roles: ['SettleAccount.SettleAccounts'],//控制页面角色(可以设置多个角色)
// icon: '结算'
// }
// },
// {
// path: 'hq-f-withoutorder',
// component: () => import('@/views/ux/billManage/kanbanWithOutOrder/index'),
// name: 'SettleAccount',//命名路由
// meta: {
// title: '大众无条码看板出库单',
// roles: ['SettleAccount.SettleAccounts'],//控制页面角色(可以设置多个角色)
// icon: '结算'
// }
// },
// {
// path: 'hq-car-outorder',
// component: () => import('@/views/ux/billManage/sparepartOutOrder/index'),
// name: 'Invoices',//命名路由
// meta: {
// title: '大众备件出库单',
// roles: ['SettleAccount.Invoices'],
// icon: '对比'
// }
// },
]
}

10
vue/src/router/modules/vw_menu.js

@ -207,6 +207,16 @@ const vwMenudataRouter = {
icon: '供货'
}
},
{
path: '/vwunsparepart',
component: () => import('@/views/ux/billManage/unSparePart'),
name: 'unSparePart',//命名路由
meta: {
title: '大众备件未结输出',
roles: ['SettleAccount.Reports'],//控制页面角色(可以设置多个角色)
icon: '供货'
}
},
{
path: '/vwsparepart90',
component: () => import('@/views/ux/billManage/sparePart90'),

11
vue/src/router/modules/wms_out_order.js

@ -80,6 +80,17 @@ const vwsOutOrderDataRouter = {
}
},
// {
// path: '/wms-unSettledSum',
// component: () => import('@/views/ux/billManage/UnSettledSum'),
// name: 'UnSettledSum',//命名路由
// meta: {
// title: '撤销出库清单',
// roles: ['SettleAccount.WMSJIT'],//控制页面角色(可以设置多个角色)
// icon: '零件'
// }
// },
]

2
vue/src/views/ux/billManage/IssuedUnsettled/index.vue

@ -587,7 +587,7 @@ export default {
setTimeout(this.getList, 0);
}, 1000 * 180); //15
// $oncebeforeDestroy
this.$once("hook:beforeDestroy", () => {
this.$once('hook:beforeDestroy', () => {
clearInterval(timer);
});
//this.disabledDateCp5();

2
vue/src/views/ux/billManage/UnSettledSum/index.vue

@ -626,7 +626,7 @@ export default {
"结算未结寄售核对表-导出条件:" + JSON.stringify(this.listExportQuery)
);
this.$axios
.gets(
.posts(
"/api/settleaccount/ReportMakeService/UnSettledSum-Make",
this.listExportQuery
)

15
vue/src/views/ux/billManage/kanbanOutOrder/detail.vue

@ -142,10 +142,7 @@
<el-button type="text" @click="dialogFormVisible = false"
>取消</el-button
>
<el-button
v-loading="formLoading"
type="primary"
@click="save()"
<el-button v-loading="formLoading" type="primary" @click="save()"
>确认</el-button
>
</div>
@ -241,6 +238,7 @@ export default {
page: 1,
JobversionValue: "",
JobversionValueVerson: "",
selectJobVersionValue: "",
dialogFormVisible: false,
multipleSelection: [],
formTitle: "",
@ -364,6 +362,7 @@ export default {
action: 0,
value: params.value,
};
this.selectJobVersionValue = params.value;
this.listQuery.Filters.push(filter);
this.getList();
},
@ -585,6 +584,14 @@ export default {
this.listQuery.SkipCount = (this.page - 1) * 15;
}
this.listQuery.billNum = this.customerInfo.parentId;
let filter = {
Column: "state",
Value: this.selectJobVersionValue,
Logic: 0,
Action: 0,
};
this.listQuery.Filters.push(filter);
console.log("查询条件:" + JSON.stringify(this.listQuery));
this.$axios
.posts(

82
vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue

@ -300,6 +300,7 @@ export default {
JobversionValue: "",
PurchaseDateValue: "",
JobversionValueVerson: "",
selectJobVersionValue: "",
dialogFormVisible: false,
multipleSelection: [],
outPutQtylist: {
@ -420,6 +421,7 @@ export default {
action: 0,
value: params.value,
};
this.selectJobVersionValue = params.value;
this.listQuery.Filters.push(filter);
this.getList();
},
@ -465,6 +467,7 @@ export default {
},
save(row) {
this.formLoading=true;
if (this.formTitle == "撤销出库") {
this.CancelBills(row);
} else if (this.formTitle == "创建出库单") {
@ -472,7 +475,7 @@ export default {
}
},
//
//
HandleOutPutCancel() {
if (this.multipleSelection.length == 0) {
this.$message({
@ -526,11 +529,11 @@ export default {
if (this.accountDatelist != "") {
this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
}
console.log(
console.log(
"无条码看板-全部确认出库条件:" + JSON.stringify(this.listOutPutQuery)
);
this.$axios
this.$axios
.posts(
"/api/settleaccount/wmskanbanoutputextend/WmsKanbanOutPut-Pass",
this.listOutPutQuery
@ -563,7 +566,7 @@ export default {
});
}
},
//
//
CancelBills(row) {
if (this.accountDatelist.accountDate == "") {
this.$message({
@ -616,69 +619,6 @@ export default {
});
},
// //
// save-00(row) {
// this.dialogFormVisible = true;
// this.resultData.errSize == 0; //
// //this.formLoading = true;
// this.listOutPutQuery.guids = [];
// this.listOutPutQuery.version = this.customerInfo.version;
// this.listOutPutQuery.billNum = this.customerInfo.parentId;
// if (this.accountDatelist.accountDate == "") {
// this.$message({
// message: "",
// type: "warning",
// });
// this.getList();
// return;
// //this.getList();
// } else {
// if (this.accountDatelist != "") {
// this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
// }
// //this.listOutPutQuery.accountDate = this.accountDatelist;
// console.log(
// "-" + JSON.stringify(this.listOutPutQuery)
// );
// this.$axios
// .posts(
// "/api/settleaccount/wmskanbanoutputextend/WmsKanbanOutPut-Pass-00",
// this.listOutPutQuery
// )
// .then((res) => {
// const index = this.list.indexOf(row);
// if (res === "Success") {
// this.$notify({
// title: "",
// message: "!",
// type: "success",
// duration: 2000,
// });
// this.accountDatelist.accountDate = "";
// this.resultData.errSize = 0;
// this.dialogFormVisible = false;
// this.resultData.successMessage = "";
// this.getList();
// } else {
// this.dialogFormVisible = false;
// this.resultData.errTemplate = res; //
// this.resultData.errSize = 1; //0
// this.resultData.successMessage = "";
// //alert(JSON.stringify(this.resultData));
// }
// this.formLoading = false;
// })
// .catch(() => {
// this.formLoading = false;
// });
// }
// },
//
handleDelete(row) {
var params = [];
@ -806,6 +746,14 @@ export default {
this.listQuery.SkipCount = (this.page - 1) * 15;
}
this.listQuery.billNum = this.customerInfo.parentId;
let filter = {
Column: "state",
Value: this.selectJobVersionValue,
Logic: 0,
Action: 0,
};
this.listQuery.Filters.push(filter);
console.log("查询条件:" + JSON.stringify(this.listQuery));
this.$axios
.posts(

6
vue/src/views/ux/billManage/kanbanWithOutOrder/index.vue

@ -18,14 +18,14 @@
@click="handleFilter"
>搜索
</el-button>
<!-- <el-button
<el-button
class="filter-item"
size="mini"
type="warning"
icon="el-icon-upload2"
@click="handleImportExcel()"
>导入文件Excel
</el-button> -->
</el-button>
<el-button
class="filter-item"
size="mini"
@ -218,7 +218,7 @@ export default {
directives: { permission },
data() {
return {
crmType: "kanbanoutorder",
crmType: "kanbanwithoutorder",
rules: {
// version: [{ required: true, message: "", trigger: "change" }],
// beginTime: [{ required: true, message: "", trigger: "change" }],

16
vue/src/views/ux/billManage/sparepartOutOrder/detail.vue

@ -175,10 +175,7 @@
<el-button type="text" @click="dialogFormVisible = false"
>取消</el-button
>
<el-button
v-loading="formLoading"
type="primary"
@click="save()"
<el-button v-loading="formLoading" type="primary" @click="save()"
>确认</el-button
>
</div>
@ -272,6 +269,7 @@ export default {
},
page: 1,
JobversionValue: "",
selectJobVersionValue: "",
PurchaseDateValue: "",
JobversionValueVerson: "",
dialogFormVisible: false,
@ -410,6 +408,7 @@ export default {
action: 0,
value: params.value,
};
this.selectJobVersionValue = params.value;
this.listQuery.Filters.push(filter);
this.getList();
},
@ -461,6 +460,7 @@ export default {
}
},
save(row) {
this.formLoading = true;
if (this.formTitle == "撤销出库") {
this.CancelBills(row);
} else if (this.formTitle == "创建出库单") {
@ -683,6 +683,14 @@ export default {
this.listQuery.SkipCount = (this.page - 1) * 15;
}
this.listQuery.billNum = this.customerInfo.parentId;
let filter = {
Column: "state",
Value: this.selectJobVersionValue,
Logic: 0,
Action: 0,
};
this.listQuery.Filters.push(filter);
console.log("查询条件:" + JSON.stringify(this.listQuery));
this.$axios
.posts(

15
vue/src/views/ux/billManage/sparepartOutOrder90/detail.vue

@ -243,6 +243,7 @@ export default {
page: 1,
JobversionValue: "",
JobversionValueVerson: "",
selectJobVersionValue: "",
dialogFormVisible: false,
multipleSelection: [],
formTitle: "",
@ -366,11 +367,13 @@ export default {
action: 0,
value: params.value,
};
this.selectJobVersionValue = params.value;
this.listQuery.Filters.push(filter);
this.getList();
},
save(row) {
this.formLoading = true;
if (this.formTitle == "撤销出库") {
this.CancelBills(row);
} else if (this.formTitle == "创建出库单") {
@ -423,10 +426,10 @@ export default {
this.accountDatelist.accountDate = "";
this.dialogFormVisible = false;
this.getList();
this.listLoading = false;
this.formLoading = false;
})
.catch(() => {
this.listLoading = false;
this.formLoading = false;
});
}
},
@ -594,6 +597,14 @@ export default {
this.listQuery.SkipCount = (this.page - 1) * 15;
}
this.listQuery.billNum = this.customerInfo.parentId;
let filter = {
Column: "state",
Value: this.selectJobVersionValue,
Logic: 0,
Action: 0,
};
this.listQuery.Filters.push(filter);
console.log("查询条件:" + JSON.stringify(this.listQuery));
this.$axios
.posts(

1190
vue/src/views/ux/billManage/unSparePart/index.vue

File diff suppressed because it is too large

13
vue/src/views/ux/billManage/vwOutOrder/detail.vue

@ -222,7 +222,7 @@ export default {
SkipCount: 0,
MaxResultCount: 15,
billNum: "",
state:"",
state: "",
},
listOutPutQuery: {
version: "",
@ -236,6 +236,7 @@ export default {
page: 1,
JobversionValue: "",
JobversionValueVerson: "",
selectJobVersionValue: "",
dialogFormVisible: false,
multipleSelection: [],
formTitle: "",
@ -318,11 +319,13 @@ export default {
action: 0,
value: params.value,
};
this.selectJobVersionValue = params.value;
this.listQuery.Filters.push(filter);
this.getList();
},
save(row) {
this.formLoading = true;
if (this.formTitle == "撤销出库") {
this.CancelBills(row);
} else if (this.formTitle == "创建出库单") {
@ -684,6 +687,14 @@ export default {
this.listQuery.SkipCount = (this.page - 1) * 15;
}
this.listQuery.billNum = this.customerInfo.parentId;
let filter = {
Column: "state",
Value: this.selectJobVersionValue,
Logic: 0,
Action: 0,
};
this.listQuery.Filters.push(filter);
console.log("查询条件:" + JSON.stringify(this.listQuery));
this.$axios
.posts(

14
vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue

@ -271,6 +271,7 @@ export default {
},
page: 1,
JobversionValue: "",
selectJobVersionValue: "",
JobversionValueVerson: "",
dialogFormVisible: false,
multipleSelection: [],
@ -468,11 +469,13 @@ export default {
action: 0,
value: params.value,
};
this.selectJobVersionValue = params.value;
this.listQuery.Filters.push(filter);
this.getList();
},
save(row) {
this.formLoading = true;
if (this.formTitle == "撤销出库") {
this.CancelBills(row);
} else if (this.formTitle == "创建出库单") {
@ -677,10 +680,10 @@ export default {
this.accountDatelist.accountDate = "";
this.dialogFormVisible = false;
this.getList();
this.listLoading = false;
this.formLoading = false;
})
.catch(() => {
this.listLoading = false;
this.formLoading = false;
});
}
},
@ -765,6 +768,13 @@ export default {
this.listQuery.SkipCount = (this.page - 1) * 15;
}
this.listQuery.billNum = this.customerInfo.parentId;
let filter = {
Column: "state",
Value: this.selectJobVersionValue,
Logic: 0,
Action: 0,
};
this.listQuery.Filters.push(filter);
console.log("查询条件:" + JSON.stringify(this.listQuery));
this.$axios
.posts(

25
vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue

@ -142,10 +142,7 @@
<el-button type="text" @click="dialogFormVisible = false"
>取消</el-button
>
<el-button
v-loading="formLoading"
type="primary"
@click="save()"
<el-button v-loading="formLoading" type="primary" @click="save()"
>确认</el-button
>
</div>
@ -238,6 +235,7 @@ export default {
page: 1,
JobversionValue: "",
JobversionValueVerson: "",
selectJobVersionValue: "",
dialogFormVisible: false,
multipleSelection: [],
formTitle: "",
@ -373,11 +371,13 @@ export default {
action: 0,
value: params.value,
};
this.selectJobVersionValue = params.value;
this.listQuery.Filters.push(filter);
this.getList();
},
save(row) {
save(row) {
this.formLoading = true;
if (this.formTitle == "撤销出库") {
this.CancelBills(row);
} else if (this.formTitle == "创建出库单") {
@ -415,7 +415,7 @@ export default {
});
},
//
//
CancelBills(row) {
if (this.accountDatelist.accountDate == "") {
this.$message({
@ -524,7 +524,7 @@ export default {
// });
// });
// },
//
//
handleCreateBills() {
this.dialogFormVisible = true;
if (this.$refs["accountDatelist"] !== undefined) {
@ -574,11 +574,11 @@ export default {
this.accountDatelist.accountDate = "";
this.dialogFormVisible = false;
this.getList();
this.listLoading = false;
this.formLoading = false;
this.dialogFormVisible = false;
})
.catch(() => {
this.listLoading = false;
this.formLoading = false;
});
}
},
@ -662,6 +662,13 @@ export default {
this.listQuery.SkipCount = (this.page - 1) * 15;
}
this.listQuery.billNum = this.customerInfo.parentId;
let filter = {
Column: "state",
Value: this.selectJobVersionValue,
Logic: 0,
Action: 0,
};
this.listQuery.Filters.push(filter);
console.log("查询条件:" + JSON.stringify(this.listQuery));
this.$axios
.posts(

11
vue/src/views/ux/vw/dataInput/hq_kb_output/detail.vue

@ -228,6 +228,7 @@ export default {
{ value: "3", label: "不能出库" },
{ value: "4", label: "取消出库" },
],
selectJobVersionValue: "",
PurchaseDateList: [],
//
filterObj: {
@ -399,6 +400,7 @@ export default {
action: 0,
value: params.value,
};
this.selectJobVersionValue = params.value;
this.listQuery.Filters.push(filter);
this.getList();
},
@ -449,6 +451,7 @@ export default {
}
},
save(row) {
this.formLoading = true;
if (this.formTitle == "撤销出库") {
this.CancelBills(row);
} else if (this.formTitle == "创建出库单") {
@ -671,6 +674,14 @@ export default {
this.listQuery.SkipCount = (this.page - 1) * 15;
}
this.listQuery.billNum = this.customerInfo.parentId;
let filter = {
Column: "state",
Value: this.selectJobVersionValue,
Logic: 0,
Action: 0,
};
this.listQuery.Filters.push(filter);
console.log("查询条件:" + JSON.stringify(this.listQuery));
this.$axios
.posts(

2
vue/src/views/ux/vw/dataInput/hq_kb_output/index.vue

@ -1,4 +1,4 @@
<!--红旗数据调整出库单-->
<!--大众看板无单号出库单-->
<template>
<div class="cr-body-content">
<flexbox class="content-header">

17
vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue

@ -168,10 +168,7 @@
<el-button type="text" @click="dialogFormVisible = false"
>取消</el-button
>
<el-button
v-loading="formLoading"
type="primary"
@click="save()"
<el-button v-loading="formLoading" type="primary" @click="save()"
>确认</el-button
>
</div>
@ -265,6 +262,7 @@ export default {
},
page: 1,
JobversionValue: "",
selectJobVersionValue: "",
PurchaseDateValue: "",
JobversionValueVerson: "",
dialogFormVisible: false,
@ -397,6 +395,7 @@ export default {
action: 0,
value: params.value,
};
this.selectJobVersionValue = params.value;
this.listQuery.Filters.push(filter);
this.getList();
},
@ -448,6 +447,7 @@ export default {
}
},
save(row) {
this.formLoading = true;
if (this.formTitle == "撤销出库") {
this.CancelBills(row);
} else if (this.formTitle == "创建出库单") {
@ -594,7 +594,7 @@ export default {
});
},
//
//
handleCreateBills() {
this.dialogFormVisible = true;
if (this.$refs["accountDatelist"] !== undefined) {
@ -727,6 +727,13 @@ export default {
this.listQuery.SkipCount = (this.page - 1) * 15;
}
this.listQuery.billNum = this.customerInfo.parentId;
let filter = {
Column: "state",
Value: this.selectJobVersionValue,
Logic: 0,
Action: 0,
};
this.listQuery.Filters.push(filter);
console.log("查询条件:" + JSON.stringify(this.listQuery));
this.$axios
.posts(

Loading…
Cancel
Save