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

src/api/wms/inventorymoveRecordDetail/index.ts

@@ -73,4 +73,5 @@ export const exportInventorymoveRecordDetail = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/inventorymove-record-detail/get-import-template' })
-}
+}
+

src/api/wms/inventorymoveRecordMain/index.ts

@@ -148,3 +148,14 @@ export const importTemplate = () => {
 export const importTemplateExceptMove = () => {
   return request.download({ url: '/wms/inventorymove-record-main/get-import-template-exceptMove' })
 }
+
+
+// 接收隔离收货
+export const receive = (id) => {
+  return request.put({ url: '/wms/inventorymove-record-main/receive?id=' + id })
+}
+
+// 拒收隔离收货
+export const refuse = (id) => {
+  return request.put({ url: '/wms/inventorymove-record-main/refuse?id=' + id })
+}

src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/index.vue

@@ -149,7 +149,7 @@ const buttonBaseClick = (val, item) => {
 }
 // 根据状态返回该按钮是否显示
 const isShowMainButton = (row,val) => {
-  if (val.indexOf(row.status) > -1) {
+  if (val.indexOf(row.receiveStatus) > -1) {
     return false
   } else {
     return true
@@ -197,20 +197,36 @@ const buttonTableClick = async (val, row) => {
   }
 }
 // 拒收
-const handleRefusal = async () => {
+const handleRefusal = async (row) => {
   try {
     loadStart()
     // 接口
+    InventorymoveRecordMainApi.refuse(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      buttonBaseClick('refresh',null)
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
   } catch {
   } finally {
     loadDone()
   }
 }
 // 接收
-const handleRecept = async () => {
+const handleRecept = async (row) => {
   try {
     loadStart()
     // 接口
+    InventorymoveRecordMainApi.receive(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      buttonBaseClick('refresh',null)
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
   } catch {
   } finally {
     loadDone()

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue

@@ -393,6 +393,15 @@ const handleExport = async () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'type',
+    'action':'==',
+    'value':'assemble'
+  }
+  if (!Array.isArray(searchData.filters)) {
+    searchData.filters = [];
+  }
+  searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters