Skip to content

M
mes-ui
Commit 6d1abacc authored by renjintao's avatar renjintao
Browse files
Options

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

parents 9a7e6e3a 45ee56fc
Hide whitespace changes
Inline Side-by-side
Showing with 379 additions and 148 deletions
assets/css/base.less
View file @ 6d1abacc
...@@ -1340,4 +1340,9 @@ html [type=button] { ...@@ -1340,4 +1340,9 @@ html [type=button] {
background-color: #2d8cf0; background-color: #2d8cf0;
color: white; color: white;
} }
}
.details{
.ivu-input-number{
width: 100%;
}
} }
\ No newline at end of file
components/page/inputTime.vue
View file @ 6d1abacc
<style lang="less"> <style lang="less">
.timer { .timer {
.ivu-input-number { // .ivu-input-number {
width: 60px; // width: 60px;
} // }
> span { > span {
line-height: 30px; line-height: 30px;
width: 40px;
} }
} }
</style> </style>
......
i18n/locale/zh-CN.js
View file @ 6d1abacc
...@@ -1215,8 +1215,8 @@ export default { ...@@ -1215,8 +1215,8 @@ export default {
description: '描述', description: '描述',
taskContent: '工序内容', taskContent: '工序内容',
resourceId: '资源ID', resourceId: '资源ID',
resourceType: '资源类型', resourceType: '首选资源',
resourceCode: '资源类型', resourceCode: '首选资源',
runtime: '排产单件工时', runtime: '排产单件工时',
setupTime: '准备工时', setupTime: '准备工时',
transportTime: '转运工时', transportTime: '转运工时',
......
pages/produce/execute/ProcessCheck/components/guidance.vue
View file @ 6d1abacc
<template> <template>
<div class="p20"> <div class="p20">
<div class=""> <div class="case_box">
工艺提醒 <CheckboxGroup v-model="caseLise">
<Checkbox class="file_card" border
v-for="(item,index) in cardlist" :label="item.id" :key="index">
<div class="file">
<Icon type="ios-paper" v-if="item.id%3==0"/>
<!-- <Icon type="ios-film" v-else/> -->
<Icon type="md-film" v-else/>
</div>
<div class="list">
<ul>
<li>{{item.name}}</li>
<li>{{item.userName}}</li>
<li>{{item.time}}</li>
</ul>
</div>
</Checkbox>
</CheckboxGroup>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
...@@ -12,7 +27,147 @@ export default { ...@@ -12,7 +27,147 @@ export default {
name:'starOrder', name:'starOrder',
data(){ data(){
return{ return{
starmodal: false, cardlist:[
{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:1,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:2,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:3,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:4,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:5,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:6,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:7,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:8,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:9,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:10,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:11,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:12,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:13,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:14,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:15,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:16,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:17,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:18,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:19,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:20,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:21,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:22,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:23,
checked:false
},
],
} }
}, },
created() { created() {
......
pages/technology/details/add.vue
View file @ 6d1abacc
<template> <template>
<div class="details"> <div class="details">
<Form ref="form" :model="entity" :rules="rules" :label-width="120"> <Form ref="form" :model="entity" :rules="rules" :label-width="100">
<Row> <Row>
<!-- <!--
<Col :span="12"> <Col :span="12">
...@@ -73,48 +73,52 @@ ...@@ -73,48 +73,52 @@
</FormItem> </FormItem>
</Col> </Col>
--> -->
<Col :span="8"> <Col :span="12">
<FormItem :label="l('taskSeq')" prop="taskSeq"> <FormItem :label="l('taskSeq')" prop="taskSeq">
<InputNumber v-model="maxNum" style="width:235px"></InputNumber> <InputNumber v-model="maxNum"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="12">
<FormItem :label="l('name')" prop="name"> <FormItem :label="l('name')" prop="name">
<Input v-model="entity.name" style="width:235px"></Input> <Input v-model="entity.name"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="6">
<FormItem :label="l('equipType')" prop="equipTypeId"> <FormItem :label="l('equipType')" prop="equipTypeId">
<EquipSelect v-model="entity.equipTypeId" @on-change="equipChange" style="width:235px"></EquipSelect> <EquipSelect v-model="entity.equipTypeId" @on-change="equipChange"></EquipSelect>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="6">
<FormItem :label="l('resourceType')" prop="resourceType"> <FormItem :label="l('resourceType')" prop="resourceType">
<!-- <Dictionary code="Process.routing_detail.resource_type" v-model="entity.resourceType"></Dictionary> --> <ResourceSelect v-model="entity.resourceId" @on-change="resourceChange"></ResourceSelect>
<ResourceSelect v-model="entity.resourceId" @on-change="resourceChange" style="width:235px"></ResourceSelect>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="6">
<FormItem :label="l('isImportant')" prop="isImportant"> <FormItem :label="l('isImportant')" prop="isImportant">
<Dictionary code="Process.state" v-model="entity.isImportant" type="radio"></Dictionary> <Dictionary code="Process.state" v-model="entity.isImportant" type="radio"></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="6">
<FormItem :label="l('isParticipateIntime')" prop="isParticipateIntime">
<Dictionary code="Process.state" v-model="entity.isParticipateIntime" type="radio"></Dictionary>
</FormItem>
</Col>
<!-- <Col :span="8">
<FormItem :label="l('isImportantResources')" prop="isImportantResources"> <FormItem :label="l('isImportantResources')" prop="isImportantResources">
<Dictionary code="Process.state" v-model="entity.isImportantResources" type="radio"></Dictionary> <Dictionary code="Process.state" v-model="entity.isImportantResources" type="radio"></Dictionary>
</FormItem> </FormItem>
</Col> </Col>-->
<Col :span="8"> <Col :span="12">
<FormItem :label="l('schedulingWorkingHours')" prop="schedulingWorkingHours"> <FormItem :label="l('schedulingWorkingHours')" prop="schedulingWorkingHours">
<InputTime v-model="entity.schedulingWorkingHours" /> <InputTime v-model="entity.schedulingWorkingHours" />
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="12">
<FormItem :label="l('runtime')" prop="runtime"> <FormItem :label="l('runtime')" prop="runtime">
<InputTime v-model="entity.runtime" /> <InputTime v-model="entity.runtime" />
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <!-- <Col :span="8">
<FormItem :label="l('realRuntime')" prop="realRuntime"> <FormItem :label="l('realRuntime')" prop="realRuntime">
<InputTime v-model="entity.realRuntime" /> <InputTime v-model="entity.realRuntime" />
</FormItem> </FormItem>
...@@ -123,8 +127,18 @@ ...@@ -123,8 +127,18 @@
<FormItem :label="l('realWorkingHours')" prop="realWorkingHours"> <FormItem :label="l('realWorkingHours')" prop="realWorkingHours">
<InputTime v-model="entity.realWorkingHours" /> <InputTime v-model="entity.realWorkingHours" />
</FormItem> </FormItem>
</Col>-->
<Col :span="4">
<FormItem :label="l('efficiencyValue')" prop="efficiencyValue">
<InputNumber v-model="entity.efficiencyValue"></InputNumber>
</FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="4">
<FormItem :label="l('singleOut')" prop="singleOut">
<InputNumber v-model="entity.singleOut"></InputNumber>
</FormItem>
</Col>
<Col :span="4">
<FormItem :label="l('isOutside')" prop="isOutside"> <FormItem :label="l('isOutside')" prop="isOutside">
<Dictionary <Dictionary
code="Process.state" code="Process.state"
...@@ -134,31 +148,15 @@ ...@@ -134,31 +148,15 @@
></Dictionary> ></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8" v-show="entity.isOutside==1"> <Col :span="12" :style="{visibility:entity.isOutside==1?'visible':'hidden'}">
<FormItem :label="l('outsideTime')" prop="outsideTime"> <FormItem :label="l('outsideTime')" prop="outsideTime">
<InputTime v-model="entity.outsideTime" /> <InputTime v-model="entity.outsideTime" />
</FormItem> </FormItem>
</Col> </Col>
<Divider />
<Col :span="8">
<FormItem :label="l('isParticipateIntime')" prop="isParticipateIntime">
<Dictionary code="Process.state" v-model="entity.isParticipateIntime" type="radio"></Dictionary>
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('efficiencyValue')" prop="efficiencyValue">
<InputNumber v-model="entity.efficiencyValue" style="width:235px"></InputNumber>
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('singleOut')" prop="singleOut">
<InputNumber v-model="entity.singleOut" style="width:235px"></InputNumber>
</FormItem>
</Col>
<Divider />
<Col :span="24"> <Col :span="24">
<FormItem :label="l('taskContent')" prop="taskContent"> <FormItem :label="l('taskContent')" prop="taskContent">
<i-quill v-model="entity.taskContent" :height="200" v-paste="handleImg" border /> <i-quill v-model="entity.taskContent" :height="260" v-paste="handleImg" border />
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
...@@ -187,8 +185,8 @@ export default { ...@@ -187,8 +185,8 @@ export default {
resourceType: null, resourceType: null,
resourceCode: "", resourceCode: "",
runtime: 0, runtime: 0,
efficiencyValue: null, efficiencyValue: 1,
singleOut: null, singleOut: 1,
isOutside: null, isOutside: null,
isImportant: null, isImportant: null,
outsideTime: 0, outsideTime: 0,
...@@ -250,24 +248,24 @@ export default { ...@@ -250,24 +248,24 @@ export default {
}); });
}, },
handleImg(e) { handleImg(e) {
let file = null let file = null;
if ( if (
e.clipboardData && e.clipboardData &&
e.clipboardData.items[0] && e.clipboardData.items[0] &&
e.clipboardData.items[0].type && e.clipboardData.items[0].type &&
e.clipboardData.items[0].type.indexOf('image') > -1 e.clipboardData.items[0].type.indexOf("image") > -1
) { ) {
//这里就是判断是否有粘贴进来的文件且文件为图片格式 //这里就是判断是否有粘贴进来的文件且文件为图片格式
file = e.clipboardData.items[0].getAsFile() file = e.clipboardData.items[0].getAsFile();
let reader = new FileReader() let reader = new FileReader();
reader.readAsDataURL(file) reader.readAsDataURL(file);
setTimeout(() => { setTimeout(() => {
var img = '<img src="' + reader.result + '" alt=""/>' var img = '<img src="' + reader.result + '" alt=""/>';
this.entity.taskContent += img this.entity.taskContent += img;
}, 1000) }, 1000);
// new R // new R
} }
}, },
l(key) { l(key) {
key = "routing_detail" + "." + key; key = "routing_detail" + "." + key;
...@@ -279,7 +277,7 @@ export default { ...@@ -279,7 +277,7 @@ export default {
}, },
resourceChange(v, items) { resourceChange(v, items) {
this.entity.resourceId = v[1]; this.entity.resourceId = v[1];
this.entity.resourceType =v[0]; this.entity.resourceType = v[0];
this.entity.resourceCode = items[1].__label; this.entity.resourceCode = items[1].__label;
} }
}, },
......
pages/technology/details/detail.vue
View file @ 6d1abacc
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
<Filed :span="12" :name="l('isImportant')"> <Filed :span="12" :name="l('isImportant')">
<state code="Process.state" :value="entity.isImportant" type="text"></state> <state code="Process.state" :value="entity.isImportant" type="text"></state>
</Filed> </Filed>
<Filed :span="12" :name="l('isImportantResources')"> <!-- <Filed :span="12" :name="l('isImportantResources')">
<state code="Process.state" :value="entity.isImportantResources" type="text"></state> <state code="Process.state" :value="entity.isImportantResources" type="text"></state>
</Filed> </Filed> -->
<Filed :span="12" :name="l('schedulingWorkingHours')"><OutputTime :value="entity.schedulingWorkingHours"></OutputTime></Filed> <Filed :span="12" :name="l('schedulingWorkingHours')"><OutputTime :value="entity.schedulingWorkingHours"></OutputTime></Filed>
<Filed :span="12" :name="l('runtime')"><OutputTime :value="entity.runtime"></OutputTime></Filed> <Filed :span="12" :name="l('runtime')"><OutputTime :value="entity.runtime"></OutputTime></Filed>
<Filed :span="12" :name="l('realRuntime')"><OutputTime :value="entity.realRuntime"></OutputTime></Filed> <Filed :span="12" :name="l('realRuntime')"><OutputTime :value="entity.realRuntime"></OutputTime></Filed>
......
pages/technology/details/edit.vue
View file @ 6d1abacc
<template> <template>
<Form ref="form" :model="entity" :rules="rules" :label-width="120" class="eid-form"> <div class="details">
<Row> <Form ref="form" :model="entity" :rules="rules" :label-width="100">
<Col :span="8"> <Row>
<FormItem :label="l('taskSeq')" prop="taskSeq"> <!--
<InputNumber v-model="entity.taskSeq" style="width:235px"></InputNumber > <Col :span="12">
<FormItem :label="l('routingHeaderId')" prop="routingHeaderId">
<InputNumber v-model="entity.routingHeaderId"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="12">
<FormItem :label="l('name')" prop="name"> <FormItem :label="l('classId')" prop="classId">
<Input v-model="entity.name" style="width:235px"></Input> <InputNumber v-model="entity.classId"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="12">
<FormItem :label="l('equipType')" prop="equipTypeId"> <FormItem :label="l('note')" prop="note">
<EquipSelect v-model="entity.equipTypeId" @on-change="equipChange" style="width:235px"></EquipSelect> <Input v-model="entity.note"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8">
<FormItem :label="l('resourceType')" prop="resourceType"> <Col :span="12">
<ResourceSelect v-model="entity.resourceId" @on-change="resourceChange" style="width:235px"></ResourceSelect> <FormItem :label="l('milestoneId')" prop="milestoneId">
<InputNumber v-model="entity.milestoneId"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8">
<FormItem :label="l('isImportant')" prop="isImportant"> <Col :span="12">
<Dictionary code="Process.state" v-model="entity.isImportant" type="radio"></Dictionary> <FormItem :label="l('status')" prop="status">
<Dictionary code="Process.Status" v-model="entity.status"></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="24">
<FormItem :label="l('isImportantResources')" prop="isImportantResources"> <FormItem :label="l('remark')" prop="remark">
<Dictionary code="Process.state" v-model="entity.isImportantResources" type="radio"></Dictionary> <Input v-model="entity.remark" type="textarea" :rows="5"></Input>
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('schedulingWorkingHours')" prop="schedulingWorkingHours">
<InputTime v-model="entity.schedulingWorkingHours" />
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('runtime')" prop="runtime">
<InputTime v-model="entity.runtime" />
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('realRuntime')" prop="realRuntime">
<InputTime v-model="entity.realRuntime" />
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="12">
<FormItem :label="l('realWorkingHours')" prop="realWorkingHours"> <FormItem :label="l('extend')" prop="extend">
<InputTime v-model="entity.realWorkingHours" /> <Input v-model="entity.extend"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8">
<FormItem :label="l('isOutside')" prop="isOutside"> <Col :span="12">
<Dictionary <FormItem :label="l('performanceHours')" prop="performanceHours">
code="Process.state" <InputNumber v-model="entity.performanceHours"></InputNumber>
v-model="entity.isOutside"
type="radio"
style="height:20px"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8" v-show="entity.isOutside==1"> <Col :span="12">
<FormItem :label="l('outsideTime')" prop="outsideTime"> <FormItem :label="l('resourceCode')" prop="resourceCode">
<InputTime v-model="entity.outsideTime" /> <Input v-model="entity.resourceCode"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12">
<Col :span="8"> <FormItem :label="l('performanceWorkingHours')" prop="performanceWorkingHours">
<FormItem :label="l('isParticipateIntime')" prop="isParticipateIntime"> <InputNumber v-model="entity.performanceWorkingHours"></InputNumber>
<Dictionary code="Process.state" v-model="entity.isParticipateIntime" type="radio"></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8">
<FormItem :label="l('efficiencyValue')" prop="efficiencyValue"> <Col :span="12">
<InputNumber v-model="entity.efficiencyValue"></InputNumber> <FormItem :label="l('equipType')" prop="equipType">
<Input v-model="entity.equipType"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="12">
<FormItem :label="l('singleOut')" prop="singleOut"> <FormItem :label="l('equipTypeId')" prop="equipTypeId">
<InputNumber v-model="entity.singleOut"></InputNumber> <InputNumber v-model="entity.equipTypeId"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
<Divider /> <Col :span="24">
<Col :span="24"> <FormItem :label="l('remark')" prop="remark">
<FormItem :label="l('taskContent')" prop="taskContent"> <Input v-model="entity.remark" type="textarea" :rows="5"></Input>
<i-quill v-model="entity.taskContent" :height="200" border v-paste="handleImg" />
</FormItem> </FormItem>
</Col> </Col>
</Row> -->
<FormItem> <Col :span="12">
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button> <FormItem :label="l('taskSeq')" prop="taskSeq">
<Button @click="handleClose" class="ml20">取消</Button> <InputNumber v-model="maxNum"></InputNumber>
</FormItem> </FormItem>
</Form> </Col>
<Col :span="12">
<FormItem :label="l('name')" prop="name">
<Input v-model="entity.name"></Input>
</FormItem>
</Col>
<Col :span="6">
<FormItem :label="l('equipType')" prop="equipTypeId">
<EquipSelect v-model="entity.equipTypeId" @on-change="equipChange"></EquipSelect>
</FormItem>
</Col>
<Col :span="6">
<FormItem :label="l('resourceType')" prop="resourceType">
<ResourceSelect v-model="entity.resourceId" @on-change="resourceChange"></ResourceSelect>
</FormItem>
</Col>
<Col :span="6">
<FormItem :label="l('isImportant')" prop="isImportant">
<Dictionary code="Process.state" v-model="entity.isImportant" type="radio"></Dictionary>
</FormItem>
</Col>
<Col :span="6">
<FormItem :label="l('isParticipateIntime')" prop="isParticipateIntime">
<Dictionary code="Process.state" v-model="entity.isParticipateIntime" type="radio"></Dictionary>
</FormItem>
</Col>
<!-- <Col :span="8">
<FormItem :label="l('isImportantResources')" prop="isImportantResources">
<Dictionary code="Process.state" v-model="entity.isImportantResources" type="radio"></Dictionary>
</FormItem>
</Col>-->
<Col :span="12">
<FormItem :label="l('schedulingWorkingHours')" prop="schedulingWorkingHours">
<InputTime v-model="entity.schedulingWorkingHours" />
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('runtime')" prop="runtime">
<InputTime v-model="entity.runtime" />
</FormItem>
</Col>
<!-- <Col :span="8">
<FormItem :label="l('realRuntime')" prop="realRuntime">
<InputTime v-model="entity.realRuntime" />
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('realWorkingHours')" prop="realWorkingHours">
<InputTime v-model="entity.realWorkingHours" />
</FormItem>
</Col>-->
<Col :span="4">
<FormItem :label="l('efficiencyValue')" prop="efficiencyValue">
<InputNumber v-model="entity.efficiencyValue"></InputNumber>
</FormItem>
</Col>
<Col :span="4">
<FormItem :label="l('singleOut')" prop="singleOut">
<InputNumber v-model="entity.singleOut"></InputNumber>
</FormItem>
</Col>
<Col :span="4">
<FormItem :label="l('isOutside')" prop="isOutside">
<Dictionary
code="Process.state"
v-model="entity.isOutside"
type="radio"
style="height:20px"
></Dictionary>
</FormItem>
</Col>
<Col :span="12" :style="{visibility:entity.isOutside==1?'visible':'hidden'}">
<FormItem :label="l('outsideTime')" prop="outsideTime">
<InputTime v-model="entity.outsideTime" />
</FormItem>
</Col>
<Divider />
<Col :span="24">
<FormItem :label="l('taskContent')" prop="taskContent">
<i-quill v-model="entity.taskContent" :height="260" v-paste="handleImg" border />
</FormItem>
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
</div>
</template> </template>
<script> <script>
import Api from "./api"; import Api from "./api";
......
pages/technology/details/index.vue
View file @ 6d1abacc
...@@ -96,12 +96,12 @@ export default { ...@@ -96,12 +96,12 @@ export default {
align: "left", align: "left",
easy: true easy: true
}, },
{ // {
key: "isImportantResources", // key: "isImportantResources",
title: this.l("isImportantResources"), // title: this.l("isImportantResources"),
align: "center", // align: "center",
code: "Process.state" // code: "Process.state"
}, // },
{ {
key: "schedulingWorkingHours", key: "schedulingWorkingHours",
...@@ -116,12 +116,12 @@ export default { ...@@ -116,12 +116,12 @@ export default {
align: "right", align: "right",
type: "outputTime", type: "outputTime",
}, },
{ // {
key: "realRuntime", // key: "realRuntime",
title: this.l("realRuntime"), // title: this.l("realRuntime"),
align: "right", // align: "right",
type: "outputTime", // type: "outputTime",
}, // },
{ {
key: "outsideTime", key: "outsideTime",
title: this.l("outsideTime"), title: this.l("outsideTime"),
......
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