Merge remote-tracking branch 'websoft/master'

# Conflicts:
#	src/views/settlement/transport-reconciliation.vue

src/views/settlement/pre-settlement.vue

@@ -130,7 +130,7 @@
             <span v-else>{{ displayValue(row[column.prop]) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="320" fixed="right" align="center">
+        <el-table-column label="操作" width="130" fixed="right" align="center">
           <template #default="{ row }">
             <div class="pre-settlement-page__links">
               <el-link
@@ -257,23 +257,30 @@
       </template>
     </el-dialog>
 
-    <el-dialog v-model="printDialog.visible" title="打印" width="620px" append-to-body>
-      <div class="dialog-section-title">选择打印模板</div>
-      <el-form label-position="right" label-width="auto" class="pre-settlement-page__print-form">
-        <el-form-item label="项目">
-          <span>{{ printDialog.row.projectName || '-' }}</span>
-        </el-form-item>
-        <el-form-item label="模板名称">
-          <el-select v-model="printDialog.template" placeholder="请选择">
-            <el-option
-              v-for="item in printDialog.templates"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-      </el-form>
+    <el-dialog
+      v-model="printDialog.visible"
+      title="打印"
+      width="620px"
+      append-to-body
+      class="pre-settlement-print-dialog"
+    >
+      <section-card title="选择打印模板">
+        <el-form label-position="right" label-width="auto" class="pre-settlement-page__print-form">
+          <el-form-item label="项目">
+            <span>{{ printDialog.row.projectName || '-' }}</span>
+          </el-form-item>
+          <el-form-item label="模板名称">
+            <el-select v-model="printDialog.template" placeholder="请选择">
+              <el-option
+                v-for="item in printDialog.templates"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-form>
+      </section-card>
       <template #footer>
         <el-button @click="printDialog.visible = false">取消</el-button>
         <el-button type="primary" :loading="printDialog.loading" @click="handlePrintPreview">
@@ -699,7 +706,7 @@ export default {
   &__search {
     padding: 12px 12px 4px;
     background: #fff;
-    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
   }
 
   &__search-grid {
@@ -754,8 +761,6 @@ export default {
   }
 
   &__print-form {
-    margin-top: 20px;
-
     :deep(.el-select) {
       width: 320px;
     }
@@ -774,22 +779,6 @@ export default {
   }
 }
 
-.dialog-section-title {
-  display: flex;
-  align-items: center;
-  min-height: 22px;
-  font-size: 16px;
-  font-weight: 600;
-
-  &::before {
-    width: 4px;
-    height: 18px;
-    margin-right: 8px;
-    background: #409eff;
-    content: '';
-  }
-}
-
 :deep(.pre-settlement-page .el-table) {
   --el-table-border-color: #eff1f7;
   background: #fff;