Merge remote-tracking branch 'origin/master_hella' into master_hella

src/api/qms/inspectionJob/inspectionJobMain/index.ts

@@ -57,11 +57,15 @@ export const releaseInspectionJobMain = async (id) => {
 }
 // 导出检验申请 Excel
 export const exportInspectionJobMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/qms/inspection-job-main/export-excel-senior`, data })
+  }else{
     return await request.download({ url: `/qms/inspection-job-main/export-excel`, params })
+  }
 }
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/qms/inspection-job-main/get-import-template' })
 }
 
-  

src/api/qms/inspectionQ1/index.ts

@@ -58,7 +58,12 @@ export const deleteQ1 = async (id: number) => {
 
 // 导出Q1通知单 Excel
 export const exportQ1 = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/qms/inspectionQ1/export-excel-senior`, data })
+  }else{
     return await request.download({ url: `/qms/inspectionQ1/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

src/api/qms/inspectionQ2/index.ts

@@ -59,7 +59,12 @@ export const deleteQ2 = async (id: number) => {
 
 // 导出Q2通知单 Excel
 export const exportQ2 = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/qms/inspectionQ2/export-excel-senior`, data })
+  }else{
     return await request.download({ url: `/qms/inspectionQ2/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

src/api/qms/inspectionQ3/index.ts

@@ -59,7 +59,12 @@ export const deleteQ3 = async (id: number) => {
 
 // 导出Q3通知单 Excel
 export const exportQ3 = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/qms/inspectionQ3/export-excel-senior`, data })
+  }else{
     return await request.download({ url: `/qms/inspectionQ3/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

src/api/qms/inspectionRecord/inspectionRecordMain/index.ts

@@ -68,6 +68,15 @@ export const exportInspectionRecordMain = async (params) => {
   }
 }
 
+export const exportFirstInspectionRecordMain = async (params) => {
+  if (params.isSearch) {
+    const data = { ...params }
+    return await request.downloadPost({ url: `/qms/inspection-record-main/export-excel-first-senior`, data })
+  } else {
+    return await request.download({ url: `/qms/inspection-record-main/export-excel-first`, params })
+  }
+}
+
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/qms/inspection-record-main/get-import-template' })

src/api/qms/inspectionRequest/index.ts

@@ -50,7 +50,12 @@ export const deleteInspectionMain = async (id: number) => {
 
 // 导出检验申请 Excel
 export const exportInspectionMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/qms/inspection-request-main/export-excel-senior`, data })
+  }else{
     return await request.download({ url: `/qms/inspection-request-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

src/api/qms/inspectionScheme/index.ts

@@ -33,7 +33,12 @@ export const disableInspectionScheme = async (id: number) => {
 
 // 导出检验阶段 Excel
 export const exportInspectionScheme = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/qms/inspection-scheme/export-excel-senior`, data })
+  }else{
     return await request.download({ url: `/qms/inspection-scheme/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

src/api/qms/inspectionTemplate/index.ts

@@ -38,7 +38,12 @@ export const disableInspectionTemplate = async (id: number) => {
 
 // 导出检验模版 Excel
 export const exportInspectionTemplate = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/qms/programme-template/export-excel-senior`, data })
+  }else{
     return await request.download({ url: `/qms/programme-template/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

src/views/qms/inspectionJob/index.vue

@@ -180,6 +180,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
+  defaultButtons.defaultExportBtn(null),
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null) // 设置

src/views/qms/inspectionRecord/index.vue

@@ -163,7 +163,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 let HeadButttondata = [
-  // defaultButtons.defaultExportBtn(null), // 导出
+  defaultButtons.defaultExportBtn(null), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null) // 设置
@@ -343,7 +343,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await InspectionRecordMainApi.exportInspectionRecordMain(tableObject.params)
-    download.excel(data, '备件申领记录主.xlsx')
+    download.excel(data, '检验记录.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/qms/inspectionRecordFirst/index.vue

@@ -67,6 +67,7 @@ import { InspectionTemplateMain,InspectionTemplateProcess,InspectionTemplateFeat
 
 
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+  import {exportFirstInspectionRecordMain} from "@/api/qms/inspectionRecord/inspectionRecordMain";
 
   // 采购订单
   defineOptions({ name: 'InspectionRecordMain' })
@@ -207,7 +208,7 @@ const handleMainExport = async (row: any) => {
       // 发起导出
     exportLoading.value = true
     tableObject.params.number = row.number
-    const data = await InspectionRecordMainApi.exportInspectionRecordMain(tableObject.params)
+    const data = await InspectionRecordMainApi.exportFirstInspectionRecordMain(tableObject.params)
     download.excel(data, '首件检验记录.xlsx')
   } catch {
   } finally {
@@ -223,7 +224,7 @@ const handleMainExport = async (row: any) => {
       await message.exportConfirm()
       // 发起导出
       exportLoading.value = true
-      const data = await InspectionRecordMainApi.exportInspectionRecordMain(tableObject.params)
+      const data = await InspectionRecordMainApi.exportFirstInspectionRecordMain(tableObject.params)
       download.excel(data, '首件检验记录.xlsx')
     } catch {
     } finally {

src/views/qms/inspectionRequest/index.vue

@@ -148,7 +148,7 @@ const { getList, setSearchParams } = tableMethods
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({ hasPermi: 'qms:inspection-request-main:create' }), // 新增
   // defaultButtons.defaultImportBtn({ hasPermi: 'wms:inspectionMain:import' }), // 导入
-  // defaultButtons.defaultExportBtn({ hasPermi: 'wms:inspectionMain:export' }), // 导出
+  defaultButtons.defaultExportBtn(null), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null) // 设置

src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue

@@ -160,6 +160,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['itemCode'] = item['itemCode']
           newRow['locationCode'] = item['locationCode']
           newRow['uom'] = item['uom']
+          newRow['originFrozen'] = newRow['frozen']=='TRUE'?true:false //记录原始数据用于判断
           tableData.value.push(newRow)
         })
       } else {
@@ -445,11 +446,25 @@ const submitForm = async (formType, submitData) => {
   if(data.masterId){
     data.id = data.masterId
   }
-  let findInventoryStatus = tableData.value.find(item=>item.fromInventoryStatus&&item.toInventoryStatus&&item.fromInventoryStatus==item.toInventoryStatus)
+  if(tableData.value.find(item=>!item.toInventoryStatus)){
+    message.warning('请选择到库存状态')
+    return
+  }
+  if(tableData.value.find(item=>!item.toQty||item.toQty==0)){
+    message.warning('请填写到数量')
+    return
+  }
+  if(tableData.value.find(item=>!item.toExpireDate)){
+    message.warning('请选择到过期日期')
+    return
+  }
+  
+  let findInventoryStatus = tableData.value.find(item=>item.fromInventoryStatus&&item.toInventoryStatus&&item.fromInventoryStatus==item.toInventoryStatus&&item.fromQty&&item.toQty&&item.fromQty==item.toQty&&item.fromExpireDate&&item.toExpireDate&&item.fromExpireDate==item.toExpireDate&&item.originFrozen==item.frozen)
   if(findInventoryStatus){
-    message.warning('从库存状态和到库存状态不能相同')
+    message.warning('您未修改数据')
     return
   }
+
   data.subList = tableData.value // 拼接子表数据参数
   const duplicateItems = tableData.value.filter((item, index) => {
   return tableData.value.findIndex((el) => el.itemCode === item.itemCode) !== index;