From b1ead1307314369986e2c5008f5193ade81449fd Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Tue, 20 May 2025 09:41:39 +0800
Subject: [PATCH] dev

---
 .../inventory/supplier/AddSupplier.vue        |   4 +-
 .../ArtificialReconciliation.vue              | 129 +++++++++--------
 .../social/reconciliation/DetailList.vue      |   2 +-
 src/views/dev/dev.vue                         |   2 +-
 src/views/settings/index.vue                  | 130 +++++++++---------
 5 files changed, 138 insertions(+), 129 deletions(-)

diff --git a/src/components/inventory/supplier/AddSupplier.vue b/src/components/inventory/supplier/AddSupplier.vue
index 7638cbd..8845713 100644
--- a/src/components/inventory/supplier/AddSupplier.vue
+++ b/src/components/inventory/supplier/AddSupplier.vue
@@ -48,8 +48,8 @@
     </div>
     <template #footer>
       <div class="bottom">
-        <el-button type="primary" @click="save">确定</el-button>
-        <el-button @click="close">取消</el-button>
+        <span class="default-btn" @click="save">确定</span>
+        <span class="default-btn" @click="close" style="margin-left: 24px">取消</span>
       </div>
     </template>
   </Mask>
diff --git a/src/components/social/reconciliation/ArtificialReconciliation.vue b/src/components/social/reconciliation/ArtificialReconciliation.vue
index 26fed56..23ee966 100644
--- a/src/components/social/reconciliation/ArtificialReconciliation.vue
+++ b/src/components/social/reconciliation/ArtificialReconciliation.vue
@@ -1,61 +1,68 @@
 <template>
-  <Mask :is-show="show" :height="600" :width="400" @close="close" title="手动对账">
-    <div class="form">
-      <el-form :model="formData" label-width="130" :rules="rules" ref="formRef">
-        <el-form-item label="对账日期" prop="date">
-          <el-date-picker
-              v-model="selectDate"
-              type="daterange"
-              @change="changeDate"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              style="height: 100%"
-          />
-        </el-form-item>
-        <el-form-item label="清算类别" prop="reconciliationType">
-          <el-select v-model="formData.reconciliationType" placeholder="请选择">
-            <el-option
-                v-for="item in clrTypeOptions"
-                :key="item.key"
-                :label="item.value"
-                :value="item.key"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="险种类型" prop="insuranceType">
-          <el-select v-model="formData.insuranceType" placeholder="请选择">
-            <el-option
-                v-for="item in insutypesOptions"
-                :key="item.key"
-                :label="item.value"
-                :value="item.key"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="经办机构" prop="handlingInstitution">
-          <el-input v-model="formData.handlingInstitution"></el-input>
-        </el-form-item>
-        <el-form-item label="医疗费用总额" prop="totalMedicalCost">
-          <el-input v-model.number="formData.totalMedicalCost" type="number"></el-input>
-        </el-form-item>
-        <el-form-item label="基金支付总额" prop="totalFundPayment">
-          <el-input v-model.number="formData.totalFundPayment" type="number"></el-input>
-        </el-form-item>
-        <el-form-item label="个账支付总额" prop="totalPersonalAccountPayment">
-          <el-input v-model.number="formData.totalPersonalAccountPayment" type="number"></el-input>
-        </el-form-item>
-        <el-form-item label="结算笔数" prop="settlementCount">
-          <el-input v-model.number="formData.settlementCount" type="number"></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="submitForm">对账</el-button>
-          <el-button @click="close">取消</el-button>
-        </el-form-item>
-      </el-form>
-    </div>
+  <Mask :is-show="show" :height="600" :width="400" @close="close" title="手动对账" :show-footer="true">
+    <template #default>
+      <div class="form">
+        <el-form :model="formData" label-width="130" :rules="rules" ref="formRef">
+          <el-form-item label="对账日期" prop="date">
+            <el-date-picker
+                v-model="selectDate"
+                type="daterange"
+                @change="changeDate"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                style="height: 100%"
+            />
+          </el-form-item>
+          <el-form-item label="清算类别" prop="reconciliationType">
+            <el-select v-model="formData.reconciliationType" placeholder="请选择">
+              <el-option
+                  v-for="item in clrTypeOptions"
+                  :key="item.key"
+                  :label="item.value"
+                  :value="item.key"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="险种类型" prop="insuranceType">
+            <el-select v-model="formData.insuranceType" placeholder="请选择">
+              <el-option
+                  v-for="item in insutypesOptions"
+                  :key="item.key"
+                  :label="item.value"
+                  :value="item.key"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="经办机构" prop="handlingInstitution">
+            <el-input v-model="formData.handlingInstitution"></el-input>
+          </el-form-item>
+          <el-form-item label="医疗费用总额" prop="totalMedicalCost">
+            <el-input v-model.number="formData.totalMedicalCost" type="number"></el-input>
+          </el-form-item>
+          <el-form-item label="基金支付总额" prop="totalFundPayment">
+            <el-input v-model.number="formData.totalFundPayment" type="number"></el-input>
+          </el-form-item>
+          <el-form-item label="个账支付总额" prop="totalPersonalAccountPayment">
+            <el-input v-model.number="formData.totalPersonalAccountPayment" type="number"></el-input>
+          </el-form-item>
+          <el-form-item label="结算笔数" prop="settlementCount">
+            <el-input v-model.number="formData.settlementCount" type="number"></el-input>
+          </el-form-item>
+          <el-form-item>
+
+          </el-form-item>
+        </el-form>
+      </div>
+    </template>
+    <template #footer>
+      <div class="footer">
+        <span class="default-btn" @click="submitForm">对账</span>
+        <span class="default-btn" @click="close" style="margin-left: 24px">取消</span>
+      </div>
+    </template>
   </Mask>
 </template>
 <script setup lang="ts">
@@ -76,6 +83,7 @@ const clrTypeOptions = Object.entries(clrType as ClrType).map(([key, value]) =>
   key: key,
   value: value
 }))
+
 interface Insutypes {
   [key: string]: string;
 }
@@ -173,4 +181,11 @@ function validateDate(rule: any, value: any, callback: any) {
   padding: 20px;
 }
 
+.footer {
+  height: 100%;
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  padding: 0 24px;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/social/reconciliation/DetailList.vue b/src/components/social/reconciliation/DetailList.vue
index 828d27a..e099287 100644
--- a/src/components/social/reconciliation/DetailList.vue
+++ b/src/components/social/reconciliation/DetailList.vue
@@ -1,7 +1,7 @@
 
 
 <template>
-<Mask :is-show="show"  :height="600" :width="1300" @close="close">
+<Mask :is-show="show"  :height="600" :width="1300" @close="close" title="对账详情">
     <div class="container-wrapper">
       <div class="table">
         <el-table :data="detailList" max-height="500px" highlight-current-row>
diff --git a/src/views/dev/dev.vue b/src/views/dev/dev.vue
index 78c14cb..03bcbe7 100644
--- a/src/views/dev/dev.vue
+++ b/src/views/dev/dev.vue
@@ -4,7 +4,7 @@
 </script>
 
 <template>
-<input  type="date">
+  <input  type="date">
 </template>
 
 <style scoped lang="scss">
diff --git a/src/views/settings/index.vue b/src/views/settings/index.vue
index f798627..b3ee97b 100644
--- a/src/views/settings/index.vue
+++ b/src/views/settings/index.vue
@@ -1,71 +1,48 @@
 <template>
   <div class="container-wrapper">
     <Panel title="基础信息">
-      <div class="form">
-        <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-width="auto"
-                 class="demo-ruleForm" status-icon label-position="top">
-          <el-descriptions
-              direction="vertical"
-              :column="3"
-              :label-width="100"
-              :label-position="'top'"
-              :border="false"
-              style="width: 100%"
-          >
-            <el-descriptions-item label="机构名称">
-              <el-form-item prop="common_name">
-                <el-input v-model="ruleForm.common_name"/>
-              </el-form-item>
-            </el-descriptions-item>
-            <el-descriptions-item label="机构简称">
-              <el-form-item>
-                <el-input v-model="ruleForm.common_sortName" style="margin: 0 24px"/>
-              </el-form-item>
-            </el-descriptions-item>
-            <el-descriptions-item label="定点机构编码">
-              <el-form-item prop="social_fixmedinsCode">
-                <el-input v-model="ruleForm.social_fixmedinsCode"/>
-              </el-form-item>
-            </el-descriptions-item>
-            <el-descriptions-item label="定点机构名称">
-              <el-form-item prop="social_fixmedinsName">
-                <el-input v-model="ruleForm.social_fixmedinsName"/>
-              </el-form-item>
-            </el-descriptions-item>
-            <el-descriptions-item label="就医区域划分">
-              <el-form-item prop="social_mdtrtareaAdmvs">
-                <el-input v-model="ruleForm.social_mdtrtareaAdmvs" style="margin: 0 24px"/>
-              </el-form-item>
-            </el-descriptions-item>
-            <el-descriptions-item label="医保接口">
-              <el-form-item prop="social_url">
-                <el-input v-model="ruleForm.social_url"/>
-              </el-form-item>
-            </el-descriptions-item>
-            <el-descriptions-item label="电子凭证接口">
-              <el-form-item prop="social_certUrl">
-                <el-input v-model="ruleForm.social_certUrl"/>
-              </el-form-item>
-            </el-descriptions-item>
-            <el-descriptions-item label="数字签名">
-              <el-form-item prop="social_cainfo">
-                <el-input v-model="ruleForm.social_cainfo" style="margin:0 24px"/>
-              </el-form-item>
-            </el-descriptions-item>
-            <el-descriptions-item
-                :rowspan="2"
-                label="logo上传">
-              <el-form-item>
-                <UpLoad v-model="uploadURL" ref="uploadRef" @uploadSuccess="uploadSuccess"
-                        style="margin-left: 24px"></UpLoad>
-              </el-form-item>
-            </el-descriptions-item>
-          </el-descriptions>
-        </el-form>
-      </div>
-      <div style="display: flex;justify-content: flex-end;padding: 0 24px">
-        <span class="default-btn" @click="submitForm(ruleFormRef)">保存</span>
-      </div>
+      <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-width="auto"
+               class="demo-ruleForm" status-icon label-position="top">
+        <div class="form">
+          <div class="left">
+            <el-form-item prop="common_name" label="机构名称">
+              <el-input v-model="ruleForm.common_name"/>
+            </el-form-item>
+            <el-form-item prop="social_certUrl" label="电子凭证接口">
+              <el-input v-model="ruleForm.social_certUrl"/>
+            </el-form-item>
+            <el-form-item prop="social_cainfo" label="数字签名">
+              <el-input v-model="ruleForm.social_cainfo"/>
+            </el-form-item>
+            <el-form-item prop="social_fixmedinsName" label="定点机构名称">
+              <el-input v-model="ruleForm.social_fixmedinsName"/>
+            </el-form-item>
+          </div>
+          <div class="center">
+            <el-form-item prop="social_insuplcAdmdvs" label="机构简称">
+              <el-input v-model="ruleForm.common_sortName"/>
+            </el-form-item>
+            <el-form-item prop="social_mdtrtareaAdmvs" label="就医区域划分">
+              <el-input v-model="ruleForm.social_mdtrtareaAdmvs"/>
+            </el-form-item>
+            <el-form-item label="logo上传">
+              <UpLoad v-model="uploadURL" ref="uploadRef" @uploadSuccess="uploadSuccess"
+                      style="margin-left: 24px"></UpLoad>
+            </el-form-item>
+          </div>
+          <div class="right">
+            <el-form-item prop="social_fixmedinsCode" label="定点机构编码">
+              <el-input v-model="ruleForm.social_fixmedinsCode"/>
+            </el-form-item>
+            <el-form-item prop="social_url" label="医保接口">
+              <el-input v-model="ruleForm.social_url"/>
+            </el-form-item>
+          </div>
+        </div>
+        <div style="display: flex;justify-content: flex-end;padding: 0 24px;height: 50px">
+          <span class="default-btn" @click="submitForm(ruleFormRef)">保存</span>
+        </div>
+      </el-form>
     </Panel>
   </div>
 </template>
@@ -146,9 +123,26 @@ const uploadSuccess = (url: any) => {
   background: #fff;
 }
 
-.form {
-  width: 100%;
-  padding: 0 24px;
+.demo-ruleForm {
+  height: 100%;
+  min-height: 0;
+  display: flex;
+  flex-direction: column;
+
+  .form {
+    width: 100%;
+    padding: 0 24px;
+    display: flex;
+
+    div {
+      flex: 1;
+      min-width: 0;
+    }
+
+    .center {
+      margin: 0 24px;
+    }
+  }
 }
 
 :deep(.el-descriptions__label.el-descriptions__cell:not(.is-bordered-label).is-vertical-label) {