Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp

mycomponents/job/jobTop.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="task_top">
-		<view class="uni-flex space-between u-col-center align-center" style="margin: 10rpx;">
+		<view class="uni-flex space-between u-col-center align-center" >
 			<job-number :number="dataContent.number"></job-number>
 			<job-status :jobStatus="dataContent.status"></job-status>
 		</view>

mycomponents/location/requiredLocation.vue

@@ -4,12 +4,11 @@
 	 padding-left: 10rpx;
 	 padding-right: 10rpx;
 	 font-size:32rpx;">
+		<view class="uni-flex uni-row u-col-center" @click="showLocation">
 			<text style="font-size: 35rpx;">{{title}} </text>
-		<view class="uni-flex u-col-center" @click="showLocation">
-			<text style="color:#3FBAFF;font-size: 35rpx;" v-if="locationCode==''&&isShowEdit==true">&nbsp 请扫描</text>
-			<text style="color:#3FBAFF; font-size: 35rpx;">&nbsp {{locationCode}}</text>
-			<image v-if="isShowEdit" style="width: 45rpx;height: 45rpx;" src="/static/icons/icons_edit.svg"
-				></image>
+			<text style="font-size: 35rpx;color:#3FBAFF;" v-if="locationCode==''&&isShowEdit==true">&nbsp 请扫描</text>
+			<text style="font-size: 35rpx;color:#3FBAFF;">&nbsp {{locationCode}}</text>
+			<image v-if="isShowEdit" style="width:45rpx;height: 45rpx;" src="/static/icons/icons_edit.svg"></image>
 		</view>
 		<win-scan-location ref="scanLocationCode" :title="title" @getLocation='getLocation'
 			:locationTypeList="locationTypeList"></win-scan-location>

mycomponents/recommend/recommend.vue

@@ -11,7 +11,8 @@
 				</location>
 			</view>
 			<view>
-				<recommend-qty v-if="detail.handleQty==null || detail.handleQty==undefined||detail.handleQty==0" :dataContent="detail"
+				<!-- ||detail.handleQty==0 -->
+				<recommend-qty v-if="detail.handleQty==null || detail.handleQty==undefined" :dataContent="detail"
 					:isShowStdPack="false"></recommend-qty>
 				<compare-qty v-else :dataContent="detail" :recommendQty="Number(detail.qty)"
 					:handleQty="Number(detail.handleQty)" :isShowStdPack="false">

pages/inspect/coms/inspectComDetailCard.vue

@@ -1,13 +1,12 @@
 <template>
 	<view class="" style="background-color: #fff;">
 		<view class="">
-			
-			<view class="cen_card" style="padding: 20rpx;">
+			<view class="" >
 				<view class="cell_box uni-flex uni-row">
-					<view class="cell_info">
+				<!-- 	<view class="cell_info">
 						<view class="text_lightblue">类型</view>
 						<view>{{getInspectType(jobContent.inspectType)}}</view>
-					</view>
+					</view> -->
 					<view class="cell_info">
 						<view class="text_lightblue">收货数</view>
 						<view>{{jobContent.receiveQty}}{{getUnitInfo(jobContent.uom)}}</view>
@@ -25,9 +24,8 @@
 						<view>{{jobContent.crackQty}}{{getUnitInfo(jobContent.uom)}}</view>
 					</view>
 				</view>
-				<u-line />
+				<!-- <u-line /> -->
 			</view>
-			
 		</view>
 		<u-line />
 		<uni-collapse ref="collapse1" @change="">
@@ -38,26 +36,41 @@
 					<view class="" style="margin-left: 20rpx; ">
 						<batch :batch="jobContent.batch"></batch>
 					</view>
-					
 				</template>
 				<u-line />
 				<view class="" v-for="(item,index) in dataContent.subList">
 					<uni-swipe-action ref="swipeAction">
 						<uni-swipe-action-item @click="swipeClick($event,item,index)"
 							:right-options="item.scaned?scanOptions:detailOptions">
-							<recommend :detail="item" :isShowPack="isShowPack"
-								:isShowBatch="isShowBatch" :isShowFromLocation="isShowLocation"></recommend>
-								<view v-if="item.failedQty>0||item.crackQty>0" :class="item.scaned?'scan_view':''" style="font-size: 32rpx;padding-left: 3rpx;">
-									<view class="" >
-										不合格数量 ：{{item.failedQty}}
+							<recommend :detail="item" :isShowPack="isShowPack" :isShowBatch="isShowBatch"
+								:isShowFromLocation="isShowLocation"></recommend>
+							<view  v-if="item.failedQty>0||item.crackQty>0" :class="item.scaned?'scan_view':''" style="font-size: 32rpx;">
+								<view class="cell_box uni-flex uni-row">
+									<view class="cell_info uni-flex uni-row">
+										<view class="text_lightblue">
+											不合格
+										</view>
+										<view style="padding-left: 12rpx;color: #F56C6C;">
+											{{item.failedQty}}
+										</view>
+									</view>
+									<view class="cell_info uni-flex uni-row">
+										<view class="text_lightblue">
+											报废
+										</view>
+										<view style="padding-left: 12rpx;color: #EC9C00">
+											{{item.crackQty}}
+										</view>
+									</view>
+									<view class="cell_info uni-flex uni-row">
+										<view class="text_lightblue">
+											合格
+										</view>
+										<view style="padding-left: 12rpx;color: #0A84FF">
+											{{item.goodQty}}
 										</view>
-									<view class="" >
-										报废数量 ：{{item.crackQty}}
 									</view>
-									<view class="" >
-										合格数量 ：{{item.goodQty}}
 								</view>
-									
 							</view>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
@@ -66,8 +79,7 @@
 
 			</uni-collapse-item>
 		</uni-collapse>
-		<inspectEdit ref='inspectEdit'  
-			@getInspectResult='getInspectResult'>
+		<inspectEdit ref='inspectEdit' @getInspectResult='getInspectResult'>
 		</inspectEdit>
 		<job-detail-popup ref="receiptHint" :dataContent="showItem"></job-detail-popup>
 		<com-message ref="message"></com-message>
@@ -134,9 +146,8 @@
 			return {
 				option: [],
 				showItem: {},
-				editItem: {
-				},
-				editIndex:0,
+				editItem: {},
+				editIndex: 0,
 				detailOptions: [],
 				scanOptions: []
 			}
@@ -157,20 +168,20 @@
 		},
 
 		methods: {
-			getInspectType(value){
+			getInspectType(value) {
 				return getInspectType(value)
 			},
 
-			swipeClick(e, item,index) {
+			swipeClick(e, item, index) {
 				if (e.content.text == "详情") {
 					this.detail(item)
 				} else if (e.content.text == "编辑") {
-					this.edit(item,index)
+					this.edit(item, index)
 				} else if (e.content.text == "移除") {
 					this.remove(item)
 				}
 			},
-			edit(item,index) {
+			edit(item, index) {
 				this.editIndex = index;
 				this.editItem = item;
 				this.$refs.inspectEdit.openEditPopup(this.editItem);
@@ -189,10 +200,10 @@
 							item.crackQty = 0;
 							item.sampleQty = 0;
 							item.notPassedQty = 0;
-							item.inspectResult =""
-							item.failedReason =""
-							item.handleQty =0;
-							item.photos =""
+							item.inspectResult = ""
+							item.failedReason = ""
+							item.handleQty = 0;
+							item.photos = ""
 							this.$forceUpdate()
 							this.$emit('remove', item)
 						}
@@ -201,14 +212,14 @@
 			confirm(qty) {
 				this.$emit('updateData')
 			},
-			getInspectResult(result){
-				this.dataContent.subList[this.editIndex]= result;
+			getInspectResult(result) {
+				this.dataContent.subList[this.editIndex] = result;
 				if (this.$refs.collapse1 != undefined) {
 					this.$nextTick(res => {
 						this.$refs.collapse1.resize()
 					})
 				}
-				this.$emit('updateData',)
+				this.$emit('updateData', )
 			},
 			getUnitInfo(value) {
 				return getUnitInfo(value).label

pages/inspect/job/inspectDetail.vue

@@ -1,13 +1,17 @@
 <template>
 	<view class="page-wraper">
+		<view style="margin: 5px;">
+			<job-top :dataContent="jobContent"></job-top>
+			<view>
+				<view class="card_content"> 检验类型 : {{getInspectType(jobContent.inspectType)}}</view>
+			</view>
+		</view>
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
-					<view class="">
-						<inspectComDetailCard :dataContent="item" :jobContent="jobContent" @remove="updateData"
+					<inspect-com-detail-card :dataContent="item" :jobContent="jobContent" @remove="updateData"
 						:isShowBatch="false" @updateData='updateData'>
-						</inspectComDetailCard>
-					</view>
+					</inspect-com-detail-card>
 				</view>
 			</scroll-view>
 		</view>
@@ -46,7 +50,8 @@
 	} from '@/common/basic.js';
 	import {
 		getInventoryStatusName,
-		getDirectoryItemArray
+		getDirectoryItemArray,
+		getInspectType
 	} from '@/common/directory.js';
 
 	import {
@@ -66,7 +71,7 @@
 	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 	import inspectComDetailCard from "@/pages/inspect/coms/inspectComDetailCard.vue"
-
+	import jobTop from '@/mycomponents/job/jobTop.vue'
 	export default {
 		name: 'returnDetail',
 		components: {
@@ -76,6 +81,7 @@
 			winScanPackAndLocation,
 			comMessage,
 			inspectComDetailCard,
+			jobTop
 		},
 		data() {
 			return {
@@ -86,7 +92,7 @@
 				subList: [], //接口返回的任务subList
 				detailSource: [], //绑定在页面上的数据源
 				businessTypeInfo: {},
-				fromInventoryStatuses :"",
+				fromInventoryStatuses: "",
 				managementList: [],
 				selectedItem: {},
 				failedQty: 0,
@@ -477,18 +483,12 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					// let canNavBack = getCurrentPages()
-					// if( canNavBack && canNavBack.length>1) {  
-					//     uni.navigateBack({
-					// 	delta:2
-					// }) 
-					// } else {  
-					//     history.back();  
-					// }
 					navigateBack(2);
 				})
-
 			},
+			getInspectType(value){
+				return getInspectType(value)
+			}
 
 
 		}

pages/issue/record/issueRecord.vue

@@ -268,6 +268,7 @@
 						}
 					})
 				}
+				this.resizeCollapse();
 				// item.handleQty=itemHandleQty;
 				// this.closeScan();
 			},

pages/purchaseReceipt/job/receiptDetail.vue

@@ -1,5 +1,13 @@
 <template>
 	<view class="page-wraper">
+		<view style="margin: 5px;">
+			<job-top :dataContent="jobContent"></job-top>
+			<view class="card_content">
+				发货单号 : {{jobContent.asnNumber}}
+			</view>
+			<u-line />
+		</view>
+
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
@@ -71,6 +79,7 @@
 	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 	import comReceiptDetailCard from '@/pages/purchaseReceipt/coms/comReceiptDetailCard.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
 
 	export default {
 		name: 'receipt_detail',
@@ -79,7 +88,8 @@
 			winScanPack,
 			comReceiptDetailCard,
 			requiredLocation,
-			comMessage
+			comMessage,
+			jobTop
 		},
 		data() {
 			return {
@@ -182,7 +192,7 @@
 						} else {
 							that.showMessage('列表数据为0');
 						}
-						updateTitle(that.jobContent.number);
+						// updateTitle("采购收货-" + that.jobContent.number);
 					}
 				}).catch(error => {
 					uni.hideLoading()
@@ -216,7 +226,7 @@
 								calcHandleQty(this.detailSource);
 								this.continueScan()
 								this.$forceUpdate()
-								var list =this.detailSource[0].subList;
+								var list = this.detailSource[0].subList;
 							}
 						}
 					}
@@ -254,7 +264,7 @@
 
 			commit() {
 				this.scanCount = getScanCount(this.subList);
-				 if( this.scanCount==0){
+				if (this.scanCount == 0) {
 					this.showErrorMessage("扫描数为0,请先扫描")
 					return;
 				}
@@ -347,7 +357,7 @@
 
 			checkLocation() {
 				var isPass = true;
-				if (this.toLocationCode == ""||this.toLocationCode ==null) {
+				if (this.toLocationCode == "" || this.toLocationCode == null) {
 					this.$refs.comMessage.showMessage('请扫描收货库位', res => {
 						if (res) {
 							this.$refs.requiredLocation.showLocation();

pages/setter/index.vue

@@ -12,14 +12,18 @@
 
 				<uni-list-item v-if="userInfo!=null" title="部门" :rightText="userInfo.dept.name"
 					thumb="/static/icon_personal_password.png"></uni-list-item>
-					<uni-list-item v-if="userInfo!=null" title="岗位" :rightText="(userInfo.posts || []).map(post => post.name).join(',')"
+				<uni-list-item v-if="userInfo!=null" title="岗位"
+					:rightText="(userInfo.posts || []).map(post => post.name).join(',')"
 					thumb="/static/icon_personal_password.png"></uni-list-item>
-						<uni-list-item v-if="userInfo!=null" title="角色" :rightText="(userInfo.roles || []).map(role => role.name).join(',')"
+				<uni-list-item v-if="userInfo!=null" title="角色"
+					:rightText="(userInfo.roles || []).map(role => role.name).join(',')"
 					thumb="/static/icon_personal_password.png"></uni-list-item>
 				<uni-list-item title="" clickable rightText="清除缓存" thumb="/static/icon_personal_name.png"
 					@click="clear"></uni-list-item>
 				<uni-list-item title="修改密码" link to="/pages/setter/passwordpage"
 					thumb="/static/icon_personal_password.png"></uni-list-item>
+				<uni-list-item title="服务器地址" 
+					thumb="/static/icon_personal_password.png"></uni-list-item>
 				<!-- 	<uni-list-item title="参数设置" link to="/pages/setter/setterDetail"
 					thumb="/static/icon_personal_setting.png"></uni-list-item> -->
 			</uni-list>
@@ -44,7 +48,9 @@
 		removeToken
 	} from '@/common/utils/auth'
 	import {
-		ref,reactive,nextTick 
+		ref,
+		reactive,
+		nextTick
 	} from "vue";
 	import {
 		onLoad
@@ -53,9 +59,9 @@
 	const userName = ref(store.state.user.name);
 	let test = ref("123");
 	let userInfo = ref(null);
-	onLoad(()=>{
+	onLoad(() => {
 		console.log(11)
-			getUserProfile().then(res=>{
+		getUserProfile().then(res => {
 			userInfo.value = res.data
 			// nextTick(()=>{
 			// 	const userInfo = res.data.nickname