Merge branch 'dev' into pre-production

src/views/distribution/artery/AddVehicleStowage.vue

@@ -569,8 +569,10 @@
       <div class="footer"></div>
       <!-- 底部提交 -->
       <div class="button-container">
+        <!-- 关闭 -->
         <el-button class="submitButton" icon="CircleClose" @click="back"> 关闭 </el-button>
 
+        <!-- 提交 -->
         <el-button
           class="submitButton"
           icon="Promotion"
@@ -580,38 +582,48 @@
         >
           提交
         </el-button>
+
+        <!-- 处理未挂载在目的仓的数据 -->
+        <el-button icon="Refresh" type="primary" @click="handleShowProblemData">
+          挂载目的仓
+        </el-button>
       </div>
     </div>
   </basic-container>
 
   <el-dialog
     title="配置目的仓"
-    v-model="details.popUpShow.editPlanNumberVisited"
+    v-model="details.popUpShow.problemDataVisited"
-    width="40%"
+    width="80%"
     append-to-body
-    class="packageDetailColumnListVisited"
+    class="problemDataVisited"
   >
-    <div class="edit_title">订单号: {{ details.editInfo.orderCode }}</div>
+    <div class="title">
+      <span class="mr20">目的仓: </span>
+
+      <el-select></el-select>
+    </div>
+    <!-- <el-form-item label="目的仓："></el-form-item> -->
 
     <tablecmt
-      class="columnList"
+      class="columnList mt20"
       ref="newColumnListNode"
       :columnList="details.newColumnList"
-      :tableData="details.renderData"
+      :tableData="details.problemData"
-      @inputTxt="(value, row) => inputsc(value, row, index)"
+      @inputTxt="(value, row) => inputsc(value, row)"
-      @selection="list => selectionChange(list, index)"
+      @selection="list => selectionChange(list)"
     >
       <template #default="slotProps">
-        <template v-if="slotProps.scope.column.label === '计划数'">
+        <!-- <template v-if="slotProps.scope.column.label === '计划数'">
           <el-text size="small" text @click="handleEditplanNum(slotProps.scope, item)">{{
             slotProps.scope.row.planNum
           }}</el-text>
-        </template>
+        </template> -->
       </template>
     </tablecmt>
 
     <div class="flex-c-c">
-      <el-button @click="details.popUpShow.editPlanNumberVisited = false">取消</el-button>
+      <el-button @click="details.popUpShow.problemDataVisited = false">取消</el-button>
       <el-button
         type="primary"
         :loading="btnLoadingObj.editPlanNumBtn"
@@ -813,6 +825,8 @@ const details = reactive<any>({
   popUpShow: {
     /** 修改计划数量 */
     editPlanNumberVisited: false,
+    /** 未挂载目的仓的数据 */
+    problemDataVisited: true,
   },
   /** 列表Dom节点 */
   listNode: '',
@@ -896,6 +910,11 @@ const details = reactive<any>({
   remveNodeList: [],
   /** 拷贝的编辑信息, 提交时根据数据对比设置为新增、删除、编辑 */
   nodeCloneInfoData: [],
+  /** 挂载在配载任务中, 但未挂载目的仓的数据 */
+  problemData: [],
+  problemForm: {},
+  /** 节点 */
+  nodeList: [],
 });
 
 const btnLoadingObj = reactive({
@@ -1709,6 +1728,25 @@ const handleSubmitEdit = async () => {
   }
 };
 
+/** 显示未挂载目的仓的数据 */
+const handleShowProblemData = () => {
+  console.log('details.nodeInfoData :>> ', details.nodeInfoData);
+  console.log('details.active :>> ', details.active);
+  details.nodeList = [];
+  for (let i = 0; i < details.nodeInfoData.length; i++) {
+    const item = details.nodeInfoData[i];
+
+    if (i <= details.active || !item.nodeId) continue;
+
+    details.nodeList.push({
+      nodeName: item.nodeName,
+      nodeId: item.nodeId,
+    });
+  }
+
+  details.popUpShow;
+};
+
 /** 关闭页面 */
 const back = () => {
   $store.commit('DEL_TAG_CURRENT');
@@ -2278,4 +2316,17 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
   border: none;
   color: #fff;
 }
+
+.mr20 {
+  margin-right: 20px;
+}
+
+// 配置目的仓弹窗
+.problemDataVisited {
+  .title {
+    font-size: 18px;
+    font-weight: bold;
+    display: flex;
+  }
+}
 </style>

src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue

@@ -207,6 +207,7 @@
           </el-form-item>
           <el-form-item label="开单日期" prop="createTime">
             <el-date-picker
+              disabled
               class="w100 h100"
               v-model="form.createTime"
               type="date"
@@ -222,7 +223,7 @@
               v-model="form.num"
               class="w100"
               :min="0"
-              :max="form.maxNum || form.maxNum === 0 || Infinity"
+              :max="form.maxNum || 0"
               :value-on-clear="0"
               controls-position="right"
             />
@@ -735,6 +736,7 @@ export default {
       if (this.selectionList.length === 0) return this.$message.error('最少选择一条数据');
       if (this.selectionList.length > 1) return this.$message.error('暂时只支持单条数据操作');
       this.title = '添加提货数据';
+      this.form = {};
       this.chooseWaybillInfo = this.selectionList[0];
       this.popUpShow.addDistrilbutionVisited = true;
     },
@@ -967,19 +969,20 @@ export default {
         if (item.waybillNo === value) _item = item;
       }
 
-      if (_item.totalCount - _item.stockCount === 0) {
+      if (_item.totalCount - _item.billladingNum <= 0) {
         this.$message.warning('该运单已全部入库!!!');
         this.form = {};
         return;
       }
 
-      this.form.maxNum = _item.totalCount - _item.stockCount;
+      this.form.maxNum = _item.totalCount - _item.billladingNum;
+      this.form.createTime = _item.createTime;
       this.form.destination = _item.destinationWarehouseName || '';
       this.form.goodsName = _item.goodsName || '';
       this.form.shipperName = _item.shipperName || '';
       this.form.shipperMobile = _item.shipperMobile || '';
       this.form.consigneeMobile = _item.consigneeMobile || '';
-      this.form.num = 0;
+      this.form.num = this.form.maxNum;
     },
   },
   activated() {
@@ -1137,4 +1140,8 @@ export default {
   height: 100% !important;
   width: 100% !important;
 }
+
+:deep(.el-input-number .el-input__inner) {
+  text-align: left;
+}
 </style>

src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue

@@ -150,7 +150,7 @@
 
         <el-tab-pane label="操 作 日 志" name="tab2">
           <div style="min-height: 300px">
-            <el-steps direction="vertical" space="120px" :active="loadLogsList.length">
+            <el-steps direction="vertical" space="80px" :active="loadLogsList.length">
               <el-step :title="item.abstText" v-for="item in loadLogsList" :key="item">
                 <template #description>
                   <div class="fz-0-9">

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">