Merge branch 'master' into stage

src/components/process/Contract.vue

@@ -1745,7 +1745,7 @@ const acquireSelectList = () => {
 onMounted(() => {
   if (!route.query.processType || route.query.processType == 30) {
     proxy
-      .post("/customer/privateSeaPage", { pageNum: 1, pageSize: 999 })
+      .post("/customer/privateSeaPage", { pageNum: 1, pageSize: 9999 })
       .then((res) => {
         customerList.value = res.rows.map((item) => {
           return {
@@ -1756,7 +1756,7 @@ onMounted(() => {
         });
       });
   } else {
-    proxy.post("/customer/page", { pageNum: 1, pageSize: 999 }).then((res) => {
+    proxy.post("/customer/page", { pageNum: 1, pageSize: 9999 }).then((res) => {
       customerList.value = res.rows.map((item) => {
         return {
           ...item,

src/components/process/ContractAlteration.vue

@@ -930,7 +930,7 @@ const getDict = () => {
       };
     });
   });
-  proxy.post("/customer/privateSeaPage", { pageNum: 1, pageSize: 999 }).then((res) => {
+  proxy.post("/customer/privateSeaPage", { pageNum: 1, pageSize: 9999 }).then((res) => {
     customerList.value = res.rows.map((item) => {
       return {
         ...item,

src/store/modules/tagsView.js

@@ -34,6 +34,7 @@ const useTagsViewStore = defineStore(
             title: title
           })
         )
+        console.log(this.visitedViews)
       },
       addCachedView(view) {
         if (this.cachedViews.includes(view.name)) return

src/views/salesMange/salesMange/profitSettlement/index.vue

@@ -673,6 +673,7 @@ const clickSettlement = (row) => {
     grossRofitMargin: row.grossProfitMargin,
     contractCurrency: row.currency,
     purchaseCurrency: "CNY",
+    taxReturnAmount: row.taxReturnMoney,
     settlementStatus: 1,
   };
   proxy.post("/saleStatement/settlement", data).then(() => {

src/views/salesMange/shipmentMange/document/index.vue

@@ -2204,12 +2204,12 @@
             <span v-if="textShowOne">
               {{ mandateData.type }}
             </span>
-            <span class="select_height">
+            <span>
               <el-select
                 v-model="mandateData.type"
-                class="m-2"
                 placeholder="请选择"
                 v-if="!textShowOne"
+                style="width: 150px; margin: 0 5px"
               >
                 <el-option label="A" value="A" />
                 <el-option label="B" value="B" />
@@ -2226,7 +2226,7 @@
               v-model="mandateData.agentList"
               multiple
               placeholder="请选择"
-              style="width: 240px"
+              style="width: 240px; margin: 0 5px"
               v-if="!textShowOne"
             >
               <el-option
@@ -2256,6 +2256,7 @@
               size="default"
               value-format="YYYY-MM-DD"
               v-if="!textShowOne"
+              style="width: 150px; margin: 0 5px"
             />止。
           </div>
           <div style="text-align: right; padding-right: 150px">
@@ -2275,6 +2276,7 @@
               size="default"
               value-format="YYYY-MM-DD"
               v-if="!textShowOne"
+              style="width: 150px; margin: 0 5px"
             />
           </div>
           <div class="title" style="margin-bottom: 10px">委 托 报 关 协 议</div>
@@ -2290,13 +2292,13 @@
                     <span v-if="textShowOne">{{
                       dictValueLabel(mandateData.companyId, companyData)
                     }}</span>
-                    <span class="select_height">
+                    <span>
                       <el-select
                         v-model="mandateData.companyId"
-                        class="m-2"
                         placeholder="请选择"
                         v-if="!textShowOne"
-                        style="height: 26px"
+                        style="height: 26px; width: 100%"
+                        class="m-2 select_height"
                       >
                         <el-option
                           v-for="item in companyData"
@@ -2328,7 +2330,7 @@
                       size="default"
                       value-format="YYYY-MM-DD"
                       v-if="!textShowOne"
-                      style="height: 26px"
+                      style="height: 26px; width: 100%"
                     />
                   </td>
                 </tr>
@@ -2379,7 +2381,10 @@
                   <td>{{ mandateData.transport_method }}</td>
                 </tr>
                 <tr>
-                  <td colspan="2" style="text-align: left; height: auto">
+                  <td
+                    colspan="2"
+                    style="text-align: left; height: 120px; vertical-align: top"
+                  >
                     <span> 其他要求：</span>
                     <span v-if="textShowOne">{{ mandateData.otherAsk }}</span>
                     <el-input
@@ -2389,7 +2394,7 @@
                       v-if="!textShowOne"
                       v-model="mandateData.otherAsk"
                       size="small"
-                      :rows="3"
+                      :rows="5"
                       style="width: 82%"
                     />
                   </td>
@@ -2404,7 +2409,7 @@
                   <td colspan="2" style="text-align: left">
                     <div style="display: flex">
                       <div>委托方签章：</div>
-                      <div style="height: 200px"></div>
+                      <div style="height: 100px"></div>
                     </div>
                     <div style="text-align: left">经办人签字：</div>
                     <div style="display: flex; justify-content: space-between">
@@ -2444,7 +2449,11 @@
                 <tr>
                   <td
                     colspan="2"
-                    style="text-align: left; height: 108px; vertical-align: top"
+                    style="
+                      text-align: left;
+                      height: 77.5px;
+                      vertical-align: top;
+                    "
                   >
                     其他
                     <!-- <el-input
@@ -2467,7 +2476,10 @@
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="3" style="text-align: left; height: auto">
+                  <td
+                    colspan="3"
+                    style="text-align: left; height: 120px; vertical-align: top"
+                  >
                     承诺说明： <span v-if="textShowOne"></span>
                   </td>
                 </tr>
@@ -2481,7 +2493,7 @@
                   <td colspan="3" style="text-align: left">
                     <div style="display: flex">
                       <div>被委托方签章：</div>
-                      <div style="height: 200px"></div>
+                      <div style="height: 100px"></div>
                     </div>
                     <div style="text-align: left">报关人员签名：</div>
                     <div style="display: flex; justify-content: space-between">
@@ -3406,7 +3418,7 @@ const getChineseDate = (date) => {
   // display: none;
 }
 :deep(#mandate .select_height .el-input__wrapper) {
-  // height: 26px;
+  height: 26px;
 }
 
 :deep(#mandate .el-textarea) {
@@ -3438,7 +3450,6 @@ const getChineseDate = (date) => {
   td {
     text-align: center;
     padding: 4px 8px;
-    height: 36px;
   }
 }
 </style>

src/views/system/user2/index.vue

@@ -303,16 +303,32 @@ const formConfig = computed(() => {
   ];
 });
 const newPassword = () => {
-  formData.data.password = generatePassword();
+  console.log(generatePassword1());
+  formData.data.password = generatePassword1();
 };
-const generatePassword = () => {
-  var length = 12,
-    charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789",
-    password = "";
-  for (var i = 0, n = charset.length; i < length; ++i) {
-    password += charset.charAt(Math.floor(Math.random() * n));
+const generatePassword1 = () => {
+  //随机生成一个密码，必须包含大小写和数字，且不能有连续三个相同的字符
+  const chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';  
+  const passwordLength = 10; // 密码长度，你可以根据需要调整  
+  var password1 = '';  
+  
+  for (let i = 0; i < passwordLength; i++) {  
+    // 随机选择一个字符  
+    const randomChar = chars.charAt(Math.floor(Math.random() * chars.length));  
+  
+    // 如果前两个字符是相同的，并且当前字符不是大写，那么我们就选择一个大写字符  
+    if (i < 2 && password1.length < 2 && randomChar === password1[password1.length - 1]) {  
+      continue;  
+    }  
+  
+    // 如果前三个字符是相同的，并且当前字符是大写，那么我们就选择一个小写字符  
+    if (i < 3 && password1.length < 3 && randomChar === password1[password1.length - 1] && randomChar === password1[password1.length - 2] && randomChar.toUpperCase() === password1[password1.length - 2]) {  
+      continue;  
+    }  
+  
+    password1 += randomChar;  
   }
-  return password;
+  return password1;
 };
 
 const getTreeList = () => {
@@ -428,9 +444,11 @@ const getDept = () => {
 };
 
 const submitPassword = (password1) => {
-  if (!password1) {
+  //正则判断密码构成 必须有大写小写数字，而且不能有连续三个相同的字符
+  const reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*([a-zA-Z0-9])\1{2}).{8,16}$/;
+  if (!reg.test(password1)) {
     ElMessage({
-      message: "请输入新密码",
+      message: "密码必须有大写小写数字，而且不能有连续三个相同的字符",
       type: "warning",
     });
     return;

src/views/systemTenant/tenant/userTenant/index.vue

@@ -346,31 +346,45 @@ const getDtl = (row) => {
   });
 };
 const newPassword = () => {
-  formData.data.password = generatePassword();
+  formData.data.password = generatePassword1();
 };
-const generatePassword = () => {
-  var length = 12,
-    charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789",
-    password = "";
-  for (var i = 0, n = charset.length; i < length; ++i) {
-    password += charset.charAt(Math.floor(Math.random() * n));
+const generatePassword1 = () => {
+  //随机生成一个密码，必须包含大小写和数字，且不能有连续三个相同的字符
+  const chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';  
+  const passwordLength = 10; // 密码长度，你可以根据需要调整  
+  var password1 = '';  
+  
+  for (let i = 0; i < passwordLength; i++) {  
+    // 随机选择一个字符  
+    const randomChar = chars.charAt(Math.floor(Math.random() * chars.length));  
+  
+    // 如果前两个字符是相同的，并且当前字符不是大写，那么我们就选择一个大写字符  
+    if (i < 2 && password1.length < 2 && randomChar === password1[password1.length - 1]) {  
+      continue;  
+    }  
+  
+    // 如果前三个字符是相同的，并且当前字符是大写，那么我们就选择一个小写字符  
+    if (i < 3 && password1.length < 3 && randomChar === password1[password1.length - 1] && randomChar === password1[password1.length - 2] && randomChar.toUpperCase() === password1[password1.length - 2]) {  
+      continue;  
+    }  
+  
+    password1 += randomChar;  
   }
-  return password;
+  return password1;
 };
 const userId = ref("");
 const password = ref("");
 const roomDialogVisible = ref(false);
 const submitPassword = (password1) => {
-  if (!password1) {
+  //正则判断密码构成 必须有大写小写数字，而且不能有连续三个相同的字符
+  const reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*([a-zA-Z0-9])\1{2}).{8,16}$/;
+  if (!reg.test(password1)) {
     ElMessage({
-      message: "请输入新密码",
+      message: "密码必须有大写小写数字，而且不能有连续三个相同的字符",
       type: "warning",
     });
     return;
   }
-  if (password1.length < 5) {
-    return ElMessage("密码长度不得低于五位");
-  }
   proxy
     .post(
       "/tenantUser/resetPwd",