Merge branch 'hella_online_20240913' into master_hella

3 months ago · 4687230153
12 changed files with 65 additions and 35 deletions
--- 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 = () => {
--- 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',
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@ -833,6 +833,7 @@ export default {
    未税差额:'未税差额',
    含税差额:'含税差额',
    可开票数量:'可开票数量',
+    可开票数量不能为0:'可开票数量不能为0',
    采购审批人:'采购审批人',
    采购审批时间:'采购审批时间',
    财务审批时间:'财务审批时间',
--- 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(
@ -281,13 +274,22 @@
          return
        case 1:
          await ElMessageBox.alert(
-            '<strong>密码过期账号已冻结，请联系管理员解冻</strong>',
+            '<strong>密码过期，请联系管理员修改</strong>',
            '重要提示',
            {
              dangerouslyUseHTMLString: true,
            }
          )
          return
+        default:
+          await ElMessageBox.alert(
+            '密码'+differenceDays+'到期，请尽快修改。',
+            '重要提示',
+            {
+              dangerouslyUseHTMLString: true,
+            }
+          )
+          break
      }
      if (!res) {
        console.log('登录-195')
--- 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>
--- 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="180px" size="large">
      <div
        class="title"
        style="font-size: 20px; text-align: center; margin-bottom: 20px; font-weight: bold"
@ -26,40 +26,51 @@
          </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="0"
+              :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="lockHours">
            <el-input-number
-              v-model="passwordConfig.lockMinutes"
-              :min="0"
+              v-model="passwordConfig.lockHours"
+              :min="1"
              :precision="0"
              style="margin-right: 10px"
            />小时
          </el-form-item>
        </el-col>
        <el-col>
-          <el-form-item label="更新周期" prop="updatePeriod">
+          <el-form-item label="24小时内密码输入错误" prop="tryCount">
+            <el-input-number
+              v-model="passwordConfig.dayTryCount"
+              :min="3"
+              :precision="0"
+              style="margin-right: 10px"
+            />次冻结24小时
+          </el-form-item>
+
+        </el-col>
+        <el-col>
+          <el-form-item label="强制更换密码周期" prop="updatePeriod">
            <el-input-number
              v-model="passwordConfig.updatePeriod"
-              :min="0"
+              :min="3"
              :precision="0"
              style="margin-right: 10px"
            />天
          </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="0"
+              :min="1"
              :precision="0"
              style="margin-right: 10px"
            />天
@ -98,8 +109,10 @@ const reset = () => {
    ruleLevel: "简单",
    ruleDesc: "",
    tryCount: 3,
-    lockMinutes: 1,
-    updatePeriod: 1,
+    lockHours: 1,
+    updatePeriod: 30,
+    dayTryCount: 3,
+    updateRemind: 7,
  }
 }
 const passwordConfig = ref({
@ -107,8 +120,10 @@ const passwordConfig = ref({
  ruleLevel: "简单",
  ruleDesc: "",
  tryCount: 3,
-  lockMinutes: 1,
-  updatePeriod: 1,
+  lockHours: 1,
+  updatePeriod: 30,
+  dayTryCount: 3,
+  updateRemind: 7,
 })
 /** 查询配置 */
 const getConfig = async () => {
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
@ -215,8 +215,7 @@ 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
--- 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'],
--- 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: '',
--- 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
--- 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,
    }
  },
  {
--- 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

  },{