1

src/main/java/com/budwk/app/zhgh/welfare/model/WelfareProject.java

@@ -214,7 +214,7 @@ public class WelfareProject extends BaseModel implements SysHomeConvert {
         sysHomeActivity.setH5Url("/platform/h5/welfare/userSelect/index?id=" + this.getId());
         sysHomeActivity.setStartDate(this.getChoiceTimeStart());
         sysHomeActivity.setEndDate(this.getChoiceTimeEnd());
-        sysHomeActivity.setAllowUserSql("select userId from welfare_list where projectId = '" + this.getId() + "' and userId = @userId");
+        sysHomeActivity.setAllowUserSql("select userId from welfare_list where projectId = (select id from welfare_project where id='" + this.getId() + "' and provideMode!=1) and userId = @userId ");
         sysHomeActivity.setEnable(true);
         sysHomeActivity.setClassPath(this.getClass().getPackageName() + this.getClass().getName());
         return sysHomeActivity;

src/main/resources/views/platform/sys/msg/summary/index.html

@@ -79,9 +79,19 @@ layout("/layouts/platform.html"){
         </el-card>
     </guava>
     <el-dialog :visible.sync="backDialogVisible" title="反馈附件" width="40%" top="2%">
-        <div style="width: 100%; text-align: center">
-            <file-preview :files="backFiles" complete_result></file-preview>
-        </div>
+     
+	    <el-dialog :visible.sync="backDialogVisible" title="反馈附件" width="40%" top="2%">
+		    <el-form v-model="backFormData" ref="backFormRef" label-width="80px">
+			    <el-form-item label="反馈附件" prop="files">
+				    <div style="width: 100%; text-align: center">
+					    <file-preview :files="backFiles" complete_result></file-preview>
+				    </div>
+			    </el-form-item>
+			    <el-form-item label="反馈内容" prop="backText">
+				    <el-input v-model="backFormData.backText" type="textarea" :rows="4" max="500" readonly></el-input>
+			    </el-form-item>
+		    </el-form>
+	    </el-dialog>
     </el-dialog>
 </div>
 
@@ -108,7 +118,7 @@ layout("/layouts/platform.html"){
                     readType: null
                 },
                 unionList: [],
-                unitList: []
+                unitList: [],
             }
         },
         components: {},
@@ -127,6 +137,9 @@ layout("/layouts/platform.html"){
                 this.doSearch()
             },
             viewFiles(row) {
+				this.backFormData = {
+					...row
+				}
                 this.backFiles = row.backFiles
                 this.backDialogVisible = true
             },

src/main/resources/views/platform/zhgh/welfare/select/optionSelect.js

@@ -179,7 +179,7 @@ const optionSelect = {
                                         </el-input>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="24">
+                                <el-col :span="24" v-if="projectInfo.signMode === 2">
                                     <el-form-item prop="sign" label="签字">
                                         <pc-signature v-model="contactForm.userSign"></pc-signature>
                                     </el-form-item>