Merge remote-tracking branch 'websoft/master'

src/views/business/components/business-crud-page.vue

@@ -1517,7 +1517,7 @@
             empty-text="暂无货物信息"
           >
             <el-table-column type="index" label="序号" width="70" align="center" fixed="left" />
-            <el-table-column label="货物名称" min-width="150" align="center">
+            <el-table-column label="货物名称" min-width="240" align="center">
               <template #default="{ row }">
                 <el-autocomplete
                   v-model="row.cargoName"

src/views/business/master-order.vue

@@ -1,7 +1,7 @@
 <template>
   <basic-container class="master-order-page">
     <template v-if="mode === 'list'">
-      <el-form :model="query" class="master-search" label-width="160px" @submit.prevent>
+      <el-form :model="query" class="master-search" label-width="88px" @submit.prevent>
         <el-row :gutter="16">
           <el-col v-for="field in primaryFields" :key="field.prop" :span="6"
             ><el-form-item :label="field.label"

src/views/business/temporary-credit-limit.vue

@@ -816,7 +816,6 @@ export default {
   width: 180px !important;
 }
 .el-form-item--default .el-form-item__label {
-  min-height: 30px;
   height: auto !important;
 }
 </style>

src/views/business/voucher-manage.vue

@@ -1,7 +1,7 @@
 <template>
   <basic-container class="voucher-manage-page">
     <section class="voucher-manage-page__search">
-      <el-form :model="query" label-position="right" label-width="160px">
+      <el-form :model="query" label-position="right" label-width="88px">
         <div class="voucher-manage-page__search-grid">
           <el-form-item label="凭证批次号"
             ><el-input v-model="query.voucherBatchNo" clearable placeholder="请输入"
@@ -290,7 +290,7 @@
     <el-form
       :model="batchQuery"
       label-position="right"
-      label-width="160px"
+      label-width="88px"
       class="voucher-manage-page__batch-search"
       ><el-row :gutter="20"
         ><el-col :span="12"
@@ -365,7 +365,7 @@
     @opened="loadProgress"
   >
     <section-card class="voucher-manage-page__progress-search">
-      <el-form :model="progressQuery" label-position="right" label-width="160px"
+      <el-form :model="progressQuery" label-position="right" label-width="88px"
         ><div class="voucher-manage-page__search-grid">
           <el-form-item label="凭证批次号"
             ><el-input