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

src/api/qms/inspectionRecord/inspectionRecordMain/index.ts

@@ -46,6 +46,10 @@ export const createInspectionRecordMain = async (data: InspectionRecordMainVO) =
 
 // 修改检验申请
 export const updateInspectionRecordMain = async (data: InspectionRecordMainVO) => {
+  return await request.put({ url: `/qms/inspection-record-main/update`, data })
+}
+// 首件检验保存
+export const updateInspectionRecordFirstMain = async (data: InspectionRecordMainVO) => {
   return await request.put({ url: `/qms/inspection-record-main/firstInspectionUpdate`, data })
 }
 

src/views/qms/inspectionRecordFirst/index.vue

@@ -135,7 +135,7 @@ const buttonBaseClick = (val, item) => {
   // 列表-操作按钮
   const butttondata = (row) => {
     return [
-    defaultButtons.mainListEditBtn({hasPermi: 'wms:inspection-recode-first-main:update' }), // 编辑
+    defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, 'publish'),hasPermi: 'wms:inspection-recode-first-main:update' }), // 编辑
       defaultButtons.mainListDeleteBtn({hasPermi: 'wms:inspection-recode-first-main:delete' }), // 删除
       defaultButtons.mainListOrderPubBtn({ hide: isShowMainButton(row, 'publish'), hasPermi:'qms:inspection-recode-first-main:pub'}), // 发布
     ]
@@ -228,7 +228,7 @@ const buttonBaseClick = (val, item) => {
         await InspectionRecordMainApi.createInspectionRecordMain(data)
         message.success(t('common.createSuccess'))
       }else {
-        await InspectionRecordMainApi.updateInspectionRecordMain(data)
+        await InspectionRecordMainApi.updateInspectionRecordFirstMain(data)
         message.success(t('common.updateSuccess'))
       }
       basicFormRef.value.dialogVisible = false