Merge remote-tracking branch 'websoft/master'

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

src/views/settlement/formal-settlement.vue

@@ -117,7 +117,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="120" fixed="right" align="center">
           <template #default="{ row }"
             ><div class="formal-page__links">
               <el-link
@@ -192,33 +192,41 @@
       :readonly="editor.readonly"
       @success="loadTable"
     />
-    <el-dialog v-model="paymentDialog.visible" title="付款申请" width="520px" append-to-body>
-      <el-form :model="paymentDialog.form" label-position="right" label-width="auto">
-        <el-form-item label="结算单号">{{
-          paymentDialog.row.formalSettlementNo || '-'
-        }}</el-form-item>
-        <el-form-item label="剩余可申请金额">{{
-          formatMoney(paymentAvailable, paymentDialog.row.currency)
-        }}</el-form-item>
-        <el-form-item label="申请付款金额" required
-          ><el-input-number
-            v-model="paymentDialog.form.appliedAmount"
-            :min="0.01"
-            :max="paymentAvailable"
-            :precision="2"
-            :controls="false"
-        /></el-form-item>
-        <el-form-item label="备注"
-          ><el-input
-            v-model="paymentDialog.form.remark"
-            type="textarea"
-            maxlength="200"
-            show-word-limit
-        /></el-form-item>
-      </el-form>
+    <el-dialog
+      v-model="paymentDialog.visible"
+      title="付款申请"
+      width="520px"
+      append-to-body
+      class="formal-payment-dialog"
+    >
+      <section-card title="付款信息">
+        <el-form :model="paymentDialog.form" label-position="right" label-width="auto">
+          <el-form-item label="结算单号">{{
+            paymentDialog.row.formalSettlementNo || '-'
+          }}</el-form-item>
+          <el-form-item label="剩余可申请金额">{{
+            formatMoney(paymentAvailable, paymentDialog.row.currency)
+          }}</el-form-item>
+          <el-form-item label="申请付款金额" required
+            ><el-input-number
+              v-model="paymentDialog.form.appliedAmount"
+              :min="0.01"
+              :max="paymentAvailable"
+              :precision="2"
+              :controls="false"
+          /></el-form-item>
+          <el-form-item label="备注"
+            ><el-input
+              v-model="paymentDialog.form.remark"
+              type="textarea"
+              maxlength="200"
+              show-word-limit
+          /></el-form-item>
+        </el-form>
+      </section-card>
       <template #footer
         ><el-button @click="paymentDialog.visible = false">取消</el-button
-        ><el-button type="primary" :loading="paymentDialog.loading" @click="submitPayment"
+        ><el-button type="success" :loading="paymentDialog.loading" @click="submitPayment"
           >提交</el-button
         ></template
       >
@@ -530,7 +538,7 @@ export default {
 .formal-page__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);
 }
 .formal-page__search-grid {
   display: grid;