Merge remote-tracking branch 'origin/master'

src/views/inout/DialogCreateOrder.vue

@@ -385,6 +385,7 @@ export default {
       let query = {
         code: this.orderFormData.invCode,
         spUse: 2,
+        enable: true
       };
       getLocalJoinByUser(query)
         .then((response) => {

src/views/inout/IoCheckErrorOrder.vue

@@ -340,7 +340,7 @@
           <el-form-item class="query-form-item" label="物资名称:">
             <el-input
               v-model="resultQuery.code"
-              placeholder="请输入UDI码"
+              placeholder="请输入物资名称"
               clearable
             >
             </el-input>

src/views/inout/IoSupSearchOrder.vue

@@ -300,7 +300,7 @@
           <el-form-item class="query-form-item" label="物资名称:">
             <el-input
               v-model="resultQuery.code"
-              placeholder="请输入UDI码"
+              placeholder="请输入物资名称"
               clearable
             >
             </el-input>