修复部分bug

src/components/tablecmt/tablecmt.vue

@@ -797,6 +797,14 @@ defineExpose({ handleCheckSelect, handleClearSelect });
 .selectbr {
   border: none !important;
   font-size: 12px !important;
+
+  .el-select__wrapper {
+    min-height: 0;
+  }
+
+  .el-select__input {
+    height: 1.1rem !important;
+  }
 }
 .tabtitles {
   color: #092c4d !important;
@@ -958,7 +966,7 @@ defineExpose({ handleCheckSelect, handleClearSelect });
     @extend .scorll;
   }
 }
-.el-select__selected-item{
+.el-select__selected-item {
   font-weight: initial;
   font-size: 12px;
 }

src/option/distribution/arteryDistrilbutionBillLadingList.js

@@ -396,7 +396,7 @@ export const columnDetailList = [
   {
     prop: 'incomingTypeName',
     label: '入库类型',
-    type: 3,
+    type: 1,
     values: '',
     width: '130',
     checkarr: [
@@ -426,7 +426,7 @@ export const columnDetailList = [
   {
     prop: 'trayName',
     label: '托盘名称',
-    type: 2,
+    type: 1,
     values: '',
     width: '130',
     checkarr: [],
@@ -436,7 +436,7 @@ export const columnDetailList = [
   {
     prop: 'trayCode',
     label: '托盘码',
-    type: 2,
+    type: 1,
     values: '',
     width: '130',
     checkarr: [],
@@ -446,7 +446,7 @@ export const columnDetailList = [
   {
     prop: 'firstPickName',
     label: '一级品类',
-    type: 2,
+    type: 1,
     values: '',
     width: '130',
     checkarr: [],
@@ -456,7 +456,7 @@ export const columnDetailList = [
   {
     prop: 'secondPickName',
     label: '二级品类',
-    type: 2,
+    type: 1,
     values: '',
     width: '130',
     checkarr: [],
@@ -466,7 +466,7 @@ export const columnDetailList = [
   {
     prop: 'thirdPickName',
     label: '三级品类',
-    type: 2,
+    type: 1,
     values: '',
     width: '130',
     checkarr: [],
@@ -476,7 +476,7 @@ export const columnDetailList = [
   {
     prop: 'materialName',
     label: '物料名称',
-    type: 2,
+    type: 1,
     values: '',
     width: '150',
     checkarr: [],
@@ -486,7 +486,7 @@ export const columnDetailList = [
   {
     prop: 'brand',
     label: '品牌',
-    type: 2,
+    type: 1,
     values: '',
     width: '150',
     checkarr: [],
@@ -496,7 +496,7 @@ export const columnDetailList = [
   {
     prop: 'warehouseName',
     label: '操作仓库',
-    type: 2,
+    type: 1,
     values: '',
     width: '130',
     checkarr: [],

src/views/distribution/artery/TripartiteTransfer.vue

@@ -278,6 +278,7 @@
           :headers="details.headers"
           :on-remove="handleRemove"
           :before-upload="handleBeforeUpload"
+          :before-remove="handleBeforeRemove"
           :on-success="handleSiginImgSuccess"
           multiple
         >
@@ -658,6 +659,10 @@ const details = reactive<any>({
   loadId: '',
   /** 在上传图片的中转批次号 */
   carsNo: '',
+  /** 是否为签收状态 */
+  isSign: false,
+  /** 已上传的图片 */
+  oldImgArr: [],
   // 图片上传必须携带TOKEN
   headers: { 'Blade-Auth': 'Bearer ' + getToken() },
   /** 异常信息 */
@@ -1041,7 +1046,7 @@ const submitConfirmArrive = async () => {
 /** 发车提交 */
 const startCar = async () => {
   try {
-    details.popUpShow.tipVisted = true;
+    details.popUpShow.tipVisted = false;
     details.loadingObj.pageLoading = true;
 
     // const _arr = [];
@@ -1310,6 +1315,8 @@ const handleShowSiginImg = async ({ row }) => {
 
     details.fileList = [];
     details.viewImgList = [];
+    details.oldImgArr = [];
+    details.isSign = Number(row.loadStatus) === 90 || Number(row.loadStatus) === 91 ? true : false;
 
     const res = await postTripartiteTransferFindSignPhoto({ loadId: row.id });
 
@@ -1325,7 +1332,7 @@ const handleShowSiginImg = async ({ row }) => {
           url: val.photoUrl,
           imgUrl: val.photoUrl,
         });
-
+        details.oldImgArr.push(val.photoUrl);
         details.viewImgList.push(val.photoUrl);
       }
     }
@@ -1368,6 +1375,15 @@ const handleBeforeUpload = async (rawFile: UploadRawFile) => {
   return res;
 };
 
+/** 移除前检测 */
+const handleBeforeRemove = rawFile => {
+  const _flag = !details.isSign ? !details.oldImgArr.includes(rawFile.imgUrl) : true;
+
+  !_flag && ElMessage.warning('已签收，无法删除已提交的图片');
+
+  return _flag;
+};
+
 /** 上传成功 */
 const handleSiginImgSuccess = (response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) => {
   details.viewImgList = details.fileList.map(val => val.url);

src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue

@@ -42,19 +42,6 @@
 
           <div v-h5uShow="!search">
             <!-- 查询模块 -->
-            <el-form :inline="true" :model="query" class="header_search">
-              <el-form-item label="提货批次:">
-                <el-input v-model="query.serviceNumber" placeholder="请输入提货批次"></el-input>
-              </el-form-item>
-
-              <!-- 查询按钮 -->
-              <el-form-item class="el-btn">
-                <el-button type="primary" icon="el-icon-search" @click="searchChange"
-                  >搜 索</el-button
-                >
-                <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
-              </el-form-item>
-            </el-form>
           </div>
           <div class="flex-c-sb mt10">
             <!-- 头部左侧按钮模块 -->