cz 1 рік тому
батько
коміт
8f3edc3fcf

+ 4 - 4
src/components/process/EHSD/Contract.vue

@@ -982,7 +982,7 @@ const rules = ref({
   ],
   quantity: [{ required: true, message: "请输入数量", trigger: "blur" }],
   price: [{ required: true, message: "请输入单价", trigger: "blur" }],
-  packMethod: [{ required: true, message: "请输入包装方式", trigger: "blur" }],
+  // packMethod: [{ required: true, message: "请输入包装方式", trigger: "blur" }],
   amount: [{ required: true, message: "请输入金额", trigger: "blur" }],
   payName: [
     { required: true, message: "请输入收费项目", trigger: ["change", "blur"] },
@@ -1001,9 +1001,9 @@ const rules = ref({
   shroffAccountId: [
     { required: true, message: "请选择收款账号", trigger: "change" },
   ],
-  tradeMethods: [
-    { required: true, message: "请选择贸易方式", trigger: "change" },
-  ],
+  // tradeMethods: [
+  //   { required: true, message: "请选择贸易方式", trigger: "change" },
+  // ],
   transportMethod: [
     { required: true, message: "请选择运输方式", trigger: "change" },
   ],

+ 4 - 4
src/components/process/EHSD/ContractChange.vue

@@ -982,7 +982,7 @@ const rules = ref({
   ],
   quantity: [{ required: true, message: "请输入数量", trigger: "blur" }],
   price: [{ required: true, message: "请输入单价", trigger: "blur" }],
-  packMethod: [{ required: true, message: "请输入包装方式", trigger: "blur" }],
+  // packMethod: [{ required: true, message: "请输入包装方式", trigger: "blur" }],
   amount: [{ required: true, message: "请输入金额", trigger: "blur" }],
   payName: [
     { required: true, message: "请输入收费项目", trigger: ["change", "blur"] },
@@ -1001,9 +1001,9 @@ const rules = ref({
   shroffAccountId: [
     { required: true, message: "请选择收款账号", trigger: "change" },
   ],
-  tradeMethods: [
-    { required: true, message: "请选择贸易方式", trigger: "change" },
-  ],
+  // tradeMethods: [
+  //   { required: true, message: "请选择贸易方式", trigger: "change" },
+  // ],
   transportMethod: [
     { required: true, message: "请选择运输方式", trigger: "change" },
   ],

+ 11 - 11
src/views/login.vue

@@ -14,16 +14,16 @@
               :autoplay="true"
             >
               <el-carousel-item>
-                <h3>{{$t('login.li1H3')}}</h3>
-                <p>{{$t('login.li1P')}}</p>
+                <h3>{{ $t("login.li1H3") }}</h3>
+                <p>{{ $t("login.li1P") }}</p>
               </el-carousel-item>
               <el-carousel-item>
-                <h3>{{$t('login.li2H3')}}</h3>
-                <p>{{$t('login.li2P')}}</p>
+                <h3>{{ $t("login.li2H3") }}</h3>
+                <p>{{ $t("login.li2P") }}</p>
               </el-carousel-item>
               <el-carousel-item>
-                <h3>{{$t('login.li3H3')}}</h3>
-                <p>{{$t('login.li3P')}}</p>
+                <h3>{{ $t("login.li3H3") }}</h3>
+                <p>{{ $t("login.li3P") }}</p>
               </el-carousel-item>
             </el-carousel>
           </div>
@@ -36,8 +36,8 @@
             class="login-form"
           >
             <div class="form" style="margin-top: 300px">
-              <div class="">{{$t('login.welcomeToLogin')}}~</div>
-              <h2>ByteSailing {{$t('login.managementSystem')}}</h2>
+              <div class="">{{ $t("login.welcomeToLogin") }}~</div>
+              <h2>ByteSailing {{ $t("login.managementSystem") }}</h2>
               <el-form-item prop="tenantId" style="margin-top: 30px">
                 <el-input
                   :placeholder="$t('login.pleaseEnterTheTenantId')"
@@ -82,14 +82,14 @@
                 <el-checkbox
                   v-model="loginForm.rememberMe"
                   style="margin: 0px 0px 25px 0px"
-                  >{{$t('login.rememberPassword')}}</el-checkbox
+                  >{{ $t("login.rememberPassword") }}</el-checkbox
                 >
               </div>
               <el-button
                 type="primary"
                 @click="handleLogin"
                 style="width: 100%; margin-top: 30px"
-                >{{$t('login.login')}}</el-button
+                >{{ $t("login.login") }}</el-button
               >
             </div>
           </el-form>
@@ -166,7 +166,7 @@ function handleLogin() {
           // 登录刷新
           setTimeout(() => {
             location.reload();
-          }, 100);
+          }, 1000);
         })
         .catch(() => {
           loading.value = false;