Merge branch 'master' of http://139.196.39.194:9021/yuansh/global-web

src/views/baseCode/ProjectArchive/BaseProjectArchiveList.vue

@@ -6,7 +6,7 @@
       <template #tableTitle>
           <a-button type="primary" v-auth="'baseCode:base_project_archive:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增(add)</a-button>
           <a-button  type="primary" v-auth="'baseCode:base_project_archive:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出(export)</a-button>
-          <a-button  type="primary"  @click="handleDeactivate"> 停用(Deactivate)</a-button>
+          <a-button  type="primary" v-auth="'baseCode:base_project_archive:submitClose'"  @click="handleDeactivate"> 停用(Deactivate)</a-button>
           <a-dropdown v-if="selectedRowKeys.length > 0">
               <template #overlay>
                 <a-menu>
@@ -210,4 +210,4 @@
   :deep(.ant-picker),:deep(.ant-input-number){
     width: 100%;
   }
-</style>
+</style>

src/views/saleCode/deliveryNotice/components/deliveryNoticeForm.vue

@@ -125,7 +125,7 @@
             </a-col>
             <a-col :span="12">
               <a-form-item
-                label="是否希望出口(isExport)"
+                label="是否出口(isExport)"
                 v-bind="validateInfos.isExport"
                 id="quotationFormForm-isExport"
                 name="isExport"

src/views/saleCode/quotation/quotation.vue

@@ -46,6 +46,13 @@
                 <JDictSelectTag v-model:value="queryParam.priority" placeholder="请选择" dictCode="priority" />
               </a-form-item>
             </a-col>
+            
+            <a-col :lg="16">
+              <a-form-item name="quotationCustomer" :label-col="{ style: 'width: 200px' }">
+                <template #label><span title="客户简称(abbreviation)">客户简称(abbreviation)</span></template>
+                <JSelect   v-model:value="queryParam.quotationCustomer" :get-option-url="CustomerOption" :showField="showField2" :param="{status:1}"></JSelect>
+              </a-form-item>
+            </a-col>
             <a-col :lg="8">
               <a-form-item name="productionClass" :label-col="{ style: 'width: 200px' }">
                 <template #label><span title="产品分类(production class)">产品分类(production class)</span></template>
@@ -180,6 +187,7 @@
     batchDelete,
     getImportUrl,
     getExportUrl,
+    getExportUrl2,
     batchSubmit,
     cancelBatchSubmit,
     ProjectOption,
@@ -199,6 +207,7 @@
   //注册model
   const [registerModal, { openModal }] = useModal();
   var showField = ref('currency_dictText+name');
+  var showField2 = ref('currency_dictText+abbreviation');
   var ViewHistoryVersionModalRef = ref();
   var SetToExamineRef = ref();
   //注册table数据
@@ -390,7 +399,7 @@
     var obj ={
       id:record.id
     }
-    handleExportXlsx(record.billCode, getExportUrl,obj)
+    handleExportXlsx(record.billCode, getExportUrl2,obj)
   }
 
   /* ----------------------以下为原生查询需要添加的-------------------------- */

src/views/saleCode/quotation/quotationForm.api.ts

@@ -12,7 +12,8 @@ enum Api {
   deleteOne = '/saleCode/saleQuotation/delete',
   deleteBatch = '/saleCode/saleQuotation/deleteBatch',
   importExcel = '/saleCode/saleQuotation/importExcel',
-  exportXls = '/saleCode/saleQuotation/exportXls',
+  exportXls2 = '/saleCode/saleQuotation/exportXls',
+  exportXls = '/saleCode/saleQuotation/exportXls11111',
   queryDataById = '/saleCode/saleQuotation/queryById',
   queryVersonHistoryById='/saleCode/saleQuotationHis/queryById',
   saleQuotationFormShipList = '/saleCode/saleQuotation/querySaleQuotationShipByMainId',
@@ -33,6 +34,7 @@ enum Api {
  * @param params
  */
 export const getExportUrl = Api.exportXls;
+export const getExportUrl2 = Api.exportXls2;
 
 /**
  * 导入api
@@ -160,4 +162,4 @@ export const CustomerOption = (params) => defHttp.get({ url: Api.customerList, p
 //获取项目下拉框列表
 export const ProjectOption = (params) => defHttp.get({ url: Api.projectList, params });
 export const queryRate = (params) => defHttp.get({url: Api.getRate, params});
-export const LinkOption = (params) => defHttp.get({ url: Api.linkOption, params });
+export const LinkOption = (params) => defHttp.get({ url: Api.linkOption, params });

src/views/saleCode/quotation/quotationForm.data.ts

@@ -8,11 +8,13 @@ export const columns: BasicColumn[] = [
    {
     title: '报价单号(bill code)',
     align:"center",
+     width:150,
     dataIndex: 'billCode'
    },   
    {
     title: '单据日期(bill date)',
     align:"center",
+     width:150,
     dataIndex: 'billDate',
     customRender:({text}) =>{
       text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
@@ -23,7 +25,7 @@ export const columns: BasicColumn[] = [
    {
     title: '报价项目(quotation project)',
     align:"center",
-    width:250,
+    width:200,
     dataIndex: 'quotationProjectName'
    },
    {
@@ -31,12 +33,18 @@ export const columns: BasicColumn[] = [
     align:"center",
     width:250,
     dataIndex: 'quotationCustomerName'
+   }, {
+    title: '客户简称(abbreviation)',
+    align:"center",
+    dataIndex: 'quotationCustomer_dictText',
+     width:180,
+    // ellipsis: false,
    },
    {
     title: '报价有效期(quotation period)',
     align:"center",
     dataIndex: 'time',
-    width:250,
+    width:220,
     customRender:({text,record}) =>{
       if(record.quotationPeriodBegin&&record.quotationPeriodEnd){
         text = record.quotationPeriodBegin+'~'+record.quotationPeriodEnd
@@ -53,22 +61,25 @@ export const columns: BasicColumn[] = [
    {
     title: '优先级(priority)',
     align:"center",
+     width:150,
     dataIndex: 'priority_dictText'
    },
    {
     title: '产品分类(production class)',
     align:"center",
     dataIndex: 'productionClass_dictText',
-    width:250,
+    width:200,
    },
    {
     title: '机型(model)',
     align:"center",
+     width:130,
     dataIndex: 'model'
    },
    {
     title: '厂家(maker)',
     align:"center",
+     width:180,
     dataIndex: 'maker'
    },
    {
@@ -81,16 +92,18 @@ export const columns: BasicColumn[] = [
     title: 'imo(imo)',
     align:"center",
     dataIndex: 'imo',
-    width:200,
+    width:100,
    },
    {
     title: '来源(sourceCode)',
     align:"center",
+     width:150,
     dataIndex: 'sourceCode'
    },
    {
     title: '状态(status)',
     align:"center",
+     width:120,
     dataIndex: 'status',
     customRender:function (t, r, index) {
       if(t.text==1){
@@ -103,6 +116,7 @@ export const columns: BasicColumn[] = [
    {
     title: '版本号(version)',
     align:"center",
+     width:120,
     dataIndex: 'version'
    },
 ];

src/views/saleCode/saleInquiryForm/SaleInquiryForm.data.ts

@@ -29,6 +29,12 @@ export const columns: BasicColumn[] = [
    {
     title: '询价客户(inquiry customer)',
     align:"center",
+    dataIndex: 'customerName',
+    // ellipsis: false,
+   },
+   {
+    title: '客户简称(abbreviation)',
+    align:"center",
     dataIndex: 'inquiryCustomer_dictText',
     // ellipsis: false,
    },

src/views/saleCode/saleInquiryForm/SaleInquiryFormList.vue

@@ -45,6 +45,13 @@
                 <JInput placeholder="请输入船(shipName)" v-model:value="queryParam.shipName" allow-clear ></JInput>
               </a-form-item>
             </a-col>
+            
+            <a-col :lg="16">
+              <a-form-item name="inquiryCustomer" >
+                <template #label><span title="客户简称(abbreviation)">客户简称(abbreviation)</span></template>
+                <JSelect   v-model:value="queryParam.inquiryCustomer" :get-option-url="CustomerOption" :showField="showField2" :param="{status:1}"></JSelect>
+              </a-form-item>
+            </a-col>
             <a-col :lg="8">
               <a-form-item name="imo" >
                 <template #label><span title="船IMO(imo)">船IMO(imo)</span></template>
@@ -241,6 +248,7 @@
   //注册model
   const [registerModal, { openModal }] = useModal();
   var showField = ref('currency_dictText+name');
+  var showField2 = ref('currency_dictText+abbreviation');
   var classOption = ref([]);
   var SetOtherStatusRef = ref();
   var SelecSaleInquiryModalRef = ref();

src/views/saleCode/salesInvoice/components/SelectCommissionOrderModal.vue

@@ -169,6 +169,12 @@
     //   key: 'chineseName',
     //   align: 'center',
     // },
+    {
+      title: '产品币种(currency)',
+      dataIndex: 'currency',
+      key: 'currency',
+      align: 'center',
+    },
     {
       title: '佣金(commission)',
       dataIndex: 'commission',
@@ -295,8 +301,39 @@
     if (selectedRowKeys.value.length == 0) {
       message.error('请勾选数据');
     } else {
-      emit('addCommission', selectedRows.value);
-      handleCancel();
+      var st = true;
+      var bz = true;
+      var supplier = "";
+      var currency = "";
+      selectedRows.value.map((item) => {
+        if(supplier == ""){
+          supplier = item.supplier;
+        }else{
+          
+          if(supplier != item.supplier){
+           
+            st = false;
+          }
+        }
+        if(currency == "" || currency == null){
+          currency = item.currency;
+        }else{
+          
+          if(currency != item.currency){
+           
+            bz = false;
+          }
+        }
+       
+      })
+      console.log(bz);
+      if(st&&bz){
+        emit('addCommission', selectedRows.value);
+        handleCancel();
+      }else{
+         message.error('请勾选供应商一致且币种一致的数据！！');
+      }
+      
     }
   }
   function handleCancel() {

src/views/saleCode/salesInvoice/components/saleInvoiceForm.vue

@@ -45,13 +45,23 @@
                 <JDictSelectTag
                   v-model:value="formData.busynessType"
                   placeholder="请选择"
-                  dictCode="	busyness_type"
+                  dictCode="busyness_type"
                   style="width: 100%"
                   :disabled="notAllowEdit"
                 />
               </a-form-item>
             </a-col>
             <a-col :span="12">
+              <a-form-item
+                label="购方(buyer)"
+                v-bind="validateInfos.customerName"
+                id="saleInvoiceForm-customerName"
+                name="invoiceHeader"
+              >
+                <a-input v-model:value="formData.customerName" placeholder="请输入" allow-clear disabled />
+              </a-form-item>
+            </a-col>
+            <!-- <a-col :span="12">
               <a-form-item
                 label="购方(buyer)"
                 v-bind="validateInfos.customer"
@@ -72,7 +82,7 @@
                   disabled
                 />
               </a-form-item>
-            </a-col>
+            </a-col> -->
             <a-col :span="12">
               <a-form-item
                 label="购方税号(buyer's tax number)"
@@ -573,39 +583,66 @@
       }
       async function addCommission(data) {
         
-        var arrCommissionSon = await queryCommissionDataById(data[0].id);
-        arrCommissionSon.map((item) => {
-          item.sourceId = item.id;
-          item.quantity = 1;
-          item.taxPrice = item.commission && item.commission !== '' ? item.commission : 0;
-          item.taxMoney = item.commission && item.commission !== '' ? item.commission : 0;
-          //暂无税率字段，设置默认为0
-          item.taxRate = item.taxRate ? item.taxRate : 0;
-          item.taxAmount = ((item.taxMoney * item.taxRate) / 100).toFixed(4);
-          item.sourceType = '佣金业务';
+        // var arrCommissionSon = await queryCommissionDataById(data[0].id);
+        
+        var price = 0;
+        var billCode = "";
+        data.map((item) => {
+          if(billCode == "" || billCode == null){
+            billCode = item.billCode;
+          }else{
+            billCode = billCode+","+item.billCode;
+          }
+          
+          price = price+item.commission;
         });
+        // arrCommissionSon.map((item) => {
+        //   // item.sourceId = item.id;
+        //   // item.quantity = 1;
+        //   // item.taxPrice = item.commission && item.commission !== '' ? item.commission : 0;
+        //   // item.taxMoney = item.commission && item.commission !== '' ? item.commission : 0;
+        //   // //暂无税率字段，设置默认为0
+        //   // item.taxRate = item.taxRate ? item.taxRate : 0;
+        //   // item.taxAmount = ((item.taxMoney * item.taxRate) / 100).toFixed(4);
+        //   // item.sourceType = '佣金业务';
+        //   price = price+item.commission && item.commission !== '' ? item.commission : 0;
+        // });
+        
+        var detailsValue={};
+        detailsValue.productId='1909891194335694849';
+        detailsValue.productCode='PA00003438';
+        detailsValue.chineseName='HANDLING CHARGE';
+        detailsValue.englishName='HANDLING CHARGE';
+        detailsValue.quantity=1;
+        detailsValue.taxPrice = price.toFixed(4);
+        detailsValue.taxMoney = price.toFixed(4);
+        //暂无税率字段，设置默认为0
+        detailsValue.taxRate = 0;
+        detailsValue.taxAmount = 0;
+        detailsValue.sourceType = '佣金业务';
         
         notAllowEdit.value = true;
         var xTable = saleInvoiceDetailsTableRef.value!.getXTable();
-        var arrSonFormCommission = xTable.data.concat(arrCommissionSon);
+        var arrSonFormCommission = xTable.data.concat(detailsValue);
         saleInvoiceDetailsTable.dataSource = arrSonFormCommission;
-       console.log("========================");
-       console.log(data[0]);
-       console.log(data[0].customerId);
+       // console.log("========================");
+       // console.log(data[0]);
+       // console.log(data[0].supplierId);
+       // console.log(data[0].supplierName);
         formData.project = '';//data[0].project;
         formData.projectName = '';//data[0].projectName;
-        formData.customer = data[0].customerId;
-        formData.customerName = data[0].customerName;
-        formData.sourceCode2 = data[0].billCode;
+        formData.customer = data[0].supplierId;
+        formData.customerName = data[0].supplierName;
+        formData.sourceCode2 = billCode;
         formData.invoiceHeader = data[0].invoiceHeader;
         formData.invoiceAddress = data[0].invoiceAddress;
         formData.currency = data[0].currency;
         formData.busynessType = '佣金业务';
-        getCustomerOptions({ pageSize: -1, id: data[0].customerId }).then((res) => {
-          formData.buyerTaxNumber = res.records[0].dutyParagraph;
-          formData.buyerTelphone = res.records[0].phone;
-          formData.buyerAddress = res.records[0].invoiceAddress;
-        });
+        // getCustomerOptions({ pageSize: -1, id: data[0].customerId }).then((res) => {
+        //   formData.buyerTaxNumber = res.records[0].dutyParagraph;
+        //   formData.buyerTelphone = res.records[0].phone;
+        //   formData.buyerAddress = res.records[0].invoiceAddress;
+        // });
       }
       
       async function addSonList(data) {

src/views/saleCode/salesOrder/SaleOrderForm.data.ts

@@ -32,6 +32,12 @@ export const columns: BasicColumn[] = [
     dataIndex: 'customerName',
     width:280,
     // ellipsis: false,
+   }, {
+    title: '客户简称(abbreviation)',
+    align:"center",
+    dataIndex: 'customer_dictText',
+    width:180,
+    // ellipsis: false,
    },
    {
     title: '优先级(priority)',

src/views/saleCode/salesOrder/SaleOrderFormList.vue

@@ -45,6 +45,13 @@
                 <JDictSelectTag v-model:value="queryParam.priority" placeholder="请选择" dictCode="priority" style="width: 100%" />
               </a-form-item>
             </a-col>
+            
+            <a-col :lg="16">
+              <a-form-item name="customer">
+                <template #label><span title="客户简称(abbreviation)">客户简称(abbreviation)</span></template>
+                <JSelect   v-model:value="queryParam.customer" :get-option-url="CustomerOption" :showField="showField2" :param="{status:1}"></JSelect>
+              </a-form-item>
+            </a-col>
             <a-col :lg="8">
               <a-form-item name="productionClass">
                 <template #label><span title="产品分类(production class)">产品分类(production class)</span></template>
@@ -275,6 +282,7 @@
   const { handleExportXlsx, } = useMethods();
   const formRef = ref();
   var showField = ref('currency_dictText+name');
+  var showField2 = ref('currency_dictText+abbreviation');
   const ViewFileListModalRef = ref();
   const SelectSaleOrderModalRef = ref();
   const ViewHistoryVersionModallRef = ref();