Skip to content

M
mes-ui
Commit 45ee56fc authored by 康振飞's avatar 康振飞
Browse files
Options

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

parents 15f7be8d 6335f598
Show whitespace changes
Inline Side-by-side
Showing with 245 additions and 177 deletions
assets/css/base.less
View file @ 45ee56fc
......@@ -1341,3 +1341,8 @@ html [type=button] {
color: white;
}
}
.details{
.ivu-input-number{
width: 100%;
}
}
\ No newline at end of file
components/page/inputTime.vue
View file @ 45ee56fc
<style lang="less">
.timer {
.ivu-input-number {
width: 60px;
}
// .ivu-input-number {
// width: 60px;
// }
> span {
line-height: 30px;
width: 40px;
}
}
</style>
......
i18n/locale/zh-CN.js
View file @ 45ee56fc
......@@ -1215,8 +1215,8 @@ export default {
description: '描述',
taskContent: '工序内容',
resourceId: '资源ID',
resourceType: '资源类型',
resourceCode: '资源类型',
resourceType: '首选资源',
resourceCode: '首选资源',
runtime: '排产单件工时',
setupTime: '准备工时',
transportTime: '转运工时',
......
pages/technology/details/add.vue
View file @ 45ee56fc
<template>
<div class="details">
<Form ref="form" :model="entity" :rules="rules" :label-width="120">
<Form ref="form" :model="entity" :rules="rules" :label-width="100">
<Row>
<!--
<Col :span="12">
......@@ -73,48 +73,52 @@
</FormItem>
</Col>
-->
<Col :span="8">
<Col :span="12">
<FormItem :label="l('taskSeq')" prop="taskSeq">
<InputNumber v-model="maxNum" style="width:235px"></InputNumber>
<InputNumber v-model="maxNum"></InputNumber>
</FormItem>
</Col>
<Col :span="8">
<Col :span="12">
<FormItem :label="l('name')" prop="name">
<Input v-model="entity.name" style="width:235px"></Input>
<Input v-model="entity.name"></Input>
</FormItem>
</Col>
<Col :span="8">
<Col :span="6">
<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>
</Col>
<Col :span="8">
<Col :span="6">
<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" style="width:235px"></ResourceSelect>
<ResourceSelect v-model="entity.resourceId" @on-change="resourceChange"></ResourceSelect>
</FormItem>
</Col>
<Col :span="8">
<Col :span="6">
<FormItem :label="l('isImportant')" prop="isImportant">
<Dictionary code="Process.state" v-model="entity.isImportant" type="radio"></Dictionary>
</FormItem>
</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">
<Dictionary code="Process.state" v-model="entity.isImportantResources" type="radio"></Dictionary>
</FormItem>
</Col>
<Col :span="8">
</Col>-->
<Col :span="12">
<FormItem :label="l('schedulingWorkingHours')" prop="schedulingWorkingHours">
<InputTime v-model="entity.schedulingWorkingHours" />
</FormItem>
</Col>
<Col :span="8">
<Col :span="12">
<FormItem :label="l('runtime')" prop="runtime">
<InputTime v-model="entity.runtime" />
</FormItem>
</Col>
<Col :span="8">
<!-- <Col :span="8">
<FormItem :label="l('realRuntime')" prop="realRuntime">
<InputTime v-model="entity.realRuntime" />
</FormItem>
......@@ -123,8 +127,18 @@
<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="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">
<Dictionary
code="Process.state"
......@@ -134,31 +148,15 @@
></Dictionary>
</FormItem>
</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">
<InputTime v-model="entity.outsideTime" />
</FormItem>
</Col>
<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">
<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>
</Col>
</Row>
......@@ -187,8 +185,8 @@ export default {
resourceType: null,
resourceCode: "",
runtime: 0,
efficiencyValue: null,
singleOut: null,
efficiencyValue: 1,
singleOut: 1,
isOutside: null,
isImportant: null,
outsideTime: 0,
......@@ -250,21 +248,21 @@ export default {
});
},
handleImg(e) {
let file = null
let file = null;
if (
e.clipboardData &&
e.clipboardData.items[0] &&
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()
let reader = new FileReader()
reader.readAsDataURL(file)
file = e.clipboardData.items[0].getAsFile();
let reader = new FileReader();
reader.readAsDataURL(file);
setTimeout(() => {
var img = '<img src="' + reader.result + '" alt=""/>'
this.entity.taskContent += img
}, 1000)
var img = '<img src="' + reader.result + '" alt=""/>';
this.entity.taskContent += img;
}, 1000);
// new R
}
......@@ -279,7 +277,7 @@ export default {
},
resourceChange(v, items) {
this.entity.resourceId = v[1];
this.entity.resourceType =v[0];
this.entity.resourceType = v[0];
this.entity.resourceCode = items[1].__label;
}
},
......
pages/technology/details/detail.vue
View file @ 45ee56fc
......@@ -10,9 +10,9 @@
<Filed :span="12" :name="l('isImportant')">
<state code="Process.state" :value="entity.isImportant" type="text"></state>
</Filed>
<Filed :span="12" :name="l('isImportantResources')">
<!-- <Filed :span="12" :name="l('isImportantResources')">
<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('runtime')"><OutputTime :value="entity.runtime"></OutputTime></Filed>
<Filed :span="12" :name="l('realRuntime')"><OutputTime :value="entity.realRuntime"></OutputTime></Filed>
......
pages/technology/details/edit.vue
View file @ 45ee56fc
<template>
<Form ref="form" :model="entity" :rules="rules" :label-width="120" class="eid-form">
<div class="details">
<Form ref="form" :model="entity" :rules="rules" :label-width="100">
<Row>
<Col :span="8">
<!--
<Col :span="12">
<FormItem :label="l('routingHeaderId')" prop="routingHeaderId">
<InputNumber v-model="entity.routingHeaderId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('classId')" prop="classId">
<InputNumber v-model="entity.classId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('note')" prop="note">
<Input v-model="entity.note"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('milestoneId')" prop="milestoneId">
<InputNumber v-model="entity.milestoneId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('status')" prop="status">
<Dictionary code="Process.Status" v-model="entity.status"></Dictionary>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('remark')" prop="remark">
<Input v-model="entity.remark" type="textarea" :rows="5"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('extend')" prop="extend">
<Input v-model="entity.extend"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('performanceHours')" prop="performanceHours">
<InputNumber v-model="entity.performanceHours"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('resourceCode')" prop="resourceCode">
<Input v-model="entity.resourceCode"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('performanceWorkingHours')" prop="performanceWorkingHours">
<InputNumber v-model="entity.performanceWorkingHours"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('equipType')" prop="equipType">
<Input v-model="entity.equipType"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('equipTypeId')" prop="equipTypeId">
<InputNumber v-model="entity.equipTypeId"></InputNumber>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('remark')" prop="remark">
<Input v-model="entity.remark" type="textarea" :rows="5"></Input>
</FormItem>
</Col>
-->
<Col :span="12">
<FormItem :label="l('taskSeq')" prop="taskSeq">
<InputNumber v-model="entity.taskSeq" style="width:235px"></InputNumber >
<InputNumber v-model="maxNum"></InputNumber>
</FormItem>
</Col>
<Col :span="8">
<Col :span="12">
<FormItem :label="l('name')" prop="name">
<Input v-model="entity.name" style="width:235px"></Input>
<Input v-model="entity.name"></Input>
</FormItem>
</Col>
<Col :span="8">
<Col :span="6">
<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>
</Col>
<Col :span="8">
<Col :span="6">
<FormItem :label="l('resourceType')" prop="resourceType">
<ResourceSelect v-model="entity.resourceId" @on-change="resourceChange" style="width:235px"></ResourceSelect>
<ResourceSelect v-model="entity.resourceId" @on-change="resourceChange"></ResourceSelect>
</FormItem>
</Col>
<Col :span="8">
<Col :span="6">
<FormItem :label="l('isImportant')" prop="isImportant">
<Dictionary code="Process.state" v-model="entity.isImportant" type="radio"></Dictionary>
</FormItem>
</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">
<Dictionary code="Process.state" v-model="entity.isImportantResources" type="radio"></Dictionary>
</FormItem>
</Col>
<Col :span="8">
</Col>-->
<Col :span="12">
<FormItem :label="l('schedulingWorkingHours')" prop="schedulingWorkingHours">
<InputTime v-model="entity.schedulingWorkingHours" />
</FormItem>
</Col>
<Col :span="8">
<Col :span="12">
<FormItem :label="l('runtime')" prop="runtime">
<InputTime v-model="entity.runtime" />
</FormItem>
</Col>
<Col :span="8">
<!-- <Col :span="8">
<FormItem :label="l('realRuntime')" prop="realRuntime">
<InputTime v-model="entity.realRuntime" />
</FormItem>
......@@ -50,8 +127,18 @@
<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="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">
<Dictionary
code="Process.state"
......@@ -61,31 +148,15 @@
></Dictionary>
</FormItem>
</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">
<InputTime v-model="entity.outsideTime" />
</FormItem>
</Col>
<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"></InputNumber>
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('singleOut')" prop="singleOut">
<InputNumber v-model="entity.singleOut"></InputNumber>
</FormItem>
</Col>
<Divider />
<Col :span="24">
<FormItem :label="l('taskContent')" prop="taskContent">
<i-quill v-model="entity.taskContent" :height="200" border v-paste="handleImg" />
<i-quill v-model="entity.taskContent" :height="260" v-paste="handleImg" border />
</FormItem>
</Col>
</Row>
......@@ -94,6 +165,7 @@
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
</div>
</template>
<script>
import Api from "./api";
......
pages/technology/details/index.vue
View file @ 45ee56fc
......@@ -96,12 +96,12 @@ export default {
align: "left",
easy: true
},
{
key: "isImportantResources",
title: this.l("isImportantResources"),
align: "center",
code: "Process.state"
},
// {
// key: "isImportantResources",
// title: this.l("isImportantResources"),
// align: "center",
// code: "Process.state"
// },
{
key: "schedulingWorkingHours",
......@@ -116,12 +116,12 @@ export default {
align: "right",
type: "outputTime",
},
{
key: "realRuntime",
title: this.l("realRuntime"),
align: "right",
type: "outputTime",
},
// {
// key: "realRuntime",
// title: this.l("realRuntime"),
// align: "right",
// type: "outputTime",
// },
{
key: "outsideTime",
title: this.l("outsideTime"),
......
pages/technology/details/routinghcorder/add.vue
View file @ 45ee56fc
......@@ -165,7 +165,8 @@ export default {
},
props: {
v: Object,
eid: Number
eid: Number,
headid: Number,
},
mounted() {
// if (this.eid > 0) {
......@@ -191,7 +192,7 @@ export default {
if (v) {
this.disabled = true;
this.entity.handlingOpinions=this.entity.handlingOpinionsId
this.entity.routingHeaderId=this.headid;
Api.create(this.entity)
.then(r => {
this.disabled = false;
......
pages/technology/details/routinghcorder/index.vue
View file @ 45ee56fc
<template>
<div>
<DataGrid :columns="columns" ref="grid" :action="action">
<DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch">
<template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys">
<Input placeholder="请输入关键字更改单编号" v-model="easySearch.keys.value" v-width="260"/>
<Input placeholder="请输入关键字更改单编号" v-model="easySearch.keys.value" v-width="260" />
</FormItem>
<FormItem>
<Button type="primary" @click="search">查询</Button>
......@@ -19,7 +19,7 @@
</template>
</DataGrid>
<Modal v-model="modal" :title="title" width="1200" footer-hide scrollable>
<component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" />
<component :is="detail" :eid="curId" :headid="hid" @on-close="cancel" @on-ok="ok" />
</Modal>
</div>
</template>
......@@ -43,8 +43,13 @@ export default {
keys: {
op: "changeorderCode,",
value: null
},
routingHeaderId: {
op: "Equal",
value: this.$http.common.getquerystring("id")
}
},
hid: 0,
modal: false,
title: "新增",
detail: null,
......@@ -75,7 +80,7 @@ export default {
align: "left",
high: true,
type: "user",
width: 140,
width: 140
},
{
key: "technicalName",
......@@ -103,7 +108,7 @@ export default {
title: this.l("quantity"),
align: "right",
high: true,
width: 100,
width: 100
},
{
key: "status",
......@@ -165,7 +170,7 @@ export default {
attrs: { oprate: "edit" },
on: { click: () => this.edit(params.row.id) }
},
params.row.status==1?"编辑":''
params.row.status == 1 ? "编辑" : ""
),
h(
"op",
......@@ -173,7 +178,7 @@ export default {
attrs: { oprate: "delete" },
on: { click: () => this.remove(params.row.id) }
},
params.row.status==1?"删除":""
params.row.status == 1 ? "删除" : ""
)
]);
}
......@@ -183,6 +188,7 @@ export default {
},
mounted() {
console.log(this);
this.search()
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
......@@ -198,6 +204,7 @@ export default {
},
add() {
this.curId = 0;
this.hid = this.$http.common.getquerystring("id");
this.title = "新增";
this.detail = () => import("./add");
this.modal = true;
......
pages/technology/index.vue
View file @ 45ee56fc
......@@ -60,6 +60,7 @@
:eid="curId"
:uid="uId"
:title="title"
:headid="hid"
@on-close="cancel"
@on-ok="ok"
/>
......@@ -143,6 +144,7 @@ export default {
easySearch: {
keys: { op: "unicode,name,code", value: null }
},
hid: 0,
modal: false,
title: "新增",
info: null,
......@@ -320,8 +322,8 @@ export default {
h(
"op",
{
attrs: { oprate: "detail" }
// on: { click: () => this.TechnologyChange(params.row) }
attrs: { oprate: "detail" },
on: { click: () => this.TechnologyChange(params.row) }
},
params.row.approvalStatus == 1 ? "新增更改单" : ""
),
......@@ -484,28 +486,10 @@ export default {
},
//工艺更改
TechnologyChange(row) {
this.$refs.routingchangeorder.flag = 0;
this.$refs.routingchangeorder.routing_header_Id = row.id;
var userId = this.$store.state.userInfo.userId;
let parma = {
Id: userId
};
this.$refs.routingchangeorder.changeorder_code = "";
this.$http.sysUser.getuserinfo(parma).then(res => {
if (res.result) {
this.$refs.routingchangeorder.formValidate = {
technical_name: row.name,
technical_code: row.code,
department_name: res.result.departmentTitle,
propose_user_name: res.result.userName
};
}
});
var url1 = `${designUrl}/routingheader/GetCodeByType?code=JSWJGGD`;
service.get(`${url1}`).then(response => {
this.$refs.routingchangeorder.changeorder_code = response.result;
});
this.$refs.routingchangeorder.modelChange = true;
this.hid = row.id;
this.title = "新增";
this.detail = () => import("./details/routinghcorder/add");
this.modal = true;
},
Main(data) {
......
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