Browse Source

销售发票-增加币种字段

jingbb 2 months ago
parent
commit
2679ca2c3a

+ 6 - 55
src/views/saleCode/salesInvoice/components/SelectDeliveryNoticeModal.vue

@@ -120,7 +120,7 @@
                 size="small"
                 @change="handleTableChange"
                 :pagination="pagination"
-                :scroll="{ x: 3500, y: 400 }"
+                :scroll="{ x: 2500, y: 400 }"
                 :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
             >
             </a-table>
@@ -183,15 +183,15 @@
         },
         {
             title: '产品分类(production class)',
-            dataIndex: 'productClass',
-            key: 'productClass',
+            dataIndex: 'productionClass_dictText',
+            key: 'productionClass_dictText',
             align:"center",
             width:250,
             ellipsis: true,
         },
         {
             title: '机型(model)',
-            dataIndex: 'headModel',
+            dataIndex: 'model',
             key: 'model',
             align:"center"
         },
@@ -205,57 +205,8 @@
         },
         {
             title: '业务员(salesman)',
-            dataIndex: 'salesman',
-            key: 'salesman',
-            align:"center"
-        },
-        {
-            title: '产品编码(product code)',
-            dataIndex: 'productCode',
-            key: 'productCode',
-            align:"center"
-        },
-        {
-            title: '产品英文名(english name)',
-            dataIndex: 'englishName',
-            key: 'englishName',
-            align:"center"
-        },
-        {
-            title: '型号(model)',
-            dataIndex: 'model',
-            key: 'model',
-            align:"center"
-        },
-        {
-            title: '厂家(maker)',
-            dataIndex: 'maker',
-            key: 'maker',
-            align:"center",
-            ellipsis: true,
-        },
-        {
-            title: '质量等级(quality grade)',
-            dataIndex: 'qualityGrade',
-            key: 'qualityGrade',
-            align:"center"
-        },
-        {
-            title: '数量(quantity)',
-            dataIndex: 'quantity',
-            key: 'quantity',
-            align:"center"
-        },
-        {
-            title: '单价(price)',
-            dataIndex: 'taxPrice',
-            key: 'taxPrice',
-            align:"center"
-        },
-        {
-            title: '金额(money)',
-            dataIndex: 'money',
-            key: 'money',
+            dataIndex: 'salesmanName',
+            key: 'salesmanName',
             align:"center"
         },
     ];

+ 9 - 2
src/views/saleCode/salesInvoice/components/saleInvoiceForm.vue

@@ -206,6 +206,11 @@
                 <a-input v-model:value="formData.sellerBankAccount" placeholder="请输入" allow-clear />
               </a-form-item>
             </a-col>
+            <a-col :span="12">
+              <a-form-item label="币种(curreny)" v-bind="validateInfos.curreny" id="saleInvoiceForm-curreny" name="curreny">
+                <JDictSelectTag v-model:value="formData.currency" placeholder="请选择" dictCode="currency" style="width: 100%;" disabled/>
+              </a-form-item>
+            </a-col>
             <a-col :span="12">
               <a-form-item label="F号(F number)" v-bind="validateInfos.fnumber" id="saleInvoiceForm-fnumber" name="fnumber">
                 <a-input v-model:value="formData.fnumber" placeholder="请输入" allow-clear AutoComplete="off" />
@@ -383,6 +388,7 @@
         fnumber: '',
         notes: '',
         busynessType: '',
+        currency:''
       });
 
       //表单验证
@@ -545,7 +551,7 @@
           var num = Number(prop.row.taxPrice) * Number(prop.row.quantity);
           prop.row.taxMoney = num.toFixed(2);
           prop.row.taxRate = prop.row.taxRate ? prop.row.taxRate : 0;
-          prop.row.taxAmount = (Number(prop.row.taxMoney) * Number(prop.row.taxRate)) / 100;
+          prop.row.taxAmount = ((Number(prop.row.taxMoney) * Number(prop.row.taxRate)) / 100).toFixed(4)
         }
       }
       function selectDeliveryList() {
@@ -575,7 +581,7 @@
           item.taxMoney = item.money && item.money !== '' ? item.money : 0;
           //暂无税率字段,设置默认为1
           item.taxRate = item.taxRate ? item.taxRate : 0;
-          item.taxAmount = (item.taxMoney * item.taxRate) / 100;
+          item.taxAmount = ((item.taxMoney * item.taxRate) / 100).toFixed(4)
           item.sourceType='普通业务'
         });
         notAllowEdit.value = true;
@@ -589,6 +595,7 @@
         formData.sourceCode = data[0].billCode;
         formData.invoiceHeader = data[0].invoiceHeader;
         formData.invoiceAddress = data[0].invoiceAddress;
+        formData.currency = data[0].currency;
         formData.busynessType = '普通业务';
         getCustomerOptions({ pageSize: -1, id: data[0].customer }).then((res) => {
           formData.buyerTaxNumber = res.records[0].dutyParagraph;

+ 5 - 0
src/views/saleCode/salesInvoice/salesInvoiceForm.data.ts

@@ -33,6 +33,11 @@ export const columns: BasicColumn[] = [
     width:250,
     dataIndex: 'orderNumber'
    },
+   {
+    title: '币种(currency)',
+    align:"center",
+    dataIndex: 'currency'
+   },
    {
     title: '购方(buyer)',
     align:"center",

+ 1 - 1
src/views/saleCode/salesInvoice/salesInvoiceList.vue

@@ -189,7 +189,7 @@
         fixed: 'right',
       },
       scroll: {
-        x: '3000px',
+        x: '3500px',
         y:'calc(100vh - 400px)',
 
       },