Merge branch 'hella_online_20240803' into master_hella

src/api/wms/balance/index.ts

@@ -58,7 +58,7 @@ export const getBalancePageReturn= async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/balance/senior', data })
+    return await request.post({ url: '/wms/balance/seniorReturn', data })
   } else {
     return await request.get({ url: `/wms/balance/pageReturn`, params })
   }

src/views/login/components/LoginForm.vue

@@ -145,8 +145,8 @@
     tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE,
     loginForm: {
       tenantName: tenantArray.value[0].name,
-      username: 'admin',
-      password: '123456',
+      username: '',
+      password: '',
       captchaVerification: '',
       rememberMe: false,
       code: '',

src/views/qms/inspectionJob/addForm.vue

@@ -488,12 +488,7 @@
                                 "
                               >
                                 <el-form-item label="检验值" required>
-                                  <el-input-number
-                                    v-model="cur.inspectionValue"
-                                    :min="0"
-                                    @change="inspectionValueInput(item, cur)"
-                                    @blur="inspectionValueInput(item, cur)"
-                                  />
+                                  <el-input v-model="cur.inspectionValue" placeholder="请输入检验值" @input="inputChange($event,cur)" @blur="inspectionValueInput(item, cur)" />
                                 </el-form-item>
                               </el-col>
                               <el-col
@@ -1406,6 +1401,9 @@ const boxList = ref()
 //     mianscroll.value.scrollTo({ top: boxList.value.clientHeight + 550, behavior: 'smooth' })
 //   })
 // }
+const inputChange = (val,cur) => {
+  cur.inspectionValue = cur.inspectionValue.replace(/[^0-9.]/g, '')
+}
 const inspectionValueInput = (item, cur) => {
   for (
     let i = 0;

src/views/qms/inspectionJob/index.vue

@@ -121,7 +121,7 @@ import Detail from './detail.vue'
 import { getReportUrl } from '@/utils/systemParam'
 
 // 采购订单
-defineOptions({ name: 'InspectionJobMain' })
+defineOptions({ name: 'inspectionJobMain' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化

src/views/qms/inspectionRecord/addForm.vue

@@ -478,12 +478,7 @@
                                 "
                               >
                                 <el-form-item label="检验值" required>
-                                  <el-input-number
-                                    v-model="cur.inspectionValue"
-                                    :min="0"
-                                    @change="inspectionValueInput(item, cur)"
-                                    @blur="inspectionValueInput(item, cur)"
-                                  />
+                                  <el-input v-model="cur.inspectionValue" placeholder="请输入检验值" @input="inputChange($event,cur)" @blur="inspectionValueInput(item, cur)" />
                                 </el-form-item>
                               </el-col>
                               <el-col
@@ -1418,6 +1413,9 @@ const boxList = ref()
 //     mianscroll.value.scrollTo({ top: boxList.value.clientHeight + 550, behavior: 'smooth' })
 //   })
 // }
+const inputChange = (val,cur) => {
+  cur.inspectionValue = cur.inspectionValue.replace(/[^0-9.]/g, '')
+}
 const inspectionValueInput = (item, cur) => {
   for (
     let i = 0;
@@ -1528,6 +1526,13 @@ const inspectionValueInput = (item, cur) => {
             .inspectionValue
         ) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
     ) {
+      console.log(parseFloat(
+          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
+            .inspectionValue
+        ))
+      console.log( parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
+      console.log( parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping))
+      console.log(333)
       item.isPass = false
       return
     }

src/views/qms/inspectionRecord/index.vue

@@ -129,7 +129,7 @@ import {
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 
 // 采购订单
-defineOptions({ name: 'InspectionRecordMain' })
+defineOptions({ name: 'inspectionRecordMain' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化

src/views/qms/inspectionRecordFirst/addForm.vue

@@ -535,12 +535,7 @@
                             v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '0'"
                           >
                             <el-form-item label="检验值" required>
-                              <el-input-number
-                                v-model="cur.inspectionValue"
-                                :min="0"
-                                @change="inspectionValueInput(item, cur)"
-                                @blur="inspectionValueInput(item, cur)"
-                              />
+                              <el-input v-model="cur.inspectionValue" placeholder="请输入检验值" @input="inputChange($event,cur)" @blur="inspectionValueInput(item, cur)" />
                             </el-form-item>
                           </el-col>
                           <el-col
@@ -1411,6 +1406,9 @@ const boxList = ref()
 //     mianscroll.value.scrollTo({ top: boxList.value.clientHeight + 550, behavior: 'smooth' })
 //   })
 // }
+const inputChange = (val,cur) => {
+  cur.inspectionValue = cur.inspectionValue.replace(/[^0-9.]/g, '')
+}
 const inspectionValueInput = (item, cur) => {
   for (
     let i = 0;

src/views/qms/inspectionRequest/index.vue

@@ -104,7 +104,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 // import { InspectionJobPackage} from '../inspectionJob/inspectionJobMain.data'
 
-defineOptions({ name: 'InspectionMain' })
+defineOptions({ name: 'inspectionMain' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化

src/views/wms/basicDataManage/documentSetting/requestsetting/requestsetting.data.ts

@@ -99,7 +99,7 @@ export const Requestsetting = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isForm: false,
+    isForm: true,
     isTable: true,
     sort: 'custom',
     table: {

src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts

@@ -736,6 +736,8 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain:true,
   },
   // {
   //   label: '任务明细ID',

src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts

@@ -502,7 +502,8 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable: false,
+    sortTableDefault: 1000,
+    isTable: true,
   },
   {
     label: '直接生成记录',
@@ -995,14 +996,14 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isTableForm: false,
     isTable:false,
   },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '备注',
+  //   field: 'remark',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '创建时间',
     field: 'createTime',

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts

@@ -544,8 +544,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    isForm:false,
-    isTable: false
+    sortTableDefault: 1000,
   },
   {
     label: '创建时间',
@@ -1259,6 +1258,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
         valueFormat: 'x',
       }
     },
+    sortTableDefault: 1001,
     isTableForm: false,
     isForm: false
   },
@@ -1269,6 +1269,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    sortTableDefault: 1002,
     isTableForm: false,
     isForm: false
   },

src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue

@@ -301,7 +301,7 @@ const buttonTableClick = async (val, row) => {
     PreparetoissueMainApi.open(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -312,7 +312,7 @@ const buttonTableClick = async (val, row) => {
     PreparetoissueMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -324,7 +324,7 @@ const buttonTableClick = async (val, row) => {
     PreparetoissueMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -335,7 +335,7 @@ const buttonTableClick = async (val, row) => {
     PreparetoissueMainApi.reject(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -347,7 +347,7 @@ const buttonTableClick = async (val, row) => {
     PreparetoissueMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -358,7 +358,7 @@ const buttonTableClick = async (val, row) => {
     PreparetoissueMainApi.publish(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
       PreparetoissueMainApi.generateIssueRequest(row.number)
     }).catch(err => {
       tableObject.loading = false
@@ -370,7 +370,7 @@ const buttonTableClick = async (val, row) => {
     PreparetoissueMainApi.resetting(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -382,7 +382,7 @@ const buttonTableClick = async (val, row) => {
     await PreparetoissueMainApi.generateIssueRequest(row.number).then(() => {
       message.success(t('common.createSuccess'))
       tableObject.loading = false
-      getList()
+      buttonBaseClick('refresh',null)
     }).catch(err => {
       tableObject.loading = false
       console.log(err)
@@ -445,7 +445,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -514,7 +514,7 @@ const submitForm = async (formType, submitData) => {
     } else {
       await PreparetoissueMainApi.updatePreparetoissueMain(data)
       message.success(t('common.updateSuccess'))
-      getList()
+      buttonBaseClick('refresh',null)
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表

src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts

@@ -99,6 +99,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'status',
     dictType: DICT_TYPE.JOB_STATUS,
     dictClass: 'string',
+    isSearch: true,
     isTable: true,
     sort: 'custom',
     table: {

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue

@@ -247,13 +247,14 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainJobAba') { // 放弃
     console.log('列表-操作按钮事件-放弃')
     await PurchasereceiptJobMainApi.abandonPurchasereceiptJobMainSpare(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobClo') { // 拒收
     handleClose(row.masterId)
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobAcc') { // 承接
     console.log('列表-操作按钮事件-承接')
     await PurchasereceiptJobMainApi.acceptPurchasereceiptJobMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if(val == 'mainPlanCheckQualityReport'){
     // 查看质检报告
     checkQualityReport(row)
@@ -277,7 +278,7 @@ const handleClose = async (id: number) => {
     await message.confirm(t('common.confirmColse'))
     await PurchasereceiptJobMainApi.closePurchasereceiptJobMain(id)
     message.success(t('common.closeSuccess'))
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 const resonSubmit = async (row)=>{
@@ -308,7 +309,7 @@ const handleRefusal = async (id: number,refuseReason:string) => {
   try {
     await PurchasereceiptJobMainApi.refusalPurchasereceiptJobMain({id,refuseReason})
     message.success(t('common.refusalSuccess'))
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue

@@ -215,7 +215,7 @@ const handleCreatePutawayRequest = async (number:string) => {
     tableObject.loading = true
     await PurchasereceiptRecordMainApi.createPutawayRequest(number)
     message.success(t('ts.上架申请生成成功'))
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }
@@ -228,7 +228,7 @@ const handleCreateInspectRequest = async (number:string) => {
     tableObject.loading = true
     await PurchasereceiptRecordMainApi.createInspectRequest(number)
     message.success(t('ts.到货检验申请生成成功'))
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -369,6 +369,15 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
     isTable: false,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetimerange',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
     form: {
       component: 'DatePicker',
       componentProps: {

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue

@@ -204,7 +204,7 @@ const handleCreatePutawayRequest = async (number:string) => {
     tableObject.loading = true
     await PurchasereceiptRecordMainApi.createPutawayRequest(number)
     message.success(t('ts.上架申请生成成功'))
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }
@@ -217,7 +217,7 @@ const handleCreateInspectRequest = async (number:string) => {
     tableObject.loading = true
     await PurchasereceiptRecordMainApi.createInspectRequest(number)
     message.success(t('ts.到货检验申请生成成功'))
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue

@@ -678,7 +678,7 @@ const handleClose = async (id: number) => {
     tableObject.loading = true
     await PurchasereceiptRequestMainApi.closePurchasereceiptRequestMain(id)
     message.success(t('common.closeSuccess'))
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }
@@ -691,7 +691,7 @@ const handleReAdd = async (id: number) => {
     tableObject.loading = true
     await PurchasereceiptRequestMainApi.reAddPurchasereceiptRequestMain(id)
     message.success(t('common.reAddSuccess'))
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }
@@ -705,7 +705,7 @@ const handleAgree = async (id: number) => {
     await PurchasereceiptRequestMainApi.agreePurchasereceiptRequestMain(id)
     message.success(t('common.agreeSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }
@@ -719,7 +719,7 @@ const handleRefused = async (id: number) => {
     await PurchasereceiptRequestMainApi.refusedPurchasereceiptRequestMain(id)
     message.success(t('common.refusedSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }
@@ -733,7 +733,7 @@ const handleHandle = async (id: number) => {
     await PurchasereceiptRequestMainApi.handlePurchasereceiptRequestMain(id)
     message.success(t('common.handleSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }
@@ -747,7 +747,7 @@ const handleSubmit = async (id: number) => {
     await PurchasereceiptRequestMainApi.submitPurchasereceiptRequestMain(id)
     message.success(t('common.submitSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }
@@ -819,7 +819,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
+    if (formType === 'create') {
       getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue

@@ -607,7 +607,7 @@ const handleClose = async (id: number) => {
     tableObject.loading = true
     await PurchasereceiptRequestMainApi.closePurchasereceiptRequestMain(id)
     message.success(t('common.closeSuccess'))
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }
@@ -620,7 +620,7 @@ const handleReAdd = async (id: number) => {
     tableObject.loading = true
     await PurchasereceiptRequestMainApi.reAddPurchasereceiptRequestMain(id)
     message.success(t('common.reAddSuccess'))
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }
@@ -634,7 +634,7 @@ const handleAgree = async (id: number) => {
     await PurchasereceiptRequestMainApi.agreePurchasereceiptRequestMain(id)
     message.success(t('common.agreeSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }
@@ -648,7 +648,7 @@ const handleRefused = async (id: number) => {
     await PurchasereceiptRequestMainApi.refusedPurchasereceiptRequestMain(id)
     message.success(t('common.refusedSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }
@@ -662,7 +662,7 @@ const handleHandle = async (id: number) => {
     await PurchasereceiptRequestMainApi.handlePurchasereceiptRequestMain(id)
     message.success(t('common.handleSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }
@@ -676,7 +676,7 @@ const handleSubmit = async (id: number) => {
     await PurchasereceiptRequestMainApi.submitPurchasereceiptRequestMain(id)
     message.success(t('common.submitSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }
@@ -747,7 +747,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
+    if (formType === 'create') {
       getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue

@@ -200,13 +200,13 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainJobAba') { // 放弃
     console.log('列表-操作按钮事件-放弃')
     await PurchasereturnJobMainApi.abandonPurchasereturnJobMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'mainJobClo') { // 关闭
     handleClose(row.masterId)
   } else if (val == 'mainJobAcc') { // 承接
     console.log('列表-操作按钮事件-承接')
     await PurchasereturnJobMainApi.acceptPurchasereturnJobMain(row.masterId)
-    getList()
+    buttonBaseClick('refresh',null)
   }
 }
 
@@ -216,7 +216,7 @@ const handleClose = async (id: number) => {
     await message.confirm(t('common.confirmColse'))
     await PurchasereturnJobMainApi.closePurchasereturnJobMain(id)
     message.success(t('common.closeSuccess'))
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 // 获取部门 用于详情 部门回显

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue

@@ -304,6 +304,8 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
             tableData.value.push(newRow)
           }
         })
+        row['fromLocationCode'] = val[0]['locationCode']
+        row['batch'] = val[0]['batch']
         // row['inventoryBalance'] = val[0]['qty'] //库存余额
       }else{
         row[formField] = val[0][searchField]
@@ -450,6 +452,8 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
     } else if (formField == 'packingNumber'){
       setV[formField] = val[0][searchField]
       setV['inventoryBalance'] = val[0]['qty']
+      setV['batch'] = val[0]['batch']
+      setV['fromLocationCode'] = val[0]['locationCode']
     }
     else {
       setV[formField] = val[0][searchField]
@@ -665,7 +669,7 @@ const handleClose = async (id: number) => {
     tableObject.loading = true
     await PurchasereturnRequestMainApi.closePurchasereturnRequestMain(id)
     message.success(t('common.closeSuccess'))
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {
   } finally {
     tableObject.loading = false
@@ -679,7 +683,7 @@ const handleReAdd = async (id: number) => {
     tableObject.loading = true
     await PurchasereturnRequestMainApi.reAddPurchasereturnRequestMain(id)
     message.success(t('common.reAddSuccess'))
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {
   } finally {
     tableObject.loading = false
@@ -693,7 +697,7 @@ const handleAgree = async (id: number) => {
     tableObject.loading = true
     await PurchasereturnRequestMainApi.agreePurchasereturnRequestMain(id)
     message.success(t('common.agreeSuccess'))
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {
   } finally {
     tableObject.loading = false
@@ -707,7 +711,7 @@ const handleRefused = async (id: number) => {
     tableObject.loading = true
     await PurchasereturnRequestMainApi.refusedPurchasereturnRequestMain(id)
     message.success(t('common.refusedSuccess'))
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {
   } finally {
     tableObject.loading = false
@@ -721,7 +725,7 @@ const handleHandle = async (id: number) => {
     tableObject.loading = true
     await PurchasereturnRequestMainApi.handlePurchasereturnRequestMain(id)
     message.success(t('common.handleSuccess'))
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {
   } finally {
     tableObject.loading = false
@@ -735,7 +739,7 @@ const handleSubmit = async (id: number) => {
     tableObject.loading = true
     await PurchasereturnRequestMainApi.submitPurchasereturnRequestMain(id)
     message.success(t('common.submitSuccess'))
-    await getList()
+    buttonBaseClick('refresh',null)
     tableObject.loading = false
   } catch {
   } finally {
@@ -947,7 +951,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
+    if (formType === 'create') {
       getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts

@@ -1027,71 +1027,73 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     tableForm:{
-      enterSearch: true,
-      // labelMessage: '信息提示说明！！！',
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择从库位代码',
-      searchField: 'code',
-      searchTitle: '库位代码信息',
-      searchAllSchemas: Location.allSchemas,
-      searchPage: LocationApi.getLocationListByAreaAndBusinesstype,
-      isRepeat:true,
-      searchCondition: [{
-        key: 'businessType',
-        value: 'PurchaseReturn',
-        message: '请填写业务类型',
-        isMainValue: false
-      },{
-        key: 'isIn',
-        value: 'out',
-        message: '',
-        isMainValue: false
-        }],
-      verificationParams: [{
-        key: 'code',
-        action: '==',
-        value: '',
-        isMainValue: false,
-        isSearch: true,
-        isFormModel: true,
-      }], // 失去焦点校验参数
+      disabled:true
     },
-    // form: {
-    //   componentProps:{
-    //     disabled:true
-    //   }
+    // tableForm: {
+    //   enterSearch: true,
+    //   // labelMessage: '信息提示说明！！！',
+    //   isInpuFocusShow: true, // 开启查询弹窗
+    //   searchListPlaceholder: '请选择从库位代码',
+    //   searchField: 'code',
+    //   searchTitle: '库位代码信息',
+    //   searchAllSchemas: Location.allSchemas,
+    //   searchPage: LocationApi.getLocationListByAreaAndBusinesstype,
+    //   searchCondition: [{
+    //     key: 'businessType',
+    //     value: 'PurchaseReturn',
+    //     message: '请填写业务类型',
+    //     isMainValue: false
+    //   },{
+    //     key: 'isIn',
+    //     value: 'out',
+    //     message: '',
+    //     isMainValue: false
+    //     }],
+    //   verificationParams: [{
+    //     key: 'code',
+    //     action: '==',
+    //     value: '',
+    //     isMainValue: false,
+    //     isSearch: true,
+    //     isFormModel: true,
+    //   }], // 失去焦点校验参数
     // },
     form: {
-      // labelMessage: '信息提示说明！！！',
       componentProps:{
-        enterSearch: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择从库位代码',
-        searchField: 'code',
-        searchTitle: '库位代码信息',
-        searchAllSchemas: Location.allSchemas,
-        searchPage: LocationApi.getLocationListByAreaAndBusinesstype,
-        searchCondition: [{
-          key: 'businessType',
-          value: 'PurchaseReturn',
-          message: '请填写业务类型',
-          isMainValue: false
-        },{
-          key: 'isIn',
-          value: 'out',
-          message: '',
-          isMainValue: false
-          }],
-        verificationParams: [{
-          key: 'code',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
+        disabled:true
       }
     },
+    // form:{
+    //   // labelMessage: '信息提示说明！！！',
+    //   componentProps: {
+    //     enterSearch: true,
+    //     isSearchList: true,
+    //     searchListPlaceholder: '请选择从库位代码',
+    //     searchField: 'code',
+    //     searchTitle: '库位代码信息',
+    //     searchAllSchemas: Location.allSchemas,
+    //     searchPage: LocationApi.getLocationListByAreaAndBusinesstype,
+    //     searchCondition: [{
+    //       key: 'businessType',
+    //       value: 'PurchaseReturn',
+    //       message: '请填写业务类型',
+    //       isMainValue: false
+    //     },{
+    //       key: 'isIn',
+    //       value: 'out',
+    //       message: '',
+    //       isMainValue: false
+    //       }],
+    //     verificationParams: [{
+    //       key: 'code',
+    //       action: '==',
+    //       value: '',
+    //       isMainValue: false,
+    //       isSearch: true,
+    //       isFormModel: true,
+    //     }], // 失去焦点校验参数
+    //   }
+    // },
     hiddenInMain: true,
     isTable: false,
   },
@@ -1117,7 +1119,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         searchField: 'packingNumber',
         searchTitle: '库存余额信息', // 查询弹窗标题
         searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
-        searchPage: BalanceApi.getBalancePage,
+        searchPage: BalanceApi.getBalancePageReturn,
         searchCondition: [{
           key: 'itemCode',
           value: 'itemCode',
@@ -1125,21 +1127,16 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
           isTableRowValue: true, //查询当前searchTable表中行数据的值
           required:true,
           isMainValue:true
-        },{
-          key: 'batch',
-          value: 'batch',
-          message: '请填写批次',
-          isTableRowValue: true, //查询当前searchTable表中行数据的值
-          // required:true,
-          isMainValue:true
-        },{
-          key: 'locationCode',
-          value: 'fromLocationCode',
-          message: '请选择从库位代码',
-          isTableRowValue: true, //查询当前searchTable表中行数据的值
-          required:true,
-          isMainValue:true
-          }],
+        },
+        // {
+        //   key: 'batch',
+        //   value: 'batch',
+        //   message: '请填写批次',
+        //   isTableRowValue: true, //查询当前searchTable表中行数据的值
+        //   // required:true,
+        //   isMainValue:true
+        // }
+        ],
         verificationParams: [{
           key: 'packingNumber',
           action: '==',
@@ -1159,7 +1156,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       searchField: 'packingNumber',
       searchTitle: '库存余额信息', // 查询弹窗标题
       searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
-      searchPage: BalanceApi.getBalancePage,
+      searchPage: BalanceApi.getBalancePageReturn,
       searchCondition: [{
         key: 'itemCode',
         value: 'itemCode',
@@ -1167,21 +1164,16 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         isTableRowValue: true, //查询当前searchTable表中行数据的值
         required:true,
         isMainValue:false
-      },{
-        key: 'batch',
-        value: 'batch',
-        message: '请填写批次',
-        isTableRowValue: true, //查询当前searchTable表中行数据的值
-        required:true,
-        isMainValue:false
-      },{
-        key: 'locationCode',
-        value: 'fromLocationCode',
-        message: '请选择从库位代码',
-        isTableRowValue: true, //查询当前searchTable表中行数据的值
-        required:true,
-        isMainValue:false
-        }],
+      },
+      // {
+      //   key: 'batch',
+      //   value: 'batch',
+      //   message: '请填写批次',
+      //   isTableRowValue: true, //查询当前searchTable表中行数据的值
+      //   required:true,
+      //   isMainValue:false
+      // }
+    ],
       verificationParams: [{
         key: 'packingNumber',
         action: '==',

src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue

@@ -619,7 +619,7 @@ const handleClose = async (id: number) => {
     tableObject.loading = true
     await PurchasereturnRequestMainApi.closePurchasereturnRequestMain(id)
     message.success(t('common.closeSuccess'))
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {
   } finally {
     tableObject.loading = false
@@ -633,7 +633,7 @@ const handleReAdd = async (id: number) => {
     tableObject.loading = true
     await PurchasereturnRequestMainApi.reAddPurchasereturnRequestMain(id)
     message.success(t('common.reAddSuccess'))
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {
   } finally {
     tableObject.loading = false
@@ -647,7 +647,7 @@ const handleAgree = async (id: number) => {
     tableObject.loading = true
     await PurchasereturnRequestMainApi.agreePurchasereturnRequestMain(id)
     message.success(t('common.agreeSuccess'))
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {
   } finally {
     tableObject.loading = false
@@ -661,7 +661,7 @@ const handleRefused = async (id: number) => {
     tableObject.loading = true
     await PurchasereturnRequestMainApi.refusedPurchasereturnRequestMain(id)
     message.success(t('common.refusedSuccess'))
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {
   } finally {
     tableObject.loading = false
@@ -675,7 +675,7 @@ const handleHandle = async (id: number) => {
     tableObject.loading = true
     await PurchasereturnRequestMainApi.handlePurchasereturnRequestMain(id)
     message.success(t('common.handleSuccess'))
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {
   } finally {
     tableObject.loading = false
@@ -689,7 +689,7 @@ const handleSubmit = async (id: number) => {
     tableObject.loading = true
     await PurchasereturnRequestMainApi.submitPurchasereturnRequestMain(id)
     message.success(t('common.submitSuccess'))
-    await getList()
+    buttonBaseClick('refresh',null)
     tableObject.loading = false
   } catch {
   } finally {
@@ -901,7 +901,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
+    if (formType === 'create') {
       getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }

src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue

@@ -270,14 +270,14 @@ const buttonTableClick = async (val, row) => {
     console.log('列表-操作按钮事件-执行')
   } else if (val == 'mainJobAba') { // 放弃
     await PutawayJobMainApi.abandonPutawayJobMain(row.masterId)
-    await getList()
+    buttonBaseClick('refresh',null)
     console.log('列表-操作按钮事件-放弃')
   } else if (val == 'mainJobClo') { // 关闭
     handleClose(row.masterId)
   } else if (val == 'mainJobAcc') { // 承接
     console.log('列表-操作按钮事件-承接')
     await PutawayJobMainApi.acceptPutawayJobMain(row.masterId)
-    await getList()
+    buttonBaseClick('refresh',null)
   } else if (val == 'documentPrint') {
     // 单据打印
     handleDocumentPrint(row)
@@ -335,7 +335,7 @@ const handleClose = async (id: number) => {
     await message.confirm(t('common.confirmColse'))
     await PutawayJobMainApi.closePutawayJobMain(id)
     message.success(t('common.closeSuccess'))
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 

src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue

@@ -266,7 +266,7 @@ const handleClose = async (id: number) => {
     tableObject.loading = true
     await PutawayRequestMainApi.closePutawayRequestMain(id)
     message.success(t('common.closeSuccess'))
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }
@@ -279,7 +279,7 @@ const handleReAdd = async (id: number) => {
     tableObject.loading = true
     await PutawayRequestMainApi.reAddPutawayRequestMain(id)
     message.success(t('common.reAddSuccess'))
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }
@@ -292,7 +292,7 @@ const handleAgree = async (id: number) => {
     tableObject.loading = true
     await PutawayRequestMainApi.agreePutawayRequestMain(id)
     message.success(t('common.agreeSuccess'))
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }
@@ -307,7 +307,7 @@ const handleRefused = async (id: number) => {
     await PutawayRequestMainApi.refusedPutawayRequestMain(id)
     message.success(t('common.refusedSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }
@@ -321,7 +321,7 @@ const handleHandle = async (id: number) => {
     await PutawayRequestMainApi.handlePutawayRequestMain(id)
     message.success(t('common.handleSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }
@@ -335,7 +335,7 @@ const handleSubmit = async (id: number) => {
     await PutawayRequestMainApi.submitPutawayRequestMain(id)
     message.success(t('common.submitSuccess'))
     tableObject.loading = false
-    await getList()
+    buttonBaseClick('refresh',null)
   }catch{}finally{
     tableObject.loading = false
   }
@@ -393,7 +393,7 @@ const handleDelete = async (id: number) => {
     await PutawayRequestMainApi.deletePutawayRequestMain(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -456,7 +456,11 @@ const submitForm = async (formType, submitData) => {
     }
     formRef.value.dialogVisible = false
     // 刷新当前列表
+    if (formType === 'create') {
       getList()
+    }else{
+      buttonBaseClick('refresh',null)
+    }
   } finally {
     formRef.value.formLoading = false
   }

src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue

@@ -207,7 +207,7 @@ const handleExecuteSpare = async (id: number) => {
     await message.confirm("是否确认执行任务!")
     await PurchasereceiptJobMainApi.executePurchasereceiptJobMainSpare(id)
     message.success("执行成功")
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -217,7 +217,7 @@ const handleAbandon = async (id: number) => {
     await message.confirm("是否确认取消承接!")
     await PurchasereceiptJobMainApi.abandonPurchasereceiptJobMainSpare(id)
     message.success("放弃成功")
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -227,7 +227,7 @@ const handleClose = async (id: number) => {
     await message.confirm(t('common.confirmColse'))
     await PurchasereceiptJobMainApi.closePurchasereceiptJobMain(id)
     message.success(t('common.closeSuccess'))
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 
@@ -237,7 +237,7 @@ const handleAccept = async (id: number) => {
     await message.confirm("是否承接任务!")
     await PurchasereceiptJobMainApi.acceptPurchasereceiptJobMain(id)
     message.success("承接成功")
-    await getList()
+    buttonBaseClick('refresh',null)
   } catch {}
 }
 // 获取部门 用于详情 部门回显