客户 供应商审批按钮

src/components/CreateCodeStep/src/ViewDesignStep.vue

@@ -670,6 +670,20 @@
                     code: PrintButton.CODE,
                     icon: 'ant-design:printer-outlined',
                     isDefault: true
+                },
+                {
+                    isUse: false,
+                    name: t('变更'),
+                    code: 'update',
+                    icon: 'ant-design:edit-filled',
+                    isDefault: true
+                },
+                {
+                    isUse: false,
+                    name: t('审批'),
+                    code: 'approve',
+                    icon: 'ant-design:check-outlined',
+                    isDefault: true
                 }
             ];
 

src/components/Tree/src/Tree.vue

@@ -382,7 +382,7 @@
             return () => {
                 const { title, helpMessage, toolbar, search, checkable } = props;
                 const showTitle = title || toolbar || search || slots.headerTitle;
-                const scrollStyle: CSSProperties = { height: 'calc(100% - 100px)' };
+                const scrollStyle: CSSProperties = { height: 'calc(100% - 150px)' };
                 const inputslots = { prefix: () => <Icon icon="gg:search" size="18" color="#ccc" /> };
                 return (
                     <div class={[bem(), 'h-full', attrs.class]}>

src/components/common/correlationContractFactList.vue

@@ -63,7 +63,6 @@
   }
   const handleSuccess = (val) =>{
       val.forEach(v => {
-        v.approId = v.id
         v.id = null
       })
       if (!dataList.value.length) {
@@ -110,7 +109,7 @@
     }
     if (btn == 'view') {
       router.push({
-        path: '/approve/Appro/form',
+        path: '/contract/ContractFact/form',
           query: {
           id: record.id || record.approId,
           disabled: true

src/components/common/downloadPointModal.vue

@@ -0,0 +1,104 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" width="60%" :title="getTitle" @ok="handleSubmit" @cancel="handleCancel"
+    @visible-change="handleVisibleChange" >
+    <BasicTable @register="registerTable" class="downloadPointModal"></BasicTable>
+  </BasicModal>
+</template>
+<script lang="ts" setup>
+    import { ref, computed, unref, nextTick  } from 'vue';
+    import { BasicModal, useModalInner, useModal } from '/@/components/Modal';
+    import { BasicForm, useForm } from '/@/components/Form/index';
+    import { BasicTable, useTable, FormSchema, BasicColumn, TableAction } from '/@/components/Table';
+    import { addCodeRule, getCodeRuleInfo, editCodeRule } from '/@/api/system/code';
+    import { useMessage } from '/@/hooks/web/useMessage';
+    import { useI18n } from '/@/hooks/web/useI18n';
+    import { getLngBStationPngPage } from '/@/api/mdm/PipeGasDownloadPoint';
+
+    const { t } = useI18n();
+    const codeFormSchema: FormSchema[] = [
+      { field: 'fullName', label: '名称', component: 'Input'},
+    ];
+
+    const columns: BasicColumn[] = [
+      { dataIndex: 'code', title: '编码', componentType: 'input', align: 'left', sorter: true},
+      { dataIndex: 'fullName', title: '名称', componentType: 'input', align: 'left', sorter: true},
+      { dataIndex: 'contact', title: '联系人', componentType: 'input', align: 'left', sorter: true},
+      { dataIndex: 'tel', title: '电话', componentType: 'input', align: 'left', sorter: true },
+      { dataIndex: 'email', title: '邮箱', componentType: 'input', align: 'left', sorter: true}
+    ];
+
+    const emit = defineEmits(['success', 'register', 'cancel']);
+
+    const { notification } = useMessage();
+    const isUpdate = ref(true);
+    const rowId = ref('');
+    const selectedKeys = ref<string[]>([]);
+    const selectedValues = ref([]);
+    const props = defineProps({
+      selectType: { type: String, default: 'radio' },
+    });
+    const type = ref('')
+    const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+
+        setModalProps({ confirmLoading: false });
+
+        isUpdate.value = !!data?.isUpdate;
+        type.value = data.type
+    });
+
+    const [registerTable, { getDataSource, setTableData, updateTableDataRecord, reload  }] = useTable({
+        title: t('列表'),
+        api: getLngBStationPngPage,
+        columns,
+  
+        bordered: true,
+        pagination: true,
+        canResize: false,
+        formConfig: {
+          labelCol:{span: 9},
+          schemas: codeFormSchema,
+          showResetButton: true,
+        },
+        immediate: false, // 设置为不立即调用
+        beforeFetch: (params) => {
+          return { ...params, valid: 'Y'};
+        },
+        rowSelection: {
+          type: props.selectType,
+          onChange: onSelectChange
+        },
+    });
+    const handleVisibleChange = (visible: boolean) => {
+      if (visible) {
+        nextTick(() => {
+          reload();
+        });
+      }
+    };
+    function onSelectChange(rowKeys: string[], e) {
+      selectedKeys.value = rowKeys;
+      selectedValues.value = e
+    }
+    const getTitle = computed(() => (!unref(isUpdate) ? t('列表') : t('')));
+    function handleCancel () {
+      emit('cancel',);
+    }
+    async function handleSubmit() {
+      if (!selectedValues.value.length) {
+        notification.warning({
+          message: t('提示'),
+          description: t('请选择数据')
+        });
+        return
+      }
+      closeModal();
+      emit('success', selectedValues.value,  type.value);
+    }
+
+</script>
+<style >
+ .downloadPointModal .basicCol{
+    position: inherit !important;
+    top: 0;
+  }
+</style>

src/router/routes/basic.ts

@@ -262,6 +262,14 @@ export const PAGE_CUSTOM_ROUTE: AppRouteRecordRaw[] = [{
                 title: (route) => '签报详情'
             }
         },
+        {
+            path: '/contract/ContractFact/form',
+            name: 'ContractFactForm',
+            component: () => import('/@/views/contract/ContractFact/components/createForm.vue'),
+            meta: {
+                title: (route) => '合同详情'
+            }
+        },
     ]
     
 

src/views/contract/ContractFact/components/createForm.vue

@@ -76,7 +76,7 @@
             </a-col>
             <a-col :span="8">
               <a-form-item label="相对方数量" name="cpCount">
-                <a-input-number v-model:value="formState.cpCount" style="width: 100%" :disabled="isDisable" :precision="0" :min="0" :step="1" :max="20"/>
+                <a-input-number v-model:value="formState.cpCount" style="width: 100%" disabled :precision="0" />
               </a-form-item>
             </a-col>
             <a-col :span="8">
@@ -297,7 +297,7 @@
       relTypeCode: [{ required: true, message: "该项为必填项", trigger: 'change' }],
       kTypeCode1: [{ required: true, message: "该项为必填项", trigger: 'change' }],
       periodTypeCode: [{ required: true, message: "该项为必填项", trigger: 'change' }],
-      cpCount: [{ required: true, message: "该项为必填项", trigger: 'change' }],
+      cpCount: [{ required: false, message: "该项为必填项", trigger: 'change' }],
       amountTypeCode: [{ required: true, message: "该项为必填项", trigger: 'change' }],
       settleTypeCode: [{ required: true, message: "该项为必填项", trigger: 'change' }],
       bidSign: [{ required: true, message: "该项为必填项", trigger: 'change' }],
@@ -521,12 +521,14 @@
         return
       }
       dataList.value.push({...val})
+      formState.cpCount = dataList.value.length
     }
     const btnCheck = (type, btn, record, index) => {
       curIdx.value = null
       if (type == 'cp') {
         if (btn == 'delete') {
           dataList.value.splice(index, 1)
+          formState.cpCount = dataList.value.length
         }
         if (btn == 'edit') {
           openModalUser(true, {record: record,isUpdate: true});
@@ -555,10 +557,10 @@
       try {
         await formRef.value.validateFields();
 
-        if (Number(formState.cpCount) !== dataList.value.length) {
+        if (Number(formState.cpCount)<0 || Number(formState.cpCount)>20) {
           notification.warning({
             message: 'Tip',
-            description: '相对数量需与相对方信息个数一致'
+            description: '相对方信息个数必须在0-20间'
           });
           return
         }

src/views/contract/ContractPurPng/components/createForm.vue

@@ -40,17 +40,17 @@
             </a-col>
              <a-col :span="8">
               <a-form-item label="确认函开始日" name="dateCfmFrom">
-                <a-date-picker v-model:value="formState.dateCfmFrom" style="width: 100%" :disabled="isDisable" placeholder="请选择确认函开始日" />
+                <a-date-picker v-model:value="formState.dateCfmFrom" style="width: 100%" :disabled="isDisable" :disabled-date="disabledDateCfmStart" placeholder="请选择确认函开始日" />
               </a-form-item>
             </a-col>
              <a-col :span="8">
               <a-form-item label="确认函结束日" name="dateCfmTo">
-                <a-date-picker v-model:value="formState.dateCfmTo" style="width: 100%" :disabled="isDisable" placeholder="请选择确认函结束日" />
+                <a-date-picker v-model:value="formState.dateCfmTo" style="width: 100%" :disabled="isDisable" :disabled-date="disabledDateCfmEnd" placeholder="请选择确认函结束日" />
               </a-form-item>
             </a-col>
             <a-col :span="8">
               <a-form-item label="供应商" name="cpName">
-                <a-input-search v-model:value="formState.cpName" :disabled="isDisable" placeholder="请选择供应商"  readonly @search="onSearchUser"/>
+                <a-input-search v-model:value="formState.cpName" :disabled="isDisable" placeholder="请选择供应商"  readonly @search="onSearcSupplier"/>
               </a-form-item>
             </a-col>
             <a-col :span="8">
@@ -110,20 +110,16 @@
           <h4>上载点</h4>
           <a-button type="primary" style="margin-bottom: 10px;margin-right: 10px;" @click="addUpLoad" v-if="!isDisable">新增</a-button>
           <a-button type="primary" @click="deleteUpLoad" v-if="!isDisable">删除</a-button>
-          <div v-for="item in dataListUpLoad">
+          <div v-for="(item, idx) in dataListPoint">
             <a-row>
               <a-col :span="8">
-                <a-form-item label="上载点" name="pointUpCode">
+                <a-form-item label="上载点" name="pointUpName">
-                  <a-select v-model:value="formState.pointUpCode" style="width: 100%" allow-clear>
+                  <a-input-search v-model:value="item.pointUpName" :disabled="isDisable" placeholder="请选择上载点"  readonly @search="onSearchDownLoad('up', idx)"/>
-                    <a-select-option v-for="item in optionSelect.approCodeList" :key="item.code" :value="item.code">
-                        {{ item.name }}
-                    </a-select-option>
-                  </a-select>
                 </a-form-item>
               </a-col>
               <a-col :span="8">
                 <a-form-item label="是否托运" name="transSign">
-                  <a-select v-model:value="formState.transSign" style="width: 100%" allow-clear>
+                  <a-select v-model:value="item.transSign" style="width: 100%" allow-clear>
                     <a-select-option v-for="item in optionSelect.transSignList" :key="item.code" :value="item.code">
                         {{ item.name }}
                     </a-select-option>
@@ -132,12 +128,16 @@
               </a-col>
               <a-col :span="24">
                 <a-form-item label="备注" name="note" :label-col="{ span: 3 }" :wrapper-col="{ span: 24 }">
-                  <a-textarea  v-model:value="formState.note" :disabled="isDisable"  placeholder="请输入备注"  :auto-size="{ minRows: 2, maxRows: 5 }"/>
+                  <a-textarea  v-model:value="item.note" :disabled="isDisable"  placeholder="请输入备注"  :auto-size="{ minRows: 2, maxRows: 5 }"/>
                 </a-form-item>
               </a-col>
               <a-col :span="24">
-                <a-form-item label="交割点" name="note" :label-col="{ span: 3 }" :wrapper-col="{ span: 24 }">
+                <a-form-item label="交割点" name="pointDelyName" :label-col="{ span: 3 }" :wrapper-col="{ span: 24 }">
-                  <a-textarea  v-model:value="formState.note" :disabled="isDisable"  placeholder="请输入交割点" :auto-size="{ minRows: 2, maxRows: 5 }"/>
+                  <div style="position: relative;">
+                    <a-textarea style="width:95%;" v-model:value="item.pointDelyName" :disabled="isDisable" readonly  placeholder="请选择交割点"  :auto-size="{ minRows: 1, maxRows: 5 }"/>
+                    <a-button :icon="h(SearchOutlined)" class="iconStyle" @click="onSearchDownLoad('dely', idx)" />
+                    <!-- <a-input-search v-model:value="item.pointDelyName" :disabled="isDisable" placeholder="请选择交割点"  readonly @search="onSearchDownLoad('dely', idx)"/> -->
+                  </div>
                 </a-form-item>
               </a-col>
             </a-row>
@@ -146,13 +146,33 @@
          <Card title="合同约定" :bordered="false" >
           <div style="width: 100%">
             <a-button type="primary" style="margin-bottom: 10px" @click="addContractAgree" v-if="!isDisable">新增行</a-button>
-            <a-table style="width: 100%" :columns="columns" :data-source="dataListContractAgree" :pagination="false" :scroll="{x: 500}">
+            <a-table style="width: 100%" :columns="columns" :data-source="dataListContractAgree" :pagination="false" :scroll="{x: 300}">
+               <template #headerCell="{ column }">
+                <template v-if="column.dataIndex == 'dateFrom'">
+                  <span><span class="redStyle">*</span>开始日期</span>
+                </template>
+                <template v-if="column.dataIndex == 'dateTo'">
+                  <span><span class="redStyle">*</span>结束日期</span>
+                </template>
+                <template v-if="column.dataIndex == 'baseInc'">
+                  <span><span class="redStyle">*</span>基础量/增量</span>
+                </template>
+                <template v-if="column.dataIndex == 'sort'">
+                  <span><span class="redStyle">*</span>优先级</span>
+                </template>
+                <template v-if="column.dataIndex == 'qtyGjMonth'">
+                  <span><span class="redStyle">*</span>月气量(吉焦)</span>
+                </template>
+                <template v-if="column.dataIndex == 'qtyM3Month'">
+                  <span><span class="redStyle">*</span>月气量(万方)</span>
+                </template>
+              </template>
               <template #bodyCell="{ column, record, index }">
                 <template v-if="column.dataIndex === 'dateFrom'">
-                  <a-date-picker v-model:value="record.dateFrom" style="width: 100%" />
+                  <a-date-picker v-model:value="record.dateFrom" @change="dateFromTb(record.dateFrom, index, record)"  style="width: 100%" />
                 </template>
                 <template v-if="column.dataIndex === 'dateTo'">
-                  <a-date-picker v-model:value="record.dateTo" style="width: 100%" />
+                  <a-date-picker v-model:value="record.dateTo" @change="dateToTb(record.dateTo, index, record)" style="width: 100%" />
                 </template>
                 <template v-if="column.dataIndex === 'sort'">
                   <a-input-number v-model:value="record.sort" :min="0" style="width: 100%" />
@@ -165,13 +185,13 @@
                   </a-select>
                 </template>
                 <template v-if="column.dataIndex === 'rateM3Gj'">
-                  <a-input-number v-model:value="record.rateM3Gj" :min="0" style="width: 100%" />
+                  <a-input-number v-model:value="record.rateM3Gj" :min="0" @change="numChange('rateM3Gj', record, index)" style="width: 100%" />
                 </template>
                 <template v-if="column.dataIndex === 'qtyGjMonth'">
-                  <a-input-number v-model:value="record.qtyGjMonth" :min="0" style="width: 100%" />
+                  <a-input-number v-model:value="record.qtyGjMonth" :min="0" @change="numChange('qtyGjMonth', record, index)" style="width: 100%" />
                 </template>
                 <template v-if="column.dataIndex === 'qtyM3Month'">
-                  <a-input-number v-model:value="record.qtyM3Month" :min="0" style="width: 100%" />
+                  <a-input-number v-model:value="record.qtyM3Month" :min="0" @change="numChange('qtyM3Month', record, index)" style="width: 100%" />
                 </template>
                 <template v-if="column.dataIndex === 'zfbyTypeCode'">
                   <a-select v-model:value="record.zfbyTypeCode" style="width: 100%" allow-clear>
@@ -187,7 +207,7 @@
                   <a-input v-model:value="record.note" style="width: 100%" />
                 </template>
                 <template v-if="column.dataIndex === 'operation'">
-                  <a v-if="!isDisable" style="margin-right: 10px" @click="btnCheck('cp', 'delete', record, index)">删除</a>
+                  <a v-if="!isDisable" style="margin-right: 10px" @click="btnCheck(record, index)">删除</a>
                 </template>
               </template>
             </a-table>
@@ -203,6 +223,8 @@
     <deptUserModal @register="register" @success="handleSuccess"/>
     <deptListModal @register="registerDept" @success="handleSuccessDept" />
     <contractFactListModal @register="registerContractFact" @success="handleSuccessContractFact" />
+    <downloadPointModal v-if='isShow' @register="registerDownLoad" @success="handleSuccessDownLoad" :selectType="selectType" @cancel="cancel"/>
+    <supplierListModal @register="registerSupplier" @success="handleSuccessSupplier" selectType="radio" />
   </a-spin>
 </template>
 
@@ -218,9 +240,11 @@
     import type { Rule } from 'ant-design-vue/es/form';
     import { getDictionary } from '/@/api/sales/Customer';
     import { useModal } from '/@/components/Modal';
-    import { addLngContractFact,updateLngContractFact,getAllCurrency,getAllUser, getLngContractFact } from '/@/api/contract/ContractFact';
+    import { addLngContract,updateLngContract, getLngContract } from '/@/api/contract/ContractPurPng';
     import { getLngAppro,getCompDept } from '/@/api/approve/Appro';
     import dayjs from 'dayjs';
+    import { h } from 'vue';
+    import { SearchOutlined } from '@ant-design/icons-vue';
     import { getAppEnvConfig } from '/@/utils/env';
     import { message } from 'ant-design-vue';
     import UploadList from '/@/components/Form/src/components/UploadList.vue';
@@ -229,9 +253,10 @@
     import correlationApproList from '/@/components/common/correlationApproList.vue';
     import correlationContractFactList from '/@/components/common/correlationContractFactList.vue';
     import contractFactListModal from '/@/components/common/contractFactListModal.vue';
-
+    import downloadPointModal from '/@/components/common/downloadPointModal.vue';
-    import { Modal } from 'ant-design-vue';
+    import supplierListModal from '/@/components/common/supplierListModal.vue';
     import { useUserStore } from '/@/store/modules/user';
+
     const userStore = useUserStore();
     const userInfo = userStore.getUserInfo;
 
@@ -265,29 +290,26 @@
     const { t } = useI18n();
     const formState = reactive({
       approCode: 'WTJ',
-      dateDraft: dayjs(new Date()),
+      typeCode: 'PP',
+      onlineSign: 'N',
+      cpTableName: 'lng_supplier',
+      curCode: 'CNY'
     });
     const [register, { openModal:openModal}] = useModal();
     const [registerDept, { openModal:openModalDept}] = useModal();
     const [registerContractFact, { openModal:openModalContractFact}] = useModal();
+    const [registerDownLoad, { openModal:openModalDownLoad}] = useModal();
+    const [registerSupplier, { openModal:openModalSupplier}] = useModal();
     const rules= reactive({
       kNo: [{ required: true, message: "该项为必填项", trigger: 'change' }],
       kName: [{ required: true, message: "该项为必填项", trigger: 'change' }],
-      relTypeCode: [{ required: true, message: "该项为必填项", trigger: 'change' }],
+      cpName: [{ required: true, message: "该项为必填项", trigger: 'change' }],
-      kTypeCode1: [{ required: true, message: "该项为必填项", trigger: 'change' }],
+      prcTypeCode: [{ required: true, message: "该项为必填项", trigger: 'change' }],
-      periodTypeCode: [{ required: true, message: "该项为必填项", trigger: 'change' }],
+      uomCode: [{ required: true, message: "该项为必填项", trigger: 'change' }],
-      cpCount: [{ required: true, message: "该项为必填项", trigger: 'change' }],
-      amountTypeCode: [{ required: true, message: "该项为必填项", trigger: 'change' }],
-      settleTypeCode: [{ required: true, message: "该项为必填项", trigger: 'change' }],
-      bidSign: [{ required: true, message: "该项为必填项", trigger: 'change' }],
-      preApproSign: [{ required: true, message: "该项为必填项", trigger: 'change' }],
-      aheadSign: [{ required: true, message: "该项为必填项", trigger: 'change' }],
-      tempSign: [{ required: true, message: "该项为必填项", trigger: 'change' }],
-      impSign: [{ required: true, message: "该项为必填项", trigger: 'change' }],
       empName: [{ required: true, message: "该项为必填项", trigger: 'change' }],
-      tel: [{ required: true, message: "该项为必填项", trigger: 'change' }],
       bDeptName: [{ required: true, message: "该项为必填项", trigger: 'change' }],
-
+      dateTo:[{ required: true, message: "该项为必填项", trigger: 'change' }],
+      dateFrom:[{ required: true, message: "该项为必填项", trigger: 'change' }]
     });
     const layout = {
       labelCol: { span: 8 },
@@ -297,11 +319,11 @@
       { title: t('序号'), dataIndex: 'index', key: 'index', sorter: true, customRender: (column) => `${column.index + 1}` ,width: 80},
       { title: t('开始日期'), dataIndex: 'dateFrom', sorter: true, width:150},
       { title: t('结束日期'), dataIndex: 'dateTo', sorter: true, width: 150},
-      { title: t('基础量/增量'), dataIndex: 'baseInc', sorter: true, width: 180},
+      { title: t('基础量/增量'), dataIndex: 'baseInc', sorter: true, width: 130},
       { title: t('优先级'), dataIndex: 'sort', sorter: true, width: 100},
-      { title: t('比值(方/吉焦)'), dataIndex: 'rateM3Gj', sorter: true, width: 180},
+      { title: t('比值(方/吉焦)'), dataIndex: 'rateM3Gj', sorter: true, width: 150},
-      { title: t('月气量(吉焦)'), dataIndex: 'qtyGjMonth', sorter: true, width: 120},
+      { title: t('月气量(吉焦)'), dataIndex: 'qtyGjMonth', sorter: true, width: 150},
-      { title: t('月气量(万方)'), dataIndex: 'qtyM3Month', sorter: true, width: 120},
+      { title: t('月气量(万方)'), dataIndex: 'qtyM3Month', sorter: true, width: 150},
       { title: t('日气量(吉焦)'), dataIndex: 'qtyGjDay', sorter: true, width: 120},
       { title: t('日气量(万方)'), dataIndex: 'qtyM3Day', sorter: true, width: 120},
       { title: t('照付不议类型'), dataIndex: 'zfbyTypeCode', sorter: true, width: 120},
@@ -309,11 +331,18 @@
       { title: t('备注'), dataIndex: 'note', sorter: true, width: 200},
       { title: t('操作'), dataIndex: 'operation', width: 80, fixed: 'right',align: 'center'},
     ]);
+    const selectType = ref()
+    const isShow = ref(false)
     const dataListContractAgree = ref([])
     const dataFile = ref([]);
     const dataListAppro = ref([])
     const dataListContractFact = ref([])
-    const dataListUpLoad = ref([{}])
+    const dataListPoint = ref([{
+      "pointUpCode": "",
+      "transSign": "",
+      "note": null,
+      "lngContractPurPngPointSalesList": []
+    }])
     let optionSelect= reactive({
       approCodeList: [],
       kPriodList: [],
@@ -365,15 +394,27 @@
     async function getInfo(id)  {
       spinning.value = true
       try {
-      let data = await getLngContractFact(id)
+      let data = await getLngContract(id)
       spinning.value = false
       Object.assign(formState, {...data})
+      Object.assign(dataListPoint.value, formState.lngContractPurPngPointList || [{}])
+      Object.assign(dataListContractAgree.value, formState.lngContractPurPngQtyList || [])
       Object.assign(dataFile.value, formState.lngFileUploadList || [])
-      Object.assign(dataList.value, formState.lngContractFactCpList || [])
+      Object.assign(dataListContractFact.value, formState.lngContractFactRelList || [])
-      Object.assign(dataListAppro.value, formState.lngApproVoList || [])
+      Object.assign(dataListAppro.value, formState.lngContractApproRelList || [])
-      formState.dateDraft = formState.dateDraft ? dayjs(formState.dateDraft) : null
+      formState.dateCfmFrom = formState.dateCfmFrom ? dayjs(formState.dateCfmFrom) : null
+      formState.dateCfmTo = formState.dateCfmTo ? dayjs(formState.dateCfmTo) : null
+      formState.dateSign = formState.dateSign ? dayjs(formState.dateSign) : null
       formState.dateFrom = formState.dateFrom ? dayjs(formState.dateFrom) : null
       formState.dateTo = formState.dateTo ? dayjs(formState.dateTo) : null
+      formState.prcTypeCode = (formState?.lngContractPurPngList[0] || {}).uomCode
+      formState.periodTypeCode = (formState?.lngContractPurPngList[0] || {}).periodTypeCode
+      formState.uomCode = (formState?.lngContractPurPngList[0] || {}).uomCode
+
+      dataListContractAgree.forEach(v => {
+        v.qtyM3Month = Number(v.qtyM3Month)/10000
+        v.qtyM3Day = Number(v.qtyM3Day)/10000
+      });
 
       } catch (error) {
         spinning.value = false
@@ -421,25 +462,117 @@
       }
       return endValue.valueOf() <= startValue.valueOf();
     }
+    const disabledDateCfmStart = (startValue) => {
+      const endValue = formState?.dateCfmTo;
+      if (!startValue || !endValue) {
+        return false
+      }
+      return startValue.valueOf() >= endValue.valueOf();
+    }
+    const disabledDateCfmEnd = (endValue) => {
+      const startValue = formState?.dateCfmFrom;
+      if (!endValue || !startValue) {
+        return false
+      }
+      return endValue.valueOf() <= startValue.valueOf();
+    }
+     const dateFromTb = (startValue, index, record) => {
+      if (!startValue) return
+      const endValue = dataListContractAgree.value[index]?.dateTo;
+      if (!startValue || !endValue) {
+        return false
+      }
+      if (startValue.valueOf() > endValue.valueOf()) {
+        message.warning('结束日期须大于等于开始日期')
+        dataListContractAgree.value[index].dateFrom = ''
+        return
+      }
+      dayCount(record)
+    }
+
+    const dateToTb = (endValue, index, record) => {
+      if (!endValue) return
+      const startValue = dataListContractAgree.value[index]?.dateFrom;
+      if (!endValue || !startValue) {
+        return false
+      }
+      if (startValue.valueOf() > endValue.valueOf()) {
+        message.warning('结束日期须大于等于开始日期')
+        dataListContractAgree.value.splice(index, 1, { ...dataListContractAgree.value[index], dateTo: '' });
+        return
+      }
+      dayCount(record)
+    }
+    const numChange = (key, record) => {
+      if (key == 'qtyGjMonth') {
+        numCount2(record)
+        dayCount(record)
+      }
+      if (key == 'qtyM3Month') {
+        numCount1(record)
+        dayCount(record)
+      }
+      if (key == 'rateM3Gj') {
+        numCount1(record)
+        numCount2(record)
+        dayCount(record)
+      }
+    }
+    const numCount1 = (record) => {
+      // 月气量(吉焦) =月气量(方)qty_m3_month*rate_m3_gj (比值(方/吉焦)
+      record.qtyGjMonth = (Number(record.qtyM3Month) || 0) * (Number(record.rateM3Gj) || 0)
+      record.qtyGjMonth = record.qtyGjMonth ? record.qtyGjMonth.toFixed(4) : '0'
+    }
+    const numCount2 = (record) => {
+      // 月气量(方) =  月气量(吉焦) qty_gj_month/rate_m3_gj/10000   显示时字段值/10000；保存时页面值*10000
+      record.qtyM3Month = Number(record.rateM3Gj) ?  (Number(record.qtyGjMonth) || 0) /Number(record.rateM3Gj) : 0
+      record.qtyM3Month = record.qtyM3Month ? record.qtyM3Month.toFixed(4) : '0'
+    }
+    const dayCount = (record) => {
+      // 日气量(吉焦) = 月气量(吉焦)qty_gj_month/开始日期到结束日期的天数；计算结果保留整数
+      const days = dayjs(record.dateTo).diff(dayjs(record.dateFrom), 'day');
+      record.qtyGjDay = days ? (Number(record.qtyGjMonth) || 0) /days : 0
+      record.qtyGjDay = parseInt(record.qtyGjDay)
+      // 日气量(方) = 月气量(万方)/开始日期到结束日期的天数；计算结果保留4位小数；显示时字段值/10000；保存时页面值*10000
+      record.qtyM3Day = days ? (Number(record.qtyM3Month) || 0) /days : 0
+      record.qtyM3Day = record.qtyM3Day ? record.qtyM3Day.toFixed(4) : '0'
+    }
     const onSearch = (val)=> {
       openModalDept(true,{isUpdate: false})
     }
+    const onSearcSupplier = () => {
+      openModalSupplier(true,{isUpdate: false})
+    }
     const onSearchUser = (val)=> {
       openModal(true,{isUpdate: false})
     }
     const onContract = (val)=> {
       openModalContractFact(true,{isUpdate: false})
-
+    }
+    const onSearchDownLoad = (val, index)=> {
+      selectType.value = val=='up'? 'radio' : 'checkbox'
+      curIdx.value = index
+      isShow.value = true
+      nextTick(() => {
+        openModalDownLoad(true,{isUpdate: false, type: val})
+      });
     }
     const addContractAgree = () => {
-      dataListContractAgree.value.push({})
+      dataListContractAgree.value.push({
+        dateFrom: null, dateTo: null, rateM3Gj: null, qtyGjMonth: null, qtyM3Month: null, qtyGjDay: null, qtyM3Day: null
+      })
     }
     const addUpLoad = ()=> {
-      dataListUpLoad.value.push({})
+      dataListPoint.value.push({
+        "pointUpCode": "",
+        "transSign": "",
+        "note": null,
+        "lngContractPurPngPointSalesList": []
+      })
     }
     const deleteUpLoad = () => {
-      if (dataListUpLoad.value.length == 1) return
+      if (dataListPoint.value.length == 1) return
-      dataListUpLoad.value.pop()
+      dataListPoint.value.pop()
     }
     
     const handleSuccess = (val) => {
@@ -454,9 +587,12 @@
       formState.comName = info.name
       formState.comId = info.id
     }
+    const handleSuccessSupplier = (val) => {
+      formState.cpCode = val[0].suCode
+      formState.cpName = val[0].suName
+    }
     const handleSuccessContractFact = (val) => {
         val.forEach(v => {
-        v.approId = v.id
         v.id = null
       })
       if (!dataListContractFact.value.length) {
@@ -475,17 +611,22 @@
       })
       dataListContractFact.value = unique([...dataListContractFact.value, ...arr], 'kNo')
     }
-    const btnCheck = (type, btn, record, index) => {
+    const cancel = () => {
-      curIdx.value = null
+      isShow.value = false
-      if (type == 'cp') {
-        if (btn == 'delete') {
-          dataList.value.splice(index, 1)
     }
-        if (btn == 'edit') {
+    const handleSuccessDownLoad = (val, type) => {
-          openModalContract(true, {record: record,isUpdate: true});
+      isShow.value = false
+      if (type == 'up') {
+        dataListPoint.value[curIdx.value].pointUpCode = val[0].code
+        dataListPoint.value[curIdx.value].pointUpName = val[0].fullName
+      } else {
+        let nameList = val.map(v=>v.fullName)
+        dataListPoint.value[curIdx.value].pointDelyName = nameList.join(',')
+        dataListPoint.value[curIdx.value].lngContractPurPngPointSalesList = val || []
       }
     }
-
+    const btnCheck = (record, index) => {
+      dataListContractAgree.value.splice(index, 1)
     }
     function unique(arr, u_key) {
       const map = new Map()
@@ -505,23 +646,41 @@
     async function handleSubmit(type) {
       try {
         await formRef.value.validateFields();
-
+        let arr = JSON.parse(JSON.stringify(dataListContractAgree.value))
-        if (Number(formState.cpCount) !== dataList.value.length) {
+        for(let i=0; i<arr.length; i++) {
-          notification.warning({
+          let isFlag = !arr[i].dateFrom || !arr[i].dateTo || !arr[i].baseInc || arr[i].rateM3Gj == null || arr[i].rateM3Gj == '' || arr[i].qtyGjMonth == null || arr[i].qtyGjMonth == ''|| arr[i].qtyM3Month == null || arr[i].qtyM3Month == ''
-            message: 'Tip',
+          if (isFlag) {
-            description: '相对数量需与相对方信息个数一致'
+            message.warn('请完善合同约定必选项')
-          });
             return
           }
+          arr[i].dateFrom = dayjs(arr[i].dateFrom).format('YYYY-MM-DD HH:mm:ss')
+          arr[i].dateTo = dayjs(arr[i].dateTo).format('YYYY-MM-DD HH:mm:ss')
+          arr[i].qtyM3Month = Number(arr[i].qtyM3Month)*10000
+          arr[i].qtyM3Day = Number(arr[i].qtyM3Day)*10000
+        }
+        dataListAppro.value.forEach(v=>{
+          v.approId = ''
+        })
         let obj = {
           ...formState,
+          lngContractPurPngPointList: dataListPoint.value,
+          lngContractPurPngQtyList: arr,
           lngFileUploadList: dataFile.value,
-          lngContractFactCpList: dataList.value,
+          lngContractFactRelList: dataListContractFact.value,
-          lngContractApproRelList: dataListAppro.value
+          lngContractApproRelList: dataListAppro.value,
+          lngContractPurPngList: [
+            {
+              ...formState.lngContractPurPngList[0],
+              "kId": formState.id,
+              "prcTypeCode": formState.prcTypeCode,
+              "periodTypeCode": formState.periodTypeCode,
+              "uomCode": formState.uomCode,
+            }
+          ]
           
         }
         spinning.value = true;
-        let request = !formState.id ? addLngContractFact :updateLngContractFact
+        let request = !formState.id ? addLngContract :updateLngContract
 
         try {
           const data = await request(obj);
@@ -572,5 +731,13 @@
         margin-bottom: 12px;
         border-bottom: 1px solid #eee;
     } 
+    .redStyle {
+      color: red;
+    }
+    .iconStyle {
+      position: absolute;
+      color: rgba(0, 0, 0, 0.45);
+      // top: 0;
+    }
     
 </style>

src/views/contract/ContractPurPng/index.vue

@@ -211,7 +211,18 @@
   }
   
   function handleEdit(record: Recordable) {
-    
+     if (schemaIdComputedRef.value) {
+      router.push({
+        path: '/flow/' + schemaIdComputedRef.value + '/0/createFlow',
+         query: {
+          formPath: 'contract/ContractPurPng',
+          formName: formName,
+          formId:currentRoute.value.meta.formId,
+          type:'edit',
+          id: record.id 
+        }
+      });
+    } else {
       router.push({
         path: '/form/ContractPurPng/' + record.id + '/updateForm',
         query: {
@@ -221,6 +232,7 @@
         }
       });
     }
+  }
   function handleDelete(record: Recordable) {
     deleteList([record.id]);
   }

src/views/dataconfig/areaManager/components/AreaModal.vue

@@ -65,11 +65,11 @@
     const isUpdate = ref(true);
     const rowId = ref('');
 
-    console.log(filterFormSchemaAuth(accountFormSchema, true), 'ssssssssss');
+    // console.log(filterFormSchemaAuth(accountFormSchema, true), 'ssssssssss');
 
     const [registerForm, { setFieldsValue, resetFields, validate }] = useForm({
         labelWidth: 100,
-        schemas: filterFormSchemaAuth(accountFormSchema, true),
+        schemas: accountFormSchema,
         showActionButtonGroup: false,
         actionColOptions: {
             span: 23

src/views/dataconfig/areaManager/index.vue

@@ -118,7 +118,7 @@
 
     const { filterColumnAuth } = usePermission();
 
-    const filterColumns = filterColumnAuth(columns, true);
+    const filterColumns = filterColumnAuth(columns);
 
     const [registerModal, { openModal }] = useModal();
     const [registerTable, { reload }] = useTable({

src/views/sales/Customer/components/config.ts

@@ -101,7 +101,7 @@ export const columns: BasicColumn[] = [
   },
 
   {
-    dataIndex: 'approCode',
+    dataIndex: 'approName',
     title: '审批状态',
     componentType: 'input',
     align: 'left',

src/views/sales/Customer/index.vue

@@ -75,9 +75,9 @@
   
   const tableRef = ref();
   //所有按钮
-  const buttons = ref([{"isUse":true,"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"type":"primary"},{"isUse":true,"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"启用","code":"enable","icon":"ant-design:form-outlined","isDefault":true,"type":"primary"},{"isUse":true,"name":"作废","code":"disable","icon":"ant-design:stop-outlined","isDefault":true,"type":"dashed"},{"isUse":true,"name":"刷新","code":"refresh","icon":"ant-design:reload-outlined","isDefault":true},{"isUse":true,"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true},{"isUse":true,"name":"发起审批","code":"startwork","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"查看流转记录","code":"flowRecord","icon":"ant-design:form-outlined","isDefault":true}]);
+  const buttons = ref([{"isUse":true,"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"type":"primary"},{"isUse":true,"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"启用","code":"enable","icon":"ant-design:form-outlined","isDefault":true,"type":"primary"},{"isUse":true,"name":"作废","code":"disable","icon":"ant-design:stop-outlined","isDefault":true,"type":"dashed"},{"isUse":true,"name":"刷新","code":"refresh","icon":"ant-design:reload-outlined","isDefault":true},{"isUse":true,"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true},{"isUse":true,"name":"发起审批","code":"startwork","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"查看流转记录","code":"flowRecord","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"变更","code":"update","icon":"ant-design:edit-filled","isDefault":true},{"isUse":true,"name":"审批","code":"approve","icon":"ant-design:check-outlined","isDefault":true}]);
   //展示在列表内的按钮
-  const actionButtons = ref<string[]>(['view', 'edit','datalog', 'copyData', 'startwork','flowRecord']);
+  const actionButtons = ref<string[]>(['view', 'edit','datalog', 'copyData', 'startwork','flowRecord', 'update', 'approve']);
   const buttonConfigs = computed(()=>{
     return filterButtonAuth(buttons.value);
   })
@@ -90,7 +90,7 @@
     return buttonConfigs.value?.filter((x) => actionButtons.value.includes(x.code));
   });
 
-  const btnEvent = {add : handleAdd,edit : handleEdit,enable : handleEnable,disable : handleDisable,refresh : handleRefresh,view : handleView,startwork : handleStartwork,flowRecord : handleFlowRecord,delete : handleDelete,}
+  const btnEvent = {add : handleAdd,edit : handleEdit,enable : handleEnable,disable : handleDisable,refresh : handleRefresh,view : handleView,startwork : handleStartwork,flowRecord : handleFlowRecord,delete : handleDelete, update: handleUpdate, approve: handleApprove}
 
   const { currentRoute } = useRouter();
   const router = useRouter();
@@ -181,31 +181,30 @@
           formName: formName,
           formId:currentRoute.value.meta.formId,
           id: record.id,
-          status
         }
       });
     } else {
-      if (schemaIdComputedRef.value) {
+      // if (schemaIdComputedRef.value) {
-        router.push({
-          path: '/flow/' + schemaIdComputedRef.value + '/0/createFlow',
-          query: {
-            formPath: 'sales/Customer',
-            formName: formName,
-            formId:currentRoute.value.meta.formId,
-            type:'edit',
-            id: record.id,
-            disabled: 1,
-          }
-        });
-      }
       //   router.push({
-      //   path: '/form/Customer/' + record.id + '/viewForm',
+      //     path: '/flow/' + schemaIdComputedRef.value + '/0/createFlow',
       //     query: {
       //       formPath: 'sales/Customer',
       //       formName: formName,
-      //     formId:currentRoute.value.meta.formId
+      //       formId:currentRoute.value.meta.formId,
+      //       type:'edit',
+      //       id: record.id,
+      //       disabled: 1,
       //     }
       //   });
+      // }
+      router.push({
+        path: '/form/Customer/' + record.id + '/viewForm',
+        query: {
+          formPath: 'sales/Customer',
+          formName: formName,
+          formId:currentRoute.value.meta.formId
+        }
+      });
     }
   }
 
@@ -262,6 +261,36 @@
     }
     
   }
+  function handleUpdate(record: Recordable) {
+    const { processId, taskIds, schemaId, status } = record.workflowData || {}; 
+    if (schemaId && !taskIds && processId) {
+      router.push({
+        path: '/flow/' + schemaId + '/' + processId + '/approveFlow',
+        query: {
+          readonly: 1,
+          taskId: '',
+          formName: formName,
+          formId:currentRoute.value.meta.formId,
+          id: record.id,
+          status
+        }
+      });
+    }
+  }
+  function handleApprove(record: Recordable) {
+    const { processId, taskIds, schemaId } = record.workflowData || {}; 
+    if (taskIds && taskIds.length) {
+      router.push({
+        path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
+        query: {
+          taskId: taskIds[0],
+          formName: formName,
+          formId:currentRoute.value.meta.formId,
+          id: record.id
+        }
+      });
+    }
+  }
   function handleDelete(record: Recordable) {
     deleteList([record.id]);
   }
@@ -380,6 +409,8 @@
     
     let actionsList: ActionItem[] = [];
     let editAndDelBtn: ActionItem[] = [];
+    let updateBtn: ActionItem[] = [];
+    let approveBtn: ActionItem[] = [];
     let hasFlowRecord = false; 
     actionButtonConfig.value?.map((button) => {
       if (['view', 'copyData', 'enable', 'disable'].includes(button.code)) {
@@ -397,21 +428,48 @@
           onClick: btnEvent[button.code].bind(null, record),
         });
       }
+      if (['update'].includes(button.code)) {
+        updateBtn.push({
+          icon: button?.icon,
+          tooltip: button?.name,
+          onClick: btnEvent[button.code].bind(null, record),
+        });
+      }
+      if (['approve'].includes(button.code)) {
+        approveBtn.push({
+          icon: button?.icon,
+          tooltip: button?.name,
+          onClick: btnEvent[button.code].bind(null, record),
+        });
+      }
       if (button.code === 'flowRecord') hasFlowRecord = true;
     });
-    if (record.workflowData?.enabled) {
+    // 未提交或已驳回
-      //与工作流有关联的表单
+    if (record.approCode == 'WTJ' || record.approCode == 'YBH' ) {
-      if (record.workflowData.status) {
+      actionsList = actionsList.concat(editAndDelBtn);
+    }
+    // 审批中SPZ
+    if (record.workflowData?.editable) {
+      actionsList = actionsList.concat(approveBtn);
+    }
+    // 已审批
+    if (record.approCode == 'YSP') {
+      actionsList = actionsList.concat(updateBtn);
+    }
+   
+    // if (record.workflowData?.enabled) {
+    //   //与工作流有关联的表单
+    //   if (record.workflowData.status) {
     //     actionsList.unshift(setIndexFlowStatus(record.workflowData))
-      } else {
+    //   } else {
-        actionsList = actionsList.concat(editAndDelBtn);
+    //     actionsList = actionsList.concat(editAndDelBtn);
-      }
+    //   }
-    } else {
+    // } else {
-      if (!record.workflowData?.processId) {
+    //   if (!record.workflowData?.processId) {
-        //与工作流没有关联的表单并且在当前页面新增的数据 如选择编辑、删除按钮则加上
+    //     //与工作流没有关联的表单并且在当前页面新增的数据 如选择编辑、删除按钮则加上
-        actionsList = actionsList.concat(editAndDelBtn);
+    //     actionsList = actionsList.concat(editAndDelBtn);
-      }
+    //   }
-    }
+    // }
     
     return actionsList;
   }

src/views/sales/ScoreCustomer/components/createForm.vue

@@ -270,6 +270,11 @@
         })
         formState.score = num
       }
+      record.aTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+      record.aEmpCode = userInfo.code
+      record.aEmpName = userInfo.name
+      record.aDeptCode = compDep.value?.dept?.code
+      record.aDeptName = compDep.value?.dept?.name
     }
     function close() {
       tabStore.closeTab(currentRoute.value, router);

src/views/secondDev/approveFlowPage.vue

@@ -563,7 +563,7 @@
     }
 
     function setBtnStatus() {
-        const btnConfigs = approvalData.buttonConfigs;
+        let btnConfigs = approvalData.buttonConfigs;
         let draftBtn = btnConfigs.find((item) => item.buttonCode === ApproveCode.DRAFT);
         if (draftBtn && rDraftsId.value) {
             btnConfigs.push({
@@ -575,13 +575,13 @@
             });
         }
         // 如果审批已完成，且没有保存按钮
-        if (rQuery.status=='COMPLETED' && btnConfigs.findIndex(v=>v.buttonCode =='draft') < 0) {
+        if (rQuery.status=='COMPLETED') {
-          btnConfigs.unshift({
+          btnConfigs =[{
             buttonName: t('保存'),
             buttonCode: 'draft',
             approveType: ApproveType.DRAFT,
             buttonType: 0
-          });
+          }];
         }
         btnConfigs.forEach((btn) => {
             const index = btn.index;

src/views/supplier/ScoreSupplier/components/createForm.vue

@@ -271,6 +271,11 @@
         })
         formState.score = num
       }
+      record.aTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+      record.aEmpCode = userInfo.code
+      record.aEmpName = userInfo.name
+      record.aDeptCode = compDep.value?.dept?.code
+      record.aDeptName = compDep.value?.dept?.name
     }
     function close() {
       tabStore.closeTab(currentRoute.value, router);

src/views/supplier/Supplier/index.vue

@@ -74,9 +74,9 @@
   const selectedKeys = ref<string[]>([]);
   const tableRef = ref();
   //所有按钮
-  const buttons = ref([{"isUse":true,"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"type":"primary"},{"isUse":true,"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"启用","code":"enable","icon":"ant-design:form-outlined","isDefault":true,"type":"primary"},{"isUse":true,"name":"作废","code":"disable","icon":"ant-design:stop-outlined","isDefault":true,"type":"dashed"},{"isUse":true,"name":"刷新","code":"refresh","icon":"ant-design:reload-outlined","isDefault":true},{"isUse":true,"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true},{"isUse":true,"name":"发起审批","code":"startwork","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"查看流转记录","code":"flowRecord","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true}]);
+  const buttons = ref([{"isUse":true,"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"type":"primary"},{"isUse":true,"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"启用","code":"enable","icon":"ant-design:form-outlined","isDefault":true,"type":"primary"},{"isUse":true,"name":"作废","code":"disable","icon":"ant-design:stop-outlined","isDefault":true,"type":"dashed"},{"isUse":true,"name":"刷新","code":"refresh","icon":"ant-design:reload-outlined","isDefault":true},{"isUse":true,"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true},{"isUse":true,"name":"发起审批","code":"startwork","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"查看流转记录","code":"flowRecord","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true},{"isUse":true,"name":"变更","code":"update","icon":"ant-design:edit-filled","isDefault":true},{"isUse":true,"name":"审批","code":"approve","icon":"ant-design:check-outlined","isDefault":true}]);
   //展示在列表内的按钮
-  const actionButtons = ref<string[]>(['view', 'edit','datalog', 'copyData', 'delete', 'startwork','flowRecord']);
+  const actionButtons = ref<string[]>(['view', 'edit','datalog', 'copyData', 'delete', 'startwork','flowRecord', 'update', 'approve']);
   const buttonConfigs = computed(()=>{
     return filterButtonAuth(buttons.value);
   })
@@ -89,7 +89,7 @@
     return buttonConfigs.value?.filter((x) => actionButtons.value.includes(x.code));
   });
 
-  const btnEvent = {add : handleAdd,edit : handleEdit,enable : handleEnable,disable : handleDisable,refresh : handleRefresh,view : handleView,startwork : handleStartwork,flowRecord : handleFlowRecord,delete : handleDelete,}
+  const btnEvent = {add : handleAdd,edit : handleEdit,enable : handleEnable,disable : handleDisable,refresh : handleRefresh,view : handleView,startwork : handleStartwork,flowRecord : handleFlowRecord,delete : handleDelete, update: handleUpdate, approve: handleApprove}
 
   const { currentRoute } = useRouter();
   const router = useRouter();
@@ -183,28 +183,15 @@
         }
       });
     } else {
-      if (schemaIdComputedRef.value) {
       router.push({
-          path: '/flow/' + schemaIdComputedRef.value + '/0/createFlow',
+        path: '/form/Supplier/' + record.id + '/viewForm',
         query: {
           formPath: 'supplier/Supplier',
           formName: formName,
-            formId:currentRoute.value.meta.formId,
+          formId:currentRoute.value.meta.formId
-            type:'edit',
-            id: record.id,
-            disabled: 1,
         }
       });
     }
-      // router.push({
-      //   path: '/form/Supplier/' + record.id + '/viewForm',
-      //   query: {
-      //     formPath: 'supplier/Supplier',
-      //     formName: formName,
-      //     formId:currentRoute.value.meta.formId
-      //   }
-      // });
-    }
   }
 
   function buttonClick(code) {
@@ -256,6 +243,36 @@
       });
     }
   }
+  function handleUpdate(record: Recordable) {
+    const { processId, taskIds, schemaId, status } = record.workflowData || {}; 
+    if (schemaId && !taskIds && processId) {
+      router.push({
+        path: '/flow/' + schemaId + '/' + processId + '/approveFlow',
+        query: {
+          readonly: 1,
+          taskId: '',
+          formName: formName,
+          formId:currentRoute.value.meta.formId,
+          id: record.id,
+          status
+        }
+      });
+    }
+  }
+  function handleApprove(record: Recordable) {
+    const { processId, taskIds, schemaId } = record.workflowData || {}; 
+    if (taskIds && taskIds.length) {
+      router.push({
+        path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
+        query: {
+          taskId: taskIds[0],
+          formName: formName,
+          formId:currentRoute.value.meta.formId,
+          id: record.id
+        }
+      });
+    }
+  }
   function handleDelete(record: Recordable) {
     deleteList([record.id]);
   }
@@ -372,9 +389,11 @@
     
     let actionsList: ActionItem[] = [];
     let editAndDelBtn: ActionItem[] = [];
+    let updateBtn: ActionItem[] = [];
+    let approveBtn: ActionItem[] = [];
     let hasFlowRecord = false; 
     actionButtonConfig.value?.map((button) => {
-      if (['view', 'copyData'].includes(button.code)) {
+      if (['view', 'copyData', 'enable', 'disable'].includes(button.code)) {
         actionsList.push({
           icon: button?.icon,
           tooltip: button?.name,
@@ -389,21 +408,49 @@
           onClick: btnEvent[button.code].bind(null, record),
         });
       }
+      if (['update'].includes(button.code)) {
+        updateBtn.push({
+          icon: button?.icon,
+          tooltip: button?.name,
+          onClick: btnEvent[button.code].bind(null, record),
+        });
+      }
+      if (['approve'].includes(button.code)) {
+        approveBtn.push({
+          icon: button?.icon,
+          tooltip: button?.name,
+          onClick: btnEvent[button.code].bind(null, record),
+        });
+      }
       if (button.code === 'flowRecord') hasFlowRecord = true;
     });
-    if (record.workflowData?.enabled) {
+    // 未提交或已驳回
-      //与工作流有关联的表单
+    if (record.approCode == 'WTJ' || record.approCode == 'YBH' ) {
-      if (record.workflowData.status) {
+      actionsList = actionsList.concat(editAndDelBtn);
+    }
+    // 审批中SPZ
+    if (record.workflowData?.editable) {
+      actionsList = actionsList.concat(approveBtn);
+    }
+    // 已审批
+    if (record.approCode == 'YSP') {
+      actionsList = actionsList.concat(updateBtn);
+    }
+   
+    // if (record.workflowData?.enabled) {
+    //   //与工作流有关联的表单
+    //   if (record.workflowData.status) {
     //     actionsList.unshift(setIndexFlowStatus(record.workflowData))
-      } else {
+    //   } else {
-        actionsList = actionsList.concat(editAndDelBtn);
+    //     actionsList = actionsList.concat(editAndDelBtn);
-      }
+    //   }
-    } else {
+    // } else {
-      if (!record.workflowData?.processId) {
+    //   if (!record.workflowData?.processId) {
-        //与工作流没有关联的表单并且在当前页面新增的数据 如选择编辑、删除按钮则加上
+    //     //与工作流没有关联的表单并且在当前页面新增的数据 如选择编辑、删除按钮则加上
-        actionsList = actionsList.concat(editAndDelBtn);
+    //     actionsList = actionsList.concat(editAndDelBtn);
-      }
+    //   }
-    }
+    // }
+    
     return actionsList;
   }
   function handleStartwork(record: Recordable) {