Merge remote-tracking branch 'origin/master'

2 years ago · 880500b80c
parent d92920ecf1 15d9403e3f
commit 880500b80c
2 changed files with 2 additions and 2 deletions
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@ -128,7 +128,7 @@
              "
            >
              <el-select
-                v-model="orderFormData.fromCorp"
+                v-model="orderFormData.fromCorpName"
                filterable
                remote
                clearable
--- a/src/views/inout/PanelCreateOrderBizDetail.vue
+++ b/src/views/inout/PanelCreateOrderBizDetail.vue
@ -364,7 +364,7 @@ export default {
        return;
      }

-      if (this.$isBlank(this.idQuery.fromCorp) && this.$isBlank(this.idQuery.fromInvCode)) {
+      if (this.$isBlank(this.idQuery.fromCorpName) && this.$isBlank(this.idQuery.fromInvCode)) {
        this.$message.error("往来信息不能为空！");
        return;
      }