Browse Source

前端提交--房大伟

branch_ccpg_220107
44673626 3 years ago
parent
commit
0825b90d01
  1. 4
      vue/src/components/ImportExcel-base/index.vue
  2. 12
      vue/src/router/modules/vw_out_order.js
  3. 256
      vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue
  4. 127
      vue/src/views/ux/billManage/kanbanWithOutOrder/index.vue
  5. 70
      vue/src/views/ux/billManage/sparePart/index.vue
  6. 22
      vue/src/views/ux/billManage/sparePart90/index.vue
  7. 220
      vue/src/views/ux/billManage/sparepartOutOrder/detail.vue
  8. 2
      vue/src/views/ux/billManage/sparepartOutOrder/index.vue
  9. 6
      vue/src/views/ux/billManage/sparepartOutOrder90/detail.vue
  10. 4
      vue/src/views/ux/billManage/sparepartOutOrder90/index.vue
  11. 136
      vue/src/views/ux/billManage/vwOutOrder/detail.vue
  12. 14
      vue/src/views/ux/vw/dataInput/SparePart/index.vue
  13. 10
      vue/src/views/ux/vw/dataInput/SparePart90/index.vue
  14. 4
      vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue

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

@ -527,6 +527,10 @@ export default {
},
//
sureClick() {
if(this.versionValue==''){
this.$message.error("必须选择版本!");
return false;
}
if (
this.fileuploadList === [] ||
JSON.stringify(this.fileuploadList) === "[]"

12
vue/src/router/modules/vw_out_order.js

@ -50,13 +50,23 @@ const vwOutOrderDataRouter = {
{
path: 'sparepart-out-order',
component: () => import('@/views/ux/billManage/sparepartOutOrder/index'),
name: 'Invoices',//命名路由
name: 'Sparepartoutorder',//命名路由
meta: {
title: '大众备件出库单',
roles: ['SettleAccount.WMSJIT'],
icon: '文件'
}
},
{
path: 'sparepart90-out-order',
component: () => import('@/views/ux/billManage/sparepartOutOrder90/index'),
name: 'Sparepartoutorder90',//命名路由
meta: {
title: '大众备件调整出库单',
roles: ['SettleAccount.WMSJIT'],
icon: '文件'
}
},
]
}

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

@ -1,27 +1,32 @@
<!--FIS发运数据对比输出表-明细数据-->
<!--大众无条码看板-明细数据-->
<template>
<div class="cr-body-content">
<flexbox class="content-header">
<!-- <el-button
class="filter-item"
size="mini"
type="info"
icon="el-icon-download"
@click="handleDownload()"
>导出全部
</el-button> -->
<JobSelectVerson
:options="JobVersionList"
style="width: 150px; margin-left: -10px"
class="search-container"
@value-change="JobVersionValue"
></JobSelectVerson>
<el-select
v-model="PurchaseDateValue"
clearable
style="width: 188px; margin-left: -10px; margin-right: 5px"
placeholder="请选择采购日期"
>
<el-option
v-for="item in PurchaseDateList"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
<el-button
class="filter-item"
type="success"
icon="el-icon-check"
size="mini"
@click="print()"
@click="handleCreateBills()"
>确认出库单</el-button
>
<el-button
@ -29,17 +34,17 @@
size="mini"
type="warning"
icon="el-icon-download"
@click="handleCancelBills()"
@click="print()"
>取消出库(支持批量)
</el-button>
<!-- <el-button
<el-button
class="filter-item"
size="mini"
type="danger"
icon="el-icon-download"
@click="handleDelete()"
>删除出库单(支持批量)
</el-button> -->
</el-button>
<el-input
v-model="searchContent"
clearable
@ -101,6 +106,30 @@
{{ scope.column.label }}
</template>
</el-table-column>
<el-table-column
prop="outputQty"
label="出库数量"
v-model="outPutQtylist.outputQty"
width="100"
>
<template slot-scope="list">
<el-input
size="small"
v-model="list.row.outputQty"
@change="handleEdit(list.$index, list.row)"
></el-input>
</template>
</el-table-column>
<el-table-column label="操作" align="center">
<template slot-scope="list">
<el-button
type="primary"
v-if="(list.$index = 1)"
@click="handle(list.row)"
>确定</el-button
>
</template>
</el-table-column>
</el-table>
<div class="table-footer">
<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
@ -145,9 +174,7 @@
<el-button
v-loading="formLoading"
type="primary"
@click="handleCreateBills()"
>确认</el-button
>
</div>
@ -177,13 +204,13 @@ export default {
},
data() {
return {
crmType: "kanbanOutOrder",
crmType: "sparepartOutOrder",
rules: {
//
erpMaterialCode: [
{ required: true, message: "必须输入!", trigger: "blur" },
],
accountDate: [
accountDate: [
{ required: true, message: "日期必须输入!", trigger: "blur" },
],
},
@ -208,6 +235,7 @@ export default {
{ value: "3", label: "不能出库" },
{ value: "4", label: "取消出库" },
],
PurchaseDateList: [],
//
filterObj: {
type: Object,
@ -232,21 +260,29 @@ export default {
version: "",
guids: "",
billNum: "",
accountDate:""
accountDate: "",
},
listDeleteQuery: {
billNum: "",
},
page: 1,
JobversionValue: "",
PurchaseDateValue: "",
JobversionValueVerson: "",
dialogFormVisible: false,
multipleSelection: [],
outPutQtylist: {
outputQty: "",
taskId: "",
},
formTitle: "",
drawer: false,
showExcelImport: false,
tableHeight: document.documentElement.clientHeight - 230,
isEdit: false,
accountDatelist:{
accountDate:""
}
accountDatelist: {
accountDate: "",
},
};
},
mounted() {
@ -286,20 +322,26 @@ export default {
prop: "version",
width: 110,
});
tempsTabs.push({ label: "单据号", prop: "billNum", width: 100 });
tempsTabs.push({ label: "物料号", prop: "sapMaterialCode", width: 100 });
tempsTabs.push({
label: "零件号",
prop: "materialCode",
width: 150,
label: "物料描述",
prop: "materialDesc",
width: 250,
});
tempsTabs.push({ label: "零件描述", prop: "materialDesc", width: 250 });
tempsTabs.push({ label: "物料组", prop: "materialGroup", width: 220 });
tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 100 });
tempsTabs.push({ label: "数量", prop: "qty", width: 100 });
tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 });
tempsTabs.push({ label: "寄售库存数量", prop: "sockQty", width: 120 });
tempsTabs.push({ label: "实际数量", prop: "realityNumber", width: 100 });
tempsTabs.push({ label: "状态", prop: "state", width: 100 });
return tempsTabs;
},
},
methods: {
//
handleEdit(index, row) {
console.log(index, row);
},
//
JobVersionValue(params) {
//
@ -314,6 +356,46 @@ export default {
this.listQuery.Filters.push(filter);
this.getList();
},
handle(row) {
this.multipleSelection.forEach((element) => {
let outPutQty = element.outPutQty;
});
if (row.outPutQty > row.sockQty) {
this.$message({
message: "出库数量大于寄售库存,不允许出库!",
type: "warning",
});
} else {
if (row.branchId != "") {
this.listOutPutQuery.branchId = row.id;
}
if (row.outPutQty != "") {
this.listOutPutQuery.outputQty = row.outputQty;
}
console.log(
"大众备件调整结算数量按钮:" + JSON.stringify(this.listOutPutQuery)
);
//"taskId": "3fa85f64-5717-4562-b3fc-2c963f66afa6","outPutQty": 0
this.$axios
.posts(
"/api/settleaccount/wmskanbanoutputextend/WmsSharePartOutPutModify",
this.listOutPutQuery
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "操作成功",
type: "success",
duration: 2000,
});
this.getList();
})
.catch(() => {
this.listLoading = false;
});
}
},
//
handleCancelBills(row) {
if (this.multipleSelection.length == 0) {
@ -350,7 +432,7 @@ export default {
.then(() => {
this.$axios
.posts(
"/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut-Cancel",
"/api/settleaccount/wmskanbanoutputextend/WmsKanbanOutPut-Cancel",
this.listOutPutQuery
)
.then((response) => {
@ -373,18 +455,18 @@ export default {
},
print() {
this.dialogFormVisible = true;
if (this.$refs["accountDatelist"] !== undefined) {
if (this.$refs["accountDatelist"] !== undefined) {
this.$refs["accountDatelist"].resetFields();
}
},
//
handleCreateBills(row) {
this.dialogFormVisible = true;
this.listLoading = true;
this.listOutPutQuery.guids = [];
this.listOutPutQuery.version = this.customerInfo.version;
this.listOutPutQuery.billNum = this.customerInfo.parentId;
if (this.accountDatelist.accountDate == "") {
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",
@ -394,8 +476,8 @@ export default {
//this.getList();
} else {
if (this.accountDatelist != "") {
this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
}
this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
}
//this.listOutPutQuery.accountDate = this.accountDatelist;
console.log(
"未选择时全部确认出库条件:" + JSON.stringify(this.listOutPutQuery)
@ -403,7 +485,7 @@ export default {
this.$axios
.posts(
"/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut-Pass",
"/api/settleaccount/wmskanbanoutputextend/WmsKanbanOutPut-Pass",
this.listOutPutQuery
)
.then((response) => {
@ -417,55 +499,60 @@ export default {
this.accountDatelist.accountDate = "";
this.dialogFormVisible = false;
this.getList();
this.listLoading = false;
this.formLoading = false;
})
.catch(() => {
this.listLoading = false;
this.formLoading = false;
});
}
},
//
// handleDelete(row){
// var params = [];
// let myalert = ""; //使
// if (row) {
// //
// params.push(row.id);
// myalert = row.name;
// } else {
// //
// this.multipleSelection.forEach((element) => {
// let id = element.id;
// params.push(id);
// });
// myalert = "";
// }
// this.$confirm("" + myalert + "?", "", {
// confirmButtonText: "",
// cancelButtonText: "",
// type: "warning",
// })
// .then(() => {
// this.$axios
// .posts("/api/settleaccount/Job/delete", params)
// .then((response) => {
// const index = this.list.indexOf(row);
// this.$notify({
// title: "",
// message: "",
// type: "success",
// duration: 2000,
// });
// this.getList();
// });
// })
// .catch(() => {
// this.$message({
// type: "info",
// message: "",
// });
// });
// },
handleDelete(row) {
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.listDeleteQuery.billNum = this.listQuery.billNum;
console.log("单据号:" + JSON.stringify(this.listDeleteQuery));
this.$confirm("是否删除" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts(
"/api/settleaccount/wmskanbanoutputextend/WmsOutPutDelete",
this.listDeleteQuery
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "删除成功",
type: "success",
duration: 2000,
});
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
});
},
/** 刷新列表 */
handleHandle(data) {
if (data.type !== "edit") {
@ -543,7 +630,7 @@ export default {
console.log("查询条件:" + JSON.stringify(this.listQuery));
this.$axios
.posts(
"/api/settleaccount/wmskanbanoutput/WmsKanbanDetailList",
"/api/settleaccount/wmskanbanoutputextend/WmsKanbanDetailList",
this.listQuery
)
.then((response) => {
@ -637,7 +724,7 @@ export default {
if (
column.property === "fisQty" ||
column.property === "diffQty" ||
column.property === "stockQty"
column.property === "sockQty"
) {
return { textAlign: "right" };
} else {
@ -649,7 +736,7 @@ export default {
if (
column.property === "fisQty" ||
column.property === "diffQty" ||
column.property === "stockQty"
column.property === "sockQty"
) {
return { textAlign: "right", background: "#FAFAFA" };
} else {
@ -669,3 +756,4 @@ export default {
@import "../../styles/crmtable.scss";
</style>

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

@ -18,13 +18,21 @@
@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
class="filter-item"
size="mini"
type="warning"
icon="el-icon-upload2"
@click="handleCreate"
>生成出库单
</el-button>
</flexbox>
<!--表格渲染-->
@ -87,7 +95,7 @@
:limit.sync="listQuery.MaxResultCount"
@pagination="getList"
/>
<!-- 导入Excel组件 -->
<!-- 导入Excel组件 -->
<importExcel
ref="importexcel"
:show="showExcelImport"
@ -109,6 +117,55 @@
></Detail>
</div>
</el-drawer>
<!--统计功能表单渲染-->
<el-dialog
:visible.sync="dialogFormVisible"
:close-on-click-modal="false"
:title="formTitle"
append-to-body
width="680px"
>
<el-form
ref="formCount"
:inline="true"
:rules="rules"
:model="formCount"
size="mini"
>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="选择版本" required />
</el-col>
<el-col :md="20" :xs="24">
<el-form-item prop="versionValue">
<el-select
v-model="formCount.versionValue"
size="medium"
clearable
style="width: 188px; margin-right: 15px"
placeholder="请选择"
>
<el-option
v-for="item in versionList"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="dialogFormVisible = false"
>取消</el-button
>
<el-button v-loading="formLoading" type="primary" @click="save"
>确认</el-button
>
</div>
</el-dialog>
</div>
</div>
</template>
@ -123,7 +180,7 @@ import { formatTimeToTimestamp } from "@/utils/index";
export default {
name: "sendUnsettledDiffReport",
components: { Pagination, Detail,importExcel },
components: { Pagination, Detail, importExcel },
directives: { permission },
data() {
return {
@ -172,6 +229,12 @@ export default {
MaxResultCount: 15,
},
page: 1,
formCount: {
versionValue: undefined,
},
listExportQuery: {
version: "",
},
dialogFormVisible: false,
multipleSelection: [],
formTitle: "",
@ -190,7 +253,7 @@ export default {
},
created() {
this.getList();
//this.getVersionInfo();
this.getVersionInfo();
},
computed: {
/** 列表字段 */
@ -209,6 +272,57 @@ export default {
},
},
methods: {
save() {
this.$refs.formCount.validate((valid) => {
if (valid) {
this.formLoading = true;
if (
this.formCount.versionValue == "" ||
this.formCount.versionValue == undefined
) {
this.$message({
message: "必须选择版本!",
type: "warning",
});
this.formLoading = false;
return;
}
this.listExportQuery.version = this.formCount.versionValue; //
console.log(
"生成出库单-条件:" + JSON.stringify(this.listExportQuery)
);
this.$axios
.posts(
"/api/settleaccount/wmskanbanoutputextend/WmsKanbanOutPutExtend",
this.listExportQuery
)
.then((res) => {
this.$notify({
title: "成功",
message: "生成成功",
type: "success",
duration: 2000,
});
this.getList();
this.formLoading = false;
this.dialogFormVisible = false;
})
.catch(() => {
this.formLoading = false;
this.dialogFormVisible = false;
});
}
});
},
handleCreate() {
if (this.$refs["formCount"] !== undefined) {
this.$refs["formCount"].resetFields();
}
this.formTitle = "生成出库单";
this.dialogFormVisible = true;
},
handleImportExcel() {
//
this.showExcelImport = true;
@ -277,7 +391,10 @@ export default {
this.listQuery.SkipCount = (this.page - 1) * 15;
}
this.$axios
.posts("/api/settleaccount/wmskanbanoutput/WmsKanbanList", this.listQuery)
.posts(
"/api/settleaccount/wmskanbanoutputextend/WmsKanbanList",
this.listQuery
)
.then((response) => {
this.list = response.items;
//alert(JSON.stringify(response.Items))

70
vue/src/views/ux/billManage/sparePart/index.vue

@ -44,14 +44,14 @@
@click="handleCreateBills()"
>生成出库单(支持批量)</el-button
>
<el-button
<!-- <el-button
class="filter-item"
size="mini"
type="primary"
icon="el-icon-plus"
@click="handleCreateNoBill"
>备件未结明细统计
</el-button>
</el-button> -->
</flexbox>
</div>
<!-- 刷新 -->
@ -404,7 +404,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="采购订单号" />
</el-col>
@ -452,7 +452,6 @@
</el-col>
</el-row>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="厂内零件号" />
@ -587,7 +586,10 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="resetNoBillForm('formNoBill')">重置</el-button>
<el-button v-loading="formNoBillLoading" type="primary" @click="saveNoBill"
<el-button
v-loading="formNoBillLoading"
type="primary"
@click="saveNoBill"
>确认</el-button
>
</div>
@ -957,23 +959,22 @@ export default {
});
return;
} else {
var getbillNum = "";
var getTaskState="";
var getbillNum = "";
var getTaskState = "";
//
this.multipleSelection.forEach((element) => {
let state = element.fileName;
if (state != "" && state != "已确认") {
this.isEdit = true;
getbillNum += state + ",";
}
else if(element.stateName != "Succeeded"){
this.isTaskSuccess=true;
getTaskState+=element.taskId;
} else if (element.stateName != "Succeeded") {
this.isTaskSuccess = true;
getTaskState += element.taskId;
}
});
}
//
if(this.isTaskSuccess == true){
if (this.isTaskSuccess == true) {
this.$message({
message:
"有未成功的任务,不能单击确认!:" +
@ -1045,23 +1046,22 @@ export default {
});
return;
} else {
var getbillNum = "";
var getTaskState="";
var getbillNum = "";
var getTaskState = "";
//
this.multipleSelection.forEach((element) => {
let state = element.fileName;
if (state != "" && state != "已确认") {
this.isEdit = true;
getbillNum += state + ",";
}
else if(element.stateName != "Succeeded"){
this.isTaskSuccess=true;
getTaskState+=element.taskId;
} else if (element.stateName != "Succeeded") {
this.isTaskSuccess = true;
getTaskState += element.taskId;
}
});
}
//
if(this.isTaskSuccess == true){
if (this.isTaskSuccess == true) {
this.$message({
message:
"有未成功的任务,不能单击确认!:" +
@ -1095,7 +1095,9 @@ export default {
}
this.listBillQuery.guids = params;
this.listBillQuery.version = this.JobversionValue;
console.log("大众备件出库单条件:" + JSON.stringify(this.listBillQuery));
console.log(
"大众备件出库单条件:" + JSON.stringify(this.listBillQuery)
);
this.$confirm("是否确认出库" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
@ -1248,7 +1250,8 @@ export default {
this.formLoading = true;
this.listExportQuery.version = this.formCount.versionValue; //
if (this.formCount.purchaseOrderNo != "") {
this.listExportQuery.purchaseOrderNo = this.formCount.purchaseOrderNo; //
this.listExportQuery.purchaseOrderNo =
this.formCount.purchaseOrderNo; //
}
if (this.formCount.sapCode != "") {
this.listExportQuery.sapCode = this.formCount.sapCode; //
@ -1257,9 +1260,7 @@ export default {
this.listExportQuery.begin = this.startTime
? this.startTime
: undefined;
this.listExportQuery.end = this.endTime
? this.endTime
: undefined;
this.listExportQuery.end = this.endTime ? this.endTime : undefined;
console.log(
"大众备件结算核对-导出条件:" + JSON.stringify(this.listExportQuery)
);
@ -1309,7 +1310,8 @@ export default {
: undefined;
console.log(
"大众备件未结明细-导出条件:" + JSON.stringify(this.listNoBillExportQuery)
"大众备件未结明细-导出条件:" +
JSON.stringify(this.listNoBillExportQuery)
);
this.$axios
.gets(
@ -1359,7 +1361,7 @@ export default {
if (this.$refs["formNoBill"] !== undefined) {
this.$refs["formNoBill"].resetFields();
}
this.formTitle = "无条码备件明细报表统计";
this.formTitle = "备件明细报表统计";
this.isEdit = false;
this.formNoBill = {};
this.startTimeNoBill = "";
@ -1478,7 +1480,8 @@ export default {
getList() {
this.listLoading = true;
//
this.listQuery.name = "备件结算输出";
this.listQuery.name = "大众备件结算输出";
this.listQuery.type = this.JobversionValue;
this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery)
.then((response) => {
@ -1501,16 +1504,13 @@ export default {
// });
// },
resetQuery() {},
/** 通过回调控制style */
cellStyle({ row, column, rowIndex, columnIndex }) {
var item = this.list[rowIndex];
if (column.property === "stateName") {
if (item.stateName === "Succeeded") {
return { color: "#71d87f", cursor: "pointer" };
} else if (item.stateName === "Processing") {
return { color: "#d87171", cursor: "pointer" };
} else if (item.stateName === "Failed") {
return { color: "#ff5640", cursor: "pointer" };
if (column.property === "fileName") {
if (item.fileName === "已确认") {
return { color: "#13CE66", cursor: "pointer", fontWeight: 700 };
} else {
return { color: "#FFBA00", cursor: "pointer", fontWeight: 800 };
}
}
return { textAlign: "left" };

22
vue/src/views/ux/billManage/sparePart90/index.vue

@ -471,7 +471,6 @@
>
</div>
</el-dialog>
</div>
</template>
@ -892,7 +891,7 @@ export default {
.then(() => {
this.$axios
.posts(
"/api/settleaccount/wmsSharePartoutput/WmsSharePartOutPutAudit",
"/api/settleaccount/wmsSharePart90output/WmsSharePartOutPutAudit",
params
)
.then((response) => {
@ -974,7 +973,7 @@ export default {
this.listBillQuery.guids = params;
this.listBillQuery.version = this.JobversionValue;
console.log(
"大众备件出库单条件:" + JSON.stringify(this.listBillQuery)
"大众备件数据调整出库单条件:" + JSON.stringify(this.listBillQuery)
);
this.$confirm("是否确认出库" + myalert + "?", "提示", {
confirmButtonText: "确定",
@ -985,7 +984,7 @@ export default {
this.formLoading = true;
this.$axios
.posts(
"/api/settleaccount/wmsSharePartoutput/WmsSharePartOutPut",
"/api/settleaccount/wmsSharePart90output/WmsSharePartOutPut",
this.listBillQuery
)
.then((response) => {
@ -1296,7 +1295,8 @@ export default {
getList() {
this.listLoading = true;
//
this.listQuery.name = "(0-90天)大众备件结算输出";
this.listQuery.name = "大众备件数据调整结算输出";
this.listQuery.type = this.JobversionValue;
this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery)
.then((response) => {
@ -1322,13 +1322,11 @@ export default {
/** 通过回调控制style */
cellStyle({ row, column, rowIndex, columnIndex }) {
var item = this.list[rowIndex];
if (column.property === "stateName") {
if (item.stateName === "Succeeded") {
return { color: "#71d87f", cursor: "pointer" };
} else if (item.stateName === "Processing") {
return { color: "#d87171", cursor: "pointer" };
} else if (item.stateName === "Failed") {
return { color: "#ff5640", cursor: "pointer" };
if (column.property === "fileName") {
if (item.fileName === "已确认") {
return { color: "#13CE66", cursor: "pointer", fontWeight: 700 };
} else {
return { color: "#FFBA00", cursor: "pointer", fontWeight: 800 };
}
}
return { textAlign: "left" };

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

@ -1,4 +1,4 @@
<!--FIS发运数据对比输出表-明细数据-->
<!---明细数据-->
<template>
<div class="cr-body-content">
<flexbox class="content-header">
@ -16,6 +16,19 @@
class="search-container"
@value-change="JobVersionValue"
></JobSelectVerson>
<el-select
v-model="PurchaseDateValue"
clearable
style="width: 188px; margin-left: -10px;margin-right:5px"
placeholder="请选择采购日期"
>
<el-option
v-for="item in PurchaseDateList"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
<el-button
class="filter-item"
type="success"
@ -101,6 +114,30 @@
{{ scope.column.label }}
</template>
</el-table-column>
<el-table-column
prop="outputQty"
label="出库数量"
v-model="outPutQtylist.outputQty"
width="100"
>
<template slot-scope="list">
<el-input
size="small"
v-model="list.row.outPutQty"
@change="handleEdit(list.$index, list.row)"
></el-input>
</template>
</el-table-column>
<el-table-column label="操作" align="center">
<template slot-scope="list">
<el-button
type="primary"
v-if="(list.$index = 1)"
@click="handle(list.row)"
>确定</el-button
>
</template>
</el-table-column>
</el-table>
<div class="table-footer">
<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
@ -119,7 +156,7 @@
:title="formTitle"
width="700px"
>
<el-form
<el-form
ref="accountDatelist"
:inline="true"
:model="accountDatelist"
@ -145,9 +182,7 @@
<el-button
v-loading="formLoading"
type="primary"
@click="handleCreateBills()"
>确认</el-button
>
</div>
@ -183,7 +218,7 @@ export default {
erpMaterialCode: [
{ required: true, message: "必须输入!", trigger: "blur" },
],
accountDate: [
accountDate: [
{ required: true, message: "日期必须输入!", trigger: "blur" },
],
},
@ -208,6 +243,7 @@ export default {
{ value: "3", label: "不能出库" },
{ value: "4", label: "取消出库" },
],
PurchaseDateList:[],
//
filterObj: {
type: Object,
@ -232,24 +268,29 @@ export default {
version: "",
guids: "",
billNum: "",
accountDate:""
accountDate: "",
},
listDeleteQuery: {
billNum: "",
},
page: 1,
JobversionValue: "",
PurchaseDateValue:"",
JobversionValueVerson: "",
dialogFormVisible: false,
multipleSelection: [],
outPutQtylist: {
outputQty: "",
taskId: "",
},
formTitle: "",
drawer: false,
showExcelImport: false,
tableHeight: document.documentElement.clientHeight - 230,
isEdit: false,
accountDatelist:{
accountDate:""
}
accountDatelist: {
accountDate: "",
},
};
},
mounted() {
@ -289,20 +330,30 @@ export default {
prop: "version",
width: 110,
});
tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 100 });
tempsTabs.push({
label: "零件号",
label: "采购订单号",
prop: "orderBillNum",
width: 150,
});
tempsTabs.push({
label: "Sap编码",
prop: "materialCode",
width: 150,
});
tempsTabs.push({ label: "零件描述", prop: "materialDesc", width: 250 });
tempsTabs.push({ label: "物料组", prop: "materialGroup", width: 220 });
tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 100 });
tempsTabs.push({ label: "数量", prop: "qty", width: 100 });
tempsTabs.push({ label: "寄售库存", prop: "stockQty", width: 100 });
tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 });
tempsTabs.push({ label: "状态", prop: "state", width: 100 });
return tempsTabs;
},
},
methods: {
//
handleEdit(index, row) {
console.log(index, row);
},
//
JobVersionValue(params) {
//
@ -317,6 +368,46 @@ export default {
this.listQuery.Filters.push(filter);
this.getList();
},
handle(row) {
this.multipleSelection.forEach((element) => {
let outPutQty = element.outputQty;
});
// if (row.outPutQty > row.stockQty) {
// this.$message({
// message: ",",
// type: "warning",
// });
// } else {
if (row.branchId != "") {
this.listOutPutQuery.branchId = row.id;
}
if (row.outPutQty != "") {
this.listOutPutQuery.outPutQty = row.outPutQty;
}
console.log(
"大众备件调整结算数量按钮:" + JSON.stringify(this.listOutPutQuery)
);
//"taskId": "3fa85f64-5717-4562-b3fc-2c963f66afa6","outPutQty": 0
this.$axios
.posts(
"/api/settleaccount/wmsSharePartoutput/WmsSharePartOutPutModify",
this.listOutPutQuery
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "操作成功",
type: "success",
duration: 2000,
});
this.getList();
})
.catch(() => {
this.listLoading = false;
});
//}
},
//
handleCancelBills(row) {
if (this.multipleSelection.length == 0) {
@ -374,20 +465,20 @@ export default {
});
});
},
print() {
print() {
this.dialogFormVisible = true;
if (this.$refs["accountDatelist"] !== undefined) {
if (this.$refs["accountDatelist"] !== undefined) {
this.$refs["accountDatelist"].resetFields();
}
},
//
handleCreateBills(row) {
this.dialogFormVisible = true;
this.listLoading = true;
this.listOutPutQuery.guids = [];
this.listOutPutQuery.version = this.customerInfo.version;
this.listOutPutQuery.billNum = this.customerInfo.parentId;
if (this.accountDatelist.accountDate == "") {
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",
@ -397,8 +488,8 @@ export default {
//this.getList();
} else {
if (this.accountDatelist != "") {
this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
}
this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
}
//this.listOutPutQuery.accountDate = this.accountDatelist;
console.log(
"未选择时全部确认出库条件:" + JSON.stringify(this.listOutPutQuery)
@ -406,7 +497,7 @@ export default {
this.$axios
.posts(
"/api/settleaccount/WMSHQFKanbanoutput/WmsHQFKanbanOutPut-Pass",
"/api/settleaccount/wmsSharePartoutput/WmsSharePartOutPut-Pass",
this.listOutPutQuery
)
.then((response) => {
@ -420,56 +511,59 @@ export default {
this.accountDatelist.accountDate = "";
this.dialogFormVisible = false;
this.getList();
this.listLoading = false;
this.formLoading = false;
})
.catch(() => {
this.listLoading = false;
this.formLoading = false;
});
}
},
//
handleDelete(row){
handleDelete(row) {
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.listDeleteQuery.billNum = this.listQuery.billNum ;
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.listDeleteQuery.billNum = this.listQuery.billNum;
console.log("单据号:" + JSON.stringify(this.listDeleteQuery));
this.$confirm("是否删除" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts("/api/settleaccount/wmsSharePartoutput/WmsOutPutDelete", this.listDeleteQuery)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "删除成功",
type: "success",
duration: 2000,
});
this.getList();
this.$confirm("是否删除" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts(
"/api/settleaccount/wmsSharePartoutput/WmsOutPutDelete",
this.listDeleteQuery
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "删除成功",
type: "success",
duration: 2000,
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
});
},
/** 刷新列表 */
handleHandle(data) {
@ -548,7 +642,7 @@ export default {
console.log("查询条件:" + JSON.stringify(this.listQuery));
this.$axios
.posts(
"/api/settleaccount/wmsjitoutput/WmsJitDetailList",
"/api/settleaccount/wmsSharePartoutput/WmsSharePartDetailList",
this.listQuery
)
.then((response) => {

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

@ -122,7 +122,7 @@ import importExcel from "@/components/ImportExcel-base";
import { formatTimeToTimestamp } from "@/utils/index";
export default {
name: "sendUnsettledDiffReport",
name: "Sparepartoutorder",
components: { Pagination, Detail,importExcel },
directives: { permission },
data() {

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

@ -401,12 +401,12 @@ export default {
}
//this.listOutPutQuery.accountDate = this.accountDatelist;
console.log(
"未选择时全部确认出库条件:" + JSON.stringify(this.listOutPutQuery)
"全部确认出库条件:" + JSON.stringify(this.listOutPutQuery)
);
this.$axios
.posts(
"/api/settleaccount/WMSHQFKanbanoutput/WmsHQFKanbanOutPut-Pass",
"/api/settleaccount/wmsSharePart90output/WmsSharePartOutPut-Pass",
this.listOutPutQuery
)
.then((response) => {
@ -548,7 +548,7 @@ export default {
console.log("查询条件:" + JSON.stringify(this.listQuery));
this.$axios
.posts(
"/api/settleaccount/wmsjitoutput/WmsJitDetailList",
"/api/settleaccount/wmsSharePart90output/WmsSharePartDetailList",
this.listQuery
)
.then((response) => {

4
vue/src/views/ux/billManage/sparepartOutOrder90/index.vue

@ -122,12 +122,12 @@ import importExcel from "@/components/ImportExcel-base";
import { formatTimeToTimestamp } from "@/utils/index";
export default {
name: "sendUnsettledDiffReport",
name: "Sparepartoutorder90",
components: { Pagination, Detail,importExcel },
directives: { permission },
data() {
return {
crmType: "sparepartoutorder",
crmType: "sparepartoutorder90",
rules: {
// version: [{ required: true, message: "", trigger: "change" }],
// beginTime: [{ required: true, message: "", trigger: "change" }],

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

@ -119,7 +119,7 @@
:title="formTitle"
width="700px"
>
<el-form
<el-form
ref="accountDatelist"
:inline="true"
:model="accountDatelist"
@ -138,7 +138,6 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="dialogFormVisible = false"
>取消</el-button
@ -306,7 +305,7 @@ export default {
methods: {
print() {
this.dialogFormVisible = true;
if (this.$refs["accountDatelist"] !== undefined) {
if (this.$refs["accountDatelist"] !== undefined) {
this.$refs["accountDatelist"].resetFields();
}
},
@ -384,7 +383,7 @@ export default {
//
handleCreateBills(row) {
this.dialogFormVisible = true;
this.listLoading = true;
this.formLoading = true;
this.listOutPutQuery.guids = [];
this.listOutPutQuery.version = this.customerInfo.version;
this.listOutPutQuery.billNum = this.customerInfo.parentId;
@ -397,33 +396,35 @@ export default {
return;
//this.getList();
} else {
if (this.accountDatelist != "") {
this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
}
//this.listOutPutQuery.accountDate = this.accountDatelist;
console.log("全部确认出库条件:" + JSON.stringify(this.listOutPutQuery));
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/wmsjitoutput/WmsJitOutPut-Pass",
this.listOutPutQuery
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "生成成功",
type: "success",
duration: 2000,
});
this.accountDatelist.accountDate = "";
this.$axios
.posts(
"/api/settleaccount/wmsjitoutput/WmsJitOutPut-Pass",
this.listOutPutQuery
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "生成成功",
type: "success",
duration: 2000,
});
this.accountDatelist.accountDate = "";
this.dialogFormVisible = false;
this.getList();
this.listLoading = false;
})
.catch(() => {
this.listLoading = false;
});
this.getList();
this.formLoading = false;
})
.catch(() => {
this.formLoading = false;
});
}
},
//
@ -521,48 +522,51 @@ export default {
}
},
//
handleDelete(row){
handleDelete(row) {
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.listDeleteQuery.billNum = this.listQuery.billNum ;
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.listDeleteQuery.billNum = this.listQuery.billNum;
console.log("单据号:" + JSON.stringify(this.listDeleteQuery));
this.$confirm("是否删除" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts("/api/settleaccount/wmsjitoutput/WmsOutPutDelete", this.listDeleteQuery)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "删除成功",
type: "success",
duration: 2000,
});
this.getList();
this.$confirm("是否删除" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts(
"/api/settleaccount/wmsjitoutput/WmsOutPutDelete",
this.listDeleteQuery
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "删除成功",
type: "success",
duration: 2000,
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
});
},
/** 刷新列表 */
handleHandle(data) {

14
vue/src/views/ux/vw/dataInput/SparePart/index.vue

@ -206,20 +206,18 @@ export default {
MaxResultCount: 15,
},
listQuery: {
Filters: [
Filters: [
{
logic: 0,
column: "Enabled",
column: "Extend",
action: 0,
value: "true",
value: "not90",
}, //
],
//OrgID:"",
SkipCount: 0,
MaxResultCount: 15,
version: "",
site: "TH",
userId: "00000000-0000-0000-0000-000000000000",
version: ""
},
listExportQuery: {
Filters: [
@ -444,9 +442,9 @@ export default {
getVersionInfo() {
//
//this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 1000;
this.listExportQuery.SkipCount = (this.page - 1) * 1000;
this.$axios
.posts("/api/settleaccount/SparePart/listVersion", this.listQuery)
.posts("/api/settleaccount/SparePart/listVersion", this.listExportQuery)
.then((response) => {
this.versionList = [];
response.items.forEach((element) => {

10
vue/src/views/ux/vw/dataInput/SparePart90/index.vue

@ -209,9 +209,9 @@ export default {
Filters: [
{
logic: 0,
column: "Enabled",
column: "Extend",
action: 0,
value: "true",
value: "is90",
}, //
],
//OrgID:"",
@ -397,9 +397,9 @@ export default {
getVersionInfo() {
//
//this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 1000;
this.listExportQuery.SkipCount = (this.page - 1) * 1000;
this.$axios
.posts("/api/settleaccount/SparePart/listVersion", this.listQuery)
.posts("/api/settleaccount/SparePart/listVersion", this.listExportQuery)
.then((response) => {
this.versionList = [];
response.items.forEach((element) => {
@ -462,7 +462,7 @@ export default {
}
console.log("列表查询条件:" + JSON.stringify(this.listQuery));
this.$axios
.posts("/api/settleaccount/SparePart/list90", this.listQuery)
.posts("/api/settleaccount/SparePart/list", this.listQuery)
.then((response) => {
this.list = response.items;
this.totalCount = response.totalCount;

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

@ -382,13 +382,13 @@ export default {
});
} else {
if (row.branchId != "") {
this.listOutPutQuery.branchId = row.branchId;
this.listOutPutQuery.branchId = row.id;//ID
}
if (row.outPutQty != "") {
this.listOutPutQuery.outPutQty = row.outPutQty;
}
console.log(
"111111结算数量按钮:" + JSON.stringify(this.listOutPutQuery)
"红旗H平台结算数量按钮:" + JSON.stringify(this.listOutPutQuery)
);
//"taskId": "3fa85f64-5717-4562-b3fc-2c963f66afa6","outPutQty": 0
this.$axios

Loading…
Cancel
Save