From 63038edf5b65e16bfb24052eb3077479d9ccbfbf Mon Sep 17 00:00:00 2001 From: whycq <123456> Date: 星期四, 27 十月 2022 12:56:22 +0800 Subject: [PATCH] # --- pages/basics/pakin.vue | 49 +++++++++++++++++++++--- pages/basics/matQuery.vue | 4 ++ pages/basics/stockCheck.vue | 20 +++++++++ colorui/main.css | 37 +++--------------- 4 files changed, 73 insertions(+), 37 deletions(-) diff --git a/colorui/main.css b/colorui/main.css index 13aed53..c3e94d5 100644 --- a/colorui/main.css +++ b/colorui/main.css @@ -220,40 +220,17 @@ border-radius: 10upx; } -switch .wx-switch-input::before, -radio.radio::before, +/* switch .wx-switch-input::before, +radio.radio::before, */ /* checkbox .wx-checkbox-input::before, */ -radio .wx-radio-input::before, -switch .uni-switch-input::before, -radio.radio::before, +/* radio .wx-radio-input::before, */ +/* switch .uni-switch-input::before, */ +/* radio.radio::before, */ /* checkbox .uni-checkbox-input::before, */ -radio .uni-radio-input::before { +/* radio .uni-radio-input::before { display: none; -} +} */ -radio.radio[checked]::after, -radio.radio .uni-radio-input-checked::after { - content: ""; - background-color: transparent; - display: block; - position: absolute; - width: 8px; - height: 8px; - z-index: 999; - top: 0upx; - left: 0upx; - right: 0; - bottom: 0; - margin: auto; - border-radius: 200upx; - /* #ifndef MP */ - border: 7px solid #ffffff !important; - /* #endif */ - - /* #ifdef MP */ - border: 8px solid #ffffff !important; - /* #endif */ -} .switch-sex::after { content: "\e71c"; diff --git a/pages/basics/matQuery.vue b/pages/basics/matQuery.vue index e9a0b1f..38aad6c 100644 --- a/pages/basics/matQuery.vue +++ b/pages/basics/matQuery.vue @@ -19,6 +19,10 @@ <view class="text-title"><input type="text" v-model="matData.batch"></view> </view> <view class="text-box"> + <view class="text-title"><text>澶囨敞</text></view> + <view class="text-title"><input type="text" v-model="matData.memo"></view> + </view> + <view class="text-box"> <view class="text-title"><text>鏁伴噺</text></view> <view class="text-title"> <view> diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue index 1ce0727..89dfe44 100644 --- a/pages/basics/pakin.vue +++ b/pages/basics/pakin.vue @@ -14,6 +14,22 @@ </view> </view> </view> + <view class="square-1"> + <view class="square-title"> + <view class="title-sign"><view class="sign"></view></view> + <view class="title-text"><text>鏄惁鍐荤粨</text></view> + <radio-group @change="cRadio"> + <label> + <radio :checked="ck1" style="margin-left: 100rpx;"/><text>鏄�</text> + </label> + <label> + <radio :checked="ck2" style="margin-left: 50rpx;"/><text>鍚�</text> + </label> + </radio-group> + <!-- <radio :value="yes" style="margin-left: 100rpx;">鏄�</radio> + <radio :value="no" style="margin-left: 50rpx;">鍚�</radio> --> + </view> + </view> <view class="square-2"> @@ -55,6 +71,7 @@ <view class="matnr"><text style="width: 400rpx;">缂栫爜锛歿{item.matnr}}</text></view> <view><text style="width: 400rpx;">鍝佸悕锛歿{item.maktx}}</text></view> <view><text style="width: 400rpx;">鎵瑰彿锛歿{item.batch}}</text></view> + <view><text style="width: 400rpx;">澶囨敞锛歿{item.memo}}</text></view> <view> <text style="width: 400rpx;">鏁伴噺锛歿{item.anfme}}</text> </view> @@ -86,19 +103,23 @@ </view> <!-- 寮圭獥 --> <!-- 淇敼鏁伴噺 --> - <uni-popup ref="revise" background-color="#fff"> + <uni-popup ref="revise" > <view class="revise-box "> <view class="revise-box-top"> <view class="color-block-blue"></view> - <text class="title">淇敼鎵瑰彿/鏁伴噺</text> + <text class="title">淇敼</text> </view> <view class="" style="position: relative;left: 50px;margin-bottom: 20px;"> <text style="display: inline-block;float: left;width: 50px;">鎵瑰彿锛�</text> <input type="text" style="width: 100px;border-bottom: 1px solid #9e9e9e;" v-model="batch"> </view> + <view class="" style="position: relative;left: 50px;margin-bottom: 20px;"> + <text style="display: inline-block;float: left;width: 50px;">澶囨敞锛�</text> + <input type="text" style="width: 100px;border-bottom: 1px solid #9e9e9e;" v-model="memo"> + </view> <view class="changeBox"> <view class="num-box"> - <text style="display: inline-block;float: left;width: 50px;">鎵瑰彿锛�</text> + <text style="display: inline-block;float: left;width: 50px;">鏁伴噺锛�</text> <uni-number-box :value="count" :max="9999999" color="#747474" @change="changeValue"/> </view> </view> @@ -135,7 +156,11 @@ check:false, checkText:'鍏ㄩ��', checkedData:[], - batch:'' + batch:'', + memo: '', + ck1: false, + ck2: true, + yess: false, } }, onShow() { @@ -157,6 +182,13 @@ // 鑾峰彇url getUrl() { this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePORT + "/" +this.baseUrl + }, + cRadio() { + var temp = this.ck1 + this.ck1 = this.ck2 + this.ck2 = temp + this.yess = this.ck1 + console.log(this.matList); }, // barcode input 浜嬩欢 barcodeInput() { @@ -389,6 +421,8 @@ }, revise(item,index) { this.count = this.matList[index].anfme + this.batch = this.matList[index].batch + this.memo = this.matList[index].memo // var maxCount = this.matList[index].maxCount // if (maxCount == undefined ) { // this.matList[index]["maxCount"] = item.enableQty @@ -410,6 +444,7 @@ confirm() { this.matList[this.rowNum].anfme = this.count this.matList[this.rowNum].batch = this.batch + this.matList[this.rowNum].memo = this.memo this.$refs.revise.close() this.$forceUpdate() // 寮哄埗鍒锋柊 }, @@ -466,8 +501,10 @@ .revise-box { position: relative; width: 500rpx; - height: 400rpx; + height: 470rpx; border-radius: 25px; + background-color: #fff; + border-radius: 20rpx; } .revise-box-top { width: 400rpx; @@ -580,7 +617,7 @@ } .data-list { border-bottom: 1px solid #d8d8d8; - height: 180rpx; + height: 220rpx; margin: 15rpx; border-radius: 20rpx; } diff --git a/pages/basics/stockCheck.vue b/pages/basics/stockCheck.vue index 3358a66..4631e29 100644 --- a/pages/basics/stockCheck.vue +++ b/pages/basics/stockCheck.vue @@ -236,7 +236,7 @@ events: { // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� matList: function(data) { - that.matList.push(data.data) + that.checkMat(data.data) }, }, success: function(res) { @@ -284,6 +284,24 @@ this.matList = [] this.staNo = '' }, + // 娣诲姞鍟嗗搧 + addMat(mat) { + this.matList.unshift(mat) + }, + checkMat(mat) { + var len = this.matList.length + var add = true + for (var i = 0; i < len; i++) { + if (mat.matnr == this.matList[i].matnr) { + this.matList[i].anfme += mat.anfme + this.$forceUpdate() // 寮哄埗鍒锋柊 + add = false + } + } + if (add) { + this.matList.unshift(mat) + } + }, adjust() { let that = this uni.request({ -- Gitblit v1.9.1