Jelajahi Sumber

Merge branch 'master' of http://120.46.159.163:7400/ezhizao/ezhizao_dms_vue

ezhizao_zx 9 bulan lalu
induk
melakukan
7158132ed0

+ 3 - 2
src/views/business/productionBatch/lotInfoForm.vue

@@ -109,7 +109,7 @@
             width="200px"
           >
             <template #default="scope">
-              <el-button v-if="scope.row.hasDaywork || scope.row.isSuperaddition == 0"
+              <el-button v-if="scope.row.id!=null"
                 link
                 type="primary"
                 @click="handleColumnClick(scope.row.lotCode)"
@@ -168,6 +168,7 @@
                 type="primary"
                 >{{ "废品回用" }}</el-tag
               >
+              <el-tag v-if="scope.row.fromId != 0" class="spacing" type="warning">{{ "分批" }}</el-tag>
             </template>
           </el-table-column>
           <el-table-column label="操作" width="200px" align="center">
@@ -358,7 +359,7 @@ function handleAddLotNum(data) {
   detailInfo.value.superadditionTotalNumber =  detailInfo.value.superadditionTotalNumber + data.length
   console.log(data)
   data.forEach(item =>{
-    lotList.value.unshift({lotCode:item,productionQuantity:detailInfo.value.oneLotQuantity,isSuperaddition:1, editStatus: true,
+    lotList.value.unshift({id:null,lotCode:item,productionQuantity:detailInfo.value.oneLotQuantity,isSuperaddition:1, editStatus: true,
       productionPlanDetailId:detailInfo.value.id,technologicalProcessId:detailInfo.value.technologicalProcessId,
       technologyVersion:detailInfo.value.technologyVersion,productId:detailInfo.value.productId})
   })

+ 2 - 2
src/views/business/reviseBath/lotFormParticulars.vue

@@ -160,7 +160,7 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="4">
+        <el-col :span="8">
           <el-form-item label="材质1" class="custom-label">
             <span style="margin-left: 28px">
               {{
@@ -171,7 +171,7 @@
             </span>
           </el-form-item>
         </el-col>
-        <el-col :span="4">
+        <el-col :span="8">
           <el-form-item label="材质2" class="custom-label">
             <span>
               {{