浏览代码

Merge branch 'develop_temp_yh14' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_fenbiao0309

lilei 2 年之前
父节点
当前提交
9b89c710ec

+ 1 - 1
public/version.json

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

+ 6 - 4
src/views/inventoryManagement/intelligentReplenishment/detailModal.vue

@@ -26,6 +26,7 @@
             :loading="loading"
             :scroll="{ y: 400 }"
             :pagination="false"
+            v-if="detailData&&detailData.stockPredictRange == 0"
             bordered>
           </a-table>
         </div>
@@ -92,6 +93,8 @@ export default {
           this.detailData = res.data
           if (this.detailData.stockPredictRange == 0) { //  自选产品
             this.getPredictRange()
+          }else{
+            this.loadData = []
           }
         } else {
           this.detailData = null
@@ -161,10 +164,9 @@ export default {
     isShow (newValue, oldValue) {
       if (!newValue) {
         this.$emit('close')
-      }
-    },
-    itemSn (newValue, oldValue) {
-      if (this.isShow && newValue) {
+        this.detailData = null
+         this.loadData = []
+      }else{
         this.getDetail()
       }
     }

+ 2 - 4
src/views/inventoryManagement/intelligentReplenishment/edit.vue

@@ -133,9 +133,7 @@ export default {
           } else {
             this.current = 0
           }
-          if (this.form.stockPredictRange == 0) {
-            this.getTrendSn()
-          }
+          this.getTrendSn()
         } else {
           this.detailData = null
           this.spinning = false
@@ -190,7 +188,7 @@ export default {
           if (!noNext) {
             this.current++
             this.spinning = false
-          }else{
+          } else {
             this.getTrendSn()
           }
         } else {

+ 1 - 0
src/views/purchasingManagement/bulkWarehousingOrder/list.vue

@@ -295,6 +295,7 @@ export default {
         kingdeeNo: ''
       }
       this.$refs.table.refresh(true)
+      this.$refs.table.clearSelected()
     },
     //  单条审核
     handleAudit (row) {

+ 2 - 0
src/views/salesManagement/receiptPrint/list.vue

@@ -299,7 +299,9 @@ export default {
     },
     printOk () {
       this.spinning = false
+      console.log(1)
       this.$refs.table.refresh()
+      this.$refs.table.clearSelected()
     },
     //  时间  change
     dateChange (date) {

+ 1 - 0
src/views/salesManagement/salesCollection/list.vue

@@ -445,6 +445,7 @@ export default {
         if (res.status == 200) {
           _this.$message.success(res.message)
           _this.$refs.table.refresh()
+          _this.$refs.table.clearSelected()
           _this.spinning = false
           _this.collectionType = 0
         } else {