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

src/api/wms/productreceiptRecordMain/index.ts

@@ -110,4 +110,13 @@ export const exportProductreceiptRecordAssembleMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/productreceipt-record-main/get-import-template' })
+}
+// 创建上架申请
+export const createPutawayRequest = async (number:string) => {
+  return await request.post({ url: `/wms/productreceipt-record-main/createPutawayRequest?number=`+number })
+}
+
+// 创建检验申请
+export const createInspectRequest = async (number:string) => {
+  return await request.post({ url: `/wms/productreceipt-record-main/createInspectRequest?number=`+number })
 }

src/views/wms/inventoryManage/balance/index.vue

@@ -193,17 +193,17 @@ const handleSelectionPoint = async ()=>{
 }
 // 列表-操作按钮
 const butttondata = [
-  {
-    label: '标签信息',
-    name: 'bqxx',
-    hide: false,
-    type: 'primary',
-    icon: '',
-    color: '',
-    link: true,
-    float:'right',
-    hasPermi: ''
-  },
+  // {
+  //   label: '标签信息',
+  //   name: 'bqxx',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: '',
+  //   color: '',
+  //   link: true,
+  //   float:'right',
+  //   hasPermi: ''
+  // },
   defaultButtons.mainListPointBtn(null), // 标签打印
   // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑
   // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除

src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue

@@ -285,9 +285,9 @@ const handleHandle = async (id: number) => {
     tableObject.loading = true
     await InventoryinitRequestMainApi.handleInventoryinitRequestMain(id)
     message.success(t('common.handleSuccess'))
-    tableObject.loading = false
     await getList()
   } catch {}
+  tableObject.loading = false
 }
 
 

src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue

@@ -177,12 +177,15 @@ const butttondata = (row,$index) => {
     return []
   }
   return [
-  defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
-  ]
+  defaultButtons.mainInspectRequestBtn({hasPermi:'wms:productreceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
+]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
+  if(val == 'inspectRequest'){//生成到货检验申请
+    handleCreateInspectRequest(row.number)
+  }
 }
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
@@ -194,6 +197,19 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue,'recordProductreceiptMain')
 }
 
+/** 生成到货检验申请按钮操作 */
+const handleCreateInspectRequest = async (number:string) => {
+  try{
+    await message.confirm(t('ts.确认生成到货检验申请吗？'))
+    tableObject.loading = true
+    await ProductreceiptRecordMainApi.createInspectRequest(number)
+    message.success(t('ts.到货检验申请生成成功'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
 /** 导出按钮操作 */
 const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {