报工优化

2024-12-10 18:14:08 +08:00 · 2024-12-10 18:14:08 +08:00 · 5e9927b1bf
commit 5e9927b1bf
parent e533e19435
7 changed files with 167 additions and 65 deletions
--- a/api/reportFlow/index.js
+++ b/api/reportFlow/index.js
@ -17,6 +17,15 @@ export function GetProcessReportWorkDetail(params) {
 	})
 }

+// 领料
+export function FeedProcessReportwork(params) {
+	return request({
+		url: '/mobile/reportflow/feed_process_reportwork',
+		method: 'get',
+		params
+	})
+}
+
 // 工序报工
 export function ProcessReportWork(params) {
 	return request({
@ -26,6 +35,15 @@ export function ProcessReportWork(params) {
 	})
 }

+// 出货
+export function ShipmentProcessReportwork(params) {
+	return request({
+		url: '/mobile/reportflow/shipment_process_reportwork',
+		method: 'get',
+		params
+	})
+}
+
 // 获取工单下的报工列表
 export function GetWorkOrderReportWorkList(params) {
 	return request({
--- a/components/scan-input/scan-input.vue
+++ b/components/scan-input/scan-input.vue
@ -26,16 +26,20 @@ export default {
 		},
 		emitValue() {
 			const _value = this.scanValue;
-			setTimeout(() => {
-				this.scanValue = '';
-			}, 100);
 			this.$nextTick(() => {
 				this.$emit('scanConfirm', _value);
-				this.getFocus();
 			});
+			setTimeout(() => {
+				this.scanValue = '';
+				this.getFocus();
+			}, 300);
+			
 		},
 		inputConfirm() {
-			this.emitValue();
+			setTimeout(()=>{
+				this.emitValue();
+			},300)
+			
 		},
 		// 重置焦点
 		getFocus() {
@ -43,7 +47,7 @@ export default {
 			this.focus = false;
 			setTimeout(() => {
 				this.focus = true;
-			}, 200);
+			}, 300);
 		}
 	}
 };
--- a/manifest.json
+++ b/manifest.json
@ -2,8 +2,8 @@
    "name" : "北泽阀门",
    "appid" : "__UNI__B156498",
    "description" : "北泽阀门PDA",
-    "versionName" : "1..0.0",
-    "versionCode" : 100,
+    "versionName" : "1..0.1",
+    "versionCode" : 101,
    "transformPx" : false,
    "app-plus" : {
        "usingComponents" : true,
--- a/pages/index.vue
+++ b/pages/index.vue
@ -23,7 +23,7 @@
 				</uni-grid-item>
 			</uni-grid>
 		</view>
-		<uni-section title="喷涂线" type="line"></uni-section>
+		<!-- <uni-section title="喷涂线" type="line"></uni-section>
 		<view class="grid-body">
 			<uni-grid :column="4" :showBorder="false" @change="changePaintingGrid">
 				<uni-grid-item v-for="(item, index) in paintingOptions" :key="index" :index="index">
@ -33,8 +33,8 @@
 					</view>
 				</uni-grid-item>
 			</uni-grid>
-		</view>
-		<uni-section title="物料管理" type="line"></uni-section>
+		</view> -->
+		<!-- <uni-section title="物料管理" type="line"></uni-section>
 		<view class="grid-body">
 			<uni-grid :column="4" :showBorder="false" @change="changeMaterialGrid">
 				<uni-grid-item v-for="(item, index) in materialOptions" :key="index" :index="index">
@ -44,7 +44,7 @@
 					</view>
 				</uni-grid-item>
 			</uni-grid>
-		</view>
+		</view> -->
 	</view>
 </template>

--- a/pages/produceManagement/process/process.vue
+++ b/pages/produceManagement/process/process.vue
@ -13,11 +13,35 @@
 					<u-text :text="formData.workorder" type="primary" bold size="18"></u-text>
 				</u-form-item>
 				<u-form-item label="主体型号" borderBottom>
-					<u-input readonly v-model="formData.productionCode" border="none"></u-input>
+					<u-text :text="formData.productionCode" size="16"></u-text>
 				</u-form-item>
 				<u-form-item label="主体品名" borderBottom>
-					<u-input readonly v-model="formData.productionName" border="none"></u-input>
+					<u-text :text="formData.productionName" size="16"></u-text>
 				</u-form-item>
+				<u-form-item label="炉号" borderBottom>
+					<u-input readonly v-model="formData.stoveCode" border="none"></u-input>
+				</u-form-item>
+				<u-form-item label="计划数量" borderBottom>
+					<u-input readonly v-model="formData.planNum" border="none"></u-input>
+				</u-form-item>
+				<u-form-item label="完成数量" borderBottom>
+					<u--input class="input-border" v-model.number="formData.finishNum" type="number"></u--input>
+				</u-form-item>
+				<u-form-item label="不良数量" borderBottom>
+					<u--input class="input-border" v-model.number="formData.badNum" type="number"></u--input>
+				</u-form-item>
+<!-- 				<u-form-item label="报工人" borderBottom>
+					<u--input class="input-border" v-model="formData.worker"></u--input>
+				</u-form-item> -->
+				<u-form-item v-if="processName === '出货'" label="客户定单">
+					<u--input class="input-border" v-model="formData.customerOrder"></u--input>
+				</u-form-item>
+			</u-form>
+		</uni-card>
+
+		<!-- 其他信息 -->
+		<uni-card v-if="formData.workorder">
+			<u-form labelPosition="left" ref="uForm" labelWidth="100">
 				<u-form-item label="主体图号" borderBottom>
 					<u-input readonly v-model="formData.drawingCode" border="none">
 						<template slot="suffix">
@ -25,21 +49,21 @@
 						</template>
 					</u-input>
 				</u-form-item>
-				<u-form-item label="炉号" borderBottom>
-					<u-input readonly v-model="formData.stoveCode" border="none"></u-input>
+				<u-form-item label="版本号" borderBottom>
+					<u-input readonly v-model="formData.version" border="none"></u-input>
 				</u-form-item>
-				<!-- <u-form-item label="前工序数量" borderBottom>
-					<u-input readonly v-model="formData.planNum" border="none"></u-input>
-				</u-form-item> -->
-				<u-form-item label="完成数量" :borderBottom="false">
-					<u--input class="input-border" v-model.number="formData.finishNum" type="number"></u--input>
+				<u-form-item label="材料型号" borderBottom>
+					<u-input readonly v-model="formData.materialName" border="none"></u-input>
 				</u-form-item>
-				<u-form-item label="不良数量" :borderBottom="false">
-					<u--input class="input-border" v-model.number="formData.badNum" type="number"></u--input>
+				<u-form-item label="材料编号" borderBottom>
+					<u-input readonly v-model="formData.materialCode" border="none"></u-input>
+				</u-form-item>
+				<u-form-item label="材质" borderBottom>
+					<u-input readonly v-model="formData.materialtextureCode" border="none"></u-input>
+				</u-form-item>
+				<u-form-item label="指示日期" borderBottom>
+					<u-input v-model="formData.instructionDate" border="none"></u-input>
 				</u-form-item>
-				<!-- <u-form-item label="完成人" :borderBottom="false">
-					<u--input class="input-border" v-model="formData.worker"></u--input>
-				</u-form-item> -->
 			</u-form>
 		</uni-card>
 		<!-- 底部按钮 -->
@ -128,7 +152,7 @@ export default {

 			const res1 = await reportWorkOrderApi.GetWorkOrderDetail(params);
 			if (res1.code === 200) {
-				if(!res1.data){
+				if (!res1.data) {
 					this.uModal.content = '工单号不存在！';
 					this.openModal();
 					this.clear();
@ -146,6 +170,7 @@ export default {
 					this.formData.finishNum = res2.data.finishNum;
 					this.formData.badNum = res2.data.badNum;
 					this.formData.worker = res2.data.worker;
+					console.log(res2.data);
 					if (this.formData.finishNum > 0) {
 						this.uModal.title = '报工提醒';
 						this.uModal.content = '此工序该工单已报工过！';
@ -197,24 +222,41 @@ export default {
 			const params = {
 				workorder: this.formData.workorder,
 				processId: this.processId,
+				// 参数填写
 				finish_num: this.formData.finishNum,
-				bad_num: this.formData.badNum,
+				bad_num: this.formData.badNum ?? 0,
+				customer_order:this.formData.customerOrder,
 				worker: this.formData.worker
 			};
-			reportWorkOrderApi.ProcessReportWork(params).then((res) => {
-				if (res.code === 200) {
-					this.uModal2.show = false;
-					this.uModal.content = '报工成功！';
-					this.openModal();
-					this.clear();
-				}
-			});
+			if(this.processName === '出货'){
+				reportWorkOrderApi.ShipmentProcessReportwork(params).then((res) => {
+					if (res.code === 200) {
+						this.uModal2.show = false;
+						this.uModal.content = '出货成功！';
+						this.openModal();
+						this.clear();
+					}
+				});
+			}else{
+				reportWorkOrderApi.ProcessReportWork(params).then((res) => {
+					if (res.code === 200) {
+						this.uModal2.show = false;
+						this.uModal.content = '报工成功！';
+						this.openModal();
+						this.clear();
+					}
+				});
+			}
+			
 		}
 	}
 };
 </script>

 <style scoped>
+.common-box {
+	padding-bottom: 60px;
+}
 .input-border {
 	border: 1px solid #eeeeee;
 }
--- a/pages/produceManagement/reportWorkOrderList/reportWorkOrderList.vue
+++ b/pages/produceManagement/reportWorkOrderList/reportWorkOrderList.vue
@ -8,11 +8,17 @@
 		<uni-card v-if="formData.workorder">
 			<u-text text="工单信息" bold size="20"></u-text>
 			<u-form labelPosition="left" ref="uForm" labelWidth="100">
-				<u-form-item label="领料日期" borderBottom>
+				<u-form-item label="工单日期" borderBottom>
 					<u-input v-model="formData.workorderDate" border="none"></u-input>
 				</u-form-item>
+				<u-form-item label="指示日期" borderBottom>
+					<u-input v-model="formData.instructionDate" border="none"></u-input>
+				</u-form-item>
 				<u-form-item label="工单号" borderBottom>
-					<u-input readonly v-model="formData.workorder" border="none"></u-input>
+					<u-text :text="formData.workorder" type="primary" bold size="18"></u-text>
+				</u-form-item>
+				<u-form-item label="计划数量" borderBottom>
+					<u-text :text="formData.planNum" type="primary" bold size="18"></u-text>
 				</u-form-item>
 				<u-form-item label="炉号" borderBottom>
 					<u-input readonly v-model="formData.stoveCode" border="none"></u-input>
@ -23,13 +29,29 @@
 				<u-form-item label="主体品名" borderBottom>
 					<u-input readonly v-model="formData.productionName" border="none"></u-input>
 				</u-form-item>
-				<u-form-item label="计划数量" borderBottom>
-					<u-input readonly v-model="formData.planNum" border="none"></u-input>
+				<u-form-item label="主体图号" borderBottom>
+					<u-input readonly v-model="formData.drawingCode" border="none">
+						<template slot="suffix">
+							<u-button type="primary" @click="uOverlay.show = true" size="mini">展示</u-button>
+						</template>
+					</u-input>
 				</u-form-item>
+				<u-form-item label="版本号" borderBottom>
+					<u-input readonly v-model="formData.version" border="none"></u-input>
+				</u-form-item>
+				<u-form-item label="材料型号" borderBottom>
+					<u-input readonly v-model="formData.materialName" border="none"></u-input>
+				</u-form-item>
+				<u-form-item label="材料编号" borderBottom>
+					<u-input readonly v-model="formData.materialCode" border="none"></u-input>
+				</u-form-item>
+				<u-form-item label="材质" borderBottom>
+					<u-input readonly v-model="formData.materialtextureCode" border="none"></u-input>
+				</u-form-item>
+
 			</u-form>
 		</uni-card>
 		<!-- 报工清单 -->
-		
 		<uni-card v-if="formReportList.length > 0">
 			<u-text text="报工清单" bold size="20"></u-text>
 			<u-list>
@ -39,8 +61,6 @@
 			</u-list>
 		</uni-card>
 		
-		
-
 		<!-- 消息提示 -->
 		<u-modal :show="uModal.show" :title="uModal.title" :content="uModal.content" @confirm="closeModal"></u-modal>
 	</view>
--- a/pages/produceManagement/requisition/requisition.vue
+++ b/pages/produceManagement/requisition/requisition.vue
@ -5,7 +5,7 @@
 			<ScanInput @scanConfirm="scanConfirm" placeholder="请扫标签,进行领料"></ScanInput>
 		</uni-card>

-		<!-- 工单信息 -->
+		<!-- 主要工单信息 -->
 		<uni-card v-if="formData.workorder">
 			<u-form labelPosition="left" ref="uForm" labelWidth="100">
 				<!-- <u-form-item label="生产日期" borderBottom>
@ -21,15 +21,38 @@
 				<!-- <u-form-item label="炉号" borderBottom>
 					<u-input readonly v-model="formData.stoveCode" border="none"></u-input>
 				</u-form-item> -->
+
 				<u-form-item label="工单号" borderBottom>
 					<u-text :text="formData.workorder" type="primary" bold size="18"></u-text>
 				</u-form-item>
 				<u-form-item label="主体型号" borderBottom>
-					<u-input readonly v-model="formData.productionCode" border="none"></u-input>
+					<u-text :text="formData.productionCode" size="16"></u-text>
 				</u-form-item>
 				<u-form-item label="主体品名" borderBottom>
-					<u-input readonly v-model="formData.productionName" border="none"></u-input>
+					<u-text :text="formData.productionName" size="16"></u-text>
 				</u-form-item>
+				<u-form-item label="计划数量" borderBottom>
+					<u-text :text="formData.planNum" type="primary" bold size="18"></u-text>
+					<!-- <u-input readonly v-model="formData.planNum" border="none"></u-input> -->
+				</u-form-item>
+
+				<u-form-item label="实际领料数" borderBottom>
+					<u--input class="input-border" v-model.number="formData.finishNum" type="number"></u--input>
+				</u-form-item>
+<!-- 				<u-form-item label="领料人" borderBottom>
+					<u--input class="input-border" v-model="formData.worker"></u--input>
+				</u-form-item> -->
+				<u-form-item label="炉号" borderBottom>
+					<u--input class="input-border" v-model="formData.stoveCode"></u--input>
+				</u-form-item>
+				<u-form-item label="进料单" borderBottom>
+					<u--input class="input-border" v-model="formData.feedOrder"></u--input>
+				</u-form-item>
+			</u-form>
+		</uni-card>
+		<!-- 其他信息 -->
+		<uni-card v-if="formData.workorder">
+			<u-form labelPosition="left" ref="uForm" labelWidth="100">
 				<u-form-item label="主体图号" borderBottom>
 					<u-input readonly v-model="formData.drawingCode" border="none">
 						<template slot="suffix">
@ -41,23 +64,16 @@
 					<u-input readonly v-model="formData.version" border="none"></u-input>
 				</u-form-item>
 				<u-form-item label="材料型号" borderBottom>
-					<u-input readonly v-model="formData.materialName" border="none"></u-input>
+					<u-text :text="formData.materialName" size="16"></u-text>
 				</u-form-item>
 				<u-form-item label="材料编号" borderBottom>
-					<u-input readonly v-model="formData.materialCode" border="none"></u-input>
+					<u-text :text="formData.materialCode" size="16"></u-text>
 				</u-form-item>
 				<u-form-item label="材质" borderBottom>
 					<u-input readonly v-model="formData.materialtextureCode" border="none"></u-input>
 				</u-form-item>
-				<u-form-item label="计划数量" borderBottom>
-					<u-text :text="formData.planNum" type="primary" bold size="18"></u-text>
-					<!-- <u-input readonly v-model="formData.planNum" border="none"></u-input> -->
-				</u-form-item>
-				<u-form-item label="实际领料数" :borderBottom="false">
-					<u--input class="input-border" v-model.number="formData.finishNum" type="number"></u--input>
-				</u-form-item>
-				<u-form-item label="炉号" :borderBottom="false">
-					<u--input class="input-border" v-model="formData.stoveCode"></u--input>
+				<u-form-item label="指示日期" borderBottom>
+					<u-input v-model="formData.instructionDate" border="none"></u-input>
 				</u-form-item>
 			</u-form>
 		</uni-card>
@ -143,7 +159,7 @@ export default {
 			};
 			reportWorkOrderApi.GetWorkOrderDetail(params).then((res) => {
 				if (res.code === 200) {
-					if(!res.data){
+					if (!res.data) {
 						this.uModal.content = '工单号不存在！';
 						this.openModal();
 						this.clear();
@ -160,12 +176,11 @@ export default {
 			});
 		},
 		// 检查工序顺序
-		checkProcessSort(){
-			if(this.processId){
-				for(let index in this.processSort){
-					
+		checkProcessSort() {
+			if (this.processId) {
+				for (let index in this.processSort) {
 				}
-			}else{
+			} else {
 				return false;
 			}
 		},
@ -193,11 +208,14 @@ export default {
 			const params = {
 				workorder: this.formData.workorder,
 				processId: this.processId,
-				finish_num: this.formData.finishNum,
 				bad_num: 0,
+				// 参数填写
+				finish_num: this.formData.finishNum,
+				feed_order:this.formData.feedOrder,
+				stove_code:this.formData.stoveCode,
 				worker: this.formData.worker
 			};
-			reportWorkOrderApi.ProcessReportWork(params).then((res) => {
+			reportWorkOrderApi.FeedProcessReportwork(params).then((res) => {
 				if (res.code === 200) {
 					this.uModal2.show = false;
 					this.uModal.content = '领料成功！';