Quellcode durchsuchen

Merge commit '40fec265ed12b686b098778ae323eea253f6efe2' into HEAD

gitadmin vor 5 Monaten
Ursprung
Commit
e3fdcf4a19

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.2.493",
+    "version": "2.2.501",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 1 - 1
src/components/UploadFile/index.vue

@@ -266,7 +266,7 @@ export default {
         }
         return true
       }
-      const isType = this.fileType.indexOf(file.type) >= 0 && file.type != ''
+      const isType = file.type.indexOf(this.fileType) >= 0 && file.type != ''
       if (!isType) {
         if (tip != 0) {
           this.$message.error('请上传正确的格式!')

+ 7 - 7
src/views/purchasingManagement/purchaseReceipt/edit.vue

@@ -54,14 +54,14 @@
         </div>
         <div class="showBtn">
           <a-button id="purchaseReceiptEdit-add" v-if="$hasPermissions('B_purchaseReceiptEdit_add')" type="primary" class="button-warning" @click="handleAddEdit">新增产品</a-button>
-          <a-button id="purchaseReceiptEdit-ex" v-if="$hasPermissions('B_purchaseReceiptEdit_import')" class="button-warning" @click="handleImport">导入产品</a-button>
-          <a-button
+          <a-button style="margin-right:6px;" id="purchaseReceiptEdit-ex" v-if="$hasPermissions('B_purchaseReceiptEdit_import')" class="button-warning" @click="handleImport">导入产品</a-button>
+          <!-- <a-button
             id="purchaseReceiptEdit-queryQty"
             type="primary"
             class="button-warning"
             :loading="loading"
             v-if="$hasPermissions('B_purchaseReceiptEdit_thirdQty')"
-            @click="handleThirdQty">第三方库存</a-button>
+            @click="handleThirdQty">第三方库存</a-button> -->
           <a-alert type="info">
             <div slot="message" class="total-bar">
               <span>采购数量:{{ statisticsObj && (statisticsObj.productTotalQty || statisticsObj.productTotalQty == 0) ? statisticsObj.productTotalQty : '--' }};</span>
@@ -116,7 +116,7 @@
       :itemSn="itemSn"
       :openModal="openAddModal"
       :nowData="detailsData"
-      @ok="resetTable"
+      @ok="resetTable(true)"
       @close="openAddModal=false" />
     <!-- 导入弹窗 -->
     <importGuideModal :openModal="openGuideModal" :params="{sparePartsSn: $route.query.sn}" @close="openGuideModal=false" @ok="hanldleImportOk" />
@@ -278,7 +278,7 @@ export default {
           purchaseDetailDel({ sn: row.sparePartsDetailSn })
             .then(res => {
               if (res.status == 200) {
-                _this.resetTable()
+                _this.resetTable(false)
               }
               _this.$message.info(res.message)
               _this.delLoading = false
@@ -292,9 +292,9 @@ export default {
       })
     },
     // 刷新列表  更新操作时间
-    resetTable () {
+    resetTable (flag) {
       this.itemSn = undefined
-      this.$refs.table.refresh(true)
+      this.$refs.table.refresh(flag)
     },
     //  重置
     resetSearchForm () {

+ 5 - 1
src/views/purchasingManagement/purchaseReceipt/list.vue

@@ -170,7 +170,7 @@
       <!-- 审核弹窗 -->
       <reviewModal v-drag :openModal="openReviewModal" :itemSn="itemSn" @ok="okReviewModal" @close="closeReviewModal"></reviewModal>
       <!-- 上传凭证 -->
-      <uploadVoucherModal v-drag :openModal="openVoucherModal" :itemSn="itemSn" @ok="handleSearch" @close="openVoucherModal=false"></uploadVoucherModal>
+      <uploadVoucherModal v-drag :openModal="openVoucherModal" :itemSn="itemSn" @ok="handleSearch" @close="closeVoucherModal"></uploadVoucherModal>
       <!-- 查看上传凭证 -->
       <seeVoucherModal v-drag :openModal="openSeeVoucherModal" :itemData="itemSeeData" @close="openSeeVoucherModal=false;itemSeeData=null"></seeVoucherModal>
     </a-card>
@@ -383,6 +383,10 @@ export default {
       this.itemSn = row.sparePartsSn
       this.openVoucherModal = true
     },
+    closeVoucherModal () {
+      this.itemSn = null
+      this.openVoucherModal = false
+    },
     // 查看凭证
     seeVoucher (row) {
       this.itemSeeData = row.attachmentList

+ 2 - 3
src/views/purchasingManagement/purchaseReceipt/uploadVoucherModal.vue

@@ -24,9 +24,9 @@
             uploadType="attach"
             :action="attachAction"
             upText="添加文件"
-            fileType="*"
+            fileType="pdf"
             @change="changeImport"></Upload>
-          <div style="color:#999999;">(支持图片、word、excel、PDF格式,最多10个附件)</div>
+          <div style="color:#999999;">(支持PDF格式,最多10个附件)</div>
         </a-form-model-item>
       </a-form-model>
       <!-- 按钮 -->
@@ -111,7 +111,6 @@ export default {
     isShow (newValue, oldValue) {
       if (!newValue) {
         this.$emit('close')
-        this.itemSn = ''
         this.$refs.importUpload.setFileList('')
       }
     }

+ 1 - 8
src/views/salesManagement/salesQueryNew/detail.vue

@@ -451,14 +451,7 @@ export default {
     },
     // 查询第三方库存
     getThreeStock () {
-      this.spinning = true
-      getThirdStockQty({ salesBillSn: this.bizSn || this.$route.params.sn }).then(res => {
-        if (res.status == 200) {
-          this.$refs.productList.showThreeStock()
-          this.resetSearchForm()
-        }
-        this.spinning = false
-      })
+      this.$refs.productList.showThreeStock()
     },
     // 详情
     getDetail () {

+ 10 - 14
src/views/salesManagement/salesQueryNew/edit.vue

@@ -269,21 +269,17 @@ export default {
     // 刷新所有第三方库存
     searchAllThreeStock () {
       this.spinning = true
-      getThirdStockQty({ salesBillSn: this.$route.params.sn }).then(res => {
-        if (res.status == 200) {
-          // 刷新正常活动产品列表
-          this.$refs.productNormalList.searchThreeStockOk()
-          // 刷新所有活动产品列表
-          const activeList = this.activeList
-          activeList.map(item => {
-            item.isActive = true
-            const row = this.$refs['productList-' + item.promoRuleSn][0]
-            row && row.searchThreeStockOk()
-          })
-          activeList.splice()
-        }
-        this.spinning = false
+      // 刷新正常活动产品列表
+      this.$refs.productNormalList.searchThreeStockOk()
+      // 刷新所有活动产品列表
+      const activeList = this.activeList
+      activeList.map(item => {
+        item.isActive = true
+        const row = this.$refs['productList-' + item.promoRuleSn][0]
+        row && row.searchThreeStockOk()
       })
+      activeList.splice()
+      this.spinning = false
     },
     // 刷新所有表格数据
     updateAllTable (flag) {