修改报工增加不合格原因

lang/th_TH.json

@@ -297,5 +297,10 @@
 	"进度:": "ความคืบหน้า:",
 	"共": "ทั้งหมด",
 	"条": "บทความ",
-	"车间异常单编号": "หมายเลขคําสั่งซื้อข้อยกเว้นร้านค้า"
+	"车间异常单编号": "หมายเลขคําสั่งซื้อข้อยกเว้นร้านค้า",
+	"查不到报工人数据": "ไม่สามารถตรวจสอบข้อมูลแรงงานที่รายงานได้",
+	"请输入报工人工号": "โปรดป้อนหมายเลขแรงงานหนังสือพิมพ์",
+	"选择原因": "เลือกเหตุผล",
+	"不合格原因": "สาเหตุที่ไม่ได้รับสิทธิ์",
+	"不合格原因不能为空": "เหตุผลที่ขาดคุณสมบัติไม่สามารถว่างได้"
 }
\ No newline at end of file

pages/mes/prodReport/components/editFeeding.vue

@@ -117,6 +117,22 @@
               <u-number-box :min="0" v-model="form.machineTime" :input-width="190" :placeholder="$t('请输入加工工时')" :long-press="false" />
             </u-form-item>
           </u-col>
+          <u-col span="6">
+            <u-form-item :label="$t('不合格原因:')" prop="abnormalReason">
+              <u-input v-model="form.abnormalReason" disabled></u-input>
+              <u-button
+                @tap="choose"
+                type="success"
+                size="mini"
+                >{{ $t('选择原因') }}</u-button
+              >
+            </u-form-item>
+          </u-col>
+          <u-col :span="6">
+            <u-form-item :label="$t('审核人')" prop="recordNick">
+              {{form.recordNick}}
+            </u-form-item>
+          </u-col>
         </u-row>
         <u-row>
           <u-col :span="6">
@@ -129,11 +145,7 @@
               {{form.feedbackTime}}
             </u-form-item>
           </u-col>
-          <u-col :span="6">
-            <u-form-item :label="$t('审核人')" prop="recordNick">
-              {{form.recordNick}}
-            </u-form-item>
-          </u-col>
+
         </u-row>
         <u-row>
           <u-col :span="24">
@@ -231,6 +243,10 @@ export default {
     }
   },
   methods: {
+    choose() {
+      console.log('aa', this.$emit)
+      this.$emit('chooseReason',this.form)
+    },
     handleQuantityChanged(){
       this.form.quantityFeedback = this.form.quantityQualify + this.form.quantityUnqualify;
     },

pages/mes/prodReport/index.vue

@@ -316,7 +316,7 @@
                     </u-form-item>
                   </u-col>
                   <u-col span="6">
-                    <u-form-item :label="$t('不合格原因:')" prop="abnormalReason">
+                    <u-form-item :label="$t('不合格原因') + ':'" prop="abnormalReason">
                       <u-input v-model="feedback.abnormalReason" disabled></u-input>
                       <u-button
                         @tap="chooseReason(feedback)"
@@ -420,29 +420,7 @@
         />
       </view>
     </u-modal>
-    <!-- //生产报工报工人员 -->
-    <u-modal
-      :title="$t('不合格原因')"
-      :cancelText="$t('取消')"
-      :confirmText="$t('确认')"
-      @confirm="abnormalReasonDetermine()"
-      show-cancel-button
-      :title-style="{
-        'background-color': '#1E3770',
-        color: '#FFFFFF',
-        'line-height': '37px',
-        'padding-top': '0px',
-      }"
-      v-model="abnormalReasonVisible"
-      width="1300rpx"
-    >
-      <view>
-        <abnormalReason
-          ref="abnormalReasonRef"
-          v-if="abnormalReasonVisible"
-        />
-      </view>
-    </u-modal>
+    
     <u-modal
       :title="$t('暂停原因')"
       :cancelText="$t('取消')"
@@ -682,8 +660,32 @@
     <editFeeding
       ref="editFeeding"
       v-model="editFeedingVisible"
+      @chooseReason="chooseReason"
       @close="editFeedingVisible = false"
     />
+    <!-- //生产报工报工人员 -->
+    <u-modal
+      :title="$t('不合格原因')"
+      :cancelText="$t('取消')"
+      :confirmText="$t('确认')"
+      @confirm="abnormalReasonDetermine()"
+      show-cancel-button
+      :title-style="{
+        'background-color': '#1E3770',
+        color: '#FFFFFF',
+        'line-height': '37px',
+        'padding-top': '0px',
+      }"
+      v-model="abnormalReasonVisible"
+      width="1300rpx"
+    >
+      <view>
+        <abnormalReason
+          ref="abnormalReasonRef"
+          v-if="abnormalReasonVisible"
+        />
+      </view>
+    </u-modal>
   </view>
 </template>
 <style scoped>
@@ -728,6 +730,7 @@ export default {
     return {
       getWorkorderDirectiveLoading: false,
       editFeedingVisible: false,
+      reasonOBJ: {},
       tableOrderColumn: [
         {
           name: 'quantity',
@@ -1639,24 +1642,21 @@ export default {
           }
         })
     },
-    numclik(...arg) {
-      console.log('99999999', arg)
-    },
     getFeedbackMax(feedback){
       if (feedback.isSerialReport && Number(feedback.isSerialReport) === 1 && !this.isWaiXie) {
         return 1
-      } else if (this.isWaiXie || feedback.surpassState){ 
+      } else if (this.isWaiXie || (feedback.surpassState && feedback.ordinal === 1)){ 
         return 9999999999999999999999999999999999999999
-      } else if(!feedback.surpassState)  {
+      } else {
         return feedback.workorderUnfeedbackSum - feedback.quantityUnqualify
       }
     },
     getquantityQualifyMax(feedback){
       if (feedback.isSerialReport && Number(feedback.isSerialReport) === 1 && !this.isWaiXie) {
         return 1
-      } else if (this.isWaiXie || feedback.surpassState){ 
+      } else if (this.isWaiXie || (feedback.surpassState && feedback.ordinal === 1)){ 
         return 9999999999999999999999999999999999999999
-      } else if(!feedback.surpassState)  {
+      } else {
         return feedback.workorderUnfeedbackSum - feedback.quantityQualify
       }
     },
@@ -1938,6 +1938,8 @@ export default {
       this.userTempVisible = true
     },
     chooseReason(row) {
+      console.log('sada', row)
+      this.reasonOBJ = row
       this.abnormalReasonVisible = true
     },
     toggleRowSelection(checked, arr) {
@@ -1951,10 +1953,10 @@ export default {
       const tableSelectData = JSON.parse(
         JSON.stringify(this.$refs.abnormalReasonRef.tableSelectData)
       )
-      this.feedbackForms[0].abnormalId = tableSelectData[0].abnormalId
-      this.feedbackForms[0].abnormalReason = tableSelectData[0].abnormalReason
-      this.feedbackForms[0].abnormalType = tableSelectData[0].abnormalType
-      this.feedbackForms[0].abnormalRemark = tableSelectData[0].remark
+      this.reasonOBJ.abnormalId = tableSelectData[0].abnormalId
+      this.reasonOBJ.abnormalReason = tableSelectData[0].abnormalReason
+      this.reasonOBJ.abnormalType = tableSelectData[0].abnormalType
+      this.reasonOBJ.abnormalRemark = tableSelectData[0].remark
     },
     userDetermine() {
       const tableSelectData = JSON.parse(