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

src/api/wms/location/index.ts

@@ -95,3 +95,14 @@ export const selectPageItemAreaToLocation = async (params) => {
     return request.get({ url: `/wms/location/pageItemAreaToLocation`, params })
   }
 }
+
+
+export const selectConfigToLocation = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/location/pageConfigToLocationSenior', data })
+  } else {
+    return request.get({ url: `/wms/location/pageConfigToLocation`, params })
+  }
+}

src/utils/dict.ts

@@ -340,5 +340,6 @@ export enum DICT_TYPE {
 
   // ========== eam - 业务 - ==========
   DEVICE_TYPE = 'device_type', // 设备类型
+  IS_UPDATED = 'is_updated', //是否可修改
 
 }

src/views/eam/basicInspectionOption/basicInspectionOption.data.ts

@@ -40,7 +40,13 @@ export const BasicInspectionOption = useCrudSchemas(reactive<CrudSchema[]>([
     label: '项是否可修改',
     field: 'isUpdated',
     sort: 'custom',
+    dictType: DICT_TYPE.IS_UPDATED,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isTable: true,
+    isDetail: false,
     isSearch: true,
+    isTableForm: false,
+    isForm: true,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -100,14 +106,13 @@ export const BasicInspectionOption = useCrudSchemas(reactive<CrudSchema[]>([
     label: '是否可用',
     field: 'available',
     sort: 'custom',
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
-      }
-    },
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isTable: true,
+    isDetail: false,
+    isSearch: false,
+    isTableForm: false,
+    isForm: false,
   },
   {
     label: '删除时间',

src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="SaleShipmentMainRecord.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...SaleShipmentMainRecord.allSchemas.searchSchema,...SaleShipmentDetailRecord.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,11 +12,12 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="SaleShipmentMainRecord.allSchemas"
+      :detailAllSchemas="SaleShipmentDetailRecord.allSchemas"
     />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
+    <Table v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -51,15 +52,23 @@
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="SaleShipmentMainRecord.allSchemas" />
+  <Detail 
+    ref="detailRef" 
+    :isBasic="true" 
+    :allSchemas="SaleShipmentMainRecord.allSchemas" 
+    :detailAllSchemas="SaleShipmentDetailRecord.allSchemas"
+    :detailAllSchemasRules="SaleShipmentDetailRecordRules"
+    :apiPage="SaleShipmentDetailRecordApi.getSaleShipmentDetailRecordPage"
+    />
 
   <!-- 导入 -->
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { SaleShipmentMainRecord,SaleShipmentMainRecordRules } from './saleShipmentMainRecord.data'
+import { SaleShipmentMainRecord,SaleShipmentMainRecordRules,SaleShipmentDetailRecord,SaleShipmentDetailRecordRules } from './saleShipmentMainRecord.data'
 import * as SaleShipmentMainRecordApi from '@/api/wms/saleShipmentMainRecord'
+import * as SaleShipmentDetailRecordApi from '@/api/wms/saleShipmentDetailRecord'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
@@ -72,8 +81,8 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(SaleShipmentMainRecord.allSchemas.tableColumns)
-
+const tableColumns = ref([SaleShipmentMainRecord.allSchemas.tableColumns,...SaleShipmentDetailRecord.allSchemas.tableMainColumns])
+// const tableColumns = ref(SaleShipmentMainRecord.allSchemas.tableColumns)
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {

src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts

@@ -22,14 +22,12 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '客户代码',
     field: 'customerCode',
     sort: 'custom',
-    isSearch: true,
   },
   {
     label: '发票时间',
     field: 'invoiceTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -51,7 +49,6 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'executeTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -72,28 +69,25 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '是否可用',
     field: 'available',
     sort: 'custom',
-    isSearch: true,
     isTable:false
   },
   {
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
-    isSearch: true,
+
   },
   
   {
     label: '业务类型',
     field: 'businessType',
     sort: 'custom',
-    isSearch: true,
   },
   {
     label: '创建时间',
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -109,7 +103,6 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '地点ID',
     field: 'siteId',
     sort: 'custom',
-    isSearch: true,
     isTable:false
   },
   {
@@ -132,43 +125,36 @@ export const SaleShipmentDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '单据号',
     field: 'number',
     sort: 'custom',
-    isSearch: true,
   },
   {
     label: '销售订单号',
     field: 'soNumber',
     sort: 'custom',
-    isSearch: true,
   },
   {
     label: '销售订单行',
     field: 'soLine',
     sort: 'custom',
-    isSearch: true,
   },
   {
     label: '从货主代码',
     field: 'fromOwnerCode',
     sort: 'custom',
-    isSearch: true,
   },
   {
     label: '包装号',
     field: 'packingNumber',
     sort: 'custom',
-    isSearch: true,
   },
   {
     label: '批次',
     field: 'batch',
     sort: 'custom',
-    isSearch: true,
   },
   {
     label: '库存状态',
     field: 'inventoryStatus',
     sort: 'custom',
-    isSearch: true,
     form: {
       component: 'Radio'
     },
@@ -177,13 +163,11 @@ export const SaleShipmentDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '从库位代码',
     field: 'fromLocationCode',
     sort: 'custom',
-    isSearch: true,
   },
   {
     label: '主表ID',
     field: 'masterId',
     sort: 'custom',
-    isSearch: true,
     form: {
       component: 'InputNumber',
       value: 0
@@ -193,56 +177,47 @@ export const SaleShipmentDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '物品代码',
     field: 'itemCode',
     sort: 'custom',
-    isSearch: true,
   },
   {
     label: '物品名称',
     field: 'itemName',
     sort: 'custom',
-    isSearch: true,
   },
   {
     label: '物品描述1',
     field: 'itemDesc1',
     sort: 'custom',
-    isSearch: true,
   },
   {
     label: '物品描述2',
     field: 'itemDesc2',
     sort: 'custom',
-    isSearch: true,
   },
   {
     label: '项目代码',
     field: 'projectCode',
     sort: 'custom',
-    isSearch: true,
   },
   {
     label: '数量',
     field: 'qty',
     sort: 'custom',
-    isSearch: true,
   },
   {
     label: '计量单位',
     field: 'uom',
     sort: 'custom',
-    isSearch: true,
   },
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
-    isSearch: true,
   },
   {
     label: '创建时间',
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -257,13 +232,11 @@ export const SaleShipmentDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '并发乐观锁',
     field: 'concurrencyStamp',
     sort: 'custom',
-    isSearch: true,
   },
   {
     label: '地点ID',
     field: 'siteId',
     sort: 'custom',
-    isSearch: true,
     form: {
       component: 'InputNumber',
       value: 0

src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue

@@ -108,13 +108,18 @@ const trueFalse = ref(false)
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(() => {
     if (type == 'tableForm') {
+      if(formField == 'soLine') {
         row['soLine'] = val[0]['lineNumber']
         row['soNumber'] = val[0]['number']    
         row['itemCode'] = val[0]['itemCode']
         row['projectCode'] = val[0]['projectCode']
         row['uom'] = val[0]['uom']
+      }else if(formField == 'fromLocationCode'){
+        row['fromLocationCode'] = val[0]['code']
+      }
     }else {
       const setV = {}
+      setV[formField] = val[0][searchField]    
       if(formField == 'CustomerCode') {
         setV['CustomerCode'] = val[0]['CustomerCode']
       } else {

src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts

@@ -53,7 +53,6 @@ export const SaleShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '客户代码',
     field: 'customerCode',
     sort: 'custom',
-    isSearch: true,
     table: {
       width: 150
     },
@@ -79,7 +78,6 @@ export const SaleShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '发票时间',
     field: 'invoiceTime',
     sort: 'custom',
-    isSearch: true,
     table: {
       width: 180
     },
@@ -249,6 +247,15 @@ export const SaleShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
 
 // 表单校验
 export const SaleShipmentDetailRules = reactive({
+  soLine: [
+    { required: true, message: '请选择订单行', trigger: 'blur' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请输选择客户库位', trigger: 'blur' }
+  ],
+  qty: [
+    { required: true, message: '请输入开票数量', trigger: 'blur' }
+  ],
 })
 
 export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
@@ -256,7 +263,6 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '销售订单号',
     field: 'soNumber',
     sort: 'custom',
-    isSearch: true,
     table: {
       width: 200
     },
@@ -321,7 +327,6 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '物料代码',
     field: 'itemCode',
     sort: 'custom',
-    isSearch: true,
     tableForm: {
       type: 'Select',
       disabled: true