version:1.0.0

jinhui.wang
Commit 241be316b27d696dec2c72514579a7112d2fc5f3 241be316 1 parent 98269bd1
Showing 4 changed files with 46 additions and 30 deletions
src/settings.js
src/utils/request.js
src/views/allocationConfig/cargoAllocation/index.vue
src/views/basicInformation/queryCargo/index.vue
--- a/src/settings.js
View file @241be31
+++ b/src/settings.js
View file @241be31
@@ -42,5 +42,5 @@ module.exports = {
     /**
    * 版本号
    */
-     version:'version：0.5.7.2'
+     version:'version：1.0.0'
 }
--- a/src/utils/request.js
View file @241be31
+++ b/src/utils/request.js
View file @241be31
@@ -55,7 +55,7 @@ service.interceptors.request.use(config => {
 // 响应拦截器
 service.interceptors.response.use(res => {
   if(res.headers['token']){
-    setToken(decodeURI(res.headers['token']))
+    setToken(decodeURIComponent(res.headers['token']))
   }
   // 未设置状态码则默认成功状态
   const code = res.data.code || 200;
--- a/src/views/allocationConfig/cargoAllocation/index.vue
View file @241be31
+++ b/src/views/allocationConfig/cargoAllocation/index.vue
View file @241be31
@@ -142,32 +142,35 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重量区间">
-            <el-col :span="11"
+              <el-row>
-              ><el-input-number
+                <el-col :span="11"
-                class="formItem"
+                ><el-input-number
-                size="mini"
+                  class="formItem"
-                v-model="formData.minWeight"
+                  size="mini"
-                :controls="false"
+                  v-model="formData.minWeight"
-                :min="0"
+                  :controls="false"
-                :precision="2"
+                  :min="0"
-              ></el-input-number
+                  :precision="2"
-            ></el-col>
+                ></el-input-number
-            <el-col class="line" :span="2">-</el-col>
+              ></el-col>
-            <el-col :span="11"
+              <el-col class="line" :span="2">-</el-col>
-              ><el-input-number
+              <el-col :span="11"
-                class="formItem"
+                ><el-input-number
-                size="mini"
+                  class="formItem"
-                v-model="formData.maxWeight"
+                  size="mini"
-                :controls="false"
+                  v-model="formData.maxWeight"
-                :min="formData.minWeight"
+                  :controls="false"
-                :precision="2"
+                  :min="formData.minWeight"
-              ></el-input-number
+                  :precision="2"
-            ></el-col>
+                ></el-input-number
+              ></el-col>
+            </el-row>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="件数区间">
-            <el-col :span="11"
+            <el-row>
+              <el-col :span="11"
               ><el-input-number
                 class="formItem"
                 size="mini"
@@ -186,6 +189,7 @@
                 :min="formData.minNumber"
               ></el-input-number
             ></el-col>
+            </el-row>
           </el-form-item>
         </el-col>
         <!-- <el-col :span="6">
@@ -270,7 +274,7 @@
           icon="el-icon-search"
           size="mini"
           :loading="loading"
-          @click="select"
+          @click="select(0)"
           >查询</el-button
         >
         <el-button
@@ -314,6 +318,7 @@
       :loading="loading"
       :limitSize="size"
       :limitStart="formData.limitStart"
+      :page="page"
       :shiftKey="shiftKey"
       height="350"
       @tableSelect="tableSelect"
@@ -793,9 +798,10 @@ export default {
     };
   },
   created() {
-    this.seleData()
+    this.seleData();
     this.select();
   },
+
   mounted() {
     window.addEventListener("keydown", (code) => {
       if (code.keyCode === 16 && code.shiftKey) {
@@ -852,9 +858,13 @@ export default {
         .catch(() => {});
     },
     //查询
-    async select() {
+    async select(val) {
       this.loading = true;
       this.dataInfo();
+      if(val === 0){
+        this.page = 1;
+        this.formData.page = 1;
+      }
       findCargoAllocationData(this.formData)
         .then((res) => {
           this.loading = false;
--- a/src/views/basicInformation/queryCargo/index.vue
View file @241be31
+++ b/src/views/basicInformation/queryCargo/index.vue
View file @241be31
@@ -213,7 +213,7 @@
           icon="el-icon-search"
           size="small"
           :loading="tableLoading"
-          @click="select"
+          @click="select(0)"
           >查询</el-button
         >
         <el-button :type="downLoadingTip.downloading?'warning':'primary'" size="small" @click="xlse(0)" :disabled="tableData.length==0" :loading="downLoadingTip.downloading"
@@ -239,6 +239,7 @@
       :loading="tableLoading"
       :limitSize="limitSize"
       :limitStart="limitStart"
+      :page="page"
       :shiftKey="shiftKey"
       height="550"
       @tableSelect="tableSelect"
@@ -709,7 +710,7 @@ export default {
     };
   },
   created() {
-    //查询条件
+    // 查询条件
     findConditionData().then((res) => {
       if (res.code == 200) {
         this.findConditionData = res.data;
@@ -740,12 +741,17 @@ export default {
       this.$refs.cargoForm.resetFields();
     },
     //查询
-    select() {
+    select(val) {
       this.tableData = [];
       this.allWeight = 0;
       this.allQty = 0;
       this.tableLoading = true;
       this.dataInfo();
+      if(val === 0){
+        this.formData.limitStart = 1;
+        this.limitStart = 1;
+        this.page = 1;
+      }
       findCargoData(this.formData).then((res) => {
           if (res.code == 200) {
             this.tableData = res.data.list;