采购计量参数

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

@@ -70,11 +70,11 @@ export const columns: BasicColumn[] = [
   },
 
   {
-    dataIndex: 'cuName',
+    dataIndex: 'cuSname',
     title: '客户',
     componentType: 'input',
     align: 'left', 
-    width: 200,
+    width: 150,
     sorter: true,
   },
 
@@ -83,12 +83,12 @@ export const columns: BasicColumn[] = [
     title: '下载点',
     componentType: 'input',
     align: 'left',
-    width: 150,
+    width: 130,
     sorter: true,
   },
 
   {
-    dataIndex: 'suName',
+    dataIndex: 'suSname',
     title: '供应商',
     componentType: 'input',
     align: 'left',
@@ -101,7 +101,7 @@ export const columns: BasicColumn[] = [
     title: '上载点',
     componentType: 'input',
     align: 'left',
-    width: 150,
+    width: 130,
     sorter: true,
   },
 

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

@@ -67,7 +67,7 @@ export const columns: BasicColumn[] = [
     componentType: 'input',
     align: 'left',
     ellipsis: true,
-    width: 150,
+    width: 130,
     sorter: true,
   },
   {
@@ -86,7 +86,7 @@ export const columns: BasicColumn[] = [
     componentType: 'input',
     align: 'left',
     ellipsis: true,
-    width: 150,
+    width: 130,
     sorter: true,
   },
 

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

@@ -133,8 +133,10 @@
     const formState = ref({});
     const isUpdate = ref(true);
     const showTable = ref(false)
+    const curCuCode = ref('')
     const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
       showTable.value = true
+      curCuCode.value = data?.cuCode
       setModalProps({ confirmLoading: false });
       setPagination({'limit': 1,'size': 10,'page': 1});
       isUpdate.value = !!data?.isUpdate;
@@ -158,7 +160,7 @@
         },
         immediate: false,
         beforeFetch: (params) => {
-          return { ...params,...formState.value,page:params.limit};
+          return { ...params,...formState.value,page:params.limit,cuCode: curCuCode.value};
         },
         rowSelection: {
           type: 'checkbox',
@@ -173,7 +175,7 @@
         await nextTick();
         await nextTick();
         nextTick(() => {
-          reload({searchInfo:{'limit':1,'size':10,'page':1}});
+          reload({searchInfo:{'limit':1,'size':10,'page':1,cuCode: curCuCode.value}});
         });
       }
     };

src/views/dayPlan/PngMeasureSalesPur/index.vue

@@ -80,6 +80,11 @@
   import { DeleteOutlined } from '@ant-design/icons-vue';
   import createFormModal from './components/createForm.vue'
   import { DataFormat, FormatOption, DATE_FORMAT, FormatType } from '/@/utils/dataFormat';
+  import { getCompDept } from '/@/api/approve/Appro';
+  import { useUserStore } from '/@/store/modules/user';
+  const userStore = useUserStore();
+  const userInfo = userStore.getUserInfo;
+  const curCuCode = ref('')
 
   const { bus, CREATE_FLOW, FLOW_PROCESSED, FORM_LIST_MODIFIED } = useEventBus();
 
@@ -158,8 +163,9 @@
       fieldMapToTime: [['dateMea', ['dateMeaStart', 'dateMeaEnd'], 'YYYY-MM-DD']],
       showResetButton: true,
     },
+    immediate: false,
     beforeFetch: (params) => {
-      return { ...params, FormId: formIdComputedRef.value, PK: 'id',page: params.limit};
+      return { ...params, FormId: formIdComputedRef.value, PK: 'id',page: params.limit,cuCode:curCuCode.value };
     },
     afterFetch: (res) => {
       tableData.value = res || []
@@ -231,7 +237,7 @@
     handleSuccess()
   }
   function handleAdd() {
-    openModalForm(true,{isUpdate: false});
+    openModalForm(true,{isUpdate: false, cuCode: curCuCode.value});
   }
    async function handleReject() {
     if (!selectedRowsData.value.length) {
@@ -434,8 +440,10 @@
   function handleImportSuccess(){
     reload()
   }
-  onMounted(() => {
+  onMounted(async() => {
-    
+    const res = await getCompDept(userInfo.id)
+    curCuCode.value = res?.comp?.cuCode
+    reload({searchInfo:{'limit':1,'size':10,'page':1}});
     if (schemaIdComputedRef.value) {
       bus.on(FLOW_PROCESSED, handleRefresh);
       bus.on(CREATE_FLOW, handleRefresh);

src/views/ship/OpsPurInt/components/createForm.vue

@@ -696,6 +696,10 @@
         formState.rateEx = data.rateEx
         formState.priceCurrEst = data.priceCurrEst
         formState.amountCurrEst = data.amountCurrEst
+
+        if (pageSource.value) {
+          getOptionParams()
+        }
       } catch (error) {
         spinning.value = false
       }

src/views/ship/OpsSalesInt/components/createForm.vue

@@ -660,6 +660,10 @@
         formState.rateEx = data.rateEx
         formState.priceCurrEst = data.priceCurrEst
         formState.amountCurrEst = data.amountCurrEst
+
+        if (pageSource.value) {
+          getOptionParams()
+        }
       } catch (error) {
         spinning.value = false
       }