Merge remote-tracking branch 'origin/ww' into orderChange

src/views/business/stockOrderSearch.vue

@@ -282,6 +282,7 @@
             :close-on-press-escape="false"
         >
             <StockOrderEdit
+                :isShow="false"
                 :closeDialog="closeDialog"
                 :detailList="detailList"
                 v-on:childByValue="parentByFn"
@@ -493,7 +494,7 @@ import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile}
 import store from "../../store";
 import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
 import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
-import StockOrderEdit from "@/views/business/stockOrderEdit";
+import StockOrderEdit from "@/views/business/stockOrderUpdate";
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 
 export default {

src/views/business/stockOrderUpdate.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
 
-        <el-card>
+        <el-card v-if="isShow">
             <el-form>
                 <el-row>
                     <span style="margin-left: 6px">单据备注:</span>
@@ -168,6 +168,9 @@ export default {
             type: Object,
             required: true,
         },
+        isShow:{
+            flag:true,
+        }
     },
     data() {
         return {