2

src/views/cuspCode/CustomerProfile/CuspCustomerProfile.data.ts

@@ -154,6 +154,7 @@ export const searchFormSchema: FormSchema[] = [
       labelWidth: 150,
       //colProps: {span: 6},
  	},
+	
    {
     label: "优先级(priority)",
     field: "priority",
@@ -177,14 +178,24 @@ export const searchFormSchema: FormSchema[] = [
 	{
       label: "付款条件(payment terms)",
       field: "paymentTerms",
-      component: 'JSelectMultiple',
+      // component: 'JSelectMultiple',
+      component: 'JDictSelectTag',
       labelWidth: 180,
       componentProps:{
           dictCode:"payment_terms"
       },
       //colProps: {span: 6},
  	},
-	
+	{
+	    label: "状态(status)",
+	    field: "status",
+	    component: 'JDictSelectTag',
+	    componentProps:{
+	        dictCode:"valid_status"
+	    },
+	    labelWidth: 150,
+	    //colProps: {span: 6},
+	},
 	
 ];
 //表单数据
@@ -202,6 +213,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     colProps: {span: 12},
     labelWidth: 250,
+    required: true,
   },
   {
     label: '简称(abbreviation)',
@@ -352,8 +364,8 @@ export const formSchema: FormSchema[] = [
      },
   },
   {
-    label: '备注(notes)',
-    field: 'notes',
+    label: '状态(status)',
+    field: 'status',
     colProps: {span: 12},
     labelWidth: 250,
     component: 'JDictSelectTag',
@@ -363,12 +375,13 @@ export const formSchema: FormSchema[] = [
 
   },
   {
-    label: '状态(status)',
-    field: 'status',
-    colProps: {span: 12},
+    label: '备注(notes)',
+    field: 'notes',
+    colProps: {span: 24},
     labelWidth: 200,
-    component: 'Input',
+    component: 'Input'
   },
+  
 	// TODO 主键隐藏字段，目前写死为ID
 	{
 	  label: '',
@@ -473,4 +486,4 @@ export const superQuerySchema = {
 export function getBpmFormSchema(_formData): FormSchema[]{
 // 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema
   return formSchema;
-}
+}

src/views/cuspCode/Intermediator/components/CuspIntermediatorModal.vue

@@ -1,5 +1,5 @@
 <template>
-  <j-modal maxHeight="370px" :title="title"  :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+  <j-modal maxHeight="400px" :title="title"  :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
     <CuspIntermediatorForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></CuspIntermediatorForm>
   </j-modal>
 </template>
@@ -10,7 +10,7 @@
   import JModal from '/@/components/Modal/src/JModal/JModal.vue';
   
   const title = ref<string>('');
-  const width = ref<number>(1200);
+  const width = ref<number>(1400);
   const visible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(false);
   const registerForm = ref();

src/views/cuspCode/SupplierProfile/CuspSupplierProfile.data.ts

@@ -25,12 +25,14 @@ export const columns: BasicColumn[] = [
    {
     title: '供应商性质(supplier nature)',
     align:"center",
-    dataIndex: 'supplierNature_dictText'
+    dataIndex: 'supplierNature_dictText',
+    width:200
    },
    {
     title: '税号(duty paragraph)',
     align:"center",
-    dataIndex: 'dutyParagraph'
+    dataIndex: 'dutyParagraph',
+    width:200
    },
    {
     title: '法人(legal person)',
@@ -55,12 +57,14 @@ export const columns: BasicColumn[] = [
    {
     title: '付款条件(payment terms)',
     align:"center",
-    dataIndex: 'paymentTerms_dictText'
+    dataIndex: 'paymentTerms_dictText',
+    width:200
    },
    {
     title: '原厂(original factory)',
     align:"center",
-    dataIndex: 'originalFactory_dictText'
+    dataIndex: 'originalFactory_dictText',
+    width:180
    },
    {
     title: '状态(status)',
@@ -70,7 +74,8 @@ export const columns: BasicColumn[] = [
    {
     title: '考评等级(evaluation level)',
     align:"center",
-    dataIndex: 'evaluationLevel_dictText'
+    dataIndex: 'evaluationLevel_dictText',
+    width:200
    },
    {
     title: '临时供应商(temporary supplier)',
@@ -212,6 +217,8 @@ export const formSchema: FormSchema[] = [
     label: '编码(code)',
     field: 'code',
     component: 'Input',
+    labelWidth: 200,
+    disabled:true,
     colProps: {span: 12},
   },
   {
@@ -220,11 +227,13 @@ export const formSchema: FormSchema[] = [
     colProps: {span: 12},
     component: 'Input',
     labelWidth: 200,
+    required: true,
   },
   {
     label: '简称(abbreviation)',
     field: 'abbreviation',
     colProps: {span: 12},
+    labelWidth: 200,
     component: 'Input',
   },
   {
@@ -238,6 +247,7 @@ export const formSchema: FormSchema[] = [
     label: '税号(duty paragraph)',
     field: 'dutyParagraph',
     colProps: {span: 12},
+    labelWidth: 200,
     component: 'Input',
   },
   {
@@ -251,6 +261,7 @@ export const formSchema: FormSchema[] = [
     label: '联系人(contacts)',
     field: 'contacts',
     colProps: {span: 12},
+    labelWidth: 200,
     component: 'Input',
   },
   {
@@ -264,6 +275,7 @@ export const formSchema: FormSchema[] = [
     label: '邮箱(email)',
     field: 'email',
     colProps: {span: 12},
+    labelWidth: 200,
     component: 'Input',
   },
   {
@@ -277,6 +289,7 @@ export const formSchema: FormSchema[] = [
     label: '公司地址(address)',
     field: 'address',
     colProps: {span: 12},
+    labelWidth: 200,
     component: 'Input',
   },
   {
@@ -293,6 +306,7 @@ export const formSchema: FormSchema[] = [
     label: '国家(country)',
     field: 'country',
     colProps: {span: 12},
+    labelWidth: 200,
     component: 'JDictSelectTag',
     componentProps:{
         dictCode:"country"
@@ -313,6 +327,7 @@ export const formSchema: FormSchema[] = [
     label: '币种(currency)',
     field: 'currency',
     colProps: {span: 12},
+    labelWidth: 200,
     component: 'JDictSelectTag',
     componentProps:{
         dictCode:"currency	"
@@ -332,6 +347,7 @@ export const formSchema: FormSchema[] = [
   {
     label: '开户行(opening bank)',
     field: 'openingBank',
+    labelWidth: 200,
     colProps: {span: 12},
     component: 'Input',
   },
@@ -349,6 +365,7 @@ export const formSchema: FormSchema[] = [
     label: '户名(opening name)',
     field: 'openingName',
     colProps: {span: 12},
+    labelWidth: 200,
     component: 'Input',
   },
   {
@@ -358,12 +375,7 @@ export const formSchema: FormSchema[] = [
     colProps: {span: 12},
     component: 'Input',
   },
-  {
-    label: '备注(notes)',
-    field: 'notes',
-    colProps: {span: 12},
-    component: 'Input',
-  },
+  
   {
     label: '银行帐号(bank account)',
     field: 'bankAccount',
@@ -375,6 +387,7 @@ export const formSchema: FormSchema[] = [
     label: '状态(status)',
     field: 'status',
     colProps: {span: 12},
+    labelWidth: 200,
     component: 'JDictSelectTag',
     componentProps:{
         dictCode:"valid_status",
@@ -402,6 +415,13 @@ export const formSchema: FormSchema[] = [
     colProps: {span: 6},
     labelWidth: 200,
     component: 'JUpload',
+  },
+  {
+    label: '备注(notes)',
+    field: 'notes',
+    colProps: {span: 24},
+    labelWidth: 200,
+    component: 'Input',
   },
 	// TODO 主键隐藏字段，目前写死为ID
 	{
@@ -467,7 +487,7 @@ export const cuspSupplierProfileQualificationColumns: JVxeColumn[] = [
     {
       title: '有效期始(valid begin)',
       key: 'validBegin',
-      type: JVxeTypes.datetime,
+      type: JVxeTypes.date,
       width:"200px",
       placeholder: '请输入${title}',
       defaultValue:'',
@@ -475,7 +495,8 @@ export const cuspSupplierProfileQualificationColumns: JVxeColumn[] = [
     {
       title: '有效期止(valid end)',
       key: 'validEnd',
-      type: JVxeTypes.datetime,
+      // type: JVxeTypes.datetime,
+      type: JVxeTypes.date,
       width:"200px",
       placeholder: '请输入${title}',
       defaultValue:'',
@@ -579,4 +600,4 @@ export const superQuerySchema = {
 export function getBpmFormSchema(_formData): FormSchema[]{
 // 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema
   return formSchema;
-}
+}

src/views/cuspCode/SupplierProfile/components/CuspSupplierProfileModal.vue

@@ -4,7 +4,7 @@
         <BasicForm @register="registerForm" ref="formRef" name="CuspSupplierProfileForm"/>
         <!-- 子表单区域 -->
         <a-tabs v-model:activeKey="activeKey" animated @change="handleChangeTabs">
-          <a-tab-pane tab="供应商档案-联系人" key="cuspSupplierProfileMan" :forceRender="true">
+          <a-tab-pane tab="联系人(link man)" key="cuspSupplierProfileMan" :forceRender="true">
             <JVxeTable
               keep-source
               resizable
@@ -26,7 +26,7 @@
                   </template>
             </JVxeTable>
           </a-tab-pane>
-          <a-tab-pane tab="供应商档案-资质信息" key="cuspSupplierProfileQualification" :forceRender="true">
+          <a-tab-pane tab="资质信息(qualification information)" key="cuspSupplierProfileQualification" :forceRender="true">
             <JVxeTable
               keep-source
               resizable
@@ -165,4 +165,4 @@
   /deep/.ant-modal{
    top: 34px;
   }
-</style>
+</style>