From a0de8d2b8fb8b529e9d7580dd6844173f78ab42d Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 12 Sep 2024 15:53:28 +0800
Subject: [PATCH 01/12] =?UTF-8?q?HL-5853=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7=E5=A2=9E=E5=8A=A0=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E5=B1=A5=E5=8E=86=E8=A1=A8=E5=8A=9F=E8=83=BD=EF=BC=8C?=
 =?UTF-8?q?=E9=9D=9E=E5=BF=85=E5=A1=AB=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/supplierdeliverRequestMain/index.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 9b57b0159..14d3475d7 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -540,7 +540,7 @@ const butttondata = (row, $index) => {
     {
       label: t('ts.上传履历表'),
       name: 'mainPlanCurriculumVitae',
-      hide: row.status!=5,
+      hide: row.status==5,
       type: 'primary',
       icon: '',
       color: '',

From fa53834e926ee51d995b5c5d0892dc384fde70ef Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 12 Sep 2024 16:18:17 +0800
Subject: [PATCH 02/12] =?UTF-8?q?HL-5862=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E5=BC=80=E7=A5=A8=E6=97=B6=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=BC=80=E7=A5=A8=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/en-US.ts                                   |  1 +
 src/locales/zh-CN.ts                                   |  1 +
 .../supplierinvoiceRequestMain/index.vue               | 10 ++++++++--
 .../supplierinvoiceRequestMain.data.ts                 |  6 ++++--
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 9793a55e5..9c6aad57a 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -832,6 +832,7 @@ export default {
     未税差额:'Untaxed Difference',
     含税差额:'Difference including tax',
     可开票数量:'Number of tickets available',
+    可开票数量不能为0:'The amount invogeable cannot be 0',
     采购审批人:'Procurement Approver',
     采购审批时间:'Purchase approval time',
     财务审批时间:'Financial approval time',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 1e78e1525..49c3e196f 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -833,6 +833,7 @@ export default {
     未税差额:'未税差额',
     含税差额:'含税差额',
     可开票数量:'可开票数量',
+    可开票数量不能为0:'可开票数量不能为0',
     采购审批人:'采购审批人',
     采购审批时间:'采购审批时间',
     财务审批时间:'财务审批时间',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index a5c137240..6eb1f7bde 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -484,7 +484,10 @@ const detailBasicFormOnChange  =  (field, cur)  => {
 const handleDetailSubmitForm = async (formType, data) => {
   if (formType === 'update') {
     console.log('handleDetailSubmitForm',data)
-    if(data.maxInvoicableQuantity>0){
+    if(data.invoicableQuantity==0){
+      message.error(t('ts.可开票数量不能为0'))
+      return
+    }else if(data.maxInvoicableQuantity>0){
       if(data.invoicableQuantity<0||data.invoicableQuantity>data.maxInvoicableQuantity){
         message.error(t('ts.可开票数量范围是')+`:0~${data.maxInvoicableQuantity}`)
         return
@@ -1375,7 +1378,10 @@ const submitForm = async (formType, submitData) => {
   tableData.value.forEach(item => {
     // 负数：默认默认开票数～0
     // 正数：0～默认开票数
-    if(item.maxInvoicableQuantity){
+    if(item.invoicableQuantity==0){
+      flagInvoicableQuantity = true
+      message.error(`${item.itemCode}`+t('ts.可开票数量不能为0'))
+    }else if(item.maxInvoicableQuantity){
       if(item.maxInvoicableQuantity>0){
         if(item.invoicableQuantity<0||item.invoicableQuantity>item.maxInvoicableQuantity){
           flagInvoicableQuantity = true
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 2e02b6143..4356beea3 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -1806,12 +1806,14 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'InputNumber',
       componentProps: {
-        disabled: false
+        disabled: false,
+        precision: 5,
       }
     },
     tableForm:{
       type: 'InputNumber',
-      disabled: false
+      disabled: false,
+      precision: 5,
     }
   },
   {

From d8b4adec206c0f5d07c36f403e316a895297732a Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 12 Sep 2024 16:20:43 +0800
Subject: [PATCH 03/12] =?UTF-8?q?HL-5905SCP=E6=AD=A3=E5=BC=8F=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=EF=BC=8C=E8=AE=B0=E5=BD=95=EF=BC=8C=E4=BB=B7?=
 =?UTF-8?q?=E5=B7=AE=E6=95=B0=E6=8D=AE=E6=9F=A5=E7=9C=8B=E3=80=82=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E9=99=84=E4=BB=B6=E4=B8=8E=E5=90=88=E5=90=8C=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E5=A2=9E=E5=8A=A0=E9=A2=84=E8=A7=88=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRequestMainDifference/index.vue              | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
index cb402755f..b5ea4f98a 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue
@@ -294,6 +294,7 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea
     hiddenDelete:true,
     hiddenUpload:true,
     showPreview: true,
+    showDownload:true,
     fileSize:20
   },{
     label: t('ts.发票附件'),
@@ -302,6 +303,7 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea
     hiddenDelete:true,
     hiddenUpload:true,
     showPreview: true,
+    showDownload:true,
     fileSize:20
 
   },{

From 9223cc20da715383e4089f771d4257aec7e4c824 Mon Sep 17 00:00:00 2001
From: tengxiaofei <302828528@qq.com>
Date: Thu, 12 Sep 2024 16:46:02 +0800
Subject: [PATCH 04/12] =?UTF-8?q?HL-5990=20=E5=AE=A2=E6=88=B7=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=EF=BC=8C=E9=80=89=E6=8B=A9=E5=8F=91=E8=B4=A7=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=90=8E=E6=9C=AA=E8=83=BD=E5=8A=A0=E8=BD=BD=E5=87=BA?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E5=8F=91=E8=B4=A7=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerreturn/customerreturnRequestMain/index.vue       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
index b2c49ad62..a574f6429 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
@@ -215,9 +215,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       setV['customerDockCode'] = val[0]['customerDockCode']
      
         // 获取子表数据 
-        DeliverRecordDetailApi.getDeliverRecordDetailPage({masterId:val[0]['masterId']})
-        .then(res => {
-          
+        DeliverRecordDetailApi.getDeliverRecordDetailPage({pageSize:999,masterId:val[0]['masterId']}).then(res => {
+
           res.list.forEach(obj => {
             let value = null
             value = obj.fromLocationCode

From 9766500a85d19d4457bc71010bd5436cb2475ef2 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Thu, 12 Sep 2024 17:22:35 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=AD=96=E7=95=A5?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=97=A5=E8=AF=95=E9=94=99=E6=AC=A1=E6=95=B0=EF=BC=8C=E8=BE=BE?=
 =?UTF-8?q?=E5=88=B0=E9=98=88=E5=80=BC=E5=86=BB=E7=BB=93=E8=B4=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/components/LoginForm.vue |  2 +-
 src/views/system/passwordRule/index.vue  | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue
index 0fe8506d1..6fcefd3cd 100644
--- a/src/views/login/components/LoginForm.vue
+++ b/src/views/login/components/LoginForm.vue
@@ -281,7 +281,7 @@
           return
         case 1:
           await ElMessageBox.alert(
-            '<strong>密码过期账号已冻结，请联系管理员解冻</strong>',
+            '<strong>密码过期，请联系管理员修改</strong>',
             '重要提示',
             {
               dangerouslyUseHTMLString: true,
diff --git a/src/views/system/passwordRule/index.vue b/src/views/system/passwordRule/index.vue
index a01c5da99..8582612fb 100644
--- a/src/views/system/passwordRule/index.vue
+++ b/src/views/system/passwordRule/index.vue
@@ -1,7 +1,7 @@
 <template>
   <!-- 搜索 -->
   <div v-loading="loading" class="box">
-    <el-form ref="formSmsLogin" :model="data" :rules="rules" label-width="90px" size="large">
+    <el-form ref="formSmsLogin" :model="data" :rules="rules" label-width="110px" size="large">
       <div
         class="title"
         style="font-size: 20px; text-align: center; margin-bottom: 20px; font-weight: bold"
@@ -32,7 +32,7 @@
               :min="0"
               :precision="0"
               style="margin-right: 10px"
-            />次
+            />每分钟
           </el-form-item>
         </el-col>
         <el-col>
@@ -45,6 +45,16 @@
             />小时
           </el-form-item>
         </el-col>
+        <el-col>
+          <el-form-item label="试错次数" prop="tryCount">
+            <el-input-number
+              v-model="passwordConfig.dayTryCount"
+              :min="0"
+              :precision="0"
+              style="margin-right: 10px"
+            />每天
+          </el-form-item>
+        </el-col>
         <el-col>
           <el-form-item label="更新周期" prop="updatePeriod">
             <el-input-number
@@ -100,6 +110,7 @@ const reset = () => {
     tryCount: 3,
     lockMinutes: 1,
     updatePeriod: 1,
+    dayTryCount: 3,
   }
 }
 const passwordConfig = ref({
@@ -109,6 +120,7 @@ const passwordConfig = ref({
   tryCount: 3,
   lockMinutes: 1,
   updatePeriod: 1,
+  dayTryCount: 3,
 })
 /** 查询配置 */
 const getConfig = async () => {

From 920684b721768c1e64d1d2b9d7ec0f5b65271773 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Thu, 12 Sep 2024 17:36:29 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=AD=96=E7=95=A5?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=97=A5=E8=AF=95=E9=94=99=E6=AC=A1=E6=95=B0=EF=BC=8C=E8=BE=BE?=
 =?UTF-8?q?=E5=88=B0=E9=98=88=E5=80=BC=E5=86=BB=E7=BB=93=E8=B4=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/updatePasswordNewTips.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/login/updatePasswordNewTips.vue b/src/views/login/updatePasswordNewTips.vue
index 06a74b6b6..328644072 100644
--- a/src/views/login/updatePasswordNewTips.vue
+++ b/src/views/login/updatePasswordNewTips.vue
@@ -6,7 +6,7 @@
         <el-col>
           <el-form-item label="新密码" prop="password" align="center">
             <el-input v-model="loginData.password" placeholder="请输入新密码" :type="isShowPassword?'text':'password'"/>
-            <el-icon style="position: absolute; right: 10px;cursor: pointer;" color="#a5a5a5" size="18" @click="isShowPassword = !isShowPassword">
+            <el-icon style="position: absolute; right: 10px;cursor: pointer;" color="#a5a5a5" size="20" @click="isShowPassword = !isShowPassword">
               <View v-if="!isShowPassword"/>
               <Hide v-if="isShowPassword"/>
             </el-icon>
@@ -15,7 +15,7 @@
         <el-col>
           <el-form-item label="确认新密码" prop="againPassword">
             <el-input v-model="loginData.againPassword" placeholder="请再次新密码"  :type="isShowAgainPassword?'text':'password'"/>
-            <el-icon style="position: absolute; right: 10px;cursor: pointer;" color="#a5a5a5" size="18" @click="isShowAgainPassword = !isShowAgainPassword">
+            <el-icon style="position: absolute; right: 10px;cursor: pointer;" color="#a5a5a5" size="20" @click="isShowAgainPassword = !isShowAgainPassword">
               <View v-if="!isShowAgainPassword"/>
               <Hide v-if="isShowAgainPassword"/>
             </el-icon>

From f9eaa8acd5dad33b3aa29f6b146bf49aff38dd30 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Fri, 13 Sep 2024 10:13:13 +0800
Subject: [PATCH 07/12] =?UTF-8?q?1=E3=80=81=E7=99=BB=E5=BD=95=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E5=88=B0=E6=9C=9F=E6=8F=90=E7=A4=BA=E6=98=8E=E7=A1=AE?=
 =?UTF-8?q?=E5=88=B0=E6=9C=9F=E6=97=B6=E9=97=B4=202=E3=80=81=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=AF=86=E7=A0=81=E7=AD=96=E7=95=A5=E9=87=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/components/LoginForm.vue | 18 ++++++++++--------
 src/views/system/passwordRule/index.vue  | 16 +++++++++-------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue
index 6fcefd3cd..ed783f5c6 100644
--- a/src/views/login/components/LoginForm.vue
+++ b/src/views/login/components/LoginForm.vue
@@ -260,14 +260,7 @@
       console.log('登陆res',res)
       const differenceDays = await PassWordApi.validateResetTime(res.userId)
       switch (differenceDays){
-        case -1:
-          await ElMessageBox.alert(
-            '<strong>密码即将到期，请尽快修改。</strong>',
-            '重要提示',
-            {
-              dangerouslyUseHTMLString: true,
-            }
-          )
+        case null:
           break
         case 0:
           await ElMessageBox.alert(
@@ -288,6 +281,15 @@
             }
           )
           return
+        default:
+          await ElMessageBox.alert(
+            '密码'+differenceDays+'到期，请尽快修改。',
+            '重要提示',
+            {
+              dangerouslyUseHTMLString: true,
+            }
+          )
+          break
       }
       if (!res) {
         console.log('登录-195')
diff --git a/src/views/system/passwordRule/index.vue b/src/views/system/passwordRule/index.vue
index 8582612fb..054beb7fa 100644
--- a/src/views/system/passwordRule/index.vue
+++ b/src/views/system/passwordRule/index.vue
@@ -29,7 +29,7 @@
           <el-form-item label="试错次数" prop="tryCount">
             <el-input-number
               v-model="passwordConfig.tryCount"
-              :min="0"
+              :min="3"
               :precision="0"
               style="margin-right: 10px"
             />每分钟
@@ -39,7 +39,7 @@
           <el-form-item label="锁定时长" prop="lockMinutes">
             <el-input-number
               v-model="passwordConfig.lockMinutes"
-              :min="0"
+              :min="1"
               :precision="0"
               style="margin-right: 10px"
             />小时
@@ -49,7 +49,7 @@
           <el-form-item label="试错次数" prop="tryCount">
             <el-input-number
               v-model="passwordConfig.dayTryCount"
-              :min="0"
+              :min="3"
               :precision="0"
               style="margin-right: 10px"
             />每天
@@ -59,7 +59,7 @@
           <el-form-item label="更新周期" prop="updatePeriod">
             <el-input-number
               v-model="passwordConfig.updatePeriod"
-              :min="0"
+              :min="3"
               :precision="0"
               style="margin-right: 10px"
             />天
@@ -69,7 +69,7 @@
           <el-form-item label="更新预警期" prop="updateRemind">
             <el-input-number
               v-model="passwordConfig.updateRemind"
-              :min="0"
+              :min="1"
               :precision="0"
               style="margin-right: 10px"
             />天
@@ -109,8 +109,9 @@ const reset = () => {
     ruleDesc: "",
     tryCount: 3,
     lockMinutes: 1,
-    updatePeriod: 1,
+    updatePeriod: 30,
     dayTryCount: 3,
+    updateRemind: 7,
   }
 }
 const passwordConfig = ref({
@@ -119,8 +120,9 @@ const passwordConfig = ref({
   ruleDesc: "",
   tryCount: 3,
   lockMinutes: 1,
-  updatePeriod: 1,
+  updatePeriod: 30,
   dayTryCount: 3,
+  updateRemind: 7,
 })
 /** 查询配置 */
 const getConfig = async () => {

From 875fda2c0454403c4d8b0b14edc1af9126807088 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Fri, 13 Sep 2024 11:12:07 +0800
Subject: [PATCH 08/12] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E7=AD=96=E7=95=A5=E5=8F=82=E6=95=B0=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/passwordRule/index.vue | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/views/system/passwordRule/index.vue b/src/views/system/passwordRule/index.vue
index 054beb7fa..9f06c9d5d 100644
--- a/src/views/system/passwordRule/index.vue
+++ b/src/views/system/passwordRule/index.vue
@@ -1,7 +1,7 @@
 <template>
   <!-- 搜索 -->
   <div v-loading="loading" class="box">
-    <el-form ref="formSmsLogin" :model="data" :rules="rules" label-width="110px" size="large">
+    <el-form ref="formSmsLogin" :model="data" :rules="rules" label-width="180px" size="large">
       <div
         class="title"
         style="font-size: 20px; text-align: center; margin-bottom: 20px; font-weight: bold"
@@ -26,17 +26,17 @@
           </el-form-item>
         </el-col>
         <el-col>
-          <el-form-item label="试错次数" prop="tryCount">
+          <el-form-item label="每分钟密码输入错误" prop="tryCount">
             <el-input-number
               v-model="passwordConfig.tryCount"
               :min="3"
               :precision="0"
               style="margin-right: 10px"
-            />每分钟
+            />次
           </el-form-item>
         </el-col>
         <el-col>
-          <el-form-item label="锁定时长" prop="lockMinutes">
+          <el-form-item label="锁定" prop="lockMinutes">
             <el-input-number
               v-model="passwordConfig.lockMinutes"
               :min="1"
@@ -46,17 +46,18 @@
           </el-form-item>
         </el-col>
         <el-col>
-          <el-form-item label="试错次数" prop="tryCount">
+          <el-form-item label="密码输入错误" prop="tryCount">
             <el-input-number
               v-model="passwordConfig.dayTryCount"
               :min="3"
               :precision="0"
               style="margin-right: 10px"
-            />每天
+            />次冻结1天
           </el-form-item>
+
         </el-col>
         <el-col>
-          <el-form-item label="更新周期" prop="updatePeriod">
+          <el-form-item label="强制更换密码周期" prop="updatePeriod">
             <el-input-number
               v-model="passwordConfig.updatePeriod"
               :min="3"
@@ -66,7 +67,7 @@
           </el-form-item>
         </el-col>
         <el-col>
-          <el-form-item label="更新预警期" prop="updateRemind">
+          <el-form-item label="强制更换密码到期提醒" prop="updateRemind">
             <el-input-number
               v-model="passwordConfig.updateRemind"
               :min="1"

From e685698946dfb737e519eaffad781d7bd09d1801 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Fri, 13 Sep 2024 13:47:41 +0800
Subject: [PATCH 09/12] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E7=AD=96=E7=95=A5=E6=97=A5=E5=AF=86=E7=A0=81=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=AC=A1=E6=95=B0=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/passwordRule/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/passwordRule/index.vue b/src/views/system/passwordRule/index.vue
index 9f06c9d5d..49ca52ea8 100644
--- a/src/views/system/passwordRule/index.vue
+++ b/src/views/system/passwordRule/index.vue
@@ -46,7 +46,7 @@
           </el-form-item>
         </el-col>
         <el-col>
-          <el-form-item label="密码输入错误" prop="tryCount">
+          <el-form-item label="1天内密码输入错误" prop="tryCount">
             <el-input-number
               v-model="passwordConfig.dayTryCount"
               :min="3"

From 47da87f5b238648e3e22c73b311c519cf9a43514 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 13 Sep 2024 14:13:18 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7-=E6=96=B0=E5=A2=9E=E6=B7=BB=E5=8A=A0id?=
 =?UTF-8?q?=E5=94=AF=E4=B8=80=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturn/purchasereturnRequestMainNew/index.vue      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
index cf3a42bfa..81e824a23 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
@@ -844,7 +844,8 @@ const onChangeForm = async (field, cur, formRef)=>{
 
     console.log('subList',subList)
     if(subList&&subList.length>0){
-      tableData.value = subList.map(item=>({
+      tableData.value = subList.map((item,index)=>({
+        'id':index,
         'batch':item['batch'],
         'inventoryStatus':item['inventoryStatus'],
         'inventoryBalance':item['qty'],

From 0b5716d07b0b1d43919d0f81cf4ab1e14d3f8f0c Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Fri, 13 Sep 2024 14:23:53 +0800
Subject: [PATCH 11/12] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E7=AD=96=E7=95=A5=E6=97=A5=E5=AF=86=E7=A0=81=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=AC=A1=E6=95=B0=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/passwordRule/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/system/passwordRule/index.vue b/src/views/system/passwordRule/index.vue
index 49ca52ea8..ef8146487 100644
--- a/src/views/system/passwordRule/index.vue
+++ b/src/views/system/passwordRule/index.vue
@@ -46,13 +46,13 @@
           </el-form-item>
         </el-col>
         <el-col>
-          <el-form-item label="1天内密码输入错误" prop="tryCount">
+          <el-form-item label="24小时内密码输入错误" prop="tryCount">
             <el-input-number
               v-model="passwordConfig.dayTryCount"
               :min="3"
               :precision="0"
               style="margin-right: 10px"
-            />次冻结1天
+            />次冻结24小时
           </el-form-item>
 
         </el-col>

From a6cc7d68b65e46c95910155b48256de1867b7a9b Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Fri, 13 Sep 2024 16:06:55 +0800
Subject: [PATCH 12/12] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E7=AD=96=E7=95=A5=E6=97=A5=E5=AF=86=E7=A0=81=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=AC=A1=E6=95=B0=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/password/index.ts        | 3 ++-
 src/views/system/passwordRule/index.vue | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/api/system/password/index.ts b/src/api/system/password/index.ts
index 9f07574cc..13d65aa23 100644
--- a/src/api/system/password/index.ts
+++ b/src/api/system/password/index.ts
@@ -6,8 +6,9 @@ export interface PassWordConfigVO {
   ruleLevel: string
   ruleDesc: string
   tryCount: number
-  lockMinutes: number
+  lockHours: number
   updatePeriod: number
+  dayTryCount: number
 }
 // 获取密码策略
 export const getConfig = () => {
diff --git a/src/views/system/passwordRule/index.vue b/src/views/system/passwordRule/index.vue
index ef8146487..74ca7f75f 100644
--- a/src/views/system/passwordRule/index.vue
+++ b/src/views/system/passwordRule/index.vue
@@ -36,9 +36,9 @@
           </el-form-item>
         </el-col>
         <el-col>
-          <el-form-item label="锁定" prop="lockMinutes">
+          <el-form-item label="锁定" prop="lockHours">
             <el-input-number
-              v-model="passwordConfig.lockMinutes"
+              v-model="passwordConfig.lockHours"
               :min="1"
               :precision="0"
               style="margin-right: 10px"
@@ -109,7 +109,7 @@ const reset = () => {
     ruleLevel: "简单",
     ruleDesc: "",
     tryCount: 3,
-    lockMinutes: 1,
+    lockHours: 1,
     updatePeriod: 30,
     dayTryCount: 3,
     updateRemind: 7,
@@ -120,7 +120,7 @@ const passwordConfig = ref({
   ruleLevel: "简单",
   ruleDesc: "",
   tryCount: 3,
-  lockMinutes: 1,
+  lockHours: 1,
   updatePeriod: 30,
   dayTryCount: 3,
   updateRemind: 7,