Merge branch 'dev' into pre-production

src/option/basicdata/ThreePartyMallManagement.js

@@ -17,7 +17,7 @@ export const columnList = [
   {
     prop: 'clientName',
     label: '客户名称',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],

src/views/distribution/artery/directGoMarketDetails.vue

@@ -145,9 +145,7 @@
         <el-text
           @click="handleZeroSigin(slotProps.scope)"
           v-if="
-            permissionObj.directGoMarketDetails_zeroSign &&
-            Number(slotProps.scope.row.type) === 2 &&
-            Number(slotProps.scope.row.scanStatus) !== 3
+            permissionObj.directGoMarketDetails_zeroSign && Number(slotProps.scope.row.type) === 2
           "
         >
           零担签收
@@ -348,7 +346,7 @@
     append-to-body
     class="truckLoadingDetailPopUp"
   >
-    <el-form-item label="零担签收数量" label-width="100px">
+    <!-- <el-form-item label="零担签收数量" label-width="100px">
       <el-input-number
         style="width: 100%"
         :precision="0"
@@ -356,7 +354,76 @@
         :controls="false"
         v-model="details.zeroItem.enterNum"
       />
-    </el-form-item>
+    </el-form-item> -->
+
+    <div class="editZeroCategoryTitleRowByLine">订单信息</div>
+
+    <div class="editZeroCategoryTitleRow mt10">
+      <div class="title">
+        <span>运单号：</span>
+        <span>{{ details.zeroItem.waybillNo }}</span>
+      </div>
+
+      <div class="title">
+        <span>订单号：</span>
+        <span>{{ details.zeroItem.orderCode }}</span>
+      </div>
+
+      <div class="title">
+        <span>装车数：</span>
+        <span>{{ details.zeroItem.num }}</span>
+      </div>
+
+      <div class="title">
+        <span>卸车数：</span>
+        <span>{{ details.zeroItem.unloadNum }}</span>
+      </div>
+    </div>
+
+    <!-- 品类详情 -->
+    <div class="editZeroCategoryTitleRowByLine mt10">品类详情</div>
+
+    <!-- 列表 -->
+    <div class="editZeroCategoryList">
+      <!-- 子项 -->
+      <div
+        class="editZeroCategoryList_item"
+        v-for="item in details.zeroItem.zeroPackageSupplyVOS"
+        :key="item.packageId"
+      >
+        <!-- 标题行 -->
+        <div class="editZeroCategoryTitleRow">
+          <div class="title">
+            <span>品类名：</span>
+            <span>{{ item.goodsName }}</span>
+          </div>
+
+          <div class="title">
+            <span>装车数：</span>
+            <span>{{ item.loadingNum }}</span>
+          </div>
+
+          <div class="title">
+            <span>已卸数：</span>
+            <span>{{ item.unloadNum }}</span>
+          </div>
+        </div>
+
+        <template v-if="details.zeroItem.type === 'unload'">
+          <el-input-number
+            class="inputNum mt10 w100"
+            v-model="item.enterNum"
+            controls-position="right"
+            :precision="0"
+            :min="0"
+            :max="item.loadingNum"
+            :step="1"
+            :value-on-clear="0"
+            :controls="false"
+          />
+        </template>
+      </div>
+    </div>
 
     <!-- 表单按钮 -->
     <div class="flex-c-c">
@@ -480,6 +547,7 @@ import {
   postUploadSignPhoto,
   postSignOrderZeroSuppleList,
 } from '@/api/distribution/directGoMarket';
+import { postFindZeroDetailByCarsLoadScanId } from '@/api/distribution/truckLoadingDetails';
 import { postAddZeroSupple } from '@/api/distribution/zeroAdditionalRecording';
 import { compressImageBlob } from '@/components/IMGcompressor/imgcompressor.js';
 import { postFindSignPhotoList } from '@/api/distribution/directMerchantSign.js';
@@ -494,6 +562,7 @@ import {
   ChecksWhetherTheWarehouseIsSelected,
   handleInputQuery,
   handleSelectQuery,
+  getObjType,
 } from '@/utils/util';
 import {
   columnList,
@@ -1180,7 +1249,30 @@ const handleZeroSigin = async ({ row }) => {
 
   details.zeroItem = { ...row };
   details.zeroItem.enterNum = row.num;
-  details.popUpShow.transferVisited = true;
+  details.zeroItem.type = 'unload';
+
+  try {
+    details.loadingObj.pageLoading = true;
+
+    const res = await postFindZeroDetailByCarsLoadScanId({ carsLoadScanId: row.loadScanId });
+    const { code, data } = res.data;
+    if (code !== 200 || getObjType(data) !== 'array') return;
+    details.zeroItem.zeroPackageSupplyVOS = data;
+
+    for (let i = 0; i < details.zeroItem.zeroPackageSupplyVOS.length; i++) {
+      const item = details.zeroItem.zeroPackageSupplyVOS[i];
+
+      item.enterNum = item.unloadNum || item.loadingNum || 0;
+    }
+
+    details.popUpShow.transferVisited = true;
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.pageLoading = false;
+  }
+
+  // details.popUpShow.transferVisited = true;
 };
 
 /** 签收 -- 零担 -- 提交 */
@@ -1192,9 +1284,19 @@ const handleZeroUnLoadSubmit = async () => {
     const submitData = {
       signOrderId: details.showDetailsSiginOrder.id,
       carsLoadScanId: details.zeroItem.loadScanId,
-      enterNum: details.zeroItem.enterNum,
+      enterNum: 0,
+      zeroPackageList: details.zeroItem.zeroPackageSupplyVOS,
     };
 
+    let _loadingNum = 0;
+    for (let i = 0; i < submitData.zeroPackageList.length; i++) {
+      const val = submitData.zeroPackageList[i];
+      val.enterNum = val.enterNum || 0;
+      _loadingNum += val.enterNum;
+    }
+
+    submitData.enterNum = _loadingNum;
+
     const res = await postSignZero(submitData);
     const { code } = res.data;
 
@@ -1221,7 +1323,7 @@ const handleBatchSigin = async () => {
     cancelButtonText: '取消',
     type: 'success',
   })
-    // 异常提交
+    // 批量提交
     .then(async () => {
       try {
         details.loadingObj.detailsLoading = true;

src/views/warehouse/prewarehousing/Prewarehouseorder.vue

@@ -29,103 +29,97 @@
       </div>
 
       <!-- 控件模块 -->
-      <el-row>
-        <div class="avue-crud__header">
-          <!-- 头部左侧按钮模块 -->
-          <div class="avue-crud__left">
-            <!-- 修改客户信息 -->
-            <el-button type="primary" icon="Edit" @click="editClientInfo"> 修改客户信息 </el-button>
-
-            <!-- 删除 -->
-            <el-button type="primary" icon="Delete" @click="handleDelete"> 删除 </el-button>
-
-            <!-- 开标签 -->
-            <el-button type="primary" icon="Plus" @click="handleOpenAddTagDlog">开标签</el-button>
-
-            <!-- 批量开标签导入 -->
-            <el-button
-              type="primary"
-              icon="Upload"
-              @click="
-                () => {
-                  if (!ChecksWhetherTheWarehouseIsSelected())
-                    return ElMessage.warning('多仓权限无法操作，请选择仓库');
-                  details.popUpShow.UploadBatch = true;
-                  details.ouPaiChooseType = 0;
-                }
-              "
-            >
-              批量开标签导入
-            </el-button>
+      <div class="avue-crud__header">
+        <!-- 头部左侧按钮模块 -->
+        <div class="avue-crud__left">
+          <!-- 修改客户信息 -->
+          <el-button type="primary" icon="Edit" @click="editClientInfo"> 修改客户信息 </el-button>
+
+          <!-- 删除 -->
+          <el-button type="primary" icon="Delete" @click="handleDelete"> 删除 </el-button>
+
+          <!-- 开标签 -->
+          <el-button type="primary" icon="Plus" @click="handleOpenAddTagDlog">开标签</el-button>
+
+          <!-- 批量开标签导入 -->
+          <el-button
+            type="primary"
+            icon="Upload"
+            @click="
+              () => {
+                if (!ChecksWhetherTheWarehouseIsSelected())
+                  return ElMessage.warning('多仓权限无法操作，请选择仓库');
+                details.popUpShow.UploadBatch = true;
+                details.ouPaiChooseType = 0;
+              }
+            "
+          >
+            批量开标签导入
+          </el-button>
 
-            <!-- 欧派数据导入 -->
-            <el-button
-              type="primary"
-              icon="Upload"
-              @click="
-                () => {
-                  details.popUpShow.UploadPackageDelivery = true;
-                  details.ouPaiChooseType = 0;
-                }
-              "
-            >
-              欧派数据导入
-            </el-button>
+          <!-- 欧派数据导入 -->
+          <el-button
+            type="primary"
+            icon="Upload"
+            @click="
+              () => {
+                details.popUpShow.UploadPackageDelivery = true;
+                details.ouPaiChooseType = 0;
+              }
+            "
+          >
+            欧派数据导入
+          </el-button>
 
-            <!-- 冻结 -->
-            <el-button type="primary" icon="Rank" @click="handleFreeze">冻结</el-button>
-          </div>
-          <!-- 头部右侧按钮模块 -->
-          <div class="avue-crud__right">
-            <el-button icon="Download" @click="handleExportData" circle></el-button>
-            <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
-            <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
-            <el-button icon="Search" @click="searchHide" circle></el-button>
-          </div>
+          <!-- 冻结 -->
+          <el-button type="primary" icon="Rank" @click="handleFreeze">冻结</el-button>
+        </div>
+        <!-- 头部右侧按钮模块 -->
+        <div class="avue-crud__right">
+          <el-button icon="Download" @click="handleExportData" circle></el-button>
+          <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
+          <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+          <el-button icon="Search" @click="searchHide" circle></el-button>
         </div>
-      </el-row>
+      </div>
 
       <!-- 首页表格 -->
-      <el-row>
-        <!-- 列表模块 -->
-        <tablecmt
-          class="tableNode"
-          :columnList="details.columnList"
-          :tableData="data"
-          :loading="loadingObj.list"
-          @inputTxt="inputsc"
-          @timeCheck="timesc"
-          @selectCheck="selectsc"
-          @selection="selectionChange"
-        >
-          <template #default="slotProps">
-            <template v-if="slotProps.scope.column.label === '操作'">
-              <div class="ElBtnClass">
-                <el-text @click="handleShowPackageOrderList(slotProps.scope)">包明细</el-text>
-              </div>
-            </template>
+      <!-- 列表模块 -->
+      <tablecmt
+        class="tableNode"
+        :columnList="details.columnList"
+        :tableData="data"
+        :loading="loadingObj.list"
+        @inputTxt="inputsc"
+        @timeCheck="timesc"
+        @selectCheck="selectsc"
+        @selection="selectionChange"
+      >
+        <template #default="slotProps">
+          <template v-if="slotProps.scope.column.label === '操作'">
+            <div class="ElBtnClass">
+              <el-text @click="handleShowPackageOrderList(slotProps.scope)">包明细</el-text>
+            </div>
           </template>
-        </tablecmt>
-      </el-row>
+        </template>
+      </tablecmt>
 
       <!-- 分页模块 -->
-      <el-row class="el-fy">
-        <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
-          <div></div>
-          <el-pagination
-            align="right"
-            background
-            @size-change="sizeChange"
-            @current-change="currentChange"
-            :current-page="page.currentPage"
-            :page-sizes="[30, 50, 80, 120]"
-            :page-size="page.pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="page.total"
-          >
-          </el-pagination>
-        </div>
-      </el-row>
+      <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
+        <div></div>
+        <el-pagination
+          align="right"
+          background
+          @size-change="sizeChange"
+          @current-change="currentChange"
+          :current-page="page.currentPage"
+          :page-sizes="[30, 50, 80, 120]"
+          :page-size="page.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="page.total"
+        >
+        </el-pagination>
+      </div>
     </div>
 
     <!-- 开标签 -->
@@ -854,7 +848,7 @@ const currentChange = val => {
 };
 // 刷新按钮
 const searchChangeS = () => {
-  details.search = false; //关闭搜索
+  // details.search = false; //关闭搜索
   onLoad();
 };
 //清空

src/views/waybill/TemporaryStorageList.vue

@@ -253,7 +253,9 @@
                 <el-input
                   :placeholder="`请输入${item.label}`"
                   v-model="details.addTagForm[item.prop]"
-                  style="width: 200px"
+                  style="width: 240px"
+                  :maxlength="item.maxlength || Infinity"
+                  :show-word-limit="item.maxlength"
                   clearable
                 />
               </template>
@@ -261,7 +263,7 @@
               <template v-if="item.type === 'number'">
                 <el-input-number
                   v-model="details.addTagForm[item.prop]"
-                  style="width: 200px"
+                  style="width: 240px"
                   :precision="item.precision"
                   :min="0"
                   controls-position="right"
@@ -274,7 +276,7 @@
                 <el-cascader
                   :placeholder="`请选择${item.label}`"
                   :options="item.checkArr"
-                  style="width: 200px"
+                  style="width: 240px"
                   v-model="details.addTagForm[item.prop]"
                   :props="{
                     checkStrictly: true,
@@ -294,7 +296,7 @@
                   v-model="details.addTagForm[item.prop]"
                   clearable
                   filterable
-                  style="width: 200px"
+                  style="width: 240px"
                   :placeholder="`请选择${item.label}`"
                 >
                   <el-option
@@ -319,7 +321,7 @@
                   :prop="item.prop"
                 >
                   <el-input
-                    style="width: 200px"
+                    style="width: 240px"
                     :placeholder="`请输入${item.label}`"
                     v-model="details.addTagForm[item.prop]"
                     clearable
@@ -339,7 +341,7 @@
                   clearable
                 >
                   <el-input
-                    style="width: 200px"
+                    style="width: 240px"
                     :placeholder="`请输入${item.label}`"
                     v-model="details.addTagForm[item.prop]"
                     clearable
@@ -713,6 +715,7 @@ const details = reactive<any>({
         type: 'text',
         label: '订单自编号',
         value: '',
+        maxlength: 80,
         checkArr: [],
         rule: [
           { required: true, message: '请输入订单自编号', trigger: 'change' },