build

.env.development

@@ -16,16 +16,18 @@ VITE_APP_ID = "ww6076e6fd4268ee31"
 # 微信开发环境基础重定向url
 REDIRECT_BASE_URL = "http://cxinv.api.caixiao365.com"
 # 开发环境后端用户地址
-VITE_PROXY_USER_REAL1 = "http://user.test241.wanyuhengtong.com"
+VITE_PROXY_USER_REAL1 = "http://user.api.caixiao365.com"
 # 开发环境后端用户地址
-VITE_PROXY_USER_REAL = "http://stockinv.test241.wanyuhengtong.com"
+VITE_PROXY_USER_REAL = "http://cxinv.api.caixiao365.com"
 # 开发环境后端业务地址
-VITE_PROXY_DOMAIN_REAL = "http://stockinv.test241.wanyuhengtong.com"
+VITE_PROXY_DOMAIN_REAL = "http://cxinv.api.caixiao365.com"
 
 VITE_IS_PROD = true
 
-# 跳转结算地址
-VITE_PURCHASE_URL = 'http://webstock3.test241.wanyuhengtong.com/'
+# 跳转采销地址
+VITE_PURCHASE_URL = 'http://pin.caixiao365.com/'
+# 跳转工单地址
+VITE_GD_URL = 'http://bug.caixiao365.com/'
 
 # 报表地址
 VITE_DASHBOARD_URL = 'http://web.report.caixiao365.com/'
@@ -33,6 +35,3 @@ VITE_DASHBOARD_URL = 'http://web.report.caixiao365.com/'
 # token密钥
 VITE_SECRET_KEY = 'key123'
 
-
-# 跳转工单地址
-VITE_GD_URL = 'http//bugweb.test241.wanyuhengtong.com/'

src/components/ReIcon/src/iconifyIconOffline.ts

@@ -44,11 +44,24 @@ import Excel from "@iconify-icons/fa-solid/file-excel";
 import Promotion from "@iconify-icons/ep/promotion";
 import BellFilled from "@iconify-icons/ep/bell-filled";
 import downloadLine from "@iconify-icons/ep/download";
+import uploadLine from "@iconify-icons/ep/upload";
+import docLine from "@iconify-icons/ep/tickets";
 import QuestionFilled from "@iconify-icons/ep/question-filled";
 import Sort from "@iconify-icons/ep/sort";
 import Management from "@iconify-icons/ep/management";
 
+import DownloadField from "@iconify-icons/fa/download"
+import UploadFiled from "@iconify-icons/fa/upload"
+import StickyNote from "@iconify-icons/fa/sticky-note"
+
+
+addIcon("download-field", DownloadField);
+addIcon("upload-field", UploadFiled);
+addIcon("sticky-note", StickyNote);
+
 addIcon("sort", Sort);
+addIcon("upload-line", uploadLine);
+addIcon("doc-line", docLine);
 addIcon("Management", Management);
 addIcon("download-line", downloadLine);
 addIcon("question-filled", QuestionFilled);

src/style/index.scss

@@ -151,3 +151,49 @@ html {
 body {
   font-family: robotothin,-apple-system,Helvetica Neue,Helvetica,Arial,PingFang SC,Hiragino Sans GB,STHeiti,Microsoft YaHei,Microsoft JhengHei,SimSun,sans-serif !important;
 }
+
+
+.capital-claim{
+  .el-button--primary{
+    &.is-plain{
+      &:hover{
+        background: red;
+      }
+    }
+  }
+
+
+  .el-button--primary{
+    &.is-plain{
+      &:hover{
+        background: #d9ecff;
+        color:#409eff;
+      }
+    }
+  }
+
+
+  .el-button--success{
+    &.is-plain{
+      &:hover{
+        background: #e1f3d8;
+        color:#67c23a;
+      }
+    }
+  }
+
+
+  .el-button--warning{
+    &.is-plain{
+      &:hover{
+        background: #faecd8;
+        color:#e6a23c;
+      }
+    }
+  }
+
+  .el-button-group{
+    display:flex;
+    flex-wrap: nowrap;
+  }
+}

src/utils/btnList.ts

@@ -57,7 +57,7 @@ const btnList = [
   { code: "056", name: "解除采购对账回票标签" },
   { code: "057", name: "资金信息导出" },
   { code: "058", name: "上传发票" },
-  { code: "059", name: "解除销售对账付款标签" },
-  { code: "060", name: "解除销售对账回票标签" },
+  { code: "061", name: "解除销售订单回款标签" },
+  { code: "062", name: "解除销售订单开票标签" },
 ];
 export default btnList;

src/utils/validate.ts

@@ -67,11 +67,10 @@ const isEmail = (s: string) => {
 // 手机号码
 
 const isMobile = (s: string) => {
-  return /^1[3|4|5|6|7|8|9][0-9]\d{8}$/.test(s);
+  return /^1[3|1|4|5|6|7|8|9][0-9]\d{8}$/.test(s);
 };
 
 //电话号码
-
 const isPhone = (s: string) => {
   return /^([0-9]{3,4}-)?[0-9]{7,8}$/.test(s);
 };

src/views/InvoiceSales/capitalClaim/index.vue

@@ -143,7 +143,7 @@ async function onDownloadCapitalInfo() {
 </script>
 
 <template>
-  <div class="main role">
+  <div class="main capital-claim">
     <PagePower :is-show="hasPermissionWithCode('001')">
       <div w-full>
         <PageSearch
@@ -152,38 +152,55 @@ async function onDownloadCapitalInfo() {
           @reset-btn-click="handleResetClick"
         >
           <template #action>
-            <el-button :loading="loading" @click="() => onDownloadOpenInv()">
-              资金认领数据导出
-            </el-button>
-            <el-button 
-              v-if="hasPermissionWithCode('057')"
-              @click="() => onDownloadCapitalInfo()"
-              :loading="loading" 
-              >
-              资金信息导出
-            </el-button>
-            <el-button
-              v-if="!isSuperUser && hasPermissionWithCode('029')"
-              @click="onDownloadTemplate"
-              >下载资金导入模板
-            </el-button>
-            <el-button
-              v-if="!isSuperUser && hasPermissionWithCode('030')"
-              type="primary"
-              @click="() => execlUploadRef.onDisplay()"
-              >批量导入客户付款资金数据
-            </el-button>
-            <el-button
+            <div class="flex gap-[10px] flex-wrap">
+              <el-button-group>
+              <el-button
+                type="warning" plain
+               v-if="!isSuperUser && hasPermissionWithCode('029')"
+               @click="onDownloadTemplate">
+                1.下载资金导入模板
+              </el-button>
+
+              <el-button
+                type="primary" plain
+                v-if="!isSuperUser && hasPermissionWithCode('030')"
+                @click="() => execlUploadRef.onDisplay()"
+                >
+                2.导入客户付款资金数据(批量)
+              </el-button>
+
+              <el-button 
+                type="success" plain
+               @click="() => onDownloadCapitalInfo()"
+               :loading="loading" 
+               >
+               3.导出资金信息
+              </el-button>
+            </el-button-group>
+
+
+            <el-button-group>
+              <el-button
+              type="warning" plain
               v-if="!isSuperUser && hasPermissionWithCode('034')"
               @click="onCapitalDownloadTemplate"
-              >下载订单认款导入模板
+              >
+              4.下载订单认款导入模板
             </el-button>
             <el-button
-              v-if="!isSuperUser && hasPermissionWithCode('035')"
-              type="primary"
-              @click="() => execlCapitalUploadRef.onDisplay()"
-              >批量导入订单认款数据
-            </el-button>
+              type="primary" plain
+               v-if="!isSuperUser && hasPermissionWithCode('035')"
+               @click="() => execlCapitalUploadRef.onDisplay()"
+               >
+               5.导入订单认款数据(批量)
+              </el-button>
+              <el-button 
+               type="success" plain
+              :loading="loading" @click="() => onDownloadOpenInv()">
+               6.导出资金认领数据
+              </el-button>
+            </el-button-group>
+           </div>
           </template>
         </PageSearch>
         <PageContent
@@ -376,4 +393,7 @@ async function onDownloadCapitalInfo() {
 .star {
   color: red;
 }
+
+
+
 </style>

src/views/InvoiceSales/currentcyOrderRecord/detail.vue

@@ -1,14 +1,18 @@
 <script setup lang="ts">
-import { shallowRef } from 'vue'
+import { shallowRef, ref, computed } from 'vue'
 import { useRouter } from "vue-router"
 import { useDetail } from "/@/hooks/core/useDetail";
-// import { usePermission } from "/@/hooks/core/usePermission";
+import { usePermission } from "/@/hooks/core/usePermission";
 import ReconciliationForm from "/@/components/ReconciliationForm";
 import { ElTabs, ElTabPane, ElCollapse, ElCollapseItem } from "element-plus"
 import OrderForm from "./components/order-form.vue"
+import { useAsync } from "/@/hooks/core/useAsync";
+import { httpStatus } from "/@/api/purchase/orderRecord";
+import { DefaultApprovalNode } from "/@/components/ApprovalNode";
 
 const pageName = "currentcyOrderRecordDetail"
 
+const status = computed(() => formRef.value?.detail.status || "");
 const { id, title, isDetail, collapses } = useDetail({
   baseName: '通用订单对账',
   collapseLen: 2
@@ -16,6 +20,19 @@ const { id, title, isDetail, collapses } = useDetail({
 
 const { push } = useRouter();
 const loading = shallowRef(false);
+
+const formRef = ref<InstanceType<typeof ReconciliationForm>>(null);
+const { run: approval } = useAsync({ success: () => formRef.value.refresh() });
+const { hasPermissionWithCode } = usePermission(pageName);
+
+function handleApproval(data) {
+  const params = {
+    ...data,
+    payNo: id.value
+  };
+
+  approval(httpStatus(params));
+}
 </script>
 
 
@@ -25,9 +42,13 @@ const loading = shallowRef(false);
       <ElTabPane :label="title">
         <ElCollapse v-model="collapses">
           <ElCollapseItem :title="title" name="1">
-            <ReconciliationForm v-if="isDetail" :id="id" :loading="loading" :readonly="isDetail" isPurch />
+            <ReconciliationForm v-if="isDetail"  ref="formRef" :id="id" :loading="loading" :readonly="isDetail" isPurch />
             <OrderForm v-else @create="() => push('/InvoiceSales/currentcyOrderRecord')" />
           </ElCollapseItem>
+
+          <ElCollapseItem name="2" title="买方公司业务审核" v-if="String(status) === '1' && hasPermissionWithCode('039')">
+              <DefaultApprovalNode approveValue="2" rejectValue="3" @approval="handleApproval" />
+            </ElCollapseItem>
         </ElCollapse>
       </ElTabPane>
     </ElTabs>

src/views/InvoiceSales/sheetOrderPool/config/content.config.ts

@@ -240,9 +240,9 @@ const contentConfig: ContentConfig = {
   // 回票标签
   showReturnTagFn: ({ is_comon }, permissions) => permissions.includes("015"),
   // 解除付款标签
-  showUnPayTagFn: ({ status, is_comon }, permissions) => permissions.includes("059"),
+  showUnPayTagFn: ({ status, is_comon }, permissions) => permissions.includes("061"),
   // 解除回票标签
-  showUnReturnTagFn: ({ status, is_comon }, permissions) => permissions.includes("060"),
+  showUnReturnTagFn: ({ status, is_comon }, permissions) => permissions.includes("062"),
   apis: { httpList }
 };
 

vite.config.ts

@@ -64,12 +64,12 @@ export default ({ command, mode }: ConfigEnv): UserConfigExport => {
             }
           : null
     },
-    plugins: [...getPluginsList(command, VITE_LEGACY),
-        zipPack({
-        inDir:'dist',
-        outFileName:'build.zip',
-        pathPrefix:''
-      })
+    plugins: [...getPluginsList(command, VITE_LEGACY)
+      //   zipPack({
+      //   inDir:'dist',
+      //   outFileName:'build.zip',
+      //   pathPrefix:''
+      // })
   ],
     optimizeDeps: {
       include: ["pinia", "lodash-es", "@vueuse/core"],