zlwu 1 jaar geleden
bovenliggende
commit
fcd20a3538

+ 1 - 1
web/src/components/CustomerSelector.vue

@@ -26,7 +26,7 @@
     <el-table v-loading="loading" :data="customerList" @current-change="handleCurrentChange" :max-height="400" border highlight-current-row>
       <el-table-column type="index" label="序号" width="60" align="center" />
       <el-table-column label="客户编号" prop="customerNo" width="140" align="center" :show-overflow-tooltip="true" />
-      <el-table-column label="客户名称" prop="customerName" min-width="180" :show-overflow-tooltip="true">
+      <el-table-column label="客户名称" prop="customerName" min-width="230" :show-overflow-tooltip="true">
         <template #default="scope">
           <div style="display: flex; align-items: center">
             <el-avatar :size="32" :src="scope.row.logo" style="margin-right: 8px">

+ 47 - 8
web/src/views/crm/contract/form.vue

@@ -241,8 +241,14 @@
 
           <!-- 产品明细部分 -->
           <el-divider content-position="left">产品明细</el-divider>
-          <el-button type="primary" icon="Plus" @click="handleAddProduct" class="mb-3">添加产品</el-button>
-          <el-button type="danger" icon="Delete" @click="handleRemoveSelectedProducts" class="mb-3 ml-2" :disabled="selectedProducts.length === 0"
+          <el-button type="primary" plain icon="Plus" @click="handleAddProduct" class="mb-3">添加产品</el-button>
+          <el-button
+            type="danger"
+            plain
+            icon="Delete"
+            @click="handleRemoveSelectedProducts"
+            class="mb-3 ml-2"
+            :disabled="selectedProducts.length === 0"
             >删除选中</el-button
           >
           <el-table :data="form.products" border @selection-change="handleProductSelectionChange">
@@ -292,7 +298,9 @@
             </el-table-column>
             <el-table-column label="送货方式" prop="deliveryMethod" min-width="150">
               <template #default="scope">
-                <el-input v-model="scope.row.deliveryMethod" placeholder="请输入送货方式" clearable size="small" />
+                <el-select v-model="scope.row.deliveryMethod" placeholder="请选择送货方式" clearable size="small" style="width: 100%">
+                  <el-option v-for="dict in crm_shfs" :key="dict.value" :label="dict.label" :value="dict.value" />
+                </el-select>
               </template>
             </el-table-column>
             <el-table-column label="操作" width="80" align="center" fixed="right">
@@ -319,10 +327,10 @@
         </div>
 
         <!-- 底部操作按钮 -->
-        <el-form-item>
-          <el-button @click="handleSaveDraft" :loading="saveDraftLoading">保存草稿</el-button>
-          <el-button type="primary" @click="handleSubmit" :loading="submitLoading">提交审批</el-button>
-          <el-button @click="handleBack">取消</el-button>
+        <el-form-item class="footer-buttons">
+          <el-button type="info" plain @click="handleSaveDraft" :loading="saveDraftLoading">保存草稿</el-button>
+          <el-button type="primary" plain @click="handleSubmit" :loading="submitLoading">提交审批</el-button>
+          <el-button plain @click="handleBack">取消</el-button>
         </el-form-item>
       </el-form>
     </el-card>
@@ -411,7 +419,7 @@ const route = useRoute();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 // 字典数据
-const { crm_contract_type, crm_product_unit } = toRefs<any>(proxy?.useDict('crm_contract_type', 'crm_product_unit'));
+const { crm_contract_type, crm_product_unit, crm_shfs } = toRefs<any>(proxy?.useDict('crm_contract_type', 'crm_product_unit', 'crm_shfs'));
 
 // 表单标题
 const formTitle = computed(() => {
@@ -1662,4 +1670,35 @@ onMounted(() => {
   cursor: not-allowed;
   background: #f5f5f5;
 }
+
+/* 底部按钮居中样式 */
+.footer-buttons {
+  margin-top: 30px;
+  text-align: center;
+
+  :deep(.el-form-item__content) {
+    justify-content: center;
+  }
+}
+
+/* 统一表格内输入框和下拉框高度 */
+:deep(.el-table .el-input__wrapper) {
+  height: 32px !important;
+  min-height: 32px !important;
+}
+
+:deep(.el-table .el-select__wrapper) {
+  height: 32px !important;
+  min-height: 32px !important;
+}
+
+:deep(.el-table .el-input--small .el-input__wrapper) {
+  height: 32px !important;
+  min-height: 32px !important;
+}
+
+:deep(.el-table .el-select--small .el-select__wrapper) {
+  height: 32px !important;
+  min-height: 32px !important;
+}
 </style>

+ 12 - 0
web/src/views/crm/contract/index.vue

@@ -2441,6 +2441,18 @@ onMounted(() => {
 .statistics-row {
   padding: 10px 0;
   margin-bottom: 20px;
+  
+  :deep(.el-statistic) {
+    text-align: center;
+    
+    .el-statistic__head {
+      justify-content: center;
+    }
+    
+    .el-statistic__content {
+      justify-content: center;
+    }
+  }
 }
 
 // 详情抽屉样式

+ 1 - 1
web/src/views/crm/customer/index.vue

@@ -170,7 +170,7 @@
           </template>
         </el-table-column>
         <el-table-column label="客户编号" align="center" prop="customerNo" min-width="150" show-overflow-tooltip />
-        <el-table-column label="客户类型" align="center" prop="customerType" width="100">
+        <el-table-column label="客户类型" align="center" prop="customerType" width="150">
           <template #default="scope">
             <dict-tag :options="crm_customer_type" :value="scope.row.customerType" />
           </template>