Browse Source

大众备件无单号加上过账日期检验

branch_ccpg_220107
44673626 3 years ago
parent
commit
9c6561a271
  1. 2
      vue/src/views/newJit/baseData/billM100Manager/index.vue
  2. 85
      vue/src/views/ux/billManage/sparepartOutOrder/detail.vue
  3. 4
      vue/static/config.js

2
vue/src/views/newJit/baseData/billM100Manager/index.vue

@ -312,7 +312,7 @@ export default {
handler(newValue, oldValue) { handler(newValue, oldValue) {
if (newValue) { if (newValue) {
let date = new Date(); let date = new Date();
let min = date.getMinutes(); let min = date..getMinutes();
date.setMinutes(min + 1); //1 date.setMinutes(min + 1); //1
let nowDate = moment(date).format("HH:mm:ss"); let nowDate = moment(date).format("HH:mm:ss");
let st = ""; let st = "";

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

@ -190,6 +190,7 @@ import permission from "@/directive/permission/index.js";
import CRMTableHead from "../../components/CRMTableHead"; import CRMTableHead from "../../components/CRMTableHead";
import { downloadFile } from "@/utils/crmindex.js"; import { downloadFile } from "@/utils/crmindex.js";
import JobSelectVerson from "@/components/CreateCom/Job-Select.vue"; import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
import moment from "moment";
export default { export default {
name: "sendUnsettledDiffReport", name: "sendUnsettledDiffReport",
@ -345,7 +346,7 @@ 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({ tempsTabs.push({
label: "实际出库数量", label: "实际出库数量",
prop: "realityNumber", prop: "realityNumber",
width: 160, width: 160,
@ -411,7 +412,7 @@ export default {
logic: 0, logic: 0,
column: column, column: column,
action: 0, action: 0,
value: params.value,realityNumber value: params.value,
}; };
this.selectJobVersionValue = params.value; this.selectJobVersionValue = params.value;
this.listQuery.Filters.push(filter); this.listQuery.Filters.push(filter);
@ -495,34 +496,68 @@ export default {
return; return;
//this.getList(); //this.getList();
} else { } else {
if (this.accountDatelist != "") { let myalert = "";
this.listOutPutQuery.accountDate = this.accountDatelist.accountDate; var getAccountMonth = moment(this.accountDatelist.accountDate).format(
} "YYYY-MM"
//this.listOutPutQuery.accountDate = this.accountDatelist; );
let date = new Date();
let currentMonth = moment(date).format("YYYY-MM");
console.log( console.log(
"全部确认出库条件:" + JSON.stringify(this.listOutPutQuery) "过账日期:" +
JSON.stringify(getAccountMonth) +
"当前日期:" +
JSON.stringify(currentMonth)
); );
if (getAccountMonth <= currentMonth) {
myalert = "过账日期小于或等于当前月份";
} else {
this.$message({
type: "warning",
message: "选择的过账日期不能大于当前月份!",
});
this.formLoading = false;
return;
}
this.$axios this.$confirm("是否确认" + myalert + "?", "提示", {
.posts( confirmButtonText: "确定",
"/api/settleaccount/wmsSharePartoutput/WmsSharePartOutPut-Pass", cancelButtonText: "取消",
this.listOutPutQuery type: "warning",
) })
.then((response) => { .then(() => {
const index = this.list.indexOf(row); this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
this.$notify({ console.log(
title: "成功", "全部确认出库条件:" + JSON.stringify(this.listOutPutQuery)
message: "生成成功", );
type: "success",
duration: 2000, this.$axios
}); .posts(
this.accountDatelist.accountDate = ""; "/api/settleaccount/wmsSharePartoutput/WmsSharePartOutPut-Pass",
this.dialogFormVisible = false; this.listOutPutQuery
this.getList(); )
this.formLoading = false; .then((response) => {
const index = this.list.indexOf(row);
this.$notify({
title: "成功",
message: "生成成功",
type: "success",
duration: 2000,
});
this.accountDatelist.accountDate = "";
this.dialogFormVisible = false;
this.getList();
this.formLoading = false;
})
.catch(() => {
this.formLoading = false;
});
}) })
.catch(() => { .catch(() => {
this.formLoading = false; this.$message({
type: "info",
message: "已取消操作",
});
this.formLoading = false;
}); });
} }
}, },

4
vue/static/config.js

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

Loading…
Cancel
Save