commit

src/main/java/com/budwk/app/zhgh/staffbenefit/maternityLeave/models/MaternityLeave.java

@@ -1,5 +1,6 @@
 package com.budwk.app.zhgh.staffbenefit.maternityLeave.models;
 
+import cn.hutool.json.JSONObject;
 import com.budwk.app.base.model.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -8,6 +9,7 @@ import org.nutz.dao.interceptor.annotation.PrevInsert;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author : hongqiwei
@@ -188,6 +190,11 @@ public class MaternityLeave extends BaseModel implements Serializable {
     @Comment("是否多胞胎")
     private Boolean isMultipleBirths;
 
+    @Column
+    @Comment("附件")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<JSONObject> files;
+
 
 }
 

src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/apply/index.html

@@ -90,6 +90,15 @@ layout("/layouts/platform.html"){
                     </el-form-item>
                 </el-descriptions-item>
                 <el-descriptions-item></el-descriptions-item>
+                <el-descriptions-item label="出生医学证明" :span="2">
+                    <el-form-item prop="files">
+                        <file-upload :value.sync="formData.files"
+                                     upload_mode="drag"
+                                     :upload_number="10" upload_result_category="array"
+                                     accept=".pdf,.jpg, .jpeg, .png"
+                                     complete_result></file-upload>
+                    </el-form-item>
+                </el-descriptions-item>
             </el-descriptions>
             <!-- <table-tool label="假期类别"></table-tool>
              <el-descriptions :column="2" border>
@@ -205,6 +214,7 @@ layout("/layouts/platform.html"){
                     isDystocia: [{required: true, message: '请选择是否难产', trigger: 'change'}],
                     isThreeChildren: [{required: true, message: '请选择是否三胎', trigger: 'change'}],
                     isMultipleBirths: [{required: true, message: '请选择是否多胞胎', trigger: 'change'}],
+                    files: [{required: true, message: '请上传出生医学证明', trigger: 'change'}],
                 },
             }
         },

src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/common/info.js

@@ -28,12 +28,15 @@ const maternityLeaveInfo = {
                 </el-descriptions-item>
                 <el-descriptions-item label="是否多胞胎">{{viewData.isMultipleBirths?'是':'否'}}
                 </el-descriptions-item>
+                <el-descriptions-item label="出生医学证明" :span="2">
+                    <file-preview :files="viewData.files" complete_result></file-preview>
+                </el-descriptions-item>
             </el-descriptions>
-            <table-tool label="假期时间"></table-tool>
+            <!--<table-tool label="假期时间"></table-tool>
             <el-descriptions :column="2" border class="flow-task-form">
 
             </el-descriptions>
-
+-->
             <template v-for="task in doneTasks">
                 <div class="mt10">
                     <div class="process-title">{{ task.displayName }}</div>
@@ -95,12 +98,12 @@ const maternityLeaveInfo = {
                             </el-descriptions-item>
                             <el-descriptions-item></el-descriptions-item>
                         </template>
-                        <el-descriptions-item label="签字" :span="3" v-if="!task.ext.isFirstTaskNode">
+                       <!-- <el-descriptions-item label="签字" :span="3" v-if="!task.ext.isFirstTaskNode">
                             <el-image :src="task.ext.tf_userSign"
                                       v-if="task.ext.tf_userSign"
                                       class="signature-image"></el-image>
                             <span v-else>暂无</span>
-                        </el-descriptions-item>
+                        </el-descriptions-item>-->
                     </el-descriptions>
                 </div>
             </template>

src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/familyPlanningOffice/index.html

@@ -173,12 +173,12 @@ layout("/layouts/platform.html"){
                                     <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
                                 </el-form-item>
                             </el-descriptions-item>
-                            <el-descriptions-item label="电子签名" span="2">
+                            <!--<el-descriptions-item label="电子签名" span="2">
                                 <el-form-item label="电子签名" prop="tf_userSign"
                                               :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
                                     <pc-signature v-model="formData.tf_userSign"></pc-signature>
                                 </el-form-item>
-                            </el-descriptions-item>
+                            </el-descriptions-item>-->
 
 
                         </el-descriptions>

src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/schoolAudit/index.html

@@ -89,10 +89,10 @@ layout("/layouts/platform.html"){
                                       :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
                             <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
                         </el-form-item>
-                        <el-form-item label="电子签名" prop="tf_userSign"
+                       <!-- <el-form-item label="电子签名" prop="tf_userSign"
                                       :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
                             <pc-signature v-model="formData.tf_userSign"></pc-signature>
-                        </el-form-item>
+                        </el-form-item>-->
                     </el-form>
                     <el-row type="flex" justify="end">
                         <el-button @click="$refs.guava.index()" size="small">取消</el-button>

src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/unionAudit/index.html

@@ -89,9 +89,9 @@ layout("/layouts/platform.html"){
                                       :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
                             <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
                         </el-form-item>
-                        <el-form-item label="电子签名" prop="tf_userSign" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+<!--                        <el-form-item label="电子签名" prop="tf_userSign" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
-                            <pc-signature v-model="formData.tf_userSign"></pc-signature>
+<!--                            <pc-signature v-model="formData.tf_userSign"></pc-signature>-->
-                        </el-form-item>
+<!--                        </el-form-item>-->
                     </el-form>
                     <el-row type="flex" justify="end">
                         <el-button @click="$refs.guava.index()" size="small">取消</el-button>

src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/apply/index.html

@@ -117,6 +117,22 @@ layout("/layouts/platform_h5.html"){
                         </van-radio-group>
                     </template>
                 </van-field>
+                <van-cell-group title="出生医学证明">
+                    <van-field class="more-text" name="files" :rules="[{ required: true,message:'请上传出生医学证明' }]"
+                               label="" required>
+                        <template #input>
+                            <h5-file-upload
+                                    slot="input"
+                                    :value.sync="formData.files"
+                                    :upload_number="10"
+                                    upload_mode="file"
+                                    upload_result_category="array"
+                                    upload_result_type="url"
+                                    complete_result
+                            ></h5-file-upload>
+                        </template>
+                    </van-field>
+                </van-cell-group>
             </van-cell-group>
 
             <!-- <van-cell-group title="假期类型" class="form-section">

src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/common/info.js

@@ -19,6 +19,9 @@ const MATERNITY_LEAVE_INFO = {
                     <van-cell title="是否难产">{{ viewData.isDystocia ?'是':'否'}}</van-cell>
                     <van-cell title="是否三胎">{{ viewData.isThreeChildren ?'是':'否'}}</van-cell>
                     <van-cell title="是否多胞胎">{{ viewData.isMultipleBirths ?'是':'否'}}</van-cell>
+                    <van-cell title="出生医学证明" class="direction-column-cell">
+                    <file-preview :files="viewData.files" complete_result></file-preview>
+                    </van-cell>
                     </van-cell-group> 
                 <template v-for="(task,index) in doneTasks">
                     <div class="process-title">