Skip to content

M
mes-ui
Commit 0f0f64ce authored by 周远喜's avatar 周远喜
Browse files
Options

样式处理。

parent 23e0cd65
Hide whitespace changes
Inline Side-by-side
Showing with 219 additions and 173 deletions
components/page/filed.vue
View file @ 0f0f64ce
<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 {
......
pages/technology/details/routinghcorder/add.vue
View file @ 0f0f64ce
...@@ -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/detail.vue
View file @ 0f0f64ce
<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 @ 0f0f64ce
<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;
......
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