Skip to content

M
mes-ui
Commit cf9954dc authored by 仇晓婷's avatar 仇晓婷
Browse files
Options

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

parents 60717e9d 0c2008ed
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2757 additions and 1187 deletions
components/page/equipSelect.vue
View file @ cf9954dc
<template> <template>
<Select :placeholder="placeholder" v-model="name" @on-change="change" :multiple="multiple" clearable > <Select
<Option v-for="item in dic" :value="item.value" :key="item.value" :label="item.label"> :placeholder="placeholder"
</Option> v-model="name"
</Select> @on-change="change"
:multiple="multiple"
clearable
@on-clear="onClear"
>
<Option v-for="item in dic" :value="item.value" :key="item.value" :label="item.label"></Option>
</Select>
</template> </template>
<script> <script>
export default { export default {
model: { model: {
prop: 'value', prop: "value",
event: 'on-change' event: "on-change"
},
data() {
return {
// name: [8,9],
name: this.value,
data: []
};
},
created() {
let url = `${systemUrl}/equipinfo/getlistall`;
this.$api.get(url).then(r => {
this.data = r.result;
});
},
props: {
value: [String, Number, Array],
placeholder: {
type: String,
default: "请选择设备"
}, },
data() { multiple: {
return { type: Boolean,
// name: [8,9], default: false
name: this.value, }
data: [] },
} methods: {
}, change(v) {
created() { // console.log(event)
let url = `${systemUrl}/equipinfo/getlistall`; this.name = v;
this.$api.get(url).then(r=>{ var item;
this.data=r.result; var items = this.data.filter(u => {
}) return u.id == v;
}, });
props: { if (items && items.length > 0) {
value: [String, Number,Array], item = items[0];
placeholder: { }
type: String, this.$emit("on-change", v, item);
default: '请选择设备' // this.$emit("on-change", event);
},
multiple:{
type:Boolean,
default:false
}
},
methods: {
change(event) {
// console.log(event)
this.$emit('on-change', event)
},
getTitle(){
var title="";
this.dic.forEach(u=>{
if(u.value==this.value){
title = u.label;
}
})
return title;
}
}, },
computed: { getTitle() {
dic() { var title = "";
let result = [] this.dic.forEach(u => {
this.data.forEach((u) => { if (u.value == this.value) {
result.push({ title = u.label;
value:u.id,
label:u.equip_name
})
})
return result
} }
});
return title;
}, },
watch:{ onClear() {
value(v,o){ this.placeholdeinfo = "请选择";
this.name=v; this.$emit("on-change", null, {});
// console.log(v,o)
}
} }
},
} computed: {
dic() {
let result = [];
this.data.forEach(u => {
result.push({
value: u.id,
label: u.equip_name
});
});
return result;
}
},
watch: {
value(v, o) {
this.name = v;
// console.log(v,o)
}
}
};
</script> </script>
<style lang="less"> <style lang="less">
.w200 { .w200 {
......
components/page/productSelect.vue
View file @ cf9954dc
<template> <template>
<TreeSelect <Select v-model="dep" :placeholder="placeholdeinfo" clearable @on-clear="onClear">
v-model="dep" <Option
:data="data" v-for="(item,index) in list"
@on-change="change" :key="index"
:disabled="disabled" :value="item.value"
:multiple="multiple" style="display:none"
/> :label="item.label"
></Option>
<Tree key="mytree" :data="data1" ref="mytree" :render="renderContent"></Tree>
</Select>
</template> </template>
<script>
<script>
export default { export default {
name: "Add",
model: { model: {
prop: "value", prop: "value",
event: "on-change" event: "on-change"
...@@ -17,37 +20,22 @@ export default { ...@@ -17,37 +20,22 @@ export default {
data() { data() {
return { return {
dep: "", dep: "",
data: [], list: [],
list: [] data1: [],
}; selectdata: [],
}, placeholdeinfo: "请选择",
created() { orderSearchForm: {
this.dep = this.value | ""; productId: null, //产品id
//http://39.100.148.168:10030/api/services/app/productlevel/getproducttreenew productName: "", //产品名称
this.$api.get(`${designUrl}/productlevel/getproducttreenew`).then(r => { drawingNo: "" //图号
this.list = r.result;
setTree(r.result)
function setTree(data) {
data.map(u => {
u.title = u.name;
u.value = u.id;
u.expand = true;
u.selected = false;
u.checked = false;
if (u.children) {
setTree(u.children);
}
});
} }
var data = r.result; };
this.data = this.$u.clone(data);
});
}, },
props: { props: {
value: [String, Number, Array], value: [String, Number, Array],
placeholder: { placeholder: {
type: String, type: String,
default: "请选择产品" default: "请选择部门"
}, },
multiple: { multiple: {
type: Boolean, type: Boolean,
...@@ -58,28 +46,111 @@ export default { ...@@ -58,28 +46,111 @@ export default {
default: false default: false
} }
}, },
mounted() {},
created() {
this.dep = this.value | "";
this.loadTree();
},
methods: { methods: {
change(v,item,items) { handleSelect(data) {
console.log(v); if (data.length > 0) {
this.dep = v; this.selectdata = [];
var item; this.selectdata = data;
var items = this.list.filter(u => { if (data[0].isProduct == "1") {
return u.id == v; this.list = [];
}); this.list.push({ label: data[0].title, value: data[0].id });
if (items && items.length > 0) { this.orderSearchForm.productName = data[0].title;
item = items[0]; this.orderSearchForm.productId = data[0].productId;
this.orderSearchForm.drawingNo = data[0].drawingNo;
this.$emit(
"on-change",
this.orderSearchForm.productId,
this.orderSearchForm
);
} else {
this.$Message.error("此节点不是产品,请选择产品节点!");
}
} }
this.$emit("on-change", v, item); },
console.log(v,item,items) resetFields() {
this.orderSearchForm = {
productId: null, //产品id
productName: "", //产品名称
drawingNo: "" //图号
};
},
loadTree() {
//打开新增订单窗口加载产品
this.resetFields();
var sumData = [];
this.$http.order.getallselecttree().then(res => {
if (res.result) {
for (var i = 0; i < res.result.length; i++) {
sumData = sumData.concat(res.result[i]);
}
this.data1 = sumData;
} else {
this.$Message.error("加载产品树失败!");
}
});
},
renderContent(h, { root, node, data }) {
//渲染树的样式
return h(
"span",
{
style: {
color: data.isProduct != "1" ? "#249E91" : "#333", //根据选中状态设置样式
cursor: "pointer"
},
on: {
click: () => {
let arrTree = [];
arrTree.push(data);
this.handleSelect(arrTree); //手动选择树节点
}
}
},
data.title
);
},
onClear() {
this.list = [];
this.placeholdeinfo = "请选择";
this.resetFields();
this.$emit("on-change", null, this.orderSearchForm);
} }
}, },
watch: { watch: {
value: { value: {
handler(v, o) { handler(v, o) {
this.dep = v | ""; this.dep = v | "";
this.resetFields();
var sumData = [];
this.$http.order.getallselecttree().then(res => {
if (res.result) {
for (var i = 0; i < res.result.length; i++) {
sumData = sumData.concat(res.result[i]);
}
this.data1 = sumData;
let temData = this.$u.clone(this.data1);
this.list = [];
if (v != "" && v != null) {
let dataTemp = this.$u.treeToList(temData);
dataTemp.forEach(data => {
if (data.isProduct == 1 && data.id == this.dep) {
this.placeholdeinfo = data.title;
this.list.push({ label: data.title, value: data.id });
}
});
}
} else {
this.$Message.error("加载产品树失败!");
}
});
}, },
deep: true deep: true
} }
} }
}; };
</script> </script>
\ No newline at end of file
components/page/remote.vue
View file @ cf9954dc
...@@ -103,9 +103,9 @@ export default { ...@@ -103,9 +103,9 @@ export default {
// this.cssId = remoteData.cssId; // this.cssId = remoteData.cssId;
// }else{ // }else{
if (this.$props.url) { if (this.$props.url) {
const res = await Axios.get(this.$props.url); const res = await this.$api.get(this.$props.url);
// this.cssId = this.getId(); // this.cssId = this.getId();
this.resData = res.data; this.resData = res;
console.log(this.resData) console.log(this.resData)
} }
......
components/page/resourceSelect.vue
View file @ cf9954dc
...@@ -41,7 +41,7 @@ export default { ...@@ -41,7 +41,7 @@ export default {
this.types.map(u => { this.types.map(u => {
let item = { let item = {
label: u.name, label: u.name,
value: u.code value: parseInt(u.code)
}; };
var children = this.resources.filter(r => { var children = this.resources.filter(r => {
return r.type == u.code; return r.type == u.code;
......
i18n/locale/zh-CN.js
View file @ cf9954dc
...@@ -1171,11 +1171,12 @@ export default { ...@@ -1171,11 +1171,12 @@ export default {
name: '工艺名称', name: '工艺名称',
code: '工艺文件编号', code: '工艺文件编号',
productId: '产品id', productId: '产品id',
productName:'产品名称', productName: '产品名称',
drawingNo: '图号',
version: '版本', version: '版本',
author: '编制人', author: '编制人',
departmentId: '主制车间', departmentId: '主制车间',
departmentName:'主制车间', departmentName: '主制车间',
isMain: '主工艺', isMain: '主工艺',
upId: '父工艺', upId: '父工艺',
upDetailId: '上级工序', upDetailId: '上级工序',
...@@ -1190,75 +1191,73 @@ export default { ...@@ -1190,75 +1191,73 @@ export default {
platesnum: '板数', platesnum: '板数',
isEffect: '有效', isEffect: '有效',
versionnotes: '版本说明', versionnotes: '版本说明',
phase: '阶段', phase: '工艺阶段',
versionid: '版本ID', versionid: '版本ID',
isSendPpm: '发送PPM', isSendPpm: '发送PPM',
creationTime:'创建时间', creationTime: '创建时间',
creatorUserId:'创建人', creatorUserId: '创建人',
lastModificationTime:'最近修改时间', lastModificationTime: '最近修改时间',
lastModifierUserId:'最近修改人', lastModifierUserId: '最近修改人',
},
routing_detail: {
id: '',
creationTime: '创建时间',
creatorUserId: '创建人',
lastModificationTime: '最近修改时间',
lastModifierUserId: '最近修改人',
isDeleted: '是否删除',
deleterUserId: '删除人',
deletionTime: '删除时间',
classId: 'classId',
routingHeaderId: '工艺规程id',
name: '工序名称',
taskSeq: '工序号',
description: '描述',
taskContent: '工序内容',
resourceId: '资源ID',
resourceType: '资源类型',
resourceCode: '资源类型',
runtime: '排产单件工时',
setupTime: '准备工时',
transportTime: '转运工时',
checkTime: '检验工时',
checkFlag: '检验标识',
efficiencyValue: '效率系数',
singleOut: '单件产出',
isOutside: '是否外协',
departmentId: '承制车间',
isImportant: '关键工序',
milestoneId: '里程碑',
phaseId: '工艺阶段',
status: '状态',
remark: '备注',
extend: '扩展字段',
outsideTime: '外协工期',
performanceHours: '绩效工时',
isImportantResources: '关重资源',
schedulingWorkingHours: '排产准结工时',
realWorkingHours: '实作准结工时',
realRuntime: '实作单件工时',
performanceWorkingHours: '绩效准结工时',
isParticipateIntime: '参与工时分配',
equipType: '设备类型',
equipTypeId: '设备类型ID',
note: '备注',
}, },
routing_detail:{
id:'',
creationTime:'创建时间',
creatorUserId:'创建人',
lastModificationTime:'最近修改时间',
lastModifierUserId:'最近修改人',
isDeleted:'是否删除',
deleterUserId:'删除人',
deletionTime:'删除时间',
classId:'classId',
routingHeaderId:'工艺规程id',
name:'工序名称',
taskSeq:'工序号',
description:'描述',
taskContent:'工序内容',
resourceId:'资源ID',
resourceType:'资源类型',
runtime:'排产工时',
setupTime:'准备工时',
transportTime:'转运工时',
checkTime:'检验工时',
checkFlag:'检验标识',
efficiencyValue:'效率系数',
singleOut:'单件产出',
isOutside:'是否外协',
departmentId:'承制车间',
isImportant:'关键工序',
milestoneId:'里程碑',
phaseId:'工艺阶段',
status:'状态',
remark:'备注',
extend:'扩展字段',
outsideTime:'外协工期',
performanceHours:'绩效工时',
resourceCode:'资源编号',
isImportantResources:'关重资源',
schedulingWorkingHours:'排产准结工时',
realWorkingHours:'实作准结工时',
realRuntime:'实作单件工时',
performanceWorkingHours:'绩效准结工时',
isParticipateIntime:'参与工时分配',
equipType:'设备类型',
equipTypeId:'设备类型ID',
note:'备注',
},
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: '数量',
singlequantity: '总计数量', singlequantity: '总计数量',
routingDetailName: '工序名称', routingDetailName: '工序名称',
routingDetailNo:'工序号', routingDetailNo: '工序号',
materialId: '物料id', materialId: '物料id',
materialType: '物料类型', materialType: '物料类型',
materialNumber: '物料编号', materialNumber: '物料编号',
...@@ -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: '备注',
...@@ -1331,7 +1330,7 @@ export default { ...@@ -1331,7 +1330,7 @@ export default {
routingHeaderName: '工艺', routingHeaderName: '工艺',
routingDetailId: '工序ID', routingDetailId: '工序ID',
routingDetailName: '工序名称', routingDetailName: '工序名称',
routingDetailNo:'工序号', routingDetailNo: '工序号',
routingStepId: '工步ID', routingStepId: '工步ID',
checkContent: '检测内容', checkContent: '检测内容',
checkType: '检测类型', checkType: '检测类型',
...@@ -1353,7 +1352,7 @@ export default { ...@@ -1353,7 +1352,7 @@ export default {
sampling: '抽检', sampling: '抽检',
samplingBatch: '抽检批次', samplingBatch: '抽检批次',
}, },
routingsupporting: {//工艺BOM routingsupporting: { //工艺BOM
id: '', id: '',
creationTime: '创建时间', creationTime: '创建时间',
creatorUserId: '创建人', creatorUserId: '创建人',
...@@ -1366,7 +1365,7 @@ export default { ...@@ -1366,7 +1365,7 @@ export default {
routingHeaderName: '工艺', routingHeaderName: '工艺',
routingDetailId: '工序ID', routingDetailId: '工序ID',
routingDetailName: '工序名称', routingDetailName: '工序名称',
routingDetailNo:'工序号', routingDetailNo: '工序号',
routingStepId: '工步ID', routingStepId: '工步ID',
quantity: '数量', quantity: '数量',
materialId: '物料id', materialId: '物料id',
...@@ -1383,5 +1382,48 @@ export default { ...@@ -1383,5 +1382,48 @@ export default {
extend: '扩展字段', extend: '扩展字段',
remark: '备注', remark: '备注',
drawNum: '产品图号', drawNum: '产品图号',
},
routing_header_changeorder: { //工艺更改单
routingHeaderId: '工艺Id',
classId: '',
proposeUserId: '',
proposeUserName: '提出人',
departmentId: '申请部门Id',
departmentName: '申请部门',
technicalName: '技术文件名称',
technicalCode: '技术文件编号',
changedVersion: '更改后的版本号',
quantity: '数量',
printData: '发行日期',
executiveBranch: '执行部门',
executiveBranchId: '执行部门Id',
handlingOpinionsId: '',
handlingOpinions: '在制品处理意见',
beforeChangeContent: '变更前内容描述（附图）',
afterChangeContent: '变更后内容描述（附图）',
changeorderCode: '更改单编号',
changeReason: '更改原因',
effectiveDate: '有效日期',
checkPerson: '校对人',
approvalPerson: '批准人',
status: '状态',
note: '',
creationTime: '创建时间',
creatorUserId: '创建人',
lastModificationTime: '更新时间',
lastModifierUserId: '更新人',
isDeleted: '删除人',
deletionTime: '删除时间',
deleterUserId: '删除人',
//
changeorder_code:'更改单编号',
print_data:'发行日期',
department_name:'申请部门',
propose_user_name:'提出人',
technical_name:'技术文件名称',
technical_code:'技术文件编号',
check_person:'校对人',
executive_branch:'执行部门',
} }
} }
package-lock.json
View file @ cf9954dc
...@@ -9538,8 +9538,7 @@ ...@@ -9538,8 +9538,7 @@
"dependencies": { "dependencies": {
"deepmerge": { "deepmerge": {
"version": "2.2.1", "version": "2.2.1",
"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz", "bundled": true
"integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA=="
} }
} }
}, },
...@@ -19891,8 +19890,7 @@ ...@@ -19891,8 +19890,7 @@
"version": "4.0.8", "version": "4.0.8",
"resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz", "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
"integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=", "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
"dev": true, "dev": true
"optional": true
}, },
"rx-lite-aggregates": { "rx-lite-aggregates": {
"version": "4.0.8", "version": "4.0.8",
......
pages/processDesign/Process/changelist.vue
View file @ cf9954dc
This diff is collapsed.
pages/processManage/Process/index.vue
View file @ cf9954dc
This diff is collapsed.
pages/produce/execute/components/functional.vue 0 → 100644
View file @ cf9954dc
<style lang="less">
@import "../execute.less";
</style>
<template>
<div class="addd">
<ul>
<li><a @click="gnFunto(0,0)" :class="{active:gnFlag == 0}"><Icon type="ios-clipboard" /> 进度汇报</a></li>
<li><a @click="gnFunto(1,1)" :class="{active:gnFlag == 1}"><Icon type="ios-cube" /> 物料领用</a></li>
<li><a @click="gnFunto(2,2)" :class="{active:gnFlag == 2}"><Icon type="md-build" /> 产品装配</a></li>
<li><a @click="gnFunto(3,3)" :class="{active:gnFlag == 3}"><Icon type="ios-time" /> 工时分配</a></li>
<li><a @click="gnFunto(4,4)" :class="{active:gnFlag == 4}"><Icon type="ios-checkmark-circle" /> 生产准备</a></li>
<li><a @click="gnFunto(5,5)" :class="{active:gnFlag == 5}"><Icon type="ios-eye" /> 工艺查看</a></li>
<li><a @click="gnFunto(6,6)" :class="{active:gnFlag == 6}"><Icon type="ios-paper" /> 工艺案例</a></li>
<li><a @click="gnFunto(7,7)" :class="{active:gnFlag == 7}"><Icon type="ios-medal" /> 质量判定</a></li>
<li><a @click="gnFunto(8,8)" :class="{active:gnFlag == 8}"><Icon type="ios-create" /> 数据填报</a></li>
<li><a @click="gnFunto(9,9)" :class="{active:gnFlag == 9}"><Icon type="logo-codepen" /> 测试数据</a></li>
</ul>
</div>
</template>
<script>
export default {
name:'functional',
data(){
return{
gnFlag:0,
}
},
methods: {
gnFunto(number,type){
this.gnFlag = number
}
},
}
</script>
\ No newline at end of file
pages/produce/execute/components/orderlist.vue 0 → 100644
View file @ cf9954dc
<style lang="less">
@import "../execute.less";
</style>
<template>
<div class="order_list">
<!-- <div slot="header">
<span class="gd_tt">工单列表</span>
<a ><Icon type="ios-list" size="18" /> 展开全部列表</a>
</div> -->
<!-- <div class="select_t">
<!-- <Icon type="md-arrow-dropright" />
<Select v-model="odermodel" style="width:100px" @on-change="searchOrder">
<Option v-for="item in oderList" :value="item.value" :key="item.index">{{ item.label }}</Option>
</Select>
<Button class="fr">时间正序排列</Button>
</div> -->
<div class="card_box">
<Card class="card_order" v-for="(item,index) in listTasks"
@click.native="goPage(item)" :key="index"
:class="item.status=='未开工'? 'card_border1' : (item.status=='执行中' ? 'card_border2': (item.status=='暂停中' ?'card_border3':
(item.status=='交检中'?'card_border4':(item.status=='交接中'?'card_border5':''))))"
>
<p slot="title">{{item.title}} <span class="fr" >{{item.status}}</span></p>
<p class="order_tit">{{item.shebei}}</p>
<p><Icon type="ios-pricetags" />{{item.gongxu}}</p>
<p>{{item.time}}</p>
</Card>
<!-- <Card class="card_order">
<p slot="title">CJ_181212_002_001 <span class="fr">未开工</span></p>
<p class="order_tit">发动机</p>
<p><Icon type="ios-pricetags" />工序1：领料</p>
<p>2018-12-12 ~ 2018-12-30</p>
</Card>
<Card class="card_order">
<p slot="title">CJ_181212_002_001 <span class="fr">执行中</span></p>
<p class="order_tit">发动机</p>
<p><Icon type="ios-pricetags" />工序1：领料</p>
<p>2018-12-12 ~ 2018-12-30</p>
</Card>
<Card class="card_order">
<p slot="title">CJ_181212_002_001 <span class="fr">暂停中</span></p>
<p class="order_tit">发动机</p>
<p><Icon type="ios-pricetags" />工序1：领料</p>
<p>2018-12-12 ~ 2018-12-30</p>
</Card>
<Card class="card_order">
<p slot="title">CJ_181212_002_001 <span class="fr">交检中</span></p>
<p class="order_tit">发动机</p>
<p><Icon type="ios-pricetags" />工序1：领料</p>
<p>2018-12-12 ~ 2018-12-30</p>
</Card>
<Card class="card_order">
<p slot="title">CJ_181212_002_001 <span class="fr">已完成</span></p>
<p class="order_tit">发动机</p>
<p><Icon type="ios-pricetags" />工序1：领料</p>
<p>2018-12-12 ~ 2018-12-30</p>
</Card> -->
</div>
</div>
</template>
<script>
export default {
name:'orderlist',
data(){
return{
gnFlag:0,
odermodel:'全部',
oderList:[
{
value: '全部',
label: '全部'
},{
value: '未开工',
label: '未开工'
},{
value: '执行中',
label: '执行中'
},{
value: '暂停中',
label: '暂停中'
},{
value: '交检中',
label: '交检中'
},{
value: '交接中',
label: '交接中'
},{
value: '已完成',
label: '已完成'
},
],
listTasks:[],
listTask:[
{
title: 'CJ_181212_002_001',
status: '已完成',
shebei: '发动机',
gongxu: '工序1：领料',
time: '2018-12-12 ~ 2018-12-30',
},{
title: 'CJ_181212_002_002',
status: '未开工',
shebei: '发动机',
gongxu: '工序1：领料',
time: '2018-12-12 ~ 2018-12-30',
},{
title: 'CJ_181212_002_003',
status: '执行中',
shebei: '发动机',
gongxu: '工序1：领料',
time: '2018-12-12 ~ 2018-12-30',
},{
title: 'CJ_181212_002_004',
status: '暂停中',
shebei: '发动机',
gongxu: '工序1：领料',
time: '2018-12-12 ~ 2018-12-30',
},{
title: 'CJ_181212_002_005',
status: '交检中',
shebei: '发动机',
gongxu: '工序1：领料',
time: '2018-12-12 ~ 2018-12-30',
},{
title: 'CJ_181212_002_006',
status: '交接中',
shebei: '发动机',
gongxu: '工序1：领料',
time: '2018-12-12 ~ 2018-12-30',
},{
title: 'CJ_181212_002_007',
status: '已完成',
shebei: '发动机',
gongxu: '工序1：领料',
time: '2018-12-12 ~ 2018-12-30',
},
],
}
},
created() {
this.loadTree();
},
methods: {
loadTree(){
this.listTasks = this.listTask
},
gnFunto(number,type){
this.gnFlag = number
},
goPage(item){
console.log(item)
},
searchOrder(value){
let allList = this.listTask;
let newitems = [];
if(value=="全部"){
this.loadTree();
}else{
allList.map((u,i)=>{
// console.log(i,":",u)
if(u.status==value){
newitems.push(u)
}
})
this.listTasks = newitems
}
},
},
}
</script>
\ No newline at end of file
pages/produce/execute/execute.less 0 → 100644
View file @ cf9954dc
.execute_box{
.top_title{
height: 50px;
line-height: 49px;
text-align: center;
font-weight: 600;
border-bottom: 1px solid #CACBD0;
}
.star{
height: 33vh;
padding: 6vh 0;
border-bottom: 1px solid #CACBD0;
.start{
width: 177px;
height: 177px;
background: url("../image/starbg.png")no-repeat center;
background-size: 100%;
display: block;
margin: 0 auto;
text-align: center;
line-height: 176px;
font-size: 22px;
color: #fff;
}
.button{
margin: 0 9%;
}
}
.gd_list{
position: absolute;
top: 45%;
left: 0px;
background: #2680EB;
color: #fff;
width: 32px;
padding: 8px;
border-top-right-radius: 5px;
border-bottom-right-radius: 5px;
}
.gn_area{
position: absolute;
top: 45%;
right: 0px;
background: #515A6E;
color: #fff;
width: 32px;
padding: 8px;
border-top-left-radius: 5px;
border-bottom-left-radius: 5px;
}
.footer_box{
height: calc( 66vh - 142px);
padding: 40px 40px 40px 40px;
.ul_box{
padding: 35px 60px;
min-width: 380px;
min-height: 370px;
border-right: 1px solid #CACBD0;
ul li{
height: 30px;
line-height: 29px;
}
}
.img_box {
text-align: center;
line-height: 350px;
font-size: 32px;
width: 750px;
height: 350px;
background: #ddd;
margin: 10px 0 0 170px;
}
}
}
.gd_box{
.ivu-drawer-wrap{
.ivu-drawer-left{
width: 370px!important;
.ivu-drawer-content{
.ivu-drawer-header{
border: none;
.header {
height: 34px;
margin: 0 -16px;
padding: 0 15px 0;
border-bottom: 1px solid #ccc;
.openAll{
margin: 0 0 0 55px;
}
}
.select_t{
padding: 15px 0 0 0;
}
}
.ivu-drawer-body {
padding: 0;
// .order_title {
// border-bottom: 1px solid #ccc;
// height: 50px;
// line-height: 50px;
// padding: 0 0 0 15px;
// .gd_tt{
// margin: 0 55px 0 0;
// }
// }
.order_list{
.select_t {
padding: 15px 20px;
}
.card_box{
padding: 0 15px 60px;
.card_order{
margin: 15px 0;
border-left: 4px solid #ccc;
cursor: pointer;
.order_tit{
color: #2680EB;
}
}
.card_border1{
border-left: 4px solid #707070;
}
.card_border2{
border-left: 4px solid #0DD78D;
}
.card_border3{
border-left: 4px solid #FE7777;
}
.card_border4{
border-left: 4px solid #FFA000;
}
.card_border5{
border-left: 4px solid #720193;
}
}
}
}
}
}
}
}
.gn_box{
.ivu-drawer-wrap{
.ivu-drawer-right{
width: 180px!important;
.ivu-drawer-content{
background: #515A6E;
.ivu-drawer-body {
padding: 13vh 0;
}
li{
line-height: 66px;
height: 66px;
a{
color: #fff;
width: 100%;
display: block;
text-align: center;
font-size: 16px;
}
a:hover{
background: #2680EB;
}
}
}
}
}
.addd{
a.active{
background: #2680EB;
}
}
}
\ No newline at end of file
pages/produce/execute/index.vue 0 → 100644
View file @ cf9954dc
<style lang="less">
@import "./execute.less";
</style>
<template>
<div class="execute_box">
<div class="top_title">
<span class="fl">进度汇报</span>
<div>工单编号: 12001011</div>
</div>
<div class="star" v-if="!starmodal">
<a class="start" @click="starFun" >
<Icon type="md-play" />
开工</a>
</div>
<div class="star flex fc-b" v-else-if="starmodal">
<Button class="button" size='large' type="primary"><Icon type="ios-pause" /> 暂停</Button>
<Button class="button" size='large' type="primary"><Icon type="logo-angular" /> 交检</Button>
<Button class="button" size='large' type="primary"><Icon type="ios-checkmark-circle-outline" /> 完工</Button>
<Button class="button" size='large' type="primary"><Icon type="md-swap" /> 转序交接</Button>
</div>
<div class="footer_box">
<div class="ul_box fl">
<ul>
<li>名称：名称1</li>
<li>图号：UIGT-763245</li>
<li>状态：未开工</li>
<li>订单编号：097543346</li>
<li>订单属性1：</li>
<li>订单属性2：</li>
<li>订单属性3：</li>
<li>计划数量：10</li>
<li>节点日期：2020-02-25</li>
</ul>
</div>
<div class="ul_box fl">
<ul>
<li>工序名称：名称1</li>
<li>工序序号：UIGT-763245</li>
<li>派工数量：66</li>
<li>资源名称：23366</li>
<li>资源编号：986732038</li>
<li>人员信息：</li>
<li>开始时间：</li>
<li>结束时间：</li>
<li>单件工时：10</li>
<li>准备工时：2020-02-25</li>
</ul>
</div>
<div class="img_box fl">
图片区
</div>
</div>
<a class="gd_list" @click="orderlistMode = true">工单列表</a>
<a class="gn_area" @click="functionalMode = true">功能区</a>
<!-- 工单列表 -->
<Drawer placement="left" class="gd_box" :closable="false" v-model="orderlistMode">
<div slot="header">
<div class="header">
<span class="gd_tt">工单列表</span>
<a class="openAll"><Icon type="ios-list" size="18" /> 展开全部列表</a>
</div>
<div class="select_t">
<!-- <Icon type="md-arrow-dropright" /> -->
<Select v-model="odermodel" style="width:100px" @on-change="searchOrder">
<Option v-for="item in oderList" :value="item.value" :key="item.index">{{ item.label }}</Option>
</Select>
<Button class="fr">时间正序排列</Button>
</div>
</div>
<orderlist ref="orderlist"/>
</Drawer>
<!-- title="功能区" -->
<Drawer class="gn_box" :closable="false" v-model="functionalMode">
<functional ref="functional" />
</Drawer>
</div>
</template>
<script>
import functional from "./components/functional";
import orderlist from "./components/orderlist";
export default {
components: { functional, orderlist},
data(){
return{
starmodal: true,
orderlistMode:false,
functionalMode:false,
oderList:[
{
value: '全部',
label: '全部'
},{
value: '未开工',
label: '未开工'
},{
value: '执行中',
label: '执行中'
},{
value: '暂停中',
label: '暂停中'
},{
value: '交检中',
label: '交检中'
},{
value: '交接中',
label: '交接中'
},{
value: '已完成',
label: '已完成'
},
],
}
},
created() {
// this.treeHeight = window.innerHeight - 120;
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
},
methods: {
starFun(){
this.$Message.success("开工...")
},
searchOrder(value){
let allList = this.$refs.orderlist.listTask;
let newitems = [];
if(value=="全部"){
this.$refs.orderlist.loadTree();
}else{
allList.map((u,i)=>{
// console.log(i,":",u)
if(u.status==value){
newitems.push(u)
}
})
this.$refs.orderlist.listTasks = newitems
}
},
},
}
</script>
pages/technology/add.vue
View file @ cf9954dc
...@@ -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.productName;
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.vue
View file @ cf9954dc
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
<MenuItem name="2" :to="'/technology/details/routingqccard?id='+headerId">质控卡</MenuItem> <MenuItem name="2" :to="'/technology/details/routingqccard?id='+headerId">质控卡</MenuItem>
<MenuItem name="3" :to="'/technology/details/routingsupporting?id='+headerId">工艺BOM</MenuItem> <MenuItem name="3" :to="'/technology/details/routingsupporting?id='+headerId">工艺BOM</MenuItem>
<!-- <MenuItem name="4" to="/technology/details/setup/setupDetails">生产准备</MenuItem> --> <!-- <MenuItem name="4" to="/technology/details/setup/setupDetails">生产准备</MenuItem> -->
<MenuItem name="5" :to="'/technology/details/routinghcorder?id='+headerId">工艺更改单</MenuItem>
</Menu> </Menu>
</div> </div>
<div class="bottom_box"> <div class="bottom_box">
......
pages/technology/details/add.vue
View file @ cf9954dc
...@@ -84,13 +84,14 @@ ...@@ -84,13 +84,14 @@
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="8">
<FormItem :label="l('equipType')" prop="equipType"> <FormItem :label="l('equipType')" prop="equipTypeId">
<EquipSelect v-model="entity.equipType"></EquipSelect> <EquipSelect v-model="entity.equipTypeId" @on-change="equipChange"></EquipSelect>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="8">
<FormItem :label="l('resourceType')" prop="resourceType"> <FormItem :label="l('resourceType')" prop="resourceType">
<Dictionary code="Process.routing_detail.resource_type" v-model="entity.resourceType"></Dictionary> <!-- <Dictionary code="Process.routing_detail.resource_type" v-model="entity.resourceType"></Dictionary> -->
<ResourceSelect v-model="entity.resourceId" @on-change="resourceChange"></ResourceSelect>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="8">
...@@ -146,12 +147,12 @@ ...@@ -146,12 +147,12 @@
</Col> </Col>
<Col :span="8"> <Col :span="8">
<FormItem :label="l('efficiencyValue')" prop="efficiencyValue"> <FormItem :label="l('efficiencyValue')" prop="efficiencyValue">
<InputNumber v-model="entity.efficiencyValue" style="width:100%"></InputNumber> <InputNumber v-model="entity.efficiencyValue" style="width:100%"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="8">
<FormItem :label="l('singleOut')" prop="singleOut"> <FormItem :label="l('singleOut')" prop="singleOut">
<InputNumber v-model="entity.singleOut" style="width:100%"></InputNumber> <InputNumber v-model="entity.singleOut" style="width:100%"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="24"> <Col :span="24">
...@@ -181,7 +182,9 @@ export default { ...@@ -181,7 +182,9 @@ export default {
name: "", name: "",
taskSeq: null, taskSeq: null,
taskContent: "", taskContent: "",
resourceId: null,
resourceType: null, resourceType: null,
resourceCode: "",
runtime: 0, runtime: 0,
efficiencyValue: null, efficiencyValue: null,
singleOut: null, singleOut: null,
...@@ -204,7 +207,7 @@ export default { ...@@ -204,7 +207,7 @@ export default {
v: Object, v: Object,
eid: Number, eid: Number,
headid: Number, headid: Number,
maxNum:Number, maxNum: Number
}, },
mounted() { mounted() {
if (this.eid > 0) { if (this.eid > 0) {
...@@ -217,7 +220,7 @@ export default { ...@@ -217,7 +220,7 @@ export default {
if (v) { if (v) {
this.disabled = true; this.disabled = true;
this.entity.routingHeaderId = this.headid; this.entity.routingHeaderId = this.headid;
this.entity.taskSeq=this.maxNum this.entity.taskSeq = this.maxNum;
Api.create(this.entity) Api.create(this.entity)
.then(r => { .then(r => {
this.disabled = false; this.disabled = false;
...@@ -269,6 +272,15 @@ export default { ...@@ -269,6 +272,15 @@ export default {
l(key) { l(key) {
key = "routing_detail" + "." + key; key = "routing_detail" + "." + key;
return this.$t(key); return this.$t(key);
},
equipChange(v, items) {
this.entity.equipType = items.equip_name;
this.entity.equipTypeId = items.id;
},
resourceChange(v, items) {
this.entity.resourceId = v[1];
this.entity.resourceType =v[0];
this.entity.resourceCode = items[1].__label;
} }
}, },
watch: { watch: {
......
pages/technology/details/edit.vue
View file @ cf9954dc
...@@ -12,13 +12,13 @@ ...@@ -12,13 +12,13 @@
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="8">
<FormItem :label="l('equipType')" prop="equipType"> <FormItem :label="l('equipType')" prop="equipTypeId">
<EquipSelect v-model="entity.equipType"></EquipSelect> <EquipSelect v-model="entity.equipTypeId" @on-change="equipChange"></EquipSelect>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="8">
<FormItem :label="l('resourceType')" prop="resourceType"> <FormItem :label="l('resourceType')" prop="resourceType">
<Dictionary code="Process.routing_detail.resource_type" v-model="entity.resourceType"></Dictionary> <ResourceSelect v-model="entity.resourceId" @on-change="resourceChange"></ResourceSelect>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="8">
...@@ -121,12 +121,18 @@ export default { ...@@ -121,12 +121,18 @@ export default {
load(v) { load(v) {
Api.get({ id: v }).then(r => { Api.get({ id: v }).then(r => {
this.entity = r.result; this.entity = r.result;
this.entity.resourceId = [r.result.resourceType, r.result.resourceId];
}); });
}, },
handleSubmit() { handleSubmit() {
this.$refs.form.validate(v => { this.$refs.form.validate(v => {
if (v) { if (v) {
this.disabled = true; this.disabled = true;
if (this.entity.resourceId.length > 1) {
this.entity.resourceId = this.entity.resourceId[1];
} else {
this.entity.resourceId = null;
}
if (this.entity.isOutside != 1) { if (this.entity.isOutside != 1) {
this.entity.outsideTime = 0; this.entity.outsideTime = 0;
} }
...@@ -154,6 +160,15 @@ export default { ...@@ -154,6 +160,15 @@ export default {
l(key) { l(key) {
key = "routing_detail" + "." + key; key = "routing_detail" + "." + key;
return this.$t(key); return this.$t(key);
},
equipChange(v, items) {
this.entity.equipType = items.equip_name;
this.entity.equipTypeId = items.id;
},
resourceChange(v, items) {
this.entity.resourceType = items[0].value;
this.entity.resourceId = v;
this.entity.resourceCode = items[1].__label;
} }
}, },
watch: { watch: {
......
pages/technology/details/index.vue
View file @ cf9954dc
...@@ -91,10 +91,10 @@ export default { ...@@ -91,10 +91,10 @@ export default {
hide: true hide: true
}, },
{ {
key: "resourceType", key: "resourceCode",
title: this.l("resourceType"), title: this.l("resourceCode"),
align: "left", align: "left",
code: "Process.routing_detail.resource_type" easy: true,
}, },
{ {
key: "isImportantResources", key: "isImportantResources",
......
pages/technology/details/routingStep/add.vue
View file @ cf9954dc
...@@ -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 @ cf9954dc
...@@ -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 @ cf9954dc
...@@ -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 @ cf9954dc
...@@ -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/routinghcorder/add.vue 0 → 100644
View file @ cf9954dc
<template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row>
<Col :span="12">
<FormItem :label="l('routingHeaderId')" prop="routingHeaderId">
<InputNumber v-model="entity.routingHeaderId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('classId')" prop="classId">
<InputNumber v-model="entity.classId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('proposeUserId')" prop="proposeUserId">
<InputNumber v-model="entity.proposeUserId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('proposeUserName')" prop="proposeUserName">
<Input v-model="entity.proposeUserName"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('departmentId')" prop="departmentId">
<InputNumber v-model="entity.departmentId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('departmentName')" prop="departmentName">
<Input v-model="entity.departmentName"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('technicalName')" prop="technicalName">
<Input v-model="entity.technicalName"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('technicalCode')" prop="technicalCode">
<Input v-model="entity.technicalCode"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('changedVersion')" prop="changedVersion">
<Input v-model="entity.changedVersion"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('quantity')" prop="quantity">
<InputNumber v-model="entity.quantity"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('printData')" prop="printData">
<Input v-model="entity.printData"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('executiveBranch')" prop="executiveBranch">
<Input v-model="entity.executiveBranch"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('executiveBranchId')" prop="executiveBranchId">
<InputNumber v-model="entity.executiveBranchId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('handlingOpinionsId')" prop="handlingOpinionsId">
<InputNumber v-model="entity.handlingOpinionsId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('handlingOpinions')" prop="handlingOpinions">
<Input v-model="entity.handlingOpinions"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('beforeChangeContent')" prop="beforeChangeContent">
<Input v-model="entity.beforeChangeContent"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('afterChangeContent')" prop="afterChangeContent">
<Input v-model="entity.afterChangeContent"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('changeorderCode')" prop="changeorderCode">
<Input v-model="entity.changeorderCode"></Input>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('changeReason')" prop="changeReason">
<Input v-model="entity.changeReason" type="textarea" :rows="5"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('effectiveDate')" prop="effectiveDate">
<Input v-model="entity.effectiveDate"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('checkPerson')" prop="checkPerson">
<InputNumber v-model="entity.checkPerson"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('approvalPerson')" prop="approvalPerson">
<InputNumber v-model="entity.approvalPerson"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('status')" prop="status">
<InputNumber v-model="entity.status"></InputNumber>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('note')" prop="note">
<Input v-model="entity.note" type="textarea" :rows="5"></Input>
</FormItem>
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
</template>
<script>
import Api from "./api";
export default {
name: "Add",
data() {
return {
disabled: false,
entity: {
routingHeaderId: null,
classId: null,
proposeUserId: null,
proposeUserName: "",
departmentId: null,
departmentName: "",
technicalName: "",
technicalCode: "",
changedVersion: "",
quantity: null,
printData: "",
executiveBranch: "",
executiveBranchId: null,
handlingOpinionsId: null,
handlingOpinions: "",
beforeChangeContent: "",
afterChangeContent: "",
changeorderCode: "",
changeReason: "",
effectiveDate: "",
checkPerson: null,
approvalPerson: null,
status: null,
note: ""
},
rules: {
name: [{ required: true, message: "必填", trigger: "blur" }]
}
};
},
props: {
v: Object,
eid: Number
},
mounted() {
if (this.eid > 0) {
this.load(this.eid);
}
},
methods: {
handleSubmit() {
this.$refs.form.validate(v => {
if (v) {
this.disabled = true;
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("保存失败");
console.warn(err);
});
}
});
},
handleClose() {
this.$emit("on-close");
},
load(v) {
Api.get({ id: v }).then(r => {
this.entity = r.result;
this.entity.id = 0;
});
},
l(key) {
key = "routing_header_changeorder" + "." + key;
return this.$t(key);
}
},
watch: {
v() {
this.entity = this.$u.clone(this.v);
},
eid(v) {
if (v > 0) {
this.load(v);
}
}
}
};
</script>
pages/technology/details/routinghcorder/api.js 0 → 100644
View file @ cf9954dc
import Api from '@/plugins/request'
export default {
index: `${technologyUrl}routingheaderchangeorder/paged`,
paged(params) {
return Api.post(`${technologyUrl}routingheaderchangeorder/paged`, params);
},
get(params) {
return Api.get(`${technologyUrl}routingheaderchangeorder/get`, params);
},
create(params) {
return Api.post(`${technologyUrl}routingheaderchangeorder/create`, params);
},
update(params) {
return Api.post(`${technologyUrl}routingheaderchangeorder/update`, params);
},
delete(id) {
return Api.delete(`${technologyUrl}routingheaderchangeorder/delete`, {
params: {
id: id
}
});
},
deletes(params) {
return Api.post(`${technologyUrl}routingheaderchangeorder/batchdelete`, params);
}
}
pages/technology/details/routinghcorder/detail.vue 0 → 100644
View file @ cf9954dc
<template>
<div class="detail">
<Row>
<Filed :span="12" :name="l('routingHeaderId')">{{entity.routingHeaderId}}</Filed>
<Filed :span="12" :name="l('classId')">{{entity.classId}}</Filed>
<Filed :span="12" :name="l('proposeUserId')">{{entity.proposeUserId}}</Filed>
<Filed :span="12" :name="l('proposeUserName')">{{entity.proposeUserName}}</Filed>
<Filed :span="12" :name="l('departmentId')">{{entity.departmentId}}</Filed>
<Filed :span="12" :name="l('departmentName')">{{entity.departmentName}}</Filed>
<Filed :span="12" :name="l('technicalName')">{{entity.technicalName}}</Filed>
<Filed :span="12" :name="l('technicalCode')">{{entity.technicalCode}}</Filed>
<Filed :span="12" :name="l('changedVersion')">{{entity.changedVersion}}</Filed>
<Filed :span="12" :name="l('quantity')">{{entity.quantity}}</Filed>
<Filed :span="12" :name="l('printData')">{{entity.printData}}</Filed>
<Filed :span="12" :name="l('executiveBranch')">{{entity.executiveBranch}}</Filed>
<Filed :span="12" :name="l('executiveBranchId')">{{entity.executiveBranchId}}</Filed>
<Filed :span="12" :name="l('handlingOpinionsId')">{{entity.handlingOpinionsId}}</Filed>
<Filed :span="12" :name="l('handlingOpinions')">{{entity.handlingOpinions}}</Filed>
<Filed :span="12" :name="l('beforeChangeContent')">{{entity.beforeChangeContent}}</Filed>
<Filed :span="12" :name="l('afterChangeContent')">{{entity.afterChangeContent}}</Filed>
<Filed :span="12" :name="l('changeorderCode')">{{entity.changeorderCode}}</Filed>
<Filed :span="24" :name="l('changeReason')">{{entity.changeReason}}</Filed>
<Filed :span="12" :name="l('effectiveDate')">{{entity.effectiveDate}}</Filed>
<Filed :span="12" :name="l('checkPerson')">{{entity.checkPerson}}</Filed>
<Filed :span="12" :name="l('approvalPerson')">{{entity.approvalPerson}}</Filed>
<Filed :span="12" :name="l('status')">{{entity.status}}</Filed>
<Filed :span="24" :name="l('note')">{{entity.note}}</Filed>
</Row>
</div>
</template>
<script>
import Api from "./api";
export default {
name: "Add",
data() {
return {
entity: {},
rules: {
name: [{ required: true, message: "必填", trigger: "blur" }],
code: [{ required: true, message: "必填", trigger: "blur" }]
}
};
},
props: {
eid: Number
},
mounted() {
if (this.eid > 0) {
this.load(this.eid);
}
},
methods: {
load(v) {
Api.get({ id: v }).then(r => {
this.entity = r.result;
this.$emit("on-load");
});
},
handleClose() {
this.$emit("on-close");
},
l(key) {
key = "routing_header_changeorder" + "." + key;
return this.$t(key);
}
},
watch: {
eid(v) {
if (v > 0) {
this.load(v);
}
}
}
};
</script>
pages/technology/details/routinghcorder/edit.vue 0 → 100644
View file @ cf9954dc
<template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row>
<Col :span="12">
<FormItem :label="l('routingHeaderId')" prop="routingHeaderId">
<InputNumber v-model="entity.routingHeaderId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('classId')" prop="classId">
<InputNumber v-model="entity.classId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('proposeUserId')" prop="proposeUserId">
<InputNumber v-model="entity.proposeUserId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('proposeUserName')" prop="proposeUserName">
<Input v-model="entity.proposeUserName"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('departmentId')" prop="departmentId">
<InputNumber v-model="entity.departmentId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('departmentName')" prop="departmentName">
<Input v-model="entity.departmentName"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('technicalName')" prop="technicalName">
<Input v-model="entity.technicalName"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('technicalCode')" prop="technicalCode">
<Input v-model="entity.technicalCode"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('changedVersion')" prop="changedVersion">
<Input v-model="entity.changedVersion"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('quantity')" prop="quantity">
<InputNumber v-model="entity.quantity"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('printData')" prop="printData">
<Input v-model="entity.printData"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('executiveBranch')" prop="executiveBranch">
<Input v-model="entity.executiveBranch"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('executiveBranchId')" prop="executiveBranchId">
<InputNumber v-model="entity.executiveBranchId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('handlingOpinionsId')" prop="handlingOpinionsId">
<InputNumber v-model="entity.handlingOpinionsId"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('handlingOpinions')" prop="handlingOpinions">
<Input v-model="entity.handlingOpinions"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('beforeChangeContent')" prop="beforeChangeContent">
<Input v-model="entity.beforeChangeContent"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('afterChangeContent')" prop="afterChangeContent">
<Input v-model="entity.afterChangeContent"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('changeorderCode')" prop="changeorderCode">
<Input v-model="entity.changeorderCode"></Input>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('changeReason')" prop="changeReason">
<Input v-model="entity.changeReason" type="textarea" :rows="5"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('effectiveDate')" prop="effectiveDate">
<Input v-model="entity.effectiveDate"></Input>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('checkPerson')" prop="checkPerson">
<InputNumber v-model="entity.checkPerson"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('approvalPerson')" prop="approvalPerson">
<InputNumber v-model="entity.approvalPerson"></InputNumber>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('status')" prop="status">
<InputNumber v-model="entity.status"></InputNumber>
</FormItem>
</Col>
<Col :span="24">
<FormItem :label="l('note')" prop="note">
<Input v-model="entity.note" type="textarea" :rows="5"></Input>
</FormItem>
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
</template>
<script>
import Api from "./api";
export default {
name: "Edit",
data() {
return {
disabled: false,
entity: {},
rules: {
name: [{ required: true, message: "必填", trigger: "blur" }]
}
};
},
props: {
eid: Number
},
mounted() {
if (this.eid > 0) {
this.load(this.eid);
}
},
methods: {
load(v) {
Api.get({ id: v }).then(r => {
this.entity = r.result;
});
},
handleSubmit() {
this.$refs.form.validate(v => {
if (v) {
this.disabled = true;
Api.update(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("保存失败");
console.warn(err);
});
}
});
},
handleClose() {
this.$emit("on-close");
},
l(key) {
key = "routing_header_changeorder" + "." + key;
return this.$t(key);
}
},
watch: {
eid(v) {
if (v != 0) {
this.load(v);
}
}
}
};
</script>
pages/technology/details/routinghcorder/index.vue 0 → 100644
View file @ cf9954dc
<template>
<div>
<DataGrid :columns="columns" ref="grid" :action="action">
<template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys">
<Input placeholder="请输入关键字更改单编号" v-model="easySearch.keys.value" />
</FormItem>
<FormItem>
<Button type="primary" @click="search">查询</Button>
</FormItem>
</Form>
</template>
<template slot="searchForm">
<Search />
</template>
<template slot="buttons">
<Button type="primary" @click="add">新增</Button>
</template>
</DataGrid>
<Modal v-model="modal" :title="title" width="1200" footer-hide>
<component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" />
</Modal>
</div>
</template>
<script>
import Api from "./api";
import Search from "./search";
export default {
name: "list",
components: {
Search
},
head: {
title: "工艺变更单",
author: "henq",
description: "routing_header_changeorder 5/11/2020 9:39:04 AM"
},
data() {
return {
action: Api.index,
easySearch: {
keys: {
op: "changeorderCode,",
value: null
}
},
modal: false,
title: "新增",
detail: null,
curId: 0,
columns: [
{
key: "changeorderCode",
title: this.l("changeorderCode"),
align: "left",
high: true
},
{
key: "printData",
title: this.l("printData"),
align: "left",
high: true
},
{
key: "departmentName",
title: this.l("departmentName"),
align: "left",
easy: true,
high: true
},
{
key: "proposeUserId",
title: this.l("proposeUserName"),
align: "left",
high: true,
type: "user"
},
{
key: "technicalName",
title: this.l("technicalName"),
align: "left",
easy: true,
high: true
},
{
key: "technicalCode",
title: this.l("technicalCode"),
align: "left",
easy: true,
high: true
},
{
key: "checkPerson",
title: this.l("checkPerson"),
align: "left",
high: true
},
{
key: "quantity",
title: this.l("quantity"),
align: "left",
high: true
},
{ key: "status", title: this.l("status"), align: "left", high: true },
{
key: "creationTime",
title: this.l("creationTime"),
hide: true,
align: "left",
hide:true,
},
{
key: "creatorUserId",
title: this.l("creatorUserId"),
hide: true,
align: "left",
hide:true,
type:'user',
},
{
key: "lastModificationTime",
title: this.l("lastModificationTime"),
hide: true,
align: "left",
hide:true,
},
{
key: "lastModifierUserId",
title: this.l("lastModifierUserId"),
hide: true,
align: "left",
hide:true,
type:'user',
},
{
title: "操作",
key: "action",
width: 140,
align: "center",
render: (h, params) => {
return h("div", { class: "action" }, [
h(
"op",
{
attrs: { oprate: "detail" },
on: { click: () => this.view(params.row.id) }
},
"查看"
),
//h('op', { attrs: { oprate: 'copy' }, on: { click: () => this.copy(params.row.id) } }, '克隆'),
h(
"op",
{
attrs: { oprate: "edit" },
on: { click: () => this.edit(params.row.id) }
},
"编辑"
),
h(
"op",
{
attrs: { oprate: "delete" },
on: { click: () => this.remove(params.row.id) }
},
"删除"
)
]);
}
}
]
};
},
mounted() {
console.log(this);
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
methods: {
ok() {
this.$refs.grid.load();
this.modal = false;
this.curId = 0;
},
search() {
this.$refs.grid.reload(this.easySearch);
},
add() {
this.curId = 0;
this.title = "新增";
this.detail = () => import("./add");
this.modal = true;
},
copy(id) {
this.curId = id;
this.title = "克隆";
this.detail = () => import("./add");
this.modal = true;
},
view(id) {
this.curId = id;
this.title = "详情";
this.detail = () => import("./detail");
this.modal = true;
},
edit(id) {
this.curId = id;
this.title = "编辑";
this.detail = () => import("./edit");
this.modal = true;
},
remove(id) {
Api.delete(id).then(r => {
if (r.success) {
this.$refs.grid.load();
this.$Message.success("删除成功");
}
});
},
cancel() {
this.curId = 0;
this.modal = false;
},
l(key) {
let vkey = "routing_header_changeorder" + "." + key;
return this.$t(vkey) || key;
}
}
};
</script>
<style lang="less">
</style>
\ No newline at end of file
pages/technology/details/routinghcorder/search.vue 0 → 100644
View file @ cf9954dc
<template>
<Form ref="form" :model="condition" :label-width="110">
<Row>
<Col :span="12" v-if="condition.id.show">
<FormItem :label="l('id')" prop="id">
<Input v-model="condition.id.value"></Input>
</FormItem>
</Col>
<Col :span="12" v-if="condition.routingHeaderId.show">
<FormItem :label="l('routingHeaderId')" prop="routingHeaderId">
<Input v-model="condition.routingHeaderId.value"></Input>
</FormItem>
</Col>
<Col :span="12" v-if="condition.classId.show">
<FormItem :label="l('classId')" prop="classId">
<Input v-model="condition.classId.value"></Input>
</FormItem>
</Col>
<Col :span="12" v-if="condition.proposeUserId.show">
<FormItem :label="l('proposeUserId')" prop="proposeUserId">
<Input v-model="condition.proposeUserId.value"></Input>
</FormItem>
</Col>
<Col :span="12" v-if="condition.proposeUserName.show">
<FormItem :label="l('proposeUserName')" prop="proposeUserName">
<Input v-model="condition.proposeUserName.value"></Input>
</FormItem>
</Col>
<Col :span="12" v-if="condition.departmentId.show">
<FormItem :label="l('departmentId')" prop="departmentId">
<Input v-model="condition.departmentId.value"></Input>
</FormItem>
</Col>
<Col :span="12" v-if="condition.departmentName.show">
<FormItem :label="l('departmentName')" prop="departmentName">
<Input v-model="condition.departmentName.value"></Input>
</FormItem>
</Col>
<Col :span="12" v-if="condition.technicalName.show">
<FormItem :label="l('technicalName')" prop="technicalName">
<Input v-model="condition.technicalName.value"></Input>
</FormItem>
</Col>
<Col :span="12" v-if="condition.technicalCode.show">
<FormItem :label="l('technicalCode')" prop="technicalCode">
<Input v-model="condition.technicalCode.value"></Input>
</FormItem>
</Col>
<Col :span="12" v-if="condition.changedVersion.show">
<FormItem :label="l('changedVersion')" prop="changedVersion">
<Input v-model="condition.changedVersion.value"></Input>
</FormItem>
</Col>
<Col :span="12" v-if="condition.quantity.show">
<FormItem :label="l('quantity')" prop="quantity">
<Input v-model="condition.quantity.value"></Input>
</FormItem>
</Col>
<Col :span="12" v-if="condition.executiveBranch.show">
<FormItem :label="l('executiveBranch')" prop="executiveBranch">
<Input v-model="condition.executiveBranch.value"></Input>
</FormItem>
</Col>
<Col :span="12" v-if="condition.executiveBranchId.show">
<FormItem :label="l('executiveBranchId')" prop="executiveBranchId">
<Input v-model="condition.executiveBranchId.value"></Input>
</FormItem>
</Col>
<Col :span="12" v-if="condition.handlingOpinionsId.show">
<FormItem :label="l('handlingOpinionsId')" prop="handlingOpinionsId">
<Input v-model="condition.handlingOpinionsId.value"></Input>
</FormItem>
</Col>
<Col :span="12" v-if="condition.handlingOpinions.show">
<FormItem :label="l('handlingOpinions')" prop="handlingOpinions">
<Input v-model="condition.handlingOpinions.value"></Input>
</FormItem>
</Col>
<Col :span="24" v-if="condition.changeReason.show">
<FormItem :label="l('changeReason')" prop="changeReason">
<Input v-model="condition.changeReason.value"></Input>
</FormItem>
</Col>
<Col :span="12" v-if="condition.checkPerson.show">
<FormItem :label="l('checkPerson')" prop="checkPerson">
<Input v-model="condition.checkPerson.value"></Input>
</FormItem>
</Col>
<Col :span="12" v-if="condition.approvalPerson.show">
<FormItem :label="l('approvalPerson')" prop="approvalPerson">
<Input v-model="condition.approvalPerson.value"></Input>
</FormItem>
</Col>
<Col :span="12" v-if="condition.status.show">
<FormItem :label="l('status')" prop="status">
<Input v-model="condition.status.value"></Input>
</FormItem>
</Col>
<Col :span="24" v-if="condition.note.show">
<FormItem :label="l('note')" prop="note">
<Input v-model="condition.note.value"></Input>
</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">
<Input v-model="condition.creatorUserId.value"></Input>
</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">
<Input v-model="condition.lastModifierUserId.value"></Input>
</FormItem>
</Col>
</Row>
</Form>
</template>
<script>
import Api from "./api";
export default {
name: "Add",
data() {
return {
condition: {
id: { op: "Equal", value: null, show: false },
routingHeaderId: { op: "Equal", value: null, show: false },
classId: { op: "Equal", value: null, show: false },
proposeUserId: { op: "Equal", value: null, show: true },
proposeUserName: { op: "Equal", value: null, show: false },
departmentId: { op: "Equal", value: null, show: true },
departmentName: { op: "Equal", value: null, show: false },
technicalName: { op: "Equal", value: null, show: true },
technicalCode: { op: "Equal", value: null, show: true },
changedVersion: { op: "Equal", value: null, show: true },
quantity: { op: "Equal", value: null, show: true },
executiveBranch: { op: "Equal", value: null, show: false },
executiveBranchId: { op: "Equal", value: null, show: true },
handlingOpinionsId: { op: "Equal", value: null, show: true },
handlingOpinions: { op: "Equal", value: null, show: true },
changeReason: { op: "Equal", value: null, show: true },
checkPerson: { op: "Equal", value: null, show: true },
approvalPerson: { op: "Equal", value: null, show: true },
status: { op: "Equal", value: null, show: true },
note: { op: "Equal", value: null, show: true },
creationTime: { op: "Range", value: null, show: true },
creatorUserId: { op: "Equal", value: null, show: true },
lastModificationTime: { op: "Range", value: null, show: true },
lastModifierUserId: { op: "Equal", value: null, show: true },
}
};
},
methods: {
handleClose() {
this.$emit("on-close");
},
l(key) {
key = "routing_header_changeorder" + "." + key;
return this.$t(key);
}
}
};
</script>
pages/technology/details/routingqccard/index.vue
View file @ cf9954dc
...@@ -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"),
...@@ -150,13 +128,13 @@ export default { ...@@ -150,13 +128,13 @@ export default {
high: true, high: true,
hide: 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"),
......
pages/technology/details/routingqccard/search.vue
View file @ cf9954dc
...@@ -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 @ cf9954dc
...@@ -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 @ cf9954dc
...@@ -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 @ cf9954dc
...@@ -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 @ cf9954dc
...@@ -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 @ cf9954dc
...@@ -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.productName;
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 @ cf9954dc
...@@ -80,6 +80,10 @@ ...@@ -80,6 +80,10 @@
<Button type="primary" @click="passDocument">工艺规程送审</Button> <Button type="primary" @click="passDocument">工艺规程送审</Button>
</div> </div>
</Modal> </Modal>
<!-- 工艺更改弹框 -->
<routingchangeorder ref="routingchangeorder"></routingchangeorder>
<!-- 工艺更改表弹框 -->
<changelist ref="changelist"></changelist>
<div class="fullWindow flex fd" v-if="viewModal"> <div class="fullWindow flex fd" v-if="viewModal">
<div class="top flex"> <div class="top flex">
<div v-width="200"> <div v-width="200">
...@@ -93,7 +97,9 @@ ...@@ -93,7 +97,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')}}：
...@@ -110,11 +116,14 @@ ...@@ -110,11 +116,14 @@
<script> <script>
import Api from "./api"; import Api from "./api";
import service from '@/plugins/request'
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";
import routingchangeorder from '../processDesign/Process/routingchangeorder.vue'
import changelist from '../processDesign/Process/changelist.vue'
export default { export default {
components: { ProductTree, Search,sendAudit}, components: { ProductTree, Search, sendAudit,routingchangeorder,changelist },
head: { head: {
title: "工艺规程", title: "工艺规程",
author: "henq", author: "henq",
...@@ -138,16 +147,7 @@ export default { ...@@ -138,16 +147,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 +164,64 @@ export default { ...@@ -164,89 +164,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",
title: this.l("isEffect"),
align: "center",
width: 80,
high: true,
code: "Process.Status"
},
{ {
key: "versionnotes", key: "drawingNo",
title: this.l("versionnotes"), title: this.l("drawingNo"),
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 +249,7 @@ export default { ...@@ -274,7 +249,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" }, [
...@@ -318,15 +293,21 @@ export default { ...@@ -318,15 +293,21 @@ export default {
}, },
"删除" "删除"
), ),
h(
"op",
{
attrs: { oprate: "detail" },
// on: { click: () => this.TechnologyChange(params.row) }
},
"新增更改单"
),
h( h(
"op", "op",
{ {
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 ? "送审" : ""
? "送审"
: ""
) )
]); ]);
} }
...@@ -476,6 +457,51 @@ export default { ...@@ -476,6 +457,51 @@ export default {
} }
}); });
this.documentShow = false; this.documentShow = false;
},
//工艺更改
TechnologyChange(row) {
this.$refs.routingchangeorder.flag = 0
this.$refs.routingchangeorder.routing_header_Id = row.id
var userId =this.$store.state.userInfo.userId
let parma = {
Id: userId
}
this.$refs.routingchangeorder.changeorder_code = ''
this.$http.sysUser.getuserinfo(parma).then((res) => {
if (res.result) {
this.$refs.routingchangeorder.formValidate = {
technical_name: row.name,
technical_code: row.code,
department_name: res.result.departmentTitle,
propose_user_name: res.result.userName
}
}
})
var url1 = `${designUrl}/routingheader/GetCodeByType?code=JSWJGGD`
service.get(`${url1}`).then((response) => {
this.$refs.routingchangeorder.changeorder_code = response.result
})
this.$refs.routingchangeorder.modelChange = true
},
Main(data) {
// this.eid1 = ''
this.seleId = data.row.id
this.$refs.changelist.seleId = data.row.id
let url = `${designUrl}/routingheaderchangeorder/getpaged`
service
.get(`${url}`, { routing_header_id: this.seleId })
.then((res) => {
//console.log(res)
this.$refs.changelist.data2 = res.result.items
this.$refs.changelist.myloading = false
if (this.$refs.changelist.data2.length == 0) {
this.$Message.error('该工艺规程没有更改单！')
this.$refs.changelist.show3 = false
return
}
this.$refs.changelist.show3 = true
})
} }
} }
}; };
......
pages/technology/search.vue
View file @ cf9954dc
<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 },
} }
......
pages/test/resource.vue
View file @ cf9954dc
This diff is collapsed.
pages/test/user.vue
View file @ cf9954dc
<template> <template>
<div style="padding:50px;"> <div style="padding:50px;">
<UserSelect v-model="user" :multiple="true" theme="list"/> <UserSelect v-model="user" :multiple="true"/>
<!-- <DepartmentSelect v-model="dep" /> <!-- <DepartmentSelect v-model="dep" /> -->
<Button @click="setUser">Set</Button>{{dep}} --> <Button @click="setUser">Set</Button>
{{user}} {{user}}
</div> </div>
</template> </template>
...@@ -12,12 +12,12 @@ export default { ...@@ -12,12 +12,12 @@ export default {
data(){ data(){
return { return {
dep:39, dep:39,
user:[21,22,23] user:[128]
} }
}, },
methods:{ methods:{
setUser(){ setUser(){
this.user=[25] this.user=[128]
} }
} }
} }
......
plugins/iview.js
View file @ cf9954dc
This diff is collapsed.
static/config.js
View file @ cf9954dc
This diff is collapsed.
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