Quellcode durchsuchen

- PSSR开工方案台账优化
- PSSR开工方案附件上传功能编写完成默认值修改

wangggziwen vor 9 Monaten
Ursprung
Commit
c36f82cd37

+ 1 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrProgrammeController.java

@@ -357,7 +357,7 @@ public class TPssrProgrammeController extends BaseController {
             test.setSubId(subId);
             test.setFileUrl(url);
             test.setFileName(file.getOriginalFilename());
-            test.setWriteDone("");
+            test.setWriteDone("Y");
             test.setApproveStatus(0L);
             test.setCreatedate(new Date());
             test.setCreaterCode(getUserId().toString());

+ 12 - 9
ui/src/views/pssr/programme/index.vue

@@ -145,9 +145,9 @@
           </a>
         </template>
       </el-table-column>
-      <el-table-column label="编写完成" align="center" prop="writeDone" :show-overflow-tooltip="true"/>
-      <el-table-column label="核准完成" align="center" prop="checkDone" :show-overflow-tooltip="true"/>
-      <el-table-column label="培训完成" align="center" prop="trainDone" :show-overflow-tooltip="true"/>
+      <el-table-column label="编写完成(Y/N)" align="center" prop="writeDone" :show-overflow-tooltip="true"/>
+      <el-table-column label="核准完成(Y/N)" align="center" prop="checkDone" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训完成(Y/N)" align="center" prop="trainDone" :show-overflow-tooltip="true"/>
       <el-table-column label="确认人1" align="center" prop="confirm1" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{ userFormat(scope.row.confirm1) }}</span>
@@ -200,16 +200,19 @@
           <el-input v-model="form.fileName" disabled placeholder="请输入附件名称"/>
         </el-form-item>
         <el-form-item label="编写完成" prop="writeDone">
-          <el-radio v-model="form.writeDone" label="是">是</el-radio>
-          <el-radio v-model="form.writeDone" label="否">否</el-radio>
+          <el-radio v-model="form.writeDone" label="Y">Y</el-radio>
+          <el-radio v-model="form.writeDone" label="N">N</el-radio>
+          <el-radio v-model="form.writeDone" label="NA">NA</el-radio>
         </el-form-item>
         <el-form-item label="核准完成" prop="checkDone">
-          <el-radio v-model="form.checkDone" label="是">是</el-radio>
-          <el-radio v-model="form.checkDone" label="否">否</el-radio>
+          <el-radio v-model="form.checkDone" label="Y">Y</el-radio>
+          <el-radio v-model="form.checkDone" label="N">N</el-radio>
+          <el-radio v-model="form.checkDone" label="NA">NA</el-radio>
         </el-form-item>
         <el-form-item label="培训完成" prop="trainDone">
-          <el-radio v-model="form.trainDone" label="是">是</el-radio>
-          <el-radio v-model="form.trainDone" label="否">否</el-radio>
+          <el-radio v-model="form.trainDone" label="Y">Y</el-radio>
+          <el-radio v-model="form.trainDone" label="N">N</el-radio>
+          <el-radio v-model="form.trainDone" label="NA">NA</el-radio>
         </el-form-item>
         <el-form-item label="关联培训" prop="trainingId">
           <el-select v-model="form.trainingId" filterable placeholder="请选择培训">