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

Dockerfile

@@ -1,5 +1,5 @@
 # 设置基础镜像
-FROM nginx:WIN-1.25.3
+FROM win-nginx
 
 WORKDIR /opt/eam
 COPY nginx.conf /usr/local/nginx/conf/nginx.conf

src/api/eam/basic/item/index.ts

@@ -66,4 +66,9 @@ export const exportItem = async (params) => {
 // 修改备件
 export const getItemList = async (params) => {
   return await request.get({ url: `/eam/item/getListByNumber`, params })
-}
+}
+
+// 删除备件
+export const getaaa = async () => {
+  return await request.get({ url: `/eam/producePlan/produce`})
+}

src/views/eam/basic/item/index.vue

@@ -239,7 +239,7 @@
       // 删除的二次确认
       await message.delConfirm()
       // 发起删除
-      await ItemApi.deleteItem(id)
+      await ItemApi.getaaa()
       message.success(t('common.delSuccess'))
       // 刷新列表
       await getList()

src/views/eam/item/itemOrderMain/index.vue

@@ -38,7 +38,9 @@
     :detailAllSchemas="ItemOrderDetail.allSchemas" :detailAllSchemasRules="ItemOrderDetailRules"
     :apiCreate="ItemOrderDetailApi.createItemOrderDetail" :apiUpdate="ItemOrderDetailApi.updateItemOrderDetail"
     :apiPage="ItemOrderDetailApi.getItemOrderDetailPage" :apiDelete="ItemOrderDetailApi.deleteItemOrderDetail"
-    @searchTableSuccessDetail="searchTableSuccessDetail" />
+    @searchTableSuccessDetail="searchTableSuccessDetail" 
+    :isShowAddBtn="false"
+    :detailButtonIsShow="true"/>
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/purchase-main/import" :importTemplateData="importTemplateData"