lilei 2 년 전
부모
커밋
526d0c3860
3개의 변경된 파일6개의 추가작업 그리고 5개의 파일을 삭제
  1. 2 2
      manifest.json
  2. 3 2
      pages/shelfSetting/editShelfHw.vue
  3. 1 1
      pages/shelfSetting/searchShelfHw.vue

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "iSCM智慧供应链",
     "appid" : "__UNI__5B57B68",
     "description" : "iSCM智慧供应链系统",
-    "versionName" : "1.2.7",
-    "versionCode" : 127,
+    "versionName" : "1.3.0",
+    "versionCode" : 130,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

+ 3 - 2
pages/shelfSetting/editShelfHw.vue

@@ -207,7 +207,7 @@
 			// 禁用货位产品
 			enableShelfProduct(){
 				const _this = this
-				const isEnable = this.nowData&&this.nowData.shelfProductApiEntity&&this.nowData.shelfProductApiEntity.enableFlag==1
+				const isEnable = this.nowData&&this.nowData.shelfProductApiEntity&&this.nowData.shelfProductApiEntity.enableFlag==1 || this.nowData.enableFlag
 				if(isEnable){
 					clzConfirm({
 					  title: '提示',
@@ -225,8 +225,9 @@
 			},
 			enableFun(isEnable){
 			  const _this = this
+			  const shelfProductSn = this.nowData.shelfProductApiEntity.shelfProductSn||this.nowData.shelfProductSn
 			  _this.spinning = true
-			  shelfProductEnable({ shelfSn: this.nowData.shelfSn, shelfProductSn: this.nowData.shelfProductApiEntity.shelfProductSn, enableFlag: isEnable ? 0 : 1 }).then(res => {
+			  shelfProductEnable({ shelfSn: this.nowData.shelfSn, shelfProductSn: shelfProductSn, enableFlag: isEnable ? 0 : 1 }).then(res => {
 				if (res.status == 200) {
 				   uni.showToast({
 				   	icon: "none",

+ 1 - 1
pages/shelfSetting/searchShelfHw.vue

@@ -114,7 +114,7 @@
 			//编辑货位
 			toEdit(item){
 				const type = 'edit'
-				const params = Object.assign({shelfSn: this.shelfSn,shelfName: this.shelfName},item)
+				const params = Object.assign({shelfSn: this.shelfSn,shelfName: this.shelfName, shelfProductApiEntity: item},item)
 				this.$store.state.vuex_tempData = params
 				uni.navigateTo({
 					url: "/pages/shelfSetting/editShelfHw?type=" + type