Merge remote-tracking branch 'origin/master'

src/views/inout/DialogCreateOrder.vue

@@ -154,10 +154,7 @@
         <el-row v-if="errView==1">
           <el-col :span="20">
             <el-form-item prop="errMsg" label="异常信息:">
-              <el-input
+              <el-input type="textarea"  :rows="3" v-model="orderFormData.errMsg" disabled></el-input>
-                v-model="orderFormData.errMsg"
-                disabled
-              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>