Skip to content

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

update

parent 95d811a3
Hide whitespace changes
Inline Side-by-side
Showing with 174 additions and 21 deletions
src/views/education/ProducSchedule.vue
View file @ 2a9a3126
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<template> <template>
<div class="lineBox"> <div class="lineBox">
<div class="LineCenten"> <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"> <div class="conterFool_middle" style="width:98%;margin:auto">
<el-table <el-table
border border
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<el-table-column <el-table-column
label="生产排程编号" label="生产排程编号"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="PlanID" prop="SID"
width="140"> width="140">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
<el-table-column <el-table-column
label="线体编号" label="线体编号"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="LineID" prop="LinNaber"
width="140"> width="140">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -180,6 +180,7 @@ export default { ...@@ -180,6 +180,7 @@ export default {
popShow:false, popShow:false,
CheckDeleteShow:true, CheckDeleteShow:true,
argKeyWord:'', argKeyWord:'',
argKeyWord1: '',
argID:'00000000-0000-0000-0000-000000000000', argID:'00000000-0000-0000-0000-000000000000',
deletetext:'', deletetext:'',
itemdata:[], itemdata:[],
...@@ -190,11 +191,31 @@ export default { ...@@ -190,11 +191,31 @@ export default {
pathE:'', pathE:'',
relateShow: false, relateShow: false,
relateType: '', relateType: '',
statusList: [
{
id: '已排程',
name: '已排程'
},
{
id: '已下达',
name: '已下达'
},{
id: '已开工',
name: '已开工'
},{
id: '已完工',
name: '已完工'
},{
id: '暂停',
name: '暂停'
},
],
} }
}, },
created(){ created(){
var postData = { var postData = {
argKeyWord: '', argKeyWord: '',
argKeyWord1: '',
argWhere: '', argWhere: '',
Stime: this.$moment().format('YYYY-MM-DD 00:00:00'), Stime: this.$moment().format('YYYY-MM-DD 00:00:00'),
Etime: this.$moment().format('YYYY-MM-DD 23:59:59') Etime: this.$moment().format('YYYY-MM-DD 23:59:59')
...@@ -206,7 +227,7 @@ export default { ...@@ -206,7 +227,7 @@ export default {
query(keyWord){ query(keyWord){
this.$axios({ this.$axios({
method:"post", 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)=>{ }).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++){
...@@ -330,6 +351,7 @@ export default { ...@@ -330,6 +351,7 @@ export default {
resetData () { resetData () {
return { return {
argKeyWord: this.$refs.head.input, argKeyWord: this.$refs.head.input,
argKeyWord1: this.$refs.head.argKeyWord1,
argWhere: this.$refs.head.argWhere, argWhere: this.$refs.head.argWhere,
Stime: this.$refs.head.dateValue ? this.$moment(this.$refs.head.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ', 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') : ' ' 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 { ...@@ -416,7 +438,7 @@ export default {
if(num == 1){ if(num == 1){
this.tableData = this.AllTableData.slice(0,50) this.tableData = this.AllTableData.slice(0,50)
}else{ }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)
} }
}, },
//上一页颜色 //上一页颜色
......
src/views/education/ProductionPlan.vue
View file @ 2a9a3126
...@@ -146,6 +146,7 @@ export default { ...@@ -146,6 +146,7 @@ export default {
popShow:false, popShow:false,
CheckDeleteShow:true, CheckDeleteShow:true,
argKeyWord:'', argKeyWord:'',
argKeyWord1: '',
argID:'00000000-0000-0000-0000-000000000000', argID:'00000000-0000-0000-0000-000000000000',
deletetext:'', deletetext:'',
itemdata:[], itemdata:[],
...@@ -162,6 +163,7 @@ export default { ...@@ -162,6 +163,7 @@ export default {
created(){ created(){
var postData = { var postData = {
argKeyWord: '', argKeyWord: '',
argKeyWord1: '',
argWhere: '', argWhere: '',
Stime: this.$moment().format('YYYY-MM-DD 00:00:00'), Stime: this.$moment().format('YYYY-MM-DD 00:00:00'),
Etime: this.$moment().format('YYYY-MM-DD 23:59:59') Etime: this.$moment().format('YYYY-MM-DD 23:59:59')
...@@ -173,7 +175,7 @@ export default { ...@@ -173,7 +175,7 @@ export default {
query(keyWord){ query(keyWord){
this.$axios({ this.$axios({
method:"post", 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)=>{ }).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++){
...@@ -282,6 +284,7 @@ export default { ...@@ -282,6 +284,7 @@ export default {
resetData () { resetData () {
return { return {
argKeyWord: this.$refs.head.input, argKeyWord: this.$refs.head.input,
argKeyWord1: this.$refs.head.argKeyWord1,
argWhere: this.$refs.head.argWhere, argWhere: this.$refs.head.argWhere,
Stime: this.$refs.head.dateValue ? this.$moment(this.$refs.head.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ', 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') : ' ' Etime: this.$refs.head.dateValue ? this.$moment(this.$refs.head.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
......
src/views/education/component/SchedulingPop.vue
View file @ 2a9a3126
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
<el-select @change="orderFun()" v-model="LineID" placeholder="请选择"> <el-select @change="orderFun()" v-model="LineID" placeholder="请选择">
<el-option <el-option
v-for="item in lineList" v-for="item in lineList"
:key="item.Name" :key="item.Nuber"
:label="item.Name" :label="item.Nuber"
:value="item.ID"> :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
......
src/views/education/component/SearchForm.vue
View file @ 2a9a3126
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<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="formData.argWhere" placeholder="请选择"> <el-select class="selectName" @change="handleChange" 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"
...@@ -13,6 +13,17 @@ ...@@ -13,6 +13,17 @@
</el-select> </el-select>
</div> </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)"> <div class="search-block" v-if="formList.includes(2)">
<el-date-picker <el-date-picker
class="selectName" class="selectName"
...@@ -63,7 +74,7 @@ export default { ...@@ -63,7 +74,7 @@ export default {
default: '请输入关键词' default: '请输入关键词'
}, },
formList: { formList: {
// 1: 查询条件与关键词搜索 2: 日期时间选择器 3：扫码枪输入框 // 1: 查询条件与关键词搜索 2: 日期时间选择器 3：扫码枪输入框
type: Array, type: Array,
default () { default () {
return [] return []
...@@ -82,6 +93,33 @@ export default { ...@@ -82,6 +93,33 @@ export default {
return [] return []
} }
}, },
statusList: {
type: Array,
default () {
return [
{
id: '未启动',
name: '未启动'
},
{
id: '进行中',
name: '进行中'
},
// {
// id: '已开工',
// name: '已开工'
// },
{
id: '已完工',
name: '已完工'
},
// {
// id: '暂停',
// name: '暂停'
// },
]
}
},
btnList: { btnList: {
// 1： 添加按钮 2： 删除按钮 // 1： 添加按钮 2： 删除按钮
type: Array, type: Array,
...@@ -105,6 +143,11 @@ export default { ...@@ -105,6 +143,11 @@ export default {
scanGunCode () { scanGunCode () {
this.$emit('scanGunCode', this.formData.scanValue) this.$emit('scanGunCode', this.formData.scanValue)
}, },
handleChange (val) {
if (val !== '生产计划状态') {
this.formData.argKeyWord1 = ''
}
},
searchData () { searchData () {
this.$emit('searchData') this.$emit('searchData')
}, },
......
src/views/education/component/deletePop.vue
View file @ 2a9a3126
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</div> </div>
<!-- new --> <!-- 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('1')" class="no">否（NO）</div>
<div @click="confirmDel('2')" class="yes">是（YES）</div> <div @click="confirmDel('2')" class="yes">是（YES）</div>
</div> </div>
......
src/views/education/component/head.vue
View file @ 2a9a3126
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</div> </div>
<div v-if="type ==='10' || type=== '11' || type === '12' || type === '8'" class="select"> <div v-if="type ==='10' || type=== '11' || type === '12' || type === '8'" class="select">
<span>查询条件: </span> <span>查询条件: </span>
<el-select class="selectName" v-model="argWhere" placeholder="请选择"> <el-select class="selectName" @change="handleChange" v-model="argWhere" placeholder="请选择">
<el-option <el-option
v-for="item in productNameArr" v-for="item in productNameArr"
:key="item.name" :key="item.name"
...@@ -30,6 +30,18 @@ ...@@ -30,6 +30,18 @@
</el-option> </el-option>
</el-select> </el-select>
</div> </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"> <div v-if="type==='10' ||type === '12' || type ==='8'" class="dateTimer">
<el-date-picker <el-date-picker
class="selectName" class="selectName"
...@@ -40,6 +52,8 @@ ...@@ -40,6 +52,8 @@
:default-time="['00:00:00', '23:59:59']"> :default-time="['00:00:00', '23:59:59']">
</el-date-picker> </el-date-picker>
</div> </div>
<div class="input"> <div class="input">
<el-input type="text" @input="inputchargeFun()" v-model="input" :placeholder="placeText"></el-input> <el-input type="text" @input="inputchargeFun()" v-model="input" :placeholder="placeText"></el-input>
</div> </div>
...@@ -86,10 +100,36 @@ export default { ...@@ -86,10 +100,36 @@ export default {
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')],
value:'不限', value:'不限',
argWhere: ' ', argWhere: ' ',
argKeyWord1: '',
} }
}, },
props:['type'], // props:['type'],
props: {
type: {
type: String,
default: ''
},
statusList: {
type: Array,
default () {
return [
{
id: '未启动',
name: '未启动'
},
{
id: '进行中',
name: '进行中'
},
{
id: '已完工',
name: '已完工'
}
]
}
}
},
created(){ created(){
if(this.type=='6'){ if(this.type=='6'){
this.placeText = '请输入关键字' this.placeText = '请输入关键字'
...@@ -222,10 +262,15 @@ export default { ...@@ -222,10 +262,15 @@ export default {
} }
}, },
methods:{ methods:{
//搜索文本赋值 //搜索文本赋值
inputchargeFun(){ inputchargeFun(){
this.$parent.textFun(this.input) this.$parent.textFun(this.input)
}, },
handleChange (val) {
if (val !== '生产排程状态' ||val !== '生产计划状态' ) {
this.argKeyWord1 = ''
}
},
//查询 //查询
query(){ query(){
var $this = this var $this = this
...@@ -241,6 +286,7 @@ export default { ...@@ -241,6 +286,7 @@ export default {
var postData = { var postData = {
argKeyWord: this.input, argKeyWord: this.input,
argWhere: this.argWhere, argWhere: this.argWhere,
argKeyWord1: this.argKeyWord1,
Stime: this.dateValue ? moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ', 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') : ' ' Etime: this.dateValue ? moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
} }
...@@ -323,6 +369,24 @@ export default { ...@@ -323,6 +369,24 @@ export default {
margin-right: 15px; 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 { .dateTimer {
float: left; float: left;
width: 400px; width: 400px;
......
src/views/education/component/linePop.vue
View file @ 2a9a3126
...@@ -289,8 +289,12 @@ export default { ...@@ -289,8 +289,12 @@ export default {
created(){ created(){
// 1为线体管理 2为工序管理 3为工艺管理 4为物料管理 5为产品管理 6为生产管理 7设备管理 // 1为线体管理 2为工序管理 3为工艺管理 4为物料管理 5为产品管理 6为生产管理 7设备管理
this.init() this.init()
this.getNum()
this.getPros() this.getPros()
if (this.typePop !== 'edit') {
this.getNum()
} else {
this.PID = this.data.PID
}
}, },
methods:{ methods:{
getNum () { getNum () {
......
src/views/education/productManage.vue
View file @ 2a9a3126
...@@ -238,7 +238,14 @@ export default { ...@@ -238,7 +238,14 @@ export default {
let data = value let data = value
data.UpdateTime = value.CreateTime data.UpdateTime = value.CreateTime
var $this = this 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({ this.$axios({
method:"post", method:"post",
url:`/api/Product/Product_WindowAddSave`, url:`/api/Product/Product_WindowAddSave`,
...@@ -264,6 +271,14 @@ export default { ...@@ -264,6 +271,14 @@ export default {
let data = value let data = value
data.UpdateTime = value.CreateTime data.UpdateTime = value.CreateTime
var $this = this 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({ this.$axios({
method:"post", method:"post",
url:`/api/Product/Product_WindowEditSave`, url:`/api/Product/Product_WindowEditSave`,
......
src/views/education/schedulingStatistics.vue
View file @ 2a9a3126
...@@ -126,6 +126,7 @@ export default { ...@@ -126,6 +126,7 @@ export default {
typeV: '', typeV: '',
formData: { formData: {
argKeyWord: '', argKeyWord: '',
argKeyWord1: '',
argWhere: '', argWhere: '',
dateValue: [this.$moment().format('YYYY-MM-DD 00:00:00'), this.$moment().format('YYYY-MM-DD 23:59:59')], dateValue: [this.$moment().format('YYYY-MM-DD 00:00:00'), this.$moment().format('YYYY-MM-DD 23:59:59')],
scanValue: '', scanValue: '',
...@@ -145,7 +146,7 @@ export default { ...@@ -145,7 +146,7 @@ export default {
var postData = this.resetData() var postData = this.resetData()
this.$axios({ this.$axios({
method:"post", 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)=>{ }).then((res)=>{
// if(res.data.data.length != 0 ){ // if(res.data.data.length != 0 ){
$this.AllTableData = res.data.data.map(item => ({ $this.AllTableData = res.data.data.map(item => ({
...@@ -195,6 +196,7 @@ export default { ...@@ -195,6 +196,7 @@ export default {
return { return {
argKeyWord: this.formData.argKeyWord, argKeyWord: this.formData.argKeyWord,
argWhere: this.formData.argWhere, 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') : ' ', 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') : ' ' 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