Merge remote-tracking branch 'origin/master'

api/base/path.js

@@ -10,16 +10,19 @@ export const path = reactive({
 	updateAppURL: 'http://120.46.159.163:401/ezhizao-dms-production',
 	// furnaceNoURL: 'http://192.168.31.152:8099',
 	furnaceNoURL: 'http://120.46.159.163:7002',
+	pdfAppURL: 'http://120.46.159.163:401/ezhizao-dms-sys',
 
 	// 内网
 	// innerURL: 'http://192.168.31.151:8099',
 	innerURL: 'http://120.46.159.163:7004',
 	innerUpdateAppURL: 'http://120.46.159.163:401/ezhizao-dms-production',
+	innerPdfAppURL: 'http://120.46.159.163:401/ezhizao-dms-sys',
 	innerFurnaceNoURL: 'http://120.46.159.163:7002',
 
 	// 外网
 	publicURL: 'http://36.129.132.128:8099',
 	outUpdateAppURL: 'http://36.129.132.128:401/ezhizao-dms-production',
+	outPdfAppURL: 'http://36.129.132.128:401/ezhizao-dms-sys',
 	outFurnaceNoURL: 'http://36.129.132.128:401/ezhizao-dms-p2'
 })
 

api/business/processInspection.js

@@ -101,6 +101,14 @@ export function getProcessInspectionByDayworkId(data) {
 	})
 }
 
+export function getCarrierInfoProcess(data) {
+	return req.request({
+		url: '/business/inspecion/getCarrierInfoProcess',
+		method: 'post',
+		data: data
+	})
+}
+
 /**
  * 保存质检箱信息
  */

components/dialog-end-work/dialog-end-work.vue

@@ -191,7 +191,8 @@
 		})
 		getDayworkCarrierList({
 			dayworkId: store.dayworkInfo.id,
-			isChanged: 0
+			isChanged: 0,
+			processInspectionId: 0
 		}).then(res => {
 			console.log(res)
 			if (res.code == 200) {
@@ -211,7 +212,7 @@
 		} else {
 			workInfo.value.status = "2"
 		}
-		console.log(event.detail.value,!store.isPreProcess)
+		console.log(event.detail.value, !store.isPreProcess)
 		showCarrierList.value = event.detail.value;
 	}
 

pages/changeBox/index.vue

@@ -138,6 +138,7 @@
 
 	function init(data) {
 		console.log("data", data)
+		data.processInspectionId = 0
 		getDayworkCarrierList(data).then(res => {
 			// console.log(res)
 			if (res.code == 200) {

pages/index/index.vue

@@ -190,6 +190,7 @@
 								path.checkAppURL = JSON.parse(res.data).checkAppURL;
 								path.updateAppURL = JSON.parse(res.data).updateAppURL;
 								path.furnaceNoURL = JSON.parse(res.data).furnaceNoURL;
+								path.pdfAppURL = JSON.parse(res.data).pdfAppURL;
 							}
 						}
 					});
@@ -203,7 +204,8 @@
 			baseUrl: useInnerUrl ? path.innerURL : path.baseURL,
 			checkAppURL: useInnerUrl ? '' : path.checkAppURL,
 			updateAppURL: useInnerUrl ? path.innerUpdateAppURL : path.updateAppURL,
-			furnaceNoURL: useInnerUrl ? path.innerFurnaceNoURL : path.furnaceNoURL
+			furnaceNoURL: useInnerUrl ? path.innerFurnaceNoURL : path.furnaceNoURL,
+			pdfAppURL: useInnerUrl ? path.innerPdfAppURL : path.pdfAppURL
 		}
 		uni.getStorage({
 			key: 'baseUrl',
@@ -258,12 +260,14 @@
 			path.checkAppURL = path.publicURL;
 			path.updateAppURL = path.outUpdateAppURL;
 			path.furnaceNoURL = path.outFurnaceNoURL;
+			path.pdfAppURL = path.outPdfAppURL
 			handleSetting();
 		} else {
 			baseUrl.value = path.innerURL;
 			path.checkAppURL = path.innerURL;
 			path.updateAppURL = path.innerUpdateAppURL;
 			path.furnaceNoURL = path.innerFurnaceNoURL;
+			path.pdfAppURL = path.innerPdfAppURL
 			handleSetting();
 		}
 	}
@@ -273,7 +277,8 @@
 			baseUrl: baseUrl.value,
 			checkAppURL: path.checkAppURL,
 			updateAppURL: path.updateAppURL,
-			furnaceNoURL: path.furnaceNoURL
+			furnaceNoURL: path.furnaceNoURL,
+			pdfAppURL: path.pdfAppURL,
 		}
 		uni.setStorage({
 			key: 'baseUrl',

pages/outsourcedInspection/scan.vue

@@ -100,6 +100,7 @@
 					//判断该箱是否绑定批次
 
 					result.processCode = store.outsourcedCode;
+					// console.log(result.processCode)
 					/************************ 根据扫码查询到的数据和需要检查的工序查询信息 ************************/
 					getCarrierInfo(result).then(response => {
 						if (response.code == 200) {
@@ -294,6 +295,8 @@
 				// ...lot.value
 				carrierCode: carrierCode.value
 			}
+			result.processCode = store.outsourcedCode;
+			// console.log(result.processCode)
 			getCarrierInfo(result).then(response => {
 				if (response.code == 200) {
 					// 判断是哪种返回值 假设是想信息则给lot附检查箱信息
@@ -308,6 +311,7 @@
 								title: '加载中'
 							});
 							// 此处根据拿到的箱子id， 获取到相对应的【 lot_id】，【 lot_code】， 以及该批次关联的其它箱号
+
 							// 需要定义一个请求方法， 从后端获取
 							getLotOutsourcedInfo(result).then(res => {
 								if (res.code == 200) {

pages/pdfviewer/index.vue

@@ -1,47 +1,53 @@
 <template>
-	<view  style="height: 1100rpx;">
-		<web-view :src="url" ></web-view>
-    <!-- <iframe width="100%" height="800rpx" :src="url"></iframe> -->
+	<view style="height: 1100rpx;">
+		<web-view :src="url"></web-view>
+		<!-- <iframe width="100%" height="800rpx" :src="url"></iframe> -->
 	</view>
 </template>
 
 <script setup>
-	import {onMounted,computed,ref} from 'vue';
-	import {onLoad,} from '@dcloudio/uni-app';
-	import { store } from '../../store';
+	import {
+		onMounted,
+		computed,
+		ref
+	} from 'vue';
+	import {
+		onLoad,
+	} from '@dcloudio/uni-app';
+	import {
+		store
+	} from '../../store';
+
+	const urlList = JSON.parse(uni.getStorageSync('baseUrl'))
 	const url = ref("")
 	const pdfUrl = ref("")
-	const webHost = ref("http://120.46.159.163:401/ezhizao-dms-sys")
+	const webHost = ref(urlList.pdfAppURL)
 	const fileUrl = ref("")
 	const pdfjs = ref("/static/hybrid/html/web/viewer.html")
-	const totalPage=ref(0) //总页码
+	const totalPage = ref(0) //总页码
 	const currentReadPage = ref(0) //当前页码
 	onLoad((options) => {
-		
+		console.log(urlList)
 		pdfUrl.value = options.param1
-		fileUrl.value =webHost.value + pdfUrl.value 
+		fileUrl.value = webHost.value + pdfUrl.value
+		console.log(webHost.value)
 		uni.setNavigationBarTitle({
 			title: ""
 		});
 		console.log(fileUrl.value)
 		init();
-		
+
 	});
 
 
 	function init() {
 		console.log(fileUrl.value)
-		url.value =pdfjs.value + '?file=' +encodeURIComponent(fileUrl.value);
-		
+		url.value = pdfjs.value + '?file=' + encodeURIComponent(fileUrl.value);
+
 		console.log(11, url.value)
 	}
-	
-	
-	
-	
-	
 </script>
 
 <style>
 
-</style>
+</style>

pages/processInspection/scan.vue

@@ -47,7 +47,7 @@
 	} from '@dcloudio/uni-app'
 	import {
 		getLotInfo,
-		getCarrierInfo
+		getCarrierInfoProcess
 	} from '@/api/business/processInspection.js'
 	import {
 		store
@@ -222,7 +222,7 @@
 						return;
 					}
 
-					getCarrierInfo(result).then(resqust => {
+					getCarrierInfoProcess(result).then(resqust => {
 						if (resqust.code == 200) {
 							//返回数据大于一条，跳转选择批次弹窗
 							if (resqust.data.length > 1) {
@@ -311,7 +311,7 @@
 				...lot.value
 			}
 			if (lot.value.lotCode == "" || lot.value.lotCode == null || lot.value.carrierCode != carrierCode.value) {
-				getCarrierInfo(result).then(resqust => {
+				getCarrierInfoProcess(result).then(resqust => {
 					if (resqust.code == 200) {
 						//返回数据大于一条，跳转选择批次弹窗
 						if (resqust.data.length > 1) {

pages/sorting/form.vue

@@ -29,11 +29,14 @@
 						@click="handleDelUnfit(index)" />
 				</view>
 				<!-- <view class="standard">检查标准：{{ item.checkStandard }}</view> -->
-				<view class="result uni-row">
-					<view class="label">检查结果</view>
+				<view class="result uni-row" style="display: flex;flex-direction: row;justify-content: space-between;">
+					<!-- align-items: flex-start; -->
+					<view class="label" style="padding-right: 16rpx;flex: 0 1 auto; min-width: 118rpx;">
+						检查结果</view>
 					<input v-if="Number(dayworkItem.status) < 3" v-model="item.reason" placeholder="请输入检查结果" />
-					<span v-else>{{ item.reason }}</span>
-					<view class="label" style="text-align: right; padding-right: 16rpx;">数量</view>
+					<span v-else style="flex-grow: 1;">{{ item.reason }}</span>
+					<view class="label"
+						style="text-align: right; padding-right: 16rpx;flex: 0 1 auto; min-width: 68rpx;">数量</view>
 					<input v-if="Number(dayworkItem.status) < 3" class="number" type="number" v-model="item.rejectNum"
 						@blur="rejectNumberChange" />
 					<span v-else>{{ item.rejectNum }}</span>

static/hybrid/html/web/viewer.html

@@ -34,7 +34,7 @@ See https://github.com/adobe-type-tools/cmap-resources
 		<script src="../build/pdf.js" type="text/javascript"></script>
 		<script src="viewer.js"></script>
 	</head>
-	<body tabindex="1" class="loadingInProgress">1231233
+	<body tabindex="1" class="loadingInProgress">
 		<div id="outerContainer">
 
 			<div id="sidebarContainer">