0528

src/views/business/daywork/index.vue

@@ -243,8 +243,9 @@
                   icon="View"
                   @click="handleCheckDayworkItem(scope.row)"
                   >查看
-                </el-button>
+                </el-button>	
                 <el-button
+                v-hasPermi="['business:daywork:remove']"
                   v-if="
                     scope.row.deptProcessStatus &&
                     (scope.row.status == 2 || scope.row.status == 3) &&

src/views/business/outsource/form.vue

@@ -375,6 +375,8 @@
       ref="dialogCarrierRef"
       :multiple-selected="handleMultipleSelectedOutsourceCarriers"
     />
+    <!-- 收回明细带回 -->
+    <form-details-recycling ref="formDetailsRecyclingRef" :singleSelected="handleSingleSelectedRecycling"/>
   </el-drawer>
 </template>
 <script setup>
@@ -389,6 +391,7 @@ import dialogCarrier from "./DialogCarrier";
 import dialogSuppliers from "./DialogSuppliers";
 import dialogProducts from "./DialogProducts";
 import dialogProcesses from "./DialogProcesses";
+import FormDetailsRecycling from "./detailsRecyclingForm";
 const { proxy } = getCurrentInstance();
 /** 父组件传参 */
 const props = defineProps({
@@ -459,11 +462,15 @@ function getForm() {
     console.log(form.value.details)
     form.value.details.forEach(item =>{
       item.editStatus = false
-      if(item.newCarrier !=null) {
+     if(!form.value.id) {
+        item.carrierNum = item.originalCarrier.split(",").length
+      }else {
+        if(item.newCarrier !=null) {
         item.carrierNum = item.newCarrier.split(",").length
       }else {
         item.carrierNum = item.originalCarrier.split(",").length
       }
+      }
       totalCarriersNum.value += item.carrierNum
     })
 
@@ -495,7 +502,7 @@ function handleChangePackagingMethod() {
     if(form.value.packagingMethod == 1) {
         form.value.details[i].carrierNum =form.value.details[i].newCarriers? form.value.details[i].newCarriers.length:0
       }else {
-        form.value.details[i].carrierNum = form.value.details[i].newCarriers? form.value.details[i].newCarriers.length:form.value.details[i].originalCarrier.split(",").length
+        form.value.details[i].carrierNum = form.value.details[i].newCarriers && form.value.details[i].newCarriers.length>0? form.value.details[i].newCarriers.length:form.value.details[i].originalCarrier.split(",").length
       }
       console.log(form.value.details)
       totalCarriersNum.value += form.value.details[i].carrierNum
@@ -650,7 +657,14 @@ const handleSingleSelectedSupplier = (data) => {
     form.value.freightAmount = 0.0
   }
 };
-
+/***************************** 外协收回明细相关 *****************************/
+//打开收回明细表单
+function handleDetailsRecycling() {
+  proxy.$refs.formDetailsRecyclingRef.open(row);
+}
+function handleSingleSelectedRecycling() {
+  
+}
 /***************************** 产品对话框相关 *****************************/
 // 打开产品选择对话框
 const handleShowDialogProducts = () => {