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

src/views/inout/DialogcChangeNewOrder.vue

@@ -311,7 +311,8 @@ export default {
         action: this.formData.action,
         fromInvCode: this.formData.fromInvCode,
         invCode: this.formData.invCode,
-        products: products
+        products: products,
+        remark: this.formData.remark
       };
       stockOrderChange(tQuery)
         .then((response) => {