Sfoglia il codice sorgente

Merge branch 'develop_yh18' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh18

lilei 2 anni fa
parent
commit
d18b4f59db

+ 11 - 11
src/views/allocationManagement/chainTransferOut/edit.vue

@@ -139,13 +139,13 @@
                 </div>
               </a-col>
               <a-col :span="7" style="text-align: right;">
-               <a-button
-                 type="danger"
-                 ghost
-                 size="small"
-                 @click="openGuideModal=true"
-                 style="margin-right: 5px"
-                 id="chainTransferOutEdit-import-btn">产品导入</a-button>
+                <a-button
+                  type="danger"
+                  ghost
+                  size="small"
+                  @click="openGuideModal=true"
+                  style="margin-right: 5px"
+                  id="chainTransferOutEdit-import-btn">产品导入</a-button>
                 <a-button
                   size="small"
                   type="primary"
@@ -187,7 +187,7 @@
         style="padding: 0 60px;">提交</a-button>
     </div>
     <!-- 导入产品 -->
-    <importGuideModal :openModal="openGuideModal" :params="{allocationLinkageOutSn: $route.params.sn}" @close="openGuideModal=false" @ok="resetSearchForm" />
+    <importGuideModal :openModal="openGuideModal" :params="{allocationLinkageOutSn: $route.params.sn}" @close="openGuideModal=false" @ok="pageInit" />
   </div>
 </template>
 
@@ -195,7 +195,7 @@
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { getOperationalPrecision } from '@/libs/tools.js'
-import { allocLinkageOutDetailSn, allocLinkageOutDetailList, allocLinkageOutDetailSave, allocLinkageOutDetailDel, allocLinkageOutDetailCount, allocLinkageOutSubmit, allocLinkageOutDetailDelAll, allocLinkageOutDetailPrint,importProductInsertBatch } from '@/api/allocLinkageOut'
+import { allocLinkageOutDetailSn, allocLinkageOutDetailList, allocLinkageOutDetailSave, allocLinkageOutDetailDel, allocLinkageOutDetailCount, allocLinkageOutSubmit, allocLinkageOutDetailDelAll, allocLinkageOutDetailPrint, importProductInsertBatch } from '@/api/allocLinkageOut'
 import { productQuery } from '@/api/allocWarehouse'
 import ProductType from '../../common/productType.js'
 import ProductBrand from '../../common/productBrand.js'
@@ -205,7 +205,7 @@ import { hdPrint } from '@/libs/JGPrint'
 import importGuideModal from './importGuideModal.vue'
 export default {
   name: 'AllocLinkageOutEdit',
-  components: { STable, VSelect, Print, ProductType, ProductBrand ,importGuideModal},
+  components: { STable, VSelect, Print, ProductType, ProductBrand, importGuideModal },
   mixins: [commonMixin],
   data () {
     return {
@@ -224,7 +224,7 @@ export default {
       warehouseList: [], //  仓库  下拉数据
       disabled: false, //  查询、重置按钮是否可操作
       chooseDisabled: false,
-      openGuideModal:false,
+      openGuideModal: false,
       advanced: false, // 高级搜索 展开/关闭
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 1 - 1
src/views/allocationManagement/warehouseAllocation/edit.vue

@@ -226,7 +226,7 @@
         style="padding: 0 60px;">提交</a-button>
     </div>
     <!-- 导入产品 -->
-    <importGuideModal :openModal="openGuideModal" :params="{allocationWarehouseSn: $route.params.sn}" @close="openGuideModal=false" @ok="resetSearchForm" />
+    <importGuideModal :openModal="openGuideModal" :params="{allocationWarehouseSn: $route.params.sn}" @close="openGuideModal=false" @ok="pageInit" />
   </div>
 </template>