Skip to content

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

technology/colums

parent 27c393b0
Show whitespace changes
Inline Side-by-side
Showing with 233 additions and 183 deletions
i18n/locale/zh-CN.js
View file @ ebee90b0
...@@ -1251,7 +1251,8 @@ export default { ...@@ -1251,7 +1251,8 @@ export default {
routingStepId: '工步ID', routingStepId: '工步ID',
quantity: '数量', quantity: '数量',
singlequantity: '总计数量', singlequantity: '总计数量',
routingDetailName: '工序名称',
routingDetailNo:'工序号',
materialId: '物料id', materialId: '物料id',
materialType: '物料类型', materialType: '物料类型',
materialNumber: '物料编号', materialNumber: '物料编号',
...@@ -1323,7 +1324,8 @@ export default { ...@@ -1323,7 +1324,8 @@ export default {
routingHeaderId: '工艺ID', routingHeaderId: '工艺ID',
routingHeaderName: '工艺', routingHeaderName: '工艺',
routingDetailId: '工序ID', routingDetailId: '工序ID',
routingDetailName: '工序', routingDetailName: '工序名称',
routingDetailNo:'工序号',
routingStepId: '工步ID', routingStepId: '工步ID',
checkContent: '检测内容', checkContent: '检测内容',
checkType: '检测类型', checkType: '检测类型',
...@@ -1357,7 +1359,8 @@ export default { ...@@ -1357,7 +1359,8 @@ export default {
routingHeaderId: '工艺ID', routingHeaderId: '工艺ID',
routingHeaderName: '工艺', routingHeaderName: '工艺',
routingDetailId: '工序ID', routingDetailId: '工序ID',
routingDetailName: '工序', routingDetailName: '工序名称',
routingDetailNo:'工序号',
routingStepId: '工步ID', routingStepId: '工步ID',
quantity: '数量', quantity: '数量',
materialId: '物料id', materialId: '物料id',
......
pages/technology/details/add.vue
View file @ ebee90b0
...@@ -154,6 +154,7 @@ ...@@ -154,6 +154,7 @@
v-model="entity.taskContent" v-model="entity.taskContent"
:height="200" :height="200"
v-paste="handleImg" v-paste="handleImg"
border
/> />
</FormItem> </FormItem>
</Col> </Col>
......
pages/technology/details/edit.vue
View file @ ebee90b0
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
</Col> </Col>
<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" /> <i-quill v-model="entity.taskContent" :height="200" border v-paste="handleImg" />
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
......
pages/technology/details/index.vue
View file @ ebee90b0
...@@ -37,7 +37,7 @@ export default { ...@@ -37,7 +37,7 @@ export default {
action: Api.index, action: Api.index,
easySearch: { easySearch: {
keys: { keys: {
op: "name,description,remark,resourceCode,equipType,note", op: "name",
value: null value: null
}, },
routingHeaderId: { op: "Equal", value: -1 } routingHeaderId: { op: "Equal", value: -1 }
...@@ -70,17 +70,18 @@ export default { ...@@ -70,17 +70,18 @@ export default {
}); });
} }
}, },
{ key: "taskSeq", title: this.l("taskSeq"), align: "left" }, { key: "taskSeq", title: this.l("taskSeq"), align: "left",width:80 },
{ {
key: "name", key: "name",
title: this.l("name"), title: this.l("name"),
align: "left" align: "left",
}, },
{ {
key: "equipType", key: "equipType",
title: this.l("equipType"), title: this.l("equipType"),
align: "left", align: "left",
easy: true easy: true,
hide:true,
}, },
{ {
key: "resourceType", key: "resourceType",
...@@ -117,32 +118,36 @@ export default { ...@@ -117,32 +118,36 @@ export default {
key: "isParticipateIntime", key: "isParticipateIntime",
title: this.l("isParticipateIntime"), title: this.l("isParticipateIntime"),
align: "center", align: "center",
code: "Process.state" code: "Process.state",
hide: true,
}, },
{ {
key: "isImportant", key: "isImportant",
title: this.l("isImportant"), title: this.l("isImportant"),
align: "center", align: "center",
code: "Process.state" code: "Process.state",
width:100,
hide: true,
}, },
{ {
key: "isOutside", key: "isOutside",
title: this.l("isOutside"), title: this.l("isOutside"),
align: "left", align: "center",
hide: true, hide: true,
code: "Process.state" code: "Process.state",
width:100
}, },
{ {
key: "efficiencyValue", key: "efficiencyValue",
title: this.l("efficiencyValue"), title: this.l("efficiencyValue"),
align: "left", align: "right",
hide: true hide: true
}, },
{ {
key: "singleOut", key: "singleOut",
title: this.l("singleOut"), title: this.l("singleOut"),
align: "left", align: "right",
hide: true hide: true
}, },
...@@ -394,53 +399,6 @@ export default { ...@@ -394,53 +399,6 @@ export default {
this.load(); this.load();
}, },
l(key) { l(key) {
/*
routing_detail:{
id:'',
creationTime:'创建时间',
creatorUserId:'创建人',
lastModificationTime:'最近修改时间',
lastModifierUserId:'最近修改人',
isDeleted:'是否删除',
deleterUserId:'删除人',
deletionTime:'删除时间',
classId:'',
routingHeaderId:'工艺规程id',
name:'工序名称',
taskSeq:'工序号',
description:'备注',
taskContent:'工序内容',
resourceId:'资源ID',
resourceType:'资源类型',
runtime:'单件排产工时',
setupTime:'工序准备工时',
transportTime:'转运工时',
checkTime:'检验工时',
checkFlag:'检验标识',
efficiencyValue:'效率系数',
singleOut:'单件产出',
isOutside:'是否外协',
departmentId:'工序的承制车间',
isImportant:'是否关键工序',
milestoneId:'里程碑',
phaseId:'阶段id',
status:'状态',
remark:'备注',
extend:'扩展字段',
outsideTime:'外协工期',
performanceHours:'绩效工时',
resourceCode:'资源编号',
isImportantResources:'关重资源',
schedulingWorkingHours:'排产准结工时',
realWorkingHours:'实作准结工时',
realRuntime:'实作单件工时',
performanceWorkingHours:'绩效准结工时',
isParticipateIntime:'是否参与工时分配',
equipType:'设备类型',
equipTypeId:'设备类型ID',
note:'备注',
}
*/
let vkey = "routing_detail" + "." + key; let vkey = "routing_detail" + "." + key;
return this.$t(vkey) || key; return this.$t(vkey) || key;
} }
......
pages/technology/details/routingStep/edit.vue
View file @ ebee90b0
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<i-quill <i-quill
v-model="entity.stepContent" v-model="entity.stepContent"
:height="260" :height="260"
border
v-paste="handleImg" v-paste="handleImg"
/> />
<!-- <Input v-model="entity.stepContent" type="textarea" :rows="5"></Input> --> <!-- <Input v-model="entity.stepContent" type="textarea" :rows="5"></Input> -->
......
pages/technology/details/routingqccard/index.vue
View file @ ebee90b0
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<Form ref="formInline" :model="easySearch" inline> <Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys"> <FormItem prop="keys">
<Input <Input
placeholder="请输入关键字检测要求/测量单位/模板/备注/生产要求/标准指标/模板名称/抽检批次" placeholder="请输入检测要求/标准指标"
v-model="easySearch.keys.value" v-model="easySearch.keys.value"
/> />
</FormItem> </FormItem>
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</Form> </Form>
</template> </template>
<template slot="searchForm"> <template slot="searchForm">
<Search :headid="hid"/> <Search :headid="hid" />
</template> </template>
<template slot="buttons"> <template slot="buttons">
<Button type="primary" @click="add">新增</Button> <Button type="primary" @click="add">新增</Button>
...@@ -46,7 +46,7 @@ export default { ...@@ -46,7 +46,7 @@ export default {
easySearch: { easySearch: {
keys: { keys: {
op: op:
"checkParams,measurementUnit,qualityTemplate,remark,productionRequirement,standard,qualityTemplateName,samplingBatch", "checkParams,standard",
value: null value: null
}, },
routingHeaderId: { op: "Equal", value: -1 } routingHeaderId: { op: "Equal", value: -1 }
...@@ -55,42 +55,34 @@ export default { ...@@ -55,42 +55,34 @@ export default {
title: "新增", title: "新增",
detail: null, detail: null,
curId: 0, curId: 0,
hid:0, hid: 0,
columns: [ columns: [
{ key: "id", title: this.l("id"), hide: true, align: "left" }, { key: "id", title: this.l("id"), hide: true, align: "left" },
{ {
key: "creationTime", key: "routingHeaderId",
title: this.l("creationTime"), title: this.l("routingHeaderId"),
align: "left",
high: true
},
{
key: "creatorUserId",
title: this.l("creatorUserId"),
align: "left",
high: true
},
{
key: "lastModificationTime",
title: this.l("lastModificationTime"),
align: "left", align: "left",
high: true high: true,
hide: true
}, },
{ {
key: "lastModifierUserId", key: "routingDetailId",
title: this.l("lastModifierUserId"), title: this.l("routingDetailId"),
align: "left", align: "left",
high: true high: true,
hide: true
}, },
{ {
key: "routingHeaderId", key: "routingDetailNo",
title: this.l("routingHeaderId"), title: this.l("routingDetailNo"),
align: "left", align: "left",
high: true high: true,
width: 80
}, },
{ {
key: "routingDetailId", key: "routingDetailName",
title: this.l("routingDetailId"), title: this.l("routingDetailName"),
align: "left", align: "left",
high: true high: true
}, },
...@@ -98,14 +90,16 @@ export default { ...@@ -98,14 +90,16 @@ export default {
key: "routingStepId", key: "routingStepId",
title: this.l("routingStepId"), title: this.l("routingStepId"),
align: "left", align: "left",
high: true high: true,
hide: true
}, },
{ {
key: "checkType", key: "checkType",
title: this.l("checkType"), title: this.l("checkType"),
align: "left", align: "left",
high: true, high: true,
code: "QC.checktype" code: "QC.checktype",
width:100,
}, },
{ {
key: "checkParams", key: "checkParams",
...@@ -119,48 +113,54 @@ export default { ...@@ -119,48 +113,54 @@ export default {
title: this.l("measurementUnit"), title: this.l("measurementUnit"),
align: "left", align: "left",
easy: true, easy: true,
high: true high: true,
hide:true,
}, },
{ {
key: "fillintype", key: "fillintype",
title: this.l("fillintype"), title: this.l("fillintype"),
align: "left", align: "center",
high: true, high: true,
code: "QC.fillintype" code: "QC.fillintype",
width:140,
}, },
{ {
key: "isphotograph", key: "isphotograph",
title: this.l("isphotograph"), title: this.l("isphotograph"),
align: "left", align: "center",
high: true, high: true,
code: "Process.state" code: "Process.state",
width:100,
}, },
{ {
key: "status", key: "status",
title: this.l("status"), title: this.l("status"),
align: "left", align: "center",
high: true, high: true,
code: "Process.Status" code: "Process.Status",
width:80,
}, },
{ {
key: "productionRequirement", key: "productionRequirement",
title: this.l("productionRequirement"), title: this.l("productionRequirement"),
align: "left", align: "left",
easy: true, easy: true,
high: true high: true,
hide: true
}, },
{ {
key: "standard", key: "standard",
title: this.l("standard"), title: this.l("standard"),
align: "left", align: "left",
easy: true, easy: true,
high: true high: true,
}, },
{ {
key: "qualityTemplateName", key: "qualityTemplateName",
title: this.l("qualityTemplateName"), title: this.l("qualityTemplateName"),
align: "left", align: "left",
easy: true, easy: true,
hide: true,
high: true, high: true,
render: (h, params) => { render: (h, params) => {
return h("div", { class: "action" }, [ return h("div", { class: "action" }, [
...@@ -178,43 +178,77 @@ export default { ...@@ -178,43 +178,77 @@ export default {
{ {
key: "isImportant", key: "isImportant",
title: this.l("isImportant"), title: this.l("isImportant"),
align: "left", align: "center",
high: true, high: true,
code: "Process.state" code: "Process.state",
width:100,
}, },
{ {
key: "firstCheck", key: "firstCheck",
title: this.l("firstCheck"), title: this.l("firstCheck"),
align: "left", align: "center",
high: true, high: true,
code: "Process.state" code: "Process.state",
width:100,
}, },
{ {
key: "inspection", key: "inspection",
title: this.l("inspection"), title: this.l("inspection"),
align: "left", align: "center",
high: true, high: true,
code: "Process.state" code: "Process.state",
width:80,
}, },
{ {
key: "inspectionTime", key: "inspectionTime",
title: this.l("inspectionTime"), title: this.l("inspectionTime"),
align: "left", align: "left",
high: true high: true,
hide: true
}, },
{ {
key: "sampling", key: "sampling",
title: this.l("sampling"), title: this.l("sampling"),
align: "left", align: "center",
high: true, high: true,
code: "Process.state" code: "Process.state",
width:80,
}, },
{ {
key: "samplingBatch", key: "samplingBatch",
title: this.l("samplingBatch"), title: this.l("samplingBatch"),
align: "left", align: "left",
easy: true, easy: true,
high: true high: true,
hide: true
},
{
key: "creationTime",
title: this.l("creationTime"),
align: "left",
high: true,
hide: true
},
{
key: "creatorUserId",
title: this.l("creatorUserId"),
align: "left",
high: true,
hide: true
},
{
key: "lastModificationTime",
title: this.l("lastModificationTime"),
align: "left",
high: true,
hide: true
},
{
key: "lastModifierUserId",
title: this.l("lastModifierUserId"),
align: "left",
high: true,
hide: true
}, },
{ {
title: "操作", title: "操作",
...@@ -257,16 +291,16 @@ export default { ...@@ -257,16 +291,16 @@ export default {
}; };
}, },
created() { created() {
if(this.headerid!=-1){ if (this.headerid != -1) {
this.easySearch.routingHeaderId.value = this.headerid; this.easySearch.routingHeaderId.value = this.headerid;
}else{ } else {
this.easySearch.routingHeaderId.value=this.$route.query.id; this.easySearch.routingHeaderId.value = this.$route.query.id;
} }
this.hid=Number(this.easySearch.routingHeaderId.value) this.hid = Number(this.easySearch.routingHeaderId.value);
}, },
mounted() { mounted() {
console.log(this); console.log(this);
this.search() this.search();
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
...@@ -318,7 +352,7 @@ export default { ...@@ -318,7 +352,7 @@ export default {
}, },
openTemplate(url) { openTemplate(url) {
this.fileUrlPath = this.downUrl + path; this.fileUrlPath = this.downUrl + path;
alert(this.fileUrlPath) alert(this.fileUrlPath);
}, },
l(key) { l(key) {
let vkey = "routing_qc_card" + "." + key; let vkey = "routing_qc_card" + "." + key;
......
pages/technology/details/routingsupporting/index.vue
View file @ ebee90b0
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<Form ref="formInline" :model="easySearch" inline> <Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys"> <FormItem prop="keys">
<Input <Input
placeholder="请输入关键字物料类型/物料编号/物料名称/牌号/规格/型号规格/材质/采购标准/质量等级/备注/产品图号" placeholder="请输入关键字物料名称"
v-model="easySearch.keys.value" v-model="easySearch.keys.value"
/> />
</FormItem> </FormItem>
...@@ -46,7 +46,7 @@ export default { ...@@ -46,7 +46,7 @@ export default {
easySearch: { easySearch: {
keys: { keys: {
op: op:
"materialType,materialNumber,nameMaterial,brand,specifications,xhgg,texture,procurementStandards,qualityGrade,remark,drawNum", "nameMaterial",
value: null value: null
}, },
routingHeaderId: { op: "Equal", value: -1 } routingHeaderId: { op: "Equal", value: -1 }
...@@ -58,85 +58,63 @@ export default { ...@@ -58,85 +58,63 @@ export default {
hid: 0, hid: 0,
columns: [ columns: [
{ key: "id", title: this.l("id"), hide: true, align: "left" }, { key: "id", title: this.l("id"), hide: true, align: "left" },
{
key: "creationTime",
title: this.l("creationTime"),
hide: true,
align: "left"
},
{
key: "creatorUserId",
title: this.l("creatorUserId"),
hide: true,
align: "left"
},
{
key: "lastModificationTime",
title: this.l("lastModificationTime"),
hide: true,
align: "left"
},
{
key: "lastModifierUserId",
title: this.l("lastModifierUserId"),
hide: true,
align: "left"
},
{
key: "isDeleted",
title: this.l("isDeleted"),
hide: true,
align: "left"
},
{
key: "deletionTime",
title: this.l("deletionTime"),
hide: true,
align: "left"
},
{
key: "deleterUserId",
title: this.l("deleterUserId"),
hide: true,
align: "left"
},
{ {
key: "routingHeaderId", key: "routingHeaderId",
title: this.l("routingHeaderId"), title: this.l("routingHeaderId"),
align: "left", align: "left",
high: true high: true,
hide:true,
}, },
{ {
key: "routingDetailId", key: "routingDetailId",
title: this.l("routingDetailId"), title: this.l("routingDetailId"),
align: "left", align: "left",
high: true,
hide:true,
},
{
key: "routingDetailNo",
title: this.l("routingDetailNo"),
align: "left",
high: true,
width: 80
},
{
key: "routingDetailName",
title: this.l("routingDetailName"),
align: "left",
high: true high: true
}, },
{ {
key: "routingStepId", key: "routingStepId",
title: this.l("routingStepId"), title: this.l("routingStepId"),
align: "left", align: "left",
high: true high: true,
hide:true,
}, },
{ {
key: "quantity", key: "quantity",
title: this.l("quantity"), title: this.l("quantity"),
align: "left", align: "right",
high: true high: true,
width:80,
}, },
{ {
key: "materialId", key: "materialId",
title: this.l("materialId"), title: this.l("materialId"),
align: "left", align: "left",
high: true high: true,
hide:true,
}, },
{ {
key: "materialType", key: "materialType",
title: this.l("materialType"), title: this.l("materialType"),
align: "left", align: "center",
easy: true, easy: true,
high: true, high: true,
code: "mes_xingchi_resource.material.materialReType" code: "mes_xingchi_resource.material.materialReType",
width:100,
}, },
{ {
key: "materialNumber", key: "materialNumber",
...@@ -150,7 +128,7 @@ export default { ...@@ -150,7 +128,7 @@ export default {
title: this.l("nameMaterial"), title: this.l("nameMaterial"),
align: "left", align: "left",
easy: true, easy: true,
high: true high: true,
}, },
{ {
key: "brand", key: "brand",
...@@ -171,7 +149,8 @@ export default { ...@@ -171,7 +149,8 @@ export default {
title: this.l("xhgg"), title: this.l("xhgg"),
align: "left", align: "left",
easy: true, easy: true,
high: true high: true,
hide:true,
}, },
{ {
key: "texture", key: "texture",
...@@ -197,23 +176,66 @@ export default { ...@@ -197,23 +176,66 @@ export default {
{ {
key: "state", key: "state",
title: this.l("state"), title: this.l("state"),
align: "left", align: "center",
high: true, high: true,
code: "Process.Status" code: "Process.Status",
width:80,
}, },
{ {
key: "remark", key: "drawNum",
title: this.l("remark"), title: this.l("drawNum"),
align: "left", align: "left",
easy: true, easy: true,
high: true high: true
}, },
{ {
key: "drawNum", key: "creationTime",
title: this.l("drawNum"), title: this.l("creationTime"),
hide: true,
align: "left", align: "left",
easy: true, hide:true,
high: true },
{
key: "creatorUserId",
title: this.l("creatorUserId"),
hide: true,
align: "left",
hide:true,
},
{
key: "lastModificationTime",
title: this.l("lastModificationTime"),
hide: true,
align: "left",
hide:true,
},
{
key: "lastModifierUserId",
title: this.l("lastModifierUserId"),
hide: true,
align: "left",
hide:true,
},
{
key: "isDeleted",
title: this.l("isDeleted"),
hide: true,
align: "left",
hide:true,
},
{
key: "deletionTime",
title: this.l("deletionTime"),
hide: true,
align: "left",
hide:true,
},
{
key: "deleterUserId",
title: this.l("deleterUserId"),
hide: true,
align: "left",
hide:true,
}, },
{ {
title: "操作", title: "操作",
......
pages/technology/index.vue
View file @ ebee90b0
...@@ -223,7 +223,7 @@ export default { ...@@ -223,7 +223,7 @@ export default {
key: "isEffect", key: "isEffect",
title: this.l("isEffect"), title: this.l("isEffect"),
align: "center", align: "center",
width:80, width: 80,
high: true, high: true,
code: "Process.Status" code: "Process.Status"
}, },
...@@ -392,6 +392,11 @@ export default { ...@@ -392,6 +392,11 @@ export default {
// }, // },
viewprocess(row) { viewprocess(row) {
this.curId = row.id; this.curId = row.id;
if (row.fileId) {
this.uId = row.fileId;
} else {
this.uId = this.$u.guid(); //未上传过文件
}
this.title = "预览"; this.title = "预览";
this.detail = () => import("./processview"); this.detail = () => import("./processview");
this.modal = true; this.modal = true;
......
pages/technology/processview.vue
View file @ ebee90b0
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
<h2>工艺内容</h2> <h2>工艺内容</h2>
</Row> </Row>
<Row class="table_row row03 auto_row"> <Row class="table_row row03 auto_row">
<div style="min-height:300px" class="tex_in10">{{formValidate.remark}}</div> <div style="min-height:300px" v-html="formValidate.remark" class="tex_in10"></div>
</Row> </Row>
<Row class="table_row center row_title"> <Row class="table_row center row_title">
<h2>工艺附图</h2> <h2>工艺附图</h2>
...@@ -246,7 +246,14 @@ export default { ...@@ -246,7 +246,14 @@ export default {
qcards: [] qcards: []
}, },
circleModal: true, circleModal: true,
dataSatus: false dataSatus: false,
nameList: [],
parms: {
app: "technology",
eid: this.uid,
name: "",
field: ""
}
}; };
}, },
props: { props: {
...@@ -255,7 +262,8 @@ export default { ...@@ -255,7 +262,8 @@ export default {
type: Boolean, type: Boolean,
default: true default: true
}, },
eid: Number eid: Number,
uid: String
}, },
mounted() { mounted() {
if (this.eid > 0) { if (this.eid > 0) {
...@@ -272,6 +280,7 @@ export default { ...@@ -272,6 +280,7 @@ export default {
.then(response => { .then(response => {
this.circleModal = false; this.circleModal = false;
this.formValidate = response.result; this.formValidate = response.result;
this.loadImg();
if ( if (
this.formValidate.change_order_code == "" || this.formValidate.change_order_code == "" ||
typeof this.formValidate.change_order_code == "undefined" typeof this.formValidate.change_order_code == "undefined"
...@@ -290,6 +299,23 @@ export default { ...@@ -290,6 +299,23 @@ export default {
this.circleModal = false; this.circleModal = false;
this.dataSatus = true; this.dataSatus = true;
}); });
},
loadImg() {
this.nameList = [];
this.formValidate.files = [];
//查询上传到文件服务器上的文件
this.$http.sysUser.getFile(this.parms).then(res => {
if (res.data != [] && res.data.length > 0) {
res.data.forEach(data => {
let objImag = {};
objImag.fileName = data.fileName;
objImag.url = data.downloadPath;
objImag.id = data.id;
this.nameList.push(objImag);
});
this.formValidate.files = this.nameList;
}
});
} }
}, },
watch: { watch: {
......
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