Просмотр исходного кода

feat:修改样式费率校验必填

颜琼丽 2 дней назад
Родитель
Сommit
469ed70431

+ 6 - 6
jd-logistics-ui-v3/src/views/index.vue

@@ -259,12 +259,12 @@ onUnmounted(() => {
               left: 0;
               width: 100%;
               height: 100%;
-              background: linear-gradient(
-                      135deg,
-                      rgba(0, 0, 0, 0.7) 0%,
-                      rgba(0, 0, 0, 0.4) 50%,
-                      rgba(0, 0, 0, 0.2) 100%
-              );
+              //background: linear-gradient(
+              //        135deg,
+              //        rgba(0, 0, 0, 0.7) 0%,
+              //        rgba(0, 0, 0, 0.4) 50%,
+              //        rgba(0, 0, 0, 0.2) 100%
+              //);
             }
 
             .carousel-content {

+ 6 - 6
jd-logistics-ui-v3/src/views/logistics/order/index.vue

@@ -537,13 +537,13 @@
                   <el-table-column
                       prop="feeItemCode"
                       label="费用代码"
-                      width="120"
+                      width="280"
                       align="center"
                   />
                   <el-table-column
                       prop="feeItemName"
                       label="费用项名称"
-                      width="150"
+                      width="280"
                       align="center"
                   />
 <!--                  <el-table-column
@@ -565,8 +565,8 @@
                   <el-table-column
                       prop="rateAmount"
                       label="费用(元)"
-                      width="120"
-                      align="right"
+                      width="220"
+                      align="center"
                   >
                     <template #default="scope">
                       {{ formatCurrency(scope.row.rateAmount) }}
@@ -585,12 +585,12 @@
                   <el-table-column
                       prop="createTime"
                       label="创建时间"
-                      width="180"
+                      width="280"
                       align="center"
                   />
                   <el-table-column
                       label="操作"
-                      width="100"
+                      width="200"
                       align="center"
                       v-if="!isViewMode"
                   >

+ 5 - 2
jd-logistics-ui-v3/src/views/system/dept/index.vue

@@ -204,7 +204,10 @@ const data = reactive({
     orderNum: [{ required: true, message: "显示排序不能为空", trigger: "blur" }],
     email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
     phone: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
-    rateValue: [{ pattern: /^\d+(\.\d{1,2})?$/, message: "请输入正确的费率格式,最多两位小数", trigger: "blur" }]
+    rateValue: [
+      { required: true, message: "费率不能为空", trigger: "blur" },
+      { pattern: /^\d+(\.\d{1,2})?$/, message: "请输入正确的费率格式,最多两位小数", trigger: "blur" }
+    ]
   },
 })
 
@@ -238,7 +241,7 @@ function reset() {
     status: "0",
     invoiceName: undefined,
     invoiceNum: undefined,
-    rateValue: 0,
+    rateValue: 1,
     openBank: undefined,
     bankAccount: undefined,
     companyAddress: undefined