自定义接口

src/api/approve/Appro/index.ts

@@ -3,8 +3,8 @@ import { defHttp } from '/@/utils/http/axios';
 import { ErrorMessageMode } from '/#/axios';
 
 enum Api {
-  Page = '/approve/appro/page',
+  // Page = '/approve/appro/page',
-  // Page = '/magic-api/sales/lngApproPage',
+  Page = '/magic-api/sales/lngApproPage',
   List = '/approve/appro/list',
   Info = '/approve/appro/info',
   LngAppro = '/approve/appro',

src/api/contract/ContractPurPng/index.ts

@@ -3,7 +3,8 @@ import { defHttp } from '/@/utils/http/axios';
 import { ErrorMessageMode } from '/#/axios';
 
 enum Api {
-  Page = '/contract/contractPurPng/page',
+  // Page = '/contract/contractPurPng/page',
+  Page = '/magic-api/contract/contractPurPng/page',
   List = '/contract/contractPurPng/list',
   Info = '/contract/contractPurPng/info',
   LngContract = '/contract/contractPurPng',

src/api/contract/ContractSales/index.ts

@@ -3,7 +3,8 @@ import { defHttp } from '/@/utils/http/axios';
 import { ErrorMessageMode } from '/#/axios';
 
 enum Api {
-  Page = '/contract/contractSales/page',
+  // Page = '/contract/contractSales/page',
+  Page = '/magic-api/contract/contractSales/page',
   List = '/contract/contractSales/list',
   Info = '/contract/contractSales/info',
   LngContract = '/contract/contractSales',

src/api/sales/Customer/index.ts

@@ -3,7 +3,8 @@ import { defHttp } from '/@/utils/http/axios';
 import { ErrorMessageMode } from '/#/axios';
 
 enum Api {
-  Page = '/sales/customer/page',
+  // Page = '/sales/customer/page',
+  Page = '/magic-api/sales/customer/page',
   List = '/sales/customer/list',
   Info = '/sales/customer/info',
   LngCustomer = '/sales/customer',

src/api/sales/GradeSystem/index.ts

@@ -3,7 +3,8 @@ import { defHttp } from '/@/utils/http/axios';
 import { ErrorMessageMode } from '/#/axios';
 
 enum Api {
-  Page = '/sales/gradeSystem/page',
+  // Page = '/sales/gradeSystem/page',
+  Page = '/magic-api/sales/gradeSystem/page',
   List = '/sales/gradeSystem/list',
   Info = '/sales/gradeSystem/info',
   LngGradeSystem = '/sales/gradeSystem',

src/api/sales/ScoreCustomer/index.ts

@@ -3,8 +3,8 @@ import { defHttp } from '/@/utils/http/axios';
 import { ErrorMessageMode } from '/#/axios';
 
 enum Api {
-  Page = '/sales/scoreCustomer/page',
+  // Page = '/sales/scoreCustomer/page',
-  // Page = '/magic-api/sales/scoreCustomerPage',
+  Page = '/magic-api/sales/scoreCustomerPage',
   List = '/sales/scoreCustomer/list',
   Info = '/sales/scoreCustomer/info',
   LngScore = '/sales/scoreCustomer',

src/api/supplier/ScoreSupplier/index.ts

@@ -3,8 +3,8 @@ import { defHttp } from '/@/utils/http/axios';
 import { ErrorMessageMode } from '/#/axios';
 
 enum Api {
-  Page = '/supplier/scoreSupplier/page',
+  // Page = '/supplier/scoreSupplier/page',
-  // Page = '/magic-api/supplier/scoreSupplierPage',
+  Page = '/magic-api/supplier/scoreSupplierPage',
   List = '/supplier/scoreSupplier/list',
   Info = '/supplier/scoreSupplier/info',
   LngScore = '/supplier/scoreSupplier',

src/api/supplier/Supplier/index.ts

@@ -3,7 +3,8 @@ import { defHttp } from '/@/utils/http/axios';
 import { ErrorMessageMode } from '/#/axios';
 
 enum Api {
-  Page = '/supplier/supplier/page',
+  // Page = '/supplier/supplier/page',
+  Page = '/magic-api/supplier/supplier/page',
   List = '/supplier/supplier/list',
   Info = '/supplier/supplier/info',
   LngSupplier = '/supplier/supplier',

src/components/CreateCodeStep/src/ViewDesignStep.vue

@@ -671,6 +671,13 @@
                     icon: 'ant-design:printer-outlined',
                     isDefault: true
                 },
+                {
+                    isUse: false,
+                    name: t('提交'),
+                    code: 'submit',
+                    icon: 'ant-design:send-outlined',
+                    isDefault: true
+                },
                 {
                     isUse: false,
                     name: t('变更'),

src/components/common/approListModal.vue

@@ -64,7 +64,7 @@
         },
         immediate: false, // 设置为不立即调用
         beforeFetch: (params) => {
-          return { ...params, valid: 'Y',approCode: 'YSP'};
+          return { ...params, valid: 'Y',approCode: 'YSP',page:params.limit};
         },
         rowSelection: {
           type: props.selectType,

src/components/common/customerListModal.vue

@@ -61,7 +61,7 @@
         },
         immediate: false, // 设置为不立即调用
         beforeFetch: (params) => {
-          return { ...params, valid: 'Y',approCode: 'YSP'};
+          return { ...params, valid: 'Y',approCode: 'YSP',page:params.limit};
         },
         rowSelection: {
           type: props.selectType,

src/components/common/customerSupplierListModal.vue

@@ -81,7 +81,7 @@
         },
         immediate: false, // 设置为不立即调用
         beforeFetch: (params) => {
-          return { ...params, valid: 'Y',approCode: 'YSP'};
+          return { ...params, valid: 'Y',approCode: 'YSP',page:params.limit};
         },
         rowSelection: {
           type: props.selectType,
@@ -104,7 +104,7 @@
         },
         immediate: false, // 设置为不立即调用
         beforeFetch: (params) => {
-          return { ...params, valid: 'Y',approCode: 'YSP'};
+          return { ...params, valid: 'Y',approCode: 'YSP',page:params.limit};
         },
         rowSelection: {
           type: props.selectType,

src/components/common/supplierListModal.vue

@@ -61,7 +61,7 @@
         },
         immediate: false, // 设置为不立即调用
         beforeFetch: (params) => {
-          return { ...params, valid: 'Y',approCode: 'YSP'};
+          return { ...params, valid: 'Y',approCode: 'YSP',page:params.limit};
         },
         rowSelection: {
           type: props.selectType,

src/views/approve/Appro/index.vue

@@ -127,7 +127,7 @@
       showResetButton: true,
     },
     beforeFetch: (params) => {
-      return { ...params, FormId: formIdComputedRef.value, PK: 'id'};
+      return { ...params, FormId: formIdComputedRef.value, PK: 'id',page:params.limit};
     },
     afterFetch: (res) => {
       tableRef.value.setToolBarWidth();

src/views/contract/ContractPurPng/index.vue

@@ -127,7 +127,7 @@
       showResetButton: true,
     },
     beforeFetch: (params) => {
-      return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
+      return { ...params, FormId: formIdComputedRef.value, PK: 'id',page:params.limit };
     },
     afterFetch: (res) => {
       tableRef.value.setToolBarWidth();

src/views/contract/ContractSales/index.vue

@@ -127,7 +127,7 @@
       showResetButton: true,
     },
     beforeFetch: (params) => {
-      return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
+      return { ...params, FormId: formIdComputedRef.value, PK: 'id', page:params.limit };
     },
     afterFetch: (res) => {
       tableRef.value.setToolBarWidth();

src/views/dayPlan/Demand/components/config.ts

@@ -92,7 +92,7 @@ export const columns: BasicColumn[] = [
   },
 
   {
-    dataIndex: 'priceSalesGj',
+    dataIndex: 'qtySalesGj',
     title: '批复量  (吉焦)',
     componentType: 'input',
     align: 'left',
@@ -101,7 +101,7 @@ export const columns: BasicColumn[] = [
   },
 
   {
-    dataIndex: 'priceSalesM3',
+    dataIndex: 'qtySalesM3',
     title: '批复量  (万方)',
     componentType: 'input',
     align: 'left',
@@ -110,7 +110,7 @@ export const columns: BasicColumn[] = [
   },
 
   {
-    dataIndex: 'ksName',
+    dataIndex: 'kName',
     title: '合同',
     componentType: 'input',
     align: 'left',

src/views/dayPlan/Demand/components/createForm.vue

@@ -15,7 +15,7 @@
         </template>
       </div>
     
-      <Card :title="title" :bordered="false" v-if="pageType=='compare'&&titleNew">
+      <Card :title="titleNew" :bordered="false" v-if="pageType=='compare'&&titleNew">
         <basicForm :formObj="formStateNew" :changeList="diffResultList" :list="dataListNew" :disable="true"></basicForm>
       </Card>
       <Card :title="title" :bordered="false" v-if="title">
@@ -127,6 +127,10 @@
       }
     }
     const changeData = (obj) => {
+      if (Object.keys(obj).length === 0) return {
+        list : [],
+        params: {}
+      }
       let arr = obj.lngPngDemandPurList || []
       obj.datePlan = obj.datePlan ? dayjs(obj.datePlan) : null
       obj.qtyContractM3 = NP.divide(Number(obj.qtyContractM3), 10000)

src/views/dayPlan/Demand/index.vue

@@ -18,6 +18,12 @@
           <template v-if="column.dataIndex === 'action'">
             <TableAction :actions="getActions(record)" />
           </template>
+          <template v-if="column.dataIndex === 'qtySalesM3'">
+            {{ NP.divide(Number(record.qtySalesM3), 10000) }}
+          </template>
+          <template v-if="column.dataIndex === 'qtyDemandM3'">
+            {{ NP.divide(Number(record.qtyDemandM3), 10000) }}
+          </template>
         </template>
       </BasicTable>
    <DemandModal @register="registerModal" @success="handleSuccess" />
@@ -31,9 +37,7 @@
   const logId = ref('')
   const logPath = ref('/dayPlan/demand/datalog');
   import { DataLog } from '/@/components/pcitc';
-  import { ref, computed, onMounted, onUnmounted, createVNode, 
+  import { ref, computed, onMounted, onUnmounted, createVNode} from 'vue';
-
-} from 'vue';
   
   import { Modal } from 'ant-design-vue';
   import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
@@ -63,6 +67,7 @@
     
   import useEventBus from '/@/hooks/event/useEventBus';
   import { cloneDeep } from 'lodash-es';
+  import NP from 'number-precision';
   
   const { bus, CREATE_FLOW, FLOW_PROCESSED, FORM_LIST_MODIFIED } = useEventBus();
 
@@ -570,7 +575,7 @@
     display: none !important;
   }
   :deep( .ant-col-8:nth-child(2)) {
-    width: 360px !important;
+    width: 320px !important;
     max-width: 320px !important;;
   }
   :deep(.ant-col-8:nth-child(2) .ant-form-item-label) {

src/views/dayPlan/PngAppro/components/createForm.vue

@@ -107,7 +107,7 @@
       let data = await getLngPngApproCompare(id) || {}
       spinning.value = false
       diffResultList.value = data.diffResultList || []
-        let obj = changeData(data.oldBean)
+        let obj = changeData(data.oldBean || {})
         Object.assign(formState, {...obj.params})
         Object.assign(dataList.value, obj.list || [])
         title.value = formState.verNo? ('版本V'+ formState.verNo) : ''
@@ -120,6 +120,7 @@
         
 
       } catch (error) {
+        console.log(error, 'error')
         spinning.value = false
       }
 
@@ -137,6 +138,10 @@
       }
     }
     const changeData = (obj) => {
+      if (Object.keys(obj).length === 0) return {
+        list : [],
+        params: {}
+      }
       let arr = obj.lngPngApproPurList || []
       obj.qtyContractM3 = NP.divide(Number(obj.qtyContractM3), 10000)
       obj.qtyPlanM3 = NP.divide(Number(obj.qtyPlanM3), 10000)

src/views/sales/Customer/index.vue

@@ -127,7 +127,7 @@
       showResetButton: true,
     },
     beforeFetch: (params) => {
-      return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
+      return { ...params, FormId: formIdComputedRef.value, PK: 'id',page:params.limit };
     },
     afterFetch: (res) => {
       clearSelectedRowKeys()

src/views/sales/GradeSystem/index.vue

@@ -105,7 +105,7 @@
       showResetButton: true,
     },
     beforeFetch: (params) => {
-      return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
+      return { ...params, FormId: formIdComputedRef.value, PK: 'id',page:params.limit };
     },
     afterFetch: (res) => {
       clearSelectedRowKeys()

src/views/sales/ScoreCustomer/index.vue

@@ -130,7 +130,7 @@
       showResetButton: true,
     },
     beforeFetch: (params) => {
-      return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
+      return { ...params, FormId: formIdComputedRef.value, PK: 'id',page:params.limit};
     },
     afterFetch: (res) => {
       clearSelectedRowKeys()

src/views/supplier/ScoreSupplier/index.vue

@@ -127,7 +127,7 @@
       showResetButton: true,
     },
     beforeFetch: (params) => {
-      return { ...params, FormId: formIdComputedRef.value, PK: 'id'};
+      return { ...params, FormId: formIdComputedRef.value, PK: 'id',page:params.limit};
     },
     afterFetch: (res) => {
       clearSelectedRowKeys()

src/views/supplier/Supplier/index.vue

@@ -125,7 +125,7 @@
       showResetButton: true,
     },
     beforeFetch: (params) => {
-      return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
+      return { ...params, FormId: formIdComputedRef.value, PK: 'id',page:params.limit };
     },
     afterFetch: (res) => {
       clearSelectedRowKeys()