Merge branch 'dev' into pre-production

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

@@ -1,7 +1,7 @@
 <template>
   <div class="head_top">
-    <div class='el-sel'>
+    <div class="el-sel">
-      <span class='el-sel-title'>仓库地址</span>
+      <span class="el-sel-title">仓库地址</span>
       <el-select
         filterable
         v-model="checkselect"
@@ -16,7 +16,7 @@
           :value="index"
         />
       </el-select>
-      <span class='el-sel-title'>货位分区</span>
+      <span class="el-sel-title">货位分区</span>
       <el-select
         filterable
         v-model="checkregionselect"
@@ -31,23 +31,27 @@
           :value="index"
         />
       </el-select>
-       <el-button icon="el-icon-refresh" @click="checkshelves" circle></el-button>
+      <div style="margin: 0 10px" class="el-exp" @click="handleExportArea">
-      <div class="el-exp" @click="handleExportArea">导出</div>
+        <el-icon><Download /></el-icon>导出
+      </div>
+      <el-button icon="el-icon-refresh" @click="checkshelves" circle></el-button>
     </div>
     <div class="tips">
-
       <div class="ls-box">
         总货位:
         <span class="def">{{ countnumber.cargoNub }}</span>
       </div>
+      <el-divider direction="vertical" />
       <div class="ls-box">
         占用货位:
         <span class="red">{{ countnumber.employNub }}</span>
       </div>
+      <el-divider direction="vertical" />
       <div class="ls-box">
         未用货位:
         <span class="green">{{ countnumber.unusedNub }}</span>
       </div>
+      <el-divider direction="vertical" />
       <div class="ls-box">
         禁用货位:
         <span class="red">{{ countnumber.disableNub }}</span>
@@ -64,7 +68,7 @@
           v-for="(item, index) in arrlist[checkselect]?.warehouseGoodsAreaVOList[checkregionselect]
             ?.warehouseGoodsShelfEntitieList"
         >
-          {{ item.goodsShelfName }}
+          {{ item.goodsShelfName }}区
         </div>
       </div>
     </el-scrollbar>
@@ -74,10 +78,12 @@
       总货位:
       <span class="def">{{ boxdetails.cargoNub }}</span>
     </div>
+      <el-divider direction="vertical" />
     <div>
       占用货位:
       <span class="red">{{ boxdetails.employNub }}</span>
     </div>
+      <el-divider direction="vertical" />
     <div>
       未用货位:
       <span class="green">{{ boxdetails.unusedNub }}</span>
@@ -86,6 +92,7 @@
       禁用货位:
       <span class="red">{{ boxdetails.disableNub }}</span>
     </div>
+      <el-divider direction="vertical" />
     <div>
       货物总数:
       <span class="red">{{ boxdetails.goodsNub }}</span>
@@ -2565,7 +2572,14 @@ const {
     font-size: 15px;
   }
   .xz {
-    background-color: #b345f1 !important;
+    width: 68px;
+    height: 28px;
+    background: #2f4370;
+    border-radius: 4px 4px 4px 4px;
+    opacity: 1;
+    display: flex;
+    align-items: center;
+    justify-content: center;
   }
 }
 .head_top {
@@ -2631,8 +2645,8 @@ const {
     cursor: pointer;
   }
   > div {
-    padding: 0 8px;
     font-weight: 500;
+    margin:0 10px;
   }
   .def {
     color: rgb(30, 159, 255);
@@ -2699,36 +2713,35 @@ const {
   display: flex;
   justify-content: space-around;
 }
-#avue-view{
+#avue-view {
-  background-color:#fff
+  background-color: #fff;
 }
-.el-sel{
+.el-sel {
-  
   display: flex !important;
   align-items: center;
-  :deep(.el-select){
+  :deep(.el-select) {
-    height:32px;
+    height: 32px;
-      .el-input{
+    .el-input {
-    height:32px;
+      height: 32px;
-  }
+    }
   }
-
 }
-.el-sel-title{
+.el-sel-title {
-  font-size:17px;
+  font-size: 17px;
-  margin-right:10px;
+  margin-right: 10px;
 }
-.el-sel-title:nth-of-type(2){
+.el-sel-title:nth-of-type(2) {
-  margin-left:20px;
+  margin-left: 20px;
 }
-.el-exp{
+.el-exp {
-    width: 110px;
+  width: 110px;
-    height: 32px;
+  height: 32px;
-    border: 1px solid #D3832A;
+  border: 1px solid #d3832a;
-    display: flex;
+  display: flex;
-    align-items: center;
+  align-items: center;
-    justify-content: center;
+  justify-content: center;
-    border-radius: 3px;
+  border-radius: 3px;
-    color: #D3832A;
+  color: #d3832a;
+  cursor: pointer;
 }
 </style>

src/views/distribution/signfor/distributionSignforedt.vue

@@ -419,7 +419,12 @@
               <div class="tab-title">
                 <div class="BatchDelete">
                   <el-button type="primary" @click="newlyAdded(item.name)"> 新增 </el-button>
-                  <el-button :disabled="ZcBtnDis" type="primary" @click="BatchDelete(item.name)">
+                  <el-button
+                    v-if="TcTemp.length > 1"
+                    :disabled="ZcBtnDis"
+                    type="primary"
+                    @click="BatchDelete(item.name)"
+                  >
                     批量移除
                   </el-button>
                 </div>
@@ -563,7 +568,7 @@
         @select-all="selectAll"
         @select="selectChange"
       >
-        <el-table-column type="selection" width="55" fixed :selectable="selectable" />
+        <el-table-column type="selection" width="55" fixed />
         <el-table-column type="index" fixed width="50" height="100" label="#" align="center" />
 
         <!-- 
@@ -1631,11 +1636,11 @@ const ValueAddedFunction = val => {
 };
 // 增值服务是否禁用勾选
 const selectable = (row, index) => {
-  if (!row.checkbox) {
+  // if (!row.checkbox) {
-    return false; //禁用状态
+  //   return false; //禁用状态
-  } else {
+  // } else {
-    return true; //非禁用状态
+  //   return true; //非禁用状态
-  }
+  // }
 };
 // 新增按钮展开增值服务弹窗
 const newlyAdded = val => {
@@ -1713,7 +1718,6 @@ const BatchDelete = row => {
   ElMessageBox.confirm('是否取消包件数?')
     .then(() => {
       cancellation(TcTemp.value);
-      TitleBarSwitch(TabInfo.value);
     })
     .catch(() => {
       // catch error
@@ -1721,7 +1725,8 @@ const BatchDelete = row => {
 };
 // 增值服务弹窗关闭回调
 const TzClose = () => {
-  menuDataB.value = menuDataB1.value;
+  menuDataB.value = menuDataB1.value; //字段切换
+  TcZcInput.value = {}; //清空搜索框数据
 };
 // 增值服务单选删除
 const DeleteEvent = row => {
@@ -1938,12 +1943,17 @@ const valueAddedServices = val => {
   dataAdded.value = []; //清空展示表单
   addvalueDetailId.value = null; //清空新增标识
   console.log(addvalueDetailId.value, '当前是否为新增还是编辑');
-
+  TabTitle.value[0].value = '暂无数据'; //距离
+  TabTitle.value[1].value = '暂无数据'; //费用
+  TabTitle.value[2].value = '暂无数据'; //楼层
+  TabTitle.value[3].value = '暂无数据'; //件数
+  editLoading.value = true; //开启加载
   addvalueInfoList({
     addvalueId: val,
     signforId: RouterId.value,
     reservationId: RouterReservationId.value,
   }).then(res => {
+    editLoading.value = false; //关闭加载
     editLoading.value = false; //关闭加载效果
     console.log(res, '增值服务上楼的返回值');
     if (res.data.data) {

src/views/system/user.vue

@@ -515,8 +515,8 @@ export default {
                   },
                   {
                     min: 2,
-                    max: 5,
+                    max: 12,
-                    message: '姓名长度在2到5个字符',
+                    message: '姓名长度在2到12个字符',
                   },
                 ],
               },