Merge remote-tracking branch 'origin/develop' into develop

src/views/biz/computilityinformation/ComputilityInformationForm.vue

@@ -10,7 +10,7 @@
 <!--      <el-form-item label="展示图地址" prop="images">-->
 <!--        <UploadImg v-model="formData.images" />-->
 <!--      </el-form-item>-->
-      <el-form-item label="轮播图地址" prop="images">
+      <el-form-item label="展示图地址" prop="images">
         <el-upload
           v-model:file-list="formData.images"
           :action="uploadUrl"

src/views/biz/industryapplication/IndustryApplicationForm.vue

@@ -10,7 +10,7 @@
 <!--      <el-form-item label="展示图地址" prop="image">-->
 <!--        <UploadImg v-model="formData.image" />-->
 <!--      </el-form-item>-->
-      <el-form-item label="轮播图地址" prop="images">
+      <el-form-item label="展示图地址" prop="images">
         <el-upload
           v-model:file-list="formData.images"
           :action="uploadUrl"

src/views/biz/information/InformationForm.vue

@@ -52,7 +52,7 @@
 <!--      <el-form-item label="预览图" prop="image">-->
 <!--        <UploadImg v-model="formData.image" />-->
 <!--      </el-form-item>-->
-      <el-form-item label="轮播图地址" prop="images">
+      <el-form-item label="预览图" prop="images">
         <el-upload
           v-model:file-list="formData.images"
           :action="uploadUrl"
@@ -142,6 +142,9 @@ const open = async (type: string, id?: number) => {
       if (data.description === null) {
         data.description = ''
       }
+      //将字典的值由布尔型转为整型
+      data.category = Number(data.category)
+      data.industryCategory = Number(data.industryCategory)
 
       // 将 images 字段转换为 file-list 需要的格式
       if (data.images && Array.isArray(data.images)) {