Merge remote-tracking branch 'websoft/master'

# Conflicts:
#	src/views/business/components/business-crud-page.vue

src/views/settlement/components/formal-settlement-table-panel.vue

@@ -64,7 +64,7 @@
           <el-link v-if="column.link && row[column.prop]" type="primary" @click="emitAction('view', row)">{{
             row[column.prop]
           }}</el-link>
-          <el-tag v-else-if="column.status" :type="statusType(row.approvalStatus)">{{
+          <el-tag v-else-if="column.status" :type="statusType(row.approvalStatus)" class="status-text">{{
             displayValue(row[column.prop])
           }}</el-tag>
           <span v-else-if="column.money">{{ formatMoney(row[column.prop], row.currency) }}</span>

src/views/settlement/components/pre-settlement-editor.vue

@@ -424,26 +424,27 @@
     destroy-on-close
     class="pre-settlement-candidate-dialog"
   >
-    <div class="dialog-section-title">选择结算明细</div>
-    <el-form :model="candidateQuery" inline label-position="right" label-width="auto">
-      <el-form-item label="批次号">
-        <el-input v-model="candidateQuery.batchNo" clearable placeholder="请输入" />
-      </el-form-item>
-      <el-form-item label="费用日期">
-        <el-date-picker
-          v-model="candidateQuery.feeDateRange"
-          type="daterange"
-          value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="loadCandidates">查询</el-button>
-        <el-button @click="resetCandidateQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+    <section-card title="选择结算明细">
+      <el-form :model="candidateQuery" inline label-position="right" label-width="auto">
+        <el-form-item label="批次号">
+          <el-input v-model="candidateQuery.batchNo" clearable placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="费用日期">
+          <el-date-picker
+            v-model="candidateQuery.feeDateRange"
+            type="daterange"
+            value-format="YYYY-MM-DD"
+            format="YYYY-MM-DD"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="loadCandidates">查询</el-button>
+          <el-button @click="resetCandidateQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </section-card>
     <el-table
       ref="candidateTableRef"
       v-loading="candidateDialog.loading"

src/views/settlement/pre-settlement.vue

@@ -118,7 +118,7 @@
             >
               {{ row[column.prop] }}
             </el-link>
-            <el-tag v-else-if="column.status" :type="statusTagType(row.approvalStatus)">
+            <el-tag v-else-if="column.status" :type="statusTagType(row.approvalStatus)" class="status-text">
               {{ row[column.prop] || '-' }}
             </el-tag>
             <span v-else-if="column.money">

src/views/settlement/receivable-payable-detail.vue

@@ -63,6 +63,7 @@
           :label="column.label"
           :min-width="column.minWidth"
           :align="column.align || 'center'"
+          :fixed="column.fixed"
           show-overflow-tooltip
         >
           <template #default="{ row }">

src/views/settlement/settlement-adjustment.vue

@@ -71,7 +71,7 @@
               type="primary"
               @click="openView(row)"
               >{{ row[column.prop] }}</el-link
-            ><el-tag v-else-if="column.status" :type="statusType(row.approvalStatus)">{{
+            ><el-tag v-else-if="column.status" :type="statusType(row.approvalStatus)" class="status-text">{{
               row[column.prop] || '-'
             }}</el-tag
             ><span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span