fix: 仓租bug调整

src/components/NotifyBox/index.vue

@@ -280,19 +280,24 @@
             stripe
           >
             <el-table-column
-              property="materialOldNumber"
+              type="index"
               align="left"
-              min-width="120"
+              min-width="50"
               label="序号"
-              show-overflow-tooltip
             />
             <el-table-column
               property="orderId"
               align="left"
-              min-width="100"
+              min-width="150"
               label="订单号"
               show-overflow-tooltip
-            />
+            >
+              <template slot-scope="scope">
+                <el-link type="primary" :underline="false" @click="handleToDaily(scope.row.orderId)">{{
+                  scope.row.orderId
+                }}</el-link>
+              </template>
+            </el-table-column>
             <el-table-column
               property="specification"
               align="left"
@@ -303,7 +308,7 @@
             <el-table-column
               property="full"
               align="left"
-              min-width="350"
+              min-width="120"
               label="是否已生成仓租"
               show-overflow-tooltip
             >
@@ -314,14 +319,14 @@
             <el-table-column
               property="fullTime"
               align="left"
-              min-width="200"
+              min-width="150"
               label="货满日期"
               show-overflow-tooltip
             />
-            <el-table-column property="fullNum" align="left" min-width="100" label="计算天数" show-overflow-tooltip />
+            <el-table-column property="fullNum" align="left" min-width="80" label="计算天数" show-overflow-tooltip />
             <el-table-column align="center" label="操作" min-width="80" show-overflow-tooltip fixed="right">
               <template slot-scope="scope">
-                <el-button type="text" class="textColor" @click="handLogistics(scope.row)">查看</el-button>
+                <el-button type="text" class="textColor" @click="handleToDaily(scope.row.orderId)">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -553,8 +558,9 @@ export default {
         pageNum: this.currentPage,
         materialName: '',
         materialNumber: '',
-        materialOldNumber: this.stockOrderNo,
+        materialOldNumber: '',
         specification: '',
+        orderId: this.stockOrderNo,
         endTime: time.length ? time[0] : '',
         startTime: time.length ? time[1] : ''
       }
@@ -668,6 +674,12 @@ export default {
       this.type = 0
       this.$emit('reset')
       this.$store.commit('user/showMessage', 'no')
+    },
+    handleToDaily(orderId) {
+      this.$router.push({ path: `/basic_data/dailyWarehouseRent?orderId=${orderId}` })
+      this.type = 0
+      this.$emit('reset')
+      this.$store.commit('user/showMessage', 'no')
     }
   }
 }

src/views/basic_data/dailyWarehouseRent.vue

@@ -41,7 +41,29 @@ export default {
       recordSelected: [],
 
       detailsId: '',
-      searchData: []
+      searchData: this.$route.query.orderId ? [
+        {
+          param: 'order_no',
+          compare: '=',
+          value: this.$route.query.orderId || ''
+        }
+      ] : this.$route.query.yearTime ? [
+        {
+          param: 'year_time',
+          compare: 'like',
+          value: this.$route.query.yearTime
+        },
+        {
+          param: 'month_time',
+          compare: 'like',
+          value: this.$route.query.monthTime
+        },
+        {
+          param: 'customer_number',
+          compare: 'like',
+          value: this.$route.query.customerNumber
+        }
+      ] : []
     }
   },
   watch: {
@@ -50,22 +72,31 @@ export default {
         if (this.$route.query.yearTime) {
           this.searchData = [
             {
-              param: 'yearTime',
+              param: 'year_time',
               compare: 'like',
               value: val.query.yearTime
             },
             {
-              param: 'monthTime',
+              param: 'month_time',
               compare: 'like',
               value: val.query.monthTime
             },
             {
-              param: 'customerNumber',
+              param: 'customer_number',
               compare: 'like',
               value: val.query.customerNumber
             }
           ]
         }
+        if (this.$route.query.orderId) {
+          this.searchData = [
+            {
+              param: 'order_no',
+              compare: '=',
+              value: this.$route.query.orderId
+            }
+          ]
+        }
       }
     }
   },