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

src/components/layouts/RouteView.vue

@@ -60,6 +60,7 @@ export default {
     name: 'RouteView',
     computed: {
         keepAlive () {
+          this.$route.meta.keepAlive = true
             return this.$route.meta.keepAlive
         }
     }

src/views/book/book-list.vue

@@ -241,11 +241,18 @@ export default {
           className: 'replacecolor'
         },
         { title: '外销发票号码', dataIndex: 'exportInvoiceNo', width: 120, className: 'replacecolor', ellipsis: true, },
+        {
+          title: '发票推送状态',
+          dataIndex: 'timeStuta',
+          width: 120,
+          scopedSlots: { customRender: 'timeStuta' },
+          className: 'replacecolor'
+        },
         {
           title: '状态',
           dataIndex: 'theDocumentsState',
           scopedSlots: { customRender: 'documentStateSlot' },
-          width: 95,
+          width: 93,
            ellipsis: true,
            fixed: 'right',
           className: 'replacecolor'
@@ -293,14 +300,7 @@ export default {
           fixed: 'right',
           className: 'replacecolor'
         },
-        {
-          title: '发票推送状态',
-          dataIndex: 'timeStuta',
-          width: 120,
-          scopedSlots: { customRender: 'timeStuta' },
-          fixed: 'right',
-          className: 'replacecolor'
-        },
+       
         {
           title: '操作',
           dataIndex: 'operation',

src/views/cost-allocation-total/modal/detailFabricLossTable.vue

@@ -1085,6 +1085,9 @@ export default {
     },
     handlecLose(){
          this.detailModVis = false
+         this.AssignedPerson='no',
+      this.AssignedPersonQx='no',
+      this.authority='no'
          this.fabricLoss={fabricPoOrderList:[],fabricOMOrderList1:[],fabricOMOrderList2:[],fabricCostAssistList:[],fabricCostClothList:[],fabricCostClothesList:[],fabricCostInvoiceList:[],fabricExpensesList:[],fabricAccidentList:[]}
     },
     closeInformation(data,text){

src/views/packing-list/clothes-list.vue

@@ -537,13 +537,12 @@ export default {
           dataIndex: 'timeStuta',
           width: 120,
           scopedSlots: { customRender: 'timeStuta' },
-          fixed: 'right',
           className: 'replacecolor'
         },
         {
           title: '推送状态',
           dataIndex: 'pushState',
-          width: 90,
+          width: 89,
           fixed: 'right',
           scopedSlots: { customRender: 'pushState' },
           className: 'replacecolor'
@@ -551,7 +550,7 @@ export default {
         {
           title: '云工厂',
           dataIndex: 'whetherCloudFactoryPush ',
-          width: 90,
+          width: 75,
           fixed: 'right',
           scopedSlots: { customRender: 'whetherCloudFactoryPush' },
           className: 'replacecolor'
@@ -560,7 +559,7 @@ export default {
         {
           title: '单据状态',
           dataIndex: 'status',
-          width: 100,
+          width: 89,
           fixed: 'right',
           scopedSlots: { customRender: 'stateSlot' },
           className: 'replacecolor'

src/views/packing-list/fabric-list.vue

@@ -341,21 +341,20 @@ export default {
           dataIndex: 'timeStuta',
           width: 120,
           scopedSlots: { customRender: 'timeStuta' },
-          fixed: 'right',
           className: 'replacecolor'
         },
         {
           title: '推送状态',
           dataIndex: 'pushState',
           scopedSlots: { customRender: 'pushState' },
-          width: 140,
+          width: 89,
           fixed: 'right',
           className: 'replacecolor'
         },
         {
           title: '云工厂',
           dataIndex: 'whetherCloudFactoryPush ',
-          width: 80,
+          width: 75,
           fixed: 'right',
           scopedSlots: { customRender: 'whetherCloudFactoryPush' },
           className: 'replacecolor'
@@ -364,7 +363,7 @@ export default {
           title: '状态',
           dataIndex: 'status',
           scopedSlots: { customRender: 'state' },
-          width: 140,
+          width: 89,
           fixed: 'right',
           className: 'replacecolor'
         },