Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev

src/views/operation/bill/index.vue

@@ -126,6 +126,13 @@
             }}</span>
             <span v-else class="ds-purple-tag">{{ record.statusText }}</span>
           </template>
+          <template v-if="column.dataIndex == 'etd'">
+            <span>{{ record.etd ? record.etd.substring(0, 11) : '' }}</span>
+          </template>
+          <template v-if="column.dataIndex == 'stlDate'">
+            <span>{{ record.stlDate ? record.stlDate.substring(0, 11) : '' }}</span>
+          </template>
+
         </template>
       </BasicTable>
     </div>
@@ -342,11 +349,13 @@ const [registerTable5, { setTableData: setTableDataFile }] = useTable({
 function exportExcel() {
   const list = [] as any
   getColumns().forEach((item) => {
+    if (item.dataIndex) {
       list.push({
         dataIndex: item.dataIndex,
         title: item.title,
         width: item.width,
       })
+    }
   })
   const postData = {
     url: 'http://118.190.144.189:3008/opApi/BLIssueManage/GetExportList',
@@ -543,10 +552,10 @@ function checkIn(type) {
 const idList = ref([])
 function checkClick() {
   let ids = [] as any
-  getSelectRows().forEach(item=>{
+  getSelectRows().forEach(item => {
     ids.push({
-      bookid:item.bookingId,
+      bookid: item.bookingId,
-      MHBillType:item.masterHBill
+      MHBillType: item.masterHBill
     })
   })
   idList.value = ids
@@ -637,11 +646,7 @@ function cancelCheckIn(type) {
   padding-bottom: 10px;
 }
 
-.main {
+.main {}
-
-
- 
-}
 
 .left {
   width: 29%;