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

src/components/tablecmt/tablecmt.vue

@@ -958,4 +958,8 @@ defineExpose({ handleCheckSelect, handleClearSelect });
     @extend .scorll;
   }
 }
+.el-select__selected-item{
+  font-weight: initial;
+  font-size: 12px;
+}
 </style>

src/views/basicdata/brand/basicClient.vue

@@ -1908,6 +1908,13 @@ export default {
       }
       if (res.code !== 200) return this.$message.warning('上传失败');
       this.$message.success('上传成功');
+      if (this.Fileverification) {
+        // 文件校验弹窗
+        this.loadingObj.UploadLoadong = false;
+        // 文件校验
+      } else {
+        this.loadingObj.UploadLoadong = false;
+      }
       if (this.loadingObj.submitLoading) {
         onLoad(this.page);
       }

src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue

@@ -124,7 +124,7 @@
           />
         </el-form-item>
 
-        <el-form-item label="仓库地址" prop="warehouseAddress">
+        <el-form-item label="仓库地址" prop="address">
           <avue-input-map
             :params="warehouseAddress"
             placeholder="请选择地图"
@@ -457,7 +457,7 @@ const rules = reactive({
   contactNumber: [{ required: true, message: '请输入联系电话', trigger: 'change' }],
   addressInfo: [{ required: true, message: '请选择仓库地区', trigger: 'change' }],
   department: [{ required: true, message: '请选择所属部门', trigger: 'change' }],
-  warehouseAddress: [{ required: true, message: '请选择仓库地址', trigger: 'change' }],
+  address: [{ required: true, message: '请选择仓库地址', trigger: 'change' }],
 });
 const Topquery = ref({}); //顶部搜索参数
 const newlyaddload = ref(false); //新增弹窗
@@ -976,40 +976,49 @@ const newlyaddSubmit = () => {
       let data = {
         ...Addform.value,
       };
-
       // 处理图片
       let imgURl = [];
-      const isValid = Addform.value.paymentCodeUrl.every(item => {
+      if (Addform.value.paymentCodeUrl?.length) {
-        if (item.url && !item.response) {
+        const isValid = Addform.value.paymentCodeUrl.every(item => {
-          // 这里是回显的图片
+          if (item.url && !item.response) {
-          imgURl.push(item.url);
+            // 这里是回显的图片
-          return true;
+            imgURl.push(item.url);
-        }
+            return true;
-        if (item.response?.code === 200 && item.response.data?.link) {
+          }
-          // 这里是最新上传的图片
+          if (item.response?.code === 200 && item.response.data?.link) {
-          imgURl.push(item.response.data.link);
+            // 这里是最新上传的图片
-          return true;
+            imgURl.push(item.response.data.link);
-        }
+            return true;
-        return false;
+          }
-      });
+          return false;
-
-      if (!isValid) {
-        ElMessage({
-          message: '图片上传错误,请移除图片重新上传',
-          type: 'warning',
-          plain: true,
         });
-        return;
-      }
 
+        if (!isValid) {
+          ElMessage({
+            message: '图片上传错误,请移除图片重新上传',
+            type: 'warning',
+            plain: true,
+          });
+          return;
+        }
+        data.paymentCodeUrl = imgURl.join(',');
+      }else{
+        delete data.paymentCodeUrl
+      }
       data.warehouseAddress = Addform.value.address[2]; //地址
       console.log(Addform.value, 'Addform.value');
-      data.daterange[0] = dayjs(data.daterange[0]).format('YYYY-MM-DD');
+      if (data.daterange?.length) {
-      data.daterange[1] = dayjs(data.daterange[1]).format('YYYY-MM-DD');
+        data.daterange[0] = dayjs(data.daterange[0]).format('YYYY-MM-DD');
-      data.paymentCodeUrl = imgURl.join(',');
+        data.daterange[1] = dayjs(data.daterange[1]).format('YYYY-MM-DD');
+      }else{
+       delete data.daterange
+      }
       data.administrativeAreas = data.administrativeAreas.join(',');
-      data.startDate = Addform.value['daterange'][0];
+      if (Addform.value.daterange?.length) {
-      data.endDate = Addform.value['daterange'][1];
+        data.startDate = Addform.value['daterange'][0];
+        data.endDate = Addform.value['daterange'][1];
+      }
+
       data.provinceCode = Addform.value['addressInfo'][0]; //仓库地区-省
       data.cityCode = Addform.value['addressInfo'][1]; //仓库地区-市
       data.code = Addform.value['addressInfo'][2]; //仓库地区-区