Merge branch 'master' of http://git.huaml.com/zhh/front-end

ghs/src/views/item/list.vue

@@ -463,6 +463,12 @@ export default {
     },
 
     hideSort (e) {
+      if(this.$util.isEmpty(this.initData)){
+        this.sort.status = false;
+        this.canAddPrice = false
+        this.costPrice = false
+        return;
+      }
       this.dataList.form.data = JSON.stringify(this.initData)
       this.$service.product.productBatchUpdate(this.dataList.form).then(res => {
         console.log(res)

hd/src/views/item/list.vue

@@ -463,6 +463,12 @@
 			},
 
 			hideSort (e) {
+				if(this.$util.isEmpty(this.initData)){
+					this.sort.status = false;
+					this.canAddPrice = false
+					this.costPrice = false
+					return;
+				}
 				this.dataList.form.data = JSON.stringify(this.initData)
 				this.$service.product.productBatchUpdate(this.dataList.form).then(res => {
 					console.log(res)