修改销售出库收货人字段

xjrsoft-vue3/src/api/ckgl/xsck/model/XsckModel.ts

@@ -6,11 +6,33 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
 export interface MesWarehouseSaleoutPageParams extends BasicPageParams {
   djbh: string;
 
+  djrq: string;
+
   ck: string;
 
+  crklx: string;
+
+  jbr: string;
+
+  bm: string;
+
+  ddkh: string;
+
+  djzt: string;
+
   ywzz: string;
 
+  cydw: string;
+
+  shrq: string;
+
+  shdz: string;
+
+  shrxm: string;
+
   pch: string;
+
+  bz: string;
 }
 
 /**
@@ -41,13 +63,13 @@ export interface MesWarehouseSaleoutPageModel {
 
   shdz: string;
 
-  shr: string;
-
   ywzz: string;
 
   djzt: string;
 
   bz: string;
+
+  shrxm: string;
 }
 
 /**
@@ -84,7 +106,7 @@ export interface MesWarehouseSaleoutModel {
 
   shdz: string;
 
-  shr: string;
+  shrxm: string;
 
   bz: string;
 

xjrsoft-vue3/src/views/ckgl/xsck/components/config.ts

@@ -10,12 +10,72 @@ export const searchFormSchema: FormSchema[] = [
     component: 'Input',
   },
   {
+    field: 'djrq',
+    label: '单据日期',
+    defaultValue: undefined,
+    component: 'RangePicker',
+    componentProps: {
+      format: 'YYYY-MM-DD HH:mm:ss',
+      style: { width: '100%' },
+      getPopupContainer: () => document.body,
+    },
+  },
+
+  {
     field: 'ck',
     label: '仓库',
     defaultValue: undefined,
     component: 'Input',
   },
   {
+    field: 'crklx',
+    label: '出入库类型',
+    defaultValue: undefined,
+    component: 'XjrSelect',
+    componentProps: {
+      datasourceType: 'dic',
+      params: { itemId: '2010533622867509249' },
+      labelField: 'name',
+      valueField: 'value',
+      mode: 'multiple',
+      showSearch: true,
+      getPopupContainer: () => document.body,
+    },
+  },
+  {
+    field: 'jbr',
+    label: '经办人',
+    defaultValue: undefined,
+    component: 'Input',
+  },
+  {
+    field: 'bm',
+    label: '部门',
+    defaultValue: undefined,
+    component: 'Input',
+  },
+  {
+    field: 'ddkh',
+    label: '订单客户',
+    defaultValue: undefined,
+    component: 'Input',
+  },
+  {
+    field: 'djzt',
+    label: '单据状态',
+    defaultValue: undefined,
+    component: 'XjrSelect',
+    componentProps: {
+      datasourceType: 'dic',
+      params: { itemId: '2010588655764074497' },
+      labelField: 'name',
+      valueField: 'value',
+      mode: 'multiple',
+      showSearch: true,
+      getPopupContainer: () => document.body,
+    },
+  },
+  {
     field: 'ywzz',
     label: '业务组织',
     defaultValue: undefined,
@@ -31,11 +91,47 @@ export const searchFormSchema: FormSchema[] = [
     },
   },
   {
+    field: 'cydw',
+    label: '承运单位',
+    defaultValue: undefined,
+    component: 'Input',
+  },
+  {
+    field: 'shrq',
+    label: '收货日期',
+    defaultValue: undefined,
+    component: 'RangePicker',
+    componentProps: {
+      format: 'YYYY-MM-DD HH:mm:ss',
+      style: { width: '100%' },
+      getPopupContainer: () => document.body,
+    },
+  },
+
+  {
+    field: 'shdz',
+    label: '收货地址',
+    defaultValue: undefined,
+    component: 'Input',
+  },
+  {
+    field: 'shrxm',
+    label: '收货人',
+    defaultValue: undefined,
+    component: 'Input',
+  },
+  {
     field: 'pch',
     label: '批次号',
     defaultValue: undefined,
     component: 'Input',
   },
+  {
+    field: 'bz',
+    label: '备注',
+    defaultValue: undefined,
+    component: 'Input',
+  },
 ];
 
 export const columns: BasicColumn[] = [
@@ -184,19 +280,6 @@ export const columns: BasicColumn[] = [
 
   {
     resizable: true,
-    dataIndex: 'shr',
-    title: '收货人',
-    componentType: 'input',
-
-    fixed: false,
-    sorter: true,
-
-    styleConfig: undefined,
-    listStyle: '',
-  },
-
-  {
-    resizable: true,
     dataIndex: 'ywzz',
     title: '业务组织',
     componentType: 'select',
@@ -233,6 +316,19 @@ export const columns: BasicColumn[] = [
     styleConfig: undefined,
     listStyle: undefined,
   },
+
+  {
+    resizable: true,
+    dataIndex: 'shrxm',
+    title: '收货人',
+    componentType: 'input',
+
+    fixed: false,
+    sorter: true,
+
+    styleConfig: undefined,
+    listStyle: '',
+  },
 ];
 //表头合并配置
 export const headerMergingData = [];
@@ -639,7 +735,6 @@ export const formProps: FormProps = {
                   { key: 2, label: 'Option 2', value: 'Option 2' },
                   { key: 3, label: 'Option 3', value: 'Option 3' },
                 ],
-                defaultSelect: null,
                 datasourceType: 'dic',
                 params: { itemId: '2015724355955159041' },
                 labelField: 'name',
@@ -774,7 +869,7 @@ export const formProps: FormProps = {
           list: [
             {
               key: '4fb2b6b7dd9341d1b5dcf0968266269b',
-              field: 'shr',
+              field: 'shrxm',
               label: '收货人',
               type: 'input',
               component: 'Input',
@@ -823,7 +918,6 @@ export const formProps: FormProps = {
                 span: 8,
                 defaultValue: '',
                 placeholder: '请输入批次号',
-                maxlength: null,
                 prefix: '',
                 suffix: '',
                 addonBefore: '',

xjrsoft-vue3/src/views/ckgl/xsck/components/workflowPermission.ts

@@ -207,7 +207,7 @@ export const permissionList = [
     isSaveTable: false,
     tableName: '',
     fieldName: '收货人',
-    fieldId: 'shr',
+    fieldId: 'shrxm',
     isSubTable: false,
     showChildren: true,
     type: 'input',

xjrsoft-vue3/src/views/ckgl/xsck/index.vue

@@ -184,7 +184,8 @@
     formConfig: {
       labelWidth: 100,
       schemas: searchFormSchema,
-      fieldMapToTime: [],
+      fieldMapToTime: [['djrq', ['djrqStart', 'djrqEnd'], 'YYYY-MM-DD HH:mm:ss ', true],
+['shrq', ['shrqStart', 'shrqEnd'], 'YYYY-MM-DD HH:mm:ss ', true],],
       showResetButton: false,
     },
      bordered:false,