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

前端提交--房大伟

branch_ccpg_220107
44673626 3 years ago
parent
100d6591cd
commit
0825b90d01
14 changed files with 600 additions and 287 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. 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
View File

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

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

@ -50,13 +50,23 @@ const vwOutOrderDataRouter = {
{ {
path: 'sparepart-out-order', path: 'sparepart-out-order',
component: () => import('@/views/ux/billManage/sparepartOutOrder/index'), component: () => import('@/views/ux/billManage/sparepartOutOrder/index'),
name: 'Invoices',//命名路由 name: 'Sparepartoutorder',//命名路由
meta: { meta: {
title: '大众备件出库单', title: '大众备件出库单',
roles: ['SettleAccount.WMSJIT'], roles: ['SettleAccount.WMSJIT'],
icon: '文件' 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
View File

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

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

@ -18,13 +18,21 @@
@click="handleFilter" @click="handleFilter"
>搜索 >搜索
</el-button> </el-button>
<el-button <!-- <el-button
class="filter-item" class="filter-item"
size="mini" size="mini"
type="warning" type="warning"
icon="el-icon-upload2" icon="el-icon-upload2"
@click="handleImportExcel()" @click="handleImportExcel()"
>导入文件（Excel） >导入文件（Excel）
</el-button> -->
<el-button
class="filter-item"
size="mini"
type="warning"
icon="el-icon-upload2"
@click="handleCreate"
>生成出库单
</el-button> </el-button>
</flexbox> </flexbox>
<!--表格渲染--> <!--表格渲染-->
@ -87,7 +95,7 @@
:limit.sync="listQuery.MaxResultCount" :limit.sync="listQuery.MaxResultCount"
@pagination="getList" @pagination="getList"
/> />
<!-- 导入Excel组件 --> <!-- 导入Excel组件 -->
<importExcel <importExcel
ref="importexcel" ref="importexcel"
:show="showExcelImport" :show="showExcelImport"
@ -109,6 +117,55 @@
></Detail> ></Detail>
</div> </div>
</el-drawer> </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>
</div> </div>
</template> </template>
@ -123,7 +180,7 @@ import { formatTimeToTimestamp } from "@/utils/index";
export default { export default {
name: "sendUnsettledDiffReport", name: "sendUnsettledDiffReport",
components: { Pagination, Detail,importExcel }, components: { Pagination, Detail, importExcel },
directives: { permission }, directives: { permission },
data() { data() {
return { return {
@ -172,6 +229,12 @@ export default {
MaxResultCount: 15, MaxResultCount: 15,
}, },
page: 1, page: 1,
formCount: {
versionValue: undefined,
},
listExportQuery: {
version: "",
},
dialogFormVisible: false, dialogFormVisible: false,
multipleSelection: [], multipleSelection: [],
formTitle: "", formTitle: "",
@ -190,7 +253,7 @@ export default {
}, },
created() { created() {
this.getList(); this.getList();
//this.getVersionInfo(); this.getVersionInfo();
}, },
computed: { computed: {
/** 列表字段 */ /** 列表字段 */
@ -209,6 +272,57 @@ export default {
}, },
}, },
methods: { 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() { handleImportExcel() {
//导入 //导入
this.showExcelImport = true; this.showExcelImport = true;
@ -277,7 +391,10 @@ export default {
this.listQuery.SkipCount = (this.page - 1) * 15; this.listQuery.SkipCount = (this.page - 1) * 15;
} }
this.$axios this.$axios
.posts("/api/settleaccount/wmskanbanoutput/WmsKanbanList", this.listQuery) .posts(
"/api/settleaccount/wmskanbanoutputextend/WmsKanbanList",
this.listQuery
)
.then((response) => { .then((response) => {
this.list = response.items; this.list = response.items;
//alert(JSON.stringify(response.Items)) //alert(JSON.stringify(response.Items))

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Write Preview
Loading…
Cancel
Save