Skip to content

T
tianjin
Commit df32524e authored by 徐来柯's avatar 徐来柯
Browse files
Options

update

parent cb201e79
Hide whitespace changes
Inline Side-by-side
Showing with 260 additions and 138 deletions
src/views/education/MaterialWarehousingMoudle.vue
View file @ df32524e
<template> <template>
<div class="box-container"> <div class="box-container">
<div class="wrap"> <div class="wrap">
<search-form :formList="[1,2,3]" :btnList="[1,2]" @openDialog="openDialog" @delData="delData" /> <search-form :formList="[1,2,3]" :btnList="[1,2]" :formData="formData" @searchData="searchData" @openDialog="openDialog" @delData="delData" />
<el-table <el-table
border border
height="675" height="675"
...@@ -24,11 +24,11 @@ ...@@ -24,11 +24,11 @@
<el-table-column <el-table-column
label="入库编号" label="入库编号"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="SID" prop="MHSort"
width="180"> width="180">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="ProductName" prop="xtid"
label="线体编号" label="线体编号"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="180"> width="180">
...@@ -36,47 +36,47 @@ ...@@ -36,47 +36,47 @@
<el-table-column <el-table-column
label="线体名称" label="线体名称"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="ProductType" prop="linname"
width="180"> width="180">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="物料编号" label="物料编号"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="PlanType" prop="MHSort"
width="180"> width="180">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="物料名称" label="物料名称"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="PlanType" prop="wlname"
width="180"> width="180">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="物料描述" label="物料描述"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="PlanType" prop="wlDesc"
width="210"> width="210">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="单位" label="单位"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="LineName" prop="Company"
width="140"> width="140">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="入库数量" label="入库数量"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="UserName" prop="MHNuber"
width="180"> width="180">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="入库时间" label="入库时间"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="StartDt" prop="UpdateTime"
> >
</el-table-column> </el-table-column>
</el-table> </el-table>
<Pagination @pageFun="pageFun" /> <Pagination :totalCount="totalCount" :pageIndex="pageIndex" :totalPage="totalPage" @pageFun="pageFun" />
</div> </div>
<store-dialog :titleText="'物料入库单'" v-if="popShow" @closeDialog="closeDialog" @conserve="conserve" /> <store-dialog :titleText="'物料入库单'" v-if="popShow" @closeDialog="closeDialog" @conserve="conserve" />
<delete-pop ref="delete" :deletetext="deletetext" :type="typeV" v-if="deleteShow"></delete-pop> <delete-pop ref="delete" :deletetext="deletetext" :type="typeV" v-if="deleteShow"></delete-pop>
...@@ -95,17 +95,63 @@ export default { ...@@ -95,17 +95,63 @@ export default {
return { return {
tableData: [], tableData: [],
AllTableData: [], AllTableData: [],
formData: {
argKeyWord: '',
argWhere: '',
dateValue: [this.$moment().format('YYYY-MM-DD 00:00:00'), this.$moment().format('YYYY-MM-DD 23:59:59')],
scanValue: '',
},
popShow: false, popShow: false,
checkList: [], checkList: [],
deletetext: '', deletetext: '',
deleteShow: false, deleteShow: false,
typeV: '', typeV: '',
// 分页数据
totalCount: 0,
pageIndex: 1,
totalPage: 1,
} }
}, },
mounted() { created() {
this.searchData()
this.scanGunCode() this.scanGunCode()
}, },
methods: { methods: {
searchData () {
var $this = this
var postData = {
argKeyWord: this.formData.argKeyWord,
argWhere: this.formData.argWhere,
Stime: this.formData.dateValue ? this.$moment(this.formData.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '',
Etime: this.formData.dateValue ? this.$moment(this.formData.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
}
this.$axios({
method:"post",
url:`/api/MaterialWarehousing/MaterialWarehousing_Query?argKeyWord=${postData.argKeyWord}&argWhere=${postData.argWhere}&Stime=${postData.Stime}&Etime=${postData.Etime}`,
}).then((res)=>{
if(res.data.data.length != 0 ){
this.AllTableData = res.data.data.map(item => ({
...item,
UpdateTime: this.$moment(item.UpdateTime).format('YYYY-MM-DD HH:mm:ss')
}))
if(this.AllTableData.length >50){
this.tableData = this.AllTableData.slice(0,50)
}else{
this.tableData = this.AllTableData
}
this.totalCount = this.AllTableData.length
this.pageIndex = 1
this.totalPage = Math.ceil(this.AllTableData.length / 50)
}else{
this.tableData = []
this.totalCount = 0
this.pageIndex = 1
this.totalPage = 1
}
}).catch(function(err){
console.log('err',err)
})
},
handleSelectionChange (val) { handleSelectionChange (val) {
this.checkList = val this.checkList = val
}, },
...@@ -208,9 +254,28 @@ export default { ...@@ -208,9 +254,28 @@ export default {
} }
}, },
delData () { delData () {
if (this.checkList.length === 0) { var $this = this
this.deleteShow = true if ($this.checkList.length === 0) {
this.typeV = 2 $this.deleteShow = true
$this.typeV = 2
} else {
var list = []
$this.checkList.forEach((item) => {
list.push(item.ID)
})
$this.$axios({
method:"post",
url:`/api/MaterialDelivery/MaterialDelivery_Delete`,
data:list
}).then((res)=>{
var postData = {
argKeyWord: this.formData.argKeyWord,
argWhere: this.formData.argWhere,
Stime: $this.$refs.dateValue ? $this.$moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '',
Etime: $this.$refs.dateValue ? $this.$moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
}
$this.searchData(postData)
})
} }
}, },
//关闭提示弹窗 //关闭提示弹窗
...@@ -224,8 +289,30 @@ export default { ...@@ -224,8 +289,30 @@ export default {
this.popShow = false this.popShow = false
}, },
conserve (data) { conserve (data) {
console.log(data) var $this = this
this.popShow = false this.$axios({
method:"post",
url:`/api/MaterialWarehousing/MWarehousing_WindowAddSave`,
data:data
}).then((res)=>{
if(res.data.code != 0){
$this.typeV = '5'
$this.deleteShow = true
}else{
$this.typeV = '6'
$this.popShow = false
}
$this.deletetext = res.data.msg
var postData = {
argKeyWord: this.formData.argKeyWord,
argWhere: this.formData.argWhere,
Stime: $this.$refs.dateValue ? $this.$moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '',
Etime: $this.$refs.dateValue ? $this.$moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
}
$this.searchData(postData)
}).catch(function(err){
console.log('err',err)
})
} }
} }
} }
......
src/views/education/component/Pagination.vue
View file @ df32524e
...@@ -19,13 +19,27 @@ ...@@ -19,13 +19,27 @@
<script> <script>
export default { export default {
props: {
totalCount: {
type: Number,
default: 0,
},
pageIndex: {
type: Number,
default: 1,
},
totalPage: {
type: Number,
default: 1,
}
},
data () { data () {
return { return {
num: 1, num: 1,
// 首字母已改为小写 // 首字母已改为小写
totalCount: 1, // totalCount: 1,
pageIndex: 1, // pageIndex: 1,
totalPage: 1, // totalPage: 1,
pageSize: 50, pageSize: 50,
} }
}, },
......
src/views/education/component/SearchForm.vue
View file @ df32524e
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
<div class="search-list" > <div class="search-list" >
<div class="search-block" v-if="formList.includes(1)" > <div class="search-block" v-if="formList.includes(1)" >
<span class="search" >{{headText}}:</span> <span class="search" >{{headText}}:</span>
<el-select class="selectName" v-model="selectValue" placeholder="请选择"> <el-select class="selectName" v-model="formData.argWhere" placeholder="请选择">
<el-option <el-option
v-for="item in searchList" v-for="item in searchList"
:key="item.name" :key="item.name"
:label="item.name" :label="item.id"
:value="item.name"> :value="item.name">
</el-option> </el-option>
</el-select> </el-select>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<div class="search-block" v-if="formList.includes(2)"> <div class="search-block" v-if="formList.includes(2)">
<el-date-picker <el-date-picker
class="selectName" class="selectName"
v-model="dateValue" v-model="formData.dateValue"
type="datetimerange" type="datetimerange"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
...@@ -25,13 +25,13 @@ ...@@ -25,13 +25,13 @@
</div> </div>
<div class="search-block search-input" v-if="formList.includes(1)"> <div class="search-block search-input" v-if="formList.includes(1)">
<el-input type="text" v-model="inputValue" :placeholder="placeText"></el-input> <el-input type="text" v-model="formData.argKeyWord" :placeholder="placeText"></el-input>
</div> </div>
<div class="search-btn" @click="searchData" >查询</div> <div class="search-btn" @click="searchData" >查询</div>
<div class="search-block search-input" v-if="formList.includes(3)" style="margin-left: 20px"> <div class="search-block search-input" v-if="formList.includes(3)" style="margin-left: 20px">
<el-input type="text" v-model="scanValue"></el-input> <el-input type="text" v-model="formData.scanValue"></el-input>
</div> </div>
</div> </div>
...@@ -69,6 +69,12 @@ export default { ...@@ -69,6 +69,12 @@ export default {
return [] return []
} }
}, },
formData: {
type: Object,
default() {
return {}
}
},
btnList: { btnList: {
// 1： 添加按钮 2： 删除按钮 // 1： 添加按钮 2： 删除按钮
type: Array, type: Array,
...@@ -79,11 +85,44 @@ export default { ...@@ -79,11 +85,44 @@ export default {
}, },
data () { data () {
return { return {
selectValue: '', // selectValue: '',
inputValue: '', // inputValue: '',
scanValue: '', // scanValue: '',
dateValue: [moment().format('YYYY-MM-DD 00:00:00'), moment().format('YYYY-MM-DD 23:59:59')], // dateValue: [moment().format('YYYY-MM-DD 00:00:00'), moment().format('YYYY-MM-DD 23:59:59')],
searchList: [] searchList: [
{
id: '不限',
name: ''
},
{
id: '入库编号',
name: '入库编号'
},
{
id: '线体编号',
name: '线体编号'
},
{
id: '线体名称',
name: '线体名称'
},
{
id: '物料编号',
name: '物料编号'
},
{
id: '物料名称',
name: '物料名称'
},
{
id: '物料描述',
name: '物料描述'
},
{
id: '入库时间',
name: '入库时间'
},
]
} }
}, },
created () { created () {
...@@ -91,13 +130,7 @@ export default { ...@@ -91,13 +130,7 @@ export default {
}, },
methods: { methods: {
searchData () { searchData () {
var searchData = { this.$emit('searchData')
selectValue: this.selectValue,
inputValue: this.inputValue,
dateValue: this.dateValue,
scanValue: this.scanValue,
}
console.log(searchData)
}, },
delData () { delData () {
this.$emit('delData') this.$emit('delData')
...@@ -105,37 +138,6 @@ export default { ...@@ -105,37 +138,6 @@ export default {
openDialog () { openDialog () {
this.$emit('openDialog') this.$emit('openDialog')
} }
// queryProduct(){
// var value = ''
// this.$axios({
// method:"post",
// url:`/api/Product/Product_Query?argKeyWord=${value}`,
// }).then((res)=>{
// this.HeadData = res.data.data
// if(this.HeadData.length != 0){
// for(let i2=0;i2<this.HeadData.length;i2++){
// var value4 = {
// id:this.HeadData[i2].ID,
// name:this.HeadData[i2].Name
// }
// this.productNameArr.push(value4)
// }
// var value = {
// id:'00000000-0000-0000-0000-000000000000',
// name:'不限'
// }
// this.productNameArr.unshift(value)
// }else{
// var value3 = {
// id:'00000000-0000-0000-0000-000000000000',
// name:'不限'
// }
// this.productNameArr.push(value3)
// }
// }).catch(function(err){
// console.log('err',err)
// })
// },
} }
} }
</script> </script>
......
src/views/education/component/StoreDialog.vue
View file @ df32524e
...@@ -10,12 +10,12 @@ ...@@ -10,12 +10,12 @@
<div class="centen_row" > <div class="centen_row" >
<span class="centen_row_text">线体编号:</span> <span class="centen_row_text">线体编号:</span>
<div class="centen_row_select"> <div class="centen_row_select">
<el-select v-model="value" placeholder="请选择"> <el-select v-model="MID" placeholder="请选择">
<el-option <el-option
v-for="item in planList" v-for="item in lineList"
:key="item.PlanType" :key="item.Name"
:label="item.PlanType" :label="item.Name"
:value="item.PlanType"> :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
<div class="centen_row" style="margin-top:10px"> <div class="centen_row" style="margin-top:10px">
<span class="centen_row_text" >物料编号:</span> <span class="centen_row_text" >物料编号:</span>
<div class="centen_row_select"> <div class="centen_row_select">
<el-select v-model="value1" placeholder="请选择"> <el-select v-model="LID" placeholder="请选择">
<el-option <el-option
v-for="item in materList" v-for="item in materList"
:key="item.LineName" :key="item.Name"
:label="item.LineName" :label="item.Name"
:value="item.LineName"> :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<span class="centen_row_text" v-if="type === 'in'" >入库数量:</span> <span class="centen_row_text" v-if="type === 'in'" >入库数量:</span>
<span class="centen_row_text" v-if="type === 'out'" >出库数量:</span> <span class="centen_row_text" v-if="type === 'out'" >出库数量:</span>
<div class="centen_row_select"> <div class="centen_row_select">
<el-input @change="numFun()" v-model="count" placeholder="请输入数量"></el-input> <el-input @change="numFun()" v-model="quantity" placeholder="请输入数量"></el-input>
</div> </div>
</div> </div>
...@@ -54,16 +54,7 @@ ...@@ -54,16 +54,7 @@
<script> <script>
export default { export default {
data() { props: {
return {
count: '',
value: '',
value1 : '',
planList: [],
materList: []
}
},
props: {
titleText: { titleText: {
type: String, type: String,
default: '' default: ''
...@@ -72,60 +63,88 @@ export default { ...@@ -72,60 +63,88 @@ export default {
type: String, type: String,
default: 'in', default: 'in',
}, },
}, },
directives: { data() {
drag: function(el) { return {
let dragBox = el; //获取当前元素 MID: '',
dragBox.onmousedown = e => { LID: '',
let box = document.querySelector('.scPopBox') quantity : '',
//算出鼠标相对元素的位置 lineList: [],
let disX = e.clientX - dragBox.offsetLeft; materList: []
let disY = e.clientY - dragBox.offsetTop;
document.onmousemove = e => {
//用鼠标的位置减去鼠标相对元素的位置，得到元素的位置
let left = e.clientX - (Number(disX));
let top = e.clientY - (Number(disY));
//移动当前元素
box.style.left = left + "px";
box.style.top = top + "px";
};
document.onmouseup = e => {
document.onmousemove = null;
document.onmouseup = null;
};
};
} }
}, },
directives: {
methods:{ drag: function(el) {
// guid() { let dragBox = el; //获取当前元素
// return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) { dragBox.onmousedown = e => {
// var r = Math.random()*16|0, v = c == 'x' ? r : (r&0x3|0x8); let box = document.querySelector('.scPopBox')
// return v.toString(16); //算出鼠标相对元素的位置
// }); let disX = e.clientX - dragBox.offsetLeft;
// }, let disY = e.clientY - dragBox.offsetTop;
document.onmousemove = e => {
//用鼠标的位置减去鼠标相对元素的位置，得到元素的位置
let left = e.clientX - (Number(disX));
let top = e.clientY - (Number(disY));
//移动当前元素
box.style.left = left + "px";
box.style.top = top + "px";
};
document.onmouseup = e => {
document.onmousemove = null;
document.onmouseup = null;
};
};
}
},
created () {
this.getLines()
this.getMaters()
},
methods:{
// guid() {
// return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
// var r = Math.random()*16|0, v = c == 'x' ? r : (r&0x3|0x8);
// return v.toString(16);
// });
// },
close(){ close(){
this.count = ''
this.value = ''
this.value1 = ''
this.$emit('closeDialog')
},
numFun(){
this.count = parseInt(this.count)
if(String(this.count) == 'NaN'){
this.count = '' this.count = ''
this.value = ''
this.value1 = ''
this.$emit('closeDialog')
},
numFun(){
this.count = parseInt(this.count)
if(String(this.count) == 'NaN'){
this.count = ''
}
},
conserve () {
var dialogData = {
count: this.count,
value: this.value,
value1 : this.value1,
}
this.$emit('conserve', dialogData)
} }
} },
conserve () {
var postData = {
MID: this.MID,
LID: this.LID,
Quantity : this.quantity,
}
this.$emit('conserve', postData)
},
getLines () {
this.$axios({
method:"post",
url:`/api/MaterialDelivery/MaterialDelivery_LinesData`,
}).then((res)=>{
this.lineList = res.data.data
})
},
getMaters () {
this.$axios({
method:"post",
url:`/api/MaterialDelivery/MaterialDelivery_PlansData`,
}).then((res)=>{
this.materList = res.data.data
})
}
}
} }
</script> </script>
<style lang="scss"> <style lang="scss">
......
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