Commit 2a9a3126 authored by 徐来柯's avatar 徐来柯

update

parent 95d811a3
......@@ -8,7 +8,7 @@
<template>
<div class="lineBox">
<div class="LineCenten">
<Head type="8" ref="head" @searchQuery="query"></Head>
<Head type="8" :statusList="statusList" ref="head" @searchQuery="query"></Head>
<div class="conterFool_middle" style="width:98%;margin:auto">
<el-table
border
......@@ -32,7 +32,7 @@
<el-table-column
label="生产排程编号"
:show-overflow-tooltip="true"
prop="PlanID"
prop="SID"
width="140">
</el-table-column>
<el-table-column
......@@ -80,7 +80,7 @@
<el-table-column
label="线体编号"
:show-overflow-tooltip="true"
prop="LineID"
prop="LinNaber"
width="140">
</el-table-column>
<el-table-column
......@@ -180,6 +180,7 @@ export default {
popShow:false,
CheckDeleteShow:true,
argKeyWord:'',
argKeyWord1: '',
argID:'00000000-0000-0000-0000-000000000000',
deletetext:'',
itemdata:[],
......@@ -190,11 +191,31 @@ export default {
pathE:'',
relateShow: false,
relateType: '',
statusList: [
{
id: '已排程',
name: '已排程'
},
{
id: '已下达',
name: '已下达'
},{
id: '已开工',
name: '已开工'
},{
id: '已完工',
name: '已完工'
},{
id: '暂停',
name: '暂停'
},
],
}
},
created(){
var postData = {
argKeyWord: '',
argKeyWord1: '',
argWhere: '',
Stime: this.$moment().format('YYYY-MM-DD 00:00:00'),
Etime: this.$moment().format('YYYY-MM-DD 23:59:59')
......@@ -206,7 +227,7 @@ export default {
query(keyWord){
this.$axios({
method:"post",
url:`/api/Schedule/Schedule_Query?argKeyWord=${ keyWord.argKeyWord }&argWhere=${ keyWord.argWhere }&Stime=${ keyWord.Stime }&Etime=${ keyWord.Etime }`,
url:`/api/Schedule/Schedule_Query?argKeyWord=${ keyWord.argKeyWord }&argKeyWord1=${ keyWord.argKeyWord1 }&argWhere=${ keyWord.argWhere }&Stime=${ keyWord.Stime }&Etime=${ keyWord.Etime }`,
}).then((res)=>{
if(res.data.data.length != 0 ){
for(let i=0;i<res.data.data.length;i++){
......@@ -330,6 +351,7 @@ export default {
resetData () {
return {
argKeyWord: this.$refs.head.input,
argKeyWord1: this.$refs.head.argKeyWord1,
argWhere: this.$refs.head.argWhere,
Stime: this.$refs.head.dateValue ? this.$moment(this.$refs.head.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ',
Etime: this.$refs.head.dateValue ? this.$moment(this.$refs.head.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
......@@ -416,7 +438,7 @@ export default {
if(num == 1){
this.tableData = this.AllTableData.slice(0,50)
}else{
this.tableData = this.AllTableData.slice((num-1)*this.PageSize + 1,this.PageSize*num)
this.tableData = this.AllTableData.slice((num-1)*this.PageSize,this.PageSize*num)
}
},
//上一页颜色
......
......@@ -146,6 +146,7 @@ export default {
popShow:false,
CheckDeleteShow:true,
argKeyWord:'',
argKeyWord1: '',
argID:'00000000-0000-0000-0000-000000000000',
deletetext:'',
itemdata:[],
......@@ -162,6 +163,7 @@ export default {
created(){
var postData = {
argKeyWord: '',
argKeyWord1: '',
argWhere: '',
Stime: this.$moment().format('YYYY-MM-DD 00:00:00'),
Etime: this.$moment().format('YYYY-MM-DD 23:59:59')
......@@ -173,7 +175,7 @@ export default {
query(keyWord){
this.$axios({
method:"post",
url:`/api/Plan/Plan_Query?argKeyWord=${keyWord.argKeyWord}&argWhere=${keyWord.argWhere}&Stime=${keyWord.Stime}&Etime=${keyWord.Etime}`,
url:`/api/Plan/Plan_Query?argKeyWord=${keyWord.argKeyWord}&argKeyWord1=${keyWord.argKeyWord1}&argWhere=${keyWord.argWhere}&Stime=${keyWord.Stime}&Etime=${keyWord.Etime}`,
}).then((res)=>{
if(res.data.data.length != 0 ){
for(let i=0;i<res.data.data.length;i++){
......@@ -282,6 +284,7 @@ export default {
resetData () {
return {
argKeyWord: this.$refs.head.input,
argKeyWord1: this.$refs.head.argKeyWord1,
argWhere: this.$refs.head.argWhere,
Stime: this.$refs.head.dateValue ? this.$moment(this.$refs.head.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ',
Etime: this.$refs.head.dateValue ? this.$moment(this.$refs.head.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
......
......@@ -32,8 +32,8 @@
<el-select @change="orderFun()" v-model="LineID" placeholder="请选择">
<el-option
v-for="item in lineList"
:key="item.Name"
:label="item.Name"
:key="item.Nuber"
:label="item.Nuber"
:value="item.ID">
</el-option>
</el-select>
......
......@@ -3,7 +3,7 @@
<div class="search-list" >
<div class="search-block" v-if="formList.includes(1)" >
<span class="search" >{{headText}}:</span>
<el-select class="selectName" v-model="formData.argWhere" placeholder="请选择">
<el-select class="selectName" @change="handleChange" v-model="formData.argWhere" placeholder="请选择">
<el-option
v-for="item in searchList"
:key="item.name"
......@@ -13,6 +13,17 @@
</el-select>
</div>
<div class="search-block" v-if="formData.argWhere == '生产计划状态'" >
<el-select class="selectName" v-model="formData.argKeyWord1" placeholder="请选择状态">
<el-option
v-for="item in statusList"
:key="item.name"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</div>
<div class="search-block" v-if="formList.includes(2)">
<el-date-picker
class="selectName"
......@@ -82,6 +93,33 @@ export default {
return []
}
},
statusList: {
type: Array,
default () {
return [
{
id: '未启动',
name: '未启动'
},
{
id: '进行中',
name: '进行中'
},
// {
// id: '已开工',
// name: '已开工'
// },
{
id: '已完工',
name: '已完工'
},
// {
// id: '暂停',
// name: '暂停'
// },
]
}
},
btnList: {
// 1: 添加按钮 2: 删除按钮
type: Array,
......@@ -105,6 +143,11 @@ export default {
scanGunCode () {
this.$emit('scanGunCode', this.formData.scanValue)
},
handleChange (val) {
if (val !== '生产计划状态') {
this.formData.argKeyWord1 = ''
}
},
searchData () {
this.$emit('searchData')
},
......
......@@ -20,7 +20,7 @@
</div>
<!-- new -->
<div v-if="type ==4 ||type==1 ||type=='4_2' || type=='9' || type=='10'" class="delete_btn">
<div v-if="type == '4_2'" class="delete_btn">
<div @click="confirmDel('1')" class="no">否(NO)</div>
<div @click="confirmDel('2')" class="yes">是(YES)</div>
</div>
......
......@@ -21,7 +21,7 @@
</div>
<div v-if="type ==='10' || type=== '11' || type === '12' || type === '8'" class="select">
<span>查询条件: </span>
<el-select class="selectName" v-model="argWhere" placeholder="请选择">
<el-select class="selectName" @change="handleChange" v-model="argWhere" placeholder="请选择">
<el-option
v-for="item in productNameArr"
:key="item.name"
......@@ -30,6 +30,18 @@
</el-option>
</el-select>
</div>
<div v-if="argWhere === '生产排程状态' || argWhere === '生产计划状态'" class="status_select">
<el-select class="selectName" v-model="argKeyWord1" placeholder="请选择状态">
<el-option
v-for="item in statusList"
:key="item.name"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</div>
<div v-if="type==='10' ||type === '12' || type ==='8'" class="dateTimer">
<el-date-picker
class="selectName"
......@@ -40,6 +52,8 @@
:default-time="['00:00:00', '23:59:59']">
</el-date-picker>
</div>
<div class="input">
<el-input type="text" @input="inputchargeFun()" v-model="input" :placeholder="placeText"></el-input>
</div>
......@@ -86,10 +100,36 @@ export default {
dateValue: [moment().format('YYYY-MM-DD 00:00:00'), moment().format('YYYY-MM-DD 23:59:59')],
value:'不限',
argWhere: ' ',
argKeyWord1: '',
}
},
props:['type'],
// props:['type'],
props: {
type: {
type: String,
default: ''
},
statusList: {
type: Array,
default () {
return [
{
id: '未启动',
name: '未启动'
},
{
id: '进行中',
name: '进行中'
},
{
id: '已完工',
name: '已完工'
}
]
}
}
},
created(){
if(this.type=='6'){
this.placeText = '请输入关键字'
......@@ -225,6 +265,11 @@ export default {
//搜索文本赋值
inputchargeFun(){
this.$parent.textFun(this.input)
},
handleChange (val) {
if (val !== '生产排程状态' ||val !== '生产计划状态' ) {
this.argKeyWord1 = ''
}
},
//查询
query(){
......@@ -241,6 +286,7 @@ export default {
var postData = {
argKeyWord: this.input,
argWhere: this.argWhere,
argKeyWord1: this.argKeyWord1,
Stime: this.dateValue ? moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ',
Etime: this.dateValue ? moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
}
......@@ -323,6 +369,24 @@ export default {
margin-right: 15px;
}
}
.status_select {
float: left;
width: 205px;
height: 40px;
margin-right: 20px;
overflow: hidden;
line-height: 20px;
.selectName{
float: left;
width:205px;
}
span{
float: left;
height: 40px;
line-height: 40px;
margin-right: 15px;
}
}
.dateTimer {
float: left;
width: 400px;
......
......@@ -289,8 +289,12 @@ export default {
created(){
// 1为线体管理 2为工序管理 3为工艺管理 4为物料管理 5为产品管理 6为生产管理 7设备管理
this.init()
this.getNum()
this.getPros()
if (this.typePop !== 'edit') {
this.getNum()
} else {
this.PID = this.data.PID
}
},
methods:{
getNum () {
......
......@@ -238,7 +238,14 @@ export default {
let data = value
data.UpdateTime = value.CreateTime
var $this = this
console.log('产品管理',data)
// 正则匹配只能输入数字+字母组合
var reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{2,20}$/
if (!reg.test(value.ProNumber)) {
this.typeV = '5'
this.deleteShow = true
this.deletetext = '产品编号需为字母加数字组合'
return
}
this.$axios({
method:"post",
url:`/api/Product/Product_WindowAddSave`,
......@@ -264,6 +271,14 @@ export default {
let data = value
data.UpdateTime = value.CreateTime
var $this = this
// 正则匹配只能输入数字+字母组合
var reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{2,20}$/
if (!reg.test(value.ProNumber)) {
this.typeV = '5'
this.deleteShow = true
this.deletetext = '产品编号需为字母加数字组合'
return
}
this.$axios({
method:"post",
url:`/api/Product/Product_WindowEditSave`,
......
......@@ -126,6 +126,7 @@ export default {
typeV: '',
formData: {
argKeyWord: '',
argKeyWord1: '',
argWhere: '',
dateValue: [this.$moment().format('YYYY-MM-DD 00:00:00'), this.$moment().format('YYYY-MM-DD 23:59:59')],
scanValue: '',
......@@ -145,7 +146,7 @@ export default {
var postData = this.resetData()
this.$axios({
method:"post",
url:`/api/TJStatistics/Statistics_Query?argKeyWord=${postData.argKeyWord}&argWhere=${postData.argWhere}&Stime=${postData.Stime}&Etime=${postData.Etime}`,
url:`/api/TJStatistics/Statistics_Query?argKeyWord=${postData.argKeyWord}&argKeyWord1=${postData.argKeyWord1}&argWhere=${postData.argWhere}&Stime=${postData.Stime}&Etime=${postData.Etime}`,
}).then((res)=>{
// if(res.data.data.length != 0 ){
$this.AllTableData = res.data.data.map(item => ({
......@@ -195,6 +196,7 @@ export default {
return {
argKeyWord: this.formData.argKeyWord,
argWhere: this.formData.argWhere,
argKeyWord1: this.formData.argKeyWord1,
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') : ' '
}
......
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