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

src/views/operation/bill/index.vue

@@ -126,57 +126,64 @@
             }}</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>
     <div style="padding-left: 20px;height: 250px">
-        <div style="display: flex;height: 100%;">
-          <div class="left">
-            <div class="title-bold">日志</div>
-            <BasicTable class="ds-mini-table-detail pay-table" @register="registerTable2">
+      <div style="display: flex;height: 100%;">
+        <div class="left">
+          <div class="title-bold">日志</div>
+          <BasicTable class="ds-mini-table-detail pay-table" @register="registerTable2">
 
-            </BasicTable>
-          </div>
-          <div class="middle">
-            <div style="display: flex;width: 100%;">
-              <div style="width: 63%;margin-right: 2%">
-                <div class="title-bold">欠费信息</div>
-                <BasicTable class="ds-mini-table-detail pay-table" @register="registerTable3">
-                </BasicTable>
+          </BasicTable>
+        </div>
+        <div class="middle">
+          <div style="display: flex;width: 100%;">
+            <div style="width: 63%;margin-right: 2%">
+              <div class="title-bold">欠费信息</div>
+              <BasicTable class="ds-mini-table-detail pay-table" @register="registerTable3">
+              </BasicTable>
+            </div>
+            <div style="width: 35%">
+              <div class="title-bold" style="display: flex;line-height: 18.84px;height: 18.84px">
+                <span>附件</span>
+                <DsFile @handleSuccess="fileSuccess" ref="dsFile" :showFileList="false" :id="bookid" :show="false"
+                  height="300">
+                  <i style="margin-left: 15px;color: #257afa;cursor: pointer;" @click="addFile"
+                    class="iconfont icon-fujian"></i>
+                </DsFile>
               </div>
-              <div style="width: 35%">
-                <div class="title-bold" style="display: flex;line-height: 18.84px;height: 18.84px">
-                  <span>附件</span>
-                  <DsFile @handleSuccess="fileSuccess" ref="dsFile" :showFileList="false" :id="bookid" :show="false"
-                    height="300">
-                    <i style="margin-left: 15px;color: #257afa;cursor: pointer;" @click="addFile"
-                      class="iconfont icon-fujian"></i>
-                  </DsFile>
-                </div>
-                <BasicTable class="ds-mini-table-detail pay-table" @register="registerTable5">
-                  <template v-slot:bodyCell="{ column, record }">
-                    <template v-if="column.dataIndex == 'fileName'">
-                      <a @click="download(record)">{{ record.fileName }}</a>
-                    </template>
+              <BasicTable class="ds-mini-table-detail pay-table" @register="registerTable5">
+                <template v-slot:bodyCell="{ column, record }">
+                  <template v-if="column.dataIndex == 'fileName'">
+                    <a @click="download(record)">{{ record.fileName }}</a>
                   </template>
-                </BasicTable>
-              </div>
+                </template>
+              </BasicTable>
             </div>
           </div>
-          <div class="right">
-            <div style="font-size: 12px;color: black;font-weight: bold;margin-bottom: 10px">相关信息</div>
-            <div>
-              客户结费类型为：{{ checkInfo.stlTypeName }} 结算日期：{{ checkInfo.stlDate }}
-            </div>
-            <div>
-              未结算费用：USD{{ checkInfo.noPayAmountUSD }} RMB{{ checkInfo.noPayAmountCNY }} 合计{{
-                checkInfo.noPayAmountTotal }}
-            </div>
-            <div>
-              信用额度：{{ checkInfo.allowAmount }}
-            </div>
+        </div>
+        <div class="right">
+          <div style="font-size: 12px;color: black;font-weight: bold;margin-bottom: 10px">相关信息</div>
+          <div>
+            客户结费类型为：{{ checkInfo.stlTypeName }} 结算日期：{{ checkInfo.stlDate }}
+          </div>
+          <div>
+            未结算费用：USD{{ checkInfo.noPayAmountUSD }} RMB{{ checkInfo.noPayAmountCNY }} 合计{{
+              checkInfo.noPayAmountTotal }}
+          </div>
+          <div>
+            信用额度：{{ checkInfo.allowAmount }}
           </div>
         </div>
+      </div>
     </div>
     <a-modal width="600px" @cancel="checkFlag = false" @ok="sureCheckIn" :visible="checkFlag"
       :title="checkType == 2 ? '签出' : '签入'">
@@ -342,11 +349,13 @@ const [registerTable5, { setTableData: setTableDataFile }] = useTable({
 function exportExcel() {
   const list = [] as any
   getColumns().forEach((item) => {
-    list.push({
-      dataIndex: item.dataIndex,
-      title: item.title,
-      width: item.width,
-    })
+    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,
-      MHBillType:item.masterHBill
+      bookid: item.bookingId,
+      MHBillType: item.masterHBill
     })
   })
   idList.value = ids
@@ -637,11 +646,7 @@ function cancelCheckIn(type) {
   padding-bottom: 10px;
 }
 
-.main {
-
-
- 
-}
+.main {}
 
 .left {
   width: 29%;