发票相关问题修改

.env.wyf

@@ -3,16 +3,16 @@ NODE_ENV=test
 
 VITE_DEV=false
 
-# # 请求路径
-# VITE_BASE_URL='http://192.168.0.108:12080'
-# # 上传路径
-# VITE_UPLOAD_URL='http://192.168.0.108:12080/api/admin-api/infra/file/upload'
-
 # 请求路径
-VITE_BASE_URL='http://dev.ccwin-in.com:25300/api'
+VITE_BASE_URL='http://192.168.0.108:12080'
-
 # 上传路径
-VITE_UPLOAD_URL='http://dev.ccwin-in.com:25300/api/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='http://192.168.0.108:12080/api/admin-api/infra/file/upload'
+
+# # 请求路径
+# VITE_BASE_URL='http://dev.ccwin-in.com:25300/api'
+
+# # 上传路径
+# VITE_UPLOAD_URL='http://dev.ccwin-in.com:25300/api/admin-api/infra/file/upload'
 
 # 接口前缀
 VITE_API_BASEPATH=

src/components/Detail/src/Detail.vue

@@ -28,7 +28,7 @@
       <Tabs ref="tabRef" :tabsList="tabsList" :current="current" @change="change" />
       <div class="flex">
         <!-- 详情 -->
-        <ContentWrap class="w-[100%]" v-show="tabsList[current].label!='附件'&&tabsList[current].label!='备注'&&tabsList[current].label!='变更记录'&&!annexTableData.some(item=>item.label==tabsList[current].label)">          <!-- 列表头部 -->
+        <ContentWrap class="w-[100%]" v-show="tabsList[current].label!=annexAliasLabel&&tabsList[current].label!='备注'&&tabsList[current].label!='变更记录'&&!annexTableData.some(item=>item.label==tabsList[current].label)">          <!-- 列表头部 -->
           <TableHead
             v-if="!isBasic"
             :HeadButttondata="HeadButttondata"
@@ -123,10 +123,10 @@
 
         </div>
         <!-- 附件/备注/变更记录 -->
-        <ContentWrap class="w-[100%]" v-show="tabsList[current].label=='附件'||tabsList[current].label=='备注'||tabsList[current].label=='变更记录'" :style="{height:remarkHeight+'px'}">
+        <ContentWrap class="w-[100%]" v-show="tabsList[current].label==annexAliasLabel||tabsList[current].label=='备注'||tabsList[current].label=='变更记录'" :style="{height:remarkHeight+'px'}">
           <!-- 附件组件 -->
           <ElScrollbar ref="scrollbar" :style="{height:(remarkHeight-40)+'px'}">
-            <Annex v-show="tabsList[current].label=='附件'"
+            <Annex v-show="tabsList[current].label==annexAliasLabel"
                 :annexData="annexData"
                 @handleAnnexSuccess="handleAnnexSuccess"
                 @deleteAnnexSuccess="deleteAnnexSuccess"
@@ -210,6 +210,12 @@ const props = defineProps({
     required: false,
     default: ()=>[]
   },
+  //展示附件组件的tab标签
+  annexAliasLabel: {
+    type: String,
+    required: false,
+    default: '附件'
+  },
   // 是否是基础数据 展现详情顶部表单
   isBasic: {
     type: Boolean,
@@ -375,7 +381,7 @@ if (props.isBasic == true) {
 }
 
 const otherList = [...props.annexTable,{
-    label:'附件',
+    label:props.annexAliasLabel,
     prop:'Annex'
   },{
     label:'备注',

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue

@@ -58,7 +58,7 @@
       prop: 'Annex',
       tableName:'contract'
     },{
-      label: '电子发票附件',
+      label: '发票附件',
       prop: 'Annex',
       tableName:'invoice'
     },{
@@ -66,6 +66,7 @@
       prop: 'Annex',
       tableName:'waybill'
     }]"
+    annexAliasLabel="其他附件"
     :isBasic="false"
     :allSchemas="SupplierinvoiceRecordMain.allSchemas"
     :detailAllSchemas="SupplierinvoiceRecordDetail.allSchemas"

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts

@@ -16,8 +16,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true
   },
   {
-    label: '申请单号',
+    label: '供应商代码',
-    field: 'requestNumber',
+    field: 'supplierCode',
     sort: 'custom',
     table: {
       width: 150
@@ -25,8 +25,16 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true
   },
   {
-    label: '供应商代码',
+    label: '订单号',
-    field: 'supplierCode',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '发票号',//金税票号
+    field: 'goldenTaxInvoiceNumber',
     sort: 'custom',
     table: {
       width: 150
@@ -34,8 +42,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true
   },
   {
-    label: '金额',
+    label: '税额',
-    field: 'amount',
+    field: 'taxAmount',
     sort: 'custom',
     table: {
       width: 150
@@ -45,8 +53,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '税率',
+    label: '价税合计',//税后金额
-    field: 'taxRate',
+    field: 'afterTaxAmount',
     sort: 'custom',
     table: {
       width: 150
@@ -56,8 +64,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '税额',
+    label: '税率',
-    field: 'taxAmount',
+    field: 'taxRate',
     sort: 'custom',
     table: {
       width: 150
@@ -67,19 +75,37 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '税后金额',
+    label: '价差',//总差额
-    field: 'afterTaxAmount',
+    field: 'totalDifference',
-    sort: 'custom',
     table: {
       width: 150
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6,
     }
   },
   {
-    label: '索赔金额',
+    label: '申请单号',
-    field: 'claimAmount',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true
+  },
+  
+  {
+    label: '金额',
+    field: 'amount',
     sort: 'custom',
     table: {
       width: 150
@@ -88,9 +114,12 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
     }
   },
+  
+  
+  
   {
-    label: '折扣金额',
+    label: '索赔金额',
-    field: 'discountAmount',
+    field: 'claimAmount',
     sort: 'custom',
     table: {
       width: 150
@@ -100,8 +129,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '调整税额',
+    label: '折扣金额',
-    field: 'adjustingTaxAmount',
+    field: 'discountAmount',
     sort: 'custom',
     table: {
       width: 150
@@ -111,24 +140,17 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '总差额',
+    label: '调整税额',
-    field: 'totalDifference',
+    field: 'adjustingTaxAmount',
+    sort: 'custom',
     table: {
       width: 150
     },
     form: {
       component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 6,
-      }
-    },
-    tableForm: {
-      type: 'InputNumber',
-      min: 0,
-      precision: 6,
     }
   },
+  
   {
     label: '未税差额',
     field: 'untaxedDifference',
@@ -167,23 +189,16 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       precision: 6,
     }
   },
-  {
-    label: '金税票号',
-    field: 'goldenTaxInvoiceNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true
-  },
   {
     label: '快递单号',
     field: 'expressTrackingNumber',
     sort: 'custom',
+    isTable:false,
+    isForm:false,
+    isSearch:false,
     table: {
       width: 150
     },
-    isSearch: true
   },
   {
     label: '发票时间',
@@ -472,7 +487,7 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '单价',
+    label: '合同价格',
     field: 'singlePrice',
     sort: 'custom',
     table: {

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

@@ -77,7 +77,7 @@
       prop: 'Annex',
       tableName:'contract'
     },{
-      label: '电子发票附件',
+      label: '发票附件',
       prop: 'Annex',
       tableName:'invoice'
     },{
@@ -85,6 +85,7 @@
       prop: 'Annex',
       tableName:'waybill'
     }]"
+    annexAliasLabel="其他附件"
     :otherHeadButttonData="[{
         label: '打印',
         name: 'printing',

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

@@ -346,6 +346,8 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '快递单号',
     field: 'expressTrackingNumber',
+    isTable:false,
+    isForm:false,
     table: {
       width: 150
     },
@@ -758,7 +760,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '单价',
+    label: '合同价格',
     field: 'singlePrice',
     table: {
       width: 150