Commit 0f0f64ce authored by 周远喜's avatar 周远喜

样式处理。

parent 23e0cd65
<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>
...@@ -34,34 +36,38 @@ export default { ...@@ -34,34 +36,38 @@ 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; flex-direction: row;
line-height: 40px; line-height: 40px;
.label { >.label {
background: #f7f7f7; background: #f7f7f7;
display: inline-block; flex-grow: 0;
width: 110px; width: 110px;
text-align: right; text-align: right;
padding: 0 10px 0 0; padding: 0 10px 0 0;
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 { // .ivu-col-span-24 {
.label { // .label {
height: 100%; // height: 100%;
padding: 0.5% 5px; // padding: 0 5px;
} // }
p { // .value {
padding-top: 1%; // padding-top: 2px;
} // }
} // }
} }
} }
.new_detail { .new_detail {
......
...@@ -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)
{ {
......
<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>
......
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