28f75ab2 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 2b0f92b5 49b44ad1
......@@ -58,9 +58,9 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="审核时间" prop="shjssj">
<el-form-item label="审核时间" prop="shkssj">
<el-date-picker
v-model="item.shjssj"
v-model="item.shkssj"
type="date"
placeholder="选择日期"
value-format="yyyy/MM/dd HH:mm:ss"
......@@ -98,7 +98,7 @@ export default {
rules: {
shyj: [{ required: true, message: "请填写意见", trigger: "blur" }],
shryxm: [{ required: true, message: "审查人", trigger: "blur" }],
shjssj: [{ required: true, message: "审核时间", trigger: "blur" }],
shkssj: [{ required: true, message: "审核时间", trigger: "blur" }],
},
};
},
......
......@@ -43,6 +43,9 @@ export function getForm(tabName) {
case "slxxjsydsyq":
form = require("@/views/djbworkflow/djbBook/components/blxxtabs/jsydsyq.vue");
break;
case "slxxtdsyq":
form = require("@/views/djbworkflow/djbBook/components/blxxtabs/tdsyq.vue");
break;
case "slxxfdcq":
form = require("@/views/djbworkflow/djbBook/components/blxxtabs/fdcq.vue");
break;
......
......@@ -27,6 +27,7 @@
box-sizing: border-box;
padding: 10px;
display: flex;
flex-direction: column;
.item-list {
......@@ -39,6 +40,7 @@
line-height: 36px;
border: 1px solid $borderColor;
font-weight: 700;
font-size: 16px;
padding: 5px 0 5px 10px;
background-color: #fff;
margin-bottom: 5px;
......@@ -253,4 +255,4 @@
text-align: center;
margin-top: 20px;
}
}
}
\ No newline at end of file
......