snow 2 سال پیش
والد
کامیت
f71c1b82d3

+ 3 - 3
src/views/InvoiceSales/invoiceApply/config/content.config.ts

@@ -1,8 +1,8 @@
 import { h } from "vue";
 import { h } from "vue";
 import { ContentConfig } from "/@/components/PageContent";
 import { ContentConfig } from "/@/components/PageContent";
 import { httpList } from "/@/api/InvoiceSales/invoiceApply";
 import { httpList } from "/@/api/InvoiceSales/invoiceApply";
-import { inv_type_list } from "../status";
 import { INV_OPEN_STATUS } from "/@/utils/details/inv-open";
 import { INV_OPEN_STATUS } from "/@/utils/details/inv-open";
+import { invoiceTypeList } from "/@/utils/status";
 import { ElTag } from "element-plus";
 import { ElTag } from "element-plus";
 import dayjs from "dayjs";
 import dayjs from "dayjs";
 
 
@@ -53,8 +53,8 @@ const columns = [
     cellRenderer: ({ row }) => {
     cellRenderer: ({ row }) => {
       return h(ElTag, null, {
       return h(ElTag, null, {
         default: () =>
         default: () =>
-          inv_type_list.find(item => item.value == row.inv_type + "")?.label ||
-          "--"
+          invoiceTypeList.find(item => item.value == row.inv_type + "")
+            ?.label || "--"
       });
       });
     }
     }
   },
   },

+ 6 - 3
src/views/InvoiceSales/invoicePool/config/content.config.ts

@@ -4,7 +4,7 @@ import { httpList } from "/@/api/InvoiceSales/invoicePool";
 import dayjs from "dayjs";
 import dayjs from "dayjs";
 import { h } from "vue";
 import { h } from "vue";
 import { ElTag } from "element-plus";
 import { ElTag } from "element-plus";
-import { inv_type_list } from "../../invoiceApply/status";
+import { invoiceTypeList } from "/@/utils/status";
 
 
 const columns = [
 const columns = [
   {
   {
@@ -45,9 +45,12 @@ const columns = [
   },
   },
   {
   {
     label: "发票类型",
     label: "发票类型",
-    width: 130,
+    width: 150,
     cellRenderer({ row }) {
     cellRenderer({ row }) {
-      const current = inv_type_list.find(i => i.value === String(row.inv_type));
+      const current = invoiceTypeList.find(
+        i => i.value === String(row.inv_type)
+      );
+
       return h(ElTag, null, {
       return h(ElTag, null, {
         default: () => current.label
         default: () => current.label
       });
       });

+ 2 - 2
src/views/InvoiceSales/invoicePool/config/search.config.ts

@@ -1,5 +1,5 @@
-import { inv_type_list } from "../../invoiceApply/status";
 import { FormConfig } from "/@/components/PageSearch";
 import { FormConfig } from "/@/components/PageSearch";
+import { xs_inv_type_list } from "/@/utils/status";
 
 
 const searchFormConfig: FormConfig = {
 const searchFormConfig: FormConfig = {
   formItems: [
   formItems: [
@@ -23,7 +23,7 @@ const searchFormConfig: FormConfig = {
       field: "inv_type",
       field: "inv_type",
       type: "select",
       type: "select",
       placeholder: "发票类型",
       placeholder: "发票类型",
-      options: inv_type_list
+      options: xs_inv_type_list
     }
     }
   ]
   ]
 };
 };

+ 3 - 2
src/views/InvoiceSales/returnTicket/config/content.config.ts

@@ -5,7 +5,7 @@ import dayjs from "dayjs";
 import { ElTag } from "element-plus";
 import { ElTag } from "element-plus";
 import { h } from "vue";
 import { h } from "vue";
 import { RETURN_STATUS, RETURN_TYPE } from "/@/utils/details/inv-return";
 import { RETURN_STATUS, RETURN_TYPE } from "/@/utils/details/inv-return";
-import { INV_TYPE } from "/@/utils/details/inv-open";
+import { invoiceTypeList } from "/@/utils/status";
 
 
 const columns = [
 const columns = [
   {
   {
@@ -43,7 +43,8 @@ const columns = [
     cellRenderer: ({ row }) => {
     cellRenderer: ({ row }) => {
       return h(ElTag, null, {
       return h(ElTag, null, {
         default: () =>
         default: () =>
-          INV_TYPE.find(s => s.value === String(row.inv_type))?.label || "--"
+          invoiceTypeList.find(s => s.value === String(row.inv_type))?.label ||
+          "--"
       });
       });
     }
     }
   },
   },

+ 8 - 1
src/views/purchase/ticketReturn/config/content.config.ts

@@ -5,6 +5,7 @@ import dayjs from "dayjs";
 import { h } from "vue";
 import { h } from "vue";
 import { ElImage, ElTag } from "element-plus";
 import { ElImage, ElTag } from "element-plus";
 import { checkTypeOptions, invTypeOptions, statusOptions } from "./_opitons";
 import { checkTypeOptions, invTypeOptions, statusOptions } from "./_opitons";
+import { invoiceTypeList } from "/@/utils/status";
 
 
 const columns = [
 const columns = [
   {
   {
@@ -126,7 +127,13 @@ const columns = [
   {
   {
     label: "发票类型",
     label: "发票类型",
     width: 110,
     width: 110,
-    prop: "invoiceType_cn"
+    cellRenderer({ row }) {
+      return h(ElTag, null, {
+        default: () =>
+          invoiceTypeList.find(({ value }) => value === row.invoiceType)
+            ?.label || "--"
+      });
+    }
   },
   },
   {
   {
     label: "申请人",
     label: "申请人",

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

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 <script setup lang="ts">
 import { ref } from "vue";
 import { ref } from "vue";
-import { ElMessage, ElMessageBox } from "element-plus";
+import { ElMessage } from "element-plus";
 import { execlUpload } from "/@/components/execlUpload";
 import { execlUpload } from "/@/components/execlUpload";
 import { httpBatchAdd } from "/@/api/purchase/ticketReturn";
 import { httpBatchAdd } from "/@/api/purchase/ticketReturn";
 import { useResponseHandle } from "/@/hooks";
 import { useResponseHandle } from "/@/hooks";

+ 12 - 0
src/views/supply/ticketReturn/config/content.config.ts

@@ -5,6 +5,7 @@ import dayjs from "dayjs";
 import { h } from "vue";
 import { h } from "vue";
 import { ElImage, ElTag } from "element-plus";
 import { ElImage, ElTag } from "element-plus";
 import { checkTypeOptions, invTypeOptions, statusOptions } from "./_opitons";
 import { checkTypeOptions, invTypeOptions, statusOptions } from "./_opitons";
+import { invoiceTypeList } from "/@/utils/status";
 
 
 const columns = [
 const columns = [
   {
   {
@@ -126,6 +127,17 @@ const columns = [
     width: 110,
     width: 110,
     prop: "invoiceType_cn"
     prop: "invoiceType_cn"
   },
   },
+  {
+    label: "发票类型",
+    width: 110,
+    cellRenderer({ row }) {
+      return h(ElTag, null, {
+        default: () =>
+          invoiceTypeList.find(({ value }) => value === row.invoiceType)
+            ?.label || "--"
+      });
+    }
+  },
   {
   {
     label: "申请人",
     label: "申请人",
     prop: "apply_name"
     prop: "apply_name"

+ 4 - 6
src/views/system/finance/components/finance-modal.vue

@@ -302,12 +302,10 @@ defineExpose({
 
 
           <ElFormItem label="支持发票类型" prop="invoiceType">
           <ElFormItem label="支持发票类型" prop="invoiceType">
             <ElCheckboxGroup v-model="formData.invoiceType">
             <ElCheckboxGroup v-model="formData.invoiceType">
-              <ElCheckbox
-                v-for="inv in xs_inv_type_list"
-                :key="inv.value"
-                :label="inv.value"
-                >{{ inv.label }} <br
-              /></ElCheckbox>
+              <template v-for="inv in xs_inv_type_list" :key="inv.value">
+                <ElCheckbox :label="inv.value">{{ inv.label }}</ElCheckbox>
+                <br />
+              </template>
             </ElCheckboxGroup>
             </ElCheckboxGroup>
           </ElFormItem>
           </ElFormItem>
         </ElCol>
         </ElCol>