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