49b44ad1 by renchao@pashanhoo.com

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents fd6e32b0 7af57188
...@@ -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;
......