修复弹窗不关闭bug

src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue

@@ -333,7 +333,7 @@
             <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmitly"
               >提 交</el-button
             >
-            <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
+            <el-button icon="el-icon-circle-close" @click="box3 = false">取 消</el-button>
           </span>
         </template>
       </el-dialog>

src/views/distribution/signfor/distributionSignforedt.vue

@@ -391,6 +391,130 @@
         </el-tab-pane>
       </template>
     </el-tabs>
+    <!-- 增值服务信息 -->
+    <el-divider content-position="left">增值服务信息</el-divider>
+    <el-tabs
+      v-loading="editLoading"
+      element-loading-text="数据正在更新中..."
+      type="border-card"
+      @tab-click="tabClickB"
+    >
+      <template v-for="(item, indexS) in TabB" :key="item.name">
+        <el-tab-pane :label="item.label" :name="item.name">
+          <template v-for="(itemT, index) in TabTitle" :key="index">
+            <div v-if="index == TabIndex" class="tab-title">
+              <span v-for="item in itemT" :key="item.name">
+                <el-icon><component :is="item.icon" /></el-icon> {{ item.name }} {{ item.value }}
+                {{ item.tap }}
+              </span>
+            </div>
+          </template>
+          <div class="el-Cart">
+            <!-- 表格列开始 -->
+            <el-table
+              :data="dataAdded"
+              row-key="name"
+              border
+              height="500"
+              style="width: 100%"
+              ref="tableRef"
+              @select-all="selectAll"
+              @select="selectChange"
+            >
+              <el-table-column type="selection" width="55" fixed />
+              <el-table-column
+                type="index"
+                fixed
+                width="50"
+                height="100"
+                label="#"
+                align="center"
+              />
+
+              <!-- 
+            Type ===1 普通文本
+            Type ===2 图片显示
+            Type ===3 操作功能
+            label:    标题
+            width:    宽度
+            prop:     数据字段
+           -->
+              <el-table-column
+                :prop="item.prop"
+                :label="item.label"
+                :width="item.width"
+                :fixed="item.fixed"
+                align="center"
+                v-for="(item, index) in menuDataB"
+                :key="item.label"
+              >
+                <template #default="props">
+                  <img :src="props.row[item.prop]" class="el-Img" v-if="item.type === 2" />
+                  <!-- <div :class="ElBtnClass" v-if="item.type === 3">
+                    <el-button
+                      :link="ElButtonS[0].link"
+                      :class="ElButtonS[0].class"
+                      :auto-insert-space="ElButtonS[0].space"
+                      :size="ElButtonS[0].size"
+                      :icon="ElButtonS[0].icon"
+                      @click="DeleteEvent(scope.row)"
+                      >删除</el-button
+                    >
+                    <el-button
+                      :link="ElButtonS[1].link"
+                      :class="ElButtonS[1].class"
+                      :auto-insert-space="ElButtonS[1].space"
+                      :size="ElButtonS[1].size"
+                      :icon="ElButtonS[1].icon"
+                      @click="EditEvent(scope.row)"
+                      >编辑</el-button
+                    >
+                    <el-button
+                      :link="ElButtonS[2].link"
+                      :class="ElButtonS[2].class"
+                      :auto-insert-space="ElButtonS[2].space"
+                      :size="ElButtonS[2].size"
+                      :icon="ElButtonS[2].icon"
+                      @click="ViewEvent(scope.row)"
+                      >查看</el-button
+                    >
+                  </div> -->
+                  <span v-else>{{ props.row[item.prop] ? props.row[item.prop] : '/' }}</span>
+                </template>
+              </el-table-column>
+
+              <template>
+                <el-table-column
+                  v-if="item.head"
+                  fixed="right"
+                  label="操作"
+                  width="280"
+                  align="center "
+                >
+                  <!-- <template #default="scope">
+                
+                  </template> -->
+                </el-table-column>
+              </template>
+            </el-table>
+            <!-- 表格翻页功能 -->
+            <!-- <div class="demo-pagination-block">
+              <el-pagination
+                v-model:current-page="currentPage"
+                v-model:page-size="pageSize"
+                :page-sizes="pageList"
+                :disabled="disabled"
+                :background="background"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="total"
+                @size-change="PageSizeChange"
+                @current-change="SizeChange"
+              />
+            </div> -->
+          </div>
+        </el-tab-pane>
+      </template>
+    </el-tabs>
   </el-card>
 </template>
 
@@ -401,10 +525,11 @@ import {
   getDetail,
   signforPackageList,
   signforInventoryList,
+  addvalueInfoList,
 } from '@/api/distribution/distributionSignfor';
 import { getToken } from '@/utils/auth';
 const form = ref({}); //基础信息
-const RouterId = ref(); //编辑ID
+const RouterId = ref('1721707916601487362'); //编辑ID
 const DoorstepPhoto = ref([]); // 上门照
 const StackingPhoto = ref([]); // 堆门照
 const FragilePhotos = ref([]); // 易碎照
@@ -413,6 +538,7 @@ const SignForPhotos = ref([]); //签收照
 const data = ref([]); //表格数据展示切换
 const InitializeTable = ref([]); //初始化展示信息（不可被修改）
 const menuData = ref([]); //表格头部
+const menuDataB = ref([]); //增值服务表格头部
 const editLoading = ref(false); //表格切换加载
 const currentPage = ref(1); // 默认页码
 const pageSize = ref(30); // 默认每一页几条
@@ -432,7 +558,9 @@ const dialogVisibleD = ref(false);
 const dialogVisibleE = ref(false);
 const active = ref(1); //签收状态
 const route = useRoute();
-const router = useRouter();
+const router = useRouter(); //参数ID
+const dataAdded = ref([]); //增值服务表格渲染参数
+const TabIndex = ref(0); //增值服务标题默认显示
 const enlargeImage = (dialogImageUrl, dialogVisible) => {
   return uploadFile => {
     console.log(uploadFile, '点击放大的内容');
@@ -461,6 +589,74 @@ const Tabs = ref([
     name: '2',
   },
 ]);
+// 增值服务标题栏
+const TabB = ref([
+  {
+    label: '上楼',
+    name: '0',
+  },
+  {
+    label: '超区',
+    name: '1',
+  },
+  {
+    label: '平移',
+    name: '2',
+  },
+  {
+    label: '搬运',
+    name: '3',
+  },
+  {
+    label: '分拣',
+    name: '4',
+  },
+  {
+    label: '专车',
+    name: '5',
+  },
+]);
+const TabTitle = ref([
+  // 上楼
+  [
+    { name: '操作人:', value: '汤建军', tap: null, icon: 'Avatar' },
+    { name: '楼层:', value: 5, tap: '层', icon: 'School' },
+    { name: '件数:', value: 13, tap: '件', icon: 'Box' },
+    { name: '费用:', value: 999.9, tap: '￥', icon: 'Coin' },
+    // 超区
+  ],
+  [
+    { name: '操作人:', value: '曹遇宗', tap: null, icon: 'Avatar' },
+    { name: '公里数:', value: 15, tap: '公里', icon: 'Van' },
+    { name: '件数:', value: 13, tap: '件', icon: 'Box' },
+    { name: '费用:', value: 888.9, tap: '￥', icon: 'Coin' },
+  ],
+  // 平移
+  [
+    { name: '公里数:', value: 15, tap: '公里', icon: 'Van' },
+    { name: '件数:', value: 13, tap: '件', icon: 'Box' },
+    { name: '费用:', value: 888.9, tap: '￥', icon: 'Coin' },
+  ],
+  // 搬运
+  [
+    { name: '操作人:', value: '漆标', tap: null, icon: 'Avatar' },
+    { name: '件数:', value: 15, tap: '', icon: 'Box' },
+    { name: '费用:', value: 13, tap: '￥', icon: 'Coin' },
+    { name: '班组:', value: 888.9, tap: null, icon: 'ScaleToOriginal' },
+  ],
+  // 分拣
+  [
+    { name: '操作人:', value: '小马', tap: null, icon: 'Avatar' },
+    { name: '件数:', value: 15, tap: '公里', icon: 'Box' },
+    { name: '费用:', value: 13, tap: '￥', icon: 'Coin' },
+  ],
+  // 专车
+  [
+    { name: '操作人:', value: '小东', tap: null, icon: 'Avatar' },
+    { name: '件数:', value: 15, tap: '公里', icon: 'Box' },
+    { name: '费用:', value: 13, tap: '￥', icon: 'Coin' },
+  ],
+]);
 // 订单列表
 const menuData1 = ref([
   {
@@ -623,7 +819,7 @@ const menuData1 = ref([
     label: '终端收获地址',
     type: 4,
     values: '',
-    width: '350',
+    width: '400',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1102,12 +1298,73 @@ const ElButtonS = ref([
     table: '删除',
   },
 ]);
+
+// menuDataB 增值服务公共表头
+
+const menuDataB1 = ref([
+  {
+    prop: 'orderCode',
+    label: '订单自编号',
+    type: 4,
+    values: '',
+    width: '200',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: true,
+  },
+  {
+    prop: 'materialName',
+    label: '货物名称',
+    type: 4,
+    values: '',
+    width: '200',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: true,
+  },
+  {
+    prop: 'orderPackageCode',
+    label: '包条码',
+    type: 4,
+    values: '',
+    width: '200',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: true,
+  },
+  {
+    prop: 'quantity',
+    label: '数量',
+    type: 4,
+    values: '',
+    width: '200',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: true,
+  },
+  {
+    prop: 'conditions',
+    label: '包条类型',
+    type: 4,
+    values: '',
+    width: '200',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: true,
+  },
+]);
+
 // 页面初始化需要请求的参数
 const onLoad = () => {
   menuData.value = menuData1.value; //页面初始化默认显示第一个表格
   data.value = InitializeTable.value; //默认显示第一个表格数据
 };
-RouterId.value = route.query.id; //获取当前路由参数ID
+// RouterId.value = route.query.id; //获取当前路由参数ID
 console.log(route.query.id, '当前路由参数');
 // 图片上传必须携带TOKEN
 const headers = computed(() => {
@@ -1197,6 +1454,24 @@ const tabClick = val => {
       break;
   }
 };
+// 上楼
+const goUpstairs = () => {
+  addvalueInfoList({
+    addvalueId: 1,
+    signforId: RouterId.value,
+  }).then(res => {
+    dataAdded.value = res.data.data.packageEntityList;
+    console.log(res, '增值服务上楼的返回值');
+  });
+};
+// 增值服务信息tab切换
+const tabClickB = val => {
+  TabIndex.value = val.props.name;
+  if (val.props.name == 0) {
+    menuDataB.value = menuDataB1.value;
+    goUpstairs();
+  }
+};
 //商品信息切换
 const switchTableFields = fields => {
   menuData.value = fields; //切换表格展示字段
@@ -1341,4 +1616,14 @@ const ImgSuccessE = (response, uploadFile) => {
     width: 100%;
   }
 }
+.tab-title {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 10px;
+  span {
+    display: flex;
+    align-items: center;
+  }
+}
 </style>

src/views/distribution/signfor/distributionSignfortreat.vue

@@ -494,7 +494,6 @@ export default {
       dialogVisibleC: false,
       dialogVisibleD: false,
       dialogVisibleE: false,
-
       TcForm: {}, //弹窗表单
       // 上门照
       DoorstepPhoto: [],