Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

6 months ago · 459a1b6ffc
10 changed files with 82 additions and 45 deletions
--- a/src/api/wms/purchasereceiptRecordMain/index.ts
+++ b/src/api/wms/purchasereceiptRecordMain/index.ts
@ -89,6 +89,16 @@ export const exportPurchasereceiptRecordMain = async (params) => {
  }
 }

+// 导出采购收货记录主 Excel
+export const exportPurchasereceiptRecordMainSCP = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereceipt-record-main/export-excel-senior-SCP`, data })
+  } else {
+    return await request.download({ url: `/wms/purchasereceipt-record-main/export-excel-SCP`, params })
+  }
+}
+
 // 下载用户导入模板
 export const importTemplate = () => {
  return request.download({ url: '/wms/purchasereceipt-record-main/get-import-template' })
--- a/src/api/wms/purchasereturnRecordMain/index.ts
+++ b/src/api/wms/purchasereturnRecordMain/index.ts
@ -75,6 +75,16 @@ export const exportPurchasereturnRecordMain = async (params) => {
  }
 }

+// 导出采购退货记录主 Excel
+export const exportPurchasereturnRecordMainSCP = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereturn-record-main/export-excel-senior-SCP`, data })
+  } else {
+    return await request.download({url: `/wms/purchasereturn-record-main/export-excel-SCP`, params})
+  }
+}
+
 // 下载用户导入模板
 export const importTemplate = () => {
  return request.download({ url: '/wms/purchasereturn-record-main/get-import-template' })
--- a/src/views/qms/inspectionJob/addForm.vue
+++ b/src/views/qms/inspectionJob/addForm.vue
@ -370,30 +370,35 @@
        // 总数量值是 样品份数 乘 每份样品量
        allSamplePieceSize.value += parseFloat((parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty) * parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize)).toFixed(2))
        // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-        if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 0) {
-          // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
-          for (let i = 0; i < parseInt(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty); i++) {
+        if(!item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList){
+          // 单个录入时
+          if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 0) {
+            // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
+            item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
+            for (let i = 0; i < parseInt(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty); i++) {
+              item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
+                inspectionValue: '', //检验值
+                qualitativeCode: '', //定性字典项值
+                defectLevel: '', //缺陷级别
+                qualifiedQuantity: '', //合格数量
+                unqualifiedQuantity: '' //不合格数量
+              })
+            }
+          } else {
+            // 汇总录入时
+            item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
+            rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
            item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
              inspectionValue: '', //检验值
              qualitativeCode: '', //定性字典项值
              defectLevel: '', //缺陷级别
              qualifiedQuantity: '', //合格数量
              unqualifiedQuantity: '' //不合格数量
-            })
-          }
-        } else {
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
-          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
-            inspectionValue: '', //检验值
-            qualitativeCode: '', //定性字典项值
-            defectLevel: '', //缺陷级别
-            qualifiedQuantity: '', //合格数量
-            unqualifiedQuantity: '' //不合格数量
+            }
+            )
          }
-          )
        }
+       
        // 编辑判断上限下限目标值是否必填
        if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping) {
          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
@ -424,13 +429,15 @@
      */
     
      for (let i = 0; i < data.value.packageList.length; i++) {
-        if (allSamplePieceSize.value > data.value.packageList[i].amount) {
-          data.value.packageList[i].sampleAmount = data.value.packageList[i].amount
-          allSamplePieceSize.value = parseFloat((allSamplePieceSize.value - data.value.packageList[i].amount).toFixed(2))
-        } else {
-          data.value.packageList[i].sampleAmount = allSamplePieceSize.value
-          allSamplePieceSize.value = 0
-          // return;
+        if(data.value.packageList[i].sampleAmount==null){
+         if (allSamplePieceSize.value > data.value.packageList[i].amount) {
+           data.value.packageList[i].sampleAmount = data.value.packageList[i].amount
+           allSamplePieceSize.value = parseFloat((allSamplePieceSize.value - data.value.packageList[i].amount).toFixed(2))
+         } else {
+           data.value.packageList[i].sampleAmount = allSamplePieceSize.value
+           allSamplePieceSize.value = 0
+           // return;
+         } 
        }
      }
      // data.value.packageList.forEach(item=>{
@ -802,6 +809,7 @@
        return;
      }
      await InspectionJobMainApi.stagingInspectionJobMain(data.value);
+      message.success("暂存成功")
    } catch {
      console.log(111)
    }
--- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
@ -90,7 +90,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'

-defineOptions({ name: 'ContainerManage' })
+defineOptions({ name: 'ContainerManageRequest' })

 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@ -110,7 +110,7 @@ const { tableObject, tableMethods } = useTable({
 /**
 * 
 */
- if ( routeName.value == 'ReturnContainerManage') {
+ if ( routeName.value == 'ReturnContainerManageRequest') {
  tableObject.params = {
    type:'RETURN'
  }
@ -120,7 +120,7 @@ const { tableObject, tableMethods } = useTable({
    }});
  businessType.value = 'ReturnContainerManage'
  importFileName.value = '器具返回申请'
-} else if ( routeName.value == 'MoveContainerManage') {
+} else if ( routeName.value == 'MoveContainerManageRequest') {
  tableObject.params = {
    type:'MOVE'
  }
@ -130,7 +130,7 @@ const { tableObject, tableMethods } = useTable({
    }});
  businessType.value = 'MoveContainerManage'
  importFileName.value = '器具转移申请'
-} else if ( routeName.value == 'DeliverContainerManage') {
+} else if ( routeName.value == 'DeliverContainerManageRequest') {
  tableObject.params = {
    type: 'DELIVER',
  }
@ -141,7 +141,7 @@ const { tableObject, tableMethods } = useTable({
    }});
  businessType.value = 'DeliverContainerManage'
  importFileName.value = '器具发运申请'
-} else if( routeName.value == 'ContainerManage'){
+} else if( routeName.value == 'ContainerManageRequest'){
  businessType.value = 'ContainerManage'
  importFileName.value = '器具管理申请'
 }
--- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts
@ -63,7 +63,6 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '备注',
    field: 'remark',
    sort: 'custom',
-    isSearch: true,
  },
  {
    label: '部门',
@ -166,7 +165,6 @@ export const ContainerRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
    label: '主表ID',
    field: 'masterId',
    sort: 'custom',
-    isSearch: true,
    form: {
      component: 'InputNumber',
      value: 0
--- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue
@ -90,38 +90,38 @@ const { tableObject, tableMethods } = useTable({
 /**
 * 
 */
- if ( routeName.value == 'ReturnContainerManage') {
+ if ( routeName.value == 'ReturnContainerManageRecord') {
  tableObject.params = {
    type:'RETURN'
  }
  businessType.value = 'ReturnContainerManage'
  importFileName.value = '器具返回记录'
-} else if ( routeName.value == 'MoveContainerManage') {
+} else if ( routeName.value == 'MoveContainerManageRecord') {
  tableObject.params = {
    type:'MOVE'
  }
  businessType.value = 'MoveContainerManage'
  importFileName.value = '器具转移记录'
-} else if ( routeName.value == 'InitialContainerManage') {
+} else if ( routeName.value == 'InitialContainerManageRecord') {
  tableObject.params = {
    type:'INITIAL',
  }
  businessType.value = 'InitialContainerManage'
  importFileName.value = '器具初始化记录'
 } 
-else if ( routeName.value == 'ScrapContainerManage') {
+else if ( routeName.value == 'ScrapContainerManageRecord') {
  tableObject.params = {
    type:'SCRAP'
  }  
  businessType.value = 'ScrapContainerManage'
  importFileName.value = '器具报废记录'
-} else if ( routeName.value == 'DeliverContainerManage') {
+} else if ( routeName.value == 'DeliverContainerManageRecord') {
  tableObject.params = {
    type: 'DELIVER',
  }
  businessType.value = 'DeliverContainerManage'
  importFileName.value = '器具发运记录'
-} else if( routeName.value == 'ContainerManage'){
+} else if( routeName.value == 'ContainerManageRecord'){
  businessType.value = 'ContainerManage'
  importFileName.value = '器具管理记录'
 }
--- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
@ -67,7 +67,7 @@
    :detailAllSchemas="ContainerDetailRequest.allSchemas"
    :detailAllSchemasRules="ContainerDetailRequestRules"
    :apiCreate="ContainerDetailRequestApi.createContainerDetailRequest"
-    :apiUpdate="ContainerDetailRequestApi.updateContainerDetailRequest"
+    :apiUpdate="ContainerDetailRequestApi.createContainerDetailRequest"
    :apiPage="ContainerDetailRequestApi.getContainerDetailRequestPage"
    :apiDelete="ContainerDetailRequestApi.deleteContainerDetailRequest"
    fromeWhere="ContainerDetailRequest"
@ -90,7 +90,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'

-defineOptions({ name: 'InitialContainerManage' })
+defineOptions({ name: 'InitialContainerManageRequest' })

 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@ -109,7 +109,7 @@ const { tableObject, tableMethods } = useTable({
 /**
 * 
 */
- if ( routeName.value == 'InitialContainerManage') {
+ if ( routeName.value == 'InitialContainerManageRequest') {
  tableObject.params = {
    type:'INITIAL',
  }
--- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
+++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
@ -90,7 +90,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'

-defineOptions({ name: 'ScrapContainerManage' })
+defineOptions({ name: 'ScrapContainerManageRequest' })

 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@ -110,7 +110,7 @@ const { tableObject, tableMethods } = useTable({
 /**
 * 
 */
- if ( routeName.value == 'ScrapContainerManage') {
+ if ( routeName.value == 'ScrapContainerManageRequest') {
  tableObject.params = {
    type:'SCRAP'
  }
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
@ -267,8 +267,13 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
-    const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(tableObject.params)
-    download.excel(data, `${t('ts.采购收货记录主')}.xlsx`)
+    if(routeName.value.includes('SCP')){
+      const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMainSCP(tableObject.params)
+      download.excel(data, `${t('ts.采购收货记录主')}.xlsx`)
+    }else{
+      const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(tableObject.params)
+      download.excel(data, `${t('ts.采购收货记录主')}.xlsx`)
+    }
  } catch {
  } finally {
    exportLoading.value = false
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
@ -167,8 +167,14 @@ const handleExport = async () => {
    await message.exportConfirm()
    // 发起导出
    exportLoading.value = true
-    const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(tableObject.params)
-    download.excel(data, `${t('ts.采购退货记录主')}.xlsx`)
+    if(routeName.value.includes('SCP')){
+      const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSCP(tableObject.params)
+      download.excel(data, `${t('ts.采购退货记录主')}.xlsx`)
+    }else{
+      const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(tableObject.params)
+      download.excel(data, `${t('ts.采购退货记录主')}.xlsx`)
+    }
+    
  } catch {
  } finally {
    exportLoading.value = false