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

# Conflicts:
#	src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue

src/api/wms/purchaseprice/index.ts

@@ -22,6 +22,17 @@ export const getPurchasepricePage = async (params) => {
   }
 }
 
+// 查询采购价格单列表
+export const getPurchasepricePageSCP = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/purchaseprice/seniorSCP', data })
+  } else {
+    return await request.get({ url: `/wms/purchaseprice/pageSCP`, params })
+  }
+}
+
 // 查询采购价格单详情
 export const getPurchaseprice = async (id: number) => {
   return await request.get({ url: `/wms/purchaseprice/get?id=` + id })
@@ -52,6 +63,16 @@ export const exportPurchaseprice = async (params) => {
   }
 }
 
+// 导出采购价格单 Excel
+export const exportPurchasepriceSCP = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchaseprice/export-excel-senior-SCP`, data })
+  } else {
+    return await request.download({ url: `/wms/purchaseprice/export-excel-SCP`, params })
+  }
+}
+
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/purchaseprice/get-import-template' })

src/api/wms/supplieritem/index.ts

@@ -31,6 +31,17 @@ export const getSupplieritemPage = async (params) => {
   }
 }
 
+// 查询供应商物料列表
+export const getSupplieritemPageSCP = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/supplieritem/seniorSCP', data })
+  } else {
+    return await request.get({ url: `/wms/supplieritem/pageSCP`, params })
+  }
+}
+
 // 查询供应商物料详情
 export const getSupplieritem = async (id: number) => {
   return await request.get({ url: `/wms/supplieritem/get?id=` + id })
@@ -61,6 +72,16 @@ export const exportSupplieritem = async (params) => {
   }
 }
 
+// 导出供应商物料 Excel
+export const exportSupplieritemSCP = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/supplieritem/export-excel-senior-SCP`, data })
+  } else {
+    return await request.download({ url: `/wms/supplieritem/export-excel-SCP`, params })
+  }
+}
+
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/supplieritem/get-import-template' })

src/utils/disposition/defaultButtons.ts

@@ -193,8 +193,7 @@ export function formStagingBtn(option:any) {
     label: t(`btn.暂存`).replace('btn.', ''),
     name: 'staging',
     hide: false,
-    
+    color: 'green',
-    color: '',
     float:'right',
     hasPermi: ''
   })

src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue

@@ -84,7 +84,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: PurchasepriceApi.getPurchasepricePage // 分页接口
+  getListApi: routeName.value.includes('SCP')?PurchasepriceApi.getPurchasepricePageSCP:PurchasepriceApi.getPurchasepricePage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -238,8 +238,13 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await PurchasepriceApi.exportPurchaseprice(tableObject.params)
+    if(routeName.value.includes('SCP')){
-    download.excel(data, `${t('ts.采购价格单')}.xlsx`)
+      const data = await PurchasepriceApi.exportPurchasepriceSCP(tableObject.params)
+      download.excel(data, `${t('ts.采购价格单')}.xlsx`)
+    }else{
+      const data = await PurchasepriceApi.exportPurchaseprice(tableObject.params)
+      download.excel(data, `${t('ts.采购价格单')}.xlsx`)
+    }
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue

@@ -83,7 +83,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: SupplieritemApi.getSupplieritemPage // 分页接口
+  getListApi: routeName.value.includes('SCP')?SupplieritemApi.getSupplieritemPageSCP:SupplieritemApi.getSupplieritemPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -237,8 +237,13 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await SupplieritemApi.exportSupplieritem(tableObject.params)
+    if(routeName.value.includes('SCP')){
-    download.excel(data, `${t('ts.供应商物料')}.xlsx`)
+      const data = await SupplieritemApi.exportSupplieritemSCP(tableObject.params)
+      download.excel(data, `${t('ts.供应商物料')}.xlsx`)
+    }else{
+      const data = await SupplieritemApi.exportSupplieritem(tableObject.params)
+      download.excel(data, `${t('ts.供应商物料')}.xlsx`)
+    }
   } catch {
   } finally {
     exportLoading.value = false

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

@@ -33,7 +33,7 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row }">
+      <template #action="{ row,$index }">
         <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
@@ -374,7 +374,7 @@ const submitForm = async (formType,data) => {
     if (formType === 'create') {
       data.businessType = businessType.value
       console.log(data.businessType,999);
-      
+
     await ContainerMainRequestApi.createContainerMainRequest(data)
     message.success(t('common.createSuccess'))
   } else {
@@ -454,4 +454,4 @@ onMounted(async () => {
 })
 
 </script>
-./initialContainerMainRequest.data
+./initialContainerMainRequest.data

src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts

@@ -1031,7 +1031,6 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
   },
   {
     label: '操作',
-    hiddenInMain:true,
     field: 'action',
     isDetail: false,
     isForm: false ,

src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts

@@ -552,7 +552,6 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
   },
   {
     label: '操作',
-    hiddenInMain:true,
     field: 'action',
     isDetail: false,
     isForm: false ,

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

@@ -731,6 +731,20 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   }
 ]))
 
+const singlePriceFormart = (row, column, cellValue) => {
+  cellValue= Number(cellValue).toFixed(5)
+  cellValue = cellValue + '' || ''
+
+  let x = cellValue.split('.')
+  let x1 = x[0]
+  let x2  = x.length > 1 ? '.' + x[1] : ''
+  const reg = /(\d+)(\d{3})/
+  while(reg.test(x1)){
+    x1 = x1.replace(reg, '$1,$2')
+  }
+  return x1+x2
+}
+
 function validateTaxRate(rule, value, callback) {
   if (value>0) {
     callback()
@@ -913,7 +927,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   {
     label: '合同价格',
     field: 'singlePrice',
-    formatter: accountantFormart,
+    formatter: singlePriceFormart,
     table: {
       width: 150
     },