ezhizao_zx 9 ヶ月 前
コミット
e2eb7df7de

+ 23 - 4
src/views/business/auxiliaryDaywork/form.vue

@@ -60,8 +60,20 @@
             </el-form-item>
           </el-col>
           <el-col :span="7">
-            <el-form-item label="总工时:" prop="workingHoursTime" label-width="82px">
-              <el-input v-model.trim="workingHoursTime" :disabled="true" style="width: 220px; margin-left: 0px" />
+            <el-form-item label="投产数量:" prop="endTime">
+              <div>{{ form.prodNum }}</div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="合格数量:" prop="endTime" label-width="90px">
+              <el-input-number :disabled="!editStatus" v-model="form.qualifiedNum" style="width: 220px;" :step="1"
+                step-strictly :controls="false" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="废品数量:" prop="endTime" label-width="90px">
+              <el-input-number :disabled="true" v-model="form.rejectNum" :step="1" style="width: 220px;" step-strictly
+                :controls="false" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -82,12 +94,11 @@
           <el-table-column prop="dayworkItem.nickName" label="生产工序加工人" align="center"></el-table-column>
           <el-table-column prop="dayworkItem.startTime" label="开始时间" align="center"></el-table-column>
           <el-table-column prop="dayworkItem.endTime" label="结束时间" align="center"></el-table-column>
-          <el-table-column prop="prodNum" label="投产数量" align="center"></el-table-column>
           <el-table-column prop="rejectNum" label="废品数量" align="center">
             <template #default="scope">
               <div v-if="!editStatus"> {{ scope.row.rejectNum }}</div>
               <el-input-number v-else v-model="scope.row.rejectNum" style="width: 100px" :step="1" step-strictly
-                :controls="false" />
+                :controls="false" @change="handleChangeRejectNum(scope.row)" />
             </template>
           </el-table-column>
           <el-table-column prop="qualifiedNum" label="合格数量" align="center"></el-table-column>
@@ -265,6 +276,14 @@ function handleGetUser(selection) {
 function handleSelectUserSingle() {
   proxy.$refs.dialogPersonRef.open()
 }
+
+function handleChangeRejectNum(row) {
+  let sumReject = 0;
+  form.value.groupRejectList.forEach(t => {
+    sumReject += t.rejectNum
+  })
+  form.value.rejectNum = sumReject
+}
 /**
  * 对话框关闭 事件
  */

+ 2 - 3
src/views/business/auxiliaryDaywork/index.vue

@@ -58,10 +58,10 @@
           <el-select-v2 v-model="queryItemParams.auxiliaryProcessId" clearable :options="processList"
             placeholder="请选择工序" style="width: 100%" @change="handleProcessChange" />
         </el-form-item>
-        <el-form-item style="margin-left: 0">
+        <!-- <el-form-item style="margin-left: 0">
           <el-button type="info" @click="handleOpenHistory">历史记录
           </el-button>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
 
       <div class="el-table-container">
@@ -72,7 +72,6 @@
             <el-table-column label="辅助工序" prop="auxiliaryProcessAlias" align="center" />
             <el-table-column label="开始时间" prop="startTime" width="160" align="center" />
             <el-table-column label="结束时间" prop="endTime" width="160" align="center" />
-            <el-table-column label="总工时" prop="workingHours" width="160" align="center" />
             <el-table-column label="生产状态" prop="status" width="100" align="center">
               <template #default="scope">
                 <dict-tag :options="daywork_status" :value="scope.row.status" />

+ 1 - 1
src/views/business/outsourceInspectionVerify/index.vue

@@ -42,7 +42,7 @@
       <div class="el-table-inner-container">
         <el-table v-loading="loading" :data="orderList" size="small" border height="100%"
           @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="48" align="center" />
+          <!--<el-table-column type="selection" width="48" align="center" />-->
           <el-table-column label="外协单位" align="center" prop="outsourcedOrderDetail.supplierName" width="150" />
           <el-table-column label="批次号" align="center" prop="lotCode" width="100" />
           <el-table-column label="产品描述" align="center" prop="productDescription" width="320" />