Skip to content

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

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

parents efb1b8f4 e7fcedd3
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1163 additions and 681 deletions
components/page/productNumberSelect.vue
View file @ 39caf2e1
...@@ -52,7 +52,7 @@ export default { ...@@ -52,7 +52,7 @@ export default {
} }
}, },
getCodes(e) { getCodes(e) {
let url = `${routeUrl}/orderproductcode/getbyorderid` let url = `${PlanUrl}/orderproductcode/getbyorderid`
if (this.eid) { if (this.eid) {
this.$api.get(url, { id: this.eid }).then((r) => { this.$api.get(url, { id: this.eid }).then((r) => {
if (r.success) { if (r.success) {
......
components/page/user.vue
View file @ 39caf2e1
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<Poptip placement="bottom-start" trigger="hover" width="240" transfer> <Poptip placement="bottom-start" trigger="hover" width="240" transfer>
<label :class="css">{{ user.name }}</label> <label :class="css">{{ user.name }}</label>
<div slot="content"> <div slot="content">
<Avatar v-if="user.face" size="large" :src="user.face"></Avatar> <Avatar v-if="user.face" size="large" :src="img"></Avatar>
<Avatar <Avatar
v-else v-else
size="large" size="large"
...@@ -44,7 +44,8 @@ export default { ...@@ -44,7 +44,8 @@ export default {
loginName: "", loginName: "",
id: 0 id: 0
}, },
css: "s0" css: "s0",
img:'',
}; };
}, },
...@@ -63,8 +64,8 @@ export default { ...@@ -63,8 +64,8 @@ export default {
} else if (this.user.status == 1) { } else if (this.user.status == 1) {
this.css = "s1"; this.css = "s1";
} }
if (this.user.face) { if(user.face){
this.user.face = fileUrlDown + this.user.face; this.img=fileUrlDown+user.face;
} }
} }
} }
......
i18n/locale/zh-CN.js
View file @ 39caf2e1
...@@ -1397,7 +1397,7 @@ export default { ...@@ -1397,7 +1397,7 @@ export default {
printData: '发行日期', printData: '发行日期',
executiveBranch: '执行部门', executiveBranch: '执行部门',
executiveBranchId: '执行部门Id', executiveBranchId: '执行部门Id',
handlingOpinionsId: '', handlingOpinionsId: '在制品处理意见Id',
handlingOpinions: '在制品处理意见', handlingOpinions: '在制品处理意见',
beforeChangeContent: '变更前内容描述（附图）', beforeChangeContent: '变更前内容描述（附图）',
afterChangeContent: '变更后内容描述（附图）', afterChangeContent: '变更后内容描述（附图）',
......
layouts/error.vue
View file @ 39caf2e1
...@@ -10,14 +10,14 @@ ...@@ -10,14 +10,14 @@
export default { export default {
props: ['error'], props: ['error'],
// layout: 'blog' // you can set a custom layout for the error page // layout: 'blog' // you can set a custom layout for the error page
// watch:{ watch:{
// error(v){ error(v){
// debugger; debugger;
// if(v.statusCode==404){ if(v.statusCode==404){
// this.$router.push("/error/404"); this.$router.push("/error/404");
// } }
// } }
// } }
} }
</script> </script>
\ No newline at end of file
pages/order/monitoring/api.js
View file @ 39caf2e1
import Api from '@/plugins/request' import Api from '@/plugins/request'
export default { export default {
index: `${routeUrl}/orderaudit/pagedmonitormesorders`, index: `${PlanUrl}/orderaudit/pagedmonitormesorders`,
record: `${routeUrl}/orderpause/paged`, record: `${PlanUrl}/orderpause/paged`,
paged(params) { paged(params) {
return Api.post(`${routeUrl}/orderaudit/pagedmonitormesorders`, params); return Api.post(`${PlanUrl}/orderaudit/pagedmonitormesorders`, params);
}, },
pagedRecord(params) { pagedRecord(params) {
return Api.post(`${routeUrl}/orderpause/paged`, params); return Api.post(`${PlanUrl}/orderpause/paged`, params);
}, },
start(params) { start(params) {
return Api.post(`${routeUrl}/orderpause/start`, params); return Api.post(`${PlanUrl}/orderpause/start`, params);
}, },
create(params) { create(params) {
return Api.post(`${routeUrl}/orderpause/create`, params); return Api.post(`${PlanUrl}/orderpause/create`, params);
}, },
get(params) { get(params) {
return Api.get(`${routeUrl}/orderpause/get`, params); return Api.get(`${PlanUrl}/orderpause/get`, params);
}, },
info(params) {//工单信息 info(params) {//工单信息
return Api.post(`${routeUrl}/dispatch/orderdispatchsummary`, params); return Api.post(`${PlanUrl}/dispatch/orderdispatchsummary`, params);
}, },
// getplantdepartments(params) {// 组织为”车间“的部门 // getplantdepartments(params) {// 组织为”车间“的部门
// return Api.get(`${systemUrl}/department/getplantdepartments`, params); // return Api.get(`${systemUrl}/department/getplantdepartments`, params);
......
pages/order/monitoring/speed.vue
View file @ 39caf2e1
...@@ -210,7 +210,7 @@ export default { ...@@ -210,7 +210,7 @@ export default {
"op", "op",
{ {
props: { oprate: "edit", title: "分卡" }, props: { oprate: "edit", title: "分卡" },
style: params.row.status == 5 ? "" : "display:none", // style: params.row.status == 5 ? "" : "display:none",
on: { click: () => this.split(params.row) } on: { click: () => this.split(params.row) }
}, },
"分卡" "分卡"
......
pages/produce/execute/execute.less
View file @ 39caf2e1
.execute_box{ .execute_box{
position: relative;
.top_title{ .top_title{
height: 50px; height: 50px;
line-height: 49px; line-height: 49px;
...@@ -29,7 +31,7 @@ ...@@ -29,7 +31,7 @@
} }
.gd_list{ .gd_list{
position: absolute; position: absolute;
top: 45%; top: 40%;
left: 0px; left: 0px;
background: #2680EB; background: #2680EB;
color: #fff; color: #fff;
...@@ -40,7 +42,7 @@ ...@@ -40,7 +42,7 @@
} }
.gn_area{ .gn_area{
position: absolute; position: absolute;
top: 45%; top: 40%;
right: 0px; right: 0px;
background: #515A6E; background: #515A6E;
color: #fff; color: #fff;
...@@ -79,6 +81,7 @@ ...@@ -79,6 +81,7 @@
.ivu-drawer-left{ .ivu-drawer-left{
width: 370px!important; width: 370px!important;
.ivu-drawer-content{ .ivu-drawer-content{
height: 100vh;
.ivu-drawer-header{ .ivu-drawer-header{
border: none; border: none;
.header { .header {
...@@ -96,6 +99,7 @@ ...@@ -96,6 +99,7 @@
} }
.ivu-drawer-body { .ivu-drawer-body {
padding: 0; padding: 0;
height: calc(100% - 210px);
// .order_title { // .order_title {
// border-bottom: 1px solid #ccc; // border-bottom: 1px solid #ccc;
// height: 50px; // height: 50px;
...@@ -110,7 +114,7 @@ ...@@ -110,7 +114,7 @@
padding: 15px 20px; padding: 15px 20px;
} }
.card_box{ .card_box{
padding: 0 15px 60px; padding: 0 15px;
.card_order{ .card_order{
margin: 15px 0; margin: 15px 0;
border-left: 4px solid #ccc; border-left: 4px solid #ccc;
...@@ -147,8 +151,9 @@ ...@@ -147,8 +151,9 @@
width: 180px!important; width: 180px!important;
.ivu-drawer-content{ .ivu-drawer-content{
background: #515A6E; background: #515A6E;
height: 100vh;
.ivu-drawer-body { .ivu-drawer-body {
padding: 13vh 0; padding: 9vh 0;
} }
li{ li{
line-height: 66px; line-height: 66px;
......
pages/produce/execute/index.vue
View file @ 39caf2e1
...@@ -53,14 +53,14 @@ ...@@ -53,14 +53,14 @@
<a class="gd_list" @click="orderlistMode = true">工单列表</a> <a class="gd_list" @click="orderlistMode = true">工单列表</a>
<a class="gn_area" @click="functionalMode = true">功能区</a> <a class="gn_area" @click="functionalMode = true">功能区</a>
<!-- 工单列表 --> <!-- 工单列表 -->
<Drawer placement="left" class="gd_box" :closable="false" v-model="orderlistMode"> <Drawer placement="left" class="gd_box" :closable="false"
:inner="true" :transfer="false" v-model="orderlistMode">
<div slot="header"> <div slot="header">
<div class="header"> <div class="header">
<span class="gd_tt">工单列表</span> <span class="gd_tt">工单列表</span>
<a class="openAll"><Icon type="ios-list" size="18" /> 展开全部列表</a> <a class="openAll"><Icon type="ios-list" size="18" /> 展开全部列表</a>
</div> </div>
<div class="select_t"> <div class="select_t">
<!-- <Icon type="md-arrow-dropright" /> -->
<Select v-model="odermodel" style="width:100px" @on-change="searchOrder"> <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> <Option v-for="item in oderList" :value="item.value" :key="item.index">{{ item.label }}</Option>
</Select> </Select>
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
<orderlist ref="orderlist"/> <orderlist ref="orderlist"/>
</Drawer> </Drawer>
<!-- title="功能区" --> <!-- title="功能区" -->
<Drawer class="gn_box" :closable="false" v-model="functionalMode"> <Drawer class="gn_box" :closable="false" :inner="true" :transfer="false" v-model="functionalMode">
<functional ref="functional" /> <functional ref="functional" />
</Drawer> </Drawer>
</div> </div>
...@@ -85,6 +85,7 @@ export default { ...@@ -85,6 +85,7 @@ export default {
starmodal: true, starmodal: true,
orderlistMode:false, orderlistMode:false,
functionalMode:false, functionalMode:false,
odermodel:'全部',
oderList:[ oderList:[
{ {
value: '全部', value: '全部',
......
pages/qc/certificate/api.js
View file @ 39caf2e1
import Api from '@/plugins/request' import Api from '@/plugins/request'
export default { export default {
index: `${routeUrl}/mesorder/pagedcompletedorders1`, index: `${PlanUrl}/mesorder/pagedcompletedorders1`,
paged(params) { paged(params) {
return Api.post(`${routeUrl}/mesorder/pagedcompletedorders1`, params); //已开具和未开具列表 return Api.post(`${PlanUrl}/mesorder/pagedcompletedorders1`, params); //已开具和未开具列表
}, },
ordercertificate(params) { ordercertificate(params) {
return Api.post(`${certificateUrl}/productcertificate/ordercertificatesummary`, params); //查看所有合格证列表 return Api.post(`${certificateUrl}/productcertificate/ordercertificatesummary`, params); //查看所有合格证列表
...@@ -11,7 +11,7 @@ export default { ...@@ -11,7 +11,7 @@ export default {
return Api.post(`${certificateUrl}/productcertificate/createcertianditems`, params); //产品合格证保存 return Api.post(`${certificateUrl}/productcertificate/createcertianditems`, params); //产品合格证保存
}, },
get(params) { get(params) {
return Api.get(`${routeUrl}/orderproductcode/getbyorderid`, params); //根据订单id返回产品编号 return Api.get(`${PlanUrl}/orderproductcode/getbyorderid`, params); //根据订单id返回产品编号
}, },
getCertificate(params) { getCertificate(params) {
return Api.get(`${certificateUrl}/productcertificate/certificate`, params); //单个合格证详情 return Api.get(`${certificateUrl}/productcertificate/certificate`, params); //单个合格证详情
......
pages/technology/details/add.vue
View file @ 39caf2e1
...@@ -249,25 +249,24 @@ export default { ...@@ -249,25 +249,24 @@ export default {
}); });
}, },
handleImg(e) { handleImg(e) {
console.warn(e); let file = null
// let file = null if (
// if ( e.clipboardData &&
// e.clipboardData && e.clipboardData.items[0] &&
// e.clipboardData.items[0] && e.clipboardData.items[0].type &&
// e.clipboardData.items[0].type && e.clipboardData.items[0].type.indexOf('image') > -1
// e.clipboardData.items[0].type.indexOf('image') > -1 ) {
// ) { //这里就是判断是否有粘贴进来的文件且文件为图片格式
// //这里就是判断是否有粘贴进来的文件且文件为图片格式 file = e.clipboardData.items[0].getAsFile()
// file = e.clipboardData.items[0].getAsFile() let reader = new FileReader()
// let reader = new FileReader() reader.readAsDataURL(file)
// reader.readAsDataURL(file) setTimeout(() => {
// setTimeout(() => { var img = '<img src="' + reader.result + '" alt=""/>'
// var img = '<img src="' + reader.result + '" alt=""/>' this.entity.taskContent += img
// this.bugForm.content += img }, 1000)
// }, 1000)
// // new R // new R
// } }
}, },
l(key) { l(key) {
key = "routing_detail" + "." + key; key = "routing_detail" + "." + key;
......
pages/technology/details/edit.vue
View file @ 39caf2e1
...@@ -157,6 +157,26 @@ export default { ...@@ -157,6 +157,26 @@ export default {
handleClose() { handleClose() {
this.$emit("on-close"); this.$emit("on-close");
}, },
handleImg(e) {
let file = null
if (
e.clipboardData &&
e.clipboardData.items[0] &&
e.clipboardData.items[0].type &&
e.clipboardData.items[0].type.indexOf('image') > -1
) {
//这里就是判断是否有粘贴进来的文件且文件为图片格式
file = e.clipboardData.items[0].getAsFile()
let reader = new FileReader()
reader.readAsDataURL(file)
setTimeout(() => {
var img = '<img src="' + reader.result + '" alt=""/>'
this.entity.taskContent += img
}, 1000)
// new R
}
},
l(key) { l(key) {
key = "routing_detail" + "." + key; key = "routing_detail" + "." + key;
return this.$t(key); return this.$t(key);
......
pages/technology/details/routingStep/add.vue
View file @ 39caf2e1
...@@ -166,25 +166,24 @@ export default { ...@@ -166,25 +166,24 @@ export default {
}); });
}, },
handleImg(e) { handleImg(e) {
console.warn(e) let file = null
// let file = null if (
// if ( e.clipboardData &&
// e.clipboardData && e.clipboardData.items[0] &&
// e.clipboardData.items[0] && e.clipboardData.items[0].type &&
// e.clipboardData.items[0].type && e.clipboardData.items[0].type.indexOf('image') > -1
// e.clipboardData.items[0].type.indexOf('image') > -1 ) {
// ) { //这里就是判断是否有粘贴进来的文件且文件为图片格式
// //这里就是判断是否有粘贴进来的文件且文件为图片格式 file = e.clipboardData.items[0].getAsFile()
// file = e.clipboardData.items[0].getAsFile() let reader = new FileReader()
// let reader = new FileReader() reader.readAsDataURL(file)
// reader.readAsDataURL(file) setTimeout(() => {
// setTimeout(() => { var img = '<img src="' + reader.result + '" alt=""/>'
// var img = '<img src="' + reader.result + '" alt=""/>' this.entity.stepContent += img
// this.bugForm.content += img }, 1000)
// }, 1000)
// // new R // new R
// } }
}, },
handleClose() { handleClose() {
this.$emit("on-close"); this.$emit("on-close");
......
pages/technology/details/routingStep/edit.vue
View file @ 39caf2e1
...@@ -162,25 +162,24 @@ export default { ...@@ -162,25 +162,24 @@ export default {
}); });
}, },
handleImg(e) { handleImg(e) {
console.warn(e) let file = null
// let file = null if (
// if ( e.clipboardData &&
// e.clipboardData && e.clipboardData.items[0] &&
// e.clipboardData.items[0] && e.clipboardData.items[0].type &&
// e.clipboardData.items[0].type && e.clipboardData.items[0].type.indexOf('image') > -1
// e.clipboardData.items[0].type.indexOf('image') > -1 ) {
// ) { //这里就是判断是否有粘贴进来的文件且文件为图片格式
// //这里就是判断是否有粘贴进来的文件且文件为图片格式 file = e.clipboardData.items[0].getAsFile()
// file = e.clipboardData.items[0].getAsFile() let reader = new FileReader()
// let reader = new FileReader() reader.readAsDataURL(file)
// reader.readAsDataURL(file) setTimeout(() => {
// setTimeout(() => { var img = '<img src="' + reader.result + '" alt=""/>'
// var img = '<img src="' + reader.result + '" alt=""/>' this.entity.stepContent += img
// this.bugForm.content += img }, 1000)
// }, 1000)
// // new R // new R
// } }
}, },
handleClose() { handleClose() {
this.$emit("on-close"); this.$emit("on-close");
......
pages/technology/details/routinghcorder/api.js
View file @ 39caf2e1
...@@ -4,6 +4,12 @@ export default { ...@@ -4,6 +4,12 @@ export default {
paged(params) { paged(params) {
return Api.post(`${technologyUrl}routingheaderchangeorder/paged`, params); return Api.post(`${technologyUrl}routingheaderchangeorder/paged`, params);
}, },
getpaged1(params) {//获取审批流程
return Api.get(`${designUrl}/routingheaderchangeorder/getpaged1`, params);
},
GetCodeByType(params) {//获取工艺更改单号
return Api.get(`${designUrl}/routingheader/GetCodeByType`, params);
},
get(params) { get(params) {
return Api.get(`${technologyUrl}routingheaderchangeorder/get`, params); return Api.get(`${technologyUrl}routingheaderchangeorder/get`, params);
}, },
......
pages/technology/details/routinghcorder/changeInfos.vue 0 → 100644
View file @ 39caf2e1
<template>
<div class="detail">
<Row>
<Filed span="12" :name="'工艺更改单'">{{info.changeInfo.changeorder_code}}</Filed>
<Filed span="12" :name="'提出人'">{{info.changeInfo.propose_user_name}}</Filed>
<Filed span="12" :name="'申请部门'">{{info.changeInfo.department_name}}</Filed>
<Filed span="12" :name="'技术文件名称'">{{info.changeInfo.technical_name}}</Filed>
<Filed span="12" :name="'技术文件编号'">{{info.changeInfo.technical_code}}</Filed>
<Filed span="12" :name="'执行部门'">{{info.changeInfo.executive_branch}}</Filed>
<Filed span="12" :name="'数量'">{{info.changeInfo.quantity}}</Filed>
<Filed span="12" :name="'发行日期'">{{info.changeInfo.print_data}}</Filed>
<Filed span="12" :name="'更改原因'">{{info.changeInfo.change_reason}}</Filed>
<Filed span="12" :name="'有效日期'">{{info.changeInfo.effective_date}}</Filed>
<Filed span="12" :name="'更改后版本号'">
<state
code="Process.Routing.version"
:value="info.changeInfo.changed_version+''"
type="text"
></state>
</Filed>
<Filed span="12" :name="'在制品意见'">
<state
code="Process.Routing.opinion"
:value="info.changeInfo.handling_opinions+''"
type="text"
></state>
</Filed>
</Row>
</div>
</template>
<script>
export default {
name: "changeInfos",
props: {
info:Object,
default:{},
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
data() {
return {};
},
methods: {
l(key) {
key = "orderInfo" + "." + key;
return this.$t(key);
}
}
};
</script>
<style lang="less">
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
margin: 0 0 -1px 0;
line-height: 30px;
box-sizing: border-box;
.label {
background: #e8eaf1;
display: inline-block;
width: 120px;
text-align: right;
padding: 0 5px;
}
}
}
}
</style>
\ No newline at end of file
pages/technology/details/routinghcorder/changeSendReview.vue 0 → 100644
View file @ 39caf2e1
<template>
<Modal
v-model="modalInfo"
title="工艺更改单送审"
width="800"
:mask-closable="false"
:scrollable="true"
fullscreen
>
<div style="width:80%;margin:0 auto">
<changeInfos v-if="info.status" :info="info"></changeInfos>
<Process ref="userProcess" schemaIdVal="d0cdafe3-2341-4499-a4f5-278ef0f30740" />
</div>
<div slot="footer">
<Button @click="modalInfo = false">取消</Button>
<Button type="primary" @click="upSave">确定送审</Button>
</div>
<Modal
v-model="modalchangeInfo"
title="送审提示"
width="800"
:mask-closable="false"
:scrollable="true"
>
<h2 class="center">确定送审该工艺更改单吗？</h2>
<div slot="footer">
<Button @click="modalchangeInfo = false">取消</Button>
<Button type="primary" @click="upSave1">确定</Button>
</div>
</Modal>
</Modal>
</template>
<script>
import changeInfos from "./changeInfos.vue";
import Process from "@/components/orderOperator/process";
import Api from "./api";
export default {
name: "changeSendReview",
components: {
changeInfos,
Process
},
data() {
return {
modalchangeInfo: false,
modalInfo: false,
data3: [],
userlist: [],
changeorder_code: "",
loading: false,
info: {
status: true,
changeInfo: []
},
dataListRetrunNew: {
schemaId: "d0cdafe3-2341-4499-a4f5-278ef0f30740", //schemaId
idList: [], //id List
codeList: [], //编号List
operatorIdList: [] //操作员id
},
operatorIdList: [] //操作员id
};
},
created() {},
mounted() {},
methods: {
upSave() {
this.modalchangeInfo = true;
},
upSave1() {
let parmas = {
changeorder_code: this.changeorder_code,
pageindex: 1,
pageSize: 10
};
Api.getpaged1(parmas).then(res => {
this.data3 = res.result.items;
let operatorIdList = this.returnDataList();
let itemCode = this.changeorder_code;
this.dataListRetrunNew.idList = [];
this.dataListRetrunNew.codeList = [];
this.dataListRetrunNew.idList.push(this.data3[0].id);
this.dataListRetrunNew.codeList.push(itemCode);
this.dataListRetrunNew.operatorIdList = operatorIdList;
this.$http.order.batchstart(this.dataListRetrunNew).then(response => {
if (response.success) {
this.$Message.info("工艺更改单送审成功!");
} else {
this.$Message.error("送审失败!");
}
this.modalInfo = false;
this.modalchangeInfo = false;
});
});
},
returnDataList() {
let ues = this.$refs.userProcess;
this.operatorIdList = ues.immutData;
return this.operatorIdList;
}
}
};
</script>
pages/technology/details/routinghcorder/edit.vue
View file @ 39caf2e1
...@@ -180,6 +180,27 @@ export default { ...@@ -180,6 +180,27 @@ export default {
handleClose() { handleClose() {
this.$emit("on-close"); this.$emit("on-close");
}, },
handleImg(e) {
console.warn(e);
// let file = null
// if (
// e.clipboardData &&
// e.clipboardData.items[0] &&
// e.clipboardData.items[0].type &&
// e.clipboardData.items[0].type.indexOf('image') > -1
// ) {
// //这里就是判断是否有粘贴进来的文件且文件为图片格式
// file = e.clipboardData.items[0].getAsFile()
// let reader = new FileReader()
// reader.readAsDataURL(file)
// setTimeout(() => {
// var img = '<img src="' + reader.result + '" alt=""/>'
// this.bugForm.content += img
// }, 1000)
// // new R
// }
},
l(key) { l(key) {
key = "routing_header_changeorder" + "." + key; key = "routing_header_changeorder" + "." + key;
return this.$t(key); return this.$t(key);
......
pages/technology/details/routinghcorder/index.vue
View file @ 39caf2e1
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<Button type="primary" @click="add">新增</Button> <Button type="primary" @click="add">新增</Button>
</template> </template>
</DataGrid> </DataGrid>
<Modal v-model="modal" :title="title" width="1200" footer-hide> <Modal v-model="modal" :title="title" width="1200" footer-hide scrollable>
<component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" /> <component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" />
</Modal> </Modal>
</div> </div>
...@@ -74,7 +74,8 @@ export default { ...@@ -74,7 +74,8 @@ export default {
title: this.l("proposeUserName"), title: this.l("proposeUserName"),
align: "left", align: "left",
high: true, high: true,
type: "user" type: "user",
width: 140,
}, },
{ {
key: "technicalName", key: "technicalName",
...@@ -90,54 +91,63 @@ export default { ...@@ -90,54 +91,63 @@ export default {
easy: true, easy: true,
high: true high: true
}, },
{ // {
key: "checkPerson", // key: "checkPerson",
title: this.l("checkPerson"), // title: this.l("checkPerson"),
align: "left", // align: "left",
high: true // high: true,
}, // type:'user'
// },
{ {
key: "quantity", key: "quantity",
title: this.l("quantity"), title: this.l("quantity"),
align: "left", align: "right",
high: true high: true,
width: 100,
},
{
key: "status",
title: this.l("status"),
align: "center",
high: true,
width: 100,
code: "unProduct.repairstatus"
}, },
{ key: "status", title: this.l("status"), align: "left", high: true },
{ {
key: "creationTime", key: "creationTime",
title: this.l("creationTime"), title: this.l("creationTime"),
hide: true, hide: true,
align: "left", align: "left",
hide:true, hide: true
}, },
{ {
key: "creatorUserId", key: "creatorUserId",
title: this.l("creatorUserId"), title: this.l("creatorUserId"),
hide: true, hide: true,
align: "left", align: "left",
hide:true, hide: true,
type:'user', type: "user"
}, },
{ {
key: "lastModificationTime", key: "lastModificationTime",
title: this.l("lastModificationTime"), title: this.l("lastModificationTime"),
hide: true, hide: true,
align: "left", align: "left",
hide:true, hide: true
}, },
{ {
key: "lastModifierUserId", key: "lastModifierUserId",
title: this.l("lastModifierUserId"), title: this.l("lastModifierUserId"),
hide: true, hide: true,
align: "left", align: "left",
hide:true, hide: true,
type:'user', type: "user"
}, },
{ {
title: "操作", title: "操作",
key: "action", key: "action",
width: 140, width: 120,
align: "center", align: "left",
render: (h, params) => { render: (h, params) => {
return h("div", { class: "action" }, [ return h("div", { class: "action" }, [
h( h(
...@@ -155,7 +165,7 @@ export default { ...@@ -155,7 +165,7 @@ export default {
attrs: { oprate: "edit" }, attrs: { oprate: "edit" },
on: { click: () => this.edit(params.row.id) } on: { click: () => this.edit(params.row.id) }
}, },
"编辑" params.row.status==1?"编辑":''
), ),
h( h(
"op", "op",
...@@ -163,7 +173,7 @@ export default { ...@@ -163,7 +173,7 @@ export default {
attrs: { oprate: "delete" }, attrs: { oprate: "delete" },
on: { click: () => this.remove(params.row.id) } on: { click: () => this.remove(params.row.id) }
}, },
"删除" params.row.status==1?"删除":""
) )
]); ]);
} }
......
pages/technology/details/routinghcorder/search.vue
View file @ 39caf2e1
<template> <template>
<Form ref="form" :model="condition" :label-width="110"> <Form ref="form" :model="condition" :label-width="120">
<Row> <Row>
<Col :span="12" v-if="condition.id.show"> <Col :span="12" v-if="condition.id.show">
<FormItem :label="l('id')" prop="id"> <FormItem :label="l('id')" prop="id">
...@@ -11,24 +11,26 @@ ...@@ -11,24 +11,26 @@
<Input v-model="condition.routingHeaderId.value"></Input> <Input v-model="condition.routingHeaderId.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.classId.show"> <Col :span="12" v-if="condition.changeorderCode.show">
<FormItem :label="l('classId')" prop="classId"> <FormItem :label="l('changeorderCode')" prop="changeorderCode">
<Input v-model="condition.classId.value"></Input> <Input v-model="condition.changeorderCode.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.proposeUserId.show"> <Col :span="12" v-if="condition.printData.show">
<FormItem :label="l('proposeUserId')" prop="proposeUserId"> <FormItem :label="l('printData')" prop="printData">
<Input v-model="condition.proposeUserId.value"></Input> <DatePicker type="daterange" v-model="condition.printData.value" style="width:100%"></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.proposeUserName.show">
<FormItem :label="l('proposeUserName')" prop="proposeUserName"> <Col :span="12" v-if="condition.classId.show">
<Input v-model="condition.proposeUserName.value"></Input> <FormItem :label="l('classId')" prop="classId">
<Input v-model="condition.classId.value"></Input>
</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">
<Input v-model="condition.departmentId.value"></Input> <departmentSelect v-model="condition.departmentId.value"></departmentSelect>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.departmentName.show"> <Col :span="12" v-if="condition.departmentName.show">
...@@ -36,6 +38,16 @@ ...@@ -36,6 +38,16 @@
<Input v-model="condition.departmentName.value"></Input> <Input v-model="condition.departmentName.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.proposeUserId.show">
<FormItem :label="l('proposeUserName')" prop="proposeUserId">
<UserSelect v-model="condition.proposeUserId.value"></UserSelect>
</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.technicalName.show"> <Col :span="12" v-if="condition.technicalName.show">
<FormItem :label="l('technicalName')" prop="technicalName"> <FormItem :label="l('technicalName')" prop="technicalName">
<Input v-model="condition.technicalName.value"></Input> <Input v-model="condition.technicalName.value"></Input>
...@@ -48,7 +60,11 @@ ...@@ -48,7 +60,11 @@
</Col> </Col>
<Col :span="12" v-if="condition.changedVersion.show"> <Col :span="12" v-if="condition.changedVersion.show">
<FormItem :label="l('changedVersion')" prop="changedVersion"> <FormItem :label="l('changedVersion')" prop="changedVersion">
<Input v-model="condition.changedVersion.value"></Input> <dictionary
code="Process.Routing.version"
v-model="condition.changedVersion.value"
style="width:100%"
></dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.quantity.show"> <Col :span="12" v-if="condition.quantity.show">
...@@ -62,13 +78,13 @@ ...@@ -62,13 +78,13 @@
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.executiveBranchId.show"> <Col :span="12" v-if="condition.executiveBranchId.show">
<FormItem :label="l('executiveBranchId')" prop="executiveBranchId"> <FormItem :label="l('executiveBranch')" prop="executiveBranchId">
<Input v-model="condition.executiveBranchId.value"></Input> <departmentSelect v-model="condition.executiveBranchId.value"></departmentSelect>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.handlingOpinionsId.show"> <Col :span="12" v-if="condition.handlingOpinionsId.show">
<FormItem :label="l('handlingOpinionsId')" prop="handlingOpinionsId"> <FormItem :label="l('handlingOpinions')" prop="handlingOpinionsId">
<Input v-model="condition.handlingOpinionsId.value"></Input> <Dictionary code="Process.Routing.opinion" v-model="condition.handlingOpinionsId.value" ></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.handlingOpinions.show"> <Col :span="12" v-if="condition.handlingOpinions.show">
...@@ -83,12 +99,12 @@ ...@@ -83,12 +99,12 @@
</Col> </Col>
<Col :span="12" v-if="condition.checkPerson.show"> <Col :span="12" v-if="condition.checkPerson.show">
<FormItem :label="l('checkPerson')" prop="checkPerson"> <FormItem :label="l('checkPerson')" prop="checkPerson">
<Input v-model="condition.checkPerson.value"></Input> <UserSelect v-model="condition.checkPerson.value"></UserSelect>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.approvalPerson.show"> <Col :span="12" v-if="condition.approvalPerson.show">
<FormItem :label="l('approvalPerson')" prop="approvalPerson"> <FormItem :label="l('approvalPerson')" prop="approvalPerson">
<Input v-model="condition.approvalPerson.value"></Input> <UserSelect v-model="condition.approvalPerson.value"></UserSelect>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.status.show"> <Col :span="12" v-if="condition.status.show">
...@@ -96,29 +112,26 @@ ...@@ -96,29 +112,26 @@
<Input v-model="condition.status.value"></Input> <Input v-model="condition.status.value"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="24" v-if="condition.note.show"> </Row>
<FormItem :label="l('note')" prop="note"> <Row>
<Input v-model="condition.note.value"></Input> <Col :span="12" v-if="condition.creatorUserId.show">
<FormItem :label="$t('creatorUserId')" prop="creatorUserId">
<UserSelect v-model="condition.creatorUserId.value"></UserSelect>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.creationTime.show"> <Col :span="12" v-if="condition.creationTime.show">
<FormItem :label="$t('creationTime')" prop="creationTime"> <FormItem :label="$t('creationTime')" prop="creationTime">
<DatePicker type="daterange" v-model="condition.creationTime.value"></DatePicker> <DatePicker type="daterange" v-model="condition.creationTime.value" style="width:100%"></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.creatorUserId.show"> <Col :span="12" v-if="condition.lastModifierUserId.show">
<FormItem :label="$t('creatorUserId')" prop="creatorUserId"> <FormItem :label="$t('lastModifierUserId')" prop="lastModifierUserId">
<Input v-model="condition.creatorUserId.value"></Input> <UserSelect v-model="condition.lastModifierUserId.value"></UserSelect>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12" v-if="condition.lastModificationTime.show"> <Col :span="12" v-if="condition.lastModificationTime.show">
<FormItem :label="$t('lastModificationTime')" prop="lastModificationTime"> <FormItem :label="$t('lastModificationTime')" prop="lastModificationTime">
<DatePicker type="daterange" v-model="condition.lastModificationTime.value"></DatePicker> <DatePicker type="daterange" v-model="condition.lastModificationTime.value" style="width:100%"></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> </FormItem>
</Col> </Col>
</Row> </Row>
...@@ -134,7 +147,6 @@ export default { ...@@ -134,7 +147,6 @@ export default {
id: { op: "Equal", value: null, show: false }, id: { op: "Equal", value: null, show: false },
routingHeaderId: { op: "Equal", value: null, show: false }, routingHeaderId: { op: "Equal", value: null, show: false },
classId: { op: "Equal", value: null, show: false }, classId: { op: "Equal", value: null, show: false },
proposeUserId: { op: "Equal", value: null, show: true }, proposeUserId: { op: "Equal", value: null, show: true },
proposeUserName: { op: "Equal", value: null, show: false }, proposeUserName: { op: "Equal", value: null, show: false },
departmentId: { op: "Equal", value: null, show: true }, departmentId: { op: "Equal", value: null, show: true },
...@@ -146,18 +158,19 @@ export default { ...@@ -146,18 +158,19 @@ export default {
executiveBranch: { op: "Equal", value: null, show: false }, executiveBranch: { op: "Equal", value: null, show: false },
executiveBranchId: { op: "Equal", value: null, show: true }, executiveBranchId: { op: "Equal", value: null, show: true },
handlingOpinionsId: { op: "Equal", value: null, show: true }, handlingOpinionsId: { op: "Equal", value: null, show: true },
handlingOpinions: { op: "Equal", value: null, show: true }, handlingOpinions: { op: "Equal", value: null, show: false },
changeReason: { op: "Equal", value: null, show: true }, changeReason: { op: "Equal", value: null, show: false },
checkPerson: { op: "Equal", value: null, show: true }, checkPerson: { op: "Equal", value: null, show: true },
approvalPerson: { op: "Equal", value: null, show: true }, approvalPerson: { op: "Equal", value: null, show: true },
status: { op: "Equal", value: null, show: true }, status: { op: "Equal", value: null, show: false },
note: { op: "Equal", value: null, show: true }, note: { op: "Equal", value: null, show: true },
creationTime: { op: "Range", value: null, show: true }, creationTime: { op: "Range", value: null, show: true },
creatorUserId: { op: "Equal", value: null, show: true }, creatorUserId: { op: "Equal", value: null, show: true },
lastModificationTime: { op: "Range", value: null, show: true }, lastModificationTime: { op: "Range", value: null, show: true },
lastModifierUserId: { op: "Equal", value: null, show: true }, lastModifierUserId: { op: "Equal", value: null, show: true },
changeorderCode: { op: "Equal", value: null, show: true },
printData: { op: "Range", value: null, show: true }
} }
}; };
}, },
......
pages/technology/index.vue
View file @ 39caf2e1
...@@ -232,7 +232,8 @@ export default { ...@@ -232,7 +232,8 @@ export default {
key: "creatorUserId", key: "creatorUserId",
title: this.$t("creatorUserId"), title: this.$t("creatorUserId"),
align: "left", align: "left",
hide: true hide: true,
type:"user"
}, },
{ {
key: "lastModificationTime", key: "lastModificationTime",
...@@ -244,7 +245,8 @@ export default { ...@@ -244,7 +245,8 @@ export default {
key: "lastModifierUserId", key: "lastModifierUserId",
title: this.$t("lastModifierUserId"), title: this.$t("lastModifierUserId"),
align: "left", align: "left",
hide: true hide: true,
type:"user"
}, },
{ {
title: "操作", title: "操作",
......
pages/test/resource.vue
View file @ 39caf2e1
<template> <template>
<div> <div>
<ResourceSelect v-model="model" @on-change="change"></ResourceSelect> <ResourceSelect v-model="model" @on-change="change"></ResourceSelect>
<p>{{model}}</p> <p>{{model}}</p>
...@@ -8,44 +7,137 @@ ...@@ -8,44 +7,137 @@
<Button @click="set">赋值</Button> <Button @click="set">赋值</Button>
<ProductSelect v-model="product" @on-change="pchange"></ProductSelect> <ProductSelect v-model="product" @on-change="pchange"></ProductSelect>
<p>{{product}}</p> <p>{{product}}</p>
<Button @click="setp">赋值</Button> <Button @click="setp">赋值</Button>
</div> <p>
<TreeNode :data="result"></TreeNode>
</p>
<p>
<Tree :data="result"></Tree>
</p>
</div>
</template> </template>
<script> <script>
import ResourceSelect from "@/components/page/resourceSelect" import ResourceSelect from "@/components/page/resourceSelect";
export default { import TreeNode from "./treeNode";
components:{ResourceSelect}, export default {
name: '', components: { TreeNode },
name: "",
data() { data() {
return { return {
model:[], model: [],
text:"", result: [
product:"", {
title: "五二九纵",
id: 41,
expand: false,
selected: false,
checked: false,
upId: 0,
rootId: 0,
children: [
{
title: "气源分配器壳体",
id: 82,
expand: false,
selected: false,
checked: false,
upId: 0,
rootId: 0,
children: [
{
title: "truio",
id: 83,
expand: false,
selected: false,
checked: false,
upId: 82,
rootId: 0,
children: [],
isProduct: 1,
productId: 83,
classType: 0,
drawingNo: "34567"
},
{
title: "北京吉普",
id: 84,
expand: false,
selected: false,
checked: false,
upId: 82,
rootId: 0,
children: [],
isProduct: 1,
productId: 84,
classType: 0,
drawingNo: "BJJP-0001"
}
],
isProduct: 1,
productId: 82,
classType: 41,
drawingNo: "TY9-06-0803"
}
],
isProduct: 0,
productId: 0,
classType: 0
},
{
title: "北京汽车",
id: 45,
expand: false,
selected: false,
checked: false,
upId: 0,
rootId: 0,
children: [
{
title: "北京吉普",
id: 85,
expand: false,
selected: false,
checked: false,
upId: 0,
rootId: 0,
children: [],
isProduct: 1,
productId: 85,
classType: 45,
drawingNo: "BJJP-0001"
}
],
isProduct: 0,
productId: 0,
classType: 0
} }
],
text: "",
product: ""
};
}, },
methods:{ methods: {
change(v,items){ change(v, items) {
this.text=items.map(u=>u.label).join('/'); this.text = items.map(u => u.label).join("/");
}, },
set(){ set() {
this.model=[ "1", 5 ]; this.model = ["1", 5];
}, },
pchange(v,item){ pchange(v, item) {
// this.text=items.map(u=>u.label).join('/'); // this.text=items.map(u=>u.label).join('/');
if(item.isProduct==0){ if (item.isProduct == 0) {
this.$Message.error("层级不能选择") this.$Message.error("层级不能选择");
this.product="" this.product = "";
} }
}, },
setp(){ setp() {
this.prodcut=8; this.prodcut = 8;
},
} }
} }
};
</script> </script>
<style lang="less" > <style lang="less" >
</style> </style>
\ No newline at end of file
pages/test/treeNode.vue 0 → 100644
View file @ 39caf2e1
<template>
<ul class="treeNode">
<li v-for="(li,i) in list" :key="i">
<span>{{li.title}}</span>
<treeNode v-if="li.children&&li.children.length>0" :data="li.children"></treeNode>
</li>
</ul>
</template>
<script>
export default {
name: "treeNode",
props: {
data: {
type: Array,
default: () => {
return [];
}
}
},
data() {
return {
list: []
};
},
created() {
this.list = this.data;
}
};
</script>
<style lang="less" >
.treeNode {
li {
line-height: 35px;
span:hover {
background-color: royalblue;
}
}
li > ul {
padding-left: 20px;
}
}
</style>
\ No newline at end of file
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