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

src/api/wms/supplierdeliverRequestMain/index.ts

@@ -63,6 +63,30 @@ export const deleteSupplierdeliverRequestMain = async (id: number) => {
   return await request.delete({ url: `/wms/supplierdeliver-request-main/delete?id=` + id })
 }
 
+// 打开供应商发货申请主
+export const opeSupplierdeliverRequestMain = async (id: number) => {
+  return await request.post({ url: `/wms/supplierdeliver-request-main/open?id=` + id })
+}
+// 关闭供应商发货申请主
+export const cloSupplierdeliverRequestMain = async (id: number) => {
+  return await request.post({ url: `/wms/supplierdeliver-request-main/close?id=` + id })
+}
+// 提交审批供应商发货申请主
+export const subSupplierdeliverRequestMain = async (id: number) => {
+  return await request.post({ url: `/wms/supplierdeliver-request-main/sub?id=` + id })
+}
+// 审批通过供应商发货申请主
+export const appSupplierdeliverRequestMain = async (id: number) => {
+  return await request.post({ url: `/wms/supplierdeliver-request-main/app?id=` + id })
+}
+// 驳回供应商发货申请主
+export const rejSupplierdeliverRequestMain = async (id: number) => {
+  return await request.post({ url: `/wms/supplierdeliver-request-main/rej?id=` + id })
+}
+// 生成标签
+export const genLabel = async (id) => {
+  return await request.post({ url: `/wms/supplierdeliver-request-main/genLabel?id=` + id })
+}
 // 导出供应商发货申请主 Excel
 export const exportSupplierdeliverRequestMain = async (params) => {
   return await request.download({ url: `/wms/supplierdeliver-request-main/export-excel`, params })

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@@ -63,6 +63,8 @@
       </template>
     </Table>
     <el-button @click="closeDialog">关闭</el-button>
+    <el-button @click="genLabel()">生成标签</el-button>
+
     <el-button @click="print">打印</el-button>
   </el-dialog>
 </template>
@@ -155,8 +157,6 @@
     } else if (val == 'refresh') { // 刷新
       getList()
     } else if (val == 'filtrate') { // 筛选
-    } else { // 其他按钮
-      console.log('其他按钮', item)
     }
   }
 
@@ -173,20 +173,17 @@
   const butttondata = (row) => {
     return [
       defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['5']) }), // 打开
-      defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1']) }), // 关闭
+      defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1', '2', '3', '4']) }), // 关闭
       defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1']) }), // 提交审批
-      defaultButtons.mainListPlanAppBtn({ hide: isShowMainButton(row, ['6']) }), // 审批通过
-      defaultButtons.mainListPlanTurBtn({ hide: isShowMainButton(row, ['6']) }), // 驳回按钮
-
+      defaultButtons.mainListPlanAppBtn({ hide: isShowMainButton(row, ['2']) }), // 审批通过
+      defaultButtons.mainListPlanTurBtn({ hide: isShowMainButton(row, ['2']) }), // 驳回按钮
       defaultButtons.mainListEditBtn({ hasPermi: 'wms:supplierdeliver-request-main:update' }), // 编辑
       defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:supplierdeliver-request-main:delete' }), // 删除
-      // defaultButtons.mainListPointBtn(null), // 标签打印
-      // defaultButtons.mainListDocumentPrintBtn(null), // 单据打印
+      defaultButtons.mainListPointBtn(null), // 标签打印
+      defaultButtons.mainListDocumentPrintBtn(null), // 单据打印
     ]
   }
 
-
-
   // 列表-操作按钮事件
   const buttonTableClick = async (val, row) => {
     if (val == 'mainPurPlanOpe') { // 打开
@@ -301,8 +298,6 @@
     } catch { }
   }
 
-
-
   /** 导出按钮操作 */
   const exportLoading = ref(false) // 导出的加载中
   const handleExport = async () => {
@@ -336,8 +331,24 @@
     isShow.value = false
   }
 
+  /** 生成标签按钮操作 */
+  const genLabel = async () => {
+    try {
+      // 生成标签的二次确认
+      await message.confirm('是否为此数据生成标签？')
+      // 发起生成标签
+      await SupplierdeliverRequestMainApi.genLabel(genLabelId.value)
+      dialogVisible.value = false
+      isShow.value = false
+      message.success(t('生成标签成功!'))
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
+
   const BASE_URL = 'http://dev.ccwin-in.com:25110'
   const src = ref(BASE_URL + '/jmreport/view/881303562245316608?token=' + getAccessToken())
+  const genLabelId=ref();
   // 标签打印
   const handlePoint = async (row) => {
     tableObject.params = {
@@ -346,6 +357,7 @@
     await getDetailList()
     dialogVisible.value = true
     dialogTitle.value = row.number + '单据号'
+    genLabelId.value = row.number
   }
 
   const print = async () => {
@@ -439,6 +451,7 @@
   */
   const tableFormKeys = {}
   SupplierdeliverRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+    
     tableFormKeys[item.field] = item.default ? item.default : ''
   })
   const tableData = ref([])