Merge remote-tracking branch 'origin/master'

2 years ago · 33dbdc87e4
parent 4765a7ee4f 7caf028ce5
commit 33dbdc87e4
3 changed files with 3 additions and 2 deletions
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/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) => {
--- a/src/views/inout/IoCheckErrorOrder.vue
+++ b/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>
--- a/src/views/inout/IoSupSearchOrder.vue
+++ b/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>