Merge remote-tracking branch 'origin/project9-8' into project9-8

src/views/template/enterboundTwo.vue

@@ -43,6 +43,15 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="lot" prop="lot">
+        <el-input
+          v-model="queryParams.lot"
+          placeholder="请输入lot"
+          clearable
+          size="small"
+          style="width: 150px"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button
           :class="commonField.queryClass"
@@ -117,23 +126,33 @@
             {{ scope.row.pn || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="出入情况" prop="ioType" :show-overflow-tooltip="true" min-width="120">
+        <el-table-column label="出入情况" prop="ioType" :show-overflow-tooltip="true" min-width="100">
           <template slot-scope="scope">
             <span v-if="scope.row.ioType === '1'">入</span>
             <span v-else-if="scope.row.ioType === '2'">出</span>
             <span v-else>-</span>
           </template>
         </el-table-column>
-        <el-table-column label="qty" prop="qty" :show-overflow-tooltip="true" min-width="120">
+        <el-table-column label="qty" prop="qty" :show-overflow-tooltip="true" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.qty || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="rank" prop="rank" :show-overflow-tooltip="true" min-width="120">
+        <el-table-column label="rank" prop="rank" :show-overflow-tooltip="true" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.rank || '-' }}
           </template>
         </el-table-column>
+        <el-table-column label="lot" prop="lot" :show-overflow-tooltip="true" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.lot || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="location" prop="location" :show-overflow-tooltip="true" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.location || '-' }}
+          </template>
+        </el-table-column>
         <!--        <el-table-column label="申请人" prop="createBy" :show-overflow-tooltip="true">-->
         <!--          <template slot-scope="scope">-->
         <!--            <span v-if="scope.row.ioType !=='1'">{{ scope.row.createName }}</span>-->
@@ -147,7 +166,7 @@
         <!--            <span v-else>-</span>-->
         <!--          </template>-->
         <!--        </el-table-column>-->
-        <el-table-column label="创建人" prop="updateBy" :show-overflow-tooltip="true" min-width="140">
+        <el-table-column label="创建人" prop="updateBy" :show-overflow-tooltip="true" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.createName || '-' }}
           </template>
@@ -238,7 +257,21 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="cj:" prop="cj">
-              <span>{{  getManufacturerLabel(singleDetails.cj) || '-' }}</span>
+              <span>{{getManufacturerLabel(singleDetails.cj) || '-' }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="lot：" prop="lot">
+              <span>{{ singleDetails.lot || '-' }}</span>
+              <!--              <el-input v-model.trim="singleDetails.ioType" :readonly="true" />-->
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="location：" prop="location">
+              <span>{{ singleDetails.location || '-' }}</span>
+              <!--              <el-input v-model.trim="singleDetails.ioType" :readonly="true" />-->
             </el-form-item>
           </el-col>
         </el-row>

src/views/template/outcomeWmsJbapplyTemp.vue

@@ -660,6 +660,16 @@ export default {
       }
     }
   },
+  /** 路由离开前存储筛选条件*/
+  beforeRouteLeave(to, from, next) {
+    this.$store.dispatch('searchSave/searchParamsSet', {
+      path: this.$route.path,
+      param: {
+        ...this.queryParams
+      }
+    })
+    next()
+  },
   computed: {
     // 判断是否禁用输入框并清空值
     isDisabled() {
@@ -675,6 +685,11 @@ export default {
   },
 
   created() {
+    if (this.$store.getters.searchParams[this.$route.path]) {
+      const { searchParams } = this.$store.getters; const { path } = this.$route
+      const param = JSON.parse(searchParams[path]) // 保留着的查询条件
+      this.queryParams = { ...param }
+    }
     this.manufacturer = manufacturer
     this.getList() // 列表查询
     this.getwareHouse() // 查询数据字典
@@ -785,7 +800,7 @@ export default {
         formData.append('file', this.files)
         importJbapplyExcel(formData).then(res => {
           if (res.code === 200) {
-            this.$message.success('共导入' + res.data.total + '条' + `成功导入` + res.data.rows + `条`)
+            this.$message.success('共' + res.data.total + '条' + `成功导入` + res.data.rows + `条`)
             this.importLoading = false
             this.importControls.open = false
             this.files = []