yuansh пре 5 месеци
родитељ
комит
060524a31b

+ 4 - 3
src/views/cuspCode/DeadlineReminder/deadlindeReminderList.vue

@@ -89,7 +89,7 @@
                     </a-button>
                 </a-dropdown> -->
             </div>
-            <a-alert type="info" show-icon class="alert" style="margin-bottom: 8px">
+           <!-- <a-alert type="info" show-icon class="alert" style="margin-bottom: 8px">
             <template #message>
                 <template v-if="selectedRowKeys.length > 0">
                 <span>已选中 {{ selectedRowKeys.length }} 条记录</span>
@@ -100,7 +100,7 @@
                 <span>未选中任何数据</span>
                 </template>
             </template>
-            </a-alert>
+            </a-alert> -->
             <a-table
                 :columns="columns"
                 :row-key="record => record.id"
@@ -110,8 +110,9 @@
                 @change="handleTableChange"
                 :pagination="pagination"
                 :scroll="{ x: 2500, y: 300 }"
-                :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+                
             >
+            <!-- :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" -->
                 <template #bodyCell="{ column, record }">
                     <!-- <template v-if="column.key === 'operation'">
                         <span>

+ 3 - 2
src/views/cuspCode/SupplierProfile/components/SelectProductModal.vue

@@ -100,7 +100,7 @@
     const columns = [
         {
             title: '分类(class)',
-            dataIndex: 'classId',
+            dataIndex: 'classId_dictText',
             key: 'classId',
             align:"center"
         },
@@ -238,6 +238,7 @@
   }  
   function loadData(){
         let params = getQueryParams();
+        params.status = 1
         defHttp
         .get({ url: '/baseCode/baseProductArchive/list',params}, { isTransformResponse: false })
         .then((res) => {
@@ -324,4 +325,4 @@
 /deep/.ant-form-item{
     margin-bottom: 8px !important;
 }
-</style>
+</style>

+ 1 - 1
src/views/cuspCode/SupplierProfile/components/SupplyCatalogModal.vue

@@ -49,7 +49,7 @@
   var columns = reactive([
         {
             title: '分类(class)',
-            dataIndex: 'classId_dictText',
+            dataIndex: 'classId',
             key: 'classId',
             align:"center",
            ellipsis: true,

+ 14 - 13
src/views/saleCode/rfp/SaleRfp.data.ts

@@ -27,12 +27,12 @@ export const columns: BasicColumn[] = [
    {
     title: '项目(project)',
     align:"center",
-    dataIndex: 'projectId'
+    dataIndex: 'projectId_dictText'
    },
    {
     title: '客户(customer)',
     align:"center",
-    dataIndex: 'customerId'
+    dataIndex: 'customerId_dictText'
    },
    {
     title: '采购方式(procurement method)',
@@ -67,7 +67,7 @@ export const columns: BasicColumn[] = [
    {
     title: '投标结果(tender result)',
     align:"center",
-    dataIndex: 'tenderResult'
+    dataIndex: 'tenderResult_dictText'
    },
    {
     title: '备注(notes)',
@@ -111,7 +111,7 @@ export const searchFormSchema: FormSchema[] = [
   {
     label: "投标结果(tender result)",
     field: 'tenderResult',
-    component: 'JSelectMultiple',
+    component: 'JDictSelectTag',
     componentProps:{
       dictCode:"tender_result" 
     },
@@ -143,7 +143,7 @@ export const searchFormSchema: FormSchema[] = [
     labelWidth:150,
     componentProps: {
       valueType: 'Date',
-      showTime:true
+      showTime:false
     },
       //colProps: {span: 6},
 	},
@@ -154,7 +154,7 @@ export const searchFormSchema: FormSchema[] = [
     labelWidth:180,
     componentProps: {
       valueType: 'Date',
-      showTime:true
+      showTime:false
     },
       //colProps: {span: 6},
 	},
@@ -175,7 +175,7 @@ export const searchFormSchema: FormSchema[] = [
 	{
       label: "提交(submit)",
       field: 'submit',
-      component: 'JSelectMultiple',
+      component: 'JDictSelectTag',
       labelWidth:150,
       componentProps:{
         dictCode:"yes_or_no" 
@@ -204,6 +204,7 @@ export const formSchema: FormSchema[] = [
     field: 'billCode',
     component: 'Input',
     labelWidth:220,
+    dynamicDisabled:true
   },
   {
     label: '项目(project)',
@@ -271,8 +272,8 @@ export const formSchema: FormSchema[] = [
     labelWidth:150,
     component: 'DatePicker',
     componentProps: {
-       showTime: true,
-       valueFormat: 'YYYY-MM-DD HH:mm:ss'
+       showTime: false,
+       valueFormat: 'YYYY-MM-DD'
      },
   },
   {
@@ -281,8 +282,8 @@ export const formSchema: FormSchema[] = [
     labelWidth:220,
     component: 'DatePicker',
     componentProps: {
-       showTime: true,
-       valueFormat: 'YYYY-MM-DD HH:mm:ss'
+       showTime: false,
+       valueFormat: 'YYYY-MM-DD'
      },
   },
   {
@@ -316,7 +317,7 @@ export const formSchema: FormSchema[] = [
     label: '参与家数(households)',
     field: 'households',
     labelWidth:150,
-    component: 'Input',
+    component: 'InputNumber',
   },
   {
     label: '备注(notes)',
@@ -371,7 +372,7 @@ export function getBpmFormSchema(_formData): FormSchema[]{
   return formSchema;
 }
 export function getCustomerOptions(){
-  let params = {pageSize:'-1'}
+  let params = {pageSize:'-1',status:1}
   defHttp.get({url:'/cuspCode/cuspCustomerProfile/list',params}, { isTransformResponse: false }).then(res=>{
     if(res){
       res.result.records.forEach(item=>{