Browse Source

托书--经营单位国内外

jbb 2 years ago
parent
commit
5e01180d67
2 changed files with 22 additions and 9 deletions
  1. 9 1
      src/views/book/addBookDrawer.vue
  2. 13 8
      src/views/book/book-list.vue

+ 9 - 1
src/views/book/addBookDrawer.vue

@@ -921,8 +921,16 @@ export default {
       // 触发表单验证
       this.$refs.form.validate(valid => {
         if (valid) {
-          // that.confirmLoading = true
+          var operation = '',
+          country =[]
+          that.arrOption.map(item=>{
+            if(item.value.includes(that.addBook.unitInOperation)){
+                operation=item.label
+            }
+          })
+          country=operation.split('-')
           var newObj = this.addBook
+          newObj.isAhaa = country[1]
           newObj.rmbList = this.rmbList
           newObj.usdList = this.usdList
           newObj.syShippingOrderItemList = this.addBookData

+ 13 - 8
src/views/book/book-list.vue

@@ -131,7 +131,7 @@
 
         <!-- 操作 -->
         <span slot="operationSlot" slot-scope="text, record">
-          <a @click="handleExportXls(record)" style="color:green;">结汇发票打印</a>
+          <a @click="handleExportXls(record)" style="color:green;">{{record.isAhaa}}-结汇发票打印</a>
           <a-divider type="vertical" />
 
           <a-dropdown>
@@ -283,7 +283,7 @@ export default {
           title: '操作',
           dataIndex: 'operation',
           scopedSlots: { customRender: 'operationSlot' },
-          width: 180,
+          width: 220,
           fixed: 'right',
           className: 'replacecolor'
         }
@@ -358,15 +358,20 @@ export default {
     // -----------------------------------
     // 结汇发票打印
     handleExportXls(record) {
-     if(record.readyFabric=='成衣'){
-      var exinvoiceArr = ["报关信息-报关单","报关信息-申报要素","报关信息-发票","报关信息-合同","报关信息-装箱单","报关信息-结汇发票"]
-     }else{
-      var exinvoiceArr = ["报关信息-报关单-面料","报关信息-申报要素","报关信息-发票-面料","报关信息-合同-面料","报关信息-装箱单-面料"]
-     }
+     
+     if(record.isAhaa == '国内'){
+       if(record.readyFabric=='成衣'){
+         var exinvoiceArr = ["报关信息-报关单","报关信息-申报要素","报关信息-发票","报关信息-合同","报关信息-装箱单","报关信息-结汇发票"]
+       }else{
+         var exinvoiceArr = ["报关信息-报关单-面料","报关信息-申报要素","报关信息-发票-面料","报关信息-合同-面料","报关信息-装箱单-面料"]
+       }
+    }else{
+      var exinvoiceArr = ["报关信息-装箱单-国外"]
+    }
        
 
        exinvoiceArr.map(item =>{
-      downFile('/syShippingOrder/syShippingOrder/syShippingOrderPrint',{id:record.id,testName:item}).then(data => {
+      downFile('/syShippingOrder/syShippingOrder/syShippingOrderPrint',{id:record.id,testName:item,isAhaa:record.isAhaa}).then(data => {
         if (!data) {
           this.$message.warning('文件下载失败')
           return