diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 65f00c8f..e6785d82 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -16,13 +16,13 @@
type="primary"
v-if="documentShow"
@click.native="OptionalDocument()"
- >选入预验收库单
+ >选入预验收库单
草稿保存
+ >草稿保存
立即提交
+ >立即提交
@@ -92,8 +92,8 @@
>
{{ item.name }}
{{
- item.warehouseName
- }}
+ item.warehouseName
+ }}
@@ -153,8 +153,8 @@
>
{{ item.name }}
{{
- item.code
- }}
+ item.code
+ }}
@@ -188,11 +188,20 @@
-
+ multiple
+ placeholder="请选入单据"
+ >
+
+
+
@@ -223,7 +232,7 @@
size="mini"
@click.native.stop="addCode()"
style="margin-left: 15px"
- >添加
+ >添加
@@ -292,6 +301,7 @@
@@ -308,9 +318,9 @@ import {
updateCodeBindSup,
enterCodeWeb,
} from "../../api/inout/order";
-import {findByFrom, findInvByUser} from "../../api/system/invSubWarehouse";
-import {parseTime} from "../../utils/coTools";
-import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain";
+import { findByFrom, findInvByUser } from "../../api/system/invSubWarehouse";
+import { parseTime } from "../../utils/coTools";
+import { getBasicUnitMaintains } from "../../api/basic/basicUnitMaintain";
import editCodeDialog from "./DialogEditCode";
import DialogCreateOrderSelect from "./DialogCreateOrderSelect";
@@ -318,7 +328,7 @@ import codesPanel from "./PanelCreateOrderCodes";
import codeDetailPanel from "./PanelCreateOrderCodeDetail";
import bizDetailPanel from "./PanelCreateOrderBizDetail";
import A from "../../plugins/KeyScaner";
-import {findByInvUser} from "@/api/basic/busType";
+import { findByInvUser } from "@/api/basic/busType";
export default {
name: "ioCreateOrder",
@@ -388,20 +398,20 @@ export default {
formRules: {
corpOrderId: [
- {required: true, message: "请输入单据号", trigger: "blur"},
+ { required: true, message: "请输入单据号", trigger: "blur" },
],
createTime: [
- {required: true, message: "请选择创建时间", trigger: "blur"},
+ { required: true, message: "请选择创建时间", trigger: "blur" },
],
invCode: [
- {required: true, message: "请选择当前仓库", trigger: "change"},
+ { required: true, message: "请选择当前仓库", trigger: "change" },
],
action: [
- {required: true, message: "请选择单据类型", trigger: "change"},
+ { required: true, message: "请选择单据类型", trigger: "change" },
],
acceptance: [
- {required: true, message: "请选入预验收单据", trigger: "blur"},
- ]
+ { required: true, message: "请选入预验收单据", trigger: "blur" },
+ ],
},
isScan: true,
scanText: "扫码录入：",
@@ -430,8 +440,7 @@ export default {
viewBizVisible: false,
viewCodeVisible: false,
viewCodeDetailVisible: false,
-
- documentShow: false,//控制预选单显示隐藏
+ documentShow: false, //控制预选单显示隐藏
};
},
components: {
@@ -457,18 +466,18 @@ export default {
this.getBusTypeByInv();
}
})
- .catch(() => {
- });
+ .catch(() => {});
},
- //接收预选单传值
+ //接收预验单传值
giveselectbox(val) {
- this.orderFormData.checkPreInOrders = val;
+ this.orderFormData.checkPreInOrders = JSON.parse(JSON.stringify(val));
},
//仓库改变
changeInv() {
this.orderFormData.action = null;
- if (this.documentShow = true) {
- this.documentShow = false
+ this.orderFormData.checkPreInOrders = null;
+ if ((this.documentShow = true)) {
+ this.documentShow = false;
}
this.getBusTypeByInv();
},
@@ -482,8 +491,7 @@ export default {
.then((response) => {
this.busTypeOptions = response.data || [];
})
- .catch(() => {
- });
+ .catch(() => {});
},
//关闭预选单弹框
closeDialogtwo() {
@@ -515,8 +523,7 @@ export default {
this.bizShow = true;
} else this.bizShow = false;
})
- .catch(() => {
- });
+ .catch(() => {});
},
//获取往来单位候选列表
@@ -550,6 +557,8 @@ export default {
//单据类型改变
actionChange(item) {
+ this.orderFormData.checkPreInOption = null;
+ this.orderFormData.checkPreInOrders = null;
this.curAction = this.getActionItem(item);
if (
(this.curAction.checkEnable && this.curAction.checkWebNew) ||
@@ -571,13 +580,13 @@ export default {
this.orderFormData.fromInvCode = null;
this.findFromInvList();
}
- if (this.curAction.scanPreIn && this.curAction.backPreinType == 1) {
- this.documentShow = true
+ if (
+ (this.curAction.scanPreIn = true && this.curAction.backPreinType == 1)
+ ) {
+ this.documentShow = true;
} else {
- this.documentShow = false
+ this.documentShow = false;
}
- this.giveselectbox();
-
},
//获取往来仓库列表
@@ -592,8 +601,7 @@ export default {
this.orderFormData.fromInvCode = this.fromInvOptions[0].code;
}
})
- .catch(() => {
- });
+ .catch(() => {});
},
//获取当前单据类型
@@ -666,8 +674,7 @@ export default {
confirmButtonText: "确定",
type: "warning",
closeOnClickModal: true,
- callback: (action) => {
- },
+ callback: (action) => {},
});
}
this.corpOrderIdDisabled = true;
@@ -697,8 +704,7 @@ export default {
tQuery.ignoreExpire = true;
this.addCodeSubmit(tQuery);
})
- .catch(() => {
- });
+ .catch(() => {});
} else if (response.code == 505) {
this.$confirm(response.message, "提示", {
confirmButtonText: "确定",
@@ -709,29 +715,24 @@ export default {
tQuery.ignoreRecentExpire = true;
this.addCodeSubmit(tQuery);
})
- .catch(() => {
- });
+ .catch(() => {});
} else if (response.code == 605) {
this.$confirm(response.message, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
- }).then(() => {
-
- }).catch(() => {
-
- });
+ })
+ .then(() => {})
+ .catch(() => {});
return;
} else if (response.code == 604) {
this.$confirm(response.message, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
- }).then(() => {
-
- }).catch(() => {
-
- });
+ })
+ .then(() => {})
+ .catch(() => {});
return;
} else if (response.code == 507) {
this.editOriginCodeVisible = true;
@@ -925,8 +926,7 @@ export default {
this.$message.error(response.message);
}
})
- .catch(() => {
- });
+ .catch(() => {});
},
closeCodeDialog() {
this.editOriginCodeVisible = false;
diff --git a/src/views/inout/DialogCreateOrderSelect.vue b/src/views/inout/DialogCreateOrderSelect.vue
index b7ba9c4a..f108ef9c 100644
--- a/src/views/inout/DialogCreateOrderSelect.vue
+++ b/src/views/inout/DialogCreateOrderSelect.vue
@@ -64,15 +64,20 @@
-
+
{
- // // 每一项的单号
- // return item.billNo
- // })
- // this.selectbox=qwe
- // },
+ //选择框根据已选入判断禁用方法
+ checkSelection(row, index) {
+ let flag = true;
+ if (this.checkPreInOrders.length === 0) {
+ flag = true;
+ } else {
+ if (this.checkPreInOrders.includes(row.billNo)) {
+ flag = false;
+ } else {
+ flag = true;
+ }
+ }
+ return flag;
+ },
//关闭对话框
closeLocalDialog() {
},
@@ -377,10 +390,21 @@ export default {
.catch(() => {
});
},
+ //多行勾选
handleSelectionChange(val) {
- this.currentRow = val;
- console.log(this.currentRow.billNo);
- this.getOrderDetails();
+ let checkboxs = JSON.parse(JSON.stringify(val));
+ this.multipleSelection = checkboxs.map((item) => {
+ return item.billNo;
+ });
+ let hebin = [...this.checkPreInOrders, ...this.multipleSelection];
+ let boxarry = Array.from(new Set(hebin));
+ this.selectbox = boxarry;
+ },
+ //全选
+ handleAll(selection) {
+ if(selection.length==0){
+ this.$refs.multipleTable.clearSelection()
+ }
},
// 获取单据 业务详情、扫码详情、扫码明细
getOrderDetails() {
@@ -644,4 +668,5 @@ export default {
diff --git a/src/views/system/dept/authDept.vue b/src/views/system/dept/authDept.vue
index 2aa03b6b..4d082a71 100644
--- a/src/views/system/dept/authDept.vue
+++ b/src/views/system/dept/authDept.vue
@@ -255,6 +255,7 @@
移除
diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue
index dcdf99ad..469f037e 100644
--- a/src/views/system/dept/invWarehouse.vue
+++ b/src/views/system/dept/invWarehouse.vue
@@ -9,6 +9,20 @@
placeholder="仓库名称"
>
+
+
+
+
+
+
+
+
重置
@@ -28,34 +42,48 @@
>
+
+
+
+
+ {{ advanceTypeTypeMap[scope.row.advanceType] }}
+
+
-
-
-
-
-
-
-
-
-
+
+
+ {{
+ scope.row.spUse | spUerFilterName
+ }}
+
+
+
+
-
-
-
-
-
+
+
+
+
+
@@ -395,17 +424,22 @@ export default {
// page: 1,
// limit: 10,
},
- isAdvanceTypeShow:false,
- isShow:false,
+ isAdvanceTypeShow: false,
+ isShow: false,
loading: true,
list: [],
isExpandAll: true,
total: 0,
+ advanceTypeTypeMap: {
+ 1: "入账库",
+ 3: "寄售库",
+ 2: "预验收库",
+ },
formMap: {
add: "仓库信息-新增",
edit: "仓库信息-编辑"
},
- invWouse:{},
+ invWouse: {},
formName: null,
configParms: {},
currentCode: null,
@@ -424,6 +458,7 @@ export default {
]
},
subData: {},
+ subDataType:{},
fromDeptOptions: [],
invOptions: [],
thirdSubQuery: {
@@ -448,6 +483,7 @@ export default {
},
sysList: [],
sysSubList: [],
+ advanceTypese: [],
};
},
methods: {
@@ -460,6 +496,7 @@ export default {
name: "",
status: "",
};
+ this.subDataType.advanceType=null;
this.getList();
//置空用户列表和货位信息列表的参数
@@ -472,6 +509,7 @@ export default {
},
onSubmit() { //提交查询
+ this.query.advanceType=this.subDataType.advanceType;
this.getList();
},
@@ -483,6 +521,7 @@ export default {
this.loading = false;
let invlist = response.data || [];
this.list = this.handleTree(invlist, "code", "parentCode");
+ console.log(this.list);
})
.catch(() => {
this.loading = false;
@@ -491,34 +530,38 @@ export default {
});
},
handleSubForm(data, formName) { //新增，编辑
- if(data != null ){
- this.invWouse=data;
+ if (data != null) {
+ this.invWouse = data;
}
this.formName = formName;
if (formName === "edit") {
this.subData = JSON.parse(JSON.stringify(data));
- this.subData.advanceType=this.subData.advanceType.toString();
- if(this.subData.parentCode!=null && this.subData.parentCode!=""){
- this.isAdvanceTypeShow=true;
- this.isShow=false;
- }else{
- this.isAdvanceTypeShow=false;
- this.isShow=true
- this.subData.parentCode=null;
+ this.subData.advanceType = this.subData.advanceType.toString();
+ if (this.subData.parentCode != null && this.subData.parentCode != "") {
+ this.isAdvanceTypeShow = true;
+ this.isShow = false;
+ } else {
+ this.isAdvanceTypeShow = false;
+ this.isShow = true
+ this.subData.parentCode = null;
}
} else if (formName === "add") {
- this.isShow=true
- if(data==null){
- this.isAdvanceTypeShow=false;
- this.subData = {advanceType: '1', spUse: false,parentCode:null};
- }else{
- this.isAdvanceTypeShow=true;
- this.subData = {advanceType: data.advanceType.toString(), spUse: false,parentCode:data.code};
+ this.isShow = true
+ if (data == null) {
+ this.isAdvanceTypeShow = false;
+ this.subData = {advanceType: '1', spUse: false, parentCode: null};
+ } else {
+ this.isAdvanceTypeShow = true;
+ this.subData = {advanceType: data.advanceType.toString(), spUse: false, parentCode: data.code};
}
}
+ //转换
+ let advanceTypese = this.subData.advanceType
+
+
this.subFormVisible = true;
this.getSubThrsysDetailData();
- if(this.subData.parentCode!=null && this.subData.parentCode!=""){
+ if (this.subData.parentCode != null && this.subData.parentCode != "") {
filterSubAll(this.query)
.then((response) => {
let invList = response.data || [];
diff --git a/src/views/system/print/pdfBizPrintSet.vue b/src/views/system/print/pdfBizPrintSet.vue
index 13f8dcb1..fbbc97b9 100644
--- a/src/views/system/print/pdfBizPrintSet.vue
+++ b/src/views/system/print/pdfBizPrintSet.vue
@@ -474,7 +474,7 @@ export default {
};
this.moduleFormVisible = true;
this.selectTemplateQuery = {
- module: row.templateType,
+ module: 2,
busRlId: row.id,
type: 1,
name: "",
diff --git a/src/views/system/print/pdfCodePrintSet.vue b/src/views/system/print/pdfCodePrintSet.vue
index 83e938c9..2af1aacb 100644
--- a/src/views/system/print/pdfCodePrintSet.vue
+++ b/src/views/system/print/pdfCodePrintSet.vue
@@ -474,7 +474,7 @@ export default {
};
this.moduleFormVisible = true;
this.selectTemplateQuery = {
- module: row.templateType,
+ module: 2,
busRlId: row.id,
type: 1,
name: "",
diff --git a/src/views/system/print/pdfLabelPrintSet.vue b/src/views/system/print/pdfLabelPrintSet.vue
index 55286b29..3071d96a 100644
--- a/src/views/system/print/pdfLabelPrintSet.vue
+++ b/src/views/system/print/pdfLabelPrintSet.vue
@@ -473,7 +473,7 @@ export default {
};
this.moduleFormVisible = true;
this.selectTemplateQuery = {
- module: row.templateType,
+ module: 0,
busRlId: row.id,
type: 1,
name: "",
diff --git a/src/views/system/print/pdfStatementPrintSet.vue b/src/views/system/print/pdfStatementPrintSet.vue
index 6affff19..7859b488 100644
--- a/src/views/system/print/pdfStatementPrintSet.vue
+++ b/src/views/system/print/pdfStatementPrintSet.vue
@@ -473,7 +473,7 @@ export default {
};
this.moduleFormVisible = true;
this.selectTemplateQuery = {
- module: row.templateType,
+ module: 1,
busRlId: row.id,
type: 1,
name: "",
diff --git a/vue.config.js b/vue.config.js
index cfcca24b..eef5677e 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,7 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- target: `http://127.0.0.1:9991/`,
+ target: `http://192.168.0.166:9991/`,
changeOrigin: true,
pathRewrite: {
["^" + process.env.VUE_APP_BASE_API]: "",