Merge branch 'dev' into pre-production

src/api/distribution/distributionStockArticle.js

@@ -365,7 +365,7 @@ export const $_Modifywaybillrecipient = data => {
   });
 };
 
-// 修改运单收货人
+/** 查看零担二维码 */
 export const postShowOrderCode = params => {
   return request({
     url: '/api/logpm-distribution/distributionStockArticle/showOrderCode',
@@ -394,8 +394,6 @@ export const getCollectt = params => {
   });
 };
 
-
-
 // 在库订单详情
 export const $_signforListDetail = params => {
   return request({

src/components/tablecmt/tablecmt.vue

@@ -380,18 +380,8 @@ const isHaveSelection = ref(false);
 let selectarr = ref([]);
 /** 设置每行颜色 */
 const tableRowClassName = ({ row, rowIndex }: { row: TableDataType; rowIndex: number }) => {
-  // let sfcheck = false;
+  for (let i = 0; i < selectarr.value.length; i++) {
-  let item = '';
+    if (selectarr.value[i] === row) return 'table-SelectedRow-bgcolor';
-
-  for (let value of selectarr.value) {
-    if (value == row) {
-      item = value;
-      break;
-    }
-  }
-
-  if (item) {
-    return 'table-SelectedRow-bgcolor';
   }
 
   if (props.tableRowClassName) return props.tableRowClassName(row, rowIndex);
@@ -434,7 +424,7 @@ onMounted(() => {
 /** 勾选 */
 function handleCheckSelect(select: any[]) {
   console.log('select :>> ', select);
-  console.log(props.isselectfun,'props.isselectfun');
+  console.log(props.isselectfun, 'props.isselectfun');
   if (select.length !== 0) {
     for (const item of select) {
       if (props.isselectfun) {

src/option/distribution/TripartiteTransfer.js

@@ -351,7 +351,7 @@ export const detailsColumnList = [
   {
     prop: 'scanStatusName',
     label: '装卸状态',
-    type: 3,
+    type: 14,
     values: '',
     width: '130',
     checkarr: [],

src/views/distribution/artery/truckLoadingDetails.vue

@@ -49,7 +49,7 @@
             v-if="permissionObj.truckLoadingDetails_changePlanWarehouse"
             type="primary"
             icon="Edit"
-            @click="handleShowTransfer('add')"
+            @click="handleChooseWarehouse"
           >
             计划仓更改
           </el-button>
@@ -116,6 +116,21 @@
         "
       >
         <template #default="slotProps">
+          <!-- 装卸状态 -->
+          <template v-if="slotProps.scope.column.label === '装卸状态'">
+            <el-tag
+              :class="{
+                sub: Number(slotProps.scope.row.scanStatus) === 1,
+                err: Number(slotProps.scope.row.scanStatus) === 2,
+                primary: Number(slotProps.scope.row.scanStatus) === 3,
+              }"
+            >
+              {{ slotProps.scope.row.scanStatusName }}
+            </el-tag>
+          </template>
+
+          <!-- 操作 -->
+          <template v-else-if="slotProps.scope.column.label === '操作'">
             <!-- 零担 -->
             <template v-if="Number(slotProps.scope.row.type) === 2">
               <el-text
@@ -151,6 +166,7 @@
               <el-text @click="printOrder(slotProps.scope)"> 二维码 </el-text>
             </template>
           </template>
+        </template>
       </tablecmt>
 
       <!-- 分页模块 -->
@@ -220,6 +236,40 @@
     </span>
   </el-dialog>
 
+  <!-- 配置装车目的地 -->
+  <el-dialog
+    title="配置装车目的地"
+    v-model="details.popUpShow.chooseDestinationVisited"
+    width="30%"
+    append-to-body
+    class="truckLoadingDetailPopUp"
+  >
+    <el-form-item label="目的地" prop="region">
+      <el-select v-model="details.chooseNodeId" placeholder="请选择目的地" class="w100">
+        <el-option
+          v-for="item in details.nextNodeData"
+          :key="item"
+          :label="item.warehouseName"
+          :value="item.warehouseId"
+        />
+      </el-select>
+    </el-form-item>
+
+    <!-- 表单按钮 -->
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button
+          icon="el-icon-circle-close"
+          @click="details.popUpShow.chooseDestinationVisited = false"
+          >取 消</el-button
+        >
+        <el-button type="primary" icon="el-icon-circle-check" @click="handleEditSubmit">
+          确 认
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+
   <!-- 列表配置显示 -->
   <edittablehead
     @setcolum="setnewcolum"
@@ -248,6 +298,7 @@ import {
   postSignLoadScanByIds,
   postLoadingDetailExport,
 } from '@/api/distribution/truckLoadingDetails';
+import { postFindNextNodeList } from '@/api/distribution/VehicleStowage';
 import { getShowAdvancePackgeCode } from '@/api/waybill/orderPackageListDetails';
 import { postShowOrderCode } from '@/api/distribution/distributionStockArticle';
 /** 获取字典 */
@@ -331,6 +382,8 @@ const details = reactive<any>({
     truckLoadingDetailVisited: false,
     /** 零担补录 */
     transferVisited: false,
+    /** 计划仓更改 */
+    chooseDestinationVisited: false,
   },
   /** 列表Dom节点 */
   listNode: '',
@@ -383,6 +436,9 @@ const details = reactive<any>({
   myWarehouseData: {},
   /** 打印的二维码 */
   html: '',
+  /** 后续节点仓库数据 */
+  nextNodeData: [],
+  choosePackageList: [],
 });
 
 const {
@@ -602,6 +658,25 @@ const onLoad = debounce(async (params = {}) => {
   }
 }, 10);
 
+/** 初始化请求数据 -- 之后节点数据 */
+const init = async () => {
+  const res = await postFindNextNodeList({ loadId: $route.query.loadId });
+
+  // 下一步节点数据
+  const { code, data } = res.data;
+  if (code !== 200) return;
+  details.nextNodeData = data || [];
+
+  if (details.nextNodeData.length !== 1) return;
+
+  for (const iterator of details.packageData) {
+    iterator.nodeName = details.nextNodeData[0].warehouseName;
+    iterator.nodeId = details.nextNodeData[0].warehouseId;
+  }
+};
+
+init();
+
 /** 搜索 */
 const searchChange = () => {
   onLoad();
@@ -1320,6 +1395,26 @@ const handleExport = async () => {
   }
 };
 
+/** 选择包件进行更改计划仓 */
+const handleChooseWarehouse = async () => {
+  if (details.selectionList.length === 0) return ElMessage.warning('请选择需要更改的数据');
+
+  const _arr = [];
+
+  for (let i = 0; i < details.selectionList.length; i++) {
+    const item = details.selectionList[i];
+    if (Number(item.scanStatus) === 1) _arr.push(item);
+  }
+
+  tableNodeRef.value.handleClearSelect();
+  tableNodeRef.value.handleCheckSelect(_arr);
+
+  await nextTick();
+  if (_arr.length === 0) return ElMessage.warning('请选择未卸车数据');
+
+  details.popUpShow.chooseDestinationVisited = true;
+};
+
 watch(
   $route,
   (newVal, oldVal) => {
@@ -1417,8 +1512,6 @@ watch(
 
 :deep(.el-table tr) {
   &.Abnormal {
-    // background: #e54b4b;
-
     .tabculconte,
     .el-tooltip,
     .el-button--text,
@@ -1427,13 +1520,25 @@ watch(
       color: #f00 !important;
     }
   }
+}
+
+:deep(.el-tag) {
+  &.err {
+    background-color: #f8544b;
+    border-color: #f8544b;
+    color: #fff;
+  }
 
-  // &.hover-row {
+  &.primary {
-  //   .tabculconte,
+    background-color: #0086f1;
-  //   .el-tooltip,
+    border-color: #0086f1;
-  //   .el-button--text {
+    color: #fff;
-  //     color: var(--el-color-primary) !important;
+  }
-  //   }
+
-  // }
+  &.sub {
+    background-color: #d3832a;
+    border-color: #d3832a;
+    color: #fff;
+  }
 }
 </style>

src/views/wel/index.vue

@@ -365,7 +365,7 @@
           <div class="item border-left">
             <div class="align_center">
               <img class="dataIcon mr5px" src="@/static/icon_money_day.png" alt="" />
-              <span>空置</span>
+              <span>空闲库位</span>
             </div>
             <div class="mt10">
               <span class="data mr5px">{{ details.allocationDataInfo.nullNum || 0 }}</span>
@@ -625,7 +625,7 @@
         <div class="border pd10 flex-c-sb">
           <div class="text_center">
             <div class="data_box blue mb10">
-              <div class="data mr5px">{{ delivery_info.totalDeliveryNum || 0 }}</div>
+              <div class="data mr5px">{{ delivery_info.totalNum || 0 }}</div>
               <div class="">单</div>
             </div>
             <div class="">
@@ -635,7 +635,7 @@
 
           <div class="text_center">
             <div class="data_box blue mb10">
-              <div class="data mr5px">{{ delivery_info.totalNum || 0 }}</div>
+              <div class="data mr5px">{{ delivery_info.totalDeliveryNum || 0 }}</div>
               <div class="">件</div>
             </div>
             <div class="">
@@ -806,7 +806,7 @@
         <div class="border pd10 flex-c-sb">
           <div class="text_center">
             <div class="data_box blue mb10">
-              <div class="data mr5px">{{ delivery_bill_info.totalDeliveryNum || 0 }}</div>
+              <div class="data mr5px">{{ delivery_bill_info.totalNum || 0 }}</div>
               <div class="">单</div>
             </div>
             <div class="">
@@ -816,7 +816,7 @@
 
           <div class="text_center">
             <div class="data_box blue mb10">
-              <div class="data mr5px">{{ delivery_bill_info.totalNum || 0 }}</div>
+              <div class="data mr5px">{{ delivery_bill_info.totalDeliveryNum || 0 }}</div>
               <div class="">件</div>
             </div>
             <div class="">
@@ -1042,10 +1042,10 @@ const details = reactive({
   },
   /** 干线车次数据 */
   trunklineCarsDataInfo: {
-    inTransitNum: 1,
+    inTransitNum: 0,
-    totalNum: 4,
+    totalNum: 0,
-    unloadNum: 1,
+    unloadNum: 0,
-    workNum: 3,
+    workNum: 0,
   },
   /** 异常卸车数据 */
   unloadAbnormalDataInfo: {
@@ -1305,9 +1305,21 @@ const signforData = computed(() => {
     if (value.type + '' === signforData_status.value) _obj = value;
   }
 
-  _obj.signScale = computeNumber(_obj.signScale || 0, '*', 100).result.toFixed(2);
+  _obj.signScaleNum ? _obj.signScaleNum : (_obj.signScaleNum = _obj.signScale || 0);
-  _obj.clerkSignforScale = computeNumber(_obj.clerkSignforScale || 0, '*', 100).result.toFixed(2);
+  _obj.clerkSignforScaleNum
-  _obj.clerkOverTimeScale = computeNumber(_obj.clerkOverTimeScale || 0, '*', 100).result.toFixed(2);
+    ? _obj.clerkSignforScaleNum
+    : (_obj.clerkSignforScaleNum = _obj.clerkSignforScale || 0);
+  _obj.clerkOverTimeScaleNum
+    ? _obj.clerkOverTimeScaleNum
+    : (_obj.clerkOverTimeScaleNum = _obj.clerkOverTimeScale || 0);
+
+  _obj.signScale = computeNumber(_obj.signScaleNum || 0, '*', 100).result.toFixed(2);
+  _obj.clerkSignforScale = computeNumber(_obj.clerkSignforScaleNum || 0, '*', 100).result.toFixed(
+    2
+  );
+  _obj.clerkOverTimeScale = computeNumber(_obj.clerkOverTimeScaleNum || 0, '*', 100).result.toFixed(
+    2
+  );
 
   return _obj;
 });
@@ -1321,9 +1333,21 @@ const billSignforData = computed(() => {
     if (value.type + '' === billSignforData_status.value) _obj = value;
   }
 
-  _obj.signScale = computeNumber(_obj.signScale || 0, '*', 100).result.toFixed(2);
+  _obj.signScaleNum ? _obj.signScaleNum : (_obj.signScaleNum = _obj.signScale || 0);
-  _obj.clerkSignforScale = computeNumber(_obj.clerkSignforScale || 0, '*', 100).result.toFixed(2);
+  _obj.clerkSignforScaleNum
-  _obj.clerkOverTimeScale = computeNumber(_obj.clerkOverTimeScale || 0, '*', 100).result.toFixed(2);
+    ? _obj.clerkSignforScaleNum
+    : (_obj.clerkSignforScaleNum = _obj.clerkSignforScale || 0);
+  _obj.clerkOverTimeScaleNum
+    ? _obj.clerkOverTimeScaleNum
+    : (_obj.clerkOverTimeScaleNum = _obj.clerkOverTimeScale || 0);
+
+  _obj.signScale = computeNumber(_obj.signScaleNum || 0, '*', 100).result.toFixed(2);
+  _obj.clerkSignforScale = computeNumber(_obj.clerkSignforScaleNum || 0, '*', 100).result.toFixed(
+    2
+  );
+  _obj.clerkOverTimeScale = computeNumber(_obj.clerkOverTimeScaleNum || 0, '*', 100).result.toFixed(
+    2
+  );
 
   return _obj;
 });