Browse Source

屏蔽错误功能

branch_ccpg_220107
44673626 2 years ago
parent
commit
d6d81389b6
  1. 5
      vue/src/components/ImportExcel-base/index.vue
  2. 11
      vue/src/router/modules/wms_out_order.js
  3. 531
      vue/src/views/ux/billManage/ErrorBill/index.vue
  4. 2
      vue/src/views/ux/billManage/kanbanOutOrder/detail.vue
  5. 2
      vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue
  6. 2
      vue/src/views/ux/billManage/sparepartOutOrder/detail.vue
  7. 2
      vue/src/views/ux/billManage/sparepartOutOrder90/detail.vue
  8. 2
      vue/src/views/ux/billManage/vwOutOrder/detail.vue
  9. 2
      vue/src/views/ux/billManage/wmsCusomerKanban/detail.vue
  10. 2
      vue/src/views/ux/vw/dataInput/OnetimeSale/detail.vue
  11. 2
      vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue
  12. 2
      vue/src/views/ux/vw/dataInput/hq_kb_output/detail.vue
  13. 8
      vue/static/config.js
  14. 36
      vue/static/tableFieldForSearch.json

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

@ -289,6 +289,7 @@ export default {
{
invoice: "大众发票汇总",
priceList: "标准价格单",
errorBill:"异常信息",
spareparts: "备件价格单",
vWKanBan: "大众看板结算明细",
scrapClaims: "CP7报废和索赔",
@ -338,6 +339,7 @@ export default {
{
invoice: "/api/settleaccount/Invoices/ExcelImport", //
priceList: "/api/settleaccount/PriceList/ExcelImport-Map", //
errorBill:"/api/settleaccount/ErrorBill/ExcelImport", //
spareparts: "/api/SettleAccount/PriceListBJ/ExcelImport-Map", //
vWKanBan: "/api/settleaccount/VWKanBan/ExcelImport", //
scrapClaims: "/api/settleaccount/ScrapClaims/ExcelImport", //CP7
@ -477,6 +479,7 @@ export default {
if (
this.crmType == "priceList" ||
this.crmType == "spareparts" ||
this.crmType == "errorBill" ||
this.crmType == "wmsOutputSum"
) {
//
@ -548,7 +551,7 @@ export default {
},
//
sureClick() {
if (this.crmType != "priceList" && this.crmType != "spareparts") {
if (this.crmType != "priceList" && this.crmType != "spareparts" && this.crmType != "errorBill") {
if (this.versionValue == "") {
this.$message.error("必须选择版本!");
return false;

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

@ -91,6 +91,17 @@ const vwsOutOrderDataRouter = {
}
},
{
path: '/wms-errbill',
component: () => import('@/views/ux/billManage/ErrorBill'),
name: 'ErrorBill',//命名路由
meta: {
title: '屏蔽异常数据',
roles: ['SettleAccount.WMSJIT'],//控制页面角色(可以设置多个角色)
icon: '零件'
}
},
]

531
vue/src/views/ux/billManage/ErrorBill/index.vue

@ -0,0 +1,531 @@
<!--异常信息汇总-->
<template>
<div class="cr-body-content">
<flexbox class="content-header">
<!-- <XhJSSelect
:options="versionList"
style="width: 200px"
class="search-container"
@value-change="selectValue"
></XhJSSelect> -->
<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>
<el-button
class="filter-item"
size="mini"
type="info"
icon="el-icon-bottom"
@click="handleCommand()"
>导出Excel
</el-button>
<el-button
class="filter-item"
type="danger"
icon="el-icon-delete"
size="mini"
@click="handleDelete()"
>批量删除
</el-button>
<!--表格头组件filter查询 v-permission="['SettleAccount.PriceLists.Create']"-->
<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 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>
<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";
export default {
name: "ErrorBill",
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: "errorBill",
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,
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.getList();
},
computed: {
getDefaultField() {
var tempsTabs = [];
//tempsTabs.push({ label: "", prop: "version", width: 120 });
tempsTabs.push({
label: "底盘|看板号|订单号",
prop: "billNum",
width: 230,
});
tempsTabs.push({
label: "厂内物料号",
prop: "materialCode",
width: 100,
});
tempsTabs.push({
label: "客户物料号",
prop: "customerMaterialCode",
width: 120,
});
tempsTabs.push({
label: "交货单号",
prop: "wmsBillNum",
width: 120,
});
tempsTabs.push({ label: "物料描述", prop: "materialDesc", width: 220 });
return tempsTabs;
},
},
methods: {
selectValue(params) {
//
this.versionValue = params.value;
this.getList();
},
handleDelete(row) {
//
var params = [];
let myalert = ""; //使
if (row) {
//
params.push(row.id);
myalert = row.name;
} else {
if (this.multipleSelection.length === 0) {
this.$message({
message: "未选择",
type: "warning",
});
return;
}
//
this.multipleSelection.forEach((element) => {
let id = element.id;
params.push(id);
});
myalert = "选中项";
}
this.$confirm("是否删除" + myalert + "?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.$axios
.posts("/api/settleaccount/ErrorBill/delete", params)
.then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "删除成功",
type: "success",
duration: 2000,
});
this.getList();
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消删除",
});
});
},
handleCommand(command) {
this.listLoading = true;
console.log("导出:" + JSON.stringify(this.listQuery));
this.$axios
.posts("/api/settleaccount/ErrorBill/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.getList();
},
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";
}
this.$axios
.posts("/api/settleaccount/ErrorBill/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;
});
},
/** 多项筛选操作 */
/** 筛选操作 */
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/billManage/kanbanOutOrder/detail.vue

@ -10,7 +10,7 @@
></JobSelectVerson>
<el-button
v-if="this.selectJobVersionValue == 0"
v-if="this.selectJobVersionValue == 0 || this.selectJobVersionValue == 3"
class="filter-item"
type="success"
icon="el-icon-check"

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

@ -22,7 +22,7 @@
></el-option>
</el-select> -->
<el-button
v-if="this.selectJobVersionValue == 0"
v-if="this.selectJobVersionValue == 0 || this.selectJobVersionValue == 3"
class="filter-item"
type="success"
icon="el-icon-check"

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

@ -18,7 +18,7 @@
></JobSelectVerson>
<el-button
v-if="this.selectJobVersionValue == 0"
v-if="this.selectJobVersionValue == 0 || this.selectJobVersionValue == 3"
class="filter-item"
type="success"
icon="el-icon-check"

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

@ -17,7 +17,7 @@
@value-change="JobVersionValue"
></JobSelectVerson>
<el-button
v-if="this.selectJobVersionValue == 0"
v-if="this.selectJobVersionValue == 0 || this.selectJobVersionValue == 3"
class="filter-item"
type="success"
icon="el-icon-check"

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

@ -17,7 +17,7 @@
>确认出库单</el-button
> -->
<el-button
v-if="this.selectJobVersionValue == 0"
v-if="this.selectJobVersionValue == 0 || this.selectJobVersionValue == 3"
class="filter-item"
type="success"
icon="el-icon-check"

2
vue/src/views/ux/billManage/wmsCusomerKanban/detail.vue

@ -9,7 +9,7 @@
@value-change="JobVersionValue"
></JobSelectVerson>
<el-button
v-if="this.selectJobVersionValue == 0"
v-if="this.selectJobVersionValue == 0 || this.selectJobVersionValue == 3"
class="filter-item"
type="success"
icon="el-icon-check"

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

@ -10,7 +10,7 @@
></JobSelectVerson>
<el-button
v-if="this.selectJobVersionValue == 0"
v-if="this.selectJobVersionValue == 0 || this.selectJobVersionValue == 3"
class="filter-item"
type="success"
icon="el-icon-check"

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

@ -9,7 +9,7 @@
@value-change="JobVersionValue"
></JobSelectVerson>
<el-button
v-if="this.selectJobVersionValue == 0"
v-if="this.selectJobVersionValue == 0 || this.selectJobVersionValue == 3"
class="filter-item"
type="success"
icon="el-icon-check"

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

@ -10,7 +10,7 @@
></JobSelectVerson>
<el-button
v-if="this.selectJobVersionValue == 0"
v-if="this.selectJobVersionValue == 0 || this.selectJobVersionValue == 3"
class="filter-item"
type="success"
icon="el-icon-check"

8
vue/static/config.js

@ -2,8 +2,8 @@ let configJSON
if (process.env.NODE_ENV === 'development') {
configJSON = {
base: {
ip: 'http://192.168.0.67',
//ip: 'http://192.168.0.140',
//ip: 'http://192.168.0.67',
ip: 'http://192.168.0.140',
//ip: 'http://149.223.116.5',
auth_port: '8066',
public_port: '8092',
@ -37,8 +37,8 @@ if (process.env.NODE_ENV === 'development') {
configJSON = {
base: {
ip: 'http://192.168.0.67',
//ip: 'http://192.168.0.140',
//ip: 'http://192.168.0.67',
ip: 'http://192.168.0.140',
//ip: 'http://149.223.116.5',
//ip: 'http://124.220.28.250',
//ip: 'http://10.123.148.162',

36
vue/static/tableFieldForSearch.json

@ -3693,5 +3693,41 @@
"setting": []
}
]
},
"errorBill": {
"id": "36",
"data": [
{
"fieldId": 5,
"formType": "text",
"name": "底盘|看板号|订单号",
"type": 1,
"value": "",
"fieldType": 1,
"fieldName": "billNum",
"setting": []
},
{
"fieldId": 5,
"formType": "text",
"name": "交货单号",
"type": 1,
"value": "",
"fieldType": 1,
"fieldName": "wmsBillNum",
"setting": []
},
{
"fieldId": 5,
"formType": "text",
"name": "客户物料号",
"type": 1,
"value": "",
"fieldType": 1,
"fieldName": "customerMaterialCode",
"setting": []
}
]
}
}
Loading…
Cancel
Save