snow 2 years ago
parent
commit
4480985edb

+ 1 - 1
src/views/invoice/query/columns.tsx

@@ -65,7 +65,7 @@ export function useColumns() {
   const cgColumns = ref([
     {
       prop: "hpNo",
-      label: "业务编号",
+      label: "对账回票申请",
       width: "180px"
     },
     {

+ 1 - 1
src/views/supply/ticketReturn/components/execl-files-upload/index.vue

@@ -105,7 +105,7 @@ const handleSubmit = async () => {
         (target.value === "normal" || target.value === "electronic") &&
         !row.checkNumber
       ) {
-        checkErrors.push(index + 1);
+        checkErrors.push(String(index + 1));
       }
     }
 

+ 12 - 4
src/views/supply/ticketReturn/components/invoice-form.vue

@@ -6,7 +6,7 @@ import { httpImageUpload, baseUrl } from "/@/api/other";
 import { useUserStore } from "/@/store/modules/user";
 import { ticketFormItems } from "../config/_details";
 import { INPUT_MAX_LENGTH } from "/@/utils/global";
-import { cg_inv_type_list, inv_type_list } from "/@/utils/status";
+import { cg_inv_type_list } from "/@/utils/status";
 import { invoceRules } from "../config/_rules";
 
 const emit = defineEmits(["change"]);
@@ -101,9 +101,6 @@ function handleScanKeydown(evt: KeyboardEvent) {
   let [_, invoiceType, ...chunks] = result;
   const [invCode, invNumber, subtotal_amount, open_time, checkNumber] = chunks;
 
-  // rules.value = is_Electronics ? invoceRules_Electronics : invoceRules;
-  // invoiceType = is_Electronics ? "electronics" : invoiceType;
-
   let _open_time = "";
   if (open_time) {
     const year = open_time.slice(0, 4);
@@ -170,6 +167,17 @@ watch(
   }
 );
 
+watch(
+  () => formData.value.invoiceType,
+  () => {
+    if (rules.value.checkNumber) {
+      rules.value.checkNumber[0].required = ["04", "10"].includes(
+        formData.value.invoiceType
+      );
+    }
+  }
+);
+
 const disabledDate = time => {
   return time.getTime() > Date.now();
 };

+ 2 - 2
src/views/supply/ticketReturn/config/_rules.ts

@@ -72,10 +72,10 @@ export const invoceRules: FormRules = {
       required: true
     }
   ],
-  gold: [
+  checkNumber: [
     {
       trigger: "blur",
-      message: "请选择金额",
+      message: "请输入校验码",
       required: true
     }
   ]