财务管理接口修改

.env.development

@@ -7,20 +7,20 @@ VITE_PUBLIC_PATH = /
 
 
 # 跨域代理，您可以配置多个 ,请注意，没有换行符
-# VITE_PROXY = [["/jeecgboot","http://192.168.0.217:8080/jeecg-boot"],["/upload","http://192.168.0.217:8080/jeecg-boot"]]
+VITE_PROXY = [["/jeecgboot","http://192.168.0.217:8080/jeecg-boot"],["/upload","http://192.168.0.217:8080/jeecg-boot"]]
 # VITE_PROXY = [["/jeecgboot","http://192.168.0.11:8080/jeecg-boot"],["/upload","http://192.168.0.11:8080/upload"]]
 # VITE_PROXY = [["/jeecgboot","http://192.168.1.253:8080/jeecg-boot"],["/upload","http://192.168.1.253:8080/upload"]]
 # VITE_PROXY = [["/jeecgboot","http://192.168.1.166:8080/jeecg-boot"],["/upload","http://192.168.1.166:8080/upload"]]
 # VITE_PROXY = [["/jeecgboot","http://47.109.18.141:8080/jeecg-boot"],["/upload","http://47.109.18.141:8080/upload"]]
-VITE_PROXY = [["/jeecgboot","https://api.qlapp.cn/jeecgboot"],["/upload","https://api.qlapp.cn/upload"]]
+# VITE_PROXY = [["/jeecgboot","https://api.qlapp.cn/jeecgboot"],["/upload","https://api.qlapp.cn/upload"]]
 
 #后台接口全路径地址(必填)
-# VITE_GLOB_DOMAIN_URL=http://192.168.0.217:8080/jeecg-boot #//黄
+VITE_GLOB_DOMAIN_URL=http://192.168.0.217:8080/jeecg-boot #//黄
 # VITE_GLOB_DOMAIN_URL=http://192.168.0.11:8080/jeecg-boot  #李
 # VITE_GLOB_DOMAIN_URL=http://192.168.1.253:8080/jeecg-boot  #张
 # VITE_GLOB_DOMAIN_URL=http://192.168.1.166:8080/jeecg-boot  #张
 # VITE_GLOB_DOMAIN_URL=http://47.109.18.141:8080/jeecg-boot  #fwq
-VITE_GLOB_DOMAIN_URL=https://api.qlapp.cn/jeecgboot  #fwq
+# VITE_GLOB_DOMAIN_URL=https://api.qlapp.cn/jeecgboot  #fwq
 
 #后台接口父地址(必填)
 VITE_GLOB_API_URL=/jeecgboot

src/views/Finance/shopBalance/shopBalance.data.ts

@@ -3,6 +3,8 @@ import { FormSchema } from '/@/components/Table';
 import { useUserStore } from '/@/store/modules/user';
 // import { Business, getProject } from '../gymnasiumBag/gymnasiumBag.api';
 import { storeToRefs } from 'pinia';
+import { h } from 'vue';
+import { Tag } from 'ant-design-vue';
 
 const { userInfo } = storeToRefs(useUserStore());
 //列表数据
@@ -16,79 +18,101 @@ export const columns: BasicColumn[] = [
   {
     title: '收支类型',
     align: 'center',
-    dataIndex: 'income_expense_type',
+    dataIndex: 'incomeType',
+    customRender: ({ record }) => {
+      if (record.incomeType == 1) {
+        return h(Tag, { color: 'pink' }, '支出');
+      } else {
+        return h(Tag, { color: 'green' }, '收入');
+      }
+    },
   },
   {
     title: '金额类型',
     align: 'center',
-    dataIndex: 'amount_type',
-    slots: { customRender: 'amount_type' },
+    dataIndex: 'moneyType',
+    customRender: ({ record }) => {
+      if (record.moneyType == 1) {
+        return '可用余额';
+      } else {
+        return '待结算';
+      }
+    },
   },
   {
     title: '改变前金额(元)',
     align: 'center',
-    dataIndex: 'amount_before',
+    dataIndex: 'beforeChange',
   },
   {
     title: '改变后金额(元)',
     align: 'center',
-    dataIndex: 'amount_after',
+    dataIndex: 'afterChange',
   },
   {
     title: '改变金额(元)',
     align: 'center',
-    dataIndex: 'change_amount',
+    dataIndex: 'moneyChange',
   },
   {
     title: '资金变化原因',
     align: 'center',
-    dataIndex: 'change_reason',
+    dataIndex: 'changeInfo',
+    customRender: ({ record }) => {
+      if (record.changeInfo == 1) {
+        return '用户支付';
+      } else if (record.changeInfo == 2) {
+        return '用户退款';
+      } else {
+        return '分账';
+      }
+    },
   },
   {
     title: '创建时间',
     align: 'center',
-    dataIndex: 'create_time',
+    dataIndex: 'createTime',
   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
   {
-    field: 'incomeExpenseType',
+    field: 'incomeType',
     label: '收支类型',
     component: 'Select',
     componentProps: {
       options: [
-        { label: '全部', value: '全部' },
-        { label: '收入', value: '收入' },
-        { label: '支出', value: '支出' },
+        { label: '全部', value: '0' },
+        { label: '收入', value: '2' },
+        { label: '支出', value: '1' },
       ],
     },
     colProps: { span: 4 },
   },
   {
-    field: 'amountType',
+    field: 'moneyType',
     label: '金额类型',
     component: 'Select',
     componentProps: {
       options: [
-        { label: '全部', value: '全部' },
-        { label: '可用余额', value: '可用余额' },
-        { label: '待结算', value: '待结算' },
-        { label: '已结算', value: '已结算' },
+        { label: '全部', value: '0' },
+        { label: '可用余额', value: '1' },
+        { label: '待结算', value: '2' },
+        // { label: '已结算', value: '已结算' },
       ],
     },
     colProps: { span: 4 },
   },
   {
-    field: 'changeReason',
+    field: 'changeInfo',
     label: '资金变化原因',
     componentProps: {
       options: [
-        { label: '全部', value: '全部' },
-        { label: '用户支付', value: '用户支付' },
-        { label: '用户退款', value: '用户退款' },
-        { label: '分账', value: '分账' },
-        { label: '银行卡到账', value: '银行卡到账' },
+        { label: '全部', value: '0' },
+        { label: '用户支付', value: '1' },
+        { label: '用户退款', value: '2' },
+        { label: '分账', value: '3' },
+        // { label: '银行卡到账', value: '银行卡到账' },
       ],
     },
     component: 'Select',

src/views/informationManagement/ContractList/index.vue

@@ -3,7 +3,7 @@
     <!--引用表格-->
     <BasicTable @register="registerTable">
       <template #tableTitle>
-        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined" v-if="getDataSource().length == 0"> 新增</a-button>
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined" v-if="getDataSource().length == 0"> 新增 </a-button>
       </template>
       <template #action="{ record }">
         <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
@@ -27,6 +27,7 @@
   import { list, getDetaile, getOrgIdentityInfos, createTemplate, getEditEsign, templateViewUrl } from './ContractList.api';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useUserStore } from '/@/store/modules/user';
+
   const queryParam = reactive<any>({});
   const { createMessage, createWarningModal } = useMessage();
   const { userInfo } = useUserStore();
@@ -58,22 +59,32 @@
   });
 
   const [registerTable, { reload, getDataSource }] = tableContext;
+
   async function handleView(record: Recordable) {
     const res = await templateViewUrl({ docTemplateId: record.docTemplateId });
     window.open(res, '_blank');
   }
+
+  async function editSign(record: Recordable) {
+    openModal(true, {
+      isUpdate: true,
+      showFooter: true,
+      record,
+    });
+  }
+
   /**
    * 操作栏
    */
   function getTableAction(record) {
     return [
-      // {
-      //   label: '编辑底稿',
-      //   onClick: handleView.bind(null, record),
-      //   ifShow() {
-      //     return record.docTemplateId;
-      //   },
-      // },
+      {
+        label: '编辑底稿',
+        onClick: editSign.bind(null, record),
+        ifShow() {
+          return record.docTemplateId;
+        },
+      },
       {
         label: '制作合同',
         onClick: handleGoEsign.bind(null, record),
@@ -97,21 +108,25 @@
       },
     ];
   }
+
   async function handleGoEsign(record) {
     const res = await createTemplate({ fileId: record.fileId });
 
     window.open(res, '_blank');
   }
+
   async function handleEdit(record) {
     const res = await getEditEsign({ docTemplateId: record.docTemplateId });
     window.open(res, '_blank');
   }
+
   /**
    * 下拉操作栏
    */
   function getDropDownAction(record) {
     return [];
   }
+
   async function handleAdd() {
     // const res = await getOrgIdentityInfos({ orgCode: userInfo?.orgCode });
     openModal(true, {

src/views/safetyManagement/Seal/index.vue

@@ -2,7 +2,7 @@
   <div>
     <!--引用表格-->
     <BasicTable @register="registerTable">
-      <template #tableTitle> </template>
+      <template #tableTitle></template>
       <template #action="{ record }">
         <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
       </template>
@@ -56,10 +56,13 @@
     },
   });
   const [registerTable, { reload }] = tableContext;
+
   async function handleView(record: Recordable) {
-    await getButton({ orgCode: userInfo.value?.orgCode, sealId: record.sealId });
-    reload();
+    const res = await getButton({ orgCode: userInfo.value?.orgCode, sealId: record.sealId });
+    window.open(res, '_blank');
+    // reload();
   }
+
   /**
    * 操作栏
    */
@@ -72,12 +75,14 @@
       },
     ];
   }
+
   /**
    * 下拉操作栏
    */
   function getDropDownAction(record) {
     return [];
   }
+
   onUnmounted(() => {
     useShopInfoStore().isShowSelect = false;
   });