Skip to content

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

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

parents 6945e821 a6f9a5ea
Hide whitespace changes
Inline Side-by-side
Showing with 480 additions and 830 deletions
components/orderOperator/orderInfos.vue
View file @ 6428865d
...@@ -87,27 +87,4 @@ export default { ...@@ -87,27 +87,4 @@ export default {
} }
} }
} }
</script> </script>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
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
components/page/filed.vue
View file @ 6428865d
<template> <template>
<Col :span="span" class="filed-col"> <Col :span="span" class="filed-col">
<div v-text="name" class="label"></div> <div class="label">
<p> <label v-text="name"></label>
</div>
<div class="value">
<slot></slot> <slot></slot>
</p> </div>
</Col> </Col>
</template> </template>
<script> <script>
...@@ -25,6 +27,7 @@ export default { ...@@ -25,6 +27,7 @@ export default {
display: table; display: table;
height: 100%; height: 100%;
border-collapse: collapse; border-collapse: collapse;
background: white;
.ivu-row { .ivu-row {
border: 1px solid #ddd; border: 1px solid #ddd;
border-top: none; border-top: none;
...@@ -33,31 +36,27 @@ export default { ...@@ -33,31 +36,27 @@ export default {
border: 1px solid #ddd; border: 1px solid #ddd;
border-right: none; border-right: none;
margin: 0 -1px -1px -1px; margin: 0 -1px -1px -1px;
box-sizing: border-box; // box-sizing: border-box;
display: flex; display: flex;
flex-direction: row;
line-height: 40px; line-height: 40px;
.label { >.label {
background: #f7f7f7; background: #f7f7f7;
display: inline-block; flex-grow: 0;
width: 110px; width: 120px;
text-align: right; text-align: right;
padding: 0 10px 0 0; padding: 0 8px;
border-right: 1px solid #ddd; border-right: 1px solid #ddd;
flex-shrink: 0;
} }
p { >.value {
word-break: break-all; word-break: break-all;
word-wrap: break-word; word-wrap: break-word;
flex-grow: 1; flex-grow: 1;
padding-left: 10px; padding-left: 10px;
} >div{
} line-height: 30px;
.ivu-col-span-24 { }
.label {
height: 100%;
padding: 0.5% 5px;
}
p {
padding-top: 1%;
} }
} }
} }
...@@ -68,7 +67,7 @@ export default { ...@@ -68,7 +67,7 @@ export default {
.filed-col { .filed-col {
box-sizing: border-box; box-sizing: border-box;
line-height: 70px; line-height: 70px;
.label { >.label {
display: inline-block; display: inline-block;
width: 100px; width: 100px;
text-align: right; text-align: right;
...@@ -76,7 +75,7 @@ export default { ...@@ -76,7 +75,7 @@ export default {
height: 100%; height: 100%;
font-weight: bold; font-weight: bold;
} }
p { >p {
text-align: left; text-align: left;
height: 100%; height: 100%;
word-break: break-all; word-break: break-all;
......
package-lock.json
View file @ 6428865d
...@@ -5611,9 +5611,9 @@ ...@@ -5611,9 +5611,9 @@
"dev": true "dev": true
}, },
"dayjs": { "dayjs": {
"version": "1.8.25", "version": "1.8.26",
"resolved": "http://r.cnpmjs.org/dayjs/download/dayjs-1.8.25.tgz", "resolved": "http://r.cnpmjs.org/dayjs/download/dayjs-1.8.26.tgz",
"integrity": "sha1-0JqGls7nGRvBKJ5zn5ZiY5G5xzw=" "integrity": "sha1-xtYszfBYynKo0Uu5OiNQEFjbnx4="
}, },
"de-indent": { "de-indent": {
"version": "1.0.2", "version": "1.0.2",
...@@ -8153,6 +8153,16 @@ ...@@ -8153,6 +8153,16 @@
"vue": "^2.6.10" "vue": "^2.6.10"
} }
}, },
"gantt-elastic-header": {
"version": "0.1.11",
"resolved": "http://r.cnpmjs.org/gantt-elastic-header/download/gantt-elastic-header-0.1.11.tgz",
"integrity": "sha1-i5/sjlFwm4L/WaA4bwZoUK5pxtE=",
"requires": {
"vue": "^2.6.10",
"vue-slider-component": "^3.0.31",
"vue-switches": "^2.0.1"
}
},
"gensync": { "gensync": {
"version": "1.0.0-beta.1", "version": "1.0.0-beta.1",
"resolved": "http://r.cnpmjs.org/gensync/download/gensync-1.0.0-beta.1.tgz", "resolved": "http://r.cnpmjs.org/gensync/download/gensync-1.0.0-beta.1.tgz",
...@@ -9548,8 +9558,7 @@ ...@@ -9548,8 +9558,7 @@
"dependencies": { "dependencies": {
"deepmerge": { "deepmerge": {
"version": "2.2.1", "version": "2.2.1",
"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz", "resolved": false
"integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA=="
} }
} }
}, },
......
package.json
View file @ 6428865d
...@@ -18,10 +18,11 @@ ...@@ -18,10 +18,11 @@
"awe-dnd": "^0.3.4", "awe-dnd": "^0.3.4",
"better-scroll": "^1.12.1", "better-scroll": "^1.12.1",
"cross-env": "^5.2.0", "cross-env": "^5.2.0",
"dayjs": "^1.8.22", "dayjs": "^1.8.26",
"echarts": "^4.7.0", "echarts": "^4.7.0",
"echarts-liquidfill": "^2.0.5", "echarts-liquidfill": "^2.0.5",
"gantt-elastic": "^1.0.11", "gantt-elastic": "^1.0.11",
"gantt-elastic-header": "^0.1.11",
"gojs": "^2.1.10", "gojs": "^2.1.10",
"iview-loader": "^1.3.0", "iview-loader": "^1.3.0",
"iview-pro": "file:./iview-pro", "iview-pro": "file:./iview-pro",
......
pages/aps/stream/index.vue
View file @ 6428865d
...@@ -277,6 +277,7 @@ export default { ...@@ -277,6 +277,7 @@ export default {
//拆分工序 //拆分工序
split(item, i) { split(item, i) {
this.chaiModal = true; this.chaiModal = true;
this.curIndex = i; this.curIndex = i;
this.maxnum = this.result[i].quantity - 1; this.maxnum = this.result[i].quantity - 1;
}, },
...@@ -284,30 +285,34 @@ export default { ...@@ -284,30 +285,34 @@ export default {
okChai() { okChai() {
let items = this.$u.clone(this.result); let items = this.$u.clone(this.result);
let curItem = items[this.curIndex]; let curItem = items[this.curIndex];
console.log(curItem);
let addItem = this.$u.clone(curItem); let addItem = this.$u.clone(curItem);
curItem.quantity -= this.chaiNum; curItem.quantity -= this.chaiNum;
curItem.chaiCount += 1; curItem.chaiCount += 1;
addItem.seq = addItem.task_seq + curItem.chaiCount * 0.1; addItem.seq = addItem.task_seq + curItem.chaiCount * 0.1;
addItem.quantity = this.chaiNum; addItem.quantity = this.chaiNum;
addItem.chai = true; addItem.chai = true;
items.splice(this.curIndex + curItem.chaiCount, 0, addItem); let total = null;
if (curItem.chaiCount) {
total = this.curIndex + curItem.chaiCount;
} else {
total = this.curIndex;
}
items.splice(total, 0, addItem);
this.result = items; this.result = items;
}, },
//删除工序 //删除工序
remove(item, index) { remove(item, index) {
console.log(item); let vroot = -1;
var root = -1; this.result.map((u, i) => {
for (let i = 0; i < this.result.length; i++) { if (!u.chai && u.detailId === item.detailId) {
const element = this.result[i]; vroot = i;
if (element.indexId == item.indexId) {
root = i;
break;
} }
} u.chaiCount = u.chaiCount - 1;
var rootItem = this.result[root]; });
this.result[root].quantity = rootItem.quantity + item.quantity; this.result[vroot].quantity += item.quantity;
this.result.splice(index, 1); var list = this.$u.clone(this.result);
list.splice(index, 1);
this.result = list;
}, },
//下发 //下发
lowerHair() { lowerHair() {
......
pages/handle/examine1/detail.vue
View file @ 6428865d
...@@ -77,27 +77,4 @@ export default { ...@@ -77,27 +77,4 @@ export default {
}, },
watch: {} watch: {}
} }
</script> </script>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
line-height: 30px;
box-sizing: border-box;
.label {
background: #e8eaf1;
display: inline-block;
width: 120px;
text-align: right;
padding: 0 5px;
}
}
}
}
</style>
pages/handle/examine10/detail.vue
View file @ 6428865d
...@@ -103,27 +103,4 @@ export default { ...@@ -103,27 +103,4 @@ export default {
}, },
watch: {} watch: {}
}; };
</script> </script>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
line-height: 30px;
box-sizing: border-box;
.label {
background: #e8eaf1;
display: inline-block;
width: 120px;
text-align: right;
padding: 0 5px;
}
}
}
}
</style>
pages/handle/examine11/detail.vue
View file @ 6428865d
...@@ -103,27 +103,4 @@ export default { ...@@ -103,27 +103,4 @@ export default {
}, },
watch: {} watch: {}
}; };
</script> </script>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
line-height: 30px;
box-sizing: border-box;
.label {
background: #e8eaf1;
display: inline-block;
width: 120px;
text-align: right;
padding: 0 5px;
}
}
}
}
</style>
pages/handle/examine12/detail.vue
View file @ 6428865d
...@@ -104,27 +104,4 @@ export default { ...@@ -104,27 +104,4 @@ export default {
}, },
watch: {} watch: {}
}; };
</script> </script>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
line-height: 30px;
box-sizing: border-box;
.label {
background: #e8eaf1;
display: inline-block;
width: 120px;
text-align: right;
padding: 0 5px;
}
}
}
}
</style>
pages/handle/examine2/detail.vue
View file @ 6428865d
...@@ -80,27 +80,4 @@ export default { ...@@ -80,27 +80,4 @@ export default {
}, },
watch: {} watch: {}
} }
</script> </script>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
line-height: 30px;
box-sizing: border-box;
.label {
background: #e8eaf1;
display: inline-block;
width: 120px;
text-align: right;
padding: 0 5px;
}
}
}
}
</style>
pages/handle/examine4/detail.vue
View file @ 6428865d
...@@ -79,27 +79,4 @@ export default { ...@@ -79,27 +79,4 @@ export default {
}, },
watch: {} watch: {}
} }
</script> </script>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
line-height: 30px;
box-sizing: border-box;
.label {
background: #e8eaf1;
display: inline-block;
width: 120px;
text-align: right;
padding: 0 5px;
}
}
}
}
</style>
pages/handle/examine6/detail.vue
View file @ 6428865d
<template> <template>
<div class="detail"style="width:90%;margin:0 auto" > <div class="detail"style="width:90%;margin:0 auto" >
<Row> <Row>
<Filed :span="120" :name="'工艺更改单'">{{results.changeorder_code}}</Filed> <Filed :span="12" :name="'工艺更改单'">{{results.changeorder_code}}</Filed>
<Filed :span="120" :name="'提出人'">{{results.propose_user_name}}</Filed> <Filed :span="12" :name="'提出人'">{{results.propose_user_name}}</Filed>
<Filed :span="120" :name="'申请部门'">{{results.department_name}}</Filed> <Filed :span="12" :name="'申请部门'">{{results.department_name}}</Filed>
<Filed :span="120" :name="'技术文件名称'">{{results.technical_name}}</Filed> <Filed :span="12" :name="'技术文件名称'">{{results.technical_name}}</Filed>
</Row> <Filed :span="12" :name="'数量'">{{results.quantity}}</Filed>
<Row> <Filed :span="12" :name="'发行日期'">{{results.print_data}}</Filed>
<Filed :span="120" :name="'数量'">{{results.quantity}}</Filed> <Filed :span="12" :name="'更改原因'">{{results.change_reason}}</Filed>
<Filed :span="120" :name="'发行日期'">{{results.print_data}}</Filed> <Filed :span="12" :name="'技术文件编号'">{{results.technical_code}}</Filed>
<Filed :span="120" :name="'更改原因'">{{results.change_reason}}</Filed>
<Filed :span="120" :name="'技术文件编号'">{{results.technical_code}}</Filed> <Filed :span="12" :name="'有效日期'">{{results.effective_date}}</Filed>
</Row> <Filed :span="12" :name="'执行部门'">{{results.executive_branch}}</Filed>
<Row> <Filed :span="12" :name="'更改后版本号'"><state code="Process.Routing.version" :value="results.changed_version+''" type="text"></state></Filed>
<Filed :span="120" :name="'有效日期'">{{results.effective_date}}</Filed> <Filed :span="12" :name="'在制品意见'"><state code="Process.Routing.opinion" :value="results.handling_opinions+''" type="text"></state></Filed>
<Filed :span="120" :name="'执行部门'">{{results.executive_branch}}</Filed>
<Filed :span="120" :name="'更改后版本号'"><state code="Process.Routing.version" :value="results.changed_version+''" type="text"></state></Filed>
<Filed :span="120" :name="'在制品意见'"><state code="Process.Routing.opinion" :value="results.handling_opinions+''" type="text"></state></Filed>
</Row> </Row>
<!-- <Row> <!-- <Row>
<Filed :span="120" :name="'变更前描述'">{{info.changeInfo.before_change_content}}</Filed> <Filed :span="12" :name="'变更前描述'">{{info.changeInfo.before_change_content}}</Filed>
<Filed :span="120 " :name="'变更后描述'">{{info.changeInfo.after_change_content}}</Filed> <Filed :span="120 " :name="'变更后描述'">{{info.changeInfo.after_change_content}}</Filed>
</Row> --> </Row> -->
</div> </div>
...@@ -118,27 +115,4 @@ export default { ...@@ -118,27 +115,4 @@ export default {
} }
} }
} }
</style> </style>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
line-height: 30px;
box-sizing:border-box;
.label {
background: #E8EAF1;
display: inline-block;
width: 120px;
text-align: right;
padding: 0 5px;
}
}
}
}
</style>
pages/handle/examine7/detail.vue
View file @ 6428865d
...@@ -64,27 +64,4 @@ export default { ...@@ -64,27 +64,4 @@ export default {
}, },
watch: {} watch: {}
} }
</script> </script>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
line-height: 30px;
box-sizing: border-box;
.label {
background: #e8eaf1;
display: inline-block;
width: 120px;
text-align: right;
padding: 0 5px;
}
}
}
}
</style>
pages/handle/examine8/detail.vue
View file @ 6428865d
<template> <template>
<div class="detail" style="width:90%;margin:0 auto" > <div class="detail" style="width:90%;margin:0 auto">
<Row> <Row>
<Filed :span="120" :name="'生产协调单'">{{results.technical_coordination_code}}</Filed> <Filed :span="12" :name="'生产协调单'">{{results.technical_coordination_code}}</Filed>
<Filed :span="120" :name="'任务号'">{{results.taskCode}}</Filed> <Filed :span="12" :name="'任务号'">{{results.taskCode}}</Filed>
<Filed :span="120" :name="'数量'">{{results.quantity}}</Filed> <Filed :span="12" :name="'数量'">{{results.quantity}}</Filed>
<Filed :span="120" :name="'阶段'">{{results.phase}}</Filed> <Filed :span="12" :name="'阶段'">{{results.phase}}</Filed>
</Row> <Filed :span="12" :name="'产品名称'">{{results.product_name}}</Filed>
<Row> <Filed :span="12" :name="'产品标识'">{{results.product_mark}}</Filed>
<Filed :span="120" :name="'产品名称'">{{results.product_name}}</Filed> <Filed :span="12" :name="'协调内容'">{{results.coordinate_content}}</Filed>
<Filed :span="120" :name="'产品标识'">{{results.product_mark}}</Filed> <Filed :span="12" :name="'图号'">{{results.drawing}}</Filed>
<Filed :span="120" :name="'协调内容'">{{results.coordinate_content}}</Filed> <!-- <Filed :span="12" :name="'协调结果'">{{results.coordinate_results}}</Filed>
<Filed :span="120" :name="'图号'">{{results.drawing}}</Filed> <Filed :span="12" :name="'在制品意见'">{{results.handling_suggestion}}</Filed>-->
<!-- <Filed :span="120" :name="'协调结果'">{{results.coordinate_results}}</Filed>
<Filed :span="120" :name="'在制品意见'">{{results.handling_suggestion}}</Filed> --> <!-- <Filed :span="12" :name="'更改设计文件'">{{results.change_design_file}}</Filed>
<Filed :span="12" :name="'更改工艺文件'">{{results.change_process_file}}</Filed>
<Filed :span="12" :name="'编写临时工艺'">{{results.compilation_temporary_process}}</Filed>-->
<Filed :span="12" :name="'检验员'">{{results.inspection_person_name}}</Filed>
<Filed :span="12" :name="'检验时间'">{{results.inspection_date}}</Filed>
<!--
<Filed :span="12" :name="'变更前描述'">{{info.changeInfo.before_change_content}}</Filed>
<Filed :span="12" :name="'变更后描述'">{{info.changeInfo.after_change_content}}</Filed>-->
</Row> </Row>
<Row>
<!-- <Filed :span="120" :name="'更改设计文件'">{{results.change_design_file}}</Filed>
<Filed :span="120" :name="'更改工艺文件'">{{results.change_process_file}}</Filed>
<Filed :span="120" :name="'编写临时工艺'">{{results.compilation_temporary_process}}</Filed> -->
<Filed :span="120" :name="'检验员'">{{results.inspection_person_name}}</Filed>
<Filed :span="120" :name="'检验时间'">{{results.inspection_date}}</Filed>
</Row>
<!-- <Row>
<Filed :span="120" :name="'变更前描述'">{{info.changeInfo.before_change_content}}</Filed>
<Filed :span="120 " :name="'变更后描述'">{{info.changeInfo.after_change_content}}</Filed>
</Row> -->
</div> </div>
</template> </template>
<script> <script>
import Api from '../api' import Api from "../api";
export default { export default {
name: 'detail', name: "detail",
components: {}, components: {},
props: { props: {
idVal: { idVal: {
type: String, type: String,
default: '' default: ""
} }
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
data() { data() {
return { return {
results: { results: {
state: '' state: ""
} }
} };
}, },
created() { created() {
this.dataImmut = [] this.dataImmut = [];
this.dataMut = [] this.dataMut = [];
Api.get({ Id: this.idVal }).then((r) => { Api.get({ Id: this.idVal }).then(r => {
if (r.success) { if (r.success) {
this.results = JSON.parse(r.result.formData) this.results = JSON.parse(r.result.formData);
// let formStr = r.result.formData.replace(/\"/g, '"') // let formStr = r.result.formData.replace(/\"/g, '"')
// this.results = JSON.parse(formStr)[0] // this.results = JSON.parse(formStr)[0]
} else { } else {
this.$Message.error('加载失败') this.$Message.error("加载失败");
} }
}) });
}, },
methods: { methods: {
load(v) {}, load(v) {},
l(key) { l(key) {
key = 'waitOpened' + '.' + key key = "waitOpened" + "." + key;
return this.$t(key) return this.$t(key);
} }
}, },
watch: {} watch: {}
} };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.pdf-detail { .pdf-detail {
...@@ -119,27 +116,4 @@ export default { ...@@ -119,27 +116,4 @@ export default {
} }
} }
} }
</style> </style>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
line-height: 30px;
box-sizing:border-box;
.label {
background: #E8EAF1;
display: inline-block;
width: 120px;
text-align: right;
padding: 0 5px;
}
}
}
}
</style>
pages/handle/process.vue
View file @ 6428865d
<template> <template>
<div class="Design" style="width:80%;margin:50px auto;"> <div class="Design">
<h3>{{ processTitle }}</h3> <h3>{{ processTitle }}</h3>
<Divider /> <Divider />
<Timeline> <Timeline>
...@@ -192,3 +192,11 @@ export default { ...@@ -192,3 +192,11 @@ export default {
watch: {} watch: {}
} }
</script> </script>
<style lang="less">
.Design{
margin:20px auto; width:90%;
.ivu-timeline-item-head{
background-color: transparent;
}
}
</style>
\ No newline at end of file
pages/processDesign/ChangeSingle/components/orderInfos.vue
View file @ 6428865d
...@@ -53,27 +53,4 @@ export default { ...@@ -53,27 +53,4 @@ export default {
} }
} }
} }
</script> </script>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
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/processDesign/ChangeSingle/technicalcoordination/techInfos.vue
View file @ 6428865d
<template> <template>
<div class="detail" > <div class="detail" >
<Row> <Row>
<Filed :span="120" :name="'生产协调单'">{{info.changeInfo.technical_coordination_code}}</Filed> <Filed :span="12" :name="'生产协调单'">{{info.changeInfo.technical_coordination_code}}</Filed>
<Filed :span="120" :name="'任务号'">{{info.changeInfo.taskCode}}</Filed> <Filed :span="12" :name="'任务号'">{{info.changeInfo.taskCode}}</Filed>
<Filed :span="120" :name="'数量'">{{info.changeInfo.quantity}}</Filed> <Filed :span="12" :name="'数量'">{{info.changeInfo.quantity}}</Filed>
<Filed :span="120" :name="'阶段'">{{info.changeInfo.phase}}</Filed> <Filed :span="12" :name="'阶段'">{{info.changeInfo.phase}}</Filed>
</Row> </Row>
<Row> <Row>
<Filed :span="120" :name="'产品名称'">{{info.changeInfo.product_name}}</Filed> <Filed :span="12" :name="'产品名称'">{{info.changeInfo.product_name}}</Filed>
<Filed :span="120" :name="'产品标识'">{{info.changeInfo.product_mark}}</Filed> <Filed :span="12" :name="'产品标识'">{{info.changeInfo.product_mark}}</Filed>
<Filed :span="120" :name="'协调内容'">{{info.changeInfo.coordinate_content}}</Filed> <Filed :span="12" :name="'协调内容'">{{info.changeInfo.coordinate_content}}</Filed>
<Filed :span="120" :name="'图号'">{{info.changeInfo.drawing}}</Filed> <Filed :span="12" :name="'图号'">{{info.changeInfo.drawing}}</Filed>
<!-- <Filed :span="120" :name="'协调结果'">{{info.changeInfo.coordinate_results}}</Filed> <!-- <Filed :span="12" :name="'协调结果'">{{info.changeInfo.coordinate_results}}</Filed>
<Filed :span="120" :name="'在制品意见'">{{info.changeInfo.handling_suggestion}}</Filed> --> <Filed :span="12" :name="'在制品意见'">{{info.changeInfo.handling_suggestion}}</Filed> -->
<!-- <Filed :span="12" :name="'更改设计文件'">{{info.changeInfo.change_design_file}}</Filed>
<Filed :span="12" :name="'更改工艺文件'">{{info.changeInfo.change_process_file}}</Filed>
<Filed :span="12" :name="'编写临时工艺'">{{info.changeInfo.compilation_temporary_process}}</Filed> -->
<Filed :span="12" :name="'检验员'">{{info.changeInfo.inspection_person_name}}</Filed>
<Filed :span="12" :name="'检验时间'">{{info.changeInfo.inspection_date}}</Filed>
<!-- <Filed :span="12" :name="'变更前描述'">{{info.changeInfo.before_change_content}}</Filed>
<Filed :span="12 " :name="'变更后描述'">{{info.changeInfo.after_change_content}}</Filed> -->
</Row> </Row>
<Row>
<!-- <Filed :span="120" :name="'更改设计文件'">{{info.changeInfo.change_design_file}}</Filed>
<Filed :span="120" :name="'更改工艺文件'">{{info.changeInfo.change_process_file}}</Filed>
<Filed :span="120" :name="'编写临时工艺'">{{info.changeInfo.compilation_temporary_process}}</Filed> -->
<Filed :span="120" :name="'检验员'">{{info.changeInfo.inspection_person_name}}</Filed>
<Filed :span="120" :name="'检验时间'">{{info.changeInfo.inspection_date}}</Filed>
</Row>
<!-- <Row>
<Filed :span="120" :name="'变更前描述'">{{info.changeInfo.before_change_content}}</Filed>
<Filed :span="120 " :name="'变更后描述'">{{info.changeInfo.after_change_content}}</Filed>
</Row> -->
</div> </div>
</template> </template>
...@@ -57,27 +55,4 @@ export default { ...@@ -57,27 +55,4 @@ export default {
} }
} }
} }
</script> </script>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
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/processDesign/Process/changeInfos.vue
View file @ 6428865d
<template> <template>
<div class="detail" > <div class="detail">
<Row> <Row>
<Filed :span="120" :name="'工艺更改单'">{{info.changeInfo.changeorder_code}}</Filed> <Filed :span="12" :name="'工艺更改单'">{{info.changeInfo.changeorder_code}}</Filed>
<Filed :span="120" :name="'提出人'">{{info.changeInfo.propose_user_name}}</Filed> <Filed :span="12" :name="'提出人'">{{info.changeInfo.propose_user_name}}</Filed>
<Filed :span="120" :name="'申请部门'">{{info.changeInfo.department_name}}</Filed> <Filed :span="12" :name="'申请部门'">{{info.changeInfo.department_name}}</Filed>
<Filed :span="120" :name="'技术文件名称'">{{info.changeInfo.technical_name}}</Filed> <Filed :span="12" :name="'技术文件名称'">{{info.changeInfo.technical_name}}</Filed>
<Filed :span="120" :name="'技术文件编号'">{{info.changeInfo.technical_code}}</Filed> <Filed :span="12" :name="'技术文件编号'">{{info.changeInfo.technical_code}}</Filed>
</Row>
<Row> <Filed :span="12" :name="'执行部门'">{{info.changeInfo.executive_branch}}</Filed>
<Filed :span="120" :name="'执行部门'">{{info.changeInfo.executive_branch}}</Filed> <Filed :span="12" :name="'数量'">{{info.changeInfo.quantity}}</Filed>
<Filed :span="120" :name="'数量'">{{info.changeInfo.quantity}}</Filed> <Filed :span="12" :name="'发行日期'">{{info.changeInfo.print_data}}</Filed>
<Filed :span="120" :name="'发行日期'">{{info.changeInfo.print_data}}</Filed> <Filed :span="12" :name="'更改原因'">{{info.changeInfo.change_reason}}</Filed>
<Filed :span="120" :name="'更改原因'">{{info.changeInfo.change_reason}}</Filed> <Filed :span="12" :name="'有效日期'">{{info.changeInfo.effective_date}}</Filed>
<Filed :span="120" :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>
<!-- <Filed :span="12" :name="'变更前描述'">{{info.changeInfo.before_change_content}}</Filed>
<Filed :span="12 " :name="'变更后描述'">{{info.changeInfo.after_change_content}}</Filed>-->
</Row> </Row>
<Row>
<Filed :span="120" :name="'更改后版本号'"><state code="Process.Routing.version" :value="info.changeInfo.changed_version+''" type="text"></state></Filed>
<Filed :span="120" :name="'在制品意见'"><state code="Process.Routing.opinion" :value="info.changeInfo.handling_opinions+''" type="text"></state></Filed>
</Row>
<!-- <Row>
<Filed :span="120" :name="'变更前描述'">{{info.changeInfo.before_change_content}}</Filed>
<Filed :span="120 " :name="'变更后描述'">{{info.changeInfo.after_change_content}}</Filed>
</Row> -->
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: 'changeInfos', name: "changeInfos",
props: ['info'], props: ["info"],
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
data(){ data() {
return{ return {};
}
}, },
methods: { methods: {
arry2Name(arryList, values) { arry2Name(arryList, values) {
//预警类别转换 //预警类别转换
var codes = arryList var codes = arryList;
var name = '' var name = "";
for (let i in codes) { for (let i in codes) {
if (values == codes[i].value) { if (values == codes[i].value) {
name = codes[i].name name = codes[i].name;
} }
} }
return name return name;
}, },
l(key) { l(key) {
key = 'orderInfo' + '.' + key key = "orderInfo" + "." + key;
return this.$t(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;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
line-height: 30px;
box-sizing:border-box;
.label {
background: #E8EAF1;
display: inline-block;
width: 120px;
text-align: right;
padding: 0 5px;
}
} }
} }
} };
</style> </script>
\ No newline at end of file \ No newline at end of file
pages/processDesign/setProcess/components/dataDissemination.vue
View file @ 6428865d
...@@ -161,27 +161,4 @@ export default { ...@@ -161,27 +161,4 @@ export default {
} }
} }
} }
</script> </script>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
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/processDesign/setProcess/components/orderInfos.vue
View file @ 6428865d
...@@ -58,27 +58,4 @@ export default { ...@@ -58,27 +58,4 @@ export default {
} }
} }
} }
</script> </script>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
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/processManage/setProcess/components/dataDissemination.vue
View file @ 6428865d
...@@ -161,27 +161,4 @@ export default { ...@@ -161,27 +161,4 @@ export default {
} }
} }
} }
</script> </script>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
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/processManage/setProcess/components/orderInfos.vue
View file @ 6428865d
...@@ -58,27 +58,4 @@ export default { ...@@ -58,27 +58,4 @@ export default {
} }
} }
} }
</script> </script>
<style lang="less"> \ No newline at end of file
.detail {
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
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/produce/execute/MaterialCollec/index.vue
View file @ 6428865d
<style lang="less">
@import "../execute.less";
</style>
<template> <template>
<div class=""> <div class="">
<div class="star" v-if="!starmodal"> <div class="star" v-if="!starmodal">
......
pages/produce/execute/ProcessCase/index.vue
View file @ 6428865d
<style lang="less">
@import "../execute.less";
</style>
<template> <template>
<div class=""> <div class="">
<div class="star" v-if="!starmodal"> <div class="star" v-if="!starmodal">
......
pages/produce/execute/ProcessCheck/index.vue
View file @ 6428865d
<style lang="less">
@import "../execute.less";
</style>
<template> <template>
<div class=""> <div class="">
<div class="star" v-if="!starmodal"> <div class="star" v-if="!starmodal">
......
pages/produce/execute/components/functional.vue
View file @ 6428865d
<style lang="less">
@import "../execute.less";
</style>
<template> <template>
<div class="addd"> <div class="addd">
<ul> <ul>
......
pages/produce/execute/components/orderlist.vue
View file @ 6428865d
<style lang="less">
@import "../execute.less";
</style>
<template> <template>
<div class="order_list"> <div class="order_list">
<!-- <div slot="header"> <!-- <div slot="header">
......
pages/produce/execute/datafilling/index.vue
View file @ 6428865d
<style lang="less">
@import "../execute.less";
</style>
<template> <template>
<div class=""> <div class="">
<div class="star" v-if="!starmodal"> <div class="star" v-if="!starmodal">
......
pages/produce/execute/execute.less
View file @ 6428865d
...@@ -100,15 +100,6 @@ ...@@ -100,15 +100,6 @@
.ivu-drawer-body { .ivu-drawer-body {
padding: 0; padding: 0;
height: calc(100% - 210px); height: calc(100% - 210px);
// .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{ .order_list{
.select_t { .select_t {
padding: 15px 20px; padding: 15px 20px;
...@@ -179,4 +170,41 @@ ...@@ -179,4 +170,41 @@
background: #2680EB; background: #2680EB;
} }
} }
}
.gs_set{
height: 100vh;
.gs_top{
margin: 15px auto;
width: 1000px;
height: 120px;
background: #2680EB;
color: #fff;
border-radius:4px;
.line_slit{
height: 5em;
float: left;
}
.gs_top_box{
float: left;
width: 46%;
text-align: center;
line-height: 140px;
i{
font-size: 71px;
}
.gs_bo01{
display: inline-block;
}
span{
display: inline-block;
}
.shi{
}
.number{
font-size: 32px;
}
}
}
} }
\ No newline at end of file
pages/produce/execute/judgment/index.vue
View file @ 6428865d
<style lang="less">
@import "../execute.less";
</style>
<template> <template>
<div class=""> <div class="">
<div class="star" v-if="!starmodal"> <div class="star" v-if="!starmodal">
......
pages/produce/execute/preparation/index.vue
View file @ 6428865d
<style lang="less">
@import "../execute.less";
</style>
<template> <template>
<div class=""> <div class="">
<div class="star" v-if="!starmodal"> <div class="star" v-if="!starmodal">
......
pages/produce/execute/productSet/index.vue
View file @ 6428865d
<style lang="less">
@import "../execute.less";
</style>
<template> <template>
<div class=""> <div class="">
<div class="star" v-if="!starmodal"> <div class="star" v-if="!starmodal">
......
pages/produce/execute/starOrder/index.vue
View file @ 6428865d
<style lang="less">
@import "../execute.less";
</style>
<template> <template>
<div class=""> <div class="">
<div class="star" v-if="!starmodal"> <div class="star" v-if="!starmodal">
......
pages/produce/execute/taskTime/index.vue
View file @ 6428865d
<style lang="less">
@import "../execute.less";
</style>
<template> <template>
<div class=""> <div class="gs_set">
<div class="star" v-if="!starmodal"> <div class="gs_top">
<a class="start" @click="starFun" > <div class="gs_top_box total_time">
<Icon type="md-play" /> <Icon type="md-pie" />
工时分配</a> <div class="gs_bo01">
<span class="shi">总工时</span>
<span class="number">250</span>
</div>
</div> </div>
<div class="star flex fc-b" v-else-if="starmodal"> <Divider type="vertical" class="line_slit"/>
<Button class="button" size='large' type="primary"><Icon type="ios-pause" /> 暂停</Button> <div class="gs_top_box allocated">
<Button class="button" size='large' type="primary"><Icon type="logo-angular" /> 交检</Button> <Icon type="md-pie" />
<Button class="button" size='large' type="primary"><Icon type="ios-checkmark-circle-outline" /> 完工</Button> <div class="gs_bo01">
<Button class="button" size='large' type="primary"><Icon type="md-swap" /> 转序交接</Button> <span class="shi">待分配</span>
</div> <span class="number">200</span>
<div class="footer_box"> </div>
<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>
</div> </div>
<div class="gs_card_box"></div>
</div> </div>
</template> </template>
<script> <script>
......
pages/produce/execute/testdata/index.vue
View file @ 6428865d
<style lang="less">
@import "../execute.less";
</style>
<template> <template>
<div class=""> <div class="">
<div class="star" v-if="!starmodal"> <div class="star" v-if="!starmodal">
......
pages/technology/details/routinghcorder/add.vue
View file @ 6428865d
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
</Col> </Col>
<Col span="24"> <Col span="24">
<FormItem :label="l('afterChangeContent')" prop="afterChangeContent"> <FormItem :label="l('afterChangeContent')" prop="afterChangeContent">
<i-quill v-model="entity.afterChangeContent" :height="200" border v-paste="handleImg" /> <i-quill v-model="entity.afterChangeContent" :height="200" border v-paste="handleImg1" />
</FormItem> </FormItem>
</Col> </Col>
...@@ -235,24 +235,45 @@ export default { ...@@ -235,24 +235,45 @@ export default {
}, },
handleImg(e) { handleImg(e) {
console.warn(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.bugForm.content += img this.entity.beforeChangeContent += img
// }, 1000) }, 1000)
// // new R // new R
// } }
},
handleImg1(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.entity.afterChangeContent += img
}, 1000)
// new R
}
}, },
departChange(v,items) departChange(v,items)
{ {
......
pages/technology/details/routinghcorder/changeInfos.vue
View file @ 6428865d
...@@ -52,25 +52,25 @@ export default { ...@@ -52,25 +52,25 @@ export default {
} }
}; };
</script> </script>
<style lang="less"> // <style lang="less">
.detail { // .detail {
display: table; // display: table;
border-collapse: collapse; // border-collapse: collapse;
.ivu-row { // .ivu-row {
display: table-row; // display: table-row;
.filed-col { // .filed-col {
display: table-cell; // display: table-cell;
margin: 0 0 -1px 0; // margin: 0 0 -1px 0;
line-height: 30px; // line-height: 30px;
box-sizing: border-box; // box-sizing: border-box;
.label { // .label {
background: #e8eaf1; // background: #e8eaf1;
display: inline-block; // display: inline-block;
width: 120px; // width: 120px;
text-align: right; // text-align: right;
padding: 0 5px; // padding: 0 5px;
} // }
} // }
} // }
} // }
</style> // </style>
\ No newline at end of file \ No newline at end of file
pages/technology/details/routinghcorder/detail.vue
View file @ 6428865d
<template> <template>
<div class="detail"> <div class="detail">
<Row> <Row>
<Filed :span="12" :name="l('routingHeaderId')">{{entity.routingHeaderId}}</Filed> <!-- <Filed :span="12" :name="l('routingHeaderId')">{{entity.routingHeaderId}}</Filed>
<Filed :span="12" :name="l('classId')">{{entity.classId}}</Filed> <Filed :span="12" :name="l('classId')">{{entity.classId}}</Filed>
<Filed :span="12" :name="l('proposeUserId')">{{entity.proposeUserId}}</Filed> <Filed :span="12" :name="l('proposeUserId')">{{entity.proposeUserId}}</Filed>
<Filed :span="12" :name="l('proposeUserName')">{{entity.proposeUserName}}</Filed> <Filed :span="12" :name="l('proposeUserName')">{{entity.proposeUserName}}</Filed>
<Filed :span="12" :name="l('departmentId')">{{entity.departmentId}}</Filed> <Filed :span="12" :name="l('departmentId')">{{entity.departmentId}}</Filed> -->
<Filed :span="12" :name="l('departmentName')">{{entity.departmentName}}</Filed> <Filed :span="12" :name="l('departmentName')">{{entity.departmentName}}</Filed>
<Filed :span="12" :name="l('technicalName')">{{entity.technicalName}}</Filed> <Filed :span="12" :name="l('technicalName')">{{entity.technicalName}}</Filed>
<Filed :span="12" :name="l('technicalCode')">{{entity.technicalCode}}</Filed> <Filed :span="12" :name="l('technicalCode')">{{entity.technicalCode}}</Filed>
...@@ -13,18 +13,24 @@ ...@@ -13,18 +13,24 @@
<Filed :span="12" :name="l('quantity')">{{entity.quantity}}</Filed> <Filed :span="12" :name="l('quantity')">{{entity.quantity}}</Filed>
<Filed :span="12" :name="l('printData')">{{entity.printData}}</Filed> <Filed :span="12" :name="l('printData')">{{entity.printData}}</Filed>
<Filed :span="12" :name="l('executiveBranch')">{{entity.executiveBranch}}</Filed> <Filed :span="12" :name="l('executiveBranch')">{{entity.executiveBranch}}</Filed>
<Filed :span="12" :name="l('executiveBranchId')">{{entity.executiveBranchId}}</Filed> <!-- <Filed :span="12" :name="l('executiveBranchId')">{{entity.executiveBranchId}}</Filed> -->
<Filed :span="12" :name="l('handlingOpinionsId')">{{entity.handlingOpinionsId}}</Filed> <!-- <Filed :span="12" :name="l('handlingOpinionsId')">{{entity.handlingOpinionsId}}</Filed> -->
<Filed :span="12" :name="l('handlingOpinions')">{{entity.handlingOpinions}}</Filed> <Filed :span="12" :name="l('handlingOpinions')">{{entity.handlingOpinions}}</Filed>
<Filed :span="12" :name="l('beforeChangeContent')">{{entity.beforeChangeContent}}</Filed> <Filed :span="24" :name="l('beforeChangeContent')">
<Filed :span="12" :name="l('afterChangeContent')">{{entity.afterChangeContent}}</Filed> <div v-html="entity.beforeChangeContent"></div>
</Filed>
<Filed :span="24" :name="l('afterChangeContent')">
<div v-html="entity.afterChangeContent"></div>
</Filed>
<Filed :span="12" :name="l('changeorderCode')">{{entity.changeorderCode}}</Filed> <Filed :span="12" :name="l('changeorderCode')">{{entity.changeorderCode}}</Filed>
<Filed :span="24" :name="l('changeReason')">{{entity.changeReason}}</Filed> <Filed :span="24" :name="l('changeReason')">{{entity.changeReason}}</Filed>
<Filed :span="12" :name="l('effectiveDate')">{{entity.effectiveDate}}</Filed> <Filed :span="12" :name="l('effectiveDate')">{{entity.effectiveDate}}</Filed>
<Filed :span="12" :name="l('checkPerson')">{{entity.checkPerson}}</Filed> <Filed :span="12" :name="l('checkPerson')">{{entity.checkPerson}}</Filed>
<Filed :span="12" :name="l('approvalPerson')">{{entity.approvalPerson}}</Filed> <Filed :span="12" :name="l('approvalPerson')">{{entity.approvalPerson}}</Filed>
<Filed :span="12" :name="l('status')">{{entity.status}}</Filed> <Filed :span="12" :name="l('status')">
<Filed :span="24" :name="l('note')">{{entity.note}}</Filed> <State code="unProduct.repairstatus" :value="entity.status"/>
</Filed>
<!-- <Filed :span="24" :name="l('note')">{{entity.note}}</Filed> -->
</Row> </Row>
</div> </div>
</template> </template>
......
pages/technology/details/routinghcorder/edit.vue
View file @ 6428865d
<template> <template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90"> <Form ref="form" :model="entity" :rules="rules" :label-width="110">
<Row> <Row>
<Col :span="12"> <Col span="8">
<FormItem :label="l('routingHeaderId')" prop="routingHeaderId"> <FormItem :label="l('changeorderCode')" prop="changeorderCode">
<InputNumber v-model="entity.routingHeaderId"></InputNumber> <Input v-model="entity.changeorderCode" readonly></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="8">
<FormItem :label="l('classId')" prop="classId"> <FormItem :label="l('printData')" prop="printData">
<InputNumber v-model="entity.classId"></InputNumber> <DatePicker type="date" v-model="entity.printData" style="width:100%" format="yyyy/MM/dd"></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="8">
<FormItem :label="l('proposeUserId')" prop="proposeUserId"> <FormItem :label="l('departmentName')" prop="departmentId">
<InputNumber v-model="entity.proposeUserId"></InputNumber> <departmentSelect v-model="entity.departmentId" @on-change="departChange"></departmentSelect>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="8">
<FormItem :label="l('proposeUserName')" prop="proposeUserName"> <FormItem :label="l('proposeUserName')" prop="proposeUserId">
<Input v-model="entity.proposeUserName"></Input> <UserSelect v-model="entity.proposeUserId"></UserSelect>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="8">
<FormItem :label="l('departmentId')" prop="departmentId"> <FormItem :label="l('technicalName')" prop="technicalName">
<InputNumber v-model="entity.departmentId"></InputNumber> <Input v-model="entity.technicalName"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="8">
<FormItem :label="l('departmentName')" prop="departmentName"> <FormItem :label="l('technicalCode')" prop="technicalCode">
<Input v-model="entity.departmentName"></Input> <Input v-model="entity.technicalCode"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="8">
<FormItem :label="l('technicalName')" prop="technicalName"> <FormItem :label="l('changedVersion')" prop="changedVersion">
<Input v-model="entity.technicalName"></Input> <dictionary
</FormItem> code="Process.Routing.version"
</Col> v-model="entity.changedVersion"
<Col :span="12"> style="width:100%"
<FormItem :label="l('technicalCode')" prop="technicalCode"> ></dictionary>
<Input v-model="entity.technicalCode"></Input> </FormItem>
</FormItem> </Col>
</Col> <Col span="8">
<Col :span="12"> <FormItem :label="l('quantity')" prop="quantity">
<FormItem :label="l('changedVersion')" prop="changedVersion"> <InputNumber v-model="entity.quantity" style="width:100%"></InputNumber>
<Input v-model="entity.changedVersion"></Input> </FormItem>
</FormItem> </Col>
</Col>
<Col :span="12"> <Col span="8">
<FormItem :label="l('quantity')" prop="quantity"> <FormItem :label="l('executiveBranch')" prop="executiveBranchId">
<InputNumber v-model="entity.quantity"></InputNumber> <departmentSelect v-model="entity.executiveBranchId"></departmentSelect>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12">
<FormItem :label="l('printData')" prop="printData"> <Col span="8">
<Input v-model="entity.printData"></Input> <FormItem :label="l('handlingOpinions')" prop="handlingOpinionsId">
</FormItem> <Dictionary
</Col> code="Process.Routing.opinion"
<Col :span="12"> v-model="entity.handlingOpinionsId"
<FormItem :label="l('executiveBranch')" prop="executiveBranch"> type="radio"
<Input v-model="entity.executiveBranch"></Input> ></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="8">
<FormItem :label="l('executiveBranchId')" prop="executiveBranchId"> <FormItem :label="l('changeReason')" prop="changeReason">
<InputNumber v-model="entity.executiveBranchId"></InputNumber> <Input v-model="entity.changeReason"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="8">
<FormItem :label="l('handlingOpinionsId')" prop="handlingOpinionsId"> <FormItem :label="l('effectiveDate')" prop="effectiveDate">
<InputNumber v-model="entity.handlingOpinionsId"></InputNumber> <DatePicker type="date" v-model="entity.effectiveDate" style="width:100%" format="yyyy/MM/dd"></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="24">
<FormItem :label="l('handlingOpinions')" prop="handlingOpinions"> <FormItem :label="l('beforeChangeContent')" prop="beforeChangeContent">
<Input v-model="entity.handlingOpinions"></Input> <i-quill v-model="entity.beforeChangeContent" :height="200" border v-paste="handleImg" />
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="24">
<FormItem :label="l('beforeChangeContent')" prop="beforeChangeContent"> <FormItem :label="l('afterChangeContent')" prop="afterChangeContent">
<Input v-model="entity.beforeChangeContent"></Input> <i-quill v-model="entity.afterChangeContent" :height="200" border v-paste="handleImg1" />
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12">
<FormItem :label="l('afterChangeContent')" prop="afterChangeContent"> <!--
<Input v-model="entity.afterChangeContent"></Input> <Col span="12">
</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"> <FormItem :label="l('checkPerson')" prop="checkPerson">
<InputNumber v-model="entity.checkPerson"></InputNumber> <InputNumber v-model="entity.checkPerson"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="12">
<FormItem :label="l('approvalPerson')" prop="approvalPerson"> <FormItem :label="l('approvalPerson')" prop="approvalPerson">
<InputNumber v-model="entity.approvalPerson"></InputNumber> <InputNumber v-model="entity.approvalPerson"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col span="12">
<FormItem :label="l('status')" prop="status"> <FormItem :label="l('status')" prop="status">
<InputNumber v-model="entity.status"></InputNumber> <InputNumber v-model="entity.status"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="24"> <Col span="24">
<FormItem :label="l('note')" prop="note"> <FormItem label>
<Input v-model="entity.note" type="textarea" :rows="5"></Input> <Process ref="userProcess" schemaIdVal="d0cdafe3-2341-4499-a4f5-278ef0f30740" />
</FormItem> </FormItem>
</Col> </Col>
</Row> -->
<FormItem> </Row>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button @click="handleClose" class="ml20">取消</Button> <Row>
</FormItem> <Col span="24" style="text-align:right">
</Form> <FormItem label>
<Button @click="handleClose" class="ml20">取消</Button>&nbsp;&nbsp;
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>&nbsp;&nbsp;
<Checkbox v-show="submitShow" v-model="checked" class="ml10" label="送审">送审</Checkbox>
</FormItem>
</Col>
</Row>
</Form>
</template> </template>
<script> <script>
import Api from "./api"; import Api from "./api";
import iQuill from "@/components/quill";
import changeSendReview from "./changeSendReview.vue";
export default { export default {
name: "Edit", name: "Edit",
components: { iQuill, changeSendReview },
data() { data() {
return { return {
disabled: false, disabled: false,
...@@ -182,24 +174,45 @@ export default { ...@@ -182,24 +174,45 @@ export default {
}, },
handleImg(e) { handleImg(e) {
console.warn(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.bugForm.content += img this.entity.beforeChangeContent += img
// }, 1000) }, 1000)
// new R
}
},
handleImg1(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.entity.afterChangeContent += img
}, 1000)
// // new R // new R
// } }
}, },
l(key) { l(key) {
key = "routing_header_changeorder" + "." + key; key = "routing_header_changeorder" + "." + key;
......
pages/workflow/process/design.vue
View file @ 6428865d
...@@ -107,6 +107,7 @@ export default { ...@@ -107,6 +107,7 @@ export default {
</script> </script>
<style lang="less"> <style lang="less">
.Design { .Design {
background: white;
padding: 20px 50px; padding: 20px 50px;
.node { .node {
.title { .title {
......
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