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

src/views/inout/DialogCreateOrder.vue

@@ -196,7 +196,7 @@
             <el-form-item
               prop="fromCorp"
               label="往来信息:"
-              v-if="curAction.corpType == 1 && curAction.genUnit"
+              v-if="curAction.corpType == 1 && curAction.genUnit && orderQuery.billNo ==''"
             >
               <el-input
                 v-model="orderFormData.fromCorp"
@@ -207,6 +207,20 @@
                 placeholder="请输入病人住院号"
               ></el-input>
             </el-form-item>
+            <el-form-item
+              prop="fromCorp"
+              label="往来信息:"
+              v-if="curAction.corpType == 1 && curAction.genUnit && orderQuery.billNo != ''"
+            >
+              <el-input
+                v-model="orderFormData.fromCorpName"
+                auto-complete="off"
+                clearable
+                style="width: 90%"
+                :disabled="corpOrderIdDisabled"
+                placeholder="请输入病人住院号"
+              ></el-input>
+            </el-form-item>
           </el-col>
           <el-col :span="11">
             <el-form-item prop="remark" label="备注:">