Merge branch 'dev'
Showing
4 changed files
with
9 additions
and
4 deletions
This diff is collapsed.
Click to expand it.
| ... | @@ -58,9 +58,9 @@ | ... | @@ -58,9 +58,9 @@ | 
| 58 | </el-form-item> | 58 | </el-form-item> | 
| 59 | </el-col> | 59 | </el-col> | 
| 60 | <el-col :span="8"> | 60 | <el-col :span="8"> | 
| 61 | <el-form-item label="审核时间" prop="shjssj"> | 61 | <el-form-item label="审核时间" prop="shkssj"> | 
| 62 | <el-date-picker | 62 | <el-date-picker | 
| 63 | v-model="item.shjssj" | 63 | v-model="item.shkssj" | 
| 64 | type="date" | 64 | type="date" | 
| 65 | placeholder="选择日期" | 65 | placeholder="选择日期" | 
| 66 | value-format="yyyy/MM/dd HH:mm:ss" | 66 | value-format="yyyy/MM/dd HH:mm:ss" | 
| ... | @@ -98,7 +98,7 @@ export default { | ... | @@ -98,7 +98,7 @@ export default { | 
| 98 | rules: { | 98 | rules: { | 
| 99 | shyj: [{ required: true, message: "请填写意见", trigger: "blur" }], | 99 | shyj: [{ required: true, message: "请填写意见", trigger: "blur" }], | 
| 100 | shryxm: [{ required: true, message: "审查人", trigger: "blur" }], | 100 | shryxm: [{ required: true, message: "审查人", trigger: "blur" }], | 
| 101 | shjssj: [{ required: true, message: "审核时间", trigger: "blur" }], | 101 | shkssj: [{ required: true, message: "审核时间", trigger: "blur" }], | 
| 102 | }, | 102 | }, | 
| 103 | }; | 103 | }; | 
| 104 | }, | 104 | }, | ... | ... | 
| ... | @@ -43,6 +43,9 @@ export function getForm(tabName) { | ... | @@ -43,6 +43,9 @@ export function getForm(tabName) { | 
| 43 | case "slxxjsydsyq": | 43 | case "slxxjsydsyq": | 
| 44 | form = require("@/views/djbworkflow/djbBook/components/blxxtabs/jsydsyq.vue"); | 44 | form = require("@/views/djbworkflow/djbBook/components/blxxtabs/jsydsyq.vue"); | 
| 45 | break; | 45 | break; | 
| 46 | case "slxxtdsyq": | ||
| 47 | form = require("@/views/djbworkflow/djbBook/components/blxxtabs/tdsyq.vue"); | ||
| 48 | break; | ||
| 46 | case "slxxfdcq": | 49 | case "slxxfdcq": | 
| 47 | form = require("@/views/djbworkflow/djbBook/components/blxxtabs/fdcq.vue"); | 50 | form = require("@/views/djbworkflow/djbBook/components/blxxtabs/fdcq.vue"); | 
| 48 | break; | 51 | break; | ... | ... | 
| ... | @@ -27,6 +27,7 @@ | ... | @@ -27,6 +27,7 @@ | 
| 27 | box-sizing: border-box; | 27 | box-sizing: border-box; | 
| 28 | padding: 10px; | 28 | padding: 10px; | 
| 29 | display: flex; | 29 | display: flex; | 
| 30 | |||
| 30 | flex-direction: column; | 31 | flex-direction: column; | 
| 31 | 32 | ||
| 32 | .item-list { | 33 | .item-list { | 
| ... | @@ -39,6 +40,7 @@ | ... | @@ -39,6 +40,7 @@ | 
| 39 | line-height: 36px; | 40 | line-height: 36px; | 
| 40 | border: 1px solid $borderColor; | 41 | border: 1px solid $borderColor; | 
| 41 | font-weight: 700; | 42 | font-weight: 700; | 
| 43 | font-size: 16px; | ||
| 42 | padding: 5px 0 5px 10px; | 44 | padding: 5px 0 5px 10px; | 
| 43 | background-color: #fff; | 45 | background-color: #fff; | 
| 44 | margin-bottom: 5px; | 46 | margin-bottom: 5px; | 
| ... | @@ -253,4 +255,4 @@ | ... | @@ -253,4 +255,4 @@ | 
| 253 | text-align: center; | 255 | text-align: center; | 
| 254 | margin-top: 20px; | 256 | margin-top: 20px; | 
| 255 | } | 257 | } | 
| 256 | } | 258 | } | 
| ... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... | 
- 
Please register or sign in to post a comment