Skip to content

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

update

parent 22da3240
Show whitespace changes
Inline Side-by-side
Showing with 46 additions and 20 deletions
src/views/education/ProductionPlan.vue
View file @ fb397017
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<template> <template>
<div class="lineBox"> <div class="lineBox">
<div class="LineCenten"> <div class="LineCenten">
<Head type="10"></Head> <Head type="10" ref="head" @searchQuery="query"></Head>
<div class="conterFool_middle" style="width:98%;margin:auto"> <div class="conterFool_middle" style="width:98%;margin:auto">
<el-table <el-table
border border
...@@ -33,13 +33,13 @@ ...@@ -33,13 +33,13 @@
label="生产计划编号" label="生产计划编号"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="185" width="185"
prop="PlanNO"> prop="PID">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="产品编号" label="产品编号"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="185" width="185"
prop="Num"> prop="ProNumber">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="产品名称" label="产品名称"
...@@ -50,13 +50,13 @@ ...@@ -50,13 +50,13 @@
<el-table-column <el-table-column
label="产品描述" label="产品描述"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="describe" prop="Prodescribe"
width="200"> width="200">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="单位" label="单位"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="Unit" prop="Prounit"
width="200"> width="200">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -159,14 +159,20 @@ export default { ...@@ -159,14 +159,20 @@ export default {
props:[], props:[],
watch:{}, watch:{},
created(){ created(){
this.query() var postData = {
argKeyWord: '',
argWhere: '',
Stime: this.$moment().format('YYYY-MM-DD 00:00:00'),
Etime: this.$moment().format('YYYY-MM-DD 23:59:59')
}
this.query(postData)
}, },
methods:{ methods:{
//查询 //查询
query(){ query(keyWord){
this.$axios({ this.$axios({
method:"post", method:"post",
url:`/api/Plan/Plan_Query?argKeyWord=${this.argKeyWord}&argID=${this.argID}`, url:`/api/Plan/Plan_Query?argKeyWord=${keyWord.argKeyWord}&argWhere=${keyWord.argWhere}&Stime=${keyWord.Stime}&Etime=${keyWord.Etime}`,
}).then((res)=>{ }).then((res)=>{
if(res.data.data.length != 0 ){ if(res.data.data.length != 0 ){
for(let i=0;i<res.data.data.length;i++){ for(let i=0;i<res.data.data.length;i++){
...@@ -224,6 +230,7 @@ export default { ...@@ -224,6 +230,7 @@ export default {
}, },
//添加 //添加
addFun(value){ addFun(value){
var $this = this
let data = value let data = value
console.log('value',value) console.log('value',value)
if(data.DeliveryDt == 'Invalid date' || data.DeliveryDt == ''){ if(data.DeliveryDt == 'Invalid date' || data.DeliveryDt == ''){
...@@ -244,13 +251,20 @@ export default { ...@@ -244,13 +251,20 @@ export default {
this.cancelFun() this.cancelFun()
} }
this.deletetext = res.data.msg this.deletetext = res.data.msg
this.query() var postData = {
argKeyWord: $this.$refs.head.input,
argWhere: $this.$refs.head.argWhere,
Stime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '',
Etime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
}
$this.query(postData)
}).catch(function(err){ }).catch(function(err){
console.log('err',err) console.log('err',err)
}) })
}, },
//编辑 //编辑
A_editFun(value){ A_editFun(value){
var $this = this
let data = value let data = value
console.log('编辑',value) console.log('编辑',value)
this.$axios({ this.$axios({
...@@ -267,7 +281,13 @@ export default { ...@@ -267,7 +281,13 @@ export default {
this.cancelFun() this.cancelFun()
} }
this.deletetext = res.data.msg this.deletetext = res.data.msg
this.query() var postData = {
argKeyWord: $this.$refs.head.input,
argWhere: $this.$refs.head.argWhere,
Stime: $this.$refs.head.dateValue ? $this.$moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '',
Etime: $this.$refs.head.dateValue ? $this.$moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
}
$this.query(postData)
}).catch(function(err){ }).catch(function(err){
console.log('err',err) console.log('err',err)
}) })
......
src/views/education/component/linePop.vue
View file @ fb397017
...@@ -227,7 +227,7 @@ export default { ...@@ -227,7 +227,7 @@ export default {
VStatus: '', VStatus: '',
VDeliveryDt: '', VDeliveryDt: '',
VPlanQuantity: '', VPlanQuantity: '',
DeliveryDt: '', DeliveryDt: this.$moment().format('YYYY-MM-DD HH:mm:ss'),
Quantity: '', Quantity: '',
ProductID: '', ProductID: '',
proList: [] proList: []
...@@ -462,6 +462,13 @@ export default { ...@@ -462,6 +462,13 @@ export default {
this.numberV = this.data.MID this.numberV = this.data.MID
this.modelV = this.data.PID this.modelV = this.data.PID
this.applyValue = this.data.ProcessName this.applyValue = this.data.ProcessName
this.ProductID = this.data.ProductID
this.Quantity = this.data.Quantity
this.DeliveryDt = this.data.DeliveryDt
this.VPID = this.data.VPID
this.VStatus = this.data.VStatus
this.VDeliveryDt = this.data.VDeliveryDt
this.VPlanQuantity = this.data.VPlanQuantity
this.dNum = this.data.Quantity this.dNum = this.data.Quantity
this.numberV2 = this.data.PID this.numberV2 = this.data.PID
......
src/views/education/productManage.vue
View file @ fb397017
...@@ -173,7 +173,6 @@ export default { ...@@ -173,7 +173,6 @@ export default {
methods:{ methods:{
//查询 //查询
query(keyWord){ query(keyWord){
var a = keyWord
this.$axios({ this.$axios({
method:"post", method:"post",
url:`/api/Product/Product_Query?argKeyWord=${ keyWord.argKeyWord }&argWhere=${ keyWord.argWhere }&Stime=${ keyWord.Stime }&Etime=${ keyWord.Etime }`, url:`/api/Product/Product_Query?argKeyWord=${ keyWord.argKeyWord }&argWhere=${ keyWord.argWhere }&Stime=${ keyWord.Stime }&Etime=${ keyWord.Etime }`,
...@@ -254,10 +253,10 @@ export default { ...@@ -254,10 +253,10 @@ export default {
} }
$this.deletetext = res.data.msg $this.deletetext = res.data.msg
var postData = { var postData = {
argKeyWord: $this.$refs.input, argKeyWord: $this.$refs.head.input,
argWhere: $this.$refs.argWhere, argWhere: $this.$refs.head.argWhere,
Stime: $this.$refs.dateValue ? $this.moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '', Stime: $this.$refs.head.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') : '' Etime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
} }
$this.query(postData) $this.query(postData)
}).catch(function(err){ }).catch(function(err){
...@@ -283,10 +282,10 @@ export default { ...@@ -283,10 +282,10 @@ export default {
} }
$this.deletetext = res.data.msg $this.deletetext = res.data.msg
var postData = { var postData = {
argKeyWord: $this.$refs.input, argKeyWord: $this.$refs.head.input,
argWhere: $this.$refs.argWhere, argWhere: $this.$refs.head.argWhere,
Stime: $this.$refs.dateValue ? $this.$moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '', Stime: $this.$refs.head.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') : '' Etime: $this.$refs.head.dateValue ? $this.$moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
} }
$this.query(postData) $this.query(postData)
}).catch(function(err){ }).catch(function(err){
......
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