ezhizao_zx 11 miesięcy temu
rodzic
commit
f5f1f01748

+ 7 - 0
src/api/business/outsourcedOrder.js

@@ -101,6 +101,13 @@ export function delOrder(id) {
 	})
 }
 
+export function delOrderForFirst(id) {
+	return request({
+		url: baseUrl + '/business/outsource/removeForFirst/' + id,
+		method: 'delete'
+	})
+}
+
 export function getCarrierInfo(data) {
 	return request({
 		url: baseUrl + '/business/outsource/getCarrierInfo',

+ 7 - 6
src/views/business/firstOutsource/form.vue

@@ -129,11 +129,12 @@
             <el-table-column label="产品描述" align="center" prop="productDescription" width="320" />
             <el-table-column label="产品数" align="center" width="160" prop="productNum">
             </el-table-column>
-            <el-table-column label="箱数" align="center" prop="carrierNum" width="100">
+            <el-table-column label="箱数" align="center" prop="newCarrierCount" width="100">
               <template #default="scope">
                 <el-input-number v-if="editStatus && scope.row.hasReturnReceiptDetailFlag" :min="0"
-                  v-model="scope.row.carrierNum" :controls="false" placeholder="箱数" @blur="handleCarrierNumChange" />
-                <span v-else>{{ scope.row.carrierNum }}</span>
+                  v-model="scope.row.newCarrierCount" :controls="false" placeholder="箱数"
+                  @blur="handleCarrierNumChange" />
+                <span v-else>{{ scope.row.newCarrierCount }}</span>
               </template>
             </el-table-column>
             <el-table-column label="炉号" align="center" prop="" width="150">
@@ -298,7 +299,7 @@ function getForm() {
     });
     form.value.details.forEach((item) => {
       item.editStatus = false;
-      totalCarriersNum.value += item.carrierNum == null ? 0 : item.carrierNum;
+      totalCarriersNum.value += item.newCarrierCount == null ? 0 : item.newCarrierCount;
     });
 
     editStatus.value = form.value.isSubmit == 1;
@@ -337,7 +338,7 @@ function handleChangePackagingMethod() {
   console.log(form.value.details)
   for (let i = 0; i < form.value.details.length; i++) {
     console.log(form.value.details)
-    totalCarriersNum.value += form.value.details[i].carrierNum == null ? 0 : form.value.details[i].carrierNum
+    totalCarriersNum.value += form.value.details[i].newCarrierCount == null ? 0 : form.value.details[i].newCarrierCount
   }
 }
 //改变送货方式
@@ -665,7 +666,7 @@ const handleSingleSelectFurnaceNoInfo = (details, info) => {
 function handleCarrierNumChange() {
   let sumNum = 0
   form.value.details.forEach(v => {
-    sumNum += (v.carrierNum == null ? 0 : v.carrierNum)
+    sumNum += (v.newCarrierCount == null ? 0 : v.newCarrierCount)
   })
   totalCarriersNum.value = sumNum
 }

+ 2 - 2
src/views/business/firstOutsource/index.vue

@@ -119,7 +119,7 @@
 <script setup name="FirstOutsource">
 import {
   listOrder,
-  delOrder,
+  delOrderForFirst,
   exportOutsource,
   printOutsource,
   getCarrierInfo
@@ -212,7 +212,7 @@ function handleDelete(row) {
   proxy.$modal
     .confirm("是否确认删除选中的数据项?")
     .then(function () {
-      return delOrder(_ids);
+      return delOrderForFirst(_ids);
     })
     .then(() => {
       getList();