Skip to content

L
Laisi_AutoMES2
Commit d4f8c6cb by yiyu.li
Options

标准节拍-工序修改

parent 5ce97470
Showing with 254 additions and 92 deletions
Html/src/view/cnc/set/beat.vue
<template>
<div class="testdiv">
<div class="divborder newSearchDiv" style="margin:0px;">
<div class="divborder newSearchDiv" style="margin: 0px">
<div class="filter">
<label>{{$t('1132')}}：</label>
<label>{{ $t("1132") }}：</label>
<Cascader
:data="datalevel"
:value="leveldata"
......@@ -10,35 +10,55 @@
change-on-select
class="searchSelect"
@on-change="getlevel"
style="width:220px"
style="width: 220px"
></Cascader>
</div>
<div class="filter">
<label>{{$t('100088')}}：</label>
<label>{{ $t("100088") }}：</label>
<Input class="searchSelect" type="text" v-model="productname" />
</div>
<div class="filter">
<label>{{$t('100090')}}：</label>
<label>{{ $t("100090") }}：</label>
<Input class="searchSelect" type="text" v-model="drawcode" />
</div>
<div class="searchBtn">
<Button type="primary" class="twoWord" icon="ios-search" @click="tosearch()">{{$t('1001')}}</Button>
<Button type="success" class="twoWord" icon="md-add-circle" @click="add()">{{$t('1002')}}</Button>
<Button type="warning" class="twoWord" icon="ios-build" @click="edit()">{{$t('1003')}}</Button>
<Button
type="primary"
class="twoWord"
icon="ios-search"
@click="tosearch()"
>{{ $t("1001") }}</Button
>
<Button
type="success"
class="twoWord"
icon="md-add-circle"
@click="add()"
>{{ $t("1002") }}</Button
>
<Button
type="warning"
class="twoWord"
icon="ios-build"
@click="edit()"
>{{ $t("1003") }}</Button
>
<Button
type="error"
class="twoWord intervalRight"
icon="md-close-circle"
@click="dele()"
>{{$t('1004')}}</Button>
>{{ $t("1004") }}</Button
>
<Button
type="primary"
class="fourWord"
icon="md-download"
@click="loadexcel()"
>{{$t('1005')}}</Button>
>{{ $t("1005") }}</Button
>
<Upload
style="display:inline-block"
style="display: inline-block"
ref="upload"
:action="action"
name="excel-file"
......@@ -49,7 +69,12 @@
:on-error="handleError"
:format="['xlsx']"
>
<Button type="primary" class="fourWord" icon="md-cloud-upload">{{$t('1006')}}</Button>
<Button
type="primary"
class="fourWord"
icon="md-cloud-upload"
>{{ $t("1006") }}</Button
>
</Upload>
</div>
</div>
......@@ -72,29 +97,56 @@
show-sizer
show-total
@on-page-size-change="handlePageSize"
:page-size-opts="[10,20,30,40,100]"
:page-size-opts="[10, 20, 30, 40, 100]"
></Page>
</div>
</div>
<Modal class="newModalClass" :title="$t('1002')" v-model="addmodal" :styles="{width:'700px'}">
<div class="modal_body" style="height:430px!important;">
<div style="width:280px;float:left;height:400px;overflow-y:scroll">
<Modal
class="newModalClass"
:title="$t('1002')"
v-model="addmodal"
:styles="{ width: '700px' }"
>
<div class="modal_body" style="height: 430px !important">
<div
style="
width: 280px;
float: left;
height: 400px;
overflow-y: scroll;
"
>
<template>
<Tree :data="treeContents" ref="tree" @on-select-change="getList()"></Tree>
<Tree
:data="treeContents"
ref="tree"
@on-select-change="getList()"
></Tree>
</template>
</div>
<div style="width:360px;float:left;height:400px;padding-left:5px;">
<div
style="
width: 360px;
float: left;
height: 400px;
padding-left: 5px;
"
>
<div class="filter">
<label>
<i>*</i>
{{this.$t('500107')}}：
{{ this.$t("500107") }}：
</label>
<Input class="searchInput" type="text" v-model="addobj.program_number" />
<Input
class="searchInput"
type="text"
v-model="addobj.program_number"
/>
</div>
<div class="filter">
<label>
<i>*</i>
{{this.$t('100088')}}：
{{ this.$t("100088") }}：
</label>
<Select
v-model="addobj.product"
......@@ -102,28 +154,56 @@
clearable
filterable
class="searchSelect"
@on-change="getRoutesByProduct"
>
<Option
v-for="item in products"
:value="item.id"
:key="item.id"
>{{ item.name }}</Option
>
<Option v-for="item in products" :value="item.id" :key="item.id">{{ item.name }}</Option>
</Select>
</div>
<div class="filter">
<!-- <div class="filter">
<label>
<i>*</i>
{{this.$t('900880')}}：
{{ this.$t("900880") }}：
</label>
<Input class="searchInput" type="text" v-model="addobj.route_number" />
</div>
<Input
class="searchInput"
type="text"
v-model="addobj.route_number"
/>
</div> -->
<div class="filter">
<label>
<i>*</i>
{{this.$t('900967')}}：
{{ this.$t("900967") }}：
</label>
<Input class="searchInput" type="text" v-model="addobj.route_name" />
<!-- <Input
class="searchInput"
type="text"
v-model="addobj.route_name"
/> -->
<Select
v-model="addobj.route_id"
label-in-value
clearable
filterable
class="searchSelect"
>
<Option
v-for="item in routeList"
:value="item.id"
:key="item.id"
>{{ item.serialnumber+'-'+item.name }}</Option
>
</Select>
</div>
<div class="filter">
<label>
<i>*</i>
{{this.$t('500098')}}：
{{ this.$t("500098") }}：
</label>
<InputNumber
:min="0"
......@@ -132,12 +212,12 @@
v-model="addobj.standard_besat"
onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"
/>
<span>{{this.$t('1104')}}</span>
<span>{{ this.$t("1104") }}</span>
</div>
<div class="filter">
<label>
<i>*</i>
{{this.$t('500221')}}：
{{ this.$t("500221") }}：
</label>
<InputNumber
:min="0"
......@@ -146,12 +226,12 @@
v-model="addobj.updown_besat"
onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"
/>
<span>{{this.$t('1104')}}</span>
<span>{{ this.$t("1104") }}</span>
</div>
<div class="filter">
<label>
<i>*</i>
{{this.$t('800281')}}：
{{ this.$t("800281") }}：
</label>
<InputNumber
:min="0"
......@@ -160,10 +240,10 @@
v-model="addobj.daily_standard_output"
onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"
/>
<span>{{this.$t('901087')}}</span>
<span>{{ this.$t("901087") }}</span>
</div>
<div class="filter">
<label>{{this.$t('810000')}}：</label>
<label>{{ this.$t("810000") }}：</label>
<InputNumber
:min="0"
class="searchInput"
......@@ -171,12 +251,12 @@
v-model="addobj.time_num"
onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"
/>
<span>{{this.$t('1104')}}</span>
<span>{{ this.$t("1104") }}</span>
</div>
<div class="filter">
<label>
<i>*</i>
{{this.$t('950009')}}：
{{ this.$t("950009") }}：
</label>
<InputNumber
:min="1"
......@@ -190,55 +270,75 @@
<div class="filter">
<label>
<!-- <i>*</i> -->
{{this.$t('1049')}}：
{{ this.$t("1049") }}：
</label>
<DatePicker type="date" v-model="addobj.start_time" class="searchInput"></DatePicker>
<DatePicker
type="date"
v-model="addobj.start_time"
class="searchInput"
></DatePicker>
</div>
<div class="filter">
<label>
<!-- <i>*</i> -->
{{this.$t('1050')}}：
{{ this.$t("1050") }}：
</label>
<DatePicker type="date" v-model="addobj.end_time" class="searchInput"></DatePicker>
<DatePicker
type="date"
v-model="addobj.end_time"
class="searchInput"
></DatePicker>
</div>
</div>
</div>
<div slot="footer">
<Button type="text" size="large" @click="closeadd()">{{$t('1033')}}</Button>
<Button type="primary" size="large" @click="adddata()">{{$t('1011')}}</Button>
<Button type="text" size="large" @click="closeadd()">{{
$t("1033")
}}</Button>
<Button type="primary" size="large" @click="adddata()">{{
$t("1011")
}}</Button>
</div>
</Modal>
<Modal
class="newModalClass"
:title="$t('1003')"
v-model="editmodal"
:styles="{width:'500px'}"
:styles="{ width: '500px' }"
>
<div class="modal_body" style="height:400px!important;">
<div class="modal_body" style="height: 400px !important">
<div class="filter">
<label>{{this.$t('200003')}}：</label>
<label class="labelInfo">{{sectionname}}</label>
<label>{{ this.$t("200003") }}：</label>
<label class="labelInfo">{{ sectionname }}</label>
</div>
<div class="filter">
<label>{{this.$t('500107')}}：</label>
<label class="labelInfo">{{editobj.process_number}}</label>
<label>{{ this.$t("500107") }}：</label>
<label class="labelInfo">{{
editobj.process_number
}}</label>
</div>
<div class="filter">
<label>{{this.$t('100088')}}：</label>
<label class="labelInfo">{{editobj.product_name_text}}</label>
<label>{{ this.$t("100088") }}：</label>
<label class="labelInfo">{{
editobj.product_name_text
}}</label>
</div>
<div class="filter">
<label>{{this.$t('900967')}}：</label>
<label class="labelInfo">{{editobj.route_name}}</label>
<label>{{ this.$t("900967") }}：</label>
<label class="labelInfo">{{
editobj.route_name
}}</label>
</div>
<div class="filter">
<label>{{this.$t('900880')}}：</label>
<label class="labelInfo">{{editobj.route_number}}</label>
<label>{{ this.$t("900880") }}：</label>
<label class="labelInfo">{{
editobj.route_number
}}</label>
</div>
<div class="filter">
<label>
<i>*</i>
{{this.$t('500098')}}：
{{ this.$t("500098") }}：
</label>
<InputNumber
:min="0"
......@@ -247,12 +347,12 @@
v-model="editobj.standard_besat"
onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"
/>
<span>{{this.$t('1104')}}</span>
<span>{{ this.$t("1104") }}</span>
</div>
<div class="filter">
<label>
<i>*</i>
{{this.$t('500221')}}：
{{ this.$t("500221") }}：
</label>
<InputNumber
:min="0"
......@@ -261,12 +361,12 @@
v-model="editobj.updown_besat"
onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"
/>
<span>{{this.$t('1104')}}</span>
<span>{{ this.$t("1104") }}</span>
</div>
<div class="filter">
<label>
<i>*</i>
{{this.$t('800281')}}：
{{ this.$t("800281") }}：
</label>
<InputNumber
:min="0"
......@@ -275,10 +375,10 @@
v-model="editobj.daily_standard_output"
onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"
/>
<span>{{this.$t('901087')}}</span>
<span>{{ this.$t("901087") }}</span>
</div>
<div class="filter">
<label>{{this.$t('810000')}}：</label>
<label>{{ this.$t("810000") }}：</label>
<InputNumber
:min="0"
class="searchInput"
......@@ -286,12 +386,12 @@
v-model="editobj.time_num"
onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"
/>
<span>{{this.$t('1104')}}</span>
<span>{{ this.$t("1104") }}</span>
</div>
<div class="filter">
<label>
<i>*</i>
{{this.$t('950009')}}：
{{ this.$t("950009") }}：
</label>
<InputNumber
:min="1"
......@@ -305,21 +405,33 @@
<div class="filter">
<label>
<!-- <i>*</i> -->
{{this.$t('1049')}}：
{{ this.$t("1049") }}：
</label>
<DatePicker type="date" v-model="editobj.start_time" class="searchInput"></DatePicker>
<DatePicker
type="date"
v-model="editobj.start_time"
class="searchInput"
></DatePicker>
</div>
<div class="filter">
<label>
<!-- <i>*</i> -->
{{this.$t('1050')}}：
{{ this.$t("1050") }}：
</label>
<DatePicker type="date" v-model="editobj.end_time" class="searchInput"></DatePicker>
<DatePicker
type="date"
v-model="editobj.end_time"
class="searchInput"
></DatePicker>
</div>
</div>
<div slot="footer">
<Button type="text" size="large" @click="closeedit()">{{$t('1033')}}</Button>
<Button type="primary" size="large" @click="editdata()">{{$t('1011')}}</Button>
<Button type="text" size="large" @click="closeedit()">{{
$t("1033")
}}</Button>
<Button type="primary" size="large" @click="editdata()">{{
$t("1011")
}}</Button>
</div>
</Modal>
</div>
......@@ -332,7 +444,8 @@ export default {
data() {
return {
action:
axios.publicPath + "cnc/upload/submit?templateName=BeatAllocation",
axios.publicPath +
"cnc/upload/submit?templateName=BeatAllocation",
headers: {
token: localStorage.getItem("token"),
timestamp: localStorage.getItem("timestamp"),
......@@ -359,6 +472,7 @@ export default {
productname: "",
drawcode: "",
products: [],
routeList:[], //工序列表
machineId: 0,
map: {
value: "value",
......@@ -447,7 +561,9 @@ export default {
},
methods: {
handleFormatError(file) {
this.$Message.error(this.$t("950396") + file.name + this.$t("950397"));
this.$Message.error(
this.$t("950396") + file.name + this.$t("950397")
);
},
handleSuccess(res, file) {
if (res.ret == 1) {
......@@ -476,9 +592,14 @@ export default {
.then((res) => {
const arr = [];
this.datalevel = res.data.data;
let sdata = res.data.data
if(sdata!=null&&sdata!=undefined&&sdata&&sdata.length >0){
arr.push(res.data.data[0].value)
let sdata = res.data.data;
if (
sdata != null &&
sdata != undefined &&
sdata &&
sdata.length > 0
) {
arr.push(res.data.data[0].value);
this.levelid = res.data.data[0].value;
}
this.leveldata = arr;
......@@ -488,13 +609,35 @@ export default {
getproduct() {
axios
.request({
url: "/config/ProjectProduct/GetProductsByCode?code=&name=&count=99",
url:
"/config/ProjectProduct/GetProductsByCode?code=&name=&count=99",
method: "get",
})
.then((res) => {
this.products = res.data.data;
});
},
getRoutesByProduct(val) {
// 选择产品查询工艺路径
let id = 0;
id = val.value?val.value:0;
var params = {
productId: id,
page: 1,
pagesize: 100,
};
axios
.request({
url: "/config/ProductRoute/GetPagedRoutes",
params,
method: "get",
})
.then((res) => {
if (res.data.ret == 1) {
this.routeList = res.data.data;
}
});
},
// 产线层级选择
getlevel: function (data) {
this.levelid = data[data.length - 1];
......@@ -634,7 +777,9 @@ export default {
getmachine() {
axios
.request({
url: "/config/Machine/GetmachineidBySection?id=" + this.sectionId,
url:
"/config/Machine/GetmachineidBySection?id=" +
this.sectionId,
method: "get",
})
.then((res) => {
......@@ -663,20 +808,23 @@ export default {
this.$Message.error(this.$t(800291));
return false;
}
if (this.addobj.product === "" || this.addobj.product === undefined) {
this.$Message.error(this.$t("100064"));
return false;
}
if (
this.addobj.route_number == "" ||
this.addobj.route_number == undefined
this.addobj.product === "" ||
this.addobj.product === undefined
) {
this.$Message.error(this.$t(666620));
this.$Message.error(this.$t("100064"));
return false;
}
// if (
// this.addobj.route_number == "" ||
// this.addobj.route_number == undefined
// ) {
// this.$Message.error(this.$t(666620));
// return false;
// }
if (
this.addobj.route_name === "" ||
this.addobj.route_name === undefined
this.addobj.route_id === "" ||
this.addobj.route_id === undefined || this.addobj.route_id === 0
) {
this.$Message.error(this.$t("901088"));
return false;
......@@ -725,7 +873,11 @@ export default {
// this.$Message.error(this.$t("9000128"));
// return false;
// }
if (this.addobj.start_time && this.addobj.end_time && this.addobj.start_time > this.addobj.end_time) {
if (
this.addobj.start_time &&
this.addobj.end_time &&
this.addobj.start_time > this.addobj.end_time
) {
this.$Message.error(this.$t("100218"));
return false;
}
......@@ -739,6 +891,7 @@ export default {
standard_besat: this.addobj.standard_besat,
daily_standard_output: this.addobj.daily_standard_output,
time_num: this.addobj.time_num,
route_id:this.addobj.route_id,
route_name: this.addobj.route_name,
route_number: this.addobj.route_number,
updown_besat: this.addobj.updown_besat, // 上下料节拍
......@@ -801,7 +954,10 @@ export default {
}
},
edit() {
if (this.detailobj === undefined || this.detailobj.id === undefined) {
if (
this.detailobj === undefined ||
this.detailobj.id === undefined
) {
this.$Message.error(this.$t("1017"));
return false;
}
......@@ -865,7 +1021,11 @@ export default {
// this.$Message.error(this.$t("9000128"));
// return false;
// }
if (this.editobj.start_time && this.editobj.end_time && this.editobj.start_time > this.editobj.end_time) {
if (
this.editobj.start_time &&
this.editobj.end_time &&
this.editobj.start_time > this.editobj.end_time
) {
this.$Message.error(this.$t("100218"));
return false;
}
......@@ -910,7 +1070,8 @@ export default {
})
.then((res) => {
if (res.data.ret === 1) {
window.location.href = axios.publicPath + "" + res.data.data;
window.location.href =
axios.publicPath + "" + res.data.data;
} else {
this.error(res.data.msg);
}
......@@ -924,7 +1085,8 @@ export default {
})
.then((res) => {
if (res.data.ret === 1) {
window.location.href = axios.publicPath + "" + res.data.data;
window.location.href =
axios.publicPath + "" + res.data.data;
} else {
this.$Message.error(res.data.msg);
}
......
Html/src/view/config/product/route.vue
......@@ -3,7 +3,7 @@
<div class="divborder newSearchDiv" style="margin:0px;">
<div class="filter">
<label>{{$t('100088')}}：</label>
<!-- <Select v-model="productname" label-in-value filterable clearable remote
<!-- <Select v-model="productname " label-in-value filterable clearable remote
:remote-method="remoteMethod"
:loading="loading1" class="searchSelect" >
<Option v-for="item in products" :value="item.id" :key="item.id">{{ item.name }}({{item.code}})</Option>
......
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