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

src/views/template/enterboundTwo.vue

@@ -487,7 +487,7 @@ export default {
       ],
       // 查询参数
       queryParams: {
-        cj: '1',
+        cj: null,
         page: 1,
         rows: 10,
         pn: null,
@@ -500,7 +500,7 @@ export default {
       },
       // 表单参数
       form: {
-        cj: '',
+        cj: null,
         whId: '',
         pn: null,
         qty: null,

src/views/template/incomeWmsBox.vue

@@ -52,6 +52,16 @@
           style="width: 150px"
         />
       </el-form-item>
+      <el-form-item label="location" prop="location">
+        <el-input
+          v-model="queryParams.location"
+          placeholder="请输入location"
+          clearable
+          :maxlength="100"
+          size="small"
+          style="width: 150px"
+        />
+      </el-form-item>
       <el-form-item label="pn" prop="pn">
         <el-input
           v-model="queryParams.pn"
@@ -130,6 +140,13 @@
             {{ scope.row.lot || '-' }}
           </template>
         </el-table-column>
+
+        <el-table-column label="location" prop="location" :show-overflow-tooltip="true" width="110">
+          <template slot-scope="scope">
+            {{ scope.row.location || '-' }}
+          </template>
+        </el-table-column>
+
         <el-table-column label="pn" prop="pn" :show-overflow-tooltip="true" width="110">
           <template slot-scope="scope">
             {{ scope.row.pn || '-' }}
@@ -290,6 +307,7 @@ export default {
         rank: undefined,
         orderCode: undefined,
         labelId: undefined,
+        location: undefined,
         flag: ''
       },
       // 表单参数
@@ -356,6 +374,7 @@ export default {
         rank: undefined,
         orderCode: undefined,
         labelId: undefined,
+        location: undefined,
         flag: '1'
       }
       this.resetForm('form')