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

src/views/wms/countManage/count/countJobMain/countJobMain.data.ts

@@ -476,7 +476,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable:false,
+    isTable:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -493,7 +493,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable:false,
+    isTable:true,
   },
   {
     label: '操作',

src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts

@@ -280,7 +280,7 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable:false,
+    isTable:true,
     isForm: false,
   },
   {
@@ -303,7 +303,7 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
-    isTable:false,
+    isTable:true,
     isForm: false,
   },
   {
@@ -462,6 +462,7 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: false,
+    isTable: false,
   },
   {
     label: '最后更新者',
@@ -828,7 +829,7 @@ export const CountPlanMain1 = useCrudSchemas(reactive<CrudSchema[]>([
         searchTitle: '库位信息', // 查询弹窗标题
         searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
         searchPage: LocationApi.getLocationPage // 查询弹窗所需分页方法
-        
+
       }
     }
   },

src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts

@@ -730,7 +730,7 @@ export const ScrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
-    isTable: false,
+    isTable: true,
   },
   {
     label: '创建者',
@@ -739,7 +739,7 @@ export const ScrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable: false,
+    isTable: true,
   },
 ]))
 

src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue

@@ -155,6 +155,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    tableObject.params.detailDataType = 2
     const data = await UnplannedissueRecordMainApi.exportUnplannedissueRecordMain(tableObject.params)
     download.excel(data, '计划外出库记录主.xlsx')
   } catch {

src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue

@@ -80,7 +80,7 @@
   />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/unplannedissue-request-main/importSpare" :importTemplateData="importTemplateData" 
+  <ImportForm ref="importFormRef" url="/wms/unplannedissue-request-main/importSpare" :importTemplateData="importTemplateData"
   @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
 </template>
 
@@ -343,7 +343,7 @@ const openForm =async (type: string, row?: number) => {
         item.componentProps.isSearchList = false
         item.componentProps.disabled = true
       }
-      
+
     }else{
       if (item.field == 'costCenterCode') {
         //成本中心代码
@@ -393,6 +393,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    tableObject.params.detailDataType = 2
     const data = await UnplannedissueRequestMainApi.exportUnplannedissueRequestMain(tableObject.params)
     download.excel(data, '备件领用申请.xlsx')
   } catch {
@@ -426,7 +427,7 @@ const tableSelectionDelete = (selection) => {
 }
 // 主子数据 提交
 const submitForm = async (formType, submitData) => {
- 
+
   let data = {...submitData}
   if(data.masterId){
     data.id = data.masterId