Merge branch 'hella_online_20241011' into master_hella

src/api/wms/supplierinvoiceRecordMain/index.ts

@@ -31,6 +31,16 @@ export const getSupplierinvoiceRecordMainPage = async (params) => {
     return await request.get({ url: `/wms/supplierinvoice-record-main/page`, params })
   }
 }
+// 查询供应商发票记录主列表
+export const getSupplierinvoiceRecordMainPageDiscrete = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/supplierinvoice-record-main/seniorDiscrete', data })
+  } else {
+    return await request.get({ url: `/wms/supplierinvoice-record-main/pageDiscrete`, params })
+  }
+}
 
 // 查询供应商发票记录主详情
 export const getSupplierinvoiceRecordMain = async (id: number) => {

src/views/login/updatePassword.vue

@@ -45,6 +45,7 @@
   const iconHouse = useIcon({ icon: 'ep:house' })
   const iconCellphone = useIcon({ icon: 'ep:cellphone' })
   const iconCircleCheck = useIcon({ icon: 'ep:circle-check' })
+  const { push, replace } = useRouter()
   const route = useRoute() //路由信息
   const rules = {
     password: [required],
@@ -69,7 +70,8 @@
         await UserApi.updateUserPassword(data)
         // 发送操作成功的事件
         message.success(t('common.updateSuccess'))
-         router.go(-1)
+        await replace('/login?redirect=/index')
+        //  router.go(-1)
       }
     } finally {
       // formLoading.value = false

src/views/login/updatePasswordNewTips.vue

@@ -23,7 +23,7 @@
         </el-col>
         <el-col>
           <el-form-item label="确认新密码" prop="againPassword">
-            <el-input v-model="loginData.againPassword" placeholder="请再次新密码"  :type="isShowAgainPassword?'text':'password'"/>
+            <el-input v-model="loginData.againPassword" placeholder="请再次输入新密码"  :type="isShowAgainPassword?'text':'password'"/>
             <el-icon style="position: absolute; right: 10px;cursor: pointer;" color="#a5a5a5" size="20" @click="isShowAgainPassword = !isShowAgainPassword">
               <View v-if="!isShowAgainPassword"/>
               <Hide v-if="isShowAgainPassword"/>

src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts

@@ -484,6 +484,19 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     label: '到数量',
     field: 'toQty',
     sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
   },
   {
     label: '计量单位',
@@ -545,7 +558,8 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
       width: 130
     },
     isForm: false,
-    isTable: true
+    isTable: true,
+    isTableForm: false
   },
   {
     label: '地点ID',

src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue

@@ -144,11 +144,10 @@ const updataTableColumns = (val) => {
 
 // 获得表格的各种操作
 const { getList, setSearchParams } = tableMethods
-
 // 列表头部按钮
 const HeadButttondata = [
   // defaultButtons.defaultAddBtn({hasPermi:`wms:{routeName.value}:create`}), // 新增
-  defaultButtons.defaultExportBtn(null), // 导出
+  defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置

src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts

@@ -446,6 +446,19 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     label: '到数量',
     field: 'toQty',
     sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
   },
   {
     label: '计量单位',
@@ -512,7 +525,8 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
       width: 130
     },
     isForm: false,
-    isTable: true
+    isTable: true,
+    isTableForm: false
   },
   {
     label: '地点ID',

src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts

@@ -485,6 +485,19 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     label: '到数量',
     field: 'toQty',
     sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
   },
   {
     label: '计量单位',

src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue

@@ -191,7 +191,7 @@
   }
   
   const { tableObject, tableMethods } = useTable({
-    getListApi: SupplierinvoiceRecordMainApi.getSupplierinvoiceRecordMainPage // 分页接口
+    getListApi: SupplierinvoiceRecordMainApi.getSupplierinvoiceRecordMainPageDiscrete // 分页接口
   })
   tableObject.params.isLS = 1
   

src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts

@@ -101,31 +101,31 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: false,
   },
-  {
-    label: '生成时间',
-    field: 'ttGenerateTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
-  },
+  // {
+  //   label: '生成时间',
+  //   field: 'ttGenerateTime',
+  //   sort: 'custom',
+  //   formatter: dateFormatter,
+  //   isSearch: true,
+  //   search: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       valueFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       type: 'daterange',
+  //       defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+  //     }
+  //   },
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       type: 'datetime',
+  //       valueFormat: 'x'
+  //     }
+  //   },
+  // },
   {
     label: '应付挂账金额',
     field: 'ttAccountAp',

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts

@@ -455,6 +455,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+ 
   //子表数据，仅是查询条件
   {
     label: '货运单号',
@@ -709,6 +710,26 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '财务驳回原因',
+    field: 'reasonFinancialRejection',
+    sort: 'custom',
+    isSearch: false,
+    isForm: true,
+    isDetail:false,
+    sortTableDefault:11,
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        style: { 'padding-bottom': '20px'},
+        type:"textarea",
+        maxlength:50,
+        showWordLimit:true
+      }
+    }
+  },
   {
     label: '回转凭证号',
     field: 'transferNumber',
@@ -1825,6 +1846,23 @@ export const SupplierinvoiceRecordMainTransfer = useCrudSchemas(reactive<CrudSch
         showWordLimit:true
       }
     }
+  },
+  {
+    label: '财务驳回原因',
+    field: 'reasonFinancialRejection',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: true,
+    isDetail:false,
+    form: {
+      componentProps: {
+        style: { 'padding-bottom': '20px'},
+        type:"textarea",
+        maxlength:50,
+        showWordLimit:true
+      }
+    }
   }
 ]))
 
@@ -1833,6 +1871,9 @@ export const SupplierinvoiceRecordMainTransfer = useCrudSchemas(reactive<CrudSch
 export const SupplierinvoiceRecordMainTransferRules = reactive({
   reversepostingdate: [
     { required: true, message: '请选择过账日期', trigger: 'change' }
+  ],
+  reasonFinancialRejection: [
+    { required: true, message: '请输入财务驳回原因', trigger: 'change' }
   ]
 })