修改部分功能

src/components/FormComponents/CustomForm/index.vue

@@ -50,9 +50,7 @@
             <template slot="title">
               {{ g.label }}
               <span v-if="g.label == '二、排除标准'" class="noCol">
-                {{
-                errorText
-                }}
+                {{ errorText }}
               </span>
             </template>
             <form-content
@@ -77,7 +75,8 @@
             size="large"
             :disabled="disabled"
             @click="onPrev"
-          >上一步</el-button>
+            >上一步</el-button
+          >
         </template>
         <template v-if="options.submitBtn">
           <el-button
@@ -87,7 +86,8 @@
             size="large"
             :disabled="disabled"
             @click="handleConfirm"
-          >{{ options.submitText || "提交" }}</el-button>
+            >{{ options.submitText || "提交" }}</el-button
+          >
         </template>
         <template v-if="options.emptyBtn">
           <el-button
@@ -95,7 +95,8 @@
             icon="el-icon-delete "
             size="large"
             @click="resetForm(true)"
-          >{{ options.emptyText || "清空" }}</el-button>
+            >{{ options.emptyText || "清空" }}</el-button
+          >
         </template>
       </template>
       <template v-if="nextTabBtnShow">
@@ -105,7 +106,8 @@
             icon="el-icon-caret-right"
             size="large"
             @click="nextTab"
-          >{{ options.nextTabText || "下一页" }}</el-button>
+            >{{ options.nextTabText || "下一页" }}</el-button
+          >
         </el-form>
       </template>
     </div>

src/views/audit-detail/components/publicDialog.vue

@@ -30,4 +30,9 @@ export default {
   },
 }
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+::v-deep .el-dialog__body {
+  border-top: none;
+  text-align: center;
+}
+</style>

src/views/audit-detail/index.vue

@@ -214,12 +214,8 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-::v-deep .el-dialog__body {
-  border-top: none;
-  text-align: center;
-  .tips {
-    font-size: 16px;
-  }
+.tips {
+  font-size: 16px;
 }
 .p-24 {
   padding: 0 24px;

src/views/screening/components/ConfigForms.vue

 <template>
-  <div id="publicContent" :class="activeName == 'index0' && formClass ? formClass : ''">
+  <div
+    id="publicContent"
+    :class="activeName == 'index0' && formClass ? formClass : ''"
+  >
     <div v-if="formTabs && formTabs.length > 0">
-      <el-button class="draftButton">
-        {{
-        formType == 1 ? "临时保存" : "返回"
-        }}
+      <el-button
+        class="draftButton"
+        @click="onSubmit(formType)"
+        :loading="loading"
+      >
+        {{ formType == 1 ? "临时保存" : "返回" }}
       </el-button>
       <el-tabs
         v-model="activeName"
@@ -41,14 +46,59 @@
       </el-tabs>
     </div>
     <el-empty v-else description="暂无数据"></el-empty>
+    <public-dialog
+      ref="showDialog"
+      @onSubmit="dialogSubmit"
+      @onCancel="dialogCancel"
+    >
+      <!-- 保存草稿 -->
+      <template v-if="dialogType == 'draft'" slot="content">
+        <div class="title center">已保存至草稿箱！</div>
+        <div class="content center">
+          <div class="img">
+            <img src="~@/assets/img/DataCenter/draft.png" alt="" />
+          </div>
+          <div class="showTips">您可以在【草稿箱】页面找到该数据</div>
+        </div>
+        <div class="btn">
+          <el-button type="primary" :loading="loading" @click="continueSubmit"
+            >继续添加</el-button
+          >
+        </div>
+      </template>
+      <!-- 保存提交 -->
+      <template v-if="dialogType == 'submit'" slot="content">
+        <div class="title center">提交成功！</div>
+        <div class="content center">
+          <div class="img">
+            <img src="~@/assets/img/DataCenter/submit.png" alt="" />
+          </div>
+          <div class="showTips">您可以在【筛查查询】页面查询到该数据</div>
+        </div>
+        <div class="btn">
+          <el-button
+            type="primary"
+            :loading="loading"
+            @click="view"
+            class="textBtn"
+            >查看</el-button
+          >
+          <el-button type="primary" :loading="loading" @click="continueSubmit"
+            >继续添加</el-button
+          >
+        </div>
+      </template>
+    </public-dialog>
   </div>
 </template>
 
 <script>
 import mixin from "./mixin"
 import CustomForm from "@/components/FormComponents/CustomForm/index"
+import publicDialog from "../../audit-detail/components/publicDialog.vue"
 
 export default {
+  components: { publicDialog },
   name: "ConfigForms",
   mixins: [mixin],
   props: {
@@ -61,15 +111,33 @@ export default {
     return {
       // showIndex:false,
       // survivalFlag:false
+      dialogType: "",
+      loading: false,
     }
   },
   methods: {
+    view() {},
     handleConfirm(data, done, cb) {
       this.addPatient(data, done, cb)
     },
     onPrev(done) {
       this.prevTab(done)
     },
+    onSubmit(type) {
+      this.loading = true
+      if (type == 1) {
+        // 临时保存草稿
+        this.dialogType = "draft"
+        this.$refs.showDialog.dialogVisible = true
+
+        this.loading = false
+      } else {
+        // 返回
+      }
+    },
+    dialogSubmit() {},
+    dialogCancel() {},
+    continueSubmit() {},
   },
   created() {
     // 字典formType 1 筛查表单
@@ -126,6 +194,32 @@ export default {
     border: 1px solid #4e68ff;
     color: #4e68ff;
   }
+  .content {
+    img {
+      width: 248px;
+      height: 180px;
+    }
+  }
+}
+::v-deep .el-dialog__body {
+  .title {
+    font-size: 22px;
+    font-family: AlibabaPuHuiTiM;
+    color: rgba(0, 0, 0, 0.8);
+    margin-bottom: 20px;
+  }
+  .showTips {
+    font-size: 16px;
+    font-family: AlibabaPuHuiTiR;
+    color: rgba(0, 0, 0, 0.8);
+    margin-bottom: 20px;
+  }
+  .btn {
+    .el-button {
+      width: 100px;
+      height: 32px;
+    }
+  }
 }
 .publicTab {
   // width: calc(100%);
@@ -198,4 +292,11 @@ export default {
     }
   }
 }
+.textBtn {
+  width: 100px;
+  height: 32px;
+  background: #ffffff;
+  border: 1px solid #4e68ff;
+  color: #4e68ff;
+}
 </style>

src/views/systems/operation-management/components/HealthPopularization.vue

@@ -33,7 +33,7 @@
       :show-close="true"
       @closed="resetForm"
     >
-      <div class="title">添加</div>
+      <div class="title">{{ readOnly ? "查看" : "添加" }}</div>
       <el-form
         ref="form"
         :model="form"
@@ -48,40 +48,45 @@
           :label="item.label"
           :prop="item.prop"
         >
-          <!-- 输入框 -->
-          <el-input
-            v-if="item.type == 'input'"
-            v-model="form[item.prop]"
-            autocomplete="off"
-            :placeholder="'请填写' + item.label"
-          ></el-input>
-          <!-- 下拉选 -->
-          <el-select
-            v-else-if="item.type == 'select'"
-            v-model="form[item.prop]"
-            :placeholder="'请选择' + item.label"
-          >
-            <el-option
-              v-for="e in item.selectGroup"
-              :key="e.value"
-              :label="e.label"
-              :value="e.value"
-            ></el-option>
-          </el-select>
-          <!-- 上传 -->
-          <el-upload-self
-            v-else-if="item.type === 'upload'"
-            v-model="form[item.prop]"
-            :btn-type="'text'"
-            v-bind="item"
-          ></el-upload-self>
-          <!-- switch -->
-          <!-- switch切换  启用 -->
-          <el-switch
-            v-else-if="item.type === 'switch'"
-            v-model="form[item.prop]"
-          >
-          </el-switch>
+          <template v-if="!readOnly">
+            <!-- 输入框 -->
+            <el-input
+              v-if="item.type == 'input'"
+              v-model="form[item.prop]"
+              autocomplete="off"
+              :placeholder="'请填写' + item.label"
+            ></el-input>
+            <!-- 下拉选 -->
+            <el-select
+              v-else-if="item.type == 'select'"
+              v-model="form[item.prop]"
+              :placeholder="'请选择' + item.label"
+            >
+              <el-option
+                v-for="e in item.selectGroup"
+                :key="e.value"
+                :label="e.label"
+                :value="e.value"
+              ></el-option>
+            </el-select>
+            <!-- 上传 -->
+            <el-upload-self
+              v-else-if="item.type === 'upload'"
+              v-model="form[item.prop]"
+              :btn-type="'text'"
+              v-bind="item"
+            ></el-upload-self>
+            <!-- switch -->
+            <!-- switch切换  启用 -->
+            <el-switch
+              v-else-if="item.type === 'switch'"
+              v-model="form[item.prop]"
+            >
+            </el-switch>
+          </template>
+          <template v-else>
+            <span>{{ form[item.prop] || "--" }}</span>
+          </template>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -103,6 +108,7 @@ export default {
   mixins: [paginationMixin],
   data() {
     return {
+      readOnly: true,
       addVisible: false,
       selectList: [
         {
@@ -169,7 +175,7 @@ export default {
           operType: "button",
           operations: [
             {
-              func: this.editMedical,
+              func: this.viewMedical,
               formatter(row) {
                 return {
                   label: "查看",
@@ -266,8 +272,17 @@ export default {
     addMedical() {
       this.addVisible = true
     },
+    // 查看
+    viewMedical() {
+      this.readOnly = true
+      this.form = {
+        title: "123",
+      }
+      this.addVisible = true
+    },
     // 编辑医联体
     editMedical(data) {
+      this.readOnly = false
       console.log(data)
       this.form = {
         medicalName: "黑乎乎",