lilei vor 2 Jahren
Ursprung
Commit
335c51e37b
3 geänderte Dateien mit 6 neuen und 7 gelöschten Zeilen
  1. 1 1
      App.vue
  2. 4 4
      pages/shelfSetting/editShelfHw.vue
  3. 1 2
      pages/shelfSetting/searchShelfHw.vue

+ 1 - 1
App.vue

@@ -7,7 +7,7 @@
 			token: '',
 			changeOrg:'',
 			version: '', // 当前版本号
-			buildType: 'pro', // 打包环境对应类型,pro 生产 uat 预发布 dev 本地开发
+			buildType: 'uat', // 打包环境对应类型,pro 生产 uat 预发布 dev 本地开发
 			envTips: '', // 环境文字提示
 			theme: 'default', // 主题,default
 			isIphoneXup: false //是否iphonex以及以上的版本

+ 4 - 4
pages/shelfSetting/editShelfHw.vue

@@ -25,7 +25,7 @@
 							<view class="pinfo flex_1">
 								<view class="ptxt flex align_center justify_between">
 									<text>{{productEntity.code}}</text>
-									<text class="pcode" @click="toBindProduct" v-if="nowData&&nowData.shelfProductApiEntity&&nowData.shelfProductApiEntity.enableFlag==1">
+									<text class="pcode" @click="toBindProduct" v-if="type=='bind'||(type=='edit'&&nowData&&nowData.shelfProductApiEntity&&nowData.shelfProductApiEntity.enableFlag==1)">
 										<u-icon name='reload'></u-icon>
 										更换产品
 									</text>
@@ -62,7 +62,7 @@
 		</view>
 		<view class="flex footer-btn">
 			<u-button v-if="type=='bind'" class="delbtn" :loading='loading' @click="handleDel" type='primary' shape="circle" size="medium">删除货位</u-button>
-			<u-button :disabled="nowData&&nowData.shelfProductApiEntity&&nowData.shelfProductApiEntity.enableFlag==0" :style="{width:type=='bind'?'45%':'100%'}" class="newbtn" :loading='loading' @click="formSubmit" type='primary' shape="circle" size="medium">保存</u-button>
+			<u-button :disabled="type=='edit'&&nowData&&nowData.shelfProductApiEntity&&nowData.shelfProductApiEntity.enableFlag==0" :style="{width:type=='bind'?'45%':'100%'}" class="newbtn" :loading='loading' @click="formSubmit" type='primary' shape="circle" size="medium">保存</u-button>
 		</view>
 	</view>
 </template>
@@ -207,7 +207,7 @@
 			// 禁用货位产品
 			enableShelfProduct(){
 				const _this = this
-				const isEnable = this.nowData&&this.nowData.shelfProductApiEntity&&this.nowData.shelfProductApiEntity.enableFlag==1 || this.nowData.enableFlag
+				const isEnable = this.nowData&&this.nowData.shelfProductApiEntity&&this.nowData.shelfProductApiEntity.enableFlag==1
 				if(isEnable){
 					clzConfirm({
 					  title: '提示',
@@ -225,7 +225,7 @@
 			},
 			enableFun(isEnable){
 			  const _this = this
-			  const shelfProductSn = this.nowData.shelfProductApiEntity.shelfProductSn||this.nowData.shelfProductSn
+			  const shelfProductSn = this.nowData.shelfProductApiEntity.shelfProductSn
 			  _this.spinning = true
 			  shelfProductEnable({ shelfSn: this.nowData.shelfSn, shelfProductSn: shelfProductSn, enableFlag: isEnable ? 0 : 1 }).then(res => {
 				if (res.status == 200) {

+ 1 - 2
pages/shelfSetting/searchShelfHw.vue

@@ -155,8 +155,7 @@
 				    pageSize: this.pageSize,
 					shelfSn: this.shelfSn,
 					queryWord: this.queryWord,
-					shelfPlaceCodeHead: this.curTab,
-					enableFlag: 1
+					shelfPlaceCodeHead: this.curTab
 				}
 				_this.status = 'loading'
 				getShelfProductList(params).then(res => {