commit

src/main/resources/views/platform/zhgh/dayofficework/fund/member/write/index.html

@@ -103,11 +103,11 @@ layout("/layouts/platform.html"){
                 ></file-upload>
             </el-form-item>
 
-            <el-form-item>
-                <el-checkbox v-model="isAgree">
-                    本人自愿申请参加南昌大学教职工医疗互助“爱心”基金会，同意并遵守《南昌大学教职工医疗互助“爱心”基金管理办法》的相关规定。
-                </el-checkbox>
-            </el-form-item>
+<!--            <el-form-item>-->
+<!--                <el-checkbox v-model="isAgree">-->
+<!--                    本人自愿申请参加南昌大学教职工医疗互助“爱心”基金会，同意并遵守《南昌大学教职工医疗互助“爱心”基金管理办法》的相关规定。-->
+<!--                </el-checkbox>-->
+<!--            </el-form-item>-->
 
         </el-form>
         <el-row type="flex" justify="end" class="mt20">
@@ -182,10 +182,10 @@ layout("/layouts/platform.html"){
             onSubmit() {
                 this.$refs.formRef.validate(valid => {
                     if (!valid) return
-                    if (!this.isAgree) {
-                        this.$message.error("请先阅读并同意《南昌大学教职工医疗互助“爱心”基金管理办法》")
-                        return
-                    }
+                    // if (!this.isAgree) {
+                    //     this.$message.error("请先阅读并同意《南昌大学教职工医疗互助“爱心”基金管理办法》")
+                    //     return
+                    // }
                     this.$confirm("您确定要提交吗？", "提示", {
                         confirmButtonText: "确定",
                         cancelButtonText: "取消",

src/main/resources/views/platform/zhgh/staffbenefit/blessing/blessingUser.html

@@ -87,7 +87,7 @@ layout("/layouts/platform.html"){
                         <div class="search-item-option">
                             <dict-select v-model="pageForm.personType" style="width: 100%" clearable
                                          placeholder="人员类型"
-                                         code="UserType"></dict-select>
+                                         code="USER_PERSON_TYPE"></dict-select>
                         </div>
                     </div>
 
@@ -96,7 +96,7 @@ layout("/layouts/platform.html"){
                         <div class="search-item-option">
                             <dict-select v-model="pageForm.userState" style="width: 100%" clearable
                                          placeholder="在职状态"
-                                         code="UserState"></dict-select>
+                                         code="USER_STATE"></dict-select>
                         </div>
                     </div>
 
@@ -147,7 +147,6 @@ layout("/layouts/platform.html"){
         mixins: [initTableMixins],
         components: {
             "vcron": vcrontab.default,
-            'dict-select': httpVueLoader('/components/plugins/DictSelect.vue?v=1.0.0'),
         },
         data() {
             return {

src/main/resources/views/platform/zhghh5/welfare/select/index.html

@@ -736,7 +736,7 @@ layout("/layouts/platform_h5.html"){
 
                     <!-- 签字组件 -->
                     <div class="confirm-section" v-if="projectInfo.signMode === 2">
-                        <div class="confirm-section-title">请签字确认</div>
+                        <div class="confirm-section-title">请签字(下滑此页面打开签字版签字)</div>
                         <h5-signature v-model="formData.userSign" ref="signatureRef"></h5-signature>
                         <div class="signature-tips">{{ formData.userSign ? '您已完成签名' : '请在上方空白区域完成签名'
                             }}