Skip to content

L
Laisi_AutoMES2
Commit 4e5891a7 by xin.yang
Options

Merge branch 'master' of http://test.siger-data.com:9000/jiawei.su/Laisi_AutoMES2

parents 14475821 17804432
Showing with 355 additions and 6 deletions
Html/src/view/fms/config/typeMaintenance.vue
<template>
<div>
<div class="divborder newSearchDiv">
<div class="filter">
<label>工装类型：</label>
<Cascader class="searchSelect" :data="frockTypeTree" change-on-select v-model="frockType" @on-change="changeFrockType"></Cascader>
</div>
<div class="searchBtn">
<Button type="primary" class="twoWord" icon="ios-search" @click="tosearch()">{{ $t(1001) }}</Button>
<Button type="success" class="twoWord" icon="md-add-circle" @click="add()">{{$t('1002')}}</Button>
<!-- <Button type="warning" class="twoWord" icon="ios-create-outline" @click="edit()">{{$t('1003')}}</Button>
<Button type="error" class="twoWord intervalRight" icon="md-close-circle" @click="dele()">{{ $t(1004) }}</Button>
<Button type="primary" class="fourWord" icon="md-download" @click="loadexcel()">{{$t('1005')}}</Button>
<Upload
style="display:inline-block"
ref="upload"
:action="action"
name="excel-file"
:headers="headers"
:show-upload-list="false"
:on-format-error="handleFormatError"
:on-success="handleSuccess"
:on-error="handleError"
:format="['xlsx']"
>
<Button
type="primary"
class="fourWord"
icon="md-cloud-upload"
>{{$t('1006')}}</Button>
</Upload>
<Button type="primary" class="fourWord" icon="ios-cloud-download" @click="Export()">{{$t('1007')}}</Button> -->
</div>
</div>
<div class="divborder newTableDiv">
<Table
class="tableClass"
@on-current-change="handleRowChange"
highlight-row
:data="tableData1"
:columns="tableColumns1"
></Table>
<div class="pageDiv">
<div class="pageDirection">
<Page
:total="total"
:current="page"
@on-change="changePage"
show-elevator
show-sizer
show-total
@on-page-size-change="handlePageSize"
:page-size-opts="[10,20,30,40,100]"
></Page>
</div>
</div>
</div>
<Modal class="newModalClass" v-model="addmodal" :styles="{width:'400px'}">
<p slot="header">
<span v-show="type==1">{{$t('1002')}}</span>
<span v-show="type==2">{{$t('1003')}}</span>
</p>
<div style="">
<div class="filter">
<label>上级类型：</label>
<Cascader class="searchSelect" :data="frockTypeTree" change-on-select v-model="parentType" @on-change="changeFrockType1"></Cascader>
</div>
<div class="filter">
<label><i>*</i>工装类型：</label>
<Input type="text" class="searchInput" v-model="frockTypename" />
</div>
</div>
<div slot="footer">
<Button type="text" size="large" @click="this.addmodal=false">{{$t('1033')}}</Button>
<Button type="primary" size="large" @click="addPost()">{{$t('1011')}}</Button>
</div>
</Modal>
</div>
</template>
<script>
export default {
data(){
return{
frockTypeTree:[],//树形结构
frockType:[],//工装类型
frockTypeid:'',
total:0,
page:1,
pagesize:10,
tableData1:[],
tableColumns1:[
{
type: "index2",
title: this.$t("1008"),
key: "xuhao",
render: (h, params) => {
return h(
"span",
params.index + (this.page - 1) * this.pagesize + 1
);
},
},
{
title:'工装类型',
key:'frockType'
},
{
title:'上级类型',
key:'parentType'
}
],
addmodal:false,//添加编辑弹窗
type:1,//1添加 2编辑
parentType:[],//父级类型
parentTypeid:'',
frockTypename:'',//工装类型名称
}
},
created(){
this.initFrockType();//工装类型树形结构
},
methods:{
//工装类型
initFrockType(){
// this.axios.request({
// url: "/fms/typeMaintenance/frockTypeList",
// method: "get",
// })
// .then((res) => {
// if (res.data.ret == 1) {
// let arr = res.data.data.children;
// this.frockTypeTree = arr;
// this.contentTree(arr);
// }
// });
},
contentTree (arr) {
arr.forEach(ele => {
ele.disabled = false;
ele.value = ele.id;
ele.label = ele.name;
if (
ele.children.length != 0 &&
ele.children != undefined &&
ele.children != null
) {
this.contentTree(ele.children);
}
});
},
changeFrockType(value){
this.frockTypeid = "";
if(value!=undefined && value.length){
this.frockTypeid = value[value.length - 1];
}
},
changeFrockType1(value){
this.parentTypeid = "";
if(value!=undefined && value.length){
this.parentTypeid = value[value.length - 1];
}
},
tosearch(){
this.page = 1;
this.pagesize = 10;
this.search(0);
},
search(toexcel){
let params = {
frockTypeid:this.frockTypeid,//工装类型id
page:this.page,
pagesize:this.pagesize,
toexcel:toexcel //0查询 1导出
}
this.detailobj = {};
// this.axios.request({
// url: "/fms/typeMaintenance/search",
// params,
// method: "get",
// })
// .then((res) => {
// if(toexcel === 1){
// if (res.data.ret === 1) {
// window.location.href =
// axios.publicPath + "" + res.data.data;
// } else {
// this.$Message.error(this.$t(res.data.msg));
// }
// }
// else{
// this.total = 0;
// this.tableData1 = [];
// let data = res.data.data;
// if (res.data.ret == 1 &&Array.isArray(data)&&data.length) {
// this.total = res.data.total;
// this.tableData1 = res.data.data;
// }
// }
// });
},
add(){
this.addmodal = true;
this.type = 1;
},
addPost(){
if(!this.frockTypename.trim()){
this.$Message.error("请输入工装类型");
return false;
}
let url = '';
let id = '';
if(this.type === 1){
url = '/fms/typeMaintenance/add';
id = 0;
}
else{
url = '/fms/typeMaintenance/update';
id = this.detailobj.id;
}
let data = {
id:id,
parentid:0,
name:''
}
this.axios.request({
url: "/fms/typeMaintenance/frockTypeList",
method: "get",
}).then((res) => {
if (res.data.ret == 1) {
this.addmodal = false;
if(this.type===1){
this.tosearch();
this.$Message.success(this.$t('1055'));
}
else{
this.$Message.success(this.$t('1060'));
this.search(0);
}
} else {
this.$Message.error(this.$t(res.data.msg+''));
}
});
},
handleRowChange(currentRow, oldCurrentRow) {
this.detailobj = currentRow;
},
handlePageSize(value) {
this.page = 1;
this.pagesize = value;
this.search(0);
},
changePage(value) {
this.page = value;
this.search(0);
},
}
}
</script>
<style>
</style>
\ No newline at end of file
Html/src/view/wms/config/storagemaintenance.vue
......@@ -250,7 +250,8 @@ export default {
(res) => {
this.total = 0;
this.tableData1 = [];
if (res.data.ret == 1) {
let data = res.data.data;
if (res.data.ret == 1 &&Array.isArray(data)&&data.length) {
this.total = res.data.total;
this.renderTable(res.data.data);
}
......
Html/src/view/wms/whStatusQuery/storageInfoQuery.vue
......@@ -67,6 +67,52 @@
</div>
</div>
</div>
<Modal class="newModalClass" v-model="addmodal" :styles="{width:'400px'}">
<p slot="header">
<span v-show="type==1">{{$t('1002')}}</span>
<span v-show="type==2">{{$t('1003')}}</span>
</p>
<div style="">
<div class="filter">
<label><i>*</i>{{ $t(8070) }}：</label>
<Select v-model="warehouseid1" label-in-value clearable filterable filter-by-label class="searchSelect">
<Option
v-for="(item,index) in whdata1"
:value="item.id"
:key="index"
:label="item.name"
>{{ item.name }}</Option
>
</Select>
</div>
<div class="filter">
<label><i>*</i>储位信息：</label>
<Input type="text" class="searchInput" v-model="warehouseid1" />
</div>
<div class="filter">
<label><i>*</i>工装类别：</label>
<Input type="text" class="searchInput" v-model="warehouseid1" />
</div>
<div class="filter">
<label><i>*</i>工装编号：</label>
<Input type="text" class="searchInput" v-model="warehouseid1" />
</div>
<div class="filter">
<label><i>*</i>附件：</label>
<Input type="text" class="searchInput" v-model="warehouseid1" />
</div>
<div class="filter">
<label><i>*</i>备注：</label>
<Input type="text" class="searchInput" v-model="warehouseid1" />
</div>
</div>
<div slot="footer">
<Button type="text" size="large" @click="this.modal=false">{{$t('1033')}}</Button>
<Button type="primary" size="large" @click="addPost()">{{$t('1011')}}</Button>
</div>
</Modal>
</div>
</template>
<script>
......@@ -157,6 +203,10 @@ export default {
key:'datetime'
}
],
addmodal:true, //添加弹窗
whdata1:[],//仓库数据集合
warehouseid1:'',//仓库id
}
},
......@@ -238,10 +288,41 @@ export default {
tosearch(){
this.page = 1;
this.pagesize = 10;
this.search();
this.search(0);
},
search(){
search(toexcel){
let params = {
warehouseid:this.warehouseid,//仓库id
storageid:this.storageid,//储位id
page:this.page,
pagesize:this.pagesize,
toexcel:toexcel //0查询 1导出
}
this.detailobj = {};
this.axios.request({
url: "/wms/storageInfoQuery/search",
params,
method: "get",
})
.then((res) => {
if(toexcel === 1){
if (res.data.ret === 1) {
window.location.href =
axios.publicPath + "" + res.data.data;
} else {
this.$Message.error(this.$t(res.data.msg));
}
}
else{
this.total = 0;
this.tableData1 = [];
let data = res.data.data;
if (res.data.ret == 1 &&Array.isArray(data)&&data.length) {
this.total = res.data.total;
this.tableData1 = res.data.data;
}
}
});
},
handleRowChange(currentRow, oldCurrentRow) {
this.detailobj = currentRow;
......@@ -249,11 +330,11 @@ export default {
handlePageSize(value) {
this.page = 1;
this.pagesize = value;
this.search();
this.search(0);
},
changePage(value) {
this.page = value;
this.search();
this.search(0);
},
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment