Skip to content

T
template_vue
Commit c5a9ceb1 authored by 高宇's avatar 高宇
Browse files
Options

Merge remote-tracking branch 'origin/project1' into project1

parents f52ef551 0967ae1f
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 28 deletions
src/views/equipment/draw.vue
View file @ c5a9ceb1
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="pissb：" prop="pissb"> <el-form-item label="pissb：" prop="pissb">
<el-input v-model.trim="singleDetails.pissb" :readonly="true" /> {{ selectedPissb(singleDetails.pissb) }}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -174,6 +174,14 @@ ...@@ -174,6 +174,14 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="8">
<el-form-item label="pnumber：" prop="pnumber">
<el-input v-model.trim="singleDetails.pnumber" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="申请人：" prop="createName"> <el-form-item label="申请人：" prop="createName">
...@@ -185,11 +193,6 @@ ...@@ -185,11 +193,6 @@
<el-input v-model.trim="singleDetails.createDate" :readonly="true" /> <el-input v-model.trim="singleDetails.createDate" :readonly="true" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-form-item label="pnumber：" prop="pnumber">
<el-input v-model.trim="singleDetails.pnumber" :readonly="true" />
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
...@@ -238,36 +241,37 @@ ...@@ -238,36 +241,37 @@
<el-dialog :title="title" :visible.sync="openHandle" width="1200px" append-to-body :close-on-click-modal="false" @close="handlecanceClose"> <el-dialog :title="title" :visible.sync="openHandle" width="1200px" append-to-body :close-on-click-modal="false" @close="handlecanceClose">
<el-form class="aboutSingleDetails" ref="formDetails" :model="singleDetails" size="small" label-width="90px"> <el-form class="aboutSingleDetails" ref="formDetails" :model="singleDetails" size="small" label-width="90px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="8">
<el-form-item label="pn：" prop="pn"> <el-form-item label="pn：" prop="pn">
<el-input v-model.trim="singleDetails.pn" :readonly="true" /> <el-input v-model.trim="singleDetails.pn" :readonly="true" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<el-form-item label="phd：" prop="phd"> <el-form-item label="phd：" prop="phd">
<el-input v-model.trim="singleDetails.phd" :readonly="true" /> <el-input v-model.trim="singleDetails.phd" :readonly="true" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="8">
<el-row>
<el-col :span="12">
<el-form-item label="prank：" prop="prank"> <el-form-item label="prank：" prop="prank">
<el-input v-model.trim="singleDetails.prank" :readonly="true" /> <el-input v-model.trim="singleDetails.prank" :readonly="true" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> </el-row>
<el-row>
<el-col :span="8">
<el-form-item label="pgx：" prop="pgx"> <el-form-item label="pgx：" prop="pgx">
<el-input v-model.trim="singleDetails.pgx" :readonly="true" /> <el-input v-model.trim="singleDetails.pgx" :readonly="true" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="8">
<el-row>
<el-col :span="12">
<el-form-item label="pissb：" prop="pissb"> <el-form-item label="pissb：" prop="pissb">
<el-input v-model.trim="singleDetails.pissb" :readonly="true" /> <template>
<span v-if="singleDetails.pissb === '0'">否</span>
<span v-else>是</span>
</template>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<el-form-item label="状态：" prop="pstatus"> <el-form-item label="状态：" prop="pstatus">
<template> <template>
<span v-if="singleDetails.pstatus === '0'" style="color: red">未完成</span> <span v-if="singleDetails.pstatus === '0'" style="color: red">未完成</span>
...@@ -276,6 +280,13 @@ ...@@ -276,6 +280,13 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="8">
<el-form-item label="pnumber：" prop="pnumber">
<el-input v-model.trim="singleDetails.pnumber" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="申请人：" prop="createName"> <el-form-item label="申请人：" prop="createName">
...@@ -829,6 +840,18 @@ export default { ...@@ -829,6 +840,18 @@ export default {
} }
}) })
}) })
},
/* TODO: pissb 类型判断的公用方法 */
selectedPissb(pissb) {
switch (pissb) {
case '0':
return '否'
case '1':
return '是'
default:
return ''
}
} }
} }
} }
......
src/views/processManagement/draw.vue
View file @ c5a9ceb1
...@@ -240,36 +240,37 @@ ...@@ -240,36 +240,37 @@
<el-dialog :title="title" :visible.sync="openHandle" width="1200px" append-to-body :close-on-click-modal="false" @close="handlecanceClose"> <el-dialog :title="title" :visible.sync="openHandle" width="1200px" append-to-body :close-on-click-modal="false" @close="handlecanceClose">
<el-form class="aboutSingleDetails" ref="formDetails" :model="singleDetails" size="small" label-width="90px"> <el-form class="aboutSingleDetails" ref="formDetails" :model="singleDetails" size="small" label-width="90px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="8">
<el-form-item label="pn：" prop="pn"> <el-form-item label="pn：" prop="pn">
<el-input v-model.trim="singleDetails.pn" :readonly="true" /> <el-input v-model.trim="singleDetails.pn" :readonly="true" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<el-form-item label="phd：" prop="phd"> <el-form-item label="phd：" prop="phd">
<el-input v-model.trim="singleDetails.phd" :readonly="true" /> <el-input v-model.trim="singleDetails.phd" :readonly="true" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="8">
<el-row>
<el-col :span="12">
<el-form-item label="prank：" prop="prank"> <el-form-item label="prank：" prop="prank">
<el-input v-model.trim="singleDetails.prank" :readonly="true" /> <el-input v-model.trim="singleDetails.prank" :readonly="true" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> </el-row>
<el-row>
<el-col :span="8">
<el-form-item label="pgx：" prop="pgx"> <el-form-item label="pgx：" prop="pgx">
<el-input v-model.trim="singleDetails.pgx" :readonly="true" /> <el-input v-model.trim="singleDetails.pgx" :readonly="true" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="8">
<el-row>
<el-col :span="12">
<el-form-item label="pissb：" prop="pissb"> <el-form-item label="pissb：" prop="pissb">
<el-input v-model.trim="singleDetails.pissb" :readonly="true" /> <template>
<span v-if="singleDetails.pissb === '0'">否</span>
<span v-else>是</span>
</template>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<el-form-item label="状态：" prop="pstatus"> <el-form-item label="状态：" prop="pstatus">
<template> <template>
<span v-if="singleDetails.pstatus === '0'" style="color: red">未完成</span> <span v-if="singleDetails.pstatus === '0'" style="color: red">未完成</span>
...@@ -278,6 +279,13 @@ ...@@ -278,6 +279,13 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="8">
<el-form-item label="pnumber：" prop="pnumber">
<el-input v-model.trim="singleDetails.pnumber" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="申请人：" prop="createName"> <el-form-item label="申请人：" prop="createName">
......
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