guoyujia il y a 5 mois
Parent
commit
db91ae4c49

+ 1 - 1
pages/auxiliaryDaywork/index.vue

@@ -8,7 +8,7 @@
 
 		<view class="time-controls" style="margin-top: 10rpx;">
 			<uni-section title="报工日期:" type="square" class="uni-row sta">
-				<input v-model="startTime" type="date" @input="timeSizer" />
+				<input v-model="startTime" type="date" @input="timeSizer" style="padding-top: 12px;" />
 				<!-- <view>
 					<uni-datetime-picker v-model="startTime" type="date" @change="timeSizer"></uni-datetime-picker>
 				</view> -->

+ 8 - 7
pages/batchReporting/index.vue

@@ -1,7 +1,8 @@
 <template>
 	<view v-if="isMaskShow" class="mask">
 	</view>
-	<view class="uni-column" style="height: 100%; background-color: #f5f5f5;">
+	<view class="uni-column"
+		style="height: 100%; background-color: #f5f5f5;padding: 8px;position: fixed;left: 0;right: 0;">
 		<view class="box-bg uni-row">
 			<view class="input-view uni-row">
 				<uni-icons class="input-uni-icon" type="search" size="18" color="#999" />
@@ -22,13 +23,13 @@
 			<switch class="switch" @change="switchChange" color="rgba(255,85,85,1)" />
 			<text>否</text> -->
 		</view>
+		<view v-if="listData.length == 0" style="color: #999;margin: 50% auto;">
+			<text>暂无批次</text>
+		</view>
+		<view v-else class="scroll-container" style="margin-bottom:130px">
 
-		<view class="scroll-container" style="padding-bottom:  150rpx">
-			<view v-if="listData.length == 0" style="color: #999;margin: 50% auto;">
-				<text>暂无批次</text>
-			</view>
 			<!-- 批次列表 -->
-			<view v-else v-for="(item, index) in listData" :key="index" class="list-item"
+			<view v-for="(item, index) in listData" :key="index" class="list-item"
 				@click="handleToreportingForWork(item)">
 				<view class="title-container uni-row" style="justify-content: flex-start;">
 					<view class="title uni-row">
@@ -136,7 +137,7 @@
 		</view>
 		<!-- 抽屉 -->
 		<uni-drawer ref="showRight" mode="right" :mask-click="true" style="height: 100%;">
-			<view style="text-align: center; font-size: 48rpx; padding: 48rpx 0 24rpx 0;">工艺列表</view>
+			<view style="text-align: center; font-size: 48rpx; padding: 80rpx 0 24rpx 0;">工艺列表</view>
 			<view style="font-size: 24rpx;text-align: center;color: red; margin-bottom: 16rpx;">
 				仅显示当前工序后面工艺
 			</view>

+ 11 - 9
pages/deliveryExamine/index.vue

@@ -8,7 +8,7 @@
 
 		<view class="time-controls" style="margin-top: 10rpx;">
 			<uni-section title="检查日期:" type="square" class="uni-row sta">
-				<input v-model="startTime" type="date" @input="timeSizer" />
+				<input v-model="startTime" type="date" @input="timeSizer" style="padding-top: 12px;" />
 			</uni-section>
 		</view>
 		<view class="daywork-item uni-column" v-for="(item, index) in inspecionList" :key="index"
@@ -16,7 +16,7 @@
 			<view class="lot-code uni-row">
 				<text>批次号:{{ item.lotCode }}</text>
 				<text :style="selectType(item)">{{ selectText(item) }}</text>
-				<text  class="fa fa-trash" style="font-size: 16; color: white;"></text>
+				<text class="fa fa-trash" style="font-size: 16; color: white;"></text>
 			</view>
 			<view class="info">
 				<view class="info-row uni-row">
@@ -38,9 +38,9 @@
 				<view class="info-row uni-row">
 					<view class="label">检测载具:</view>
 					<view class="value">{{ item.inspectionCarrierCode }}</view>
-					<button class="start-batch-btn" v-if="item.adoptStatus != 1" style="margin-right: 10rpx; " type="primary"
-						@click.stop="handlePass(item)">通过</button>
-					<button class="start-batch-btn" v-if="item.adoptStatus != 2"  style="background-color:#fe5555;"
+					<button class="start-batch-btn" v-if="item.adoptStatus != 1" style="margin-right: 10rpx; "
+						type="primary" @click.stop="handlePass(item)">通过</button>
+					<button class="start-batch-btn" v-if="item.adoptStatus != 2" style="background-color:#fe5555;"
 						@click.stop="handleFailed(item)">不通过</button>
 				</view>
 			</view>
@@ -128,6 +128,7 @@
 			}
 		});
 	}
+
 	function delable(item) {
 		return true
 		// if (store.userInfo.permissions.some(item => item === 'business:outsourcedInspection:remove') && item.status == 0) {
@@ -185,16 +186,16 @@
 	//交检审核通过
 	function handlePass(data) {
 		data.adoptStatus = 1
-		updateAdoptStatus(data).then(res =>{
+		updateAdoptStatus(data).then(res => {
 			getList()
 		})
 	}
 	//交检不通过
 	function handleFailed(data) {
 		data.adoptStatus = 2
-			updateAdoptStatus(data).then(res =>{
-				getList()
-			})
+		updateAdoptStatus(data).then(res => {
+			getList()
+		})
 	}
 
 	//状态样式
@@ -324,6 +325,7 @@
 				.value {
 					flex: 1;
 				}
+
 				.start-batch-btn {
 					flex: 1;
 					height: 80rpx;

+ 3 - 2
pages/deliveryInspection/index.vue

@@ -11,9 +11,10 @@
 			<view class="uni-row sta">
 				<span style="align-items: center;display: flex;font-size: 16px;margin-left: 12rpx;">检查日期:</span>
 				<view class="uni-row" style="flex: 1;width: 100%;">
-					<input v-model="startTime" type="date" @input="timeSizer" style="flex: 1;width: 100%;" />
+					<input v-model="startTime" type="date" @input="timeSizer"
+						style="flex: 1;width: 100%;padding-top: 12px;" />
 					<span style="align-items: center;display: flex;">—</span>
-					<input v-model="endTime" type="date" @input="timeSizer" />
+					<input v-model="endTime" type="date" @input="timeSizer" style="padding-top: 12px;" />
 				</view>
 			</view>
 		</view>

+ 3 - 2
pages/factoryInspection/index.vue

@@ -11,9 +11,10 @@
 			<view class="uni-row sta">
 				<span style="align-items: center;display: flex;font-size: 16px;margin-left: 12rpx;">检查日期:</span>
 				<view class="uni-row" style="flex: 1;width: 100%;">
-					<input v-model="startTime" type="date" @input="timeSizer" style="flex: 1;width: 100%;" />
+					<input v-model="startTime" type="date" @input="timeSizer"
+						style="flex: 1;width: 100%;padding-top: 12px;" />
 					<span style="align-items: center;display: flex;">—</span>
-					<input v-model="endTime" type="date" @input="timeSizer" />
+					<input v-model="endTime" type="date" @input="timeSizer" style="padding-top: 12px;" />
 				</view>
 			</view>
 		</view>

+ 3 - 2
pages/firstInspection/index.vue

@@ -11,9 +11,10 @@
 			<view class="uni-row sta">
 				<span style="align-items: center;display: flex;font-size: 16px;margin-left: 12rpx;">检查日期:</span>
 				<view class="uni-row" style="flex: 1;width: 100%;">
-					<input v-model="startTime" type="date" @input="timeSizer" style="flex: 1;width: 100%;" />
+					<input v-model="startTime" type="date" @input="timeSizer"
+						style="flex: 1;width: 100%;padding-top: 12px;" />
 					<span style="align-items: center;display: flex;">—</span>
-					<input v-model="endTime" type="date" @input="timeSizer" />
+					<input v-model="endTime" type="date" @input="timeSizer" style="padding-top: 12px;" />
 				</view>
 			</view>
 		</view>

+ 5 - 0
pages/innerTurnover/index.vue

@@ -349,6 +349,11 @@
 			font-size: 12px;
 			color: #666;
 			padding-top: 16px;
+			height: 100%;
+			position: fixed;
+			background-color: #f5f5f5;
+			left: 0;
+			right: 0;
 		}
 
 		.scroll-item {

+ 1 - 1
pages/inspectionDetails/index.vue

@@ -8,7 +8,7 @@
 
 		<view class="time-controls" style="margin-top: 10rpx;">
 			<uni-section title="检查日期:" type="square" class="uni-row sta" style="flex: 1;">
-				<input v-model="startTime" type="date" @input="timeSizer" />
+				<input v-model="startTime" type="date" @input="timeSizer" style="padding-top: 12px;" />
 			</uni-section>
 		</view>
 		<view

+ 3 - 2
pages/instrumentRoomInspection/index.vue

@@ -11,9 +11,10 @@
 			<view class="uni-row sta">
 				<span style="align-items: center;display: flex;font-size: 16px;margin-left: 12rpx;">检查日期:</span>
 				<view class="uni-row" style="flex: 1;width: 100%;">
-					<input v-model="startTime" type="date" @input="timeSizer" style="flex: 1;width: 100%;" />
+					<input v-model="startTime" type="date" @input="timeSizer"
+						style="flex: 1;width: 100%;padding-top: 12px;" />
 					<span style="align-items: center;display: flex;">—</span>
-					<input v-model="endTime" type="date" @input="timeSizer" />
+					<input v-model="endTime" type="date" @input="timeSizer" style="padding-top: 12px;" />
 				</view>
 			</view>
 		</view>

+ 3 - 2
pages/onSiteInspection/index.vue

@@ -11,9 +11,10 @@
 			<view class="uni-row sta">
 				<span style="align-items: center;display: flex;font-size: 16px;margin-left: 12rpx;">检查日期:</span>
 				<view class="uni-row" style="flex: 1;width: 100%;">
-					<input v-model="startTime" type="date" @input="timeSizer" style="flex: 1;width: 100%;" />
+					<input v-model="startTime" type="date" @input="timeSizer"
+						style="flex: 1;width: 100%;padding-top: 12px;" />
 					<span style="align-items: center;display: flex;">—</span>
-					<input v-model="endTime" type="date" @input="timeSizer" />
+					<input v-model="endTime" type="date" @input="timeSizer" style="padding-top: 12px;" />
 				</view>
 			</view>
 		</view>

+ 3 - 2
pages/outsourcedInspection/index.vue

@@ -11,9 +11,10 @@
 			<view class="uni-row sta">
 				<span style="align-items: center;display: flex;font-size: 16px;margin-left: 12rpx;">检查日期:</span>
 				<view class="uni-row" style="flex: 1;width: 100%;">
-					<input v-model="startTime" type="date" @input="timeSizer" style="flex: 1;width: 100%;" />
+					<input v-model="startTime" type="date" @input="timeSizer"
+						style="flex: 1;width: 100%;padding-top:12px;" />
 					<span style="align-items: center;display: flex;">—</span>
-					<input v-model="endTime" type="date" @input="timeSizer" />
+					<input v-model="endTime" type="date" @input="timeSizer" style="padding-top: 12px;" />
 				</view>
 			</view>
 		</view>

+ 8 - 6
pages/outsourcedReturnCheck/index.vue

@@ -1,7 +1,8 @@
 <template>
 	<view v-if="isMaskShow" class="mask">
 	</view>
-	<view class="uni-column" style="height: 100%; background-color: #f5f5f5;">
+	<view class="uni-column"
+		style="height: 100%; background-color: #f5f5f5;padding: 8px;position: fixed;left: 0;right: 0;">
 		<view class="box-bg uni-row">
 			<view class="input-view uni-row">
 				<uni-icons class="input-uni-icon" type="search" size="18" color="#999" />
@@ -11,11 +12,12 @@
 				搜索
 			</view>
 		</view>
-		<view class="scroll-container" style="padding-bottom:  150rpx">
-			<view v-if="listData.length == 0" style="color: #999;margin: 50% auto;">
-				<text>暂无批次</text>
-			</view>
-			<view v-else v-for="(item, index) in listData" :key="index" class="list-item"
+		<view v-if="listData.length == 0" style="color: #999;margin: 50% auto;">
+			<text>暂无批次</text>
+		</view>
+		<view v-else class="scroll-container" style="padding-bottom:  150rpx">
+
+			<view v-for="(item, index) in listData" :key="index" class="list-item"
 				@click="handleToreportingForWork(item)">
 				<view class="item-info uni-row">
 					<text class="label">外协单:</text>

+ 5 - 1
pages/pdfviewer/index.vue

@@ -1,5 +1,9 @@
 <template>
-	<view style="height: 1100rpx;">
+	<view style="position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    height: 100%;">
 		<web-view :src="url"></web-view>
 		<!-- <iframe width="100%" height="800rpx" :src="url"></iframe> -->
 	</view>

+ 2 - 2
pages/reportHistory/index.vue

@@ -5,10 +5,10 @@
 			<view class="second">注意日期区间最长不超过31天</view>
 		</view>
 		<uni-section title="开始日期:" type="square" class="uni-row sta">
-			<input v-model="startTime" type="date" />
+			<input v-model="startTime" type="date" style="padding-top: 12px;" />
 		</uni-section>
 		<uni-section title="结束日期:" type="square" class="uni-row end">
-			<input v-model="endTime" type="date" />
+			<input v-model="endTime" type="date" style="padding-top: 12px;" />
 		</uni-section>
 		<button @click="handleSearch">查询</button>
 	</view>

+ 6 - 5
pages/sortBatchReporting/index.vue

@@ -14,12 +14,13 @@
 			<text>{{ normalStatus ? '是' : '否' }}</text>
 			<switch class="switch" :checked="normalStatus" @change="switchChange" color="rgba(103, 195, 55, 1.0)" />
 		</view>
-		<view class="scroll-container" style="margin-bottom: 100px;">
-			<view v-if="listData.length == 0" style="color: #999;margin: 50% auto;">
-				<text>暂无批次</text>
-			</view>
+		<view v-if="listData.length == 0" style="color: #999;margin: 50% auto;">
+			<text>暂无批次</text>
+		</view>
+		<view v-else class="scroll-container" style="margin-bottom:130px">
+
 			<!-- 批次列表 -->
-			<view v-else v-for="(item, index) in listData" :key="index" class="list-item" @click="checkStatus(item)">
+			<view v-for="(item, index) in listData" :key="index" class="list-item" @click="checkStatus(item)">
 				<!-- @click="handleToreportingForWork(item)" -->
 				<view class="title-container uni-row" style="justify-content: flex-start;">
 					<view class="title uni-row">

+ 83 - 77
static/hybrid/html/web/viewer.js

@@ -179,8 +179,7 @@
 	/* 0 */
 	/***/
 	(function(module, exports, __webpack_require__) {
-		"use strict";
-		;
+		"use strict";;
 		var pdfjsWebApp, pdfjsWebAppOptions; {
 			pdfjsWebApp = __webpack_require__(1);
 			pdfjsWebAppOptions = __webpack_require__(6);
@@ -2970,89 +2969,89 @@
 							turnOnlyIfPageFit = true;
 						}
 
-						case 75:
-						case 80:
-							turnPage = -1;
-							break;
+					case 75:
+					case 80:
+						turnPage = -1;
+						break;
 
-						case 27:
-							if (PDFViewerApplication.secondaryToolbar.isOpen) {
-								PDFViewerApplication.secondaryToolbar.close();
-								handled = true;
-							}
+					case 27:
+						if (PDFViewerApplication.secondaryToolbar.isOpen) {
+							PDFViewerApplication.secondaryToolbar.close();
+							handled = true;
+						}
 
-							if (!PDFViewerApplication.supportsIntegratedFind && PDFViewerApplication.findBar
-								.opened) {
-								PDFViewerApplication.findBar.close();
-								handled = true;
-							}
+						if (!PDFViewerApplication.supportsIntegratedFind && PDFViewerApplication.findBar
+							.opened) {
+							PDFViewerApplication.findBar.close();
+							handled = true;
+						}
 
-							break;
+						break;
 
-						case 40:
-						case 34:
-							if (pdfViewer.isVerticalScrollbarEnabled) {
-								turnOnlyIfPageFit = true;
-							}
+					case 40:
+					case 34:
+						if (pdfViewer.isVerticalScrollbarEnabled) {
+							turnOnlyIfPageFit = true;
+						}
 
-							turnPage = 1;
-							break;
+						turnPage = 1;
+						break;
 
-						case 13:
-						case 32:
-							if (!isViewerInPresentationMode) {
-								turnOnlyIfPageFit = true;
-							}
+					case 13:
+					case 32:
+						if (!isViewerInPresentationMode) {
+							turnOnlyIfPageFit = true;
+						}
 
-							turnPage = 1;
-							break;
+						turnPage = 1;
+						break;
 
-						case 39:
-							if (pdfViewer.isHorizontalScrollbarEnabled) {
-								turnOnlyIfPageFit = true;
-							}
+					case 39:
+						if (pdfViewer.isHorizontalScrollbarEnabled) {
+							turnOnlyIfPageFit = true;
+						}
 
-							case 74:
-							case 78:
-								turnPage = 1;
-								break;
+					case 74:
+					case 78:
+						turnPage = 1;
+						break;
 
-							case 36:
-								if (isViewerInPresentationMode || PDFViewerApplication.page > 1) {
-									PDFViewerApplication.page = 1;
-									handled = true;
-									ensureViewerFocused = true;
-								}
+					case 36:
+						if (isViewerInPresentationMode || PDFViewerApplication.page > 1) {
+							PDFViewerApplication.page = 1;
+							handled = true;
+							ensureViewerFocused = true;
+						}
 
-								break;
+						break;
 
-							case 35:
-								if (isViewerInPresentationMode || PDFViewerApplication.page <
-									PDFViewerApplication.pagesCount) {
-									PDFViewerApplication.page = PDFViewerApplication.pagesCount;
-									handled = true;
-									ensureViewerFocused = true;
-								}
+					case 35:
+						if (isViewerInPresentationMode || PDFViewerApplication.page <
+							PDFViewerApplication.pagesCount) {
+							PDFViewerApplication.page = PDFViewerApplication.pagesCount;
+							handled = true;
+							ensureViewerFocused = true;
+						}
 
-								break;
+						break;
 
-							case 83:
-								PDFViewerApplication.pdfCursorTools.switchTool(_pdf_cursor_tools.CursorTool
-									.SELECT);
-								break;
+					case 83:
+						PDFViewerApplication.pdfCursorTools.switchTool(_pdf_cursor_tools.CursorTool
+							.SELECT);
+						break;
 
-							case 72:
-								PDFViewerApplication.pdfCursorTools.switchTool(_pdf_cursor_tools.CursorTool
-									.HAND);
-								break;
+					case 72:
+						PDFViewerApplication.pdfCursorTools.switchTool(_pdf_cursor_tools.CursorTool
+							.HAND);
+						break;
 
-							case 82:
-								PDFViewerApplication.rotatePages(90);
-								break;
+					case 82:
+						PDFViewerApplication.rotatePages(90);
+						break;
 
-							case 115:
-								PDFViewerApplication.pdfSidebar.toggle();
-								break;
+					case 115:
+						PDFViewerApplication.pdfSidebar.toggle();
+						break;
 				}
 
 				if (turnPage !== 0 && (!turnOnlyIfPageFit || pdfViewer.currentScaleValue === 'page-fit')) {
@@ -15656,20 +15655,27 @@
 											case 0:
 												databaseStr = JSON.stringify(
 													this.database);
-												localStorage.setItem(
-													'pdfjs.history',
-													databaseStr);
+												// localStorage.setItem(
+												// 	'pdfjs.history',
+												// 	databaseStr);
 												// let arr = this.database.files[0]
 												/* 这里不读缓存 走window事件 */
-												let data = [
-												{totalPage: window.PDFViewerApplication.pagesCount}, 
-												{page: window.PDFViewerApplication.page},
+												let data = [{
+														totalPage: window
+															.PDFViewerApplication
+															.pagesCount
+													},
+													{
+														page: window
+															.PDFViewerApplication
+															.page
+													},
 												]
 												// console.log("0000",window.PDFViewerApplication.page,window.PDFViewerApplication.pagesCount)
 												// console.log("pdf记录:",data)
 												// uni.webView.getEnv(function(res) {
-												        // console.log('当前环境:' + JSON.stringify(res));
-												      // });
+												// console.log('当前环境:' + JSON.stringify(res));
+												// });
 												uni.postMessage({
 													data: data
 												});
@@ -18129,4 +18135,4 @@
 	})
 	/******/
 ]);
-//# sourceMappingURL=viewer.js.map
+//# sourceMappingURL=viewer.js.map