UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
prod
anthonywj 3 years ago
parent 51d0dcf4af 3bfc612522
commit 5c6fca4e80
9 changed files with 194 additions and 125 deletions
Show Stats Download Patch File Download Diff File

80
src/views/inout/DialogCreateOrder.vue
Unescape Escape View File

@ -188,11 +188,20 @@
<el-row v-if="documentShow">
<el-col :span="11">
<el-form-item prop="acceptance" label="预验收单据:">
<el-input
<el-select
style="width: 90%"
:disabled="true"
v-model="orderFormData.checkPreInOrders"
></el-input>
multiple
placeholder="请选入单据"
>
<el-option
v-for="(item, index) in orderFormData.checkPreInOrders"
:key="item.index"
:label="item"
:value="item"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
@ -292,6 +301,7 @@
<dialog-create-order-select
@giveselectbox="giveselectbox"
:closeDialogtwo="closeDialogtwo"
:checkPreInOrders="orderFormData.checkPreInOrders"
>
</dialog-create-order-select>
</el-dialog>
@ -401,7 +411,7 @@ export default {
],
acceptance: [
{ required: true, message: "请选入预验收单据", trigger: "blur" },
]
],
},
isScan: true,
scanText: "扫码录入：",
@ -430,7 +440,6 @@ export default {
viewBizVisible: false,
viewCodeVisible: false,
viewCodeDetailVisible: false,
documentShow: false, //控制预选单显示隐藏
};
},
@ -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;

65
src/views/inout/DialogCreateOrderSelect.vue
Unescape Escape View File

@ -64,15 +64,20 @@
<el-divider style="margin: 15px"></el-divider>
<el-table
ref="multipleTable"
@select="select"
@select-all="handleAll"
:header-cell-class-name="leftheaderStyle"
@selection-change="handleSelectionChange"
v-loading="loading"
:data="list"
style="width: 100%"
highlight-current-row
border
@row-click="handleSelectionChange"
>
<!-- <el-table-column type="selection" width="55"></el-table-column> -->
<el-table-column
type="selection"
:selectable="checkSelection"
width="55"
></el-table-column>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="扫码单据类型"
@ -192,6 +197,10 @@ export default {
type: Function,
required: true,
},
checkPreInOrders: {
type: Array,
required: true,
},
},
data() {
return {
@ -306,8 +315,9 @@ export default {
resultTotal: 0,
resultDetailLoading: false,
resultDetailList: [],
selectboxs: [],
selectbox: "",
multipleSelection: [],
selectbox: [],
selectRow: null,
};
},
components: {},
@ -345,20 +355,23 @@ export default {
//选入
combine() {
this.closeDialogtwo();
this.$emit("giveselectbox", this.currentRow.billNo);
this.$emit("giveselectbox", this.selectbox);
},
// //选择
// select(selection,row){
// // console.log(row);
// this.selectboxs.push(row)
// let nerArr = JSON.parse(JSON.stringify(this.selectboxs))
// let qwe = nerArr.map(item=>{
// // 每一项的单号
// 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 {
</script>
<style type="text/scss" lang="scss">
</style>

1
src/views/system/dept/authDept.vue
Unescape Escape View File

@ -255,6 +255,7 @@
<template slot-scope="scope">
<el-button
type="text"
:disabled="scope.row.userId == 1"
@click.native.stop="removeUserDialog(scope.row)"
>移除
</el-button>

77
src/views/system/dept/invWarehouse.vue
Unescape Escape View File

@ -9,6 +9,20 @@
placeholder="仓库名称"
></el-input>
</el-form-item>
<!-- <el-form-item class="query-form-item" label="仓库类型:">
<el-input
clearable
placeholder="仓库类型"
></el-input>
</el-form-item> -->
<el-form-item label="仓库类型" prop="advanceType">
<el-select v-model="subDataType.advanceType" placeholder="请选择仓库类型" style="width: 80%">
<el-option label="入账库" :value="1"/>
<el-option label="预验收库" :value="2"/>
<el-option label="寄售库" :value="3"/>
</el-select>
</el-form-item>
<el-form-item>
<el-button-group style="margin-left: 10px;display:flex;">
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
@ -28,34 +42,48 @@
>
<el-table-column label="序号" type="index" ref="dataForm"></el-table-column>
<el-table-column
prop="name"
label="仓库名称"
prop="code"
width="140"
label="仓库编码"
>
</el-table-column>
<el-table-column
prop="code"
label="仓库编码"
width="160"
prop="name"
label="仓库名称"
>
</el-table-column>
<el-table-column
prop="parentName"
width="180"
label="所属部门"
>
</el-table-column>
<el-table-column
<el-table-column width="160"
prop="parentInvName"
label="上级仓库"
>
</el-table-column>
<!--<el-table-column label="允许供应商使用" prop="spUse">-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag :type="scope.row.spUse | spUerFilterType">{{-->
<!-- scope.row.spUse | spUerFilterName-->
<!-- }}-->
<!-- </el-tag>-->
<!-- </template>-->
<!--</el-table-column>-->
<el-table-column label="操作" class-name="small-padding fixed-width">
<el-table-column
width="140"
prop="advanceType"
label="仓库类型"
>
<template slot-scope="scope">
<span>{{ advanceTypeTypeMap[scope.row.advanceType] }}</span>
</template>
</el-table-column>
<el-table-column label="允许供应商使用" prop="spUse" width="140">
<template slot-scope="scope">
<el-tag :type="scope.row.spUse | spUerFilterType">{{
scope.row.spUse | spUerFilterName
}}
</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="220">
<template slot-scope="scope">
<el-button
type="text"
@ -169,10 +197,11 @@
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<el-form-item label="仓库类型" prop="advanceType">
<el-select v-model="subData.advanceType" :disabled="invWouse != null" placeholder="请选择仓库类型" style="width: 80%">
<el-select v-model="subData.advanceType" :disabled="invWouse != null" placeholder="请选择仓库类型"
style="width: 80%">
<el-option label="入账库" value="1"/>
<el-option label="寄售库" value="2"/>
<el-option label="预验收库" value="3"/>
<el-option label="预验收库" value="2"/>
<el-option label="寄售库" value="3"/>
</el-select>
</el-form-item>
@ -401,6 +430,11 @@ export default {
list: [],
isExpandAll: true,
total: 0,
advanceTypeTypeMap: {
1: "入账库",
3: "寄售库",
2: "预验收库",
},
formMap: {
add: "仓库信息-新增",
edit: "仓库信息-编辑"
@ -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;
@ -516,6 +555,10 @@ export default {
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 != "") {

2
src/views/system/print/pdfBizPrintSet.vue
Unescape Escape View File

@ -474,7 +474,7 @@ export default {
};
this.moduleFormVisible = true;
this.selectTemplateQuery = {
module: row.templateType,
module: 2,
busRlId: row.id,
type: 1,
name: "",

2
src/views/system/print/pdfCodePrintSet.vue
Unescape Escape View File

@ -474,7 +474,7 @@ export default {
};
this.moduleFormVisible = true;
this.selectTemplateQuery = {
module: row.templateType,
module: 2,
busRlId: row.id,
type: 1,
name: "",

2
src/views/system/print/pdfLabelPrintSet.vue
Unescape Escape View File

@ -473,7 +473,7 @@ export default {
};
this.moduleFormVisible = true;
this.selectTemplateQuery = {
module: row.templateType,
module: 0,
busRlId: row.id,
type: 1,
name: "",

2
src/views/system/print/pdfStatementPrintSet.vue
Unescape Escape View File

@ -473,7 +473,7 @@ export default {
};
this.moduleFormVisible = true;
this.selectTemplateQuery = {
module: row.templateType,
module: 1,
busRlId: row.id,
type: 1,
name: "",

2
vue.config.js
Unescape Escape View File

@ -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]: "",

Write Preview
Loading…
Cancel
Save