shish 1 год назад
Родитель
Сommit
2976cf38d7

+ 2 - 2
ghsApp/src/admin/billing/result.vue

@@ -30,7 +30,7 @@
         <text v-if="item.giveNum && Number(item.giveNum)>0" style="color:green;">,已赠{{item.giveNum}}{{item.xhUnitName}}</text>
         </text>
         <view v-if="item.xhUnitType == 1" style="width:100%;">
-          <button class="admin-button-com middle" style="width:180upx;margin:10upx 0 0 0;" @click="partOne(item)">拆1</button>
+          <button class="admin-button-com middle" style="width:180upx;margin:10upx 0 0 0;" @click="partOne(item)">拆1</button>
           <button class="admin-button-com middle blue" style="width:180upx;margin:10upx 0 0 20upx;" @click="subHalf(item)">减半扎</button>
         </view>
         <button v-else class="admin-button-com middle blue" style="margin:10upx auto 0 auto;" @click="giveItemFn(item)">赠送</button>
@@ -141,7 +141,7 @@ export default {
     partOne(item){
       let that = this
       let product = [{ productId: item.productId, bigNum: 1, smallNum: 0, classId: 0, itemId: item.itemId, ratio:item.ratio }]
-      that.$util.confirmModal({content:'确认拆1?'},() => {
+      that.$util.confirmModal({content:'确认拆1?'},() => {
           partItem({product:JSON.stringify(product),remark:'开单拆散'}).then((res) => {
             that.init()
             that.$msg(res.msg)

+ 1 - 1
ghsApp/src/admin/item/list.vue

@@ -218,7 +218,7 @@ export default {
 		breakSingleItem(item){
 			let that = this
 			this.breakNum = 1
-			that.$util.confirmModal({content:'确定拆1?'},() => {
+			that.$util.confirmModal({content:'确定拆1?'},() => {
 				that.breakAction()
 			})
 		},

+ 1 - 1
ghsApp/src/admin/item/list2.vue

@@ -247,7 +247,7 @@ export default {
 		breakSingleItem(item){
 			let that = this
 			this.breakNum = 1
-			that.$util.confirmModal({content:'确定拆1?'},() => {
+			that.$util.confirmModal({content:'确定拆1?'},() => {
 				that.breakAction()
 			})
 		},

+ 1 - 1
ghsApp/src/admin/item/selectList.vue

@@ -169,7 +169,7 @@ export default {
 		breakSingleItem(item){
 			let that = this
 			this.breakNum = 1
-			that.$util.confirmModal({content:'确定拆1?'},() => {
+			that.$util.confirmModal({content:'确定拆1?'},() => {
 				that.breakAction()
 			})
 		},

+ 1 - 1
ghsApp/src/pagesOrder/detail.vue

@@ -761,7 +761,7 @@ export default {
 		partOne(item){
 			let that = this
 			let product = [{ productId: item.productId, bigNum: 1, smallNum: 0, classId: 0, itemId: item.itemId, ratio:item.ratio }]
-			that.$util.confirmModal({content:'确认拆1?'},() => {
+			that.$util.confirmModal({content:'确认拆1?'},() => {
 				partItem({product:JSON.stringify(product),remark:'开单拆散'}).then((res) => {
 					that.$msg(res.msg)
 				})

+ 3 - 3
hdApp/src/admin/billing/result.vue

@@ -11,7 +11,7 @@
 					<text style="font-size:30upx;">
 					{{item.name}}
 					</text>
-					<button class="admin-button-com middle blue" style="margin:10upx auto 0 auto;" @click="subHalf(item)">减半</button>
+					<button class="admin-button-com middle blue" style="margin:10upx auto 0 auto;" @click="subHalf(item)">减半</button>
 				</view>
 			</block>
 		</view>
@@ -41,8 +41,8 @@ export default {
 		subHalf(item){
 			let that = this
 			let orderSn = this.orderInfo.orderSn
-			let remark = "开零售单"+orderSn+",减少半"
-			that.$util.confirmModal({content:'确认减少半?'},() => {
+			let remark = "开零售单"+orderSn+",减少半"
+			that.$util.confirmModal({content:'确认减少半?'},() => {
 				uni.showLoading()
 				changeHalf({productId:item.itemId,add:0,remark:remark}).then((res) => {
 					uni.hideLoading()

+ 3 - 3
hdApp/src/admin/order/refund.vue

@@ -39,7 +39,7 @@
 							<input type="number" placeholder="退货数" v-model="res.refundCount" placeholder-style="color:#CCCCCC" style="height:60upx;width:160upx;" />
 							<text style="margin-left:10upx;">{{res.unitName}}</text>
 							<text style="color:green;margin-left:20upx;">可退{{Number(res.num)-Number(res.refundNum)}}{{res.unitName}}</text>
-							<button class="admin-button-com mini-btn" @click="addHalf(res)" v-if="res.unitType == 1" style="margin-left:10upx;">退半</button>
+							<button class="admin-button-com mini-btn" @click="addHalf(res)" v-if="res.unitType == 1" style="margin-left:10upx;">退半</button>
 						</view>
 					</view>
 				</template>
@@ -131,8 +131,8 @@ export default {
 		addHalf(item){
 			let that = this
 			let orderSn = this.orderInfo.orderSn
-			let remark = "零售订单"+orderSn+"售后,退回半"
-			that.$util.confirmModal({content:'确认退回半?'},() => {
+			let remark = "零售订单"+orderSn+"售后,退回半"
+			that.$util.confirmModal({content:'确认退回半?'},() => {
 				uni.showLoading()
 				changeHalf({productId:item.itemId,add:1,remark:remark}).then((res) => {
 					uni.hideLoading()