11.3

components/x-form.vue

@@ -161,15 +161,20 @@
 					this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
 						status: 'success',
 						message: '',
-						url: result
+						url: this.$baseUrl + result
 					}))
 					fileListLen++
 				}
 				var arr = []
 				this.fileList1.forEach(item1 => {
+<<<<<<< HEAD
 					let arrUrl = item1.url.split(this.$baseUrl)
 					let lastItem = arrUrl[arrUrl.length - 1];
 					arr.push(lastItem)
+=======
+					let img = item1.url.split(this.$baseUrl)
+					arr.push(img[1])
+>>>>>>> ec9bba9783fc5bf29c8b3276224b1ab4fab155dc
 				})
 				this.model.addressImg = arr.join()
 				this.model[type] = this.model.addressImg

manifest.json

@@ -3,7 +3,11 @@
     "appid" : "__UNI__10C0A5F",
     "description" : "",
     "versionName" : "1.0.14",
+<<<<<<< HEAD
     "versionCode" : 114,
+=======
+    "versionCode" : 110,
+>>>>>>> ec9bba9783fc5bf29c8b3276224b1ab4fab155dc
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/home/index.vue

@@ -10,6 +10,15 @@
 				</view>
 				<view class="title_hint">{{item.title}}</view>
 			</view>
+<<<<<<< HEAD
+=======
+			<view class="card_bottle" @click="scanning">
+				<view class="card_fiche" :style="{backgroundColor:'#67C23A'}">
+					<span class="iconfont icon_image icon-saomachaxun"></span>
+					<view class="title_hint">扫码查询气瓶流转信息</view>
+				</view>
+			</view>
+>>>>>>> ec9bba9783fc5bf29c8b3276224b1ab4fab155dc
 			<view style="width: 25%;"></view>
 			<view style="width: 25%;"></view>
 			<view style="width: 25%;"></view>
@@ -21,8 +30,7 @@
 					<view class="title_hint">{{item.title}}</view>
 				</view>
 			</view>
-			<view style="width: 25%;"></view>
-			<view style="width: 25%;"></view>
+			<view style="width: 50%;"></view>
 		</view>
 	</view>
 </template>
@@ -50,12 +58,16 @@
 					id: 'step',
 					title: '流转信息',
 					icon: 'icon-saomachaxun',
+<<<<<<< HEAD
 					color: '#6db1ff',
+=======
+					color: '#4792ef',
+>>>>>>> ec9bba9783fc5bf29c8b3276224b1ab4fab155dc
 				}, {
 					id: 'allot',
 					title: '钢瓶调拨',
 					icon: 'icon-moveais',
-					color: '#19baea',
+					color: '#01d0ff',
 				}, {
 					id: 'record',
 					title: '调拨记录',
@@ -135,6 +147,10 @@
 						qr_id: qrid,
 					},
 					success: (res) => {
+<<<<<<< HEAD
+=======
+						console.log(res, 134)
+>>>>>>> ec9bba9783fc5bf29c8b3276224b1ab4fab155dc
 						if (res.data.code == 0) {
 							var arr = res.data.data
 							// this.frequencyCoding = arr.inner_code
@@ -191,10 +207,14 @@
 
 	.card_bottle {
 		width: 45%;
+<<<<<<< HEAD
 		margin: 10rpx 0rpx;
+=======
+>>>>>>> ec9bba9783fc5bf29c8b3276224b1ab4fab155dc
 		display: flex;
 		flex-direction: column;
 		align-items: center;
+		margin-bottom: 20rpx;
 	}
 
 	.card_fiche {
@@ -203,22 +223,30 @@
 		flex-direction: column;
 		justify-content: center;
 		width: 100%;
+<<<<<<< HEAD
 		padding: 20rpx 0rpx;
 		height: 120rpx;
+=======
+		padding: 25rpx 0rpx;
+>>>>>>> ec9bba9783fc5bf29c8b3276224b1ab4fab155dc
 		background-color: #027DB4;
 		border-radius: 16rpx;
 	}
 
 	.icon_image {
 		color: #fff;
-		font-size: 70rpx;
+		font-size: 80rpx;
 	}
 
 	.title_hint {
-		// height: 78rpx;
 		margin-top: 10rpx;
+<<<<<<< HEAD
 		color: #ffffff;
 		width: 85%;
+=======
+		color: #fff;
+		width: 70%;
+>>>>>>> ec9bba9783fc5bf29c8b3276224b1ab4fab155dc
 		text-align: center;
 		font-size: 26rpx;
 	}

pages/information/cylinder.vue

@@ -110,6 +110,33 @@
 			delCode(index) {
 				this.codeList.splice(index, 1);
 			},
+<<<<<<< HEAD
+=======
+			// 输入钢瓶编号添加
+			addCode() {
+				function hasChinese(text) {
+					var pattern = /[\u4E00-\u9FA5]/; // Unicode编码范围包含中文字符
+					return pattern.test(text);
+				}
+				if (!this.frequencyCoding) {
+					return uni.$u.toast('请先输入单位内编号')
+				} else {
+					if (!hasChinese(this.frequencyCoding)) {
+						this.$api.get('/api/gas-cylinder/' + this.frequencyCoding).then(res => {
+							if (res.code == 200) {
+								this.codeList.push(this.frequencyCoding)
+								this.codeList = Array.from(new Set(this.codeList));
+								this.frequencyCoding = ''
+							} else {
+								uni.$u.toast(res.data.msg)
+							}
+						})
+					} else {
+						uni.$u.toast('请输入正确单位内编号')
+					}
+				}
+			},
+>>>>>>> ec9bba9783fc5bf29c8b3276224b1ab4fab155dc
 			// 添加一条
 			addLine() {
 				this.scanType = 1
@@ -127,7 +154,6 @@
 					scanType: ['qrCode'],
 					autoZoom: false,
 					success: (res) => {
-						console.log(res, '--------');
 						if (res.result) {
 							let url = res.result;
 							const arrf = url.split('=')

pages/information/transfer.vue

@@ -64,14 +64,22 @@
 					<view style="width: 100%;display: flex;flex-direction: column;">
 						<view class="card_dinay frame" v-for="(item,index) in list" :key="index">
 							<view style="display: flex;align-items: center;">
+<<<<<<< HEAD
 								<u-checkbox :disabled="item.isAllot" :name="item.inner_code"
 									:checked="item.checked"></u-checkbox>
+=======
+								<u-checkbox :name="item.inner_code" :checked="item.checked" :disabled="item.isAllot"></u-checkbox>
+>>>>>>> ec9bba9783fc5bf29c8b3276224b1ab4fab155dc
 								<view style="display: flex;align-items: center;margin-left: 20rpx;">
 									<view class="item_current">{{index + 1}}</view>
 									<view class="item_title1">{{item.inner_code}}</view>
 								</view>
 							</view>
+<<<<<<< HEAD
 							<view class="blue_transferr" v-if="item.isAllot">调拨中</view>
+=======
+							<view class="blue_title" v-if="item.isAllot">调拨中</view>
+>>>>>>> ec9bba9783fc5bf29c8b3276224b1ab4fab155dc
 						</view>
 					</view>
 				</u-checkbox-group>

pages/information/transferDetails.vue

@@ -31,6 +31,7 @@
 				<view class="title_code_a">单位内编号</view>
 				<view class="num_code">总数: {{innerCodeData.length}}</view>
 			</view>
+<<<<<<< HEAD
 			<u-checkbox-group v-model="checkedList" v-if="userList.status == 1 && type == 1" @change="checkboxChange">
 				<view style="display: flex;flex-direction: column;width: 100%;">
 					<view class="item_card_tran frame" v-for="(item,index) in innerCodeData">
@@ -49,15 +50,33 @@
 					<view style="display: flex;align-items: center;" v-if="userList.status != 1">
 						<view class="color_blue" v-if="item.flag">已接收</view>
 						<view class="color_red" v-else>未接收</view>
+=======
+			<u-checkbox-group v-model="checkedList" @change="checkboxChange">
+				<view style="display: flex;flex-direction: column;width: 100%;">
+					<view class="item_card_tran frame" v-for="(item,index) in innerCodeData">
+						<view style="display: flex;align-items: center;">
+							<u-checkbox :name="item.inner_code" :checked="item.checked"
+								v-if="type == 1 && userList.status == 1"></u-checkbox>
+							<view style="width: 60rpx;margin-right: 10rpx;text-align: center;">{{index + 1}}</view>
+							<span style="font-weight: 600;">{{item.inner_code}}</span>
+						</view>
+						<view style="display: flex;align-items: center;" v-if="userList.status != 1">
+							<span class="blue_title" v-if="item.flag">已接收</span>
+							<span class="red_title" v-else>未接收</span>
+						</view>
+>>>>>>> ec9bba9783fc5bf29c8b3276224b1ab4fab155dc
 					</view>
 				</view>
-			</view>
+			</u-checkbox-group>
 		</view>
 		<view style="width: 100%;height: 120rpx;"></view>
 		<view class="btn_transfer_details" v-if="type == 1 && userList.status == 1">
+<<<<<<< HEAD
 			<!-- <view style="flex: 1;">
 				<u-button style="width: 90%;" type="error" @click="cancelAllocation">取消</u-button>
 			</view> -->
+=======
+>>>>>>> ec9bba9783fc5bf29c8b3276224b1ab4fab155dc
 			<view style="flex: 1;">
 				<u-button style="width: 90%;" type="primary" @click="submit">确定</u-button>
 			</view>
@@ -91,6 +110,25 @@
 				} else {
 					this.transferTitle = '调拨详情'
 				}
+				this.checkedList = userArr.innerCodeList
+				this.innerCodeData = []
+				userArr.innerCodeList.forEach(item => {
+					let arr = {
+						inner_code: '',
+						checked: true,
+					}
+					arr.inner_code = item
+					if (userArr.acceptInnerCodeList == null) {
+						userArr.acceptInnerCodeList = []
+					}
+					if (userArr.acceptInnerCodeList.indexOf(item) > -1) {
+						arr.flag = true;
+					} else {
+						arr.flag = false;
+					}
+					this.innerCodeData.push(arr)
+				})
+				console.log(this.innerCodeData, userArr, 6767)
 				this.userList = userArr
 				// console.log(this.userList,25)
 				const bmList = this.regroup(userArr.innerCodeList, true)
@@ -145,17 +183,50 @@
 					}
 				})
 			},
+<<<<<<< HEAD
 			// 选择钢瓶编号
 			checkboxChange(value) {
 				for (let i = 0; i < this.innerCodeData.length; i++) {
 					let flag = value.includes(this.innerCodeData[i].inner_code);
 					if (flag) {
 						this.innerCodeData[i].checked = true
+=======
+			submit() {
+				this.$api.post('/api/gas-cylinder-allot/submit', {
+					id: this.userList.id,
+					optType: this.userList.optType,
+					allotUserId: this.userList.allotUserId,
+					acceptUserId: this.userList.acceptUserId,
+					allotCompanyId: this.userList.allotCompanyId,
+					acceptCompanyId: this.userList.acceptCompanyId,
+					innerCodeList: this.checkedList,
+				}).then(res => {
+					if (res.code == 200) {
+						uni.navigateBack({
+							delta: 1
+						});
+>>>>>>> ec9bba9783fc5bf29c8b3276224b1ab4fab155dc
 					} else {
 						this.innerCodeData[i].checked = false
 					}
+<<<<<<< HEAD
 				}
 				this.checkedList = value
+=======
+				})
+			},
+			// 选择钢瓶
+			checkboxChange(value) {
+				for (let i = 0; i < this.innerCodeData.length; i++) {
+					let flag = value.includes(this.innerCodeData[i].inner_code);
+					if (flag) {
+						this.innerCodeData[i].checked = true
+					} else {
+						this.innerCodeData[i].checked = false
+					}
+				}
+				this.checkedList = this.checkedList.concat(value);
+>>>>>>> ec9bba9783fc5bf29c8b3276224b1ab4fab155dc
 			}
 		}
 	}
@@ -200,6 +271,7 @@
 	.item_card_tran {
 		display: flex;
 		align-items: center;
+		justify-content: space-between;
 		padding: 30rpx 30rpx 30rpx 0rpx;
 	}
 
@@ -225,6 +297,7 @@
 		border-top: 1rpx solid #f4f4f5;
 	}
 
+<<<<<<< HEAD
 	.color_blue {
 		color: #19be6b;
 		font-size: 26rpx;
@@ -233,5 +306,15 @@
 	.color_red {
 		color: #fa3534;
 		font-size: 26rpx;
+=======
+	.blue_title {
+		color: #53c21d;
+		font-size: 28rpx;
+	}
+
+	.red_title {
+		color: red;
+		font-size: 28rpx;
+>>>>>>> ec9bba9783fc5bf29c8b3276224b1ab4fab155dc
 	}
 </style>

pages/information/transferRecord.vue

@@ -33,12 +33,20 @@
 					<span>单位内编号：</span>
 					<span class="examine_title" @click.stop="clickToView(item)">点击查看</span>
 				</view>
+<<<<<<< HEAD
 				<view class="del_btn_card center_in" v-if="item.status == 3 || item.status == 4"
 					@click.stop="delAllocation(item)">
 					删除
 				</view>
 				<view class="orange_btn_card center_in" v-if="item.status == 1" @click.stop="cancelAllocation(item)">
 					取消调拨
+=======
+				<view style="margin-top: 20rpx;" @click.stop="cancelAllocation(item)" v-if="item.status == 1">
+					<u-button type="warning" size="normal" text="取消调拨"></u-button>
+				</view>
+				<view style="margin-top: 20rpx;" @click.stop="delAllocation(item)" v-if="item.status == 3">
+					<u-button type="error" text="删除"></u-button>
+>>>>>>> ec9bba9783fc5bf29c8b3276224b1ab4fab155dc
 				</view>
 			</view>
 		</view>
@@ -59,6 +67,7 @@
 				</view>
 			</view>
 		</u-popup>
+		<u-modal :show="hintShow" :content='hintTitle' showCancelButton @confirm="confirmAllocation" @cancel="hintShow = false"></u-modal>
 	</view>
 </template>
 
@@ -99,6 +108,9 @@
 				loadingMore: true,
 				innerCodeShow: false,
 				innerCodeData: [],
+				hintShow: false,
+				allotId: null,
+				hintTitle: '此操作将永久删除该调拨记录, 是否继续?',
 			}
 		},
 		onReachBottom() {
@@ -170,7 +182,11 @@
 			},
 			// 我调拨的/我接收的
 			standardClick(event) {
+<<<<<<< HEAD
 				// console.log(event,326)
+=======
+				console.log(event, 25)
+>>>>>>> ec9bba9783fc5bf29c8b3276224b1ab4fab155dc
 				this.belowStandard = event.index
 				if (event.index == 0) {
 					this.bottleList[1].name = '调拨中'
@@ -183,6 +199,36 @@
 				this.list = []
 				this.getList()
 			},
+			// 取消调拨
+			cancelAllocation(event) {
+				this.$api.post('/api/gas-cylinder-allot/cancel', {
+					id: event.id,
+				}).then(res => {
+					if (res.code == 200) {
+						this.list = []
+						uni.$u.toast(res.msg)
+						this.getList()
+					}
+				})
+			},
+			// 删除
+			delAllocation(event) {
+				this.hintShow = true
+				this.allotId = event.id
+			},
+			// 确定删除
+			confirmAllocation() {
+				this.$api.delete('/api/gas-cylinder-allot', {
+					id: this.allotId,
+				}).then(res => {
+					if (res.code == 200) {
+						this.list = []
+						uni.$u.toast(res.msg)
+						this.getList()
+					}
+					this.hintShow = false
+				})
+			},
 			// 详情
 			recordParticulars(value) {
 				uni.setStorageSync('transferData', JSON.stringify(value));
@@ -249,6 +295,10 @@
 		background-color: #f4f4f5;
 	}
 
+	.u-button--normal {
+		height: 70rpx !important;
+	}
+
 	.tabs_card_bg {
 		background-color: #fff;
 	}

pages/mine/personal.vue

@@ -272,6 +272,18 @@
 				}).catch(() => {
 					uni.hideLoading();
 				})
+			},
+			eliminateImge(img) {
+				let arr = img.split(',')
+				console.log(img,arr,1)
+				let imgArr = []
+				arr.forEach(item => {
+					let img = item.split(this.$baseUrl)
+					imgArr.push(img[1])
+				})
+				let imgList = imgArr.join()
+				console.log(imgList,26)
+				return imgList
 			}
 		}
 	}

pages/order/securityCheck.vue

@@ -245,21 +245,28 @@
 					this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
 						status: 'success',
 						message: '',
-						url: result
+						url: this.$baseUrl + result
 					}))
 					fileListLen++
 				}
+				uni.hideLoading();
 				if (event.name == '1') {
 					var arr = []
 					this.fileList1.forEach(item1 => {
-						arr.push(item1.url)
+						let img = item1.url.split(this.$baseUrl)
+						arr.push(img[1])
 					})
 					this.ruleForm.homeCheckImg = arr.join()
 					this.$refs.uForm.validateField('homeCheckImg')
 				} else {
 					var arr1 = []
 					this.fileList2.forEach(item2 => {
+<<<<<<< HEAD
 						arr1.push(item2.url)
+=======
+						let img1 = item2.url.split(this.$baseUrl)
+						arr1.push(img1[1])
+>>>>>>> ec9bba9783fc5bf29c8b3276224b1ab4fab155dc
 					})
 					this.ruleForm.beforeRectifyImg = arr1.join()
 					this.$refs.uForm.validateField('beforeRectifyImg')