Merge branch 'dev' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into dev

src/api/ecw/box.js

@@ -389,6 +389,18 @@ export function downloadLadingCopy(params) {
   });
 }
 
+// 下载提单copy
+export function cdAwbFile(params) {
+  return request({
+    url: "/ecw/box-preload-goods/cdAwbFile",
+    method: "get",
+    timeout: 3*60*1000,
+    params,
+  });
+}
+
+
+
 // 更新异常订单状态
 export function updateAbnormalOrder(data) {
   return request({

src/views/ecw/box/queryAir.vue

@@ -384,6 +384,13 @@ export default {
           hasPermi: "shipment:air:download:downloadAgentListFiles"
         },
         { title: "soncap", serviceName: "downloadSoncapFiles", type: "url", hasPermi: "shipment:air:download:downloadSoncapFiles" },
+        {
+          title: this.$t("AWB文件"),
+          serviceName: "cdAwbFile",
+          type: "url",
+          hasPermi: "shipment:air:download:cdAwbFile"
+        },
+
         {
           title: this.$t("提单Copy"),
           serviceName: "downloadLadingCopy",

src/views/ecw/box/shippingAir/nodePage/clrDocument.vue

 <template>
   <div>
     <el-form ref="cDocForm" :model="cDocObj" label-width="100px">
+<!--       
       <el-form-item :label="$t('出单方式')">
         {{method.find(item=>item.value == cDocObj.cdOutBillType).label}}
       </el-form-item>
@@ -19,7 +20,7 @@
           <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cDocObj.cdSendTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
         </el-form-item>
 
-      </template>
+      </template> -->
 
       <el-form-item label="agent list">
         <el-radio-group v-model="cDocObj.cdAgentlistType">
@@ -33,6 +34,14 @@
         <FileUpload :limit="1" :isShowTip=false v-model="cDocObj.cdAgentlistFile" :fileType="fileType" />
       </el-form-item>
 
+    
+      <el-form-item >
+        <ol style="margin-left:-35px;margin-top:-10px;margin-bottom: -10px;">AWB文件上传</ol>
+        <FileUpload :limit="1" :isShowTip=false v-model="cDocObj.cdAwbFile" :fileType="fileType" ></FileUpload>
+      </el-form-item>
+  
+
+
       <!-- <el-form-item label="soncap">
         <el-radio-group v-model="cDocObj.cdSoncapType">
           <el-radio v-for="item in status" :key="item.value" :label="item.value">{{item.label}}</el-radio>
@@ -64,7 +73,8 @@ import {
   serviceMsg,
 } from "../utils";
 import FileUpload from "@/components/FileUpload";
-
+import { uploadFile } from "@/api/infra/file";
+import {getToken} from "@/utils/auth";
 /**
  * 清关文件
  */
@@ -82,6 +92,17 @@ export default {
       status: constantDict.isFile,
       // 文件类型
       fileType: fileTypes,
+            // 用户导入参数
+      fileList: [],
+      cdAwbFile: null,      
+      upload: {
+        open: false, // 是否显示弹出层
+        title: "", // 弹出层标题
+        isUploading: false, // 是否禁用上传
+        url: process.env.VUE_APP_BASE_API + "/admin-api/infra/file/upload", // 请求地址
+        headers: { Authorization: "Bearer " + getToken() }, // 设置上传的请求头部
+        data: {} // 上传的额外数据，用于文件名
+      },
     };
   },
   created() {
@@ -126,6 +147,20 @@ export default {
     cancel(type) {
       this.$emit("closeDialog", type);
     },
+     /** 文件上传成功处理 */
+     handleFileSuccess(response, file, fileList) {
+      // 清理
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      // 提示成功，并刷新
+      this.$modal.msgSuccess("上传成功");
+      console.log(fileList);
+      console.log(file);
+      
+      this.$set(this.form, 'this.$refs.cdAwbFile', response.data);
+     console.log(cdAwbFile);
+    },
   },
 };
 </script>

src/views/ecw/financial/selfNoReport.vue

@@ -93,6 +93,46 @@
             clearable
           ></dict-selector>
         </el-form-item>
+
+        <el-form-item :label="$t('到港时间')" prop="daogangTime">
+          <el-date-picker
+            v-model="daogangTime"
+            type="datetimerange"
+            range-separator="-"
+            :start-placeholder="$t('开始日期')"
+            :end-placeholder="$t('结束日期')"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            
+          >
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item :label="$t('卸柜/到仓时间')" prop="ulWarehouseTime">
+          <el-date-picker
+            v-model="ulWarehouseTime"
+            type="datetimerange"
+            range-separator="-"
+            :start-placeholder="$t('开始日期')"
+            :end-placeholder="$t('结束日期')"
+            value-format="yyyy-MM-dd HH:mm:ss"
+           
+          >
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item :label="$t('清关时间')" prop="qingguanTime">
+          <el-date-picker
+            v-model="qingguanTime"
+            type="datetimerange"
+            range-separator="-"
+            :start-placeholder="$t('开始日期')"
+            :end-placeholder="$t('结束日期')"
+            value-format="yyyy-MM-dd HH:mm:ss"
+          
+          >
+          </el-date-picker>
+        </el-form-item>
+
         <el-form-item>
           <el-button
             type="primary"
@@ -322,6 +362,9 @@ export default {
     return {
       loading: false, // 是否加载中
       dateFilter: [], // 筛选时间
+      qingguanTime:[],
+      daogangTime:[],
+      ulWarehouseTime:[],
       list: [],
       total: 0,
       queryParams: {
@@ -425,6 +468,11 @@ export default {
         destWarehouseIdList: this.queryParams.destWarehouseIdList.join(","),
       };
       this.addBeginAndEndTime(params, this.dateFilter, "JsDate", false);
+      this.addBeginAndEndTime(params, this.ulWarehouseTime, "UlWarehouseTime", false);
+
+      this.addBeginAndEndTime(params, this.daogangTime, "DaogangTime", false);
+      this.addBeginAndEndTime(params, this.qingguanTime, "QingguanTime", false);
+      
       // 执行查询
       boxSettlementPage(params)
         .then((response) => {
@@ -500,6 +548,12 @@ export default {
         this.exporting = true;
         let params = { ...this.queryParams };
         this.addBeginAndEndTime(params, this.dateFilter, "JsDate", false);
+
+        this.addBeginAndEndTime(params, this.ulWarehouseTime, "UlWarehouseTime", false);
+
+        this.addBeginAndEndTime(params, this.daogangTime, "DaogangTime", false);
+        this.addBeginAndEndTime(params, this.qingguanTime, "QingguanTime", false);
+
         exportSettlementExcel(params)
           .then((res) => {
             //this.$download.excel(res, 'shipment-summary.xls');