xiaodai2022 2 anni fa
parent
commit
3ef422e621

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/0.js


+ 1 - 1
src/views/reportQuery/purchaseReport/components/columns.js

@@ -295,7 +295,7 @@ const table6 = [
   },
   {
     prop: "addtime",
-    label: "竞价时间",
+    label: "创建时间",
     minWidth: "155px",
   },
   {

+ 105 - 110
src/views/reportQuery/purchaseReport/components/table6.vue

@@ -1,112 +1,109 @@
 <template>
-    <div>
-      <ex-table
-        v-loading="loading"
-        :table="table"
-        :data="tableData"
-        :columns="table6"
-        :page="pageInfo"
-        :size="size"
-        @page-curr-change="handlePageChange"
-        @page-size-change="handleSizeChange"
-        @screen-reset="
-          pageInfo.curr = 1;
-          parmValue.page = 1;
-          searchList();
-        "
-        @screen-submit="
-          pageInfo.curr = 1;
-          parmValue.page = 1;
-          searchList();
-        "
-        @selection="selection_change"
-      >
-        <template #table-header="{}">
-          <div style="width: 100%">
-            <el-row style="padding: 0 0 0 80px">
-             
-               <el-col :span="6" style="width: 363px;">
-                <periodDatePickerActive
-                      :start="parmValue.start_date"
-                      :end="parmValue.end_date"
-                      :placeholder="'竞价'"
-                      :width="'165px'"
-                      :size="searchSize"
-                      @timeReturned="time"
-                    />
-              </el-col>  
-              <el-col :span="4" style="width: 66px; float: right">       
-                <el-button type="primary" style="margin-left:30px;" @click="download" :size="searchSize"  class="fr">
-                    导出
-                </el-button>
-              </el-col>
-              <el-col :span="3" style="width: 66px; float: right">
-                <el-button
-                  :size="searchSize"
-                  type="primary"
-                  style="float: right; margin-left: 5px"
-                  @click="searchList"
-                >
-                  刷新
-                </el-button>
-              </el-col>
-              
-            </el-row>
-           <el-row style="padding: 10px 0 0 0">
-              <el-col :span="6" style="width: 240px">
-                <el-input
-                  clearable
-                  placeholder="客户名称"
-                  v-model="parmValue.companyName"
-                  maxlength="40"
-                  :size="searchSize"
-                  @blur="
-                    pageInfo.curr = 1;
-                    parmValue.page = 1;
-                    searchList();
-                  "
-                >
-                </el-input>
-              </el-col>
-              
-              <el-col :span="4" style="width: 66px; float: right">
-                <el-button
-                  type="warning"
-                  class="fr"
-                  :size="searchSize"
-                  @click="restSearch"
-                >
-                  重置
-                </el-button>
-              </el-col>     
-            </el-row>
-          </div>
-       </template>
+  <div>
+    <ex-table
+      v-loading="loading"
+      :table="table"
+      :data="tableData"
+      :columns="table6"
+      :page="pageInfo"
+      :size="size"
+      @page-curr-change="handlePageChange"
+      @page-size-change="handleSizeChange"
+      @screen-reset="
+        pageInfo.curr = 1;
+        parmValue.page = 1;
+        searchList();
+      "
+      @screen-submit="
+        pageInfo.curr = 1;
+        parmValue.page = 1;
+        searchList();
+      "
+      @selection="selection_change"
+    >
+      <template #table-header="{}">
+        <div style="width: 100%">
+          <el-row style="padding: 0 0 0 80px">
+            <el-col :span="6" style="width: 430px">
+              <div class="fl" style="line-height: 28px; padding: 0 12px 0 0">
+                竞价单创建:
+              </div>
+              <periodDatePickerActive
+                :start="parmValue.start_date"
+                :end="parmValue.end_date"
+                :placeholder="''"
+                :width="'135px'"
+                :size="searchSize"
+                @timeReturned="time"
+              />
+            </el-col>
+            <el-col :span="4" style="width: 66px; float: right">
+              <el-button
+                type="primary"
+                style="margin-left: 30px"
+                @click="download"
+                :size="searchSize"
+                class="fr"
+              >
+                导出
+              </el-button>
+            </el-col>
+            <el-col :span="3" style="width: 66px; float: right">
+              <el-button
+                :size="searchSize"
+                type="primary"
+                style="float: right; margin-left: 5px"
+                @click="searchList"
+              >
+                刷新
+              </el-button>
+            </el-col>
+          </el-row>
+          <el-row style="padding: 10px 0 0 0">
+            <el-col :span="6" style="width: 240px">
+              <el-input
+                clearable
+                placeholder="客户名称"
+                v-model="parmValue.companyName"
+                maxlength="40"
+                :size="searchSize"
+                @blur="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+              >
+              </el-input>
+            </el-col>
 
-        
-      </ex-table>
-    </div>
-
-  
+            <el-col :span="4" style="width: 66px; float: right">
+              <el-button type="warning" class="fr" :size="searchSize" @click="restSearch">
+                重置
+              </el-button>
+            </el-col>
+          </el-row>
+        </div>
+      </template>
+    </ex-table>
+  </div>
 </template>
-   <script>
+<script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import urlConfig from "@/apis/url-config";
 import asyncRequest from "@/apis/service/reportQuery/purchaseReport";
 import periodDatePickerActive from "../period-date-picker/main.vue";
-import { table6} from "./columns";
+import { table6 } from "./columns";
 import { mapGetters } from "vuex";
 
 export default {
   name: "purchaseOrder",
   mixins: [mixinPage, resToken],
   components: {
-    periodDatePickerActive
+    periodDatePickerActive,
   },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
-    
   },
   data() {
     return {
@@ -118,13 +115,12 @@ export default {
       loading: false,
       //请求参数集合
       parmValue: {
-        companyName:"", //客户名称
+        companyName: "", //客户名称
         start_date: "", //起始时间
         end_date: "", // 结束时间
         // is_export:0,//是否导出0/1
         page: 1, // 页码
         size: 15, // 每页显示条数
-       
       },
       // 表格 - 数据集合
       tableData: [],
@@ -161,7 +157,7 @@ export default {
       }
       // return;
       this.loading = true;
-      
+
       const res = await asyncRequest.reportconsultinfobidssumnot(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
@@ -169,17 +165,17 @@ export default {
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
       } else {
-        this.$message.warning(res.message)
+        this.$message.warning(res.message);
         this.tableData = [];
         this.pageInfo.total = 0;
       }
       this.loading = false;
     },
-   
+
     //重置
     restSearch() {
       this.parmValue = {
-        companyName:"", //客户名称
+        companyName: "", //客户名称
         start_date: "", //新建起始时间
         end_date: "", // 新建结束时间
         page: 1, // 页码
@@ -194,7 +190,7 @@ export default {
       };
       this.searchList();
     },
-    
+
     // 时间函数
     async time(e) {
       this.parmValue.start_date = e.startTime || "";
@@ -211,13 +207,13 @@ export default {
       await this.searchList();
     },
 
-     //选中触发函数
+    //选中触发函数
     selection_change(e) {
       const { list } = e;
       //选中的数组集合
       this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : [];
     },
-    //导出文件 
+    //导出文件
     async download() {
       // if(this.changeList.length<=0){
       //   this.$message.warning("请选择有效数据")
@@ -226,16 +222,16 @@ export default {
       let start_date = new Date(this.parmValue.start_date).valueOf();
       let end_date = new Date(this.parmValue.end_date).valueOf();
       let flag = end_date - start_date > 30 * 24 * 60 * 60 * 1000;
-      if(this.parmValue.start_date != "" && this.parmValue.end_date != ""){
-        if(flag){
-          this.$message.warning("导出文件的时间区间不能超过30天")
+      if (this.parmValue.start_date != "" && this.parmValue.end_date != "") {
+        if (flag) {
+          this.$message.warning("导出文件的时间区间不能超过30天");
           return;
         }
-      }else{
-        this.$message.warning("请选择导出文件的时间区间")
+      } else {
+        this.$message.warning("请选择导出文件的时间区间");
         return;
       }
-      let model = JSON.parse(JSON.stringify(this.parmValue))
+      let model = JSON.parse(JSON.stringify(this.parmValue));
       // model.is_export = 1;
       if (!this.loading) {
         this.loading = true;
@@ -259,7 +255,7 @@ export default {
               let url = window.URL.createObjectURL(
                 new Blob([res.data], {
                   // type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8",
-                  type: httpType
+                  type: httpType,
                 })
               );
               let link = document.createElement("a");
@@ -291,9 +287,8 @@ export default {
   },
 };
 </script>
-   <style lang="scss" scoped>
+<style lang="scss" scoped>
 .purchaseOrder {
   // text-align: right;
 }
 </style>
-   

+ 4 - 0
src/views/sellOut/sellOutOrder/sendOutOrder.vue

@@ -7,6 +7,10 @@
     <div v-else>
       <upload-excel :on-success="handleSuccess" :before-upload="beforeUpload" />
     </div>
+    <div>
+      <el-alert title="多物流单号请用逗号','隔开" type="warning" :closable="false">
+      </el-alert>
+    </div>
     <ex-table
       :columns="columns"
       :table="table"

Some files were not shown because too many files changed in this diff