Browse Source

H平台 出库一套代码

branch_ccpg_220107
44673626 3 years ago
parent
commit
fad1e3ee70
  1. 2
      vue/src/components/ImportExcel-base/index.vue
  2. 2
      vue/src/router/index.js
  3. 12
      vue/src/router/modules/hq_menu.js
  4. 64
      vue/src/router/modules/hq_out_order.js
  5. 3
      vue/src/views/ux/vw/dataInput/hq_f/index.vue
  6. 3
      vue/src/views/ux/vw/dataInput/hq_h/index.vue
  7. 621
      vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue
  8. 340
      vue/src/views/ux/vw/dataInput/hq_h_outorder/index.vue
  9. 198
      vue/src/views/ux/vw/dataInput/hq_h_report/index.vue
  10. 1316
      vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue
  11. 3
      vue/src/views/ux/vw/dataInput/hq_m/index.vue
  12. 5
      vue/src/views/ux/vw/dataInput/hq_y/index.vue
  13. 133
      vue/static/tableFieldForSearch.json

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

@ -308,6 +308,7 @@ export default {
vwoutorder: "准时化出库单", vwoutorder: "准时化出库单",
sparepartoutorder: "大众备件出库单", sparepartoutorder: "大众备件出库单",
kanbanoutorder: "大众看板出库单", kanbanoutorder: "大众看板出库单",
HQ_H_OUTORDER:"红旗H平台出库单",
bomdatabase: "产品结构BOM", bomdatabase: "产品结构BOM",
prebatch: "预批量", prebatch: "预批量",
secondaryPriceRatio: "二配结算价格比例", secondaryPriceRatio: "二配结算价格比例",
@ -339,6 +340,7 @@ export default {
hqYPlatform: "/api/settleaccount/BT_Carlatform/ExcelImport", //轿 hqYPlatform: "/api/settleaccount/BT_Carlatform/ExcelImport", //轿
vwoutorder: "/api/settleaccount/wmsjitoutput/ExcelImport", // vwoutorder: "/api/settleaccount/wmsjitoutput/ExcelImport", //
kanbanoutorder: "/api/settleaccount/wmskanbanoutput/ExcelImport", // kanbanoutorder: "/api/settleaccount/wmskanbanoutput/ExcelImport", //
HQ_H_OUTORDER: "/api/settleaccount/WmsHQHKanbanoutput/ExcelImport", //H
sparepartoutorder: sparepartoutorder:
"/api/settleaccount/wmsSharePartoutput/ExcelImport", // "/api/settleaccount/wmsSharePartoutput/ExcelImport", //
bomdatabase: "/api/settleaccount/bom/ExcelImport", bomdatabase: "/api/settleaccount/bom/ExcelImport",

2
vue/src/router/index.js

@ -20,6 +20,7 @@ import vwMenudataRouter from './modules/vw_menu'
import hqMenudataRouter from './modules/hq_menu' import hqMenudataRouter from './modules/hq_menu'
import btcarDataRouter from './modules/bt_menu' import btcarDataRouter from './modules/bt_menu'
import vwOutOrderDataRouter from './modules/vw_out_order' import vwOutOrderDataRouter from './modules/vw_out_order'
import hqOutOrderDataRouter from './modules/hq_out_order'
//import newjitRouter from './modules/newjit-basedata' //import newjitRouter from './modules/newjit-basedata'
import pgfis from './modules/fis' import pgfis from './modules/fis'
import pgfisPrint from './modules/fisprint' import pgfisPrint from './modules/fisprint'
@ -178,6 +179,7 @@ export const asyncRoutes = [
vwMenudataRouter,//大众 vwMenudataRouter,//大众
hqMenudataRouter,//红旗 hqMenudataRouter,//红旗
vwOutOrderDataRouter, vwOutOrderDataRouter,
hqOutOrderDataRouter,
//btcarDataRouter,//一汽轿车 //btcarDataRouter,//一汽轿车
//vwFisDataRouter,//结算与开票数据导入 //vwFisDataRouter,//结算与开票数据导入
//billdataRouter,//销售结算与开票报表 //billdataRouter,//销售结算与开票报表

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

@ -39,7 +39,17 @@ const hqMenudataRouter = {
component: () => import('@/views/ux/vw/dataInput/hq_h_report'), component: () => import('@/views/ux/vw/dataInput/hq_h_report'),
name: 'HQH', name: 'HQH',
meta: { meta: {
title: 'H平台结算差异输出', title: 'H平台核对明细',
//roles: ['SettleAccount.FISs'],
icon: '文件'
}
},
{
path: 'hq-H-sparepart-export',
component: () => import('@/views/ux/vw/dataInput/hq_h_sparepart'),
name: 'HQH',
meta: {
title: 'H平台备件明细',
//roles: ['SettleAccount.FISs'], //roles: ['SettleAccount.FISs'],
icon: '文件' icon: '文件'
} }

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

@ -0,0 +1,64 @@
//大众-FIS结算-路由
import Layout from '@/layout'
const hqOutOrderDataRouter = {
path: '/cpat-order',
component: Layout,
redirect: 'pg',
name: '业务数据',
//hidden: true,
meta: {
//requiresAuth: true,
title: '红旗出库单管理',
index: 0,
type: 'crm',
icon: '单据导入',
keepAlive: false,
},
children: [
{
path: 'hq-h-outorder',
component: () => import('@/views/ux/vw/dataInput/hq_h_outorder'),
name: 'SettleAccount',//命名路由
meta: {
title: '红旗H平台出库单',
roles: ['SettleAccount.SettleAccounts'],//控制页面角色(可以设置多个角色)
icon: '结算'
}
},
// {
// path: 'hq-m-outorder',
// component: () => import('@/views/ux/billManage/kanbanOutOrder/index'),
// name: 'SettleAccount',//命名路由
// meta: {
// title: '大众看板出库单',
// roles: ['SettleAccount.SettleAccounts'],//控制页面角色(可以设置多个角色)
// icon: '结算'
// }
// },
// {
// path: 'hq-f-withoutorder',
// component: () => import('@/views/ux/billManage/kanbanWithOutOrder/index'),
// name: 'SettleAccount',//命名路由
// meta: {
// title: '大众无条码看板出库单',
// roles: ['SettleAccount.SettleAccounts'],//控制页面角色(可以设置多个角色)
// icon: '结算'
// }
// },
// {
// path: 'hq-car-outorder',
// component: () => import('@/views/ux/billManage/sparepartOutOrder/index'),
// name: 'Invoices',//命名路由
// meta: {
// title: '大众备件出库单',
// roles: ['SettleAccount.Invoices'],
// icon: '对比'
// }
// },
]
}
export default hqOutOrderDataRouter

3
vue/src/views/ux/vw/dataInput/hq_f/index.vue

@ -291,7 +291,8 @@ export default {
prop: "acceptanceDate", prop: "acceptanceDate",
width: 170, width: 170,
}); });
tempsTabs.push({ label: "数量", prop: "price", width: 100 }); tempsTabs.push({ label: "数量", prop: "qty", width: 100 });
tempsTabs.push({ label: "单价", prop: "price", width: 100 });
tempsTabs.push({ label: "金额", prop: "amt", width: 100 }); tempsTabs.push({ label: "金额", prop: "amt", width: 100 });
tempsTabs.push({ label: "供应商", prop: "supplier", width: 120 }); tempsTabs.push({ label: "供应商", prop: "supplier", width: 120 });
tempsTabs.push({ tempsTabs.push({

3
vue/src/views/ux/vw/dataInput/hq_h/index.vue

@ -291,7 +291,8 @@ export default {
prop: "acceptanceDate", prop: "acceptanceDate",
width: 170, width: 170,
}); });
tempsTabs.push({ label: "数量", prop: "price", width: 100 }); tempsTabs.push({ label: "数量", prop: "qty", width: 100 });
tempsTabs.push({ label: "单价", prop: "price", width: 100 });
tempsTabs.push({ label: "金额", prop: "amt", width: 100 }); tempsTabs.push({ label: "金额", prop: "amt", width: 100 });
tempsTabs.push({ label: "供应商", prop: "supplier", width: 120 }); tempsTabs.push({ label: "供应商", prop: "supplier", width: 120 });
tempsTabs.push({ tempsTabs.push({

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

@ -0,0 +1,621 @@
<!--红旗H平台出库单-明细数据-->
<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-button
class="filter-item"
type="success"
icon="el-icon-check"
size="mini"
@click="handleCreateBills()"
>确认出库单(支持批量)</el-button
>
<el-button
class="filter-item"
size="mini"
type="warning"
icon="el-icon-download"
@click="handleCancelBills()"
>取消出库(支持批量)
</el-button>
<el-input
v-model="searchContent"
clearable
size="small"
placeholder="按照零件号搜索..."
style="width: 230px"
class="search-container"
@keyup.enter.native="handleFilter"
/>
<el-button
size="mini"
type="success"
icon="el-icon-search"
@click="handleFilter"
>搜索
</el-button>
<!--表格头组件filter查询-->
<c-r-m-table-head
ref="crmTableHead"
:crm-type="crmType"
@handle="handleHandle"
@filter="handleFilters"
>
</c-r-m-table-head>
</flexbox>
<!--表格渲染-->
<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 type="selection" width="44px"></el-table-column>
<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 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"
/>
</div>
</div>
</template>
<script>
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../../components/CRMTableHead";
import { downloadFile } from "@/utils/crmindex.js";
import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
export default {
name: "sendUnsettledDiffReport",
components: { Pagination, CRMTableHead, CRMTableHead, JobSelectVerson },
directives: { permission },
props: {
customerInfos: {
type: Array,
default: () => {
return [];
},
},
},
data() {
return {
crmType: "hq-h-OutOrder",
rules: {
//
erpMaterialCode: [
{ required: true, message: "必须输入!", trigger: "blur" },
],
},
searchContent: "", //
customerInfo: {
parentId: "",
version: "",
},
form: {
dicDetailID: "",
customerId: "",
projectId: "",
},
list: null,
totalCount: 0,
listLoading: true,
formLoading: false,
JobVersionList: [
{ value: "0", label: "未处理" },
{ value: "1", label: "申请出库" },
{ value: "2", label: "确认出库" },
{ value: "3", label: "不能出库" },
{ value: "4", label: "取消出库" },
],
//
filterObj: {
type: Object,
default: () => {
return {};
},
},
listQuery: {
Filters: [
{
logic: 0,
column: "Enabled",
action: 0,
value: "true",
}, //
],
SkipCount: 0,
MaxResultCount: 15,
billNum: "",
},
listOutPutQuery: {
version: "",
guids: "",
billNum: "",
},
page: 1,
JobversionValue: "",
JobversionValueVerson: "",
dialogFormVisible: false,
multipleSelection: [],
formTitle: "",
drawer: false,
showExcelImport: false,
tableHeight: document.documentElement.clientHeight - 230,
isEdit: false,
};
},
mounted() {
var self = this;
window.onresize = function () {
var offsetHei = document.documentElement.clientHeight;
self.tableHeight = offsetHei - 190;
};
},
created() {
this.getList();
},
watch: {
customerInfos: {
handler(newVal) {
if (newVal == "" || newVal == "undefined") {
//TODO
} else {
newVal.forEach((element) => {
this.customerInfo.parentId = element.ParentId;
this.customerInfo.version = element.Version;
});
if (this.customerInfo.parentId != "") {
this.getList();
}
}
},
immediate: true,
},
},
computed: {
/** 列表字段 */
getDefaultField() {
var tempsTabs = [];
tempsTabs.push({
label: "版本",
prop: "version",
width: 110,
});
tempsTabs.push({
label: "订货看板编号",
prop: "kanban",
width: 150,
});
tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 110 });
tempsTabs.push({ label: "Sap编码", prop: "materialCode", width: 150 });
tempsTabs.push({
label: "物料组(车型)",
prop: "materialGroup",
width: 220,
});
tempsTabs.push({ label: "发货零件号", prop: "extend1", width: 220 });
tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 });
tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 });
return tempsTabs;
},
},
methods: {
//
JobVersionValue(params) {
//
this.listQuery.Filters = [];
var column = "state";
let filter = {
logic: 0,
column: column,
action: 0,
value: params.value,
};
this.listQuery.Filters.push(filter);
this.getList();
},
//
handleCancelBills(row) {
if (this.multipleSelection.length == 0) {
this.$message({
message: "至少选择一行!",
type: "warning",
});
return;
}
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.listOutPutQuery.version = this.customerInfo.version;
this.listOutPutQuery.guids = params;
this.listOutPutQuery.billNum = this.customerInfo.parentId;
console.log("取消出库条件:" + JSON.stringify(this.listOutPutQuery));
this.$confirm("是否确认取消出库" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts(
"/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPut-Cancel",
this.listOutPutQuery
)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "操作成功",
type: "success",
duration: 2000,
});
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
});
},
//
handleCreateBills(row) {
if (this.multipleSelection.length == 0) {
this.listLoading = true;
this.listOutPutQuery.guids = [];
this.listOutPutQuery.version = this.customerInfo.version;
this.listOutPutQuery.billNum = this.customerInfo.parentId;
console.log(
"未选择时全部确认出库条件:" + JSON.stringify(this.listOutPutQuery)
);
this.$confirm("是否全部确认出库?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
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;
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
this.listLoading = false;
});
} else {
this.listLoading = true;
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.listOutPutQuery.version = this.customerInfo.version;
this.listOutPutQuery.guids = params;
this.listOutPutQuery.billNum = this.customerInfo.parentId;
console.log(
"部分选择时确认出库条件:" + JSON.stringify(this.listOutPutQuery)
);
this.$confirm("是否确认将选中的出库" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
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;
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消操作",
});
this.listLoading = false;
});
}
},
/** 刷新列表 */
handleHandle(data) {
if (data.type !== "edit") {
this.getList();
}
},
/** 格式化字段 */
fieldFormatter(row, column) {
if (column.property == "state") {
return {
0: "未处理",
1: "申请出库",
2: "确认出库",
3: "不能出库",
4: "取消出库",
}[row[column.property]];
}
return row[column.property] || "--";
},
importExcelData() {
//
this.showExcelImport = false;
this.getList();
},
async handleDownload() {
//await this.getDownBoms();
this.listLoading = true;
this.$axios
.gets(
"/api/settleaccount/bt-kb-not-consign/export/" +
this.customerInfo.parentId
)
.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;
});
});
},
getList(data) {
this.listLoading = true;
if (data != undefined) {
this.listQuery.SkipCount = (this.page - 1) * data.limit;
} else {
this.listQuery.SkipCount = (this.page - 1) * 15;
}
this.listQuery.billNum = this.customerInfo.parentId;
console.log("查询条件:" + JSON.stringify(this.listQuery));
this.$axios
.posts(
"/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanDetailList",
this.listQuery
)
.then((response) => {
this.list = response.items;
//alert(JSON.stringify(response.Items))
this.totalCount = response.totalCount;
setTimeout(() => {
//
this.listLoading = false;
}, 500);
})
.catch(() => {
this.listLoading = false;
});
},
/** 筛选操作 */
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();
},
/** 多项筛选操作 */
/** 筛选操作 */
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();
}
},
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 === "fisQty" ||
column.property === "diffQty" ||
column.property === "stockQty"
) {
return { textAlign: "right" };
} else {
return { textAlign: "left" };
}
},
/** 通过回调控制表头style */
headerRowStyle({ row, column, rowIndex, columnIndex }) {
if (
column.property === "fisQty" ||
column.property === "diffQty" ||
column.property === "stockQty"
) {
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>

340
vue/src/views/ux/vw/dataInput/hq_h_outorder/index.vue

@ -0,0 +1,340 @@
<!--红旗H平台出库单-->
<template>
<div class="cr-body-content">
<flexbox class="content-header">
<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-upload2"
@click="handleImportExcel()"
>导入文件Excel
</el-button>
</flexbox>
<!--表格渲染-->
<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"
size="small"
stripe
border
highlight-current-row
style="width: 100%"
@sort-change="sortChange"
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
>
<el-table-column
label="单据号"
prop="billNum"
sortable="custom"
align="center"
width="250px"
>
<template slot-scope="scope">
<el-tooltip :content="scope.row.billNum" placement="bottom-end">
<span class="link-type" @click="handleDrawerOpen(scope.row)">{{
scope.row.billNum
}}</span>
</el-tooltip>
</template>
</el-table-column>
<!-- <el-table-column type="selection" width="44px"></el-table-column> -->
<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 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"
/>
<!-- 抽屉控件 -->
<el-drawer
title="信息详细页"
size="75%"
direction="rtl"
:visible.sync="drawer"
:before-close="handleDrawerClose"
>
<div>
<Detail
v-bind:customerInfos="customerInfos"
style="margin-top: -35px"
></Detail>
</div>
</el-drawer>
</div>
</div>
</template>
<script>
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
import permission from "@/directive/permission/index.js";
import Detail from "./detail";
import moment from "moment";
import importExcel from "@/components/ImportExcel-base";
import { formatTimeToTimestamp } from "@/utils/index";
export default {
name: "HQH_OUTORDER",
components: { Pagination, Detail,importExcel },
directives: { permission },
data() {
return {
crmType: "HQ_H_OUTORDER",
rules: {
// version: [{ required: true, message: "", trigger: "change" }],
// beginTime: [{ required: true, message: "", trigger: "change" }],
// endTime: [{ required: true, message: "", trigger: "change" }],
},
customerInfos: [],
searchContent: "", //
drawer: false,
form: {
version: "",
customerCode: "",
customerName: "",
beginTime: "",
endTime: "",
},
versionValue: "",
versionList: [],
startTimeVale: "",
endTimeVale: "",
list: null,
totalCount: 0,
listLoading: true,
formLoading: false,
//
filterObj: {
type: Object,
default: () => {
return {};
},
},
listQuery: {
Filters: [
{
logic: 0,
column: "Enabled",
action: 0,
value: "true",
}, //
],
//OrgID:"",
SkipCount: 0,
MaxResultCount: 15,
},
page: 1,
dialogFormVisible: false,
multipleSelection: [],
formTitle: "",
drawer: false,
showExcelImport: false,
tableHeight: document.documentElement.clientHeight - 200,
isEdit: false,
};
},
mounted() {
var self = this;
window.onresize = function () {
var offsetHei = document.documentElement.clientHeight;
self.tableHeight = offsetHei - 200;
};
},
created() {
this.getList();
//this.getVersionInfo();
},
computed: {
/** 列表字段 */
getDefaultField() {
var tempsTabs = [];
tempsTabs.push({
label: "版本",
prop: "version",
width: 120,
});
//tempsTabs.push({ label: "", prop: "billNum", width: 150 });
tempsTabs.push({ label: "创建人", prop: "creator", width: 160 });
tempsTabs.push({ label: "创建时间", prop: "creationTime", width: 160 });
tempsTabs.push({ label: "备注", prop: "remark", width: 120 });
return tempsTabs;
},
},
methods: {
handleImportExcel() {
//
this.showExcelImport = true;
this.$refs.importexcel.handleImportExcelClick();
},
getVersionInfo() {
//
this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 1000;
this.$axios
.posts("/api/settleaccount/CentralizedControl/openlist")
.then((response) => {
this.versionList = [];
response.forEach((element) => {
let options = {};
options.value = element.version;
options.label = element.version;
this.versionList.push(options);
});
})
.catch(() => {
this.listLoading = false;
});
},
//
handleDrawerOpen(param) {
this.drawer = true;
var parentId = param.billNum; //
var version = param.version; //
this.customerInfos = [
{
ParentId: parentId,
Version: version,
},
];
},
handleDrawerClose(done) {
done();
},
/** 格式化字段 */
fieldFormatter(row, column) {
if (column.property == "creationTime") {
var date = row[column.property];
if (date == undefined) {
return "";
}
return moment(date).format("YYYY-MM-DD HH:mm:ss");
}
if (column.property == "state") {
return { 0: "已提交", 1: "已出库", 2: "不能出库" }[
row[column.property]
];
}
return row[column.property] || "--";
},
importExcelData() {
//
this.showExcelImport = false;
this.getList();
},
getList(data) {
this.listLoading = true;
if (data != undefined) {
this.listQuery.SkipCount = (this.page - 1) * data.limit;
} else {
this.listQuery.SkipCount = (this.page - 1) * 15;
}
this.$axios
.posts("/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanList", this.listQuery)
.then((response) => {
this.list = response.items;
//alert(JSON.stringify(response.Items))
this.totalCount = response.totalCount;
setTimeout(() => {
//
this.listLoading = false;
}, 500);
})
.catch(() => {
this.listLoading = false;
});
},
/** 筛选操作 */
handleFilter() {
this.page = 1;
this.getList();
this.listQuery.Filters = [];
if (this.searchContent != "") {
var column = "version";
let filter = {
logic: 0,
column: column,
action: 0,
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 }) {
return { textAlign: "left" };
},
handleRowClick(row, column, event) {
this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(row);
},
},
};
</script>
<style lang="scss" scoped>
@import "../../../styles/crmtable.scss";
</style>

198
vue/src/views/ux/vw/dataInput/hq_h_report/index.vue

@ -269,37 +269,24 @@
</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>
<el-col :md="20" :xs="24" style="margin-left: -80px"> <el-col :md="20" :xs="24" style="margin-left: -80px">
<el-form-item prop="materialGroupValue"> <el-form-item prop="warehouseDesc">
<el-select <el-input
v-model="formCount.materialGroupValue" v-model="formCount.warehouseDesc"
size="medium" style="width: 450px"
multiple type="textarea"
filterable :rows="4"
clearable placeholder="多个收货仓库描述,请以回车换行形式添加!"
style="width: 450px; margin-right: 15px" />
@change="valueChange"
placeholder="请选择"
>
<el-option
v-for="item in materialGroupList"
:key="item.value"
:label="item.value"
:value="item.value"
>
<span style="float: left">{{ item.label }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{
item.value
}}</span>
</el-option>
</el-select>
</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="交货日期" />
@ -348,10 +335,10 @@
<el-form-item label="订货看板编号" /> <el-form-item label="订货看板编号" />
</el-col> </el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px"> <el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item prop="kennCode"> <el-form-item prop="kanban">
<el-input <el-input
type="textarea" type="textarea"
v-model="formCount.kennCode" v-model="formCount.kanban"
style="width: 170px" style="width: 170px"
:rows="4" :rows="4"
placeholder="多个订货看板编号,请以回车换行形式添加!" placeholder="多个订货看板编号,请以回车换行形式添加!"
@ -362,9 +349,9 @@
<el-form-item label="发货零件号" /> <el-form-item label="发货零件号" />
</el-col> </el-col>
<el-col :md="10" :xs="24" style="margin-left: -95px"> <el-col :md="10" :xs="24" style="margin-left: -95px">
<el-form-item prop="chassisNumber"> <el-form-item prop="materialCode">
<el-input <el-input
v-model="formCount.chassisNumber" v-model="formCount.materialCode"
style="width: 170px" style="width: 170px"
type="textarea" type="textarea"
:rows="4" :rows="4"
@ -379,9 +366,9 @@
<el-form-item label="结算验收单号" /> <el-form-item label="结算验收单号" />
</el-col> </el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px"> <el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item prop="materialCode"> <el-form-item prop="acceptNo">
<el-input <el-input
v-model="formCount.materialCode" v-model="formCount.acceptNo"
style="width: 170px" style="width: 170px"
type="textarea" type="textarea"
:rows="4" :rows="4"
@ -390,7 +377,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="4" :xs="24"> <el-col :md="4" :xs="24">
<el-form-item label="结算零件号" /> <el-form-item label="SAP编号" />
</el-col> </el-col>
<el-col :md="10" :xs="24" style="margin-left: -95px"> <el-col :md="10" :xs="24" style="margin-left: -95px">
<el-form-item prop="sapCode"> <el-form-item prop="sapCode">
@ -399,23 +386,6 @@
style="width: 170px" style="width: 170px"
type="textarea" type="textarea"
:rows="4" :rows="4"
placeholder="多个结算零件号,请以回车换行形式添加!"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :md="4" :xs="24">
<el-form-item label="SAP编号" />
</el-col>
<el-col :md="10" :xs="24" style="margin-left: -80px">
<el-form-item prop="sapCode">
<el-input
v-model="formCount.sapCode"
style="width: 450px"
type="textarea"
:rows="4"
placeholder="多个厂内零件号,请以回车换行形式添加!" placeholder="多个厂内零件号,请以回车换行形式添加!"
/> />
</el-form-item> </el-form-item>
@ -434,36 +404,6 @@
> >
</div> </div>
</el-dialog> </el-dialog>
<el-dialog
title="批量录入KEEN号"
:visible.sync="showModal"
width="400px"
height="500px"
append-to-body
>
<flexbox class="content">
<div>
<el-input
type="textarea"
v-model="paster"
@paste.native="pasteMe"
:rows="6"
/>
<el-table :data="tableData" max-height="400">
<el-table-column
prop="name"
label="说明:只支持从Excel上粘贴复制,不支持手输!"
width="300"
>
</el-table-column>
</el-table>
</div>
</flexbox>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submiteBillNo">确定录入</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
@ -483,7 +423,7 @@ export default {
data() { data() {
return { return {
crmType: "backJob", crmType: "hq-h-backJob",
activeNames: ["1"], activeNames: ["1"],
tableData: [ tableData: [
{ {
@ -575,15 +515,26 @@ export default {
searchContent: "", // searchContent: "", //
form: {}, form: {},
formCount: { formCount: {
version: undefined,
startTime: "", startTime: "",
endTime: "", endTime: "",
// name: "", materialCode: undefined,
// settledate: "", materialGroup: undefined,
// materialCode: "", sapCode: undefined,
// sapMaterialCode: "", warehouseDesc: undefined,
// chassisNumber: "", acceptNo: undefined,
// kennCode: "", kanban: undefined,
// version: "", },
listExportQuery: {
version: "",
materialCode: undefined,
begin: undefined,
end: undefined,
materialGroup: undefined,
sapCode: undefined,
warehouseDesc: undefined,
acceptNo: undefined,
kanban: undefined,
}, },
dataKenCode: "", dataKenCode: "",
datachassisNumber: "", datachassisNumber: "",
@ -601,18 +552,7 @@ export default {
return {}; return {};
}, },
}, },
listExportQuery: {
version: "",
materialCode: undefined,
sapCode: undefined,
cp7Begin: undefined,
cp7End: undefined,
kenncode: undefined,
chassisNumber: undefined,
materialGroup: undefined,
begin: undefined,
end: undefined,
},
listQuery: { listQuery: {
taskId: "", taskId: "",
name: "", name: "",
@ -796,7 +736,7 @@ export default {
.then(() => { .then(() => {
this.$axios this.$axios
.posts( .posts(
"/api/settleaccount/wmsjitoutput/WmsJitOutPutAudit", "/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPutAudit",
params params
) )
.then((response) => { .then((response) => {
@ -873,7 +813,7 @@ export default {
this.formLoading = true; this.formLoading = true;
this.$axios this.$axios
.posts( .posts(
"/api/settleaccount/wmsjitoutput/WmsJitOutPut", "/api/settleaccount/WmsHQHKanbanoutput/WmsHQHKanbanOutPut",
this.listBillQuery this.listBillQuery
) )
.then((response) => { .then((response) => {
@ -1156,38 +1096,37 @@ export default {
this.$refs.formCount.validate((valid) => { this.$refs.formCount.validate((valid) => {
if (valid) { if (valid) {
this.formLoading = true; this.formLoading = true;
this.listExportQuery.version = this.formCount.versionValue; // this.listExportQuery.version = this.formCount.versionValue; //1
if (this.formCount.materialCode != "") { if (this.formCount.materialCode != "") {
this.listExportQuery.materialCode = this.formCount.materialCode; // this.listExportQuery.materialCode = this.formCount.materialCode; //2
} }
if (this.formCount.sapCode != "") { if (this.formCount.sapCode != "") {
this.listExportQuery.sapCode = this.formCount.sapCode; // this.listExportQuery.sapCode = this.formCount.sapCode; //3
} }
if (this.formCount.kennCode != "") { if (this.formCount.warehouseDesc != "") {
this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN this.listExportQuery.warehouseDesc = this.formCount.warehouseDesc; //4
} }
this.listExportQuery.begin = this.startTime this.listExportQuery.begin = this.startTime
? this.startTime ? this.startTime
: undefined; : undefined;
this.listExportQuery.end = this.endTime ? this.endTime : undefined; this.listExportQuery.end = this.endTime ? this.endTime : undefined;
if (this.formCount.chassisNumber != "") { if (this.formCount.acceptNo != "") {
this.listExportQuery.chassisNumber = this.formCount.chassisNumber; // this.listExportQuery.acceptNo = this.formCount.acceptNo; //5
}
if (this.formCount.kanban != "") {
this.listExportQuery.kanban = this.formCount.kanban; //6
} }
// if (this.formCount.materialGroupValue != "") {
// this.listExportQuery.materialGroup =
// '"'+this.formCount.materialGroupValue+'"'; //
// }
if (this.formCount.materialGroupValue != "") { if (this.formCount.materialGroupValue != "") {
this.listExportQuery.materialGroup = this.getmaterialGroupValue; // this.listExportQuery.materialGroup = this.getmaterialGroupValue; //7
} }
console.log( console.log(
"大众发票与结算核对明细表-导出条件:" + "H平台核对明细-导出条件:" +
JSON.stringify(this.listExportQuery) JSON.stringify(this.listExportQuery)
); );
this.$axios this.$axios
.posts( .posts(
"/api/settleaccount/ReportMakeService/InvoiceSettledDetailDiff-Make", "/api/settleaccount/ReportMakeService/HQHSettledDetailDiffExportService",
this.listExportQuery this.listExportQuery
) )
.then((res) => { .then((res) => {
@ -1218,7 +1157,6 @@ export default {
this.formTitle = "报表统计"; this.formTitle = "报表统计";
this.isEdit = false; this.isEdit = false;
this.form = {}; this.form = {};
this.datetime5 = [];
this.startTime = ""; this.startTime = "";
this.endTime = ""; this.endTime = "";
this.dialogFormVisible = true; this.dialogFormVisible = true;
@ -1236,28 +1174,6 @@ export default {
const property = column["property"]; const property = column["property"];
return row[property] === value; return row[property] === value;
}, },
/* 任务详细信息 */
handleView(row) {
this.listQuery.taskId = row.taskId;
this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery)
.then((response) => {
this.form = response[0];
switch (response[0].stateName) {
case "Succeeded":
case "Failed":
this.activeIndex = 3;
break;
case "Processing":
this.activeIndex = 2;
break;
case "Enqueued":
this.activeIndex = 1;
break;
}
this.openView = true;
});
},
/* 刷新 */ /* 刷新 */
refresh() { refresh() {
this.list = []; this.list = [];
@ -1344,7 +1260,7 @@ export default {
getList() { getList() {
this.listLoading = true; this.listLoading = true;
// //
this.listQuery.name = "准时化结算核对明细"; this.listQuery.name = "H平台核对明细";
this.listQuery.type = this.JobversionValue; this.listQuery.type = this.JobversionValue;
this.$axios this.$axios
.posts("/api/settleaccount/Job/list", this.listQuery) .posts("/api/settleaccount/Job/list", this.listQuery)
@ -1359,14 +1275,6 @@ export default {
this.listLoading = false; this.listLoading = false;
}); });
}, },
// fetchData(id) {
// //
// this.$axios
// .gets("/api/settleaccount/MaterialRelationship/" + id)
// .then((response) => {
// this.form = response;
// });
// },
resetQuery() {}, resetQuery() {},
/** 通过回调控制style */ /** 通过回调控制style */
cellStyle({ row, column, rowIndex, columnIndex }) { cellStyle({ row, column, rowIndex, columnIndex }) {

1316
vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue

File diff suppressed because it is too large

3
vue/src/views/ux/vw/dataInput/hq_m/index.vue

@ -291,7 +291,8 @@ export default {
prop: "acceptanceDate", prop: "acceptanceDate",
width: 170, width: 170,
}); });
tempsTabs.push({ label: "数量", prop: "price", width: 100 }); tempsTabs.push({ label: "数量", prop: "qty", width: 100 });
tempsTabs.push({ label: "单价", prop: "price", width: 100 });
tempsTabs.push({ label: "金额", prop: "amt", width: 100 }); tempsTabs.push({ label: "金额", prop: "amt", width: 100 });
tempsTabs.push({ label: "供应商", prop: "supplier", width: 120 }); tempsTabs.push({ label: "供应商", prop: "supplier", width: 120 });
tempsTabs.push({ tempsTabs.push({

5
vue/src/views/ux/vw/dataInput/hq_y/index.vue

@ -262,7 +262,7 @@ export default {
}, },
computed: { computed: {
/** 列表字段 */ /** 列表字段 */
getDefaultField() { getDefaultField() {
var tempsTabs = []; var tempsTabs = [];
tempsTabs.push({ tempsTabs.push({
label: "看板号", label: "看板号",
@ -291,7 +291,8 @@ export default {
prop: "acceptanceDate", prop: "acceptanceDate",
width: 170, width: 170,
}); });
tempsTabs.push({ label: "数量", prop: "price", width: 100 }); tempsTabs.push({ label: "数量", prop: "qty", width: 100 });
tempsTabs.push({ label: "单价", prop: "price", width: 100 });
tempsTabs.push({ label: "金额", prop: "amt", width: 100 }); tempsTabs.push({ label: "金额", prop: "amt", width: 100 });
tempsTabs.push({ label: "供应商", prop: "supplier", width: 120 }); tempsTabs.push({ label: "供应商", prop: "supplier", width: 120 });
tempsTabs.push({ tempsTabs.push({

133
vue/static/tableFieldForSearch.json

@ -2815,17 +2815,17 @@
{ {
"fieldId": 3, "fieldId": 3,
"formType": "text", "formType": "text",
"name": "采购订单号", "name": "看板号",
"type": 1, "type": 1,
"value": "", "value": "",
"fieldType": 1, "fieldType": 1,
"fieldName": "purchaseOrderNo", "fieldName": "hqmKanBan",
"setting": [] "setting": []
}, },
{ {
"fieldId": 5, "fieldId": 5,
"formType": "text", "formType": "text",
"name": "物料代码", "name": "物料",
"type": 1, "type": 1,
"value": "", "value": "",
"fieldType": 1, "fieldType": 1,
@ -2835,41 +2835,81 @@
{ {
"fieldId": 5, "fieldId": 5,
"formType": "text", "formType": "text",
"name": "科目号", "name": "存储地点描述",
"type": 1, "type": 1,
"value": "", "value": "",
"fieldType": 1, "fieldType": 1,
"fieldName": "accountNum", "fieldName": "storageLocationDesc",
"setting": []
}
]
},
"hqFPlatform": {
"id": "36",
"data": [
{
"fieldId": 3,
"formType": "text",
"name": "看板号",
"type": 1,
"value": "",
"fieldType": 1,
"fieldName": "hqhKanBan",
"setting": [] "setting": []
}, },
{ {
"fieldId": 5, "fieldId": 5,
"formType": "text", "formType": "text",
"name": "交货单号", "name": "物料号",
"type": 1, "type": 1,
"value": "", "value": "",
"fieldType": 1, "fieldType": 1,
"fieldName": "deliveryOrderNo", "fieldName": "materialCode",
"setting": [] "setting": []
}, },
{ {
"fieldId": 5, "fieldId": 5,
"formType": "text", "formType": "text",
"name": "工厂", "name": "存储地点描述",
"type": 1, "type": 1,
"value": "", "value": "",
"fieldType": 1, "fieldType": 1,
"fieldName": "factory", "fieldName": "storageLocationDesc",
"setting": []
}
]
},
"hqYPlatform": {
"id": "36",
"data": [
{
"fieldId": 3,
"formType": "text",
"name": "看板号",
"type": 1,
"value": "",
"fieldType": 1,
"fieldName": "btCarKanBan",
"setting": [] "setting": []
}, },
{ {
"fieldId": 5, "fieldId": 5,
"formType": "text", "formType": "text",
"name": "工厂名称", "name": "物料号",
"type": 1, "type": 1,
"value": "", "value": "",
"fieldType": 1, "fieldType": 1,
"fieldName": "factoryName", "fieldName": "materialCode",
"setting": []
},
{
"fieldId": 5,
"formType": "text",
"name": "存储地点描述",
"type": 1,
"value": "",
"fieldType": 1,
"fieldName": "storageLocationDesc",
"setting": [] "setting": []
} }
] ]
@ -3002,5 +3042,76 @@
] ]
} }
] ]
},
"hq-h-OutOrder": {
"id": "36",
"data": [
{
"fieldId": 3,
"formType": "text",
"name": "订货看板编号",
"type": 1,
"value": "",
"fieldType": 1,
"fieldName": "kanban",
"setting": []
},
{
"fieldId": 5,
"formType": "text",
"name": "交货单号",
"type": 1,
"value": "",
"fieldType": 1,
"fieldName": "wmsBillNum",
"setting": []
},
{
"fieldId": 5,
"formType": "text",
"name": "Sap编码",
"type": 1,
"value": "",
"fieldType": 1,
"fieldName": "materialCode",
"setting": []
},
{
"fieldId": 5,
"formType": "text",
"name": "物料组(车型)",
"type": 1,
"value": "",
"fieldType": 1,
"fieldName": "materialGroup",
"setting": []
},
{
"fieldId": 5,
"formType": "text",
"name": "发货零件号",
"type": 1,
"value": "",
"fieldType": 1,
"fieldName": "extend1",
"setting": []
},
{
"fieldId": 5,
"formType": "text",
"name": "收货仓库",
"type": 1,
"value": "",
"fieldType": 1,
"fieldName": "extend2",
"setting": []
}
]
} }
} }
Loading…
Cancel
Save