Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/views/aftersales/aftersalesWorkOrderAdd.vue

@@ -1204,6 +1204,9 @@ const beforeAvatarUpload = async rawFile => {
   if (rawFile.type !== 'image/png' && rawFile.type !== 'image/jpeg') {
     ElMessage.error('只能上传格式为PNG/JPG的图片!');
     return false;
+  } else if (rawFile.size / 1024 / 1024 > 4) {
+    ElMessage.error('图片大小不能大于4MB!');
+    return false;
   }
   const res = await compressImageBlob(rawFile);
   return res;

src/views/aftersales/aftersalesWorkOrderAddCopy.vue

@@ -751,8 +751,8 @@ const beforeAvatarUpload = async rawFile => {
   if (rawFile.type !== 'image/png' && rawFile.type !== 'image/jpeg') {
     ElMessage.error('图片格式只能为 png/jpg!');
     return false;
-  } else if (rawFile.size / 1024 / 1024 > 10) {
-    ElMessage.error('图片大小不能大于10MB!');
+  } else if (rawFile.size / 1024 / 1024 > 4) {
+    ElMessage.error('图片大小不能大于4MB!');
     return false;
   }
   const res = await compressImageBlob(rawFile);
@@ -2261,5 +2261,4 @@ const isShowFormItem4 = computed(() => {
 .page_loading {
   height: 100%;
 }
-
 </style>

src/views/aftersales/aftersalesWorkOrderAddTemp.vue

@@ -1998,8 +1998,6 @@ const isShowFormItem4 = computed(() => {
   }
 }
 .ResponsibilityBox {
-
-
   width: 100%;
   display: flex;
   flex-direction: column;

src/views/aftersales/aftersalesWorkOrderInfoEnxt.vue

@@ -931,6 +931,9 @@ const beforeAvatarUpload = async rawFile => {
   if (!_whiteArr.includes(_name.toLocaleLowerCase())) {
     ElMessage.warning('请上传png、jpg、jpeg的类型图片');
     return false;
+  } else if (rawFile.size / 1024 / 1024 > 4) {
+    ElMessage.error('图片大小不能大于4MB!');
+    return false;
   }
   const res = await compressImageBlob(rawFile);
   return res;

src/views/aftersales/aftersalesWorkOrderInfoTemp.vue

@@ -906,6 +906,9 @@ const beforeAvatarUpload = async rawFile => {
   if (!_whiteArr.includes(_name.toLocaleLowerCase())) {
     ElMessage.warning('请上传png、jpg、jpeg的类型图片');
     return false;
+  } else if (rawFile.size / 1024 / 1024 > 4) {
+    ElMessage.error('图片大小不能大于4MB!');
+    return false;
   }
   const res = await compressImageBlob(rawFile);
   return res;

src/views/aftersales/aftersalesWorkOrdermodify.vue

@@ -1544,7 +1544,7 @@ const Responsemoval = index => {
 };
 
 const calculateMaxValues = () => {
-  return
+  return;
   // 计算每个输入框剩余最大值
   let data = form.value.responsibilitiesList;
   let totalUsed = data.reduce((acc, item) => acc + item.responsibilityRatio, 0);
@@ -1611,8 +1611,8 @@ const beforeAvatarUpload = async rawFile => {
   if (rawFile.type !== 'image/png' && rawFile.type !== 'image/jpeg') {
     ElMessage.error('只能上传格式为PNG/JPG的图片!');
     return false;
-  } else if (rawFile.size / 1024 / 1024 > 3) {
-    ElMessage.error('图片大小不能大于3MB!');
+  } else if (rawFile.size / 1024 / 1024 > 4) {
+    ElMessage.error('图片大小不能大于4MB!');
     return false;
   }
   const res = await compressImageBlob(rawFile);

src/views/aftersales/aftersalesWorkOrdermodifyTemp.vue

@@ -1017,6 +1017,9 @@ const beforeAvatarUpload = async rawFile => {
   if (_nameArr.length === 0) {
     ElMessage.warning('异常类型文件');
     return false;
+  } else if (rawFile.size / 1024 / 1024 > 4) {
+    ElMessage.error('图片大小不能大于4MB!');
+    return false;
   }
 
   const _name = _nameArr[_nameArr.length - 1];

src/views/basic/forklift/basicForklift.vue

@@ -998,8 +998,8 @@ export default {
       if (rawFile.type !== 'image/png') {
         ElMessage.error('图片格式只能为image/png!');
         return false;
-      } else if (rawFile.size / 1024 / 1024 > 2) {
-        ElMessage.error('图片大小不能大于2MB!');
+      } else if (rawFile.size / 1024 / 1024 > 4) {
+        ElMessage.error('图片大小不能大于4MB!');
         return false;
       }
       const res = await compressImageBlob(rawFile);

src/views/basic/forklift/basicForklift2.vue

@@ -696,8 +696,8 @@ export default {
       if (rawFile.type !== 'image/png') {
         ElMessage.error('图片格式只能为image/png!');
         return false;
-      } else if (rawFile.size / 1024 / 1024 > 2) {
-        ElMessage.error('图片大小不能大于2MB!');
+      } else if (rawFile.size / 1024 / 1024 > 4) {
+        ElMessage.error('图片大小不能大于4MB!');
         return false;
       }
       const res = await compressImageBlob(rawFile);

src/views/basic/pda/basicPda2.vue

@@ -571,8 +571,8 @@ export default {
       if (rawFile.type !== 'image/png') {
         ElMessage.error('图片格式只能为image/png!');
         return false;
-      } else if (rawFile.size / 1024 / 1024 > 2) {
-        ElMessage.error('图片大小不能大于2MB!');
+      } else if (rawFile.size / 1024 / 1024 > 4) {
+        ElMessage.error('图片大小不能大于4MB!');
         return false;
       }
       const res = await compressImageBlob(rawFile);

src/views/basic/pda/basicPdatt.vue

@@ -803,6 +803,9 @@ const beforeAvatarUpload: UploadProps['beforeUpload'] = async rawFile => {
   if (!_whiteArr.includes(_name.toLocaleLowerCase())) {
     ElMessage.warning('请上传png、jpg、jpeg的类型图片');
     return false;
+  } else if (rawFile.size / 1024 / 1024 > 4) {
+    ElMessage.error('图片大小不能大于4MB!');
+    return false;
   }
   const res = await compressImageBlob(rawFile);
   return res;

src/views/basicdata/brand/basicBrand.vue

@@ -376,13 +376,13 @@ export default {
       const isJPEG = file.type === 'image/jpeg';
       const isJPG = file.type === 'image/jpg';
       const isPNG = file.type === 'image/png';
-      const isLt2M = file.size / 1024 / 1024 < 2;
+      const isLt2M = file.size / 1024 / 1024 < 4;
 
       if (!isJPEG && !isJPG && !isPNG) {
         this.$message.error('上传头像图片是 JPG | JPEG | PNG 格式!');
       }
-      if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!');
+      if (!isLt4M) {
+        this.$message.error('上传头像图片大小不能超过 4MB!');
       }
       return (isJPG || isJPEG || isPNG) && isLt2M;
     },

src/views/basicdata/brand/basicClientFrom.vue

@@ -677,8 +677,8 @@ export default {
       if (rawFile.type !== 'image/png') {
         ElMessage.error('图片格式只能为image/png!');
         return false;
-      } else if (rawFile.size / 1024 / 1024 > 2) {
-        ElMessage.error('图片大小不能大于2MB!');
+      } else if (rawFile.size / 1024 / 1024 > 4) {
+        ElMessage.error('图片大小不能大于4MB!');
         return false;
       }
       const res = await compressImageBlob(rawFile);

src/views/basicdata/driverArtery/basicdataDriverArteryAdd.vue

@@ -611,14 +611,14 @@ export default {
       try {
         const isJPG = file.type === 'image/jpeg';
         const isPNG = file.type === 'image/png';
-        const isLt2M = file.size / 1024 / 1024 < 2;
+        const isLt4M = file.size / 1024 / 1024 < 4;
 
         if (!isJPG && !isPNG) {
           this.$message.error('上传图片只能是 JPG 或 PNG 格式!');
           return false;
         }
-        if (!isLt2M) {
-          this.$message.error('上传图片大小不能超过 2MB!');
+        if (!isLt4M) {
+          this.$message.error('上传图片大小不能超过 4MB!');
           return false;
         }
         item.loading = true;

src/views/cost/storagecost/Transferwarehousestatistics.vue

@@ -179,7 +179,11 @@
       class="el_Abnormalsettlement"
     >
       <div v-loading="Abnormalsettlement.loading" element-loading-text="Loading...">
-        <el-tabs class="demo-tabs" v-model="Abnormalsettlement.activeName1" v-if="Abnormalsettlement.form.settlementStatus !='已结算'">
+        <el-tabs
+          class="demo-tabs"
+          v-model="Abnormalsettlement.activeName1"
+          v-if="Abnormalsettlement.form.settlementStatus != '已结算'"
+        >
           <el-tab-pane label="费用信息" name="费用信息">
             <h3>结算单号:{{ Abnormalsettlement.form.settlementCode }}</h3>
             <h3>结算状态:【{{ Abnormalsettlement.form.settlementStatus }}】</h3>
@@ -265,7 +269,7 @@
           type="primary"
           @click="AbnormalsettlementSubmit"
           :disabled="Abnormalsettlement.loading"
-          v-if="Abnormalsettlement.form.settlementStatus !='已结算'"
+          v-if="Abnormalsettlement.form.settlementStatus != '已结算'"
         >
           确定
         </el-button>
@@ -622,6 +626,9 @@ const beforeAvatarUpload = async rawFile => {
   if (!allowedTypes.includes(rawFile.type)) {
     ElMessage.error('只能上传格式为PNG/JPG/GIF/WebP/SVG的图片!');
     return false;
+  } else if (rawFile.size / 1024 / 1024 > 4) {
+    ElMessage.error('图片大小不能大于4MB!');
+    return false;
   }
   const res = await compressImageBlob(rawFile);
   return res;
@@ -939,10 +946,10 @@ const exportExcel = () => {
     margin: 10px;
   }
 }
-.el-fr-d{
+.el-fr-d {
   display: flex;
   width: 100%;
-  .el-btn{
+  .el-btn {
     margin: 0;
     align-items: flex-start;
   }

src/views/datadetail/ToolUpdate.vue

@@ -315,6 +315,9 @@ const beforeAvatarUpload: UploadProps['beforeUpload'] = async rawFile => {
   if (!_whiteArr.includes(_name.toLocaleLowerCase())) {
     ElMessage.warning('请上传png、jpg、jpeg的类型图片');
     return false;
+  } else if (rawFile.size / 1024 / 1024 > 4) {
+    ElMessage.error('图片大小不能大于4MB!');
+    return false;
   }
   const res = await compressImageBlob(rawFile);
   return res;

src/views/distribution/artery/VehicleNodeImgs.vue

@@ -563,14 +563,14 @@ const handleBeforeUpload = async (file, item) => {
     console.log('item :>> ', item);
     const isJPG = file.type === 'image/jpeg';
     const isPNG = file.type === 'image/png';
-    const isLt2M = file.size / 1024 / 1024 < 2;
+    const isLt4M = file.size / 1024 / 1024 < 4;
 
     if (!isJPG && !isPNG) {
       ElMessage.warning('上传图片只能是 JPG 或 PNG 格式!');
       return false;
     }
-    if (!isLt2M) {
-      ElMessage.warning('上传图片大小不能超过 2MB!');
+    if (!isLt4M) {
+      ElMessage.warning('上传图片大小不能超过 4MB!');
       return false;
     }
     item.loading = true;

src/views/distribution/artery/directGoMarketDetails.vue

@@ -1130,6 +1130,9 @@ const beforeAvatarUpload: UploadProps['beforeUpload'] = async rawFile => {
   if (!_whiteArr.includes(_name.toLocaleLowerCase())) {
     ElMessage.warning('请上传png、jpg、jpeg的类型图片');
     return false;
+  } else if (rawFile.size / 1024 / 1024 > 4) {
+    ElMessage.error('图片大小不能大于4MB!');
+    return false;
   }
   const res = await compressImageBlob(rawFile);
   return res;

src/views/reportforms/ConsigneeReport.vue

@@ -3,15 +3,17 @@
     <div class="avue-crud">
       <!-- 搜索模块 -->
       <div v-h5uShow="search">
+        <!-- 查询模块 -->
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query" class="header_search" label-width="100px">
-          <el-form-item label="品牌" prop="brandName">
+          <el-form-item label="品牌" prop="brands">
             <el-select
               class="w100"
-              v-model="query.brand"
+              v-model="query.brands"
               filterable
               placeholder="请选择"
               default-first-option
+              multiple
               clearable
             >
               <el-option
@@ -75,10 +77,11 @@
           <el-form-item label="事业线">
             <el-select
               class="w100"
-              v-model="query.businessLine"
+              v-model="query.businessLines"
               filterable
               placeholder="请选择"
               default-first-option
+              multiple
               clearable
             >
               <el-option
@@ -90,12 +93,46 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="始发仓">
-            <el-input v-model="query.departureWarehouseName" placeholder="请输入" clearable />
+          <el-form-item label="发站仓">
+            <el-select
+              class="w100"
+              v-model="query.departureWarehouseIds"
+              filterable
+              placeholder="请选择"
+              default-first-option
+              multiple
+              clearable
+            >
+              <el-option
+                v-for="value in details.warehouseOption"
+                :key="value.dictKey"
+                :label="value.dictValue"
+                :value="value.dictKey"
+              />
+            </el-select>
           </el-form-item>
 
           <el-form-item label="目的仓">
-            <el-input v-model="query.destinationWarehouseName" placeholder="请输入" clearable />
+            <el-select
+              class="w100"
+              v-model="query.destinationWarehouseIds"
+              filterable
+              placeholder="请选择"
+              default-first-option
+              multiple
+              clearable
+            >
+              <el-option
+                v-for="value in details.warehouseOption"
+                :key="value.dictKey"
+                :label="value.dictValue"
+                :value="value.dictKey"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="收货单位">
+            <el-input placeholder="请输入" v-model="details.query.consignee" />
           </el-form-item>
 
           <!-- 查询按钮 -->
@@ -192,6 +229,7 @@ import {
 } from '@/utils/util';
 import { useRouter } from 'vue-router';
 import { ElMessage, ElMessageBox } from 'element-plus';
+import { getListName } from '@/api/basicdata/basicdataVehicle';
 import { columnList } from '@/option/reportforms/ConsigneeReport';
 
 // 获取路由实例
@@ -262,6 +300,8 @@ const details = reactive<any>({
   brandOptions: [],
   /** 事业线 */
   businessLineOption: [],
+  /** 仓库 */
+  warehouseOption: [],
   /** 弹出层显示 */
   popUpShow: {},
   /** 全屏 */
@@ -356,6 +396,18 @@ const handleFindBrand = async () => {
   }
 };
 
+/** 初始化请求仓库数据 */
+getListName({ name: '' }).then(res => {
+  const { code, data } = res.data;
+  if (code !== 200 || getObjType(data) !== 'array') return;
+  details.warehouseOption = data.map(val => {
+    return {
+      dictKey: val.id,
+      dictValue: val.name,
+    };
+  });
+});
+
 /** 查询事业线 */
 const handleFindbusinessLine = async () => {
   try {

src/views/reportforms/SalesDepartmentIncomeReport.vue

@@ -5,13 +5,14 @@
       <div v-h5uShow="search">
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query" class="header_search" label-width="100px">
-          <el-form-item label="品牌" prop="brandName">
+          <el-form-item label="品牌" prop="brands">
             <el-select
               class="w100"
-              v-model="query.brandName"
+              v-model="query.brands"
               filterable
               placeholder="请选择"
               default-first-option
+              multiple
               clearable
             >
               <el-option
@@ -75,10 +76,11 @@
           <el-form-item label="事业线">
             <el-select
               class="w100"
-              v-model="query.businessLine"
+              v-model="query.businessLines"
               filterable
               placeholder="请选择"
               default-first-option
+              multiple
               clearable
             >
               <el-option
@@ -90,12 +92,42 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="始发仓">
-            <el-input v-model="query.departureWarehouseName" placeholder="请输入" clearable />
+          <el-form-item label="发站仓">
+            <el-select
+              class="w100"
+              v-model="query.departureWarehouseIds"
+              filterable
+              placeholder="请选择"
+              default-first-option
+              multiple
+              clearable
+            >
+              <el-option
+                v-for="value in details.warehouseOption"
+                :key="value.dictKey"
+                :label="value.dictValue"
+                :value="value.dictKey"
+              />
+            </el-select>
           </el-form-item>
 
           <el-form-item label="目的仓">
-            <el-input v-model="query.destinationWarehouseName" placeholder="请输入" clearable />
+            <el-select
+              class="w100"
+              v-model="query.destinationWarehouseIds"
+              filterable
+              placeholder="请选择"
+              default-first-option
+              multiple
+              clearable
+            >
+              <el-option
+                v-for="value in details.warehouseOption"
+                :key="value.dictKey"
+                :label="value.dictValue"
+                :value="value.dictKey"
+              />
+            </el-select>
           </el-form-item>
 
           <!-- 查询按钮 -->
@@ -192,6 +224,7 @@ import {
 } from '@/utils/util';
 import { useRouter } from 'vue-router';
 import { ElMessage, ElMessageBox } from 'element-plus';
+import { getListName } from '@/api/basicdata/basicdataVehicle';
 import { columnList } from '@/option/reportforms/SalesDepartmentIncomeReport';
 
 // 获取路由实例
@@ -262,6 +295,8 @@ const details = reactive<any>({
   brandOptions: [],
   /** 事业线 */
   businessLineOption: [],
+  /** 仓库 */
+  warehouseOption: [],
   /** 弹出层显示 */
   popUpShow: {},
   /** 全屏 */
@@ -356,6 +391,18 @@ const handleFindBrand = async () => {
   }
 };
 
+/** 初始化请求仓库数据 */
+getListName({ name: '' }).then(res => {
+  const { code, data } = res.data;
+  if (code !== 200 || getObjType(data) !== 'array') return;
+  details.warehouseOption = data.map(val => {
+    return {
+      dictKey: val.id,
+      dictValue: val.name,
+    };
+  });
+});
+
 /** 查询事业线 */
 const handleFindbusinessLine = async () => {
   try {