11.1

package1/AI/voiceInventory.vue

@@ -388,9 +388,9 @@
 							<view class="shop-checkList" v-if="temporaryList != ''">
 								<view class="shop-checkList-box" style="width: 69.5%;">
 									<text
-										style="width: 300rpx;display: inline-block;font-size: 30rpx;font-weight: bold;padding-left: 40rpx;">规格</text>
+										style="width: 69%;display: inline-block;font-size: 30rpx;font-weight: bold;padding-left: 40rpx;">规格</text>
 									<text
-										style="font-size: 30rpx;color: #000;font-weight: bold;width: 110rpx;display: inline-block;text-align: right;">库存</text>
+										style="font-size: 30rpx;color: #000;font-weight: bold;width: 25%;display: inline-block;text-align: center;">库存</text>
 								</view>
 								<view class="zuni-numbox">
 									<view @tap="minusNum" class="zuni-numbox__minus zuni-numbox-btns"
@@ -412,8 +412,8 @@
 									<uni-icons color="red" type="minus" size="26"></uni-icons>
 								</view>
 								<view class="shop-checkList-box">
-									<text style="width: 300rpx;display: inline-block;">{{item.name}}</text>
+									<text style="width: 69%;display: inline-block;">{{item.name}}</text>
-									<text style="color:#777;font-size: 12px;color:red"
+									<text style="color:#777;font-size: 12px;color:red;width: 25%;display: inline-block;"
 										v-if="item.productNum == null || item.productNum === '' || item.productNum == undefined">
 										无库存
 									</text>
@@ -813,6 +813,7 @@
 				snList: [],
 				carList1: [],
 				zhuImg: '',
+				zhuImgList: [],
 				productNum: null,
 				prefixRule: '',
 				numRule: '',
@@ -1376,10 +1377,20 @@
 								}
 							})
 						} else {
-							this.addPageGoods(this.zhuImg, res1.result)
+							if(that.zhuImgList != [] && that.zhuImgList.length > 0){
+								for (let i = 0; i < that.zhuImgList.length; i++) {
+									that.upLoadFile(that.zhuImgList[i], i + 1)
+								}
+								setTimeout(res => {
+									that.zhuImgList = []
+								}, 2000)
+								
+							}else{
+								this.addPageGoods(this.zhuImg, res1.result)
+							}
 							that.getSnList()
 						}
-
+						
 					} else {
 						this.tui.toast(res.message)
 					}
@@ -7054,6 +7065,7 @@
 						}
 						for (let i = 0; i < res.tempFiles.length; i++) {
 							that.upLoadFile(res.tempFiles[i].tempFilePath, i + 1)
+							that.zhuImgList.push(res.tempFiles[i].tempFilePath)
 						}
 					},
 					fail(err) {

package1/index/order.vue

@@ -62,7 +62,7 @@
 									<view class="floatRight" v-if="item.status == 6" @tap.stop="goSaleGoods(item,'')">去开单</view>
 									<view class="floatRight" v-if="item.status == 4" @tap.stop="cancelOrder(item,'',index)">撤销</view>
 									<view class="floatRight" v-if="item.status == 4" @tap.stop="cancelOrder(item,'goPay')">撤销并复制</view>
-									<view class="floatRight" v-if="item.status == 2" @tap.stop="goSaleGoods(item)">重新开单</view>
+									<view class="floatRight" v-if="item.status == 2" @tap.stop="againOrder(item)">重新开单</view>
 									<view class="floatRight" style="color: red;width: 150rpx;" @tap.stop="delItemModal(item)" v-if="item.status == 6">删除订单</view>
 								</uni-card>
 							</view>
@@ -224,6 +224,16 @@
 						this.tui.toast(res.message)
 					}
 				})
+			},
+			// 重新开单订单
+			async againOrder(item,type,index) {
+				let that = this;
+				await this.getReturnOrder(item.id)
+				await this.tui.modal("提示", "您确定要重新开单吗？", true, (res) => {
+					if (res) {
+						that.goSaleGoods(item)
+					}
+				})
 			},
 			// 取消订单
 			async cancelOrder(item,type,index) {

package1/inventory/addGoods.vue

@@ -93,7 +93,7 @@
 					</view>
 
 				</uni-forms-item>
-				<uni-forms-item label="市场价" name="price">
+				<uni-forms-item label="零售价" name="price">
 					<!-- <uni-easyinput type="digit" v-model="formData.price" placeholder="请输入零售价" trim="all" /> -->
 					<input type="digit" class="content-input" v-model="formData.price"
 						@focus="obtainPrice($event,'price')" @blur="changessPrice($event,'price')" placeholder="请输入零售价">
@@ -971,7 +971,7 @@
 						} else {
 							this.formData.purchasePrice = e.target.value
 							console.log('改变', this.formData)
-							if (this.dataList.id) {
+							if (this.dataList.id == undefined) {
 								uni.hideLoading()
 								return
 							}

package1/staff/addStaff.vue

@@ -14,6 +14,7 @@
 				</uni-forms-item>
 			</uni-forms>
 			<u-button type="primary" @click="onFormSubmit">保存</u-button>
+			<button type="primary" style="margin-top: 13px !important;background-color:#5fd9ee;font-size:14px;height: 40px;;"  @click="deleteSubmit" v-if="type==='edit'">删除</button>
 		</view>
 	</view>
 </template>
@@ -30,6 +31,7 @@
 				},
 				username:'',
 				id: '',
+				type:'',
 				typeList: [{
 						value: 0,
 						text: "管理员"
@@ -96,6 +98,15 @@
 				}, (reason) => {
 
 				})
+			},
+			deleteSubmit() {
+				let ids = []
+				ids.push(this.id)
+				this.tui.request("/app/common/user/delByIds", "POST", {
+					ids: ids
+				}, false, true).then((res1) => {
+					uni.navigateBack()
+				}).catch((res) => {})
 			}
 		}
 	}