Skip to content

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

update 2-5

parent 1687d502
Hide whitespace changes
Inline Side-by-side
Showing with 216 additions and 70 deletions
src/views/education/ManageList.vue
View file @ 5824108e
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<template> <template>
<div class="lineBox"> <div class="lineBox">
<div class="LineCenten"> <div class="LineCenten">
<Head type="7"></Head> <Head type="12"></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
...@@ -24,6 +24,18 @@ ...@@ -24,6 +24,18 @@
width="185" width="185"
prop="NO"> prop="NO">
</el-table-column> </el-table-column>
<el-table-column
label="生产计划编号"
:show-overflow-tooltip="true"
width="185"
prop="PlanNO">
</el-table-column>
<el-table-column
label="产品编号"
:show-overflow-tooltip="true"
width="185"
prop="Num">
</el-table-column>
<el-table-column <el-table-column
label="产品名称" label="产品名称"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
...@@ -31,33 +43,52 @@ ...@@ -31,33 +43,52 @@
width="300"> width="300">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="ProductID" prop="ProductDescirbe"
label="产品型号" label="产品描述"
:show-overflow-tooltip="true"
width="310">
</el-table-column>
<el-table-column
prop="unit"
label="单位"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="310"> width="310">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="订单编号" label="计划交货日期"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="PlanID" prop="PlanDay"
width="320"> width="310">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="计划数量" label="计划数量"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="PlanQuantity" prop="PlanCount"
> width="185">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="已排程数量" label="排程数量"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="ScheduleQuantity" prop="PaiCount"
> width="185">
</el-table-column>
<el-table-column
label="完工数量"
:show-overflow-tooltip="true"
prop="FinishCount"
width="185">
</el-table-column>
<el-table-column
label="实际完工日期"
:show-overflow-tooltip="true"
prop="finishDay"
width="300">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="已完成数量" label="生产计划状态"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="FinishQuantity" prop="status"
width="210"
> >
</el-table-column> </el-table-column>
</el-table> </el-table>
......
src/views/education/ProducSchedule.vue
View file @ 5824108e
...@@ -30,61 +30,73 @@ ...@@ -30,61 +30,73 @@
prop="NO"> prop="NO">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="生产编码" label="生产排程编号"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="SID" prop="SID"
width="140"> width="140">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="ProductName" prop="ProductName"
label="产品名称" label="生产计划编号"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
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="ProductType" prop="ProductType"
width="140"> width="140">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="订单编号" label="产品名称"
:show-overflow-tooltip="true"
prop="PlanType"
width="140">
</el-table-column>
<el-table-column
label="产品描述"
:show-overflow-tooltip="true"
prop="PlanType"
width="140">
</el-table-column>
<el-table-column
label="单位"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="PlanType" prop="PlanType"
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="LineName" prop="LineName"
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="UserName"
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="StartDt" prop="StartDt"
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="EndDt" prop="EndDt"
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="Quantity" prop="Quantity"
width="80"> width="80">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="状态" label="生产排程状态"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="TextStatus" prop="TextStatus"
width="140"> width="140">
...@@ -92,7 +104,8 @@ ...@@ -92,7 +104,8 @@
<el-table-column <el-table-column
label="操作" label="操作"
show-overflow-tooltip> show-overflow-tooltip
width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- 4暂停 1待生产 2正在生产 --> <!-- 4暂停 1待生产 2正在生产 -->
<div :class="[scope.row.zip==20033?'noneBox':'']"> <div :class="[scope.row.zip==20033?'noneBox':'']">
......
src/views/education/ProductionPlan.vue
View file @ 5824108e
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<template> <template>
<div class="lineBox"> <div class="lineBox">
<div class="LineCenten"> <div class="LineCenten">
<Head type="6"></Head> <Head type="10"></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
...@@ -30,37 +30,49 @@ ...@@ -30,37 +30,49 @@
prop="NO"> prop="NO">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="产品名称" label="生产计划编号"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="ProductName" width="185"
width="200"> prop="PlanNO">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="ProductType" label="产品编号"
label="产品型号" :show-overflow-tooltip="true"
width="185"
prop="Num">
</el-table-column>
<el-table-column
label="产品名称"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="ProductName"
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="PID" prop="describe"
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="Quantity" prop="Unit"
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="DeliveryDt" prop="DeliveryDt"
width="300"> width="300">
</el-table-column>
<el-table-column
label="计划数量"
:show-overflow-tooltip="true"
prop="Quantity"
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="TextStatus" prop="TextStatus"
width="200"> width="200">
......
src/views/education/component/SchedulingPop.vue
View file @ 5824108e
...@@ -14,7 +14,20 @@ ...@@ -14,7 +14,20 @@
<div class="popCenten_box"> <div class="popCenten_box">
<div class="popCenten"> <div class="popCenten">
<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">
<el-select @change="orderFun()" v-model="value" placeholder="请选择">
<el-option
v-for="item in planArr"
:key="item.PlanType"
:label="item.PlanType"
:value="item.PlanType">
</el-option>
</el-select>
</div>
</div>
<div class="centen_row" style="margin-top: 10px" >
<span class="centen_row_text" style="margin-left: 30px" >线体编号:</span>
<div class="centen_row_select"> <div class="centen_row_select">
<el-select @change="orderFun()" v-model="value" placeholder="请选择"> <el-select @change="orderFun()" v-model="value" placeholder="请选择">
<el-option <el-option
...@@ -27,7 +40,7 @@ ...@@ -27,7 +40,7 @@
</div> </div>
</div> </div>
<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" style="margin-left: 30px" >操作员:</span>
<div class="centen_row_select"> <div class="centen_row_select">
<el-select v-model="value1" placeholder="请选择"> <el-select v-model="value1" placeholder="请选择">
<el-option <el-option
...@@ -40,7 +53,7 @@ ...@@ -40,7 +53,7 @@
</div> </div>
</div> </div>
<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" style="margin-left: 30px" >排程数量:</span>
<div class="centen_row_select"> <div class="centen_row_select">
<el-select v-model="value3" placeholder="请选择"> <el-select v-model="value3" placeholder="请选择">
<el-option <el-option
...@@ -54,10 +67,10 @@ ...@@ -54,10 +67,10 @@
</div> </div>
<div class="centen_row" style="margin-top:10px"> <div class="centen_row" style="margin-top:10px">
<span class="centen_row_text" style="margin-left:31px">数量:</span> <span class="centen_row_text" >线体状态信号:</span>
<div class="centen_row_select"> <!-- <div class="centen_row_select">
<el-input @change="numFun()" v-model="num" placeholder="请输入内容"></el-input> <el-input @change="numFun()" v-model="num" placeholder="请输入内容"></el-input>
</div> </div> -->
</div> </div>
</div> </div>
...@@ -362,7 +375,7 @@ export default { ...@@ -362,7 +375,7 @@ export default {
margin-left:30px; margin-left:30px;
padding-top:42px; padding-top:42px;
.centen_row{ .centen_row{
width: 55%; width: 60%;
margin: auto; margin: auto;
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
......
src/views/education/component/head.vue
View file @ 5824108e
...@@ -18,6 +18,27 @@ ...@@ -18,6 +18,27 @@
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<div v-if="type==='10' || type=== '11' || type === '12'" class="select">
<span>查询条件: </span>
<el-select class="selectName" v-model="value" placeholder="请选择">
<el-option
v-for="item in productNameArr"
:key="item.name"
:label="item.name"
:value="item.name">
</el-option>
</el-select>
</div>
<div v-if="type==='10' ||type === '12'" class="dateTimer">
<el-date-picker
class="selectName"
v-model="dateValue"
type="datetimerange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']">
</el-date-picker>
</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>
...@@ -28,11 +49,11 @@ ...@@ -28,11 +49,11 @@
<div v-if="type == 9" class="add sy" style="margin-left:15px"> <div v-if="type == 9" class="add sy" style="margin-left:15px">
<span class="addText">导出</span> <span class="addText">导出</span>
</div> </div>
<div v-if="type != 7" @click="deleteFun()" class="delete"> <div v-if="type != 7 && type != 12" @click="deleteFun()" class="delete">
<span class="deText">删除</span> <span class="deText">删除</span>
<div class="deleteImg"></div> <div class="deleteImg"></div>
</div> </div>
<div v-if="type != 7" @click="add()" class="add"> <div v-if="type != 7 && type != 12" @click="add()" class="add">
<span class="addText">添加</span> <span class="addText">添加</span>
<div class="addImg"></div> <div class="addImg"></div>
</div> </div>
...@@ -47,6 +68,8 @@ ...@@ -47,6 +68,8 @@
</div> </div>
</template> </template>
<script> <script>
import moment from 'moment'
export default { export default {
data() { data() {
return { return {
...@@ -56,6 +79,7 @@ export default { ...@@ -56,6 +79,7 @@ export default {
input:'', input:'',
placeText:'请输入名称', placeText:'请输入名称',
headText:'产品名称', headText:'产品名称',
dateValue: [moment().format('YYYY-MM-DD 00:00:00'), moment().format('YYYY-MM-DD 23:59:59')],
value:'不限', value:'不限',
} }
...@@ -69,6 +93,8 @@ export default { ...@@ -69,6 +93,8 @@ export default {
}else if(this.type==9){ }else if(this.type==9){
this.placeText = '请输入关键字' this.placeText = '请输入关键字'
this.headText='设备名称' this.headText='设备名称'
}else if(this.type==='10' || this.type ==='11' || this.type === '12'){
this.placeText = '请输入关键字'
}else{ }else{
this.placeText = '请输入名称' this.placeText = '请输入名称'
} }
...@@ -164,6 +190,14 @@ export default { ...@@ -164,6 +190,14 @@ export default {
margin-right: 15px; margin-right: 15px;
} }
} }
.dateTimer {
float: left;
width: 400px;
height: 40px;
margin-right: 20px;
overflow: hidden;
line-height: 20px;
}
.input{ .input{
float: left; float: left;
width: 340px; width: 340px;
......
src/views/education/component/linePop.vue
View file @ 5824108e
...@@ -13,12 +13,20 @@ ...@@ -13,12 +13,20 @@
<div class="popCenten_box"> <div class="popCenten_box">
<div class="popCenten"> <div class="popCenten">
<div v-if="type != 6" class="name"> <div v-if="type == 5 || type === '7'" class="name">
<span>{{name}}编号：</span>
<input v-model="modelV" class="nameipt" />
</div>
<div v-if="type != 6" class="name" style="margin-top:10px">
<span>{{name}}名称：</span> <span>{{name}}名称：</span>
<input v-model="nameV" class="nameipt" /> <input v-model="nameV" class="nameipt" />
</div> </div>
<div v-if="type == 6" class="name"> <div v-if="type == 6" class="name">
<span>产品名称：</span> <span>生产计划编号：</span>
<input v-model="planNo" class="nameipt" />
</div>
<div v-if="type == 6" style="margin-top: 20px" class="name">
<span>产品编号：</span>
<el-select class="apply" v-model="producV" clearable placeholder="请选择"> <el-select class="apply" v-model="producV" clearable placeholder="请选择">
<el-option <el-option
v-for="item in productions" v-for="item in productions"
...@@ -52,16 +60,27 @@ ...@@ -52,16 +60,27 @@
</el-select> </el-select>
</div> </div>
<div v-if="type === '7'" style="margin-top: 20px" class="name">
<span>关联变量：</span>
</div>
<div v-if="type == 4" style="margin-top:10px" class="name"> <div v-if="type == 4" style="margin-top:10px" class="name">
<span>{{name}}编号：</span> <span>{{name}}编号：</span>
<input v-model="numberV" class="nameipt" /> <input v-model="numberV" class="nameipt" />
</div> </div>
<div v-if="type == 5" style="margin-top:10px" class="name">
<span>{{name}}型号：</span> <div v-if="type == 5" style="margin-top:20px" class="name">
<input v-model="modelV" class="nameipt" /> <span>{{name}}描述：</span>
<input v-model="describeV" class="nameipt" />
</div>
<div v-if="type == 5" style="margin-top:20px" class="name">
<span>单位：</span>
<input v-model="unit" class="nameipt" />
</div> </div>
<div v-if="type == 5" style="margin-top:10px" class="name"> <div v-if="type == 5" style="margin-top:10px" class="name">
<span>适用工艺：</span> <span>产品工艺：</span>
<el-select :disabled="istech" class="apply" v-model="applyValue" clearable placeholder="请选择"> <el-select :disabled="istech" class="apply" v-model="applyValue" clearable placeholder="请选择">
<el-option <el-option
v-for="item in technologyOptions" v-for="item in technologyOptions"
...@@ -77,21 +96,17 @@ ...@@ -77,21 +96,17 @@
</div> </div>
<div v-if="type == 4" style="margin-top:10px" class="name"> <div v-if="type == 4" style="margin-top:10px" class="name">
<span>单位</span> <span>单位：</span>
<input v-model="unit" class="nameipt" /> <input v-model="unit" class="nameipt" />
</div> </div>
<div v-if="type == 6" style="margin-top:10px" class="name">
<span>{{name}}编号：</span>
<input v-model="numberV2" class="nameipt" />
</div>
<div v-if="type == 6" class="name2" style="margin:15px auto"> <div v-if="type == 6" class="name2" style="margin:15px auto">
<span>订单数量：</span> <span>计划数量：</span>
<input @change="dNumFun()" style="width:460px;height:40px;margin-left:46px" v-model="dNum" type="text"/> <input @change="dNumFun()" style="width:460px;height:40px;margin-left:46px" v-model="dNum" type="text"/>
</div> </div>
<div v-if="type == 6" class="name2" style="margin:15px auto"> <div v-if="type == 6" class="name2" style="margin:15px auto">
<span style="float:left;display:block">交货日期: </span> <span style="float:left;display:block">计划交货日期: </span>
<div style="float:left;width:461px;height:40px;margin-left:58px"> <div style="float:left;width:461px;height:40px;margin-left: 25px">
<el-date-picker <el-date-picker
v-model="dtatime" v-model="dtatime"
type="datetime" type="datetime"
...@@ -99,6 +114,9 @@ ...@@ -99,6 +114,9 @@
</el-date-picker> </el-date-picker>
</div> </div>
</div> </div>
<div v-if="type == 6" class="name2" style="margin-top:20px">
<span>交货日期临近报警：</span>
</div>
<div v-if="type==3" class="namebtn"> <div v-if="type==3" class="namebtn">
<span>选择所包含的工序：</span> <span>选择所包含的工序：</span>
<div @click="deleteFun2()" class="delete"> <div @click="deleteFun2()" class="delete">
...@@ -410,6 +428,7 @@ export default { ...@@ -410,6 +428,7 @@ export default {
//保存 //保存
conserve(){ conserve(){
if(this.typePop == 'add'){ if(this.typePop == 'add'){
debugger
var guid = this.guid() var guid = this.guid()
this.edit_Add_dataFun(guid) this.edit_Add_dataFun(guid)
this.$parent.addFun(this.valuedata) this.$parent.addFun(this.valuedata)
......
src/views/education/deviceManage.vue
View file @ 5824108e
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<template> <template>
<div class="deviceManage"> <div class="deviceManage">
<div class="deviceCenten"> <div class="deviceCenten">
<Head type="1"></Head> <Head type="11"></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
...@@ -29,6 +29,12 @@ ...@@ -29,6 +29,12 @@
width="185" width="185"
prop="NO"> prop="NO">
</el-table-column> </el-table-column>
<el-table-column
label="设备编号"
:show-overflow-tooltip="true"
width="185"
prop="Num">
</el-table-column>
<el-table-column <el-table-column
label="设备名称" label="设备名称"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
...@@ -47,6 +53,12 @@ ...@@ -47,6 +53,12 @@
prop="LineName" prop="LineName"
width="320"> width="320">
</el-table-column> </el-table-column>
<el-table-column
label="变量关联"
:show-overflow-tooltip="true"
width="185"
prop="relat">
</el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
......
src/views/education/productManage.vue
View file @ 5824108e
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<template> <template>
<div class="lineBox"> <div class="lineBox">
<div class="LineCenten"> <div class="LineCenten">
<Head type="5"></Head> <Head type="10"></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
...@@ -30,25 +30,37 @@ ...@@ -30,25 +30,37 @@
prop="NO"> prop="NO">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="产品名称" label="产品编号"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="Name" prop="Name"
width="200"> width="200">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="PID" prop="PID"
label="产品型号" label="产品名称"
:show-overflow-tooltip="true"
width="210">
</el-table-column>
<el-table-column
prop="descipipt"
label="产品描述"
:show-overflow-tooltip="true"
width="210">
</el-table-column>
<el-table-column
prop="unit"
label="单位"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="210"> width="210">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="ProcessName" prop="ProcessName"
label="适用工艺" label="产品工艺"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="210"> width="210">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="产品BOM表" label="产品组成(BOM)"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="260"> width="260">
<template slot-scope="scope"> <template slot-scope="scope">
......
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