From 2182727cf18c94d94d8745e860784f5bc5f805ef Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期六, 02 八月 2025 01:16:33 +0800
Subject: [PATCH] 报工页面传递dutyRecordId,机台id

---
 pages/product/report/index.vue |   65 +++++++++++++++++---------------
 1 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/pages/product/report/index.vue b/pages/product/report/index.vue
index 5177790..cfaaf59 100644
--- a/pages/product/report/index.vue
+++ b/pages/product/report/index.vue
@@ -8,13 +8,13 @@
       :rules="rules"
       :error-type="['toast']"
     >
-      <u-form-item label="杞﹂棿" :border-bottom="false" prop="work">
+      <u-form-item label="杞﹂棿" :border-bottom="false" prop="work" style="font-size:small">
         <u-radio-group v-model="form.work" :disabled="subdisabled">
-          <u-radio name="dt">瀵间綋</u-radio>
-          <u-radio name="tg">閾滄潌</u-radio>
+          <u-radio name="dt"><span style="font-size:small">瀵间綋</span>瀵间綋</u-radio>
+          <u-radio name="tg"><span style="fongt-size:small">閾滄潌</span></u-radio>
         </u-radio-group>
       </u-form-item>
-      <u-form-item label="鎶ュ伐鍗曞彿" :border-bottom="false" prop="taskNo">
+      <u-form-item label="鎶ュ伐鍗曞彿" :border-bottom="false" prop="taskNo" style="font-size:small">
         <u-input
           v-model="form.taskNo"
           type="select"
@@ -22,14 +22,14 @@
           @click="open"
         />
       </u-form-item>
-      <u-form-item label="宸ュ簭" :border-bottom="false" prop="name">
+      <u-form-item label="宸ュ簭" :border-bottom="false" prop="name" style="font-size:small">
         <u-input
           v-model="form.name"
           type="select"
           placeholder="璇锋壂鎻忔姤宸ュ崟鍙�"
         />
       </u-form-item>
-      <u-form-item label="璁㈠崟鍙�" :border-bottom="false" prop="moOn">
+      <u-form-item label="璁㈠崟鍙�" :border-bottom="false" prop="moOn" style="font-size:small">
         <u-input
           v-model="form.moOn"
           type="select"
@@ -37,60 +37,61 @@
           @click="openList"
         />
       </u-form-item>
-      <u-form-item label="闆朵欢鍙�" :border-bottom="false" prop="partNo">
+      <u-form-item label="闆朵欢鍙�" :border-bottom="false" prop="partNo" style="font-size:small">
         <u-input v-model="form.partNo" placeholder="" disabled />
       </u-form-item>
-      <u-form-item label="闆朵欢鎻忚堪" :border-bottom="false" prop="partName">
+      <u-form-item label="闆朵欢鎻忚堪" :border-bottom="false" prop="partName" style="font-size:small">
         <u-input v-model="form.partName" placeholder="" disabled />
       </u-form-item>
-      <u-form-item label="鎵归噺澶у皬" :border-bottom="false" prop="qtyRequired">
+      <u-form-item label="鎵归噺澶у皬" :border-bottom="false" prop="qtyRequired" style="font-size:small">
         <u-input v-model="form.qtyRequired" placeholder="" disabled />
       </u-form-item>
       <u-form-item
         label="鍓╀綑鏁伴噺"
         :border-bottom="false"
         prop="Jianqtyfinished"
+        style="font-size:small"
       >
         <u-input v-model="form.Jianqtyfinished" placeholder="" disabled />
       </u-form-item>
-      <u-form-item label="搴撲綅" :border-bottom="false" prop="proposedLocation">
+      <u-form-item label="搴撲綅" :border-bottom="false" prop="proposedLocation" style="font-size:small">
         <u-input v-model="form.proposedLocation" placeholder="" disabled />
       </u-form-item>
-      <u-form-item label="鎶ュ伐绫诲瀷" prop="productType">
+      <u-form-item label="鎶ュ伐绫诲瀷" label-width="90px" prop="productType" style="font-size:small">
         <u-radio-group v-model="form.productType" :disabled="subdisabled">
-          <u-radio name="dep">涓嬫満鎶ュ伐</u-radio>
-          <u-radio name="ndep">鏈笅鏈烘姤宸�</u-radio>
+          <u-radio name="dep"><span style="font-size:small">涓嬫満鎶ュ伐</span></u-radio>
+          <u-radio name="ndep"><span style="font-size:small">鏈笅鏈烘姤宸�</span></u-radio>
         </u-radio-group>
       </u-form-item>
-      <u-form-item label="鎺ユ敹闆朵欢" prop="receive">
+      <u-form-item label="鎺ユ敹闆朵欢" label-width="90px" prop="receive" style="font-size:small">
         <u-radio-group v-model="form.receive" :disabled="subdisabled">
-          <u-radio name="mo">杞﹂棿璁㈠崟</u-radio>
-          <u-radio name="part">鏇夸唬闆朵欢</u-radio>
+          <u-radio name="mo"><span style="font-size:small">杞﹂棿璁㈠崟</span></u-radio>
+          <u-radio name="part"><span style="font-size:small">鏇夸唬闆朵欢</span></u-radio>
         </u-radio-group>
       </u-form-item>
-      <u-form-item label="鐗╂枡" prop="materialCost">
+      <u-form-item label="鐗╂枡" label-width="90px" prop="materialCost" style="font-size:small">
         <u-radio-group v-model="form.materialCost" :disabled="true">
-          <u-radio name="鍊掑啿">鍊掑啿</u-radio>
-          <u-radio name="鎶曟枡">鎶曟枡</u-radio>
+          <u-radio name="鍊掑啿"><span style="font-size:small">鍊掑啿</span></u-radio>
+          <u-radio name="鎶曟枡"><span style="font-size:small">鎶曟枡</span></u-radio>
         </u-radio-group>
       </u-form-item>
-	  <u-form-item label="绠�鍖栫墿鏂欐鏌�" prop="simplifyMaterials">
+	  <u-form-item label="绠�鍖栫墿鏂欐鏌�" label-width="90px" prop="simplifyMaterials" style="font-size:small">
 	    <u-radio-group v-model="form.simplifyMaterials" :disabled="subdisabled || simplifyDisabled" @change="radioChange">
-	      <u-radio name="true">鏄�</u-radio>
-	      <u-radio name="false">鍚�</u-radio>
+	      <u-radio name="true"><span style="font-size:small">鏄�</span></u-radio>
+	      <u-radio name="false"><span style="font-size:small">鍚�</span></u-radio>
 	    </u-radio-group>
 	  </u-form-item>
-      <u-form-item label="鎶ュ伐鏂瑰紡" prop="status">
+      <u-form-item label="鎶ュ伐鏂瑰紡" label-width="90px" prop="status"  style="font-size:small">
         <u-radio-group v-model="form.status" :disabled="subdisabled" @change="handleReportTypeChange">
-          <u-radio name="false">鎸夌彮缁勬姤宸�</u-radio>
-          <u-radio name="true">鎸変汉鍛樻姤宸�</u-radio>
+          <u-radio name="false"><span style="font-size:small">鎸夌彮缁勬姤宸�</span></u-radio>
+          <u-radio name="true"><span style="font-size:small">鎸変汉鍛樻姤宸�</span></u-radio>
         </u-radio-group>
       </u-form-item>
-      <u-form-item label="浜哄憳鍚嶇О" :border-bottom="false" prop="Persons">
+      <u-form-item label="浜哄憳鍚嶇О" label-width="90px" :border-bottom="false" prop="Persons"  style="font-size:small">
 				<u-input v-model="form.Persons" type="select" placeholder="璇烽�夋嫨"
 					@click="openselectedPersons" :disabled="!canSelectPerson || subdisabled"/>
 			</u-form-item>
-      <u-form-item label="浜у嚭鍒楄〃" :border-bottom="false"></u-form-item>
+      <u-form-item label="浜у嚭鍒楄〃" :border-bottom="false"  style="font-size:small"></u-form-item>
     </u-form>
     <view class="wrap">
       <scroll-view class="packing-registration-scroll-list" scroll-y="true">
@@ -106,7 +107,7 @@
             @click="cancelReport(item)"
           >
             <view class="content-header">
-              <view class="content-header-title">{{ index + 1 }}</view>
+              <view class="content-header-title" style="font-size:small">{{ index + 1 }}</view>
             </view>
             <view class="content-body">
               <view class="row-list">
@@ -145,12 +146,14 @@
         label="鎶ュ伐鍗曞彿"
         placeholder="璇疯緭鍏�"
         :border-bottom="false"
+        style="font-size:small"
       >
       </u-field>
     </modalBg>
     <saveForm
       ref="saveForm"
       :operationTaskList="this.form"
+      :dutyId="dutyId"
       @update="handleUpdate"
     />
     <u-modal
@@ -203,8 +206,8 @@
     </u-modal>
     <u-modal v-model="personShowModal" title="" :show-cancel-button="true" :show-confirm-button="true"
 			@confirm="confirmSelection" @cancel="cancelSelection">
-      <scroll-view scroll-y="true" style="height: 100%">
 			<view class="popup-content">
+      <scroll-view scroll-y="true" style="height: 100%; transform: translateZ(0); -webkit-font-smoothing: antialiased;-moz-osx-font-smoothing: grayscale;">
 				<view class="popup-header">
 					<checkbox-group @change="checkboxChange">
 						<label class="checkbox-item" v-for="(item, index) in selectedPersons" :key="index">
@@ -213,8 +216,8 @@
 						</label>
 					</checkbox-group>
 				</view>
-			</view>
       </scroll-view>
+			</view>
 		</u-modal>
     <scan></scan>
   </div>
@@ -509,6 +512,7 @@
       this.$u.api.cancelReporting
         .cancelDTAOfWorkApplication({
           outBatchNo: this.detailedList.outBatchNo,
+          outputId: this.detailedList.id
         })
         .then((res) => {
           console.log("res", res);
@@ -610,6 +614,7 @@
       }
       // 濡傛灉鏈塪utyNo锛岃幏鍙栦汉鍛樺垪琛�
       if (val.dutyId) {
+        this.dutyId = val.dutyId;
         this.getPersonList(val.dutyId);
       }
     },

--
Gitblit v1.9.3