Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/views/distribution/signfor/asurcharge.vue

@@ -115,7 +115,7 @@
             <el-button type="primary" @click="AddInfo"
               ><el-icon><Plus /></el-icon>新增</el-button
             >
-            <el-button type="primary" @click="AddInfo"
+            <el-button type="primary" @click="Batchdeletion"
               ><el-icon><Delete /></el-icon>批量删除</el-button
             >
             <el-button type="primary" @click="exportExcel"
@@ -264,6 +264,9 @@ import { columnList, columnListTC } from '@/option/signfor/asurcharge.js';
 import {
   addvalueInfoList,
   $_checkAddValuePackageList,
+  $_updateSignAddValuePackage,
+  $_saveSignAddValuePackage,
+  $_cancelSignAddValuePackage,
 } from '@/api/distribution/distributionSignfor';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
 import { processRowProperty, setNodeHeight } from '@/utils/util';
@@ -550,11 +553,55 @@ const ConfirmSubmission=()=>{
     addvalueType: tabName.value, //类型
     deliveryId: $route.query.id,
     reservationId: $route.query.reservationId,
-        num:0,//包件个数
+    num: details.TCselectionList.length, //包件个数
     packageEntityList: details.TCselectionList, //选择的包件
-    }
+    floolNum: TcZcInput.value.floolNum, //楼层
+  };
   console.log(data, '准备提交的数据');
+  // 表格下面有数据走新增接口
+  $_saveSignAddValuePackage(data).then(res => {
+    console.log(res, '新增成功');
+    if (res.data.code == 200) {
+      ElMessage({
+        message: res.data.msg,
+        type: 'success',
+      });
+      packdialog.value = false; //关闭弹窗
+      TcZcInput.value.floolNum = ''; //清空楼层
     }
+  });
+};
+//删除
+const Batchdeletion = () => {
+  if (!details.selectionList.length) {
+    ElMessage({
+      message: '请勾选要删除的数据',
+      type: 'warning',
+    });
+    return
+  }
+  details.loadingObj.list = true;
+  let data={
+    addvalueType: tabName.value, //类型
+    deliveryId: $route.query.id,
+    reservationId: $route.query.reservationId,
+    packageEntityList: details.selectionList, //选择的包件
+  }
+  $_cancelSignAddValuePackage(data).then(res=>{
+    console.log(res,'删除成功');
+    if(res.data.code==200){
+      ElMessage({
+        message:res.data.msg,
+        type: 'success',
+      });
+    }
+  }).catch(err=>{
+    console.log(err,'删除失败');
+  }).finally(()=>{
+    details.loadingObj.list = false;
+      onLoad(tabName.value)
+  })
+};
 //导出
 // const exportExcel = () => {
 //   if (!Object.values(queryCarn.value).length && !Object.values(details.query).length) {

src/views/distribution/signfor/distributionSignforedt.vue

@@ -672,9 +672,9 @@
           />
         </el-form-item>
 
-        <!-- <el-form-item label="费用:" width="200px">
+        <el-form-item label="费用:" width="200px">
           <el-input v-model="TcZcInput.fee" placeholder="请输入费用" />
-        </el-form-item> -->
+        </el-form-item>
       </el-form>
       <template #footer>
         <span class="dialog-footer">