2

src/views/BasicData/productArchive.vue

@@ -149,7 +149,7 @@
     const columns = [
         {
             title: '分类(class)',
-            dataIndex: 'classId',
+            dataIndex: 'classId_dictText',
             key: 'classId',
             align:"center"
         },
@@ -402,4 +402,4 @@
 //     padding: 8px !important;
 // }
 
-</style>
+</style>

src/views/baseCode/ProjectArchive/BaseProjectArchive.data.ts

@@ -3,6 +3,7 @@ import {FormSchema} from '/@/components/Table';
 import { rules} from '/@/utils/helper/validator';
 import { render } from '/@/utils/common/renderUtils';
 import { getWeekMonthQuarterYear } from '/@/utils';
+import { defHttp } from '/@/utils/http/axios';
 //列表数据
 export const columns: BasicColumn[] = [
   {
@@ -19,7 +20,7 @@ export const columns: BasicColumn[] = [
    {
     title: '客户(customer)',
     align:"center",
-    dataIndex: 'customerId'
+    dataIndex: 'customerId_dictText'
    },
    {
     title: '备注(notes)',
@@ -87,19 +88,35 @@ export const formSchema: FormSchema[] = [
   {
     label: '客户(customer)',
     field: 'customerId',
-    component: 'JDictSelectTag',
-    componentProps:{
-        dictCode: 'customer',
-     },
-     required: true
+    component: 'ApiSelect',
+    // componentProps:{
+    //     dictCode: 'customer',
+    //  },
+     required: true,
+     componentProps: {
+             // mode: 'multiple',//multiple: 多选；不填写为单选
+             //请求api,返回结果{ result: { records: [{'id':'1',name:'scott'},{'id':'2',name:'小张'}] }}
+             api: ()=> defHttp.get({ url: '/cuspCode/cuspCustomerProfile/list?pageSize=-1' }),
+             //数值转成String
+             numberToString: false,
+             //标题字段
+             labelField: 'name',
+             //值字段
+             valueField: 'id',
+             //请求参数
+             params:{},
+             //返回结果字段
+             resultField:'records'
+           },
   },
   {
     label: '编码(code)',
     field: 'code',
     component: 'Input',
     componentProps: {
-      placeholder:'请输入,为空则自动生成'
+      placeholder:'自动生成'
     },
+    dynamicDisabled:true
   },
   {
     label: '名称(name)',
@@ -141,4 +158,4 @@ export const superQuerySchema = {
 export function getBpmFormSchema(_formData): FormSchema[]{
   // 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema
   return formSchema;
-}
+}

src/views/baseCode/ShipArchive/BaseShipArchive.data.ts

@@ -87,7 +87,7 @@ export const searchFormSchema: FormSchema[] = [
   labelWidth: 150,
   componentProps: {
       valueType: 'Date',
-      showTime:true
+      showTime:false
   },
   //colProps: {span: 6},
 },
@@ -153,8 +153,8 @@ export const formSchema: FormSchema[] = [
     field: 'shipDate',
     component: 'DatePicker',
     componentProps: {
-       showTime: true,
-       valueFormat: 'YYYY-MM-DD HH:mm:ss'
+       showTime: false,
+       valueFormat: 'YYYY-MM-DD'
      },
   },
   {

src/views/cuspCode/SupplierEvaluation/CuspSupplierEvaluation.data.ts

@@ -116,7 +116,7 @@ export const formSchema: FormSchema[] = [
     labelWidth:150,
     componentProps: {
        showTime:true,
-       valueFormat: 'YYYY-MM-DD HH:mm:ss'
+       valueFormat: 'YYYY-MM-DD'
      },
   },
   {
@@ -253,4 +253,4 @@ export function getSupplierOptions(){
     }
   })
 }
-export const supplierOptions = supplierOption.value
+export const supplierOptions = supplierOption.value

src/views/cuspCode/SupplierEvaluation/components/CuspSupplierEvaluationModal.vue

@@ -16,7 +16,7 @@
               <a-row :gutter="24">
                 <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="8">
                   <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="billDate" label="单据日期(billDate)">
-                    <a-date-picker v-model:value="model.billDate" show-time  valueFormat="YYYY-MM-DD HH:mm:ss" format='YYYY-MM-DD HH:mm:ss' style="width: 100%;" :disabled="!showFooter"/>
+                    <a-date-picker v-model:value="model.billDate" show-time  valueFormat="YYYY-MM-DD" format='YYYY-MM-DD' style="width: 100%;" :disabled="!showFooter"/>
                   </a-form-item>
                 </a-col>
                 <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="8">
@@ -31,7 +31,7 @@
                 </a-col>
                 <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="8">
                   <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="billCode" label="考评单号(bill code)">
-                      <a-input  placeholder="请输入" v-model:value="model.billCode" AutoComplete='off' :disabled="!showFooter"/>
+                      <a-input  placeholder="请输入" v-model:value="model.billCode" AutoComplete='off' disabled/>
                   </a-form-item>
                 </a-col>
                 <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="8">
@@ -109,7 +109,9 @@
       serviceScore:'',
       totalScore:'',
     });
-    var validatorRules = ref({});
+    const validatorRules = reactive({
+      supplierId: [{ required: true, message: '请选择供应商!'},],
+    });
     var title = ref('');
     const tableRefs = {cuspSupplierEvaluationScore, };
     var dataSource = ref([
@@ -232,4 +234,4 @@
   /deep/.ant-form-item{
       margin-bottom: 8px !important;
   }
-</style>
+</style>

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

@@ -219,6 +219,10 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     labelWidth: 200,
     colProps: {span: 12},
+    componentProps: {
+      placeholder:'自动生成'
+    },
+    dynamicDisabled:true
   },
   {
     label: '名称(name)',

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

@@ -49,7 +49,7 @@
   var columns = reactive([
         {
             title: '分类(class)',
-            dataIndex: 'classId',
+            dataIndex: 'classId_dictText',
             key: 'classId',
             align:"center",
            ellipsis: true,
@@ -184,4 +184,4 @@
   // margin-top: 15%;
   // margin-left: 82%;
 }
-</style>
+</style>