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

src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="[...ProductionreturnRecordMain.allSchemas.searchSchema,...ProductionreturnRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...ProductionscrapRecordMain.allSchemas.searchSchema,...ProductionscrapRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -11,8 +11,8 @@
       :routeName="routeName"
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
-      :allSchemas="ProductionreturnRecordMain.allSchemas"
+      :allSchemas="ProductionscrapRecordMain.allSchemas"
-      :detailAllSchemas="ProductionreturnRecordDetail.allSchemas"
+      :detailAllSchemas="ProductionscrapRecordDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -43,10 +43,10 @@
   <BasicForm
     ref="formRef"
     @success="getList"
-    :rules="ProductionreturnRecordMainRules"
+    :rules="ProductionscrapRecordMainRules"
-    :formAllSchemas="ProductionreturnRecordMain.allSchemas"
+    :formAllSchemas="ProductionscrapRecordMain.allSchemas"
-    :tableAllSchemas="ProductionreturnRecordDetail.allSchemas"
+    :tableAllSchemas="ProductionscrapRecordDetail.allSchemas"
-    :tableFormRules="ProductionreturnRecordDetailRules"
+    :tableFormRules="ProductionscrapRecordDetailRules"
     :isBusiness="true"
   />
 
@@ -54,18 +54,18 @@
   <Detail
     ref="detailRef"
     :isBasic="false"
-    :allSchemas="ProductionreturnRecordMain.allSchemas"
+    :allSchemas="ProductionscrapRecordMain.allSchemas"
-    :detailAllSchemas="ProductionreturnRecordDetail.allSchemas"
+    :detailAllSchemas="ProductionscrapRecordDetail.allSchemas"
-    :detailAllSchemasRules="ProductionreturnRecordDetailRules"
+    :detailAllSchemasRules="ProductionscrapRecordDetailRules"
-    :apiPage="ProductionreturnRecordDetailApi.getProductionreturnRecordDetailPage"
+    :apiPage="ProductionscrapRecordDetailApi.getProductionscrapRecordDetailPage"
   />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { ProductionreturnRecordMain,ProductionreturnRecordMainRules,ProductionreturnRecordDetail,ProductionreturnRecordDetailRules } from './productionscrapRecordMain.data'
+import { ProductionscrapRecordMain,ProductionscrapRecordMainRules,ProductionscrapRecordDetail,ProductionscrapRecordDetailRules } from './productionscrapRecordMain.data'
-import * as ProductionreturnRecordMainApi from '@/api/wms/productionreturnRecordMain'
+import * as ProductionscrapRecordMainApi from '@/api/wms/productionscrapRecordMain'
-import * as ProductionreturnRecordDetailApi from '@/api/wms/productionreturnRecordDetail'
+import * as ProductionscrapRecordDetailApi from '@/api/wms/productionscrapRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 // 生产退料记录主
@@ -77,7 +77,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref([...ProductionreturnRecordMain.allSchemas.tableColumns,...ProductionreturnRecordDetail.allSchemas.tableMainColumns])
+const tableColumns = ref([...ProductionscrapRecordMain.allSchemas.tableColumns,...ProductionscrapRecordDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -85,7 +85,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: ProductionreturnRecordDetailApi.getProductionreturnRecordDetailPage // 分页接口
+  getListApi: ProductionscrapRecordDetailApi.getProductionscrapRecordDetailPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -93,7 +93,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultExportBtn({hasPermi:'wms:productionreturn-record-main:export'}), // 导出
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productionscrap-record-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -155,8 +155,8 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await ProductionreturnRecordMainApi.exportProductionreturnRecordMain(tableObject.params)
+    const data = await ProductionscrapRecordMainApi.exportProductionscrapRecordMain(tableObject.params)
-    download.excel(data, '生产退料记录主.xlsx')
+    download.excel(data, '线标报废记录主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts

@@ -4,7 +4,7 @@ import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 /**
  * @returns {Array} 生产退料记录主表
  */
-export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+export const ProductionscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '单据号',
     field: 'number',
@@ -16,22 +16,21 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     isSearch: true
   },
   {
-    label: '车间代码',
+    label: '申请单号',
-    field: 'workshopCode',
+    field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
+    isSearch: true
   },
   {
-    label: '申请单号',
+    label: '车间代码',
-    field: 'requestNumber',
+    field: 'workshopCode',
     sort: 'custom',
     table: {
-      width: 180
+      width: 150
     },
-    isTable: false,
-    isSearch: true
   },
   {
     label: '出库事务类型',
@@ -319,7 +318,7 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
 ]))
 
 //表单校验
-export const ProductionreturnRecordMainRules = reactive({
+export const ProductionscrapRecordMainRules = reactive({
   requestNumber: [
     { required: true, message: '请选择申请单号', trigger: 'change' }
   ],
@@ -373,7 +372,7 @@ export const ProductionreturnRecordMainRules = reactive({
 /**
  * @returns {Array} 生产退料记录子表
  */
-export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+export const ProductionscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生产线代码',
     field: 'productionLineCode',
@@ -636,7 +635,7 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]
 ]))
 
 //表单校验
-export const ProductionreturnRecordDetailRules = reactive({
+export const ProductionscrapRecordDetailRules = reactive({
   inventoryStatus: [
     { required: true, message: '请选择库存状态', trigger: 'change' }
   ],