From d3e650724e79eecface1e46a62e35592a19fbc51 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Wed, 24 Jul 2024 17:58:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/signfor/asurcharge.js              | 50 ++++++-------------
 src/views/distribution/signfor/asurcharge.vue | 40 ++++++++-------
 .../signfor/distributionSignforedt.vue        | 12 +++++
 3 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/src/option/signfor/asurcharge.js b/src/option/signfor/asurcharge.js
index 7958e8f0..ca6047f3 100644
--- a/src/option/signfor/asurcharge.js
+++ b/src/option/signfor/asurcharge.js
@@ -26,8 +26,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'brandName',
-    label: '品牌',
+    prop: 'materialCode',
+    label: '物料编码',
     type: 1,
     values: '',
     width: '150',
@@ -37,8 +37,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'clientName',
-    label: '客户名称',
+    prop: 'brandName',
+    label: '品牌',
     type: 1,
     values: '',
     width: '150',
@@ -48,8 +48,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'materialName',
-    label: '货物名称',
+    prop: 'clientName',
+    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',
-      label: '品牌',
+      prop: 'materialCode',
+      label: '物料编码',
       type: 1,
       values: '',
       width: '150',
@@ -219,8 +210,8 @@ export const columnListTC = [
       head: false,
     },
     {
-      prop: 'clientName',
-      label: '客户名称',
+      prop: 'brandName',
+      label: '品牌',
       type: 1,
       values: '',
       width: '150',
@@ -230,8 +221,8 @@ export const columnListTC = [
       head: false,
     },
     {
-      prop: 'materialName',
-      label: '货物名称',
+      prop: 'clientName',
+      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: '上楼层数',
diff --git a/src/views/distribution/signfor/asurcharge.vue b/src/views/distribution/signfor/asurcharge.vue
index 94b6011c..c157d783 100644
--- a/src/views/distribution/signfor/asurcharge.vue
+++ b/src/views/distribution/signfor/asurcharge.vue
@@ -91,34 +91,34 @@
             <div v-if="tabName == 6" class="el_box">
               <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 v-model="form.Specialcar">
+                  <el-radio :label="0">否</el-radio>
+                  <el-radio :label="1">是</el-radio>
                 </el-radio-group>
               </div>
-              <div class="el_radio el_money">
+              <div v-if="form.Specialcar" class="el_radio el_money">
                 <span class="title">专车费用：</span>
                 <el-input-number
-                  v-model="form.num"
+                  v-model="form.numcost"
                   :min="0"
-                  :max="10"
-                  @change="handleChange"
                   :controls="false"
                   :value-on-clear="0"
                 />
               </div>
-              <el-button type="primary" class="el_butn" @click="preservation">保存</el-button>
+              <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="radio">
-                  <el-radio :value="0">是</el-radio>
-                  <el-radio :value="1">否</el-radio>
+                <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">
+              <div class="el_radio el_money" v-if="form.SuperZone">
                 <span class="title">超区公里数：</span>
                 <el-input-number
                   v-model="form.num"
@@ -128,7 +128,7 @@
                   :value-on-clear="0"
                 />
               </div>
-              <div class="el_radio el_money">
+              <div class="el_radio el_money" v-if="form.SuperZone">
                 <span class="title">超区费用：</span>
                 <el-input-number
                   v-model="form.num"
@@ -139,7 +139,7 @@
                 />
               </div>
 
-              <el-button type="primary" class="el_butn" @click="preservation">保存</el-button>
+              <el-button type="primary" class="el_butn" @click="preservation"  v-if="form.SuperZone">保存</el-button>
             </div>
           </div>
         </div>
@@ -270,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({
   /** 是否开启搜索 */
@@ -481,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 => {
@@ -564,11 +569,12 @@ const preservation = () => {
     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 => {
diff --git a/src/views/distribution/signfor/distributionSignforedt.vue b/src/views/distribution/signfor/distributionSignforedt.vue
index 0d3dba5e..acc8bd62 100644
--- a/src/views/distribution/signfor/distributionSignforedt.vue
+++ b/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: '装车时间',