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

src/api/wms/purchasereceiptJobMain/index.ts

@@ -86,4 +86,9 @@ export const exportPurchasereceiptJobMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/purchasereceipt-job-main/get-import-template' })
-}
+}
+
+// 关闭采购收货任务主
+export const closePurchasereceiptJobMain = (id: number) => {
+  return request.download({ url: '/wms/purchasereceipt-job-main/close?id=' + id })
+}

src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts

@@ -95,7 +95,18 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
         searchField: 'code',
         searchTitle: '物品信息',
         searchAllSchemas: Itembasic.allSchemas,
-        searchPage: ItembasicApi.getItembasicPage
+        searchPage: ItembasicApi.getItembasicPage,
+        searchCondition: [{
+          key:'enableMake',
+          value:'TRUE',
+          isMainValue: false
+        },
+        {
+          key:'type',
+          value:'FG,SEMI',
+          isMainValue: false
+        },
+      ]
       }
     }
   },

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue

@@ -174,9 +174,9 @@ const isShowMainButton = (row,val) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
-    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭
-    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
     // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
@@ -188,12 +188,22 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainJobAba') { // 放弃
     console.log('列表-操作按钮事件-放弃')
   } else if (val == 'mainJobClo') { // 关闭
-    console.log('列表-操作按钮事件-关闭')
+    handleClose(row.id)
   } else if (val == 'mainJobAcc') { // 承接
     console.log('列表-操作按钮事件-承接')
   }
 }
 
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    await PurchasereceiptJobMainApi.closePurchasereceiptJobMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  } catch {}
+}
+
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
@@ -209,7 +219,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PurchasereceiptJobMainApi.exportPurchasereceiptJobMain(setSearchParams)
-    download.excel(data, '采购收货任务主.xls')
+    download.excel(data, '采购收货任务主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue

@@ -142,7 +142,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(setSearchParams)
-    download.excel(data, '采购收货记录主.xls')
+    download.excel(data, '采购收货记录主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue

@@ -177,15 +177,15 @@ const isShowMainButton = (row,val) => {
 
 // 列表-操作按钮
 const butttondata = (row) => {
-    return [
+  return [
-        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6'])}), // 关闭
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:purchasereceipt-request-main:close'}), // 关闭
-        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5'])}), //重新添加
+    defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:purchasereceipt-request-main:reAdd'}), //重新添加
-        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1'])}), // 提交审批
+    defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:submit'}), // 提交审批
-        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2'])}), // 驳回
+    defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:refused'}), // 驳回
-        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2'])}), // 审批通过
+    defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:agree'}), // 审批通过
-        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3'])}), // 处理
+    defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchasereceipt-request-main:handle'}), // 处理
-        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑
+    defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑
-    ]
+  ]
 }
 
 // 列表-操作按钮事件
@@ -289,7 +289,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PurchasereceiptRequestMainApi.exportPurchasereceiptRequestMain(setSearchParams)
-    download.excel(data, '采购收货申请主.xls')
+    download.excel(data, '采购收货申请主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false