Skip to content

M
mes-ui
Commit 09ea4669 authored by 佟礼's avatar 佟礼
Browse files
Options

配套

parents ff9387a2 85a46678
Show whitespace changes
Inline Side-by-side
Showing with 392 additions and 253 deletions
components/page/dataGrid.vue
View file @ 09ea4669
......@@ -162,7 +162,7 @@ export default {
},
size: {
type: String,
default: "default "
default: "default"
},
height: {
type: Number,
......
i18n/locale/zh-CN.js
View file @ 09ea4669
......@@ -927,6 +927,12 @@ export default {
mes_part_task_plan_simulate: {
id: '',
part_task_pk: '计划编号',
mes_code: '计划编号',
urgency_level: '紧急程度',
batchnum: '批次号',
drawingnum: '图号',
project_no: '项目号',
product_name: '产品名称',
priority: '优先级',
plan_qty: '排产数量',
spare_qty: '备件数量',
......
layouts/basic-layout/product.vue
View file @ 09ea4669
......@@ -9,37 +9,59 @@
<table class="t_table_box">
<tr>
<td class="t_title">
<a class="a_goIndex" @click="goIndex">
<a class="a_goIndex">
<b class="title">首页</b>
</a>
</td>
</tr>
<tr>
<td class="t_title">
<td>
<ul class="table_row_ul">
<li>
<a class="a_goIndex" @click="goIndex">
首页一
</a>
</li>
<li>
<a class="a_goIndex" @click="goIndexTwo">
<b class="title">首页二</b>
首页二
</a>
</li>
</ul>
</td>
</tr>
<tr v-for="(item,i) in filterSider">
<td class="t_title">
<b class="title"
>{{item.title}}</b>
<b class="title">{{item.title}}</b>
</td>
<td>
<ul class="table_row_ul">
<li v-for="(li,j) in item.children">
<a @click="goPage(li,j)" :class="{'active': li.id === isActive}">{{li.title}}</a>
<li v-for="(li) in item.children">
<a @click="goPage(item,li)" :class="{'active': li.id === isActive}">{{li.title}}</a>
</li>
</ul>
</td>
</tr>
</table>
</div>
</span>
</a>
<i-header-breadcrumb v-if="showBreadcrumb && !headerMenu && !isMobile" ref="breadcrumb" />
<!-- <i-header-breadcrumb v-if="showBreadcrumb && !headerMenu && !isMobile" ref="breadcrumb" /> -->
<!-- {{}} -->
<Breadcrumb class="i-layout-header-breadcrumb" v-if="homeMenuItem==''">
<BreadcrumbItem to="/" class="white">
<Icon type="ios-home" />首页
</BreadcrumbItem>
</Breadcrumb>
<Breadcrumb class="i-layout-header-breadcrumb" v-else-if="homeMenuItem!=''" separator=">">
<BreadcrumbItem to="/" class="white">
<Icon type="ios-home" />首页
</BreadcrumbItem>
<BreadcrumbItem>
{{homeMenu}}
</BreadcrumbItem>
<BreadcrumbItem :to="parthto" class="white">
{{homeMenuItem}}
</BreadcrumbItem>
</Breadcrumb>
<i-header-search v-if="showSearch && !headerMenu && !isMobile && !showBreadcrumb" />
<div class="header_right">
<i-header-search
......@@ -52,7 +74,7 @@
<i-header-notice v-if="showNotice" />
<i-header-user />
<!-- <i-header-i18n v-if="showI18n" />
<i-header-setting v-if="enableSetting && !isMobile" /> -->
<i-header-setting v-if="enableSetting && !isMobile" />-->
</div>
</Header>
<Content class="i-layout-content">
......@@ -107,13 +129,17 @@ export default {
},
data() {
return {
isActive:0,
isActive: 0,
showDrawer: false,
ticking: false,
headerVisible: true,
oldScrollTop: 0,
isDelayHideSider: false, // hack，当从隐藏侧边栏的 header 切换到正常 header 时，防止 Logo 抖动
loadRouter: true
loadRouter: true,
homeMenu:'',
homeMenuItem:"",
parthto:'',
};
},
computed: {
......@@ -222,8 +248,7 @@ export default {
}, 0);
},
$route(to, from) {
if (to.name === from.name) {
// 相同路由，不同参数，跳转时，重载页面
if (to.name === from.name) {// 相同路由，不同参数，跳转时，重载页面
if (Setting.sameRouteForceUpdate) {
this.handleReload();
}
......@@ -242,10 +267,7 @@ export default {
},
handleScroll() {
if (!this.headerHide) return;
const scrollTop =
document.body.scrollTop + document.documentElement.scrollTop;
const scrollTop = document.body.scrollTop + document.documentElement.scrollTop;
if (!this.ticking) {
this.ticking = true;
requestAnimation(() => {
......@@ -272,8 +294,7 @@ export default {
// todo $menuHead.handleGetMenuHeight();
}
},
handleReload() {
// 针对缓存的页面也生效
handleReload() {// 针对缓存的页面也生效
const isCurrentPageCache = this.keepAlive.indexOf(this.$route.name) > -1;
const pageName = this.$route.name;
if (isCurrentPageCache) {
......@@ -287,15 +308,24 @@ export default {
}
});
},
goPage(u) {
this.$router.push(u.path)
this.isActive = u.id
goPage(u,li) {
this.$router.push(li.path)
this.isActive = li.id
this.homeMenu = u.title
this.homeMenuItem = li.title
this.parthto = li.path
},
goIndex(){
this.$router.push("/")
this.homeMenu = ''
this.homeMenuItem = ''
this.isActive = 0
},
goIndexTwo(){
this.$router.push("/home")
this.homeMenu = ''
this.homeMenuItem = ''
this.isActive = 0
}
},
mounted() {
......@@ -311,7 +341,22 @@ export default {
</script>
<style lang="less">
.i-layout-header-breadcrumb {
color: #A7B8CC!important;//wheat
}
.i-layout-header-breadcrumb .white .ivu-breadcrumb-item-link {
color: #ffffff!important;//wheat
}
.ivu-icon-ios-home{
font-size: 20px;
}
.white{
color: #ffffff!important;
}
.product-layout {
.i-layout-content {
padding: 5px 10px;
}
.ivu-layout-header {
height: 50px;
line-height: 50px;
......@@ -335,7 +380,8 @@ export default {
-webkit-transition: width 0.5s, height 0.5s, -webkit-transform 0.5s; /* Safari */
transition: width 0.5s, height 0.5s, transform 0.5s;
i {
-webkit-transition: font-size 0.5s, margin 0.5s, -webkit-transform 0.5s; /* Safari */
-webkit-transition: font-size 0.5s, margin 0.5s,
-webkit-transform 0.5s; /* Safari */
transition: font-size 0.5s, margin 0.5s, transform 0.5s;
}
}
......@@ -348,10 +394,10 @@ export default {
top: 57%;
min-width: 1084px;
min-height: 300px;
box-shadow: 0px 5px 17px 5px rgba(0,0,0,0.28);
box-shadow: 0px 5px 17px 5px rgba(0, 0, 0, 0.28);
background: #f5f6fa;
.t_table_box{
border-collapse:collapse;
.t_table_box {
border-collapse: collapse;
border-radius: 5px;
tr:first-of-type {
border-top-right-radius: 5px;
......@@ -365,15 +411,14 @@ export default {
border-bottom-left-radius: 5px;
}
}
tr{
// line-height: 35px;
td{
tr {
td {
padding: 9px 10px 0px;
.table_row_ul{
.table_row_ul {
list-style: none;
border-bottom: 1px solid #E0E0E0;
border-bottom: 1px solid #e0e0e0;
text-align: left;
li{
li {
list-style: none;
display: inline-block;
a {
......@@ -383,15 +428,15 @@ export default {
margin: 0px 6px;
border-radius: 4px;
}
a:hover{
a:hover {
background: #2680eb;
color: white;
}
a:visited{
a:visited {
background: #2680eb;
color: white;
}
a.active{
a.active {
background: #2680eb;
color: white;
}
......@@ -399,13 +444,13 @@ export default {
}
}
}
.t_title{
.t_title {
min-width: 120px;
background: #515a6e;
.a_goIndex{
.a_goIndex {
color: #fff;
}
.title{
.title {
padding: 5px 10px;
}
}
......
pages/aps/aps/add.vue
View file @ 09ea4669
......@@ -118,16 +118,16 @@
<InputNumber v-model="entity.efficiencyValue" :step="0.01"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<Col :span="12" v-if="opTaskPk>0">
<FormItem :label="l('run_time')" prop="run_time">
<span v-text="run_time"></span>
<span v-text="row.run_time"></span>
</FormItem>
</Col>
</Row>
<Divider />
<FormItem :label="l('isDiscrete')" prop="lisan">
<i-switch v-model="entity.lisan" size="large">
<FormItem :label="l('isDiscrete')" prop="isDiscrete">
<i-switch v-model="entity.isDiscrete" size="large">
<span slot="open">是</span>
<span slot="close">否</span>
</i-switch>
......@@ -171,7 +171,7 @@ export default {
overTime: "不加班", //"六日加班", 不加班 加班
efficiencyValue: 11, // 效率系数, 必须大于 0
shopId: null,
lisan: true,
isDiscrete: true,
isDiscrete: "否",
discrete: 1, //离散数值 必须大于 1
multiple: true,
......@@ -231,9 +231,15 @@ export default {
type: Number,
default: 0
},
run_time:{
run_time: {
type: Number,
default:0
default: 0
},
row: {
type: Object,
default: () => {
return null;
}
}
},
created() {
......@@ -272,7 +278,7 @@ export default {
this.entity.over = u.OverTime == "不加班";
this.entity.overTime = u.parameterValue;
} else if (u.parametersCode == "Discrete") {
this.entity.lisan = u.parameterValue == "是";
this.entity.isDiscrete = u.parameterValue == "是";
this.entity.isDiscrete = u.parameterValue;
}
});
......@@ -280,15 +286,22 @@ export default {
handleSubmit() {
this.$refs.form.validate(valid => {
if (valid) {
if(this.opTaskPk==0&&this.partTaskPk>0&&this.entity.flog<1){
this.$Message.error("计划参数调整参数应用范围不能是工序级的")
this.entity.flog=1;
if (
this.opTaskPk == 0 &&
this.partTaskPk > 0 &&
this.entity.flog < 1
) {
this.$Message.error("计划参数调整参数应用范围不能是工序级的");
this.entity.flog = 1;
return;
}
if(this.entity.multipleEquipPks){
this.entity.multipleEquipIds = this.entity.multipleEquipPks.join();
}
//
this.entity.planMethod = this.entity.planState ? "重叠" : "平行";
this.entity.overTime = this.entity.over ? "不加班" : "加班";
this.entity.isDiscrete = this.entity.lisan ? "是" : "否";
this.entity.isDiscrete = this.entity.isDiscrete ? "是" : "否";
this.entity.multipleEquip = this.entity.multiple ? "是" : "否";
Api.apsschedulupdateparameter(this.entity)
.then(res => {
......@@ -336,11 +349,35 @@ export default {
},
opTaskPk(v, n) {
this.entity.opTaskPk = v;
if(v>0){
let entity={
partTaskPk: this.row.part_task_pk,
opTaskPk: this.row.op_task_pk,
taskSeq: this.row.task_seq,
flog: 5, //参数应用范围
calId: null,
planState: true,
planMethod: this.row.plan_method, // 平行 重叠
over: false,
overTime: this.row.over_time, //"六日加班", 不加班 加班
efficiencyValue:this.row.efficiency_value, // 效率系数, 必须大于 0
shopId: null,
isDiscrete: this.row.isdiscrete,
isDiscrete: "否",
discrete: this.row.discrete_value, //离散数值 必须大于 1
multiple: true,
multipleEquip: this.row.multi_machine, //"是否多台安排设备", 否 是
multipleCount: 1, //多台数量
multipleEquipPks: [],
multipleEquipIds: "", //"设备id", 用英文逗号分隔
}
this.entity=entity
}
this.entity.taskSeq = this.taskSeq;
},
count(v, n) {
this.entity.discrete = 1;
}
},
}
};
</script>
......@@ -375,7 +412,7 @@ export default {
}
}
}
.h50{
.h50 {
height: 115px;
}
.click-btn {
......
pages/aps/aps/api.js
View file @ 09ea4669
......@@ -2,20 +2,20 @@ import Api from '@/plugins/request'
export default {
index: `${resourceUrl}mesparttaskplansimulate/paged`,
paged(params) {
return Api.post(`${resourceUrl}mesparttaskplansimulate/paged`, params);
return Api.post(`${resourceUrl}/mesparttaskplansimulate/paged`, params);
},
get(params) {
return Api.get(`${resourceUrl}mesparttaskplansimulate/get`, params);
return Api.get(`${resourceUrl}/mesparttaskplansimulate/get`, params);
},
create(params) {
return Api.post(`${resourceUrl}mesparttaskplansimulate/create`, params);
return Api.post(`${resourceUrl}/mesparttaskplansimulate/create`, params);
},
update(params) {
return Api.post(`${resourceUrl}mesparttaskplansimulate/update`, params);
return Api.post(`${resourceUrl}/mesparttaskplansimulate/update`, params);
},
//删除：
delete(params) {
return Api.delete(`${resourceUrl}mesparttaskplansimulate/delete`, {
return Api.delete(`${resourceUrl}/mesparttaskplansimulate/delete`, {
params: params
});
},
......@@ -76,4 +76,13 @@ export default {
userdepartmentsofworkshop(params) {
return Api.get(`${systemUrl}/user/userdepartmentsofworkshop`, params);
},
//工时修改
updatesetuptimeandfirstequip(params) {
return Api.post(`${apsUrl}/mes_op_task_plan_simulate/updatesetuptimeandfirstequip`, params);
},
//工时同步到原始工艺
apsupdate(params) {
return Api.post(`${designUrl}/routingdetail/apsupdate `, params);
},
}
pages/aps/aps/components/edit.vue
View file @ 09ea4669
......@@ -2,46 +2,27 @@
<Form ref="form" :model="entity" :rules="rules" :label-width="100">
<Row>
<Col :span="12">
<FormItem :label="l('tASKSEQ')" prop="tASKSEQ">
<Input v-model="entity.task_seq"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('tASKNAME')" prop="tASKNAME">
<Input v-model="entity.task_name"></Input>
</FormItem>
<FormItem :label="l('tASKSEQ')" prop="tASKSEQ">{{this.entity.task_seq}}</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('sHOPID')" prop="sHOPID">
<!-- v-model="orderSearchForm.orderCat" -->
<Select v-model="entity.sHOPID">
<Option value="" class="option-text">请选择</Option>
<Option v-for="item in orderCatList" :value="item" :key="item">{{ item }}</Option>
</Select>
</FormItem>
<FormItem :label="l('tASKNAME')" prop="tASKNAME">{{this.entity.task_name}}</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('eQUIPID')" prop="eQUIPID">
<Select v-model="entity.eQUIPID">
<Option value="" class="option-text">请选择</Option>
<Option v-for="item in orderCatList" :value="item" :key="item">{{ item }}</Option>
</Select>
</FormItem>
</Col>
<Col :span="12">
<FormItem label="关重资源名称" prop="rUNTIME">
<Select v-model="entity.run_time">
<Option value="" class="option-text">请选择</Option>
<Option v-for="item in orderCatList" :value="item" :key="item">{{ item }}</Option>
</Select>
<FormItem label="生产设备">
<EquipSelect v-model="entity.eQUIPID"></EquipSelect>
</FormItem>
</Col>
<Col :span="12" v-model="entity.rUNTIME">
<FormItem :label="l('rUNTIME')" prop="rUNTIME">
<!-- v-model="value1" -->
<InputNumber v-model="entity.run_time" :max="100" :min="1"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem label=" ">
<Checkbox v-model="single">是否同步到原始工艺</Checkbox>
</FormItem>
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
......@@ -50,70 +31,99 @@
</Form>
</template>
<script>
import Api from '../api'
import Api from "../api";
export default {
name: 'Edit',
name: "Edit",
data() {
return {
disabled: false,
entity: {},
orderCatList:[
],
orderCatList: [],
rules: {
name: [{ required: true, message: '必填', trigger: 'blur' }]
}
}
name: [{ required: true, message: "必填", trigger: "blur" }]
},
single: false
};
},
props: {
row: {
type:Object,
default:()=>{
return null
type: Object,
default: () => {
return null;
}
}
},
methods: {
load(v) {
this.entity = v
this.entity = v;
},
handleSubmit() {
this.$refs.form.validate((v) => {
this.$refs.form.validate(v => {
if (v) {
this.disabled = true
Api.update(this.entity)
.then((r) => {
this.disabled = false
this.disabled = true;
let parmsUp = {
run_time: this.entity.run_time,
first_equip: this.entity.eQUIPID,
id: this.entity.id
};
Api.updatesetuptimeandfirstequip(parmsUp)
.then(res => {
if (res.success) {
if (!this.single) {
this.$Message.success("保存成功");
this.$emit("on-option-ok");
} else {
let parms = {
id: this.entity.routing_detail_id, //工序ID
name: this.entity.task_name, //工序名
task_seq: this.entity.task_seq, //工序号
resource_id: this.entity.eQUIPID, //设备id
runtime: this.entity.run_time, //单件工时
department_id: 0 //班组ID
};
Api.apsupdate(parms)
.then(r => {
this.disabled = false;
if (r.success) {
this.$Message.success('保存成功')
this.$emit('on-option-ok')
this.$Message.success("保存成功");
this.$emit("on-option-ok");
} else {
this.$Message.error('保存失败')
this.$Message.error("保存失败");
}
})
.catch((err) => {
this.disabled = false
this.$Message.error('保存失败')
console.warn(err)
})
.catch(err => {
this.disabled = false;
this.$Message.error("保存失败");
console.warn(err);
});
}
} else {
this.$Message.error("保存失败");
}
})
.catch(err => {
this.disabled = false;
this.$Message.error("保存失败");
console.warn(err);
});
}
});
},
handleClose() {
this.$emit('on-close')
this.$emit("on-close");
},
l(key) {
key = 'mes_op_task_execute' + '.' + key
return this.$t(key)
key = "mes_op_task_execute" + "." + key;
return this.$t(key);
}
},
watch: {
row(v) {
if (v != {}) {
//alert(JSON.stringify(v))
this.entity = v
this.entity = v;
}
}
}
}
};
</script>
pages/aps/aps/components/excute.vue
View file @ 09ea4669
......@@ -27,6 +27,7 @@
:partTaskPk="setParams.partTaskPk"
:taskSeq="setParams.taskSeq"
:count="setParams.count"
:row="rowData"
/>
</Modal>
</div>
......@@ -429,6 +430,7 @@ export default {
taskSeq: row.task_seq,
count: row.put_into_qty
};
this.rowData=row
this.setParsModal = true;
},
//单个工序进行参数设置end----
......
pages/aps/aps/index.vue
View file @ 09ea4669
......@@ -146,16 +146,50 @@ export default {
category: "icon"
},
{
key: "part_task_pk",
title: this.l("part_task_pk"),
key: "mesCode",
title: this.l("mes_code"),
align: "left",
high: true,
width: 240,
},
{
key: "product_name",
title: this.l("product_name"),
align: "left",
high: true
},
{
key: "drawingnum",
title: this.l("drawingnum"),
align: "left",
high: true
},
{
key: "project_no",
title: this.l("project_no"),
align: "left",
high: true
},
{
key: "batchnum",
title: this.l("batchnum"),
align: "left",
high: true
},
{
key: "urgency_level",
title: this.l("urgency_level"),
align: "left",
high: true,
code: "plan.order.urgencyLevel",
width: 100,
},
{
key: "priority",
title: this.l("priority"),
align: "left",
high: true,
hide: true,
render: (h, params) => {
return h("span", {}, params.index + 1);
}
......@@ -163,14 +197,15 @@ export default {
{
key: "plan_qty",
title: this.l("plan_qty"),
align: "left",
align: "right",
width: 100,
high: true,
sortable: true
},
{
key: "spare_qty",
title: this.l("spare_qty"),
align: "left",
align: "right",
width: 100,
high: true
},
{
......@@ -180,7 +215,7 @@ export default {
high: true,
hide: true,
resizable: true,
width: 140
width: 150
},
{
key: "plan_finish",
......@@ -190,7 +225,7 @@ export default {
hide: true,
sortable: true,
resizable: true,
width: 140
width: 150
},
{
key: "notes",
......@@ -205,7 +240,7 @@ export default {
title: this.l("demand_start"),
align: "center",
resizable: true,
width: 140
width: 150
},
{
key: "demand_finish",
......@@ -213,7 +248,7 @@ export default {
align: "center",
high: true,
resizable: true,
width: 140
width: 150
},
{
key: "badjustflag",
......@@ -235,7 +270,7 @@ export default {
icon: "md-options",
type: "icon",
title: "工序参数设置",
oprate: "edit",
oprate: "edit"
},
on: { click: () => this.openAddModel(2, params.row) }
}),
......
pages/aps/results/index.vue
View file @ 09ea4669
......@@ -240,7 +240,6 @@ export default {
line-height: 38px;
border-bottom: 1px solid #e4e6ed;
margin-bottom: 15px;
margin-right: 15px;
}
.left-body:hover {
cursor: pointer;
......@@ -269,7 +268,6 @@ export default {
.btn {
float: right;
margin-top: -52px;
margin-right: 15px;
}
}
}
......
pages/mesPlan/index.vue
View file @ 09ea4669
......@@ -33,16 +33,17 @@
<Search />
</template>
<template slot="buttons">
<Button type="primary" @click="addModal=true">新增</Button>
<Button type="primary" @click="addModal=true">创建</Button>
<Button type="primary" >修改</Button>
</template>
</DataGrid>
<Modal v-model="addModal" title="新增" footer-hide>
<Modal v-model="addModal" title="新增" footer-hide width="1000">
<Add @on-close="cancel" @on-ok="addOk" />
</Modal>
<Modal v-model="editModal" title="编辑" footer-hide>
<Modal v-model="editModal" title="编辑" footer-hide width="1000">
<Edit :eid="curId" @on-close="cancel" @on-ok="addOk" />
</Modal>
<Modal v-model="detailModal" title="详情">
<Modal v-model="detailModal" title="详情" width="1000">
<Detail :eid="curId" />
</Modal>
<Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel">
......
pages/order/quotation/components/treeType.vue
View file @ 09ea4669
<template>
<div class="tree-type">
<div class="zh-tree">
<h3 class="zh-title">产品结构</h3>
<div class="zh-box">
<Input placeholder="输入内容" style="width: auto" v-model="treeInputSearch">
......@@ -81,7 +81,5 @@ export default {
</script>
<style lang="less" scoped>
.tree-content {
margin-top: 15px;
}
</style>
pages/order/quotation/index.vue
View file @ 09ea4669
......@@ -2,9 +2,7 @@
<Layout class="quotation">
<!-- 左侧树 -->
<Sider hide-trigger :style="{background: '#fff'}" width="260">
<div class="zh-tree" :style="{ height: treeHeight + 'px' }">
<Tree-Type @func="getMsgFormSon"></Tree-Type>
</div>
<Tree-Type @func="getMsgFormSon" :style="{ height: treeHeight + 'px' }"></Tree-Type>
</Sider>
<!-- 右侧内容 -->
<Content class="content">
......@@ -364,8 +362,8 @@ export default {
};
},
created() {
this.treeHeight = window.innerHeight - 150;
this.tableHeight = window.innerHeight - 280;
this.treeHeight = window.innerHeight - 140;
this.tableHeight = window.innerHeight - 210;
this.newColumn = this.column;
this.tableTata(this.selectName);
},
......@@ -377,8 +375,8 @@ export default {
///浏览器窗口大小变化
return (() => {
window.screenHeight = window.innerHeight;
this.treeHeight = window.screenHeight - 150;
this.tableHeight = window.innerHeight - 280;
this.treeHeight = window.screenHeight - 140;
this.tableHeight = window.innerHeight - 210;
})();
};
},
......@@ -816,17 +814,5 @@ export default {
}
};
</script>
<style lang="less" scoped>
.table {
margin-top: 15px;
}
.seach {
margin-top: 15px;
}
</style>
<style>
.ivu-layout.ivu-layout-has-sider > .ivu-layout {
overflow-y: hidden !important;
}
</style>
pages/processManage/Process/processMain.vue
View file @ 09ea4669
......@@ -183,9 +183,9 @@ export default {
RoutingList: {},
components: {},
ruleValidate: {
// code: [
// { required: true, message: '工艺文件编号不能为空', trigger: 'blur' }
// ],
code: [
{ required: true, message: '工艺文件编号不能为空', trigger: 'blur' }
],
// number:[{required: true,type:'number'}],
name: [
{ required: true, message: '工艺文件名称不能为空', trigger: 'blur' }
......
pages/processManage/setProcess/components/orderMaterial.vue
View file @ 09ea4669
......@@ -460,13 +460,14 @@ export default {
} else {
this.isview = false;
}
if (this.formValidate.status == 1) {
this.isview = false;
}
this.codeisview = true;
this.formValidate1 = response.result.orderMaterialList;
for (let i = 0; i < this.formValidate1.length; i++) {
let obj = this.formValidate1[i];
}
});
} else {
......@@ -588,10 +589,10 @@ export default {
}, 5);
return;
}
this.formprocessValidate.quantity=this.formprocessValidate.singlequantity *this.dataTop[0].quantity;
this.formprocessValidate.quantity =
this.formprocessValidate.singlequantity * this.dataTop[0].quantity;
if (this.formValidate.id == 0) {
if (this.editindex == -1) {
let curData = {};
curData = JSON.parse(JSON.stringify(this.formprocessValidate));
......
pages/processManage/setProcess/index.vue
View file @ 09ea4669
......@@ -633,9 +633,13 @@ export default {
});
}
}
if (gh != null && gh.length > 0) {
content1 = gh[0].name;
editColor1 = gh[0].color;
} if(params.row.materialbillStatus>1)
{
content1 = "查看";
}
return h("div", [
h(
......
pages/qc/certificate/endIssued/index.vue
View file @ 09ea4669
<template>
<div class="end-issued">
<DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :high="false" :height="tdHeight"></DataGrid>
<DataGrid
:columns="columns"
ref="grid"
:action="action"
:conditions="easySearch"
:high="false"
:height="tdHeight"
></DataGrid>
<Modal v-model="detailModal" title="查看合格证" footer-hide width="1000" :mask-closable="false">
<Detail @on-close="cancel" @on-ok="addOk" :eid="curId" />
</Modal>
......@@ -8,10 +15,10 @@
</template>
<script>
import Api from '../api'
import Detail from './detail'
import Api from "../api";
import Detail from "./detail";
export default {
name: 'index',
name: "index",
components: {
Detail
},
......@@ -21,145 +28,145 @@ export default {
detailModal: false,
curId: 0,
modalInfo: false,
tdHeight:'',
tdHeight: "",
rules: {
approveUser: [{ required: true, message: '必填', trigger: 'blur' }]
approveUser: [{ required: true, message: "必填", trigger: "blur" }]
},
columns: [
{ key: 'id', title: this.l('id'), hide: true, align: 'left' },
{ key: "id", title: this.l("id"), hide: true, align: "left" },
// {
// type: 'selection',
// width: 60,
// align: 'center'
// },
{
key: 'mesCode',
title: this.l('mesCode'),
align: 'left',
key: "mesCode",
title: this.l("mesCode"),
align: "left",
easy: true,
high: true
},
{
key: 'productName',
title: this.l('productName'),
align: 'left',
key: "productName",
title: this.l("productName"),
align: "left",
easy: true,
high: true
},
{
key: 'drawnNumber',
title: this.l('drawnNumber'),
align: 'left',
key: "drawnNumber",
title: this.l("drawnNumber"),
align: "left",
easy: true,
high: true
},
{
key: 'quantity',
title: this.l('quantity'),
align: 'left',
key: "quantity",
title: this.l("quantity"),
align: "left",
easy: true,
high: true
},
{
key: 'productQuantity',
title: this.l('productQuantity'),
align: 'left',
key: "productQuantity",
title: this.l("productQuantity"),
align: "left",
easy: true,
high: true
},
{
key: 'uncertificateQuantity',
title: this.l('uncertificateQuantity'),
align: 'left',
key: "uncertificateQuantity",
title: this.l("uncertificateQuantity"),
align: "left",
easy: true,
high: true
},
{
key: 'actualFinishDate',
title: this.l('actualFinishDate'),
align: 'left',
key: "actualFinishDate",
title: this.l("actualFinishDate"),
align: "left",
easy: true,
high: true,
render: (h, params) => {
return h(
'span',
params.row.actualFinishDate == '0001-01-01 00:00:00'
? ''
"span",
params.row.actualFinishDate == "0001-01-01 00:00:00"
? ""
: params.row.actualFinishDate
)
);
}
},
{
key: 'productingPreparationPeople',
title: this.l('productingPreparationPeople'),
align: 'left',
key: "productingPreparationPeople",
title: this.l("productingPreparationPeople"),
align: "left",
easy: true,
high: true
},
{
key: 'status',
title: this.l('status'),
align: 'left',
key: "status",
title: this.l("status"),
align: "left",
easy: true,
high: true,
code: 'plan.order.status'
code: "plan.order.status"
},
{
title: '操作',
key: 'id',
title: "操作",
key: "id",
render: (h, params) => {
return h('div', { class: 'action' }, [
return h("div", { class: "action" }, [
h(
'op',
"op",
{
attrs: {
oprate: 'detail'
oprate: "detail"
},
on: { click: () => this.detail(params.row.id) }
},
'查看合格证'
"查看合格证"
)
])
]);
}
}
],
easySearch: {
keys: { op: 'mesCode', value: '', default: true },
type: { op: 'Equal', value: 2 }
}
keys: { op: "mesCode", value: "", default: true },
type: { op: "Equal", value: 2 }
}
};
},
mounted() {},
created() {
this.tdHeight = window.innerHeight - 260
this.tdHeight = window.innerHeight - 200;
},
methods: {
addOk() {
// this.$refs.grid.load()
this.detailModal = false
this.curId = 0
this.detailModal = false;
this.curId = 0;
},
cancel() {
this.curId = 0
this.detailModal = false
this.curId = 0;
this.detailModal = false;
},
reload() {
this.$refs.grid.load()
this.$refs.grid.load();
},
detail(id) {
this.detailModal = true
this.curId = id
this.detailModal = true;
this.curId = id;
},
// 列表title
l(key) {
let vkey = 'waitOpened' + '.' + key
return this.$t(vkey) || key
let vkey = "waitOpened" + "." + key;
return this.$t(vkey) || key;
}
}
}
};
</script>
<style lang="less" scoped>
......
pages/qc/certificate/waitOpened/index.vue
View file @ 09ea4669
......@@ -130,7 +130,7 @@ export default {
},
mounted() {},
created() {
this.tdHeight = window.innerHeight - 260
this.tdHeight = window.innerHeight - 200
},
methods: {
addOk() {
......
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