Skip to content

M
mes-ui
Commit f1f2b1c5 authored by 周远喜's avatar 周远喜
Browse files
Options

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

parents 7ba2ff5f f07e0df8
Hide whitespace changes
Inline Side-by-side
Showing with 239 additions and 339 deletions
i18n/locale/zh-CN.js
View file @ f1f2b1c5
...@@ -1172,6 +1172,7 @@ export default { ...@@ -1172,6 +1172,7 @@ export default {
code: '工艺文件编号', code: '工艺文件编号',
productId: '产品id', productId: '产品id',
productName:'产品名称', productName:'产品名称',
drawingNo:'图号',
version: '版本', version: '版本',
author: '编制人', author: '编制人',
departmentId: '主制车间', departmentId: '主制车间',
...@@ -1190,7 +1191,7 @@ export default { ...@@ -1190,7 +1191,7 @@ export default {
platesnum: '板数', platesnum: '板数',
isEffect: '有效', isEffect: '有效',
versionnotes: '版本说明', versionnotes: '版本说明',
phase: '阶段', phase: '工艺阶段',
versionid: '版本ID', versionid: '版本ID',
isSendPpm: '发送PPM', isSendPpm: '发送PPM',
creationTime:'创建时间', creationTime:'创建时间',
...@@ -1215,7 +1216,7 @@ export default { ...@@ -1215,7 +1216,7 @@ export default {
taskContent:'工序内容', taskContent:'工序内容',
resourceId:'资源ID', resourceId:'资源ID',
resourceType:'资源类型', resourceType:'资源类型',
runtime:'排产工时', runtime:'排产单件工时',
setupTime:'准备工时', setupTime:'准备工时',
transportTime:'转运工时', transportTime:'转运工时',
checkTime:'检验工时', checkTime:'检验工时',
...@@ -1246,13 +1247,11 @@ export default { ...@@ -1246,13 +1247,11 @@ export default {
RoutingSupporting: { RoutingSupporting: {
id: '', id: '',
routingHeaderId: '工艺规程ID', routingHeaderId: '工艺规程ID',
routingHeaderId: '工艺规程ID',
routingDetailId: '工序ID', routingDetailId: '工序ID',
routingStepId: '工步ID', routingStepId: '工步ID',
isDeleted: '删除人', isDeleted: '删除人',
deletionTime: '删除时间', deletionTime: '删除时间',
deleterUserId: '删除人', deleterUserId: '删除人',
routingHeaderId: '工艺规程ID',
routingDetailId: '工序ID', routingDetailId: '工序ID',
routingStepId: '工步ID', routingStepId: '工步ID',
quantity: '数量', quantity: '数量',
...@@ -1289,7 +1288,7 @@ export default { ...@@ -1289,7 +1288,7 @@ export default {
routingDetailId: '工序', routingDetailId: '工序',
classId: '', classId: '',
stepSeq: '工步号', stepSeq: '工步号',
name: '名称', name: '工步名称',
description: '描述', description: '描述',
status: '状态', status: '状态',
remark: '备注', remark: '备注',
......
pages/technology/add.vue
View file @ f1f2b1c5
...@@ -11,11 +11,6 @@ ...@@ -11,11 +11,6 @@
<Input v-model="entity.unicode"></Input> <Input v-model="entity.unicode"></Input>
</FormItem> </FormItem>
</Col>--> </Col>-->
<Col :span="8">
<FormItem :label="l('name')" prop="name">
<Input v-model="entity.name"></Input>
</FormItem>
</Col>
<Col :span="8"> <Col :span="8">
<!-- <FormItem v-if="title=='新增'" :label="l('code')" prop="code"> <!-- <FormItem v-if="title=='新增'" :label="l('code')" prop="code">
<Input v-model="entity.code"></Input> <Input v-model="entity.code"></Input>
...@@ -24,17 +19,32 @@ ...@@ -24,17 +19,32 @@
<Input disabled v-model="entity.code"></Input> <Input disabled v-model="entity.code"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8">
<FormItem :label="l('name')" prop="name">
<Input v-model="entity.name"></Input>
</FormItem>
</Col>
<Col :span="8"> <Col :span="8">
<FormItem :label="l('routingType')" prop="routingType"> <FormItem :label="l('routingType')" prop="routingType">
<Dictionary code="Process.Routing.routingType" v-model="entity.routingType"></Dictionary> <Dictionary code="Process.Routing.routingType" v-model="entity.routingType"></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8">
<FormItem :label="l('phase')" prop="phase">
<Dictionary code="Process.Routing.phase" v-model="entity.phase"></Dictionary>
</FormItem>
</Col>
<Col :span="8"> <Col :span="8">
<FormItem :label="l('productName')" prop="productId"> <FormItem :label="l('productName')" prop="productId">
<ProductSelect v-model="entity.productId" @on-change="proChange"></ProductSelect> <ProductSelect v-model="entity.productId" @on-change="proChange"></ProductSelect>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8">
<FormItem :label="l('drawingNo')" prop="drawingNo">
<Input v-model="entity.drawingNo" disabled></Input>
</FormItem>
</Col>
<Col :span="8"> <Col :span="8">
<FormItem :label="l('version')" prop="version"> <FormItem :label="l('version')" prop="version">
<Input v-model="entity.version"></Input> <Input v-model="entity.version"></Input>
...@@ -42,25 +52,25 @@ ...@@ -42,25 +52,25 @@
</Col> </Col>
<Col :span="8"> <Col :span="8">
<FormItem :label="l('departmentName')" prop="departmentId"> <FormItem :label="l('departmentName')" prop="departmentId">
<departmentSelect v-model="entity.departmentId" @on-change="departChange"></departmentSelect> <departmentSelect v-model="entity.departmentId" @on-change="departChange"></departmentSelect>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="8">
<FormItem :label="l('isEffect')" prop="isEffect">
<Dictionary code="Process.Status" v-model="entity.isEffect" type="radio"></Dictionary>
</FormItem>
</Col>
<!--
<Col :span="8">
<FormItem :label="l('isMain')" prop="isMain"> <FormItem :label="l('isMain')" prop="isMain">
<Dictionary code="Process.state" v-model="entity.isMain" type="radio"></Dictionary> <Dictionary code="Process.state" v-model="entity.isMain" type="radio"></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="8">
<FormItem :label="l('isSendPpm')" prop="isSendPpm"> <FormItem :label="l('isSendPpm')" prop="isSendPpm">
<Dictionary code="Process.Status" v-model="entity.isSendPpm" type="radio"></Dictionary> <Dictionary code="Process.Status" v-model="entity.isSendPpm" type="radio"></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8">
<FormItem :label="l('isEffect')" prop="isEffect">
<Dictionary code="Process.Status" v-model="entity.isEffect" type="radio"></Dictionary>
</FormItem>
</Col>
<!--
<Col :span="12"> <Col :span="12">
<FormItem :label="l('upId')" prop="upId"> <FormItem :label="l('upId')" prop="upId">
<InputNumber v-model="entity.upId"></InputNumber> <InputNumber v-model="entity.upId"></InputNumber>
...@@ -133,7 +143,7 @@ ...@@ -133,7 +143,7 @@
<Col :span="24"> <Col :span="24">
<FormItem label="多媒体附件" prop="files"> <FormItem label="多媒体附件" prop="files">
<files ref="refFile" :parms="parms" fileFormat/> <files ref="refFile" :parms="parms" fileFormat />
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
...@@ -161,11 +171,11 @@ export default { ...@@ -161,11 +171,11 @@ export default {
name: "", name: "",
code: "", code: "",
productId: null, productId: null,
productName:'', productName: "",
version: "", version: "",
author: null, author: null,
departmentId: null, departmentId: null,
departmentName:'', departmentName: "",
isMain: 1, isMain: 1,
upId: null, upId: null,
upDetailId: null, upDetailId: null,
...@@ -199,14 +209,14 @@ export default { ...@@ -199,14 +209,14 @@ export default {
props: { props: {
v: Object, v: Object,
eid: Number, eid: Number,
title: String, title: String
}, },
mounted() { mounted() {
this.parms.eid = this.$u.guid(); this.parms.eid = this.$u.guid();
this.$refs.refFile.intFiles(); this.$refs.refFile.intFiles();
if (this.eid > 0) { if (this.eid > 0) {
this.load(this.eid); this.load(this.eid);
}else{ } else {
this.getCodNumber(); this.getCodNumber();
} }
}, },
...@@ -215,40 +225,42 @@ export default { ...@@ -215,40 +225,42 @@ export default {
this.$refs.form.validate(v => { this.$refs.form.validate(v => {
if (v) { if (v) {
this.disabled = true; this.disabled = true;
if(this.title=='克隆'){ if (this.title == "克隆") {
this.$Message.success("克隆"); this.$Message.success("克隆");
this.getcloneData() this.getcloneData();
}else{
if (this.$refs.refFile.nameList.length > 0) {
this.entity.fileId = this.parms.eid;
} else { } else {
this.entity.fileId = ""; if (this.$refs.refFile.nameList.length > 0) {
} this.entity.fileId = this.parms.eid;
Api.create(this.entity).then(r => { } else {
this.disabled = false; this.entity.fileId = "";
if (r.success) { }
this.$Message.success("保存成功"); Api.create(this.entity)
this.$emit("on-ok"); .then(r => {
} else { this.disabled = false;
if (r.success) {
this.$Message.success("保存成功");
this.$emit("on-ok");
} else {
this.$Message.error("保存失败");
}
})
.catch(err => {
this.disabled = false;
this.$Message.error("保存失败"); this.$Message.error("保存失败");
} console.warn(err);
}) });
.catch(err => { }
this.disabled = false;
this.$Message.error("保存失败");
console.warn(err);
});
}
} }
}); });
}, },
// 克隆工艺 // 克隆工艺
getcloneData(){ getcloneData() {
let parmese = { let parmese = {
headerId: this.eid, headerId: this.eid,
code: this.entity.code code: this.entity.code
}; };
Api.getCloneHeader(parmese).then(r => { Api.getCloneHeader(parmese)
.then(r => {
this.disabled = false; this.disabled = false;
if (r.success) { if (r.success) {
this.$Message.success("克隆成功"); this.$Message.success("克隆成功");
...@@ -295,27 +307,25 @@ export default { ...@@ -295,27 +307,25 @@ export default {
}); });
this.getCodNumber(); this.getCodNumber();
}, },
getCodNumber(){ getCodNumber() {
Api.getCodeNumber({code:'GY',count:'1'}).then( r => { Api.getCodeNumber({ code: "GY", count: "1" }).then(r => {
if(r.success){ if (r.success) {
this.entity.code = r.result[0] this.entity.code = r.result[0];
}else{ } else {
this.$Message.error("生成编号失败"); this.$Message.error("生成编号失败");
} }
}) });
}, },
l(key) { l(key) {
key = "routingHeader" + "." + key; key = "routingHeader" + "." + key;
return this.$t(key); return this.$t(key);
}, },
proChange(v,items) proChange(v, items) {
{ this.entity.productName = items.name;
this.entity.productName=items.name this.entity.drawingNo = items.drawingNo;
}, },
departChange(v,items) departChange(v, items) {
{ this.entity.departmentName = items.name;
this.entity.departmentName=items.name
} }
}, },
watch: { watch: {
...@@ -327,7 +337,7 @@ export default { ...@@ -327,7 +337,7 @@ export default {
if (v != 0) { if (v != 0) {
this.load(v); this.load(v);
} }
}, }
} }
}; };
</script> </script>
\ No newline at end of file
pages/technology/details/routingStep/add.vue
View file @ f1f2b1c5
...@@ -34,16 +34,17 @@ ...@@ -34,16 +34,17 @@
<!-- <Input v-model="entity.stepContent" type="textarea" :minRows="3", :maxRows="7" ></Input> --> <!-- <Input v-model="entity.stepContent" type="textarea" :minRows="3", :maxRows="7" ></Input> -->
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12">
<!--
<Col :span="12">
<FormItem :label="l('status')" prop="status"> <FormItem :label="l('status')" prop="status">
<RadioGroup v-model="entity.status"> <RadioGroup v-model="entity.status">
<Radio :label="1">是</Radio> <Radio :label="1">是</Radio>
<Radio :label="0">否</Radio> <Radio :label="0">否</Radio>
</RadioGroup> </RadioGroup>
<!-- <Dictionary style="width:100px" code="Process.Status" v-model="entity.status"></Dictionary> -->
</FormItem> </FormItem>
</Col> </Col>
<!--<Col :span="24"> <Col :span="24">
<FormItem :label="l('description')" prop="description"> <FormItem :label="l('description')" prop="description">
<Input v-model="entity.description" type="textarea" :rows="5"></Input> <Input v-model="entity.description" type="textarea" :rows="5"></Input>
</FormItem> </FormItem>
......
pages/technology/details/routingStep/detail.vue
View file @ f1f2b1c5
...@@ -3,13 +3,6 @@ ...@@ -3,13 +3,6 @@
<Row> <Row>
<Filed :span="12" :name="l('stepSeq')">{{entity.stepSeq}}</Filed> <Filed :span="12" :name="l('stepSeq')">{{entity.stepSeq}}</Filed>
<Filed :span="12" :name="l('name')">{{entity.name}}</Filed> <Filed :span="12" :name="l('name')">{{entity.name}}</Filed>
<Filed :span="12" :name="l('status')">
<state
code="Process.state"
:value="entity.status+''"
type="text"
></state>
</Filed>
<Filed :span="24" :name="l('stepContent')"><div v-html="entity.stepContent" class="html"></div></Filed> <Filed :span="24" :name="l('stepContent')"><div v-html="entity.stepContent" class="html"></div></Filed>
<Filed :span="12" :name="l('creationTime')">{{entity.creationTime}}</Filed> <Filed :span="12" :name="l('creationTime')">{{entity.creationTime}}</Filed>
<Filed :span="12" :name="l('creatorUserId')"><User :value="entity.creatorUserId"></User></Filed> <Filed :span="12" :name="l('creatorUserId')"><User :value="entity.creatorUserId"></User></Filed>
......
pages/technology/details/routingStep/edit.vue
View file @ f1f2b1c5
...@@ -24,16 +24,18 @@ ...@@ -24,16 +24,18 @@
<!-- <Input v-model="entity.stepContent" type="textarea" :minRows="3", :maxRows="7" ></Input> --> <!-- <Input v-model="entity.stepContent" type="textarea" :minRows="3", :maxRows="7" ></Input> -->
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12">
<!--
<Col :span="12">
<FormItem :label="l('status')" prop="status"> <FormItem :label="l('status')" prop="status">
<RadioGroup v-model="entity.status"> <RadioGroup v-model="entity.status">
<Radio :label="1">是</Radio> <Radio :label="1">是</Radio>
<Radio :label="0">否</Radio> <Radio :label="0">否</Radio>
</RadioGroup> </RadioGroup>
<!-- <Dictionary style="width:100px" code="Process.Status" v-model="entity.status"></Dictionary> -->
</FormItem> </FormItem>
</Col> </Col>
<!--<Col :span="24"> <Col :span="24">
<FormItem :label="l('description')" prop="description"> <FormItem :label="l('description')" prop="description">
<Input v-model="entity.description" type="textarea" :rows="5"></Input> <Input v-model="entity.description" type="textarea" :rows="5"></Input>
</FormItem> </FormItem>
......
pages/technology/details/routingStep/index.vue
View file @ f1f2b1c5
...@@ -111,13 +111,6 @@ export default { ...@@ -111,13 +111,6 @@ export default {
align: "left", align: "left",
hide: true hide: true
}, },
{
key: "status",
title: this.l("status"),
align: "left",
high: true,
code: "Process.Status"
},
{ {
title: "操作", title: "操作",
key: "action", key: "action",
......
pages/technology/details/routingqccard/index.vue
View file @ f1f2b1c5
...@@ -58,22 +58,7 @@ export default { ...@@ -58,22 +58,7 @@ export default {
curId: 0, curId: 0,
hid: 0, hid: 0,
columns: [ columns: [
{ key: "id", title: this.l("id"), hide: true, align: "left" },
{
key: "routingHeaderId",
title: this.l("routingHeaderId"),
align: "left",
high: true,
hide: true
},
{
key: "routingDetailId",
title: this.l("routingDetailId"),
align: "left",
high: true,
hide: true
},
{ {
key: "routingDetailNo", key: "routingDetailNo",
title: this.l("routingDetailNo"), title: this.l("routingDetailNo"),
...@@ -88,13 +73,6 @@ export default { ...@@ -88,13 +73,6 @@ export default {
align: "left", align: "left",
high: true high: true
}, },
{
key: "routingStepId",
title: this.l("routingStepId"),
align: "left",
high: true,
hide: true
},
{ {
key: "checkType", key: "checkType",
title: this.l("checkType"), title: this.l("checkType"),
......
pages/technology/details/routingqccard/search.vue
View file @ f1f2b1c5
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.routingDetailId.show"> <Col :span="12" v-if="condition.routingDetailId.show">
<FormItem :label="l('routingDetailId')" prop="routingDetailId"> <FormItem :label="l('routingDetailName')" prop="routingDetailId">
<Select v-model="condition.routingDetailId.value"> <Select v-model="condition.routingDetailId.value" clearable>
<Option <Option
v-for="(item,index) in routingDetailList" v-for="(item,index) in routingDetailList"
:value="item.value" :value="item.value"
...@@ -162,7 +162,7 @@ export default { ...@@ -162,7 +162,7 @@ export default {
remark: { op: "Equal", value: null, show: false }, remark: { op: "Equal", value: null, show: false },
productionRequirement: { op: "Equal", value: null, show: false }, productionRequirement: { op: "Equal", value: null, show: false },
standard: { op: "Equal", value: null, show: false }, standard: { op: "Equal", value: null, show: false },
qualityTemplateName: { op: "Equal", value: null, show: true }, qualityTemplateName: { op: "Equal", value: null, show: false },
isImportant: { op: "Equal", value: null, show: true }, isImportant: { op: "Equal", value: null, show: true },
firstCheck: { op: "Equal", value: null, show: true }, firstCheck: { op: "Equal", value: null, show: true },
inspection: { op: "Equal", value: null, show: true }, inspection: { op: "Equal", value: null, show: true },
......
pages/technology/details/routingsupporting/add.vue
View file @ f1f2b1c5
...@@ -22,10 +22,20 @@ ...@@ -22,10 +22,20 @@
<InputNumber v-model="entity.routingHeaderId"></InputNumber> <InputNumber v-model="entity.routingHeaderId"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8">
<FormItem :label="l('state')" prop="state">
<Dictionary code="Process.state" v-model="entity.state" type="radio"></Dictionary>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('remark')" prop="remark">
<Input v-model="entity.remark" type="textarea" :rows="2"></Input>
</FormItem>
</Col>
--> -->
<Col :span="8"> <Col :span="8">
<FormItem :label="l('routingDetailId')" prop="routingDetailId"> <FormItem :label="l('routingDetailName')" prop="routingDetailId">
<Select v-model="entity.routingDetailId"> <Select v-model="entity.routingDetailId">
<Option <Option
v-for="(item,index) in routingDetailList" v-for="(item,index) in routingDetailList"
...@@ -55,7 +65,7 @@ ...@@ -55,7 +65,7 @@
</Col> </Col>
<Col :span="8"> <Col :span="8">
<FormItem :label="l('quantity')" prop="quantity"> <FormItem :label="l('quantity')" prop="quantity">
<InputNumber v-model="entity.quantity"></InputNumber> <InputNumber v-model="entity.quantity" style="width:100%"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="8">
...@@ -93,16 +103,7 @@ ...@@ -93,16 +103,7 @@
<Input v-model="entity.drawNum"></Input> <Input v-model="entity.drawNum"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8">
<FormItem :label="l('state')" prop="state">
<Dictionary code="Process.state" v-model="entity.state" type="radio"></Dictionary>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('remark')" prop="remark">
<Input v-model="entity.remark" type="textarea" :rows="2"></Input>
</FormItem>
</Col>
</Row> </Row>
<FormItem> <FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button> <Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
......
pages/technology/details/routingsupporting/edit.vue
View file @ f1f2b1c5
...@@ -22,6 +22,16 @@ ...@@ -22,6 +22,16 @@
<InputNumber v-model="entity.routingHeaderId"></InputNumber> <InputNumber v-model="entity.routingHeaderId"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8">
<FormItem :label="l('state')" prop="state">
<Dictionary code="Process.state" v-model="entity.state" type="radio"></Dictionary>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('remark')" prop="remark">
<Input v-model="entity.remark" type="textarea" :rows="2"></Input>
</FormItem>
</Col>
--> -->
<Col :span="8"> <Col :span="8">
...@@ -93,16 +103,7 @@ ...@@ -93,16 +103,7 @@
<Input v-model="entity.drawNum"></Input> <Input v-model="entity.drawNum"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8">
<FormItem :label="l('state')" prop="state">
<Dictionary code="Process.state" v-model="entity.state" type="radio"></Dictionary>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('remark')" prop="remark">
<Input v-model="entity.remark" type="textarea" :rows="2"></Input>
</FormItem>
</Col>
</Row> </Row>
<FormItem> <FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button> <Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
......
pages/technology/details/routingsupporting/index.vue
View file @ f1f2b1c5
...@@ -57,22 +57,6 @@ export default { ...@@ -57,22 +57,6 @@ export default {
curId: 0, curId: 0,
hid: 0, hid: 0,
columns: [ columns: [
{ key: "id", title: this.l("id"), hide: true, align: "left" },
{
key: "routingHeaderId",
title: this.l("routingHeaderId"),
align: "left",
high: true,
hide:true,
},
{
key: "routingDetailId",
title: this.l("routingDetailId"),
align: "left",
high: true,
hide:true,
},
{ {
key: "routingDetailNo", key: "routingDetailNo",
title: this.l("routingDetailNo"), title: this.l("routingDetailNo"),
...@@ -87,13 +71,6 @@ export default { ...@@ -87,13 +71,6 @@ export default {
align: "left", align: "left",
high: true high: true
}, },
{
key: "routingStepId",
title: this.l("routingStepId"),
align: "left",
high: true,
hide:true,
},
{ {
key: "quantity", key: "quantity",
title: this.l("quantity"), title: this.l("quantity"),
...@@ -101,13 +78,6 @@ export default { ...@@ -101,13 +78,6 @@ export default {
high: true, high: true,
width:80, width:80,
}, },
{
key: "materialId",
title: this.l("materialId"),
align: "left",
high: true,
hide:true,
},
{ {
key: "materialType", key: "materialType",
title: this.l("materialType"), title: this.l("materialType"),
...@@ -174,14 +144,6 @@ export default { ...@@ -174,14 +144,6 @@ export default {
easy: true, easy: true,
high: true high: true
}, },
{
key: "state",
title: this.l("state"),
align: "center",
high: true,
code: "Process.Status",
width:80,
},
{ {
key: "drawNum", key: "drawNum",
title: this.l("drawNum"), title: this.l("drawNum"),
...@@ -202,6 +164,7 @@ export default { ...@@ -202,6 +164,7 @@ export default {
hide: true, hide: true,
align: "left", align: "left",
hide:true, hide:true,
type:'user',
}, },
{ {
key: "lastModificationTime", key: "lastModificationTime",
...@@ -216,27 +179,7 @@ export default { ...@@ -216,27 +179,7 @@ export default {
hide: true, hide: true,
align: "left", align: "left",
hide:true, hide:true,
}, type:'user',
{
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/details/routingsupporting/search.vue
View file @ f1f2b1c5
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.routingDetailId.show"> <Col :span="12" v-if="condition.routingDetailId.show">
<FormItem :label="l('routingDetailId')" prop="routingDetailId"> <FormItem :label="l('routingDetailName')" prop="routingDetailId">
<Select v-model="condition.routingDetailId.value"> <Select v-model="condition.routingDetailId.value" clearable>
<Option <Option
v-for="(item,index) in routingDetailList" v-for="(item,index) in routingDetailList"
:value="item.value" :value="item.value"
...@@ -123,7 +123,7 @@ export default { ...@@ -123,7 +123,7 @@ export default {
texture: { op: "Equal", value: null, show: true }, texture: { op: "Equal", value: null, show: true },
procurementStandards: { op: "Equal", value: null, show: true }, procurementStandards: { op: "Equal", value: null, show: true },
qualityGrade: { op: "Equal", value: null, show: true }, qualityGrade: { op: "Equal", value: null, show: true },
state: { op: "Equal", value: null, show: true }, state: { op: "Equal", value: null, show: false },
remark: { op: "Equal", value: null, show: false }, remark: { op: "Equal", value: null, show: false },
drawNum: { op: "Equal", value: null, show: true } drawNum: { op: "Equal", value: null, show: true }
}, },
......
pages/technology/edit.vue
View file @ f1f2b1c5
...@@ -26,25 +26,29 @@ ...@@ -26,25 +26,29 @@
<Dictionary code="Process.Routing.routingType" v-model="entity.routingType"></Dictionary> <Dictionary code="Process.Routing.routingType" v-model="entity.routingType"></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8">
<FormItem :label="l('phase')" prop="phase">
<Dictionary code="Process.Routing.phase" v-model="entity.phase"></Dictionary>
</FormItem>
</Col>
<Col :span="8"> <Col :span="8">
<FormItem :label="l('productName')" prop="productId"> <FormItem :label="l('productName')" prop="productId">
<ProductSelect v-model="entity.productId" @on-change="proChange"></ProductSelect> <ProductSelect v-model="entity.productId" @on-change="proChange"></ProductSelect>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="8">
<FormItem :label="l('version')" prop="version"> <FormItem :label="l('drawingNo')" prop="drawingNo">
<Input v-model="entity.version"></Input> <Input v-model="entity.drawingNo" disabled></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="8">
<FormItem :label="l('departmentName')" prop="departmentId"> <FormItem :label="l('version')" prop="version">
<departmentSelect v-model="entity.departmentId" @on-change="departChange"></departmentSelect> <Input v-model="entity.version"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="8">
<FormItem :label="l('isMain')" prop="isMain"> <FormItem :label="l('departmentName')" prop="departmentId">
<Dictionary code="Process.state" v-model="entity.isMain" type="radio"></Dictionary> <departmentSelect v-model="entity.departmentId" @on-change="departChange"></departmentSelect>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="8">
...@@ -58,6 +62,11 @@ ...@@ -58,6 +62,11 @@
</FormItem> </FormItem>
</Col> </Col>
<!-- <!--
<Col :span="8">
<FormItem :label="l('isMain')" prop="isMain">
<Dictionary code="Process.state" v-model="entity.isMain" type="radio"></Dictionary>
</FormItem>
</Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('upId')" prop="upId"> <FormItem :label="l('upId')" prop="upId">
<InputNumber v-model="entity.upId"></InputNumber> <InputNumber v-model="entity.upId"></InputNumber>
...@@ -124,7 +133,7 @@ ...@@ -124,7 +133,7 @@
<Col :span="24"> <Col :span="24">
<FormItem label="多媒体附件" prop="files"> <FormItem label="多媒体附件" prop="files">
<files ref="refFile" :parms="parms" fileFormat/> <files ref="refFile" :parms="parms" fileFormat />
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
...@@ -146,9 +155,7 @@ export default { ...@@ -146,9 +155,7 @@ export default {
data() { data() {
return { return {
disabled: false, disabled: false,
entity: { entity: {},
},
rules: { rules: {
name: [{ required: true, message: "必填", trigger: "blur" }] name: [{ required: true, message: "必填", trigger: "blur" }]
}, },
...@@ -162,7 +169,7 @@ export default { ...@@ -162,7 +169,7 @@ export default {
}, },
props: { props: {
eid: Number, eid: Number,
uid: String, uid: String
}, },
mounted() { mounted() {
if (this.eid > 0) { if (this.eid > 0) {
...@@ -228,14 +235,12 @@ export default { ...@@ -228,14 +235,12 @@ export default {
key = "routingHeader" + "." + key; key = "routingHeader" + "." + key;
return this.$t(key); return this.$t(key);
}, },
proChange(v,items) proChange(v, items) {
{ this.entity.productName = items.name;
this.entity.productName=items.name this.entity.drawingNo = items.drawingNo;
}, },
departChange(v,items) departChange(v, items) {
{ this.entity.departmentName = items.name;
this.entity.departmentName=items.name
} }
}, },
watch: { watch: {
...@@ -244,8 +249,7 @@ export default { ...@@ -244,8 +249,7 @@ export default {
this.load(v); this.load(v);
} }
}, },
uid(v) { uid(v) {}
}
} }
}; };
</script> </script>
\ No newline at end of file
pages/technology/index.vue
View file @ f1f2b1c5
...@@ -93,7 +93,9 @@ ...@@ -93,7 +93,9 @@
{{l('name')}}： {{l('name')}}：
<span class="grayTitle mr10">{{titleObj.name}}</span> <span class="grayTitle mr10">{{titleObj.name}}</span>
{{l('routingType')}}： {{l('routingType')}}：
<span class="grayTitle mr10"><state code="Process.Routing.routingType" :value="titleObj.routingType" type="text"></state></span> <span class="grayTitle mr10">
<state code="Process.Routing.routingType" :value="titleObj.routingType" type="text"></state>
</span>
{{l('version')}}： {{l('version')}}：
<span class="grayTitle">{{titleObj.version}}</span> <span class="grayTitle">{{titleObj.version}}</span>
{{l('departmentName')}}： {{l('departmentName')}}：
...@@ -112,9 +114,9 @@ ...@@ -112,9 +114,9 @@
import Api from "./api"; import Api from "./api";
import Search from "./search"; import Search from "./search";
import ProductTree from "@/components/page/productTree.vue"; import ProductTree from "@/components/page/productTree.vue";
import sendAudit from './sendAudit.vue' import sendAudit from "./sendAudit.vue";
export default { export default {
components: { ProductTree, Search,sendAudit}, components: { ProductTree, Search, sendAudit },
head: { head: {
title: "工艺规程", title: "工艺规程",
author: "henq", author: "henq",
...@@ -138,16 +140,7 @@ export default { ...@@ -138,16 +140,7 @@ export default {
uId: "", uId: "",
documentShow: false, documentShow: false,
columns: [ columns: [
{ key: "id", title: this.$t("id"), hide: true, align: "left" },
{ key: "classId", title: this.l("classId"), align: "left", hide: true },
{
key: "unicode",
title: this.l("unicode"),
align: "left",
easy: false,
hide: true
},
{ {
key: "code", key: "code",
title: this.l("code"), title: this.l("code"),
...@@ -164,89 +157,64 @@ export default { ...@@ -164,89 +157,64 @@ export default {
high: true high: true
}, },
{ {
key: "productName", key: "phase",
title: this.l("productName"), title: this.l("phase"),
align: "left", align: "center",
high: true
},
{ key: "version", title: this.l("version"), align: "left", high: true },
{
key: "creatorUserId",
title: this.l("author"),
align: "left",
high: true, high: true,
type: "user"
},
{
key: "departmentName",
title: this.l("departmentName"),
width: 100, width: 100,
align: "left", code: "Process.Routing.phase"
high: true
}, },
{ key: "version", title: this.l("version"), align: "left", high: true,width: 100, },
// { key:"upId",title:this.l("upId") ,align:"left" ,high:true },
// { key:"upDetailId",title:this.l("upDetailId") ,hide:true ,align:"left" ,high:true },
{ {
key: "routingType", key: "routingType",
title: this.l("routingType"), title: this.l("routingType"),
align: "left", align: "center",
width: 100, width: 100,
high: true, high: true,
code: "Process.Routing.routingType" code: "Process.Routing.routingType"
}, },
// { key:"status",title:this.l("status") ,align:"left" ,high:true ,code:'Process.Status' },
// { key:"approvalStatus",title:this.l("approvalStatus") ,align:"left" ,high:true ,code:'process.RoutingStatus' },
// { key:"approvalStatusRemark",title:this.l("approvalStatusRemark") ,align:"left" ,high:true },
// { key:"auditUserId1",title:this.l("auditUserId1") ,align:"left" ,high:true },
// { key:"auditUserId2",title:this.l("auditUserId2") ,align:"left" ,high:true },
// { key:"platesnum",title:this.l("platesnum") ,align:"left" ,high:true },
{ {
key: "isEffect", key: "drawingNo",
title: this.l("isEffect"), title: this.l("drawingNo"),
align: "center",
width: 80,
high: true,
code: "Process.Status"
},
{
key: "versionnotes",
title: this.l("versionnotes"),
align: "left", align: "left",
high: true, high: true
hide: true
}, },
{ {
key: "phase", key: "productName",
title: this.l("phase"), title: this.l("productName"),
align: "left", align: "left",
high: true, high: true
hide: true,
code: "Process.Routing.phase"
}, },
{ {
key: "versionid", key: "departmentName",
title: this.l("versionid"), title: this.l("departmentName"),
width: 100,
align: "left", align: "left",
hide: true, high: true
code: "Process.Routing.version"
}, },
{ {
key: "isMain", key: "isEffect",
title: this.l("isMain"), title: this.l("isEffect"),
align: "center", align: "center",
width: 80, width: 80,
high: true, high: true,
code: "Process.state"
},
{
key: "isSendPpm",
title: this.l("isSendPpm"),
align: "center",
width: 140,
high: true,
code: "Process.Status" code: "Process.Status"
}, },
//{ key: "id", title: this.$t("id"), hide: true, align: "left" },
// { key:"upId",title:this.l("upId") ,align:"left" ,high:true },
// { key:"upDetailId",title:this.l("upDetailId") ,hide:true ,align:"left" ,high:true },
//{ key: "classId", title: this.l("classId"), align: "left", hide: true },
//{ key: "unicode", title: this.l("unicode"),align: "left",easy: false,hide: true},
// { key:"status",title:this.l("status") ,align:"left" ,high:true ,code:'Process.Status' },
// { key:"approvalStatus",title:this.l("approvalStatus") ,align:"left" ,high:true ,code:'process.RoutingStatus' },
// { key:"approvalStatusRemark",title:this.l("approvalStatusRemark") ,align:"left" ,high:true },
// { key:"auditUserId1",title:this.l("auditUserId1") ,align:"left" ,high:true },
// { key:"auditUserId2",title:this.l("auditUserId2") ,align:"left" ,high:true },
// { key:"platesnum",title:this.l("platesnum") ,align:"left" ,high:true },
// { key: "isMain", title: this.l("isMain"),align: "center",width: 80,high: true,code: "Process.state"},
//{key: "creatorUserId",title: this.l("author"),align: "left", high: true,type: "user",hide: true},
//{key: "versionnotes",title: this.l("versionnotes"),align: "left", high: true,hide: true},
//{key: "versionid", title: this.l("versionid"), align: "left", hide: true, code: "Process.Routing.version"},
{ {
key: "creationTime", key: "creationTime",
title: this.$t("creationTime"), title: this.$t("creationTime"),
...@@ -274,7 +242,7 @@ export default { ...@@ -274,7 +242,7 @@ export default {
{ {
title: "操作", title: "操作",
key: "action", key: "action",
width: 210, width: 320,
align: "left", align: "left",
render: (h, params) => { render: (h, params) => {
return h("div", { class: "action" }, [ return h("div", { class: "action" }, [
...@@ -324,9 +292,15 @@ export default { ...@@ -324,9 +292,15 @@ export default {
attrs: { oprate: "detail" }, attrs: { oprate: "detail" },
on: { click: () => this.sendAuditFun(params.row) } on: { click: () => this.sendAuditFun(params.row) }
}, },
params.row.approvalStatus == 4 params.row.approvalStatus == 4 ? "新增更改单" : "查看更改单"
? "送审" ),
: "" h(
"op",
{
attrs: { oprate: "detail" },
on: { click: () => this.sendAuditFun(params.row) }
},
params.row.approvalStatus == 4 ? "送审" : ""
) )
]); ]);
} }
......
pages/technology/search.vue
View file @ f1f2b1c5
<template> <template>
<Form ref="form" :model="condition" :label-width="90"> <Form ref="form" :model="condition" :label-width="100">
<Row> <Row>
<Col :span="12" v-if="condition.creationTime.show">
<FormItem :label="$t('creationTime')" prop="creationTime">
<DatePicker type="daterange" v-model="condition.creationTime.value"></DatePicker>
</FormItem>
</Col>
<Col :span="12" v-if="condition.creatorUserId.show">
<FormItem :label="$t('creatorUserId')" prop="creatorUserId">
<UserSelect v-model="condition.creatorUserId.value"></UserSelect>
</FormItem>
</Col>
<Col :span="12" v-if="condition.lastModificationTime.show">
<FormItem :label="$t('lastModificationTime')" prop="lastModificationTime">
<DatePicker type="daterange" v-model="condition.lastModificationTime.value"></DatePicker>
</FormItem>
</Col>
<Col :span="12" v-if="condition.lastModifierUserId.show">
<FormItem :label="$t('lastModifierUserId')" prop="lastModifierUserId">
<UserSelect v-model="condition.lastModifierUserId.value"></UserSelect>
</FormItem>
</Col>
<Col :span="12" v-if="condition.classId.show"> <Col :span="12" v-if="condition.classId.show">
<FormItem :label="l('classId')" prop="classId"> <FormItem :label="l('classId')" prop="classId">
<Input v-model="condition.classId.value"></Input> <Input v-model="condition.classId.value"></Input>
...@@ -30,34 +10,45 @@ ...@@ -30,34 +10,45 @@
<FormItem :label="l('unicode')" prop="unicode"> <FormItem :label="l('unicode')" prop="unicode">
<Input v-model="condition.unicode.value"></Input> <Input v-model="condition.unicode.value"></Input>
</FormItem> </FormItem>
</Col>
<Col :span="12" v-if="condition.code.show">
<FormItem :label="l('code')" prop="code">
<Input v-model="condition.code.value"></Input>
</FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.name.show"> <Col :span="12" v-if="condition.name.show">
<FormItem :label="l('name')" prop="name"> <FormItem :label="l('name')" prop="name">
<Input v-model="condition.name.value"></Input> <Input v-model="condition.name.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.code.show"> <Col :span="12" v-if="condition.routingType.show">
<FormItem :label="l('code')" prop="code"> <FormItem :label="l('routingType')" prop="routingType">
<Input v-model="condition.code.value"></Input> <Dictionary code="Process.Routing.routingType" v-model="condition.routingType.value"></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.productId.show"> <Col :span="12" v-if="condition.phase.show">
<FormItem :label="l('productId')" prop="productId"> <FormItem :label="l('phase')" prop="phase">
<ProductSelect v-model="condition.productId.value"></ProductSelect> <Input v-model="condition.phase.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.version.show"> <Col :span="12" v-if="condition.version.show">
<FormItem :label="l('version')" prop="version"> <FormItem :label="l('version')" prop="version">
<Input v-model="condition.version.value"></Input> <Input v-model="condition.version.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.productId.show">
<FormItem :label="l('productName')" prop="productId">
<ProductSelect v-model="condition.productId.value"></ProductSelect>
</FormItem>
</Col>
<Col :span="12" v-if="condition.author.show"> <Col :span="12" v-if="condition.author.show">
<FormItem :label="l('author')" prop="author"> <FormItem :label="l('author')" prop="author">
<UserSelect v-model="condition.author.value"></UserSelect> <UserSelect v-model="condition.author.value"></UserSelect>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.departmentId.show"> <Col :span="12" v-if="condition.departmentId.show">
<FormItem :label="l('departmentId')" prop="departmentId"> <FormItem :label="l('departmentName')" prop="departmentId">
<departmentSelect v-model="condition.departmentId.value"></departmentSelect> <departmentSelect v-model="condition.departmentId.value"></departmentSelect>
</FormItem> </FormItem>
</Col> </Col>
...@@ -71,11 +62,7 @@ ...@@ -71,11 +62,7 @@
<Input v-model="condition.upId.value"></Input> <Input v-model="condition.upId.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.routingType.show">
<FormItem :label="l('routingType')" prop="routingType">
<Dictionary code="Process.Routing.routingType" v-model="condition.routingType.value"></Dictionary>
</FormItem>
</Col>
<Col :span="12" v-if="condition.status.show"> <Col :span="12" v-if="condition.status.show">
<FormItem :label="l('status')" prop="status"> <FormItem :label="l('status')" prop="status">
<Dictionary code="Process.Status" v-model="condition.status.value"></Dictionary> <Dictionary code="Process.Status" v-model="condition.status.value"></Dictionary>
...@@ -121,11 +108,7 @@ ...@@ -121,11 +108,7 @@
<Input v-model="condition.versionnotes.value"></Input> <Input v-model="condition.versionnotes.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.phase.show">
<FormItem :label="l('phase')" prop="phase">
<Input v-model="condition.phase.value"></Input>
</FormItem>
</Col>
<Col :span="12" v-if="condition.versionid.show"> <Col :span="12" v-if="condition.versionid.show">
<FormItem :label="l('versionid')" prop="versionid"> <FormItem :label="l('versionid')" prop="versionid">
<Input v-model="condition.versionid.value"></Input> <Input v-model="condition.versionid.value"></Input>
...@@ -136,6 +119,26 @@ ...@@ -136,6 +119,26 @@
<Dictionary code="Process.state" v-model="condition.isSendPpm.value"></Dictionary> <Dictionary code="Process.state" v-model="condition.isSendPpm.value"></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.creationTime.show">
<FormItem :label="$t('creationTime')" prop="creationTime">
<DatePicker type="daterange" v-model="condition.creationTime.value"></DatePicker>
</FormItem>
</Col>
<Col :span="12" v-if="condition.creatorUserId.show">
<FormItem :label="$t('creatorUserId')" prop="creatorUserId">
<UserSelect v-model="condition.creatorUserId.value"></UserSelect>
</FormItem>
</Col>
<Col :span="12" v-if="condition.lastModificationTime.show">
<FormItem :label="$t('lastModificationTime')" prop="lastModificationTime">
<DatePicker type="daterange" v-model="condition.lastModificationTime.value"></DatePicker>
</FormItem>
</Col>
<Col :span="12" v-if="condition.lastModifierUserId.show">
<FormItem :label="$t('lastModifierUserId')" prop="lastModifierUserId">
<UserSelect v-model="condition.lastModifierUserId.value"></UserSelect>
</FormItem>
</Col>
</Row> </Row>
</Form> </Form>
</template> </template>
...@@ -158,16 +161,14 @@ export default { ...@@ -158,16 +161,14 @@ export default {
routingType: { op: "Equal", value: null, show: true }, routingType: { op: "Equal", value: null, show: true },
productId: { op: "Equal", value: null, show: true }, productId: { op: "Equal", value: null, show: true },
version: { op: "Equal", value: null, show: true }, version: { op: "Equal", value: null, show: true },
author: { op: "Equal", value: null, show: true },
departmentId: { op: "Equal", value: null, show: true }, departmentId: { op: "Equal", value: null, show: true },
isMain: { op: "Equal", value: null, show: true },
isSendPpm: { op: "Equal", value: null, show: true },
isEffect: { op: "Equal", value: null, show: true }, isEffect: { op: "Equal", value: null, show: true },
phase: { op: "Equal", value: null, show: true },
author: { op: "Equal", value: null, show: false },
isMain: { op: "Equal", value: null, show: false },
upId: { op: "Equal", value: null, show: false }, upId: { op: "Equal", value: null, show: false },
upDetailId: { op: "Equal", value: null, show: false }, upDetailId: { op: "Equal", value: null, show: false },
status: { op: "Equal", value: null, show: false }, status: { op: "Equal", value: null, show: false },
...@@ -178,7 +179,7 @@ export default { ...@@ -178,7 +179,7 @@ export default {
auditUserId2: { op: "Equal", value: null, show: false }, auditUserId2: { op: "Equal", value: null, show: false },
platesnum: { op: "Equal", value: null, show: false }, platesnum: { op: "Equal", value: null, show: false },
versionnotes: { op: "Equal", value: null, show: false }, versionnotes: { op: "Equal", value: null, show: false },
phase: { op: "Equal", value: null, show: false }, isSendPpm: { op: "Equal", value: null, show: false },
versionid: { op: "Equal", value: null, show: false }, versionid: { op: "Equal", value: null, show: false },
} }
......
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