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

src/option/signfor/asurcharge.js

@@ -26,8 +26,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'brandName',
+    prop: 'materialCode',
-    label: '品牌',
+    label: '物料编码',
     type: 1,
     values: '',
     width: '150',
@@ -37,8 +37,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'clientName',
+    prop: 'brandName',
-    label: '客户名称',
+    label: '品牌',
     type: 1,
     values: '',
     width: '150',
@@ -48,8 +48,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'materialName',
+    prop: 'clientName',
-    label: '货物名称',
+    label: '客户名称',
     type: 1,
     values: '',
     width: '150',
@@ -58,6 +58,7 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+
   {
     prop: 'firsts',
     label: '一级品',
@@ -135,17 +136,7 @@ export const columnList = [
     sortable: true,
     head: false,
   },
-  {
+
-    prop: 'materialCode',
-    label: '物料编码',
-    type: 1,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
   {
     prop: 'a',
     label: '上楼层数',
@@ -208,8 +199,8 @@ export const columnListTC = [
       head: false,
     },
     {
-      prop: 'brandName',
+      prop: 'materialCode',
-      label: '品牌',
+      label: '物料编码',
       type: 1,
       values: '',
       width: '150',
@@ -219,8 +210,8 @@ export const columnListTC = [
       head: false,
     },
     {
-      prop: 'clientName',
+      prop: 'brandName',
-      label: '客户名称',
+      label: '品牌',
       type: 1,
       values: '',
       width: '150',
@@ -230,8 +221,8 @@ export const columnListTC = [
       head: false,
     },
     {
-      prop: 'materialName',
+      prop: 'clientName',
-      label: '货物名称',
+      label: '客户名称',
       type: 1,
       values: '',
       width: '150',
@@ -240,6 +231,7 @@ export const columnListTC = [
       sortable: true,
       head: false,
     },
+
     {
       prop: 'firsts',
       label: '一级品',
@@ -317,17 +309,7 @@ export const columnListTC = [
       sortable: true,
       head: false,
     },
-    {
+
-      prop: 'materialCode',
-      label: '物料编码',
-      type: 1,
-      values: '',
-      width: '150',
-      checkarr: [],
-      fixed: false,
-      sortable: true,
-      head: false,
-    },
     {
       prop: 'a',
       label: '上楼层数',

src/views/distribution/signfor/asurcharge.vue

@@ -25,102 +25,13 @@
           </el-form-item> -->
         </el-form>
       </el-row>
-      <div class="header">
-        <h2 class="money">合计费用:999999</h2>
-
-        <div class="radio">
-          <div class="el_radio">
-            <span class="title">是否专车：</span>
-            <el-radio-group v-model="radio">
-              <el-radio :value="0">是</el-radio>
-              <el-radio :value="1">否</el-radio>
-            </el-radio-group>
-          </div>
-          <div class="el_radio el_money">
-            <span class="title">专车费用：</span>
-            <el-input-number
-              v-model="form.num"
-              :min="0"
-              :max="10"
-              @change="handleChange"
-              :controls="false"
-              :value-on-clear="0"
-            />
-          </div>
-          <div class="el_radio">
-            <span class="title">是否超区：</span>
-            <el-radio-group v-model="radio">
-              <el-radio :value="0">是</el-radio>
-              <el-radio :value="1">否</el-radio>
-            </el-radio-group>
-          </div>
-          <div class="el_radio el_money">
-            <span class="title">超区公里数：</span>
-            <el-input-number
-              v-model="form.num"
-              :min="0"
-              @change="handleChange"
-              :controls="false"
-              :value-on-clear="0"
-            />
-          </div>
-          <div class="el_radio el_money">
-            <span class="title">超区费用：</span>
-            <el-input-number
-              v-model="form.num"
-              :min="0"
-              @change="handleChange"
-              :controls="false"
-              :value-on-clear="0"
-            />
-          </div>
-        </div>
-        <!-- ---  -->
-        <!-- <div class="radio">
-          <div class="el_radio">
-            <span class="title">是否超区：</span>
-            <el-radio-group v-model="radio">
-              <el-radio :value="0">是</el-radio>
-              <el-radio :value="1">否</el-radio>
-            </el-radio-group>
-          </div>
-          <div class="el_radio el_money">
-            <span class="title">超区公里数：</span>
-            <el-input-number
-              v-model="form.num"
-              :min="0"
-              @change="handleChange"
-              :controls="false"
-              :value-on-clear="0"
-            />
-          </div>
-          <div class="el_radio el_money">
-            <span class="title">超区费用：</span>
-            <el-input-number
-              v-model="form.num"
-              :min="0"
-              @change="handleChange"
-              :controls="false"
-              :value-on-clear="0"
-            />
-          </div>
-        </div> -->
-      </div>
 
       <!-- 控件模块 -->
       <el-row>
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
-            <el-button type="primary" @click="AddInfo"
+            <h4 class="el_fee">合计费用:999999</h4>
-              ><el-icon><Plus /></el-icon>新增</el-button
-            >
-            <el-button type="primary" @click="Batchdeletion"
-              ><el-icon><Delete /></el-icon>批量删除</el-button
-            >
-            <el-button type="primary" @click="exportExcel"
-              ><el-icon><Download /></el-icon>导出</el-button
-            >
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -133,12 +44,28 @@
       <div v-loading="loadingObj.list">
         <!-- 首页表格 -->
         <el-tabs v-model="tabName" type="border-card" class="el_tab_top" @tab-click="tabchange">
-          <el-tab-pane label="上楼费" name="1"></el-tab-pane>
+          <el-tab-pane label="上楼费" :name="1"></el-tab-pane>
-          <el-tab-pane label="装卸费" name="4"></el-tab-pane>
+          <el-tab-pane label="装卸费" :name="4"></el-tab-pane>
-          <el-tab-pane label="平移费" name="3"></el-tab-pane>
+          <el-tab-pane label="平移费" :name="3"></el-tab-pane>
-          <el-tab-pane label="分货费" name="5"></el-tab-pane>
+          <el-tab-pane label="分货费" :name="5"></el-tab-pane>
+          <el-tab-pane label="专车费" :name="6"></el-tab-pane>
+          <el-tab-pane label="超区费" :name="2"></el-tab-pane>
         </el-tabs>
-        <el-row>
+        <div class="el_topbtn">
+          <div v-if="[1, 3, 4, 5].includes(tabName)" class="el_left">
+            <el-button type="primary" @click="AddInfo"
+              ><el-icon><Plus /></el-icon>新增</el-button
+            >
+            <el-button type="primary" @click="Batchdeletion"
+              ><el-icon><Delete /></el-icon>批量删除</el-button
+            >
+          </div>
+          <el-button type="primary" @click="exportExcel"
+            ><el-icon><Download /></el-icon>导出</el-button
+          >
+        </div>
+
+        <el-row v-if="[1, 3, 4, 5].includes(tabName)">
           <!-- 列表模块 -->
           <tablecmt
             class="tableNode"
@@ -159,6 +86,63 @@
             </template>
           </tablecmt>
         </el-row>
+        <div v-if="[2, 6].includes(tabName)" class="header_content">
+          <div class="radio">
+            <div v-if="tabName == 6" class="el_box">
+              <div class="el_radio">
+                <span class="title">是否专车：</span>
+                <el-radio-group v-model="form.Specialcar">
+                  <el-radio :label="0">否</el-radio>
+                  <el-radio :label="1">是</el-radio>
+                </el-radio-group>
+              </div>
+              <div v-if="form.Specialcar" class="el_radio el_money">
+                <span class="title">专车费用：</span>
+                <el-input-number
+                  v-model="form.numcost"
+                  :min="0"
+                  :controls="false"
+                  :value-on-clear="0"
+                />
+              </div>
+              <el-button v-if="form.Specialcar" type="primary" class="el_butn" @click="preservation"
+                >保存</el-button
+              >
+            </div>
+
+            <div v-if="tabName == 2" class="el_box">
+              <div class="el_radio">
+                <span class="title">是否超区：</span>
+                <el-radio-group v-model="form.SuperZone">
+                  <el-radio :label="0">否</el-radio>
+                  <el-radio :label="1">是</el-radio>
+                </el-radio-group>
+              </div>
+              <div class="el_radio el_money" v-if="form.SuperZone">
+                <span class="title">超区公里数：</span>
+                <el-input-number
+                  v-model="form.num"
+                  :min="0"
+                  @change="handleChange"
+                  :controls="false"
+                  :value-on-clear="0"
+                />
+              </div>
+              <div class="el_radio el_money" v-if="form.SuperZone">
+                <span class="title">超区费用：</span>
+                <el-input-number
+                  v-model="form.num"
+                  :min="0"
+                  @change="handleChange"
+                  :controls="false"
+                  :value-on-clear="0"
+                />
+              </div>
+
+              <el-button type="primary" class="el_butn" @click="preservation"  v-if="form.SuperZone">保存</el-button>
+            </div>
+          </div>
+        </div>
       </div>
       <!-- 分页模块 -->
       <!-- <el-row class="el-fy">
@@ -275,9 +259,10 @@ import { ElMessageBox, ElMessage } from 'element-plus';
 import { downloadXls } from '@/utils/util';
 import { useStore } from 'vuex';
 import dayjs from 'dayjs';
+import { postFindCarListByName } from '@/api/distribution/addTripartiteTransfer';
 const $router = useRouter(); //跳转
 const $useStore = useStore(); //权限
-const tabName = ref('1');
+const tabName = ref(1);
 const addvalueDetailId = ref('');
 const ConfirmationInformation = ref(false);
 const $route = useRoute(); //获取地址栏参数
@@ -285,7 +270,9 @@ const packdialog = ref(false);
 const Tipstitle = ref('上楼费'); //
 const TcZcInput = ref({});
 const form = ref({
-  num: 0,
+  numcost: 0,
+  Specialcar: 0,
+  SuperZone: 0,
 });
 const details = reactive({
   /** 是否开启搜索 */
@@ -496,6 +483,9 @@ const onLoad = (value = 1) => {
           addvalueDetailId.value = res.data.data.addvalueDetailId;
         }
         details.data = res.data.data.packageEntityList;
+        if (res.data.data.addvalueId == 6) {
+          res.data.data.packageEntityList[0];
+        }
       }
     })
     .catch(error => {
@@ -571,6 +561,34 @@ const ConfirmSubmission = () => {
     }
   });
 };
+// 超区专车保存
+const preservation = () => {
+  let data = {
+    addvalueType: tabName.value, //类型
+    deliveryId: $route.query.id,
+    reservationId: $route.query.reservationId,
+  };
+  console.log(data, '准备提交的数据');
+
+  if (tabName.value == 2) {
+    //超区
+  } else if (tabName.value == 6) {
+    //专车
+    data.fee = form.value.numcost; //费用
+  }
+  // 表格下面有数据走新增接口
+  $_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) {
@@ -578,29 +596,32 @@ const Batchdeletion = () => {
       message: '请勾选要删除的数据',
       type: 'warning',
     });
-    return
+    return;
   }
   details.loadingObj.list = true;
-  let data={
+  let data = {
     addvalueType: tabName.value, //类型
     deliveryId: $route.query.id,
     reservationId: $route.query.reservationId,
     packageEntityList: details.selectionList, //选择的包件
-  }
+  };
-  $_cancelSignAddValuePackage(data).then(res=>{
+  $_cancelSignAddValuePackage(data)
-    console.log(res,'删除成功');
+    .then(res => {
-    if(res.data.code==200){
+      console.log(res, '删除成功');
-      ElMessage({
+      if (res.data.code == 200) {
-        message:res.data.msg,
+        ElMessage({
-        type: 'success',
+          message: res.data.msg,
-      });
+          type: 'success',
-    }
+        });
-  }).catch(err=>{
+      }
-    console.log(err,'删除失败');
+    })
-  }).finally(()=>{
+    .catch(err => {
-    details.loadingObj.list = false;
+      console.log(err, '删除失败');
-      onLoad(tabName.value)
+    })
-  })
+    .finally(() => {
+      details.loadingObj.list = postFindCarListByName;
+      onLoad(tabName.value);
+    });
 };
 //导出
 // const exportExcel = () => {
@@ -730,4 +751,38 @@ const Batchdeletion = () => {
     }
   }
 }
+.avue-crud__left {
+  .el_fee {
+    margin: 0;
+  }
+}
+.header_content {
+  .el_box {
+    display: flex;
+    align-items: flex-end;
+    .el_radio {
+      display: flex;
+      flex-direction: column;
+      width: 15%;
+    }
+    .el-radio-group {
+      background-color: #e7e7e7;
+    }
+    .el-input-number {
+      width: 100%;
+    }
+    .el_money {
+      margin-left: 10px;
+    }
+    .el_butn {
+      margin-left: 10px;
+    }
+  }
+}
+.el_topbtn {
+  display: flex;
+  .el_left {
+    margin-right: 12px;
+  }
+}
 </style>

src/views/distribution/signfor/distributionSignforedt.vue

@@ -1316,6 +1316,18 @@ const menuData2 = ref([
     isshowSummary: true,
     head: false,
   },
+  {
+    prop: 'signforType',
+    label: '签收方式',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    isshowSummary: true,
+    head: false,
+  },
   {
     prop: 'loadingTime',
     label: '装车时间',