Merge remote-tracking branch 'origin/master_merge' into master_merge

lms/nladmin-ui/src/views/wms/pdm/bi/index.vue

@@ -143,6 +143,22 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <el-form-item label="是否入过库">
+            <el-select
+              v-model="query.type"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in typeList"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <!--          <el-form-item label="满轴位状态">
             <el-select
               v-model="query.full_point_status"
@@ -645,7 +661,10 @@ export default {
         { 'label': '是', 'value': '1' },
         { 'label': '否', 'value': '0' }
       ],
-
+      typeList: [
+        { 'label': '是', 'value': '1' },
+        { 'label': '否', 'value': '0' }
+      ],
       rules: {
         customer_description: [
           { required: true, message: '客户名称不能为空', trigger: 'blur' }