浏览代码

bug修复

chenrui 3 年之前
父节点
当前提交
15b02d89c0

+ 59 - 50
src/views/purchasingManagement/purchaseOrder/chooseImportModal.vue

@@ -8,59 +8,61 @@
     v-model="isShow"
     @cancle="isShow=false"
     :width="900">
-    <div class="chooseImport-con">
-      <!-- 可导入数据 -->
-      <p class="chooseImport-tit">可导入数据{{ loadData.length }}条</p>
-      <a-table
-        class="sTable"
-        ref="table"
-        size="small"
-        :rowKey="(record) => record.purchaseBillSn"
-        :columns="nowColumns"
-        :dataSource="loadData"
-        :loading="loading"
-        :scroll="{ y: 200 }"
-        :pagination="false"
-        bordered>
-      </a-table>
-      <a-divider />
-      <!-- 不可导入数据 -->
-      <p class="chooseImport-tit red">不可导入数据{{ unLoadData.length }}条</p>
-      <a-table
-        class="unTable sTable"
-        ref="unTable"
-        size="small"
-        :rowClassName="(record, index) => 'yellowBg-row'"
-        :rowKey="(record) => record.errorDesc"
-        :columns="nowUnColumns"
-        :dataSource="unLoadData"
-        :loading="loading"
-        :scroll="{ y: 200 }"
-        :pagination="false"
-        bordered>
-      </a-table>
-      <!-- 按钮 -->
-      <div class="btn-con">
-        <a-button
-          type="primary"
-          id="chooseImport-submit"
-          size="large"
-          :class="loadData.length==0?'button-grey':'button-primary'"
-          @click="handleSubmit"
-          style="padding: 0 60px;">确认导入</a-button>
-        <a-button
-          id="chooseImport-cancel"
-          size="large"
-          class="button-cancel"
-          @click="isShow=false"
-          style="padding: 0 60px;margin-left: 15px;">取消</a-button>
+    <a-spin :spinning="spinning" tip="Loading...">
+      <div class="chooseImport-con">
+        <!-- 可导入数据 -->
+        <p class="chooseImport-tit">可导入数据{{ loadData.length }}条</p>
+        <a-table
+          class="sTable"
+          ref="table"
+          size="small"
+          :rowKey="(record) => record.purchaseBillSn"
+          :columns="nowColumns"
+          :dataSource="loadData"
+          :loading="loading"
+          :scroll="{ y: 200 }"
+          :pagination="false"
+          bordered>
+        </a-table>
+        <a-divider />
+        <!-- 不可导入数据 -->
+        <p class="chooseImport-tit red">不可导入数据{{ unLoadData.length }}条</p>
+        <a-table
+          class="unTable sTable"
+          ref="unTable"
+          size="small"
+          :rowClassName="(record, index) => 'yellowBg-row'"
+          :rowKey="(record) => record.errorDesc"
+          :columns="nowUnColumns"
+          :dataSource="unLoadData"
+          :loading="loading"
+          :scroll="{ y: 200 }"
+          :pagination="false"
+          bordered>
+        </a-table>
+        <!-- 按钮 -->
+        <div class="btn-con">
+          <a-button
+            type="primary"
+            id="chooseImport-submit"
+            size="large"
+            :class="loadData.length==0?'button-grey':'button-primary'"
+            @click="handleSubmit"
+            style="padding: 0 60px;">确认导入</a-button>
+          <a-button
+            id="chooseImport-cancel"
+            size="large"
+            class="button-cancel"
+            @click="isShow=false"
+            style="padding: 0 60px;margin-left: 15px;">取消</a-button>
+        </div>
       </div>
-    </div>
+    </a-spin>
   </a-modal>
 </template>
 
 <script>
-import { purchaseDetailParseProducts } from '@/api/purchase'
+import { purchaseDetailParseProducts, purchaseDetailBatchInsert } from '@/api/purchase'
 export default {
   name: 'ChooseImportModal',
   props: {
@@ -77,6 +79,7 @@ export default {
   },
   data () {
     return {
+      spinning: false,
       isShow: this.openModal, //  是否打开弹框
       nowColumns: [ //  正品
         { title: '序号', dataIndex: 'no', width: '15%', align: 'center' },
@@ -125,8 +128,14 @@ export default {
       if (this.loadData.length == 0) {
         this.$message.warning('无可导入产品!')
       } else {
-        this.$emit('ok', this.loadData)
-        this.isShow = false
+        this.spinning = true
+        purchaseDetailBatchInsert(this.loadData).then(res => {
+          this.spinning = false
+          if (res.status == 200) {
+            this.$emit('ok', '')
+            this.isShow = false
+          }
+        })
       }
     }
   },

+ 4 - 8
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -229,7 +229,7 @@
         style="padding: 0 60px;">提交</a-button>
     </div>
     <!-- 导入产品 -->
-    <importGuideModal :openModal="openGuideModal" :params="{purchaseBillSn: $route.params.sn}" @close="openGuideModal=false" @ok="hanldeOk" />
+    <importGuideModal :openModal="openGuideModal" :params="{purchaseBillSn: $route.params.sn}" @close="openGuideModal=false" @ok="hanldeOks" />
     <!-- 上次缺货 -->
     <outStockModal :openModal="openOutStockModal" :paramsData="paramsData" @close="openOutStockModal=false" @ok="hanldeOkOutStock" />
     <!-- 选择地址 -->
@@ -244,7 +244,7 @@ import outStockModal from './outStockModal.vue'
 import chooseAddressModal from './receivingAddress/chooseAddressModal.vue'
 import ProductType from '../../common/productType.js'
 import ProductBrand from '../../common/productBrand.js'
-import { purchaseDetailBySn, purchaseWriteSubmit, purchaseDetailPrint, purchaseDetailBatchInsert, purchaseDetailExport, purchaseDetailAddress } from '@/api/purchase'
+import { purchaseDetailBySn, purchaseWriteSubmit, purchaseDetailPrint, purchaseDetailExport, purchaseDetailAddress } from '@/api/purchase'
 import { purchaseDetailList, purchaseDetailSave, purchaseDetailDel, purchaseDetailCount, purchaseDetailCancelList } from '@/api/purchaseDetail'
 import { productListPurchase } from '@/api/product'
 import defImg from '@/assets/def_img@2x.png'
@@ -479,12 +479,8 @@ export default {
       })
     },
     // 导入产品
-    hanldeOk (obj) {
-      purchaseDetailBatchInsert(obj).then(res => {
-        if (res.status == 200) {
-          this.$refs.purchaseTable.refresh(true)
-        }
-      })
+    hanldeOks () {
+      this.$refs.purchaseTable.refresh(true)
     },
     // 上次缺货
     handleOutStock () {

+ 2 - 5
src/views/purchasingManagement/purchaseOrder/importGuideModal.vue

@@ -109,11 +109,8 @@ export default {
       }
     },
     // 导入
-    hanldeOk (obj) {
-      if (obj && obj.length > 0) {
-        this.$emit('ok', obj)
-        this.isShow = false
-      }
+    hanldeOk () {
+      this.$emit('ok')
     },
     // 关闭
     handleClose () {