Browse Source

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

# Conflicts:
#	vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue
#	vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue
branch_ccpg_220107
xunyu.guo 3 years ago
parent
commit
5c50bf914c
  1. 12
      vue/src/components/ImportExcel-base/index.vue
  2. 10
      vue/src/router/modules/basedata.js
  3. 2
      vue/src/router/modules/hq_menu.js
  4. 1
      vue/src/router/modules/hq_out_order.js
  5. 2
      vue/src/router/modules/vw_menu.js
  6. 1
      vue/src/router/modules/vw_out_order.js
  7. 2
      vue/src/views/role/index.vue
  8. 23
      vue/src/views/ux/basedata/priceList/index.vue
  9. 567
      vue/src/views/ux/basedata/spareparts/index.vue
  10. 2
      vue/src/views/ux/vw/dataInput/hq_f_outorder/detail.vue
  11. 75
      vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue
  12. 99
      vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue
  13. 17
      vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue
  14. 63
      vue/src/views/ux/vw/dataInput/hq_m_checkout/detail.vue
  15. 1
      vue/src/views/ux/vw/dataInput/hq_m_outorder/detail.vue
  16. 1
      vue/src/views/ux/vw/dataInput/hq_y_checkout/detail.vue
  17. 94
      vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue
  18. 38
      vue/static/tableFieldForSearch.json

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

@ -284,7 +284,7 @@ export default {
return this.stepsActive == 1;
},
getMoudleDisable() {
if (this.crmType == "prebatch") {
if (this.crmType == "priceList" || this.crmType == "spareparts") {
//
this.isEditYearMont = true;
this.isEditFactory = true;
@ -298,6 +298,8 @@ export default {
return (
{
invoice: "大众发票汇总",
priceList: "标准价格单",
spareparts: "备件价格单",
vWKanBan: "大众看板结算明细",
scrapClaims: "CP7报废和索赔",
sparePart: "大众备件结算明细",
@ -338,6 +340,8 @@ export default {
return (
{
invoice: "/api/settleaccount/Invoices/ExcelImport", //
priceList: "/api/settleaccount/PriceList/ExcelImport-Map", //
spareparts: "/api/SettleAccount/PriceListBJ/ExcelImport-Map", //
vWKanBan: "/api/settleaccount/VWKanBan/ExcelImport", //
scrapClaims: "/api/settleaccount/ScrapClaims/ExcelImport", //CP7
sparePart: "/api/settleaccount/SparePart/ExcelImport", //
@ -563,7 +567,11 @@ export default {
fd.append("period", "03");
fd.append("customerCode", "03");
fd.append("factory", this.YearMonthValue);
fd.append("version", this.versionValue);
if (this.crmType == "priceList" || this.crmType == "spareparts") {
fd.append("version", "202110");
} else {
fd.append("version", this.versionValue);
}
const webapi = this.getWebApi;
this.$axios
.posts(webapi, fd)

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

@ -49,6 +49,16 @@ const basedataRouter = {
icon: '结算'
}
},
{
path: 'spareparts',
component: () => import('@/views/ux/basedata/spareparts/index'),
name: 'Spareparts',//命名路由
meta: {
title: '备件价格单',
roles: ['SettleAccount.PriceLists'],
icon: '结算'
}
},
// {
// path: 'wms-kanban',
// component: () => import('@/views/ux/vw/dataInput/wmsKanban'),

2
vue/src/router/modules/hq_menu.js

@ -9,7 +9,7 @@ const hqMenudataRouter = {
meta: {
title: '红旗工厂',
icon: '红旗',
roles: ['SettleAccount.WMSHQ'],
roles: ['SettleAccount.WMSHQ','SettleAccount.HQ_HPlatform', 'SettleAccount.HQ_MPlatform','SettleAccount.HQ_FPlatform','SettleAccount.BT_Carlatform','SettleAccount.Reports'],
keepAlive: false,
},
children: [

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

@ -13,6 +13,7 @@ const hqOutOrderDataRouter = {
index: 0,
type: 'crm',
icon: '单据导入',
roles: ['SettleAccount.WMSHQ'],//控制页面角色(可以设置多个角色)
keepAlive: false,
},
children: [

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

@ -9,7 +9,7 @@ const vwMenudataRouter = {
meta: {
title: '大众工厂',
icon: 'vw',
//roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns', 'SettleAccount.HQKBs', 'SettleAccount.HQSpecKBs'],
roles: ['SettleAccount.Invoices', 'SettleAccount.SettleAccounts', 'SettleAccount.UnSettleAccount', 'SettleAccount.VWKanBan', 'SettleAccount.SparePart', 'SettleAccount.ScrapClaims', 'SettleAccount.Reports'],
keepAlive: false,
},
children: [

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

@ -13,6 +13,7 @@ const vwOutOrderDataRouter = {
index: 0,
type: 'crm',
icon: '单据导入',
roles: ['SettleAccount.WMSJIT'],
keepAlive: false,
},
children: [

2
vue/src/views/role/index.vue

@ -321,7 +321,7 @@ export default {
if (this.isEdit) {
this.$axios
.puts("/api/identity/roles/" + this.form.id, this.form)
.then((response) => {
.then((response) => {
this.formLoading = false;
this.$notify({
title: "成功",

23
vue/src/views/ux/basedata/priceList/index.vue

@ -9,6 +9,16 @@
@value-change="selectValue"
></XhJSSelect>
<el-button
class="filter-item"
size="mini"
type="warning"
icon="el-icon-upload2"
@click="handleImportExcel()"
v-permission="['SettleAccount.PriceLists.Create']"
>导入文件Excel
</el-button>
<el-input
v-model="searchContent"
clearable
@ -119,22 +129,12 @@
import Pagination from "@/components/Pagination";
import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../components/CRMTableHead";
import importExcel from "@/components/ImportExcel-vw";
import importExcel from "@/components/ImportExcel-base";
import Lockr from "lockr";
import { downloadFile } from "@/utils/crmindex.js";
import XhJSSelect from "@/components/CreateCom/Xh-JS-Select.vue";
import moment from "moment";
//
const bomUnit = [
{ key: 0, display_name: "PC" },
{ key: 1, display_name: "TON" },
{ key: 2, display_name: "Other" },
];
const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
acc[cur.key] = cur.display_name;
return acc;
}, {});
export default {
name: "PriceList",
@ -222,7 +222,6 @@ export default {
// userId: "00000000-0000-0000-0000-000000000000",
// },
page: 1,
bomUnit,
multipleSelection: [],
drawer: false,
tableHeight: document.documentElement.clientHeight - 260,

567
vue/src/views/ux/basedata/spareparts/index.vue

@ -0,0 +1,567 @@
<!--备件价格单信息页-->
<template>
<div class="cr-body-content">
<flexbox class="content-header">
<XhJSSelect
:options="versionList"
style="width: 200px"
class="search-container"
@value-change="selectValue"
></XhJSSelect>
<el-button
class="filter-item"
size="mini"
type="warning"
icon="el-icon-upload2"
@click="handleImportExcel()"
v-permission="['SettleAccount.PriceLists.Create']"
>导入文件Excel
</el-button>
<el-input
v-model="searchContent"
clearable
size="small"
placeholder="按照物料编号搜索..."
style="width: 200px"
class="search-container"
@keyup.enter.native="handleFilter"
/>
<el-button
size="mini"
type="success"
icon="el-icon-search"
@click="handleFilter"
>搜索
</el-button>
<el-button
class="filter-item"
size="mini"
type="warning"
icon="el-icon-bottom"
@click="handleCommand()"
>导出Excel
</el-button>
<!--表格头组件filter查询-->
<c-r-m-table-head
ref="crmTableHead"
:crm-type="crmType"
@handle="handleHandle"
@filter="handleFilters"
>
</c-r-m-table-head>
<!-- <el-dropdown size="small" class="filter-item" @command="handleCommand">
<span class="el-dropdown-link">
导出数据<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="excel" icon="el-icon-plus"
>导出Excel</el-dropdown-item
>
<el-dropdown-item command="csv" icon="el-icon-circle-plus"
>导出Csv</el-dropdown-item
>
</el-dropdown-menu>
</el-dropdown> -->
</flexbox>
<div class="l-table">
<!--表格渲染-->
<el-table
ref="multipleTable"
v-loading="listLoading"
element-loading-text="拼命加载中..."
element-loading-spinner="el-icon-loading"
class="cr-table"
:data="list"
:height="tableHeight"
:cell-style="cellStyle"
:header-cell-style="headerRowStyle"
size="small"
stripe
border
highlight-current-row
style="width: 100%"
@sort-change="sortChange"
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
>
<el-table-column
v-for="(item, index) in getDefaultField"
:key="index"
:prop="item.prop"
:label="item.label"
:min-width="item.width"
:formatter="fieldFormatter"
sortable="custom"
show-overflow-tooltip
:gutter="0"
>
<template slot="header" slot-scope="scope">
{{ scope.column.label }}
</template>
</el-table-column>
</el-table>
</div>
<div class="table-footer">
<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
<pagination
v-show="totalCount > 0"
:total="totalCount"
:page.sync="page"
:limit.sync="listQuery.MaxResultCount"
@pagination="getList"
/>
<!-- 导入Excel组件 -->
<importExcel
ref="importexcel"
:show="showExcelImport"
:crmType="crmType"
@close="importExcelData"
/>
</div>
</div>
</template>
<script>
import Pagination from "@/components/Pagination";
import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../components/CRMTableHead";
import importExcel from "@/components/ImportExcel-base";
import Lockr from "lockr";
import { downloadFile } from "@/utils/crmindex.js";
import XhJSSelect from "@/components/CreateCom/Xh-JS-Select.vue";
import moment from "moment";
//
const bomUnit = [
{ key: 0, display_name: "PC" },
{ key: 1, display_name: "TON" },
{ key: 2, display_name: "Other" },
];
const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
acc[cur.key] = cur.display_name;
return acc;
}, {});
export default {
name: "Spareparts",
components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
directives: { permission },
filters: {
IsCustomerSignFilter(status) {
//
const statusMap = {
true: "是",
false: "否",
};
return statusMap[status];
},
},
props: {
customerInfos: {
type: Array,
default: () => {
return [];
},
},
},
data() {
return {
crmType: "spareparts",
versionValue: "",
versionList: [], //
searchContent: "", //
showExcelImport: false,
form: {},
drawer: false,
list: null,
totalCount: 0,
listLoading: true,
customerInfo: {
bomId: "",
},
//
filterObj: {
type: Object,
default: () => {
return {};
},
},
// listQuery: {
// Filters: [
// {
// "logic": 0,
// "column": "enabled",
// "action": 0,
// "value": "true"
// }//
// ],
// //OrgID:"",
// "SkipCount": 0,
// "MaxResultCount": 15
// },
listQuery: {
Filters: [
{
logic: 0,
column: "enabled",
action: 0,
value: "true",
}, //
],
SkipCount: 0,
MaxResultCount: 15,
ParentId: null,
fileType: 0,
userId: "00000000-0000-0000-0000-000000000000",
},
listVersionQuery: {
SkipCount: 0,
MaxResultCount: 15,
fileType: 0,
},
// listVersionQuery: {
// SkipCount: 0,
// MaxResultCount: 15,
// ParentId: null,
// fileType: 0,
// userId: "00000000-0000-0000-0000-000000000000",
// },
page: 1,
bomUnit,
multipleSelection: [],
drawer: false,
tableHeight: document.documentElement.clientHeight - 260,
};
},
mounted() {
var self = this;
window.onresize = function () {
var offsetHei = document.documentElement.clientHeight;
self.tableHeight = offsetHei - 190;
};
},
created() {
this.getVersionInfo();
this.getList();
},
// watch: {
// customerInfos: {
// handler(newVal) {
// if (newVal == "" || newVal == "undefined") {
// //TODO
// } else {
// newVal.forEach((element) => {
// this.customerInfo.bomId = element.BomId;
// });
// if (this.customerInfo.bomId != "") {
// this.getList();
// }
// }
// },
// },
// },
computed: {
getDefaultField() {
var tempsTabs = [];
tempsTabs.push({ label: "版本", prop: "version", width: 120 });
tempsTabs.push({
label: "物料编号",
prop: "materialCode",
width: 230,
});
// tempsTabs.push({
// label: "",
// prop: "type",
// width: 100,
// });
tempsTabs.push({
label: "价格",
prop: "price",
width: 100,
});
// tempsTabs.push({ label: "", prop: "beginDate", width: 120 });
// tempsTabs.push({ label: "", prop: "endDate", width: 120 });
return tempsTabs;
},
},
methods: {
selectValue(params) {
//
this.versionValue = params.value;
this.getList();
},
handleCommand(command) {
if (this.versionValue === "") {
this.$message.error("请先选择版本!");
return;
}
this.listQuery.fileType = 1; //0csv,1excel
/* switch (command) {
case "excel":
this.listQuery.fileType = 1; //0csv,1excel
break;
case "csv":
this.listQuery.fileType = 0; //0csv,1excel
break;
default:
//
break;
} */
this.listLoading = true;
/* if (this.versionValue === "") {
this.$message.error("必需选择版本!");
this.listLoading = false;
return;
} */
if (this.versionValue != "") {
this.listQuery.ParentId = this.versionValue;
} else {
this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
}
this.listQuery.userId = Lockr.get("loginUserInfo").userId;
console.log("产品结构导出:" + JSON.stringify(this.listQuery));
this.$axios
.posts("/api/settleaccount/PriceListBJ/Export", this.listQuery)
.then((res) => {
let fileNameOfProject = res;
this.$axios
.BolbGets(
"/api/settleaccount/getblobfile/download/" + fileNameOfProject
)
.then((response) => {
if (fileNameOfProject.indexOf("_") != -1) {
let downName =
fileNameOfProject.slice(
0,
fileNameOfProject.lastIndexOf("_")
) +
fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
downloadFile(response, downName);
this.$notify({
title: "成功",
message: "数据-导出成功!",
type: "success",
duration: 2000,
});
} else {
downloadFile(response, fileNameOfProject);
this.$notify({
title: "成功",
message: "数据-导出成功!",
type: "success",
duration: 2000,
});
}
this.listLoading = false;
});
});
},
selectOptionsChange(item) {
this.getList();
},
importExcelData() {
//
this.showExcelImport = false;
this.getVersionInfo();
//this.getList();
},
getVersionInfo() {
//
this.listLoading = true;
this.listVersionQuery.SkipCount = (this.page - 1) * 1000;
this.$axios
.posts(
"/api/settleaccount/PriceListBJ/versionlist",
this.listVersionQuery
)
.then((response) => {
this.versionList = [];
response.items.forEach((element) => {
let options = {};
options.value = element.id;
options.label = element.version;
this.versionList.push(options);
});
if (JSON.stringify(this.versionList) != "[]") {
//
this.versionValue = this.versionList[0].value;
this.getList();
}
//this.totalCount = response.totalCount;
setTimeout(() => {
//
this.listLoading = false;
}, 500);
})
.catch(() => {
this.listLoading = false;
});
},
handleImportExcel() {
//
this.showExcelImport = true;
this.$refs.importexcel.handleImportExcelClick();
},
/** 刷新列表 */
handleHandle(data) {
if (data.type !== "edit") {
this.getList();
}
},
/** 格式化字段 */
fieldFormatter(row, column) {
if (column.property === "projectRole") {
return { 0: "是", 1: "否" }[row[column.property]];
}
if (column.property == "beginDate" || column.property == "endDate") {
var date = row[column.property];
if (date == undefined) {
return "";
}
return moment(date).format("YYYY-MM-DD HH:mm:ss");
}
return row[column.property] || "--";
},
roleFilter(type) {
return projectTypeKeyValue[type];
},
getList() {
this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 10;
if (this.listQuery.Sorting === "") {
this.listQuery.Sorting = "materialCode ascending";
}
if (this.versionValue != "") {
this.listQuery.ParentId = this.versionValue;
} else {
this.listQuery.ParentId = "00000000-0000-0000-0000-000000000000";
}
this.$axios
.posts("/api/settleaccount/PriceListBJ/list", this.listQuery)
.then((response) => {
this.list = response.items;
this.totalCount = response.totalCount;
this.listQuery.Sorting = "";
setTimeout(() => {
//
this.listLoading = false;
}, 500);
})
.catch(() => {
this.listLoading = false;
});
},
fetchData(id) {
//
this.$axios
.gets("/api/settleaccount/PriceListBJ/" + id)
.then((response) => {
this.form = response;
});
},
/** 多项筛选操作 */
/** 筛选操作 */
handleFilters(data) {
if (data === null) {
this.listQuery.Filters = [];
this.getList(); //
} else {
this.filterObj = data;
console.log("筛选" + JSON.stringify(data));
var offsetHei = document.documentElement.clientHeight;
var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
this.tableHeight = offsetHei - removeHeight;
this.currentPage = 1;
let Filter = [];
data.forEach((item) => {
let filter = {};
if (item.formType === "datetime" || item.formType === "datetime") {
// (datetime >= a and datetime <=b)
filter["Column"] = item.fieldName;
filter["Logic"] = 0;
filter["Value"] = item.value[0];
filter["Action"] = item.action;
Filter.push(filter);
if (item.value[1] != null) {
filter["Value"] = item.value[1];
filter["Action"] = 5;
Filter.push(filter);
}
} else {
filter["Column"] = item.fieldName;
filter["Value"] = item.value;
filter["Logic"] = 0;
filter["Action"] = item.action;
Filter.push(filter);
}
});
console.log("筛选条件" + JSON.stringify(Filter));
this.listQuery.Filters = Filter;
this.getList();
}
},
handleFilter() {
this.page = 1;
this.getList();
this.listQuery.Filters = [];
if (this.searchContent != "") {
var column = "materialCode";
let filter = {
logic: 0,
column: column,
action: 6,
value: this.searchContent,
};
this.listQuery.Filters.push(filter);
}
this.getList();
},
resetQuery() {},
sortChange(data) {
const { prop, order } = data;
if (!prop || !order) {
this.handleFilter();
return;
}
this.listQuery.Sorting = prop + " " + order;
this.handleFilter();
},
handleSelectionChange(val) {
this.multipleSelection = val;
},
/** 通过回调控制style */
cellStyle({ row, column, rowIndex, columnIndex }) {
if (column.property === "qty") {
return { textAlign: "right" };
} else {
return { textAlign: "left" };
}
},
/** 通过回调控制表头style */
headerRowStyle({ row, column, rowIndex, columnIndex }) {
if (column.property === "qty") {
return { textAlign: "right", background: "#FAFAFA" };
} else {
return { textAlign: "left", background: "#FAFAFA" };
}
},
handleRowClick(row, column, event) {
this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row);
},
},
};
</script>
<style lang="scss" scoped>
@import "../../styles/crmtable.scss";
</style>

2
vue/src/views/ux/vw/dataInput/hq_f_outorder/detail.vue

@ -243,6 +243,7 @@ export default {
dialogFormVisible: false,
multipleSelection: [],
formTitle: "",
stockQty: "",
drawer: false,
showExcelImport: false,
tableHeight: document.documentElement.clientHeight - 230,
@ -426,6 +427,7 @@ export default {
this.dialogFormVisible = false;
this.getList();
this.listLoading = false;
this.dialogFormVisible = false;
})
.catch(() => {
this.listLoading = false;

75
vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue

@ -102,15 +102,7 @@
{{ scope.column.label }}
</template>
</el-table-column>
<el-table-column prop="OutPutQty" label="出库数量" width="100">
<template slot-scope="scope">
<el-input
size="small"
v-model="scope.row.deliverytype"
@change="handleEdit(scope.$index, scope.row)"
></el-input>
</template>
</el-table-column>
<el-table-column
prop="state"
:formatter="fieldFormatter"
@ -118,6 +110,15 @@
width="100"
>
</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;"-->
@ -248,7 +249,9 @@ export default {
version: "",
guids: "",
billNum: "",
accountDate: "",
accountDate:"",
branchId:"",
outPutQty:"",
},
listDeleteQuery: {
billNum: "",
@ -328,6 +331,51 @@ export default {
},
},
methods: {
//
handleEdit(index, row) {
console.log(index, row);
},
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.branchId;
}
if (row.outPutQty != "") {
this.listOutPutQuery.outPutQty = row.outPutQty;
}
console.log(
"111111结算数量按钮:" + JSON.stringify(this.listOutPutQuery)
);
//"taskId": "3fa85f64-5717-4562-b3fc-2c963f66afa6","outPutQty": 0
this.$axios
.posts(
"/api/settleaccount/wmsHQFSharePartoutput/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;
});
}
},
//
JobVersionValue(params) {
//
@ -496,13 +544,8 @@ export default {
});
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
});
},
/** 刷新列表 */
handleHandle(data) {

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

@ -66,6 +66,7 @@
</c-r-m-table-head>
</flexbox>
<!--表格渲染-->
<el-table
ref="multipleTable"
v-loading="listLoading"
@ -101,12 +102,18 @@
{{ scope.column.label }}
</template>
</el-table-column>
<el-table-column prop="OutPutQty" label="出库数量" width="100">
<template slot-scope="scope">
<el-table-column
prop="outPutQty"
label="出库数量"
v-model="outPutQtylist.outPutQty"
width="100"
>
<template slot-scope="list">
<el-input
size="small"
v-model="scope.row.deliverytype"
@change="handleEdit(scope.$index, scope.row)"
v-model="list.row.outPutQty"
@change="handleEdit(list.$index, list.row)"
></el-input>
</template>
</el-table-column>
@ -114,9 +121,19 @@
prop="state"
:formatter="fieldFormatter"
label="状态"
width="100"
width="100">
>
</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;"-->
@ -239,7 +256,7 @@ export default {
}, //
],
SkipCount: 0,
MaxResultCount: 15,
MaxResultCount: 1000,
billNum: "",
},
listOutPutQuery: {
@ -247,6 +264,8 @@ export default {
guids: "",
billNum: "",
accountDate: "",
branchId: "",
outPutQty: "",
},
listDeleteQuery: {
billNum: "",
@ -257,12 +276,23 @@ export default {
dialogFormVisible: false,
multipleSelection: [],
formTitle: "",
stockQty: "",
qty:"",
drawer: false,
showExcelImport: false,
tableHeight: document.documentElement.clientHeight - 230,
isEdit: false,
accountDatelist: {
accountDate: "",
// materialCode:"",
// state:"",
// extend1:"",
// qty:"",
// outPutQty:"",
},
outPutQtylist: {
outPutQty: "",
taskId: "",
},
};
},
@ -318,7 +348,7 @@ export default {
});
tempsTabs.push({ label: "结算零件号", prop: "extend1", width: 220 });
//tempsTabs.push({ label: "", prop: "extend2", width: 120 });
tempsTabs.push({ label: "寄售库存", prop: "StockQty", width: 100 });
tempsTabs.push({ label: "寄售库存", prop: "stockQty", width: 100 });
tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 });
//tempsTabs.push({ label: "", prop: "state", width: 100 });
@ -326,6 +356,61 @@ export default {
},
},
methods: {
//
handleEdit(index, row) {
console.log(index, row);
},
// rowstyle({ row, rowIndex }) {
// console.log(row, rowIndex);
// let stylejson = {};
// if (this.listOutPutQuery.outPutQty>this.stockQty) {
// stylejson.background = "red";//
// return stylejson;
// } else {
// return "";
// }
// },
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.branchId;
}
if (row.outPutQty != "") {
this.listOutPutQuery.outPutQty = row.outPutQty;
}
console.log(
"111111结算数量按钮:" + JSON.stringify(this.listOutPutQuery)
);
//"taskId": "3fa85f64-5717-4562-b3fc-2c963f66afa6","outPutQty": 0
this.$axios
.posts(
"/api/settleaccount/WmsHQHSharePartoutput/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;
});
}
},
//
JobVersionValue(params) {
//

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

@ -387,6 +387,22 @@ export default {
},
print() {
this.dialogFormVisible = true;
// this.$axios
// .posts(
// "/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPut-Pass",
// this.listOutPutQuery
// )
// .then((response) => {
// const index = this.list.indexOf(row);
// this.$notify({
// title: "",
// message: "",
// type: "success",
// duration: 2000,
// });
// this.getList();
// this.listLoading = false;
// })
},
handleCreateBillsEnd(row)
{
@ -434,6 +450,7 @@ export default {
this.dialogFormVisible = false;
this.getList();
this.listLoading = false;
this.dialogFormVisible = false;
})
.catch(() => {
this.listLoading = false;

63
vue/src/views/ux/vw/dataInput/hq_m_checkout/detail.vue

@ -105,8 +105,8 @@
prop="OutPutQty"
label="出库数量"
width="100">
<template slot-scope="scope">
<el-input size="small" v-model="scope.row.deliverytype" @change="handleEdit(scope.$index, scope.row)"></el-input>
<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
@ -115,6 +115,15 @@
label="状态"
width="100">
</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;"-->
@ -246,7 +255,9 @@ export default {
version: "",
guids: "",
billNum: "",
accountDate:""
accountDate:"",
branchId:"",
outPutQty:"",
},
listDeleteQuery: {
billNum: "",
@ -257,6 +268,7 @@ export default {
dialogFormVisible: false,
multipleSelection: [],
formTitle: "",
stockQty: "",
drawer: false,
showExcelImport: false,
tableHeight: document.documentElement.clientHeight - 230,
@ -326,6 +338,50 @@ export default {
},
},
methods: {
handleEdit(index, row) {
console.log(index, row);
},
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.branchId;
}
if (row.outPutQty != "") {
this.listOutPutQuery.outPutQty = row.outPutQty;
}
console.log(
"111111结算数量按钮:" + JSON.stringify(this.listOutPutQuery)
);
//"taskId": "3fa85f64-5717-4562-b3fc-2c963f66afa6","outPutQty": 0
this.$axios
.posts(
"/api/settleaccount/WmsHQMSharePartoutput/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;
});
}
},
//
JobVersionValue(params) {
//
@ -445,6 +501,7 @@ export default {
this.dialogFormVisible = false;
this.getList();
this.listLoading = false;
this.dialogFormVisible = false;
})
.catch(() => {
this.listLoading = false;

1
vue/src/views/ux/vw/dataInput/hq_m_outorder/detail.vue

@ -430,6 +430,7 @@ export default {
this.dialogFormVisible = false;
this.getList();
this.listLoading = false;
this.dialogFormVisible = false;
})
.catch(() => {
this.listLoading = false;

1
vue/src/views/ux/vw/dataInput/hq_y_checkout/detail.vue

@ -354,6 +354,7 @@ export default {
});
this.getList();
this.listLoading = false;
this.dialogFormVisible = false;
});
})
.catch(() => {

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

@ -105,8 +105,8 @@
prop="OutPutQty"
label="出库数量"
width="100">
<template slot-scope="scope">
<el-input size="small" v-model="scope.row.deliverytype" @change="handleEdit(scope.$index, scope.row)"></el-input>
<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
@ -115,6 +115,13 @@
label="状态"
width="100">
</el-table-column>
<template slot-scope="list">
<el-button
type="primary"
v-if="list.$index=1"
@click="handle(list.row)"
>确定</el-button>
</template>
</el-table>
<div class="table-footer">
<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
@ -249,6 +256,8 @@ export default {
guids: "",
billNum: "",
accountDate: "",
branchId:"",
outPutQty:"",
},
listDeleteQuery: {
billNum: "",
@ -259,6 +268,7 @@ export default {
dialogFormVisible: false,
multipleSelection: [],
formTitle: "",
stockQty: "",
drawer: false,
showExcelImport: false,
tableHeight: document.documentElement.clientHeight - 230,
@ -327,6 +337,85 @@ export default {
},
},
methods: {
handleEdit(index, row) {
console.log(index, row);
},
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.branchId;
}
if (row.outPutQty != "") {
this.listOutPutQuery.outPutQty = row.outPutQty;
}
console.log(
"111111结算数量按钮:" + JSON.stringify(this.listOutPutQuery)
);
//"taskId": "3fa85f64-5717-4562-b3fc-2c963f66afa6","outPutQty": 0
this.$axios
.posts(
"/api/settleaccount/WmsHQMSharePartoutput/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;
});
}
},
//
handleEdit(index, row) {
console.log(index, row);
},
handle(row){
if (row.taskId != "") {
this.listOutPutQuery.taskId = row.taskId;
}
if (row.outPutQty != "") {
this.listOutPutQuery.outPutQty = row.outPutQty;
}
console.log(
"111111结算数量按钮:" + JSON.stringify(this.listOutPutQuery)
);
//"taskId": "3fa85f64-5717-4562-b3fc-2c963f66afa6","outPutQty": 0
this.$axios
.posts(
"/api/settleaccount/WmsHQHSharePartoutput/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;
});
},
//
JobVersionValue(params) {
//
@ -446,6 +535,7 @@ export default {
this.dialogFormVisible = false;
this.getList();
this.listLoading = false;
this.dialogFormVisible = false;
})
.catch(() => {
this.listLoading = false;

38
vue/static/tableFieldForSearch.json

@ -1825,8 +1825,7 @@
"setting": []
}
]
}
,
},
"priceList": {
"id": "31",
"data": [
@ -1862,6 +1861,41 @@
}
]
},
"spareparts": {
"id": "31",
"data": [
{
"fieldId": 0,
"formType": "text",
"name": "价格",
"type": 1,
"value": "",
"fieldType": 1,
"fieldName": "price",
"setting": []
},
{
"fieldId": 1,
"formType": "text",
"name": "物料编号",
"type": 1,
"value": "",
"fieldType": 1,
"fieldName": "materialCode",
"setting": []
},
{
"fieldId": 1,
"formType": "text",
"name": "期间",
"type": 1,
"value": "",
"fieldType": 1,
"fieldName": "version",
"setting": []
}
]
},
"invoice": {
"id": "31",
"data": [

Loading…
Cancel
Save