Преглед на файлове

完成了通知公告字体颜色

sunyanqiang преди 3 години
родител
ревизия
b8f24a4be9
променени са 2 файла, в които са добавени 59 реда и са изтрити 41 реда
  1. 40 27
      src/views/medicalhealth/examine/index.vue
  2. 19 14
      src/views/system/notice/index.vue

+ 40 - 27
src/views/medicalhealth/examine/index.vue

@@ -216,9 +216,15 @@
       width="1016px"
       append-to-body
       :close-on-click-modal="false"
-      >
+    >
       <div class="ww">
-        <el-form ref="form" :model="form" :rules="rules" :inline="true" style="margin-left: 30px;">
+        <el-form
+          ref="form"
+          :model="form"
+          :rules="rules"
+          :inline="true"
+          style="margin-left: 30px"
+        >
           <el-form-item label="年份" prop="yeardate">
             <el-input v-model="form.yeardate" />
           </el-form-item>
@@ -232,24 +238,30 @@
             ></quill-editor>
           </el-form-item>
         </el-form>
-         </div>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel" size="btn">取 消</el-button>
-        </div>
-     
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
+      </div>
     </el-dialog>
 
     <!-- 查看体检信息 -->
-   
-      <el-dialog
-        title="添加体检信息"
-        :visible.sync="openes"
-        width="1016px"
-        append-to-body
-        :close-on-click-modal="false"
-      > <div class="ee">
-        <el-form ref="form" :model="form" :rules="rules" :inline="true" style="margin-left: 30px;">
+
+    <el-dialog
+      title="添加体检信息"
+      :visible.sync="openes"
+      width="1016px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <div class="ee">
+        <el-form
+          ref="form"
+          :model="form"
+          :rules="rules"
+          :inline="true"
+          style="margin-left: 30px"
+        >
           <el-form-item label="年份" prop="yeardate">
             <el-input v-model="form.yeardate" />
           </el-form-item>
@@ -263,10 +275,9 @@
             ></quill-editor>
           </el-form-item>
         </el-form>
-        </div>
-      </el-dialog>
-    </div>
-  
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
@@ -441,6 +452,8 @@ export default {
       const id = row.id || this.ids;
       getExamine(id).then((response) => {
         this.form = response.data;
+        this.form.yeardate = null;
+        this.form.checkInformation = null;
         // this.getRenYuan(this.form.unitId);
         this.opene = true;
         this.title = "新增人员体检信息";
@@ -543,28 +556,28 @@ export default {
   font: 18px;
 }
 ::v-deep .el-input__inner {
-  width: 200px !important;
+  /* width: 200px !important; */
   height: 36px;
   background: transparent;
   color: #fff;
   border: 1px solid white !important;
+  margin-top: -10px;
 }
 /* 添加体检信息 */
-.ww .el-form  {
+.ww .el-form {
   margin-bottom: 70px !important;
 }
 ::v-deep .el-dialog__footer {
-    margin-right: 27px !important;}
+  margin-right: 27px !important;
+}
 /*调整表单间距 */
 ::v-deep .el-form-item__content {
   width: 200px;
 }
-.ee .el-form  {
+.ee .el-form {
   margin-bottom: 70px !important;
 }
 
-
-
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {
   background: #004d86 !important;

+ 19 - 14
src/views/system/notice/index.vue

@@ -115,10 +115,16 @@
         width="100"
       >
         <template slot-scope="scope">
-          <dict-tag
+          <span v-if="scope.row.noticeType == '1'" style="color: #13ce66"
+            >通知</span
+          >
+          <span v-if="scope.row.noticeType == '2'" style="color: #ffba00"
+            >公告</span
+          >
+          <!-- <dict-tag
             :options="dict.type.sys_notice_type"
             :value="scope.row.noticeType"
-          />
+          /> -->
         </template>
       </el-table-column>
       <el-table-column label="状态" align="center" prop="status" width="100">
@@ -221,19 +227,19 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="发布人" prop="createBy">
-              <el-input v-model="form.createBy" disabled placeholder="请输入发布人" />
+              <el-input
+                v-model="form.createBy"
+                disabled
+                placeholder="请输入发布人"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="" prop="">
-            </el-form-item>
+            <el-form-item label="" prop=""> </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="附件上传" label-width="0px" prop="filename">
-              <fileUpload
-                v-model="form.filename"
-                class="m-l-20"
-              />
+              <fileUpload v-model="form.filename" class="m-l-20" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -403,8 +409,8 @@ export default {
     submitForm: function () {
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          if(this.form.filename){
-             this.form.filename=this.form.filename[0].url;
+          if (this.form.filename) {
+            this.form.filename = this.form.filename[0].url;
           }
           if (this.form.noticeId != undefined) {
             updateNotice(this.form).then((response) => {
@@ -482,9 +488,8 @@ export default {
   background: transparent;
   color: #fff;
   border: 1px solid white !important;
-  
 }
-::v-deep .el-form .el-input__inner{
+::v-deep .el-form .el-input__inner {
   height: 36px !important;
 }
 /* 单位框背景颜色 */
@@ -569,7 +574,7 @@ export default {
 ::v-deep .el-upload__tip {
   display: none;
 }
-::v-deep .el-input.is-disabled .el-input__inner{
+::v-deep .el-input.is-disabled .el-input__inner {
   background-color: transparent !important;
 }
 </style>