Skip to content

M
mes-ui
Commit 614278c5 authored by 仇晓婷's avatar 仇晓婷
Browse files
Options

Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

parents e4c76f0a 9f471fef
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1054 additions and 81 deletions
pages/aps/aps/components/check.vue 0 → 100644
View file @ 614278c5
<template>
<div>
<h3 class="tc" v-if="data.res">
<Icon type="md-checkmark-circle" size="32" color="green"/>
数据检查通过
</h3>
<h3 class="tc" v-else>
<Icon type="md-close-circle" size="32" color="red"/>
数据检查失败
</h3>
<div>
<Tabs>
<TabPane v-for="(item,key,index) in list" :key="key" :label="key" :name="key">
<Table :columns="init(item)" :data="item" height="500" border></Table>
</TabPane>
</Tabs>
</div>
</div>
</template>
<script>
export default {
name: "",
data() {
return {
datas:{},
};
},
props:{
data:Object,
default:()=>{
return {
res:true,
datas:{},
}
}
},
computed:{
list(){
var data={};
var item=JSON.parse(this.data.datas);
for(var key in item)
{
if(item[key]&& item[key].length>0){
data[key]= item[key];
}
}
return data;
}
},
methods:{
init(items){
var cols=[];
if(items.length>0){
for(var key in items[0]){
let col={
key:key,
title:key
}
cols.push(col);
}
}
return cols;
}
}
};
</script>
<style lang="less" >
</style>
\ No newline at end of file
pages/aps/aps/index.vue
View file @ 614278c5
......@@ -14,31 +14,36 @@
:easy="true"
>
<template slot="easySearch">
<div><Select
placeholder="选择排序优先级"
v-model="tempValue"
style="width: 150px;"
@on-change="tempValueChange"
clearable
>
<Option v-for="(item,index) in listTemp" :key="index" :value="item.id" :label="item.name"></Option>
</Select>
<a style="font-weight: bold;" @click="openaddModalTemp">
<Icon type="md-color-palette" size="14" />&nbsp;自定义排序模板
</a>
<a style="font-weight: bold;" @click="openDuration">
<Icon type="md-create" size="14" />&nbsp;修改外协工期
</a>
<div>
<Select
placeholder="选择排序优先级"
v-model="tempValue"
style="width: 150px;"
@on-change="tempValueChange"
clearable
>
<Option
v-for="(item,index) in listTemp"
:key="index"
:value="item.id"
:label="item.name"
></Option>
</Select>
<a style="font-weight: bold;" @click="openaddModalTemp">
<Icon type="md-color-palette" size="14" />&nbsp;自定义排序模板
</a>
<a style="font-weight: bold;" @click="openDuration">
<Icon type="md-create" size="14" />&nbsp;修改外协工期
</a>
<Select placeholder="选择历史方案" style="width: 150px;"></Select>
</div>
</template>
<template slot="searchBack">
</template>
<template slot="searchBack"></template>
<template slot="searchForm">
<Search />
</template>
<template slot="buttons">
<DatePicker
<DatePicker
type="date"
placeholder="设置基准日期"
style="width: 150px;"
......@@ -52,7 +57,8 @@
type="primary"
@click="goResults"
style="background:#515A6E;border:solid 1px #515A6E"
>查看历史方案</Button>
>历史方案</Button>
<Button type="primary" @click="resultModal=true">Result</Button>
<Button type="primary" @click="openApsModal">APS排产</Button>
</template>
<template slot="batch">
......@@ -78,6 +84,9 @@
<Modal v-model="apsModal" title="确定APS排产" @on-ok="apsOk" @on-cancel="cancel">
<p>确定进行APS排产？</p>
</Modal>
<Modal v-model="resultModal" title="数据检查" width="1500" @on-ok="checkOk" @on-cancel="cancel">
<CheckResult :data="result"></CheckResult>
</Modal>
<Modal v-model="apsCheckModal" title="确定APS排产" @on-ok="apsCheckOk" @on-cancel="cancel">
<p>已有排产方案，是否移出排产池？</p>
</Modal>
......@@ -103,13 +112,15 @@ import Add from "./options";
import Temp from "./temp";
import Duration from "./duration";
import Expand from "./components/excute";
import CheckResult from "./components/check";
export default {
name: "list",
components: {
Add,
Expand,
Temp,
Duration
Duration,
CheckResult
},
data() {
return {
......@@ -117,6 +128,11 @@ export default {
easySearch: {
keys: { op: "notes", value: null }
},
result: {
res: true,
datas: {}
},
resultModal: false,
entity: {
setTime: ""
},
......@@ -512,6 +528,7 @@ export default {
this.deletedlModal = false;
this.apsModal = false;
this.apsCheckModal = false;
this.resultModal = false;
},
onDragDrop(a, b) {
//拖拽排序
......@@ -575,41 +592,8 @@ export default {
Api.apsdatachecked()
.then(res1 => {
if (res1.success) {
if (res1.result.res) {
// this.$Message.success("数据校验成功");
//排产计算
let paramsTime = {
setTime: this.entity.setTime
};
Api.apsprepareandcalc(paramsTime)
.then(res2 => {
if (res2.success) {
if (res2.result.res) {
this.$Message.success("排产计算成功");
this.circleModal = false;
this.$router.push({
path: "/aps/results"
// params: { customerId: id }
});
} else {
this.circleModal = false;
this.$Message.error(res2.result.msg);
}
} else {
this.circleModal = false;
this.$Message.error("操作失败：排产计算");
}
})
.catch(
function(err) {
this.circleModal = false;
this.$Message.error("操作失败");
}.bind(this)
);
} else {
this.circleModal = false;
this.$Message.success("数据校验失败");
}
this.result=res1.result;
this.resultModal=true;
} else {
this.circleModal = false;
this.$Message.error("操作失败：数据校验");
......@@ -637,6 +621,37 @@ export default {
}.bind(this)
);
},
checkOk() {
//排产计算
let paramsTime = {
setTime: this.entity.setTime
};
Api.apsprepareandcalc(paramsTime)
.then(res2 => {
if (res2.success) {
if (res2.result.res) {
this.$Message.success("排产计算成功");
this.circleModal = false;
this.$router.push({
path: "/aps/results"
// params: { customerId: id }
});
} else {
this.circleModal = false;
this.$Message.error(res2.result.msg);
}
} else {
this.circleModal = false;
this.$Message.error("操作失败：排产计算");
}
})
.catch(
function(err) {
this.circleModal = false;
this.$Message.error("操作失败");
}.bind(this)
);
},
//打开设置参数
openAddModel(type, row) {
if (type == 2) {
......
pages/dncmnc/mnc/analysis.vue
View file @ 614278c5
<template>
<div>数据分析表
<Echart1 ></Echart1>
<div>
<a class="back_href" @click="goView">
<Icon type="ios-undo-outline" size="24" />返回设备监控
</a>
<!-- 数据分析表 -->
<Echart1 ></Echart1>
</div>
</template>
<script>
......@@ -73,6 +77,11 @@ export default {
};
},
methods: {},
methods: {
goView(){
//返回设备监控页面
this.$router.push("/dncmnc/mnc");
},
},
};
</script>
pages/implement/components/entryrecordfiles.vue
View file @ 614278c5
......@@ -70,7 +70,22 @@ export default {
render: (h, params) => {
let id = params.row.id
if (!this.isedit) {
return h('div', '')
return h(
'A',
{
attrs: {
href: fileUrlDown + params.row.data_content2,
target: '_blank'
},
props: {},
style: {
color: '#249E91',
marginRight: '5px',
cursor: 'pointer'
}
},
'查看'
)
} else {
return h(
'div',
......
pages/produce/execute/components/functional.vue
View file @ 614278c5
......@@ -58,7 +58,7 @@
</a>
</li>
<li>
<a @click="gnFunto(10,'质量检验')" :class="{active:gnFlag == 8}">
<a @click="gnFunto(10,'质量检验')" :class="{active:gnFlag == 10}">
<img src="@/assets/imgicon/execute/ex09.png" alt /> 质量检验
</a>
</li>
......
pages/produce/execute/datafilling/backCheck.vue 0 → 100644
View file @ 614278c5
<template>
<Form ref="form" :model="mod" :label-width="100">
<Row class="rowTitle100">
<Col :span="12">
<span class="ml20">产品号</span>
<Select
multiple
@on-change="productonchange"
v-model="product_ID"
class="w200"
>
<Option
v-for="item in product_List"
:value="item.productids"
:key="item.index"
>{{ item.productcodes }}</Option>
</Select>
</Col>
</Row>
<Row class="rowTitle100">
<Col :span="12">
<FormItem label="备注" >
<Input v-model="mod.check_Result" type="textarea" :rows="4" maxlength="100" show-word-limit></Input>
</FormItem>
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">确定</Button>
</FormItem>
</Form>
</template>
<script>
import service from '@/plugins/request'
export default {
name: 'backCheck',
components: {},
data() {
return {
disabled: false,
isCurrentUser: false,
mod: {
id: 0,
dispatch_id: 0,
execute_id: 0,
order_id: '',
routingHeaderId: 0,
routingDetailId: 0,
product_code: '',
board_code: '',
checkerIds: '',
checkerNames: '',
check_Status: 0,
check_Result: '',
checker: 0,
checkName: '',
check_time: null
},
recordList: [],
isMain: 1,
productisabled: false,
product_ID: [],
board_ID: [],
product_List: [],
board_List: []
}
},
mounted() {},
watch: {},
methods: {
handleSubmit() {
let state = true
if (this.product_ID.length == 0) {
state = false
this.$Message.error('请选择要打回的产品')
return
}
this.mod.product_code = this.product_ID.join(',')
this.mod.board_code = this.board_ID.join(',')
if (state) {
var url = `${PlanUrl}/ordercheckresult/savecheckresult`
service
.post(`${url}`, this.mod)
.then((response) => {
if (response.success) {
this.$Message.success('操作成功')
this.$parent.$parent.loadproduct()
this.$parent.$parent.backCheckModal = false
}
})
.catch((error) => {
this.$Message.error('保存失败')
})
}
},
handleClose() {},
loadentry(entryModel, fillModel) {
this.mod.dispatch_id = entryModel.id
this.mod.execute_id = entryModel.executeId
this.mod.order_id = entryModel.order_id
this.mod.routingHeaderId = entryModel.routingHeaderId
this.mod.routingDetailId = entryModel.routingDetailId
this.mod.checkName = this.$store.state.userInfo.userName
this.mod.check_Status = 3
this.product_code = ''
this.board_code = ''
this.isCurrentUser = false
this.isMain = entryModel.isMain
this.product_ID = []
this.board_ID = []
this.productisabled = fillModel.productisabled
this.product_ID.push(fillModel.product_ID)
this.board_ID.push(fillModel.board_ID)
this.product_List = fillModel.product_List
this.board_List = fillModel.board_List
},
productonchange(e) {},
boardonchange(e) {
this.product_ID = []
for (let i = 0; i < this.board_List.length; i++) {
let obj = this.board_List[i]
for (let j = 0; j < e.length; j++) {
if (obj.boardNumber == e[j]) {
this.product_ID.push(obj.productids)
}
}
}
}
}
}
</script>
\ No newline at end of file
pages/produce/execute/datafilling/check.vue
View file @ 614278c5
This diff is collapsed.
pages/produce/execute/datafilling/entryrecordfiles.vue
View file @ 614278c5
......@@ -70,7 +70,22 @@ export default {
render: (h, params) => {
let id = params.row.id
if (!this.isedit) {
return h('div', '')
return h(
'A',
{
attrs: {
href: fileUrlDown + params.row.data_content2,
target: '_blank'
},
props: {},
style: {
color: '#249E91',
marginRight: '5px',
cursor: 'pointer'
}
},
'查看'
)
} else {
return h(
'div',
......
pages/produce/execute/datafilling/index.vue
View file @ 614278c5
......@@ -246,6 +246,7 @@ export default {
ishavzj: true,
board_ID: "",
board_List: [],
productobj:{productstatus:-1},
usercardModal: false,
sendCheckModal: false,
entryrecorddataModal: false,
......
pages/produce/execute/datafilling/sendCheck.vue
View file @ 614278c5
......@@ -6,7 +6,6 @@
<span class="ml20">产品号</span>
<Select
multiple
@on-change="productonchange"
v-model="product_ID"
......@@ -64,7 +63,7 @@ export default {
checker: 0,
check_time: null
},
isall:[],
isall:false,
isMain: 1,
productisabled: false,
product_ID: [],
......
pages/produce/execute/datafilling/sendCheckRecord.vue
View file @ 614278c5
......@@ -42,11 +42,7 @@ export default {
width: '100',
key: 'product_code'
},
{
title: '板号',
width: '100',
key: 'board_code'
},
{
title: '送检检验员',
width: '150',
......
pages/produce/execute/datafilling/usercard.vue
View file @ 614278c5
......@@ -135,7 +135,7 @@ export default {
handleClose() {},
loadentry(entryModel, fillModel, recordList) {
this.user.dispatch_id = recordList[0].dispatch_id
this.user.dispatch_id = entryModel.id
this.user.execute_id = entryModel.executeId;
this.user.order_id = entryModel.order_id;
this.user.routingHeaderId = entryModel.routingHeaderId;
......
pages/produce/execute/index.vue
View file @ 614278c5
......@@ -144,7 +144,7 @@ row.routingdetailId=this.$route.query.routid;
this.detail = () => import("./datafilling/check");
} //质量检验
if (number == 9) {
this.$Message.info("尊敬的用户，您没有该权限！");
// this.$Message.info("尊敬的用户，您没有该权限！");
// this.detail = () => import("./testdata/index");
} //测试数据
},
......
pages/produce/execute/testdata/index.vue
View file @ 614278c5
......@@ -6,6 +6,7 @@
<Icon type="md-play" />
测试数据</a>
</div>
<div class="star flex fc-b" v-else-if="starmodal">
<Button class="button" size='large' type="primary"><Icon type="ios-pause" /> 暂停</Button>
<Button class="button" size='large' type="primary"><Icon type="logo-angular" /> 交检</Button>
......
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