Browse Source

日常提交

branch_ccpg_220107
44673626 3 years ago
parent
commit
4b96b91beb
  1. 1
      vue/src/axios/index.js
  2. 15
      vue/src/views/ux/billManage/WMSOutputSumReport/index.vue
  3. 7
      vue/src/views/ux/billManage/sparepartOutOrder/detail.vue
  4. 6
      vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue

1
vue/src/axios/index.js

@ -2,6 +2,7 @@ import router from '../router'
import axios from 'axios' import axios from 'axios'
import qs from 'qs' import qs from 'qs'
import config from '../../static/config' import config from '../../static/config'
//import config from '../../public/config'
import { import {
Message, Message,
Loading Loading

15
vue/src/views/ux/billManage/WMSOutputSumReport/index.vue

@ -875,9 +875,7 @@ export default {
/** 格式化字段 */ /** 格式化字段 */
fieldFormatter(row, column) { fieldFormatter(row, column) {
if (column.property === "state") { if (column.property === "state") {
return { 0: "新建", 2: "成功", 1: "失败" }[ return { 0: "新建", 2: "成功", 1: "失败" }[row[column.property]];
row[column.property]
];
} }
if ( if (
column.property == "settleInputDate" || column.property == "settleInputDate" ||
@ -898,9 +896,13 @@ export default {
this.showExcelImport = false; this.showExcelImport = false;
}, },
getList() { getList(data) {
this.listLoading = true; this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 10; if (data != undefined) {
this.listQuery.SkipCount = (this.page - 1) * data.limit;
} else {
this.listQuery.SkipCount = (this.page - 1) * 15;
}
if (this.JobversionValue != "") { if (this.JobversionValue != "") {
this.listQuery.version = this.JobversionValue; this.listQuery.version = this.JobversionValue;
} }
@ -921,6 +923,9 @@ export default {
.catch(() => { .catch(() => {
this.listLoading = false; this.listLoading = false;
}); });
// WMSSAP
this.resultData.errSize = 0;
this.resultData.successMessage = "";
}, },
/** 筛选操作 */ /** 筛选操作 */
handleFilter() { handleFilter() {

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

@ -345,6 +345,11 @@ export default {
tempsTabs.push({ label: "零件描述", prop: "materialDesc", width: 250 }); tempsTabs.push({ label: "零件描述", prop: "materialDesc", width: 250 });
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: "qty", width: 100 });
tempsTabs.push({
label: "实际出库数量",
prop: "realityNumber",
width: 160,
});
tempsTabs.push({ label: "状态", prop: "state", width: 100 }); tempsTabs.push({ label: "状态", prop: "state", width: 100 });
return tempsTabs; return tempsTabs;
}, },
@ -406,7 +411,7 @@ export default {
logic: 0, logic: 0,
column: column, column: column,
action: 0, action: 0,
value: params.value, value: params.value,realityNumber
}; };
this.selectJobVersionValue = params.value; this.selectJobVersionValue = params.value;
this.listQuery.Filters.push(filter); this.listQuery.Filters.push(filter);

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

@ -1,4 +1,4 @@
<!--发票与结算核对明细--> <!--红旗工厂备件明细-->
<template> <template>
<div class="cr-body-content"> <div class="cr-body-content">
<!--功能栏--> <!--功能栏-->
@ -364,7 +364,7 @@
></i> ></i>
</template> </template>
<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>
@ -393,7 +393,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">

Loading…
Cancel
Save