Merge remote-tracking branch 'websoft/master'

# Conflicts:
#	src/views/business/contract-manage-change.vue

src/page/login/userlogin.vue

@@ -55,13 +55,13 @@
       <el-button type="primary" @click.prevent="handleLogin" class="login-submit"
         >{{ $t('login.submit') }}
       </el-button>
-      <el-button
-        v-if="this.registerMode"
-        type="danger"
-        @click.prevent="handleRegister"
-        class="register-submit"
-        >{{ $t('login.register') }}
-      </el-button>
+<!--      <el-button-->
+<!--        v-if="this.registerMode"-->
+<!--        type="danger"-->
+<!--        @click.prevent="handleRegister"-->
+<!--        class="register-submit"-->
+<!--        >{{ $t('login.register') }}-->
+<!--      </el-button>-->
     </el-form-item>
     <behavior-captcha ref="behaviorCaptcha" @success="handleBehaviorSuccess"></behavior-captcha>
   </el-form>

src/styles/element-ui.scss

@@ -1117,11 +1117,18 @@
   color: #909399 !important;
 }
 
-// 已选中：选中文本用主文字色 #333333，与占位符明显区分。
-// 注意：Element Plus 选中值节点同时带 el-select__selected-item 与 el-select__placeholder 两个类，
-// 而上面占位符规则用了 !important，故此处必须同样 !important 才能胜出（本规则 specificity 更高）。
+// 已选中：选中文本用主文字色 #606266，与占位符明显区分。
+// 关键：Element Plus 的「选中值文本」与「占位符」共用同一个节点，
+//   <div class="el-select__selected-item el-select__placeholder [is-transparent]">
+// 只有未选值（或已展开但无搜索输入）时才会带 .is-transparent。
+// 因此这里必须排除 .is-transparent，否则未选值的占位符也会被染成选中色，与占位符灰无法区分。
 // 仅作用于非禁用态，禁用态保留 Element Plus 的禁用灰（--el-select-disabled-color），避免被覆盖。
-.el-select__wrapper:not(.is-disabled) .el-select__selected-item {
+.el-select__wrapper:not(.is-disabled) .el-select__selected-item:not(.is-transparent) {
+  color: #606266 !important;
+}
+
+// 多选：选中项渲染为 el-tag，文字色由 tag 自身控制，上面规则覆盖不到，单独处理。
+.el-select__wrapper:not(.is-disabled) .el-select__tags-text {
   color: #606266 !important;
 }
 

src/views/base/region.vue

@@ -770,6 +770,6 @@ export default {
   margin-bottom: 12px !important;
 }
 .el-form-item{
-  margin-bottom: 8px !important;
+  margin-bottom: 9px !important;
 }
 </style>

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

@@ -13573,7 +13573,9 @@ export default {
   :deep(.el-form-item__content > .el-select),
   :deep(.el-form-item__content > .el-cascader),
   :deep(.el-form-item__content > .el-input-number),
-  :deep(.el-form-item__content > .el-date-editor) {
+  :deep(.el-form-item__content > .el-date-editor),
+  :deep(.el-form-item__content > .el-autocomplete),
+  :deep(.el-form-item__content > .el-autocomplete > .el-input) {
     width: 250px;
     max-width: 100%;
   }
@@ -13644,7 +13646,7 @@ export default {
   &__shipping-title,
   &__goods-title,
   &__task-title {
-    min-width: 100%;
+    //min-width: 100%;
   }
 
   &__shipping-route-action {
@@ -13891,7 +13893,7 @@ export default {
       );
     gap: 8px;
     align-items: center;
-    width: 100%;
+    width:98%;
 
     :deep(.el-input),
     :deep(.el-select),
@@ -13945,7 +13947,9 @@ export default {
   }
 
   &__dispatch-shipping-form &__route-address-row {
-    grid-template-columns: 260px minmax(280px, 1fr) 58px minmax(160px, 220px) 72px minmax(
+    // 地址列用 minmax(0, 1fr)：窗口较窄时地址输入框自动收窄，
+    // 避免各列最小宽度合计超出弹窗宽度，把右侧联系方式挤出弹窗。
+    grid-template-columns: 260px minmax(0, 1fr) 58px minmax(160px, 220px) 72px minmax(
         160px,
         220px
       );

src/views/vehicle/customer-archive.vue

@@ -497,38 +497,37 @@
                 >新增联系人</el-button
               >
             </div>
-              <el-table :data="contactTableData" border class="contact-table">
-                <el-table-column label="序号" prop="__index" width="90" align="center" />
-                <el-table-column label="联系人姓名" prop="contactName" min-width="150" />
-                <el-table-column label="联系人电话" prop="contactPhone" min-width="150" />
-                <el-table-column label="邮箱" prop="email" min-width="180" />
-                <el-table-column label="联系地址" min-width="240">
-                  <template #default="{ row }">
-                    <span>{{ formatContactAddress(row) || '-' }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column label="备注" prop="remark" min-width="180" />
-                <el-table-column label="所属分公司/事业部" min-width="170">
-                  <template #default="{ row }">
-                    <span>{{ row.branchName || archiveForm.deptName || '-' }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column label="操作" width="130" align="center" v-if="!readonly">
-                  <template #default="{ row }">
-                    <el-link type="primary" @click="openContact(row.__raw, row.__rawIndex)">
-                      修改
-                    </el-link>
-                    <el-link type="danger" @click="deleteContact(row.__rawIndex)">删除</el-link>
-                  </template>
-                </el-table-column>
-              </el-table>
-              <empty-pagination
-                :page="contactPaginationPage"
-                always-show
-                @size-change="size => handleDetailSizeChange('contact', size)"
-                @current-change="page => handleDetailCurrentChange('contact', page)"
-              />
-
+            <el-table :data="contactTableData" border class="contact-table">
+              <el-table-column label="序号" prop="__index" width="90" align="center" />
+              <el-table-column label="联系人姓名" prop="contactName" min-width="150" />
+              <el-table-column label="联系人电话" prop="contactPhone" min-width="150" />
+              <el-table-column label="邮箱" prop="email" min-width="180" />
+              <el-table-column label="联系地址" min-width="240">
+                <template #default="{ row }">
+                  <span>{{ formatContactAddress(row) || '-' }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="备注" prop="remark" min-width="180" />
+              <el-table-column label="所属分公司/事业部" min-width="170">
+                <template #default="{ row }">
+                  <span>{{ row.branchName || archiveForm.deptName || '-' }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" width="130" align="center" v-if="!readonly">
+                <template #default="{ row }">
+                  <el-link type="primary" @click="openContact(row.__raw, row.__rawIndex)">
+                    修改
+                  </el-link>
+                  <el-link type="danger" @click="deleteContact(row.__rawIndex)">删除</el-link>
+                </template>
+              </el-table-column>
+            </el-table>
+            <empty-pagination
+              :page="contactPaginationPage"
+              always-show
+              @size-change="size => handleDetailSizeChange('contact', size)"
+              @current-change="page => handleDetailCurrentChange('contact', page)"
+            />
           </el-tab-pane>
           <el-tab-pane label="收款信息" name="receiptAccounts">
             <div class="tab-table-toolbar" v-if="!readonly">
@@ -607,7 +606,9 @@
         </template>
         <template #extra>
           <div class="section-actions">
-            <el-button icon="el-icon-download" @click="downloadAttachments">批量下载</el-button>
+            <el-button type="primary" plain icon="el-icon-download" @click="downloadAttachments"
+              >批量下载</el-button
+            >
             <vehicle-attachment-upload
               v-if="!readonly"
               v-model="ocrQualificationUploadFiles"
@@ -817,9 +818,7 @@
 
       <div class="archive-form__footer">
         <!-- 次要：独立页返回 / 只读关闭 / 弹窗取消 -->
-        <el-button @click="closeArchive">{{
-          readonly ? '关闭' : '取消'
-        }}</el-button>
+        <el-button @click="closeArchive">{{ readonly ? '关闭' : '取消' }}</el-button>
         <el-button type="primary" plain v-if="!readonly" @click="saveArchive">保存</el-button>
         <el-button type="primary" v-if="!readonly" @click="saveAndSubmitArchive">提交</el-button>
       </div>
@@ -1145,7 +1144,7 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="最大资金使用额度">
-                <el-input :model-value="formatScoreValue(currentScore.maxCreditLimit)" disabled >
+                <el-input :model-value="formatScoreValue(currentScore.maxCreditLimit)" disabled>
                   <template #suffix>万元</template>
                 </el-input>
               </el-form-item>
@@ -1245,7 +1244,7 @@
                         </el-input>
                       </template>
                       <template v-else>
-<!--                        <div class="score-standard-cell__label">请选择：</div>-->
+                        <!--                        <div class="score-standard-cell__label">请选择：</div>-->
                         <el-select
                           v-model="detail.selectedOption"
                           filterable
@@ -1419,12 +1418,7 @@ import { normalizeSearchRangeParams } from '@/utils/search-range';
 import { ArrowRight, Location } from '@element-plus/icons-vue';
 import { ElImageViewer, ElLoading } from 'element-plus';
 import { OpenFileViewer } from '@open-file-viewer/vue';
-import {
-  fallbackPlugin,
-  imagePlugin,
-  officePlugin,
-  textPlugin,
-} from '@open-file-viewer/core';
+import { fallbackPlugin, imagePlugin, officePlugin, textPlugin } from '@open-file-viewer/core';
 import '@open-file-viewer/core/style.css';
 import pdfWorkerSrc from 'pdfjs-dist/build/pdf.worker.mjs?url';
 import { mapGetters } from 'vuex';
@@ -1482,7 +1476,9 @@ export default {
       }
     };
     const validateUnifiedCreditCode = (rule, value, callback) => {
-      const code = String(value || '').trim().toUpperCase();
+      const code = String(value || '')
+        .trim()
+        .toUpperCase();
       const charset = '0123456789ABCDEFGHJKLMNPQRTUWXY';
       const weights = [1, 3, 9, 27, 19, 26, 16, 17, 20, 29, 25, 13, 8, 24, 10, 30, 28];
       if (!code) {
@@ -1865,10 +1861,7 @@ export default {
     this.initScoreQuantificationOptions();
     if (this.isArchivePage) {
       const readonly = this.$route.query.view === '1' || this.$route.query.view === 'true';
-      this.openArchive(
-        this.$route.query.id ? { id: this.$route.query.id } : null,
-        readonly
-      );
+      this.openArchive(this.$route.query.id ? { id: this.$route.query.id } : null, readonly);
     }
   },
   computed: {
@@ -1917,8 +1910,8 @@ export default {
         const ids = Array.isArray(this.archiveForm.deptId)
           ? this.archiveForm.deptId
           : this.archiveForm.deptId
-            ? [this.archiveForm.deptId]
-            : [];
+          ? [this.archiveForm.deptId]
+          : [];
         const currentId = ids.length ? String(ids[ids.length - 1]) : '';
         if (!currentId) return [];
         return this.findDeptPath(currentId) || [currentId];
@@ -2596,15 +2589,10 @@ export default {
       });
     },
     initBusinessDictionaries() {
-      this.loadDictOptions(
-        'nature_of_client',
-        'customerNatureOptions',
-        [],
-        options => {
-          const customerNatureColumn = this.findColumn(this.option.column, 'customerNature');
-          customerNatureColumn.dicData = [{ label: '全部', value: '' }, ...options];
-        }
-      );
+      this.loadDictOptions('nature_of_client', 'customerNatureOptions', [], options => {
+        const customerNatureColumn = this.findColumn(this.option.column, 'customerNature');
+        customerNatureColumn.dicData = [{ label: '全部', value: '' }, ...options];
+      });
       this.loadDictOptions('customer_type', 'customerTypeOptions', ['客户', '承运商'], options => {
         const customerTypeColumn = this.findColumn(this.option.column, 'customerType');
         customerTypeColumn.dicData = [{ label: '全部', value: '' }, ...options];
@@ -3605,7 +3593,11 @@ export default {
         : this.splitValue(customerType);
       const requiredTypes = ['营业执照', '法人身份证'];
       const includesCarrier = customerTypes.some(item =>
-        ['承运商', 'carrier'].includes(String(item || '').trim().toLowerCase())
+        ['承运商', 'carrier'].includes(
+          String(item || '')
+            .trim()
+            .toLowerCase()
+        )
       );
       if (includesCarrier) requiredTypes.push('运输许可证');
       return requiredTypes;
@@ -3656,10 +3648,7 @@ export default {
       }
       files.forEach((item, index) => {
         window.setTimeout(() => {
-          downloadFileByUrl(
-            item.url,
-            item.originalName || item.name || `客商材料${index + 1}`
-          );
+          downloadFileByUrl(item.url, item.originalName || item.name || `客商材料${index + 1}`);
         }, index * 300);
       });
     },
@@ -4155,7 +4144,9 @@ export default {
           const changeLabel = item.changeType === 'decrease' ? '每减少' : '每增加';
           const scoreLabel = item.scoreType === 'subtract' ? '减' : '加';
           const generatedLabel = isScoreOption
-            ? `${changeLabel}${item.changeValue || ''}${item.changeUnit || ''}${scoreLabel}${item.score || ''}分`
+            ? `${changeLabel}${item.changeValue || ''}${item.changeUnit || ''}${scoreLabel}${
+                item.score || ''
+              }分`
             : '';
           const label = item.label || item.optionName || item.value || generatedLabel;
           return {
@@ -4359,7 +4350,8 @@ export default {
     calculateScore(score) {
       const details = score.details || [];
       details.forEach(detail => {
-        if (!this.isScoreTypeDetail(detail) || String(detail.scoreInput ?? '').trim() === '') return;
+        if (!this.isScoreTypeDetail(detail) || String(detail.scoreInput ?? '').trim() === '')
+          return;
         const calculatedScore = this.getScoreTypeCalculatedScore(detail);
         if (calculatedScore !== null) detail.selfScore = calculatedScore;
       });
@@ -5316,7 +5308,7 @@ export default {
   max-height: 72vh;
   overflow: auto;
 }
-.el-col{
+.el-col {
   margin-bottom: 0;
 }
 .el-form-item {