Merge branch 'v3.0' into sit

.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/'

.gitignore

@@ -1,8 +1,8 @@
 node_modules
 .DS_Store
-dist
-./dist/**
-/dist/assets
+# dist
+# ./dist/**
+# /dist/assets
 
 
 dist-ssr

src/components/PageContainer/src/page-container.tsx

@@ -12,6 +12,8 @@ import {
   type PageContentInstance
 } from "/@/components/PageContent";
 
+import { Notice } from "../../Notice"
+
 const PageContainer = defineComponent({
   name: "PageContainer",
   props: {
@@ -144,7 +146,10 @@ const PageContainer = defineComponent({
 
 
     const list = ['系统需求和问题，请点击右上角工单填写，工程师会逐一回复并处理。','系统需求和问题，请点击右上角工单填写，工程师会逐一回复并处理。']
+<<<<<<< HEAD
 
+=======
+>>>>>>> v3.0
     return () => {
       return (
         <div class="w-full h-full" v-loading={loading.value}>

src/layout/components/navbar.vue

@@ -108,7 +108,7 @@ function openPurchaseSystem(type) {
       break;
     case 2:
       // this.url =;
-      url = VITE_GD_URL + "#/demand/index?t=";
+      url = VITE_GD_URL + "#/accept?t=";
       break;
     default:
       url = VITE_DASHBOARD_URL + "#/accept?t=";

src/style/index.scss

@@ -199,6 +199,10 @@ body {
 }
 
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> v3.0
 .carousel-x-enter-active,
 .carousel-x-leave-active {
   transition: transform 1s linear;

src/utils/status.ts

@@ -174,8 +174,8 @@ export const cgdStatusOptions = [
 
 export const tyStatusOptions = [
   { value: "0", label: "未对账" },
-  { value: "1", label: "对账中" },
-  { value: "2", label: "已对账" }
+  { value: "1", label: "对账回票付款未完成" },
+  { value: "2", label: "对账回票付款已完成" }
 ];
 
 const pay_status_list = [

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

@@ -77,7 +77,7 @@ const columns = [
   {
     label: '对账状态',
     prop: 'status',
-    width: 80,
+    width: 160,
     cellRenderer({ row }) {
       return h(ElTag, null, {
         default: () => tyStatusOptions.find(c => c.value == row.status)?.label || '--'
@@ -109,12 +109,10 @@ const contentConfig: ContentConfig = {
       if(data.orderCode) {
         data.orderCode = [data.orderCode];
       }
-
      
       return httpList({
         ...data,
-        pay_status: '1',
-        // status: [0, 1, 2]
+        // pay_status: '2',
         status
       })
     }

src/views/InvoiceSales/invoiceApply/components/back-modal.vue

@@ -10,7 +10,10 @@ const map = {
   "10": "electronic", //电子普通发票
   "20": "special_electronic", //电子专用发票
   "01": "special", //普通专用发票
-  "04": "normal" //普通发票
+  "04": "normal", //普通发票
+
+  "32": "fully_digitalized_normal_electronic",
+  "31": "fully_digitalized_special_electronic"
 };
 
 const invType = ref("");
@@ -40,7 +43,8 @@ const rules = reactive({
       required: true,
       message: "发票号码格式不正确",
       trigger: "blur",
-      validator(_, value) {
+      validator(rules, value) {
+        console.log(rules)
         if (!value) {
           return new Error("发票号码不能为空");
         }
@@ -91,6 +95,7 @@ const formData = reactive({
   inv_number: "",
   open_date: null,
   inv_subtotal: 0,
+  inv_total: 0,
   check_code: ""
 });
 
@@ -100,6 +105,7 @@ function handleSaveStatus() {
     const {
       input_type: _,
       inv_subtotal,
+      inv_total,
       check_code,
       ...otherParams
     } = formData;
@@ -114,7 +120,8 @@ function handleSaveStatus() {
     //线下开票
     params = {
       invNo: invNo.value,
-      inv_subtotal: inv_subtotal.toFixed(2),
+      inv_subtotal: type === 'fully_digitalized_normal_electronic' || type === 'fully_digitalized_special_electronic' ? '' : inv_subtotal.toFixed(2),
+      inv_total: type === 'fully_digitalized_normal_electronic' || type === 'fully_digitalized_special_electronic' ? inv_total.toFixed(2) : '' ,
       ...(check_code ? { check_code } : {}),
       ...otherParams
     };
@@ -146,8 +153,9 @@ function handleScanKeydown(evt: KeyboardEvent) {
   }
 
   const result = scanInputValue.value.split(",");
+  console.log(result)
 
-  if (result.length !== 9) {
+  if (result.length !== 9 && result.length !== 8) {
     ElMessage.error("扫码枪识别数据格式不正确,请重新扫描。");
     return;
   }
@@ -156,6 +164,7 @@ function handleScanKeydown(evt: KeyboardEvent) {
   const [inv_code, inv_number, subtotal_amount, open_time, check_code] = chunks;
 
   scanInvType.value = invoiceType;
+  console.log(invoiceType)
   const year = open_time.slice(0, 4);
   const month = open_time.slice(4, 6);
   const day = open_time.slice(6);
@@ -163,7 +172,13 @@ function handleScanKeydown(evt: KeyboardEvent) {
   formData.inv_code = inv_code;
   formData.check_code = check_code;
   formData.inv_number = inv_number;
-  formData.inv_subtotal = Number(subtotal_amount);
+
+  if(invoiceType === '31' || invoiceType === '32'){
+    formData.inv_total = Number(subtotal_amount);
+  }else {
+    formData.inv_subtotal = Number(subtotal_amount);
+  }
+
   formData.open_date = dayjs(`${year}-${month}-${day}`).format(
     "YYYY-MM-DD HH:mm:ss"
   );
@@ -187,6 +202,14 @@ watchEffect(() => {
       scanInvType.value = source.scanValue;
     }
   }
+
+  // if(scanInvType.value === '32'){
+  //   rules.inv_code[0].required = false
+  //   rules.inv_subtotal[0].required = false
+  //   rules.check_code[0].required = false
+  // }
+
+  console.log(scanInvType)
 });
 
 defineExpose({
@@ -259,7 +282,7 @@ defineExpose({
           :disabled="disabled"
         />
       </el-form-item>
-      <el-form-item label="发票代码" prop="inv_code">
+      <el-form-item label="发票代码" prop="inv_code" v-if="scanInvType !== '32' && scanInvType !== '31'">
         <el-input
           v-model="formData.inv_code"
           placeholder="发票代码"
@@ -275,7 +298,7 @@ defineExpose({
         />
       </el-form-item>
 
-      <el-form-item label="税前金额" prop="inv_subtotal">
+      <el-form-item label="税前金额" prop="inv_subtotal" v-if="scanInvType !== '32' && scanInvType !== '31'">
         <el-input-number
           v-model="formData.inv_subtotal"
           :precision="2"
@@ -286,7 +309,18 @@ defineExpose({
         />
       </el-form-item>
 
-      <el-form-item label="校验码" prop="check_code">
+      <el-form-item label="税后金额" prop="inv_total" v-else>
+        <el-input-number
+          v-model="formData.inv_total"
+          :precision="2"
+          style="width: 100%"
+          :min="0"
+          :max="999999"
+          :disabled="disabled"
+        />
+      </el-form-item>
+
+      <el-form-item label="校验码" prop="check_code" v-if="scanInvType !== '32' && scanInvType !== '31'">
         <el-input
           placeholde="请输入校验码"
           v-model="formData.check_code"

src/views/InvoiceSales/invoiceApply/components/currentcy-form-wanyu/add-edit-form.vue

@@ -22,6 +22,11 @@ const responseHandle = useResponseHandle();
 const loading = shallowRef(false);
 const denomination = shallowRef(0);
 
+const sourceCompanyList = ref([
+  { companyName: '北京泰文创供应链管理有限公司', companyNo: 'GS2402020907088731' },
+  { companyName: '北京万宇恒通国际科贸有限公司', companyNo: 'GS2203161855277894' },
+]);
+
 const initform = {
   buyer:"",
   email: "", //邮箱
@@ -206,10 +211,9 @@ onMounted(() => handleCompanyChange(currentCompany.value.companyNo));
               @change="handleSupplierChange"
             >
               <el-option
-                v-for="c in companyList"
-                :disabled="c.companyCode === 'GS2404151642335170'"
-                :key="c.companyCode"
-                :value="c.companyCode"
+                v-for="c in sourceCompanyList"
+                :key="c.companyNo"
+                :value="c.companyNo"
                 :label="c.companyName"
               />
             </el-select>

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,13 @@ 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"],