Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-web

src/views/book/book-list.vue

@@ -17,7 +17,7 @@
                   <a-input placeholder="请输入托书号" v-model="queryParam.shippingOrderNumber"></a-input>
                 </a-form-item>
               </a-col>
-            
+
             <a-col :md="5" :sm="8">
               <a-form-item label="客户简称">
                 <!-- <a-input placeholder="请输入客户简称" v-model="queryParam.clientAbbreviation"></a-input> -->
@@ -114,7 +114,7 @@
                   </a-select>
                 </a-form-model-item>
               </a-col>
-               
+
             </template>
             <a-col :md="4" :sm="8">
               <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -180,7 +180,7 @@
           <a-tag color="B7B7B7" v-if="record.timeStuta == '4'">不可推送</a-tag>
           <a-tag color="blue" v-if="record.timeStuta == '5'">推送中</a-tag>
         </span>
-        
+
         <!-- if  已提交 -->
         <!-- <span slot="documentStateSlot">
           <a-tag color="#2db7f5">已提交</a-tag>
@@ -293,6 +293,25 @@ export default {
         //   className: 'replacecolor'
         // },
         { title: '外销发票号码', dataIndex: 'exportInvoiceNo', width: 120, className: 'replacecolor', ellipsis: true, },
+        {
+          title: '推送SRM信息',
+          dataIndex: 'pushSrmState',
+          ellipsis:true,
+          width: 120,
+          customRender: (text, record, index) => {
+            if (text == "0"){
+              return "待推送";
+            }
+            if (text == "1"){
+              return "推送成功";
+            }
+            if (text == "2"){
+              return record.pushSrmMessage;
+            }
+            return "未设置推送";
+
+          }
+        },
         {
           title: '发票推送状态',
           dataIndex: 'timeStuta',
@@ -352,7 +371,8 @@ export default {
           fixed: 'right',
           className: 'replacecolor'
         },
-       
+
+
         {
           title: '操作',
           dataIndex: 'operation',
@@ -462,7 +482,7 @@ export default {
     // -----------------------------------
     // 结汇发票打印
     handleExportXls(record) {
-     
+
      if(record.isAhaa == '国内'){
        if(record.readyFabric=='成衣'){
          var exinvoiceArr = ["-报关资料","-结汇资料"]
@@ -472,7 +492,7 @@ export default {
     }else{//
       var exinvoiceArr = ["国外-报关信息-托书","-结汇资料"]
     }
-       
+
        exinvoiceArr.map(item =>{
       downFile('/syShippingOrder/syShippingOrder/syShippingOrderPrint',{id:record.id,testName:item,isAhaa:record.isAhaa}).then(data => {
         if (!data) {
@@ -568,11 +588,11 @@ export default {
             this.$message.warning(res.message);
           }
         }).finally(() => {
-            this.loadingU8 = false          
+            this.loadingU8 = false
         });
       }
     },
-    //批量推送装箱单发票 
+    //批量推送装箱单发票
     batchPushInvoice(){
       if(this.selectedRowKeys.length==0){
         this.$message.success('请勾选数据')
@@ -658,7 +678,7 @@ export default {
                 this.$refs.detailsBookDrawer.disabled = false
               }
             }
-             
+
             this.$refs.addBookDrawer.query = '1'
           }else {
              this.$message.error(res.message);
@@ -718,7 +738,7 @@ export default {
     onSelectChange(keys) {
       this.selectedRowKeys = keys
     }
-    
+
   },
   computed: {},
   mounted() {}