Merge branch 'test' into 'feature-20251125wyz-做产品上架'

Test

See merge request !8

package.json

 {
-  "name": "ruoyi",
+  "name": "yd",
   "version": "3.9.0",
-  "description": "若依管理系统",
-  "author": "若依",
+  "description": "银盾中台系统",
+  "author": "银盾",
   "license": "MIT",
   "type": "module",
   "scripts": {

src/api/common.js

@@ -34,3 +34,20 @@ export function getAllCompanys(data) {
     data: data
   })
 }
+// 获取保险对账公司
+export function getReconciliationCompany(data) {
+  return request({
+    url: '/insurance/base/api/insuranceReconciliationCompany/page',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获取保险公司列表
+export function getInsuranceCompany(data) {
+  return request({
+    url: '/insurance/base/api/insuranceCompany/page',
+    method: 'post',
+    data: data
+  })
+}

src/api/product/index.js

@@ -110,7 +110,7 @@ export function deleteCommission(announcementCommissionRatioBizId) {
     method: 'delete'
   })
 }
-// 获得来佣列表的数据
+// 获得来佣规格数据
 export function comeCommissionList(data) {
   return request({
     url: '/product/api/expectedSpecies/page',
@@ -118,7 +118,7 @@ export function comeCommissionList(data) {
     data: data
   })
 }
-// 获得来佣列表的数据
+// 更新产品规格数据
 export function comeExpectedSpecies(data) {
   return request({
     url: '/product/api/expectedSpecies/import/species',

src/api/system/dept.js

@@ -82,3 +82,11 @@ export function getAllCompanys(data) {
     data: data
   })
 }
+// 通过部门ID查询部门下的所有用户
+export function getDeptUsers(data) {
+  return request({
+    url: '/user/api/relTenantDept/import/query/dept/tree',
+    method: 'post',
+    data: data
+  })
+}
\ No newline at end of file

src/components/Pagination/index.vue

@@ -33,7 +33,7 @@ const props = defineProps({
   pageSizes: {
     type: Array,
     default() {
-      return [10, 20, 30, 50]
+      return [10, 50, 100, 300]
     }
   },
   // 移动端页码按钮的数量端默认值5

src/views/merchandise/addProduce.vue

@@ -7,25 +7,11 @@
         <el-row>
           <el-col :span="12">
             <div class="commonHeader">产品标题</div>
-            <el-select
-              v-model="queryParams.productName"
-              filterable
-              remote
-              allow-create
-              default-first-option
-              :reserve-keyword="false"
-              placeholder="请选择产品名称"
-              @blur="handleSelectChange"
-              :remote-method="searchProduct"
-              clearable
-              remote-show-suffix
-            >
-              <el-option
-                v-for="item in productList"
-                :key="item.productBizId"
-                :label="item.productName"
-                :value="item.productBizId"
-              />
+            <el-select v-model="queryParams.productName" filterable remote allow-create default-first-option
+              :reserve-keyword="false" placeholder="请选择产品名称" @blur="handleSelectChange" :remote-method="searchProduct"
+              clearable remote-show-suffix>
+              <el-option v-for="item in productList" :key="item.productBizId" :label="item.productName"
+                :value="item.productBizId" />
             </el-select>
           </el-col>
           <el-col :span="24">
@@ -47,29 +33,21 @@
           </el-col>
           <el-col :span="24" v-if="showNameTip">
             <div class="tipCon">
-              <el-icon color="red" :size="20" style="margin-right: 5px"><Warning /></el-icon>
+              <el-icon color="red" :size="20" style="margin-right: 5px">
+                <Warning />
+              </el-icon>
               <span>标题信息过少，请至少输入5个有效字数（含中文、英文、数字）</span>
             </div>
           </el-col>
           <el-col :span="24" style="margin: 20px 0">
             <div class="commonHeader">
               图片和视频
-              <span style="color: rgb(111, 111, 111); font-size: 15px"
-                >({{ imageInfo.count }}/9)</span
-              >
+              <span style="color: rgb(111, 111, 111); font-size: 15px">({{ imageInfo.count }}/9)</span>
             </div>
 
-            <image-upload
-              v-model="queryParams.picture"
-              :action="'/oss/api/oss/upload'"
-              :limit="9"
-              :image-size="10"
-              :video-size="500"
-              :file-type="['png', 'jpg', 'jpeg', 'mp4']"
-              :is-show-tip="false"
-              @change="handleImageChange"
-              @file-change="handleFileChange"
-            />
+            <image-upload v-model="queryParams.picture" :action="'/oss/api/oss/upload'" :limit="9" :image-size="10"
+              :video-size="500" :file-type="['png', 'jpg', 'jpeg', 'mp4']" :is-show-tip="false"
+              @change="handleImageChange" @file-change="handleFileChange" />
           </el-col>
           <el-col :span="24">
             <div v-for="(item, index) in imageRequireList" :key="item.key" class="imgTip">
@@ -90,7 +68,9 @@
           </el-col>
           <el-col :span="24" v-if="imageInfo.count > 0 && imageInfo.count < 3">
             <div class="tipCon">
-              <el-icon color="red" :size="20" style="margin-right: 5px"><Warning /></el-icon>
+              <el-icon color="red" :size="20" style="margin-right: 5px">
+                <Warning />
+              </el-icon>
               <span>请上传至少3张产品主图</span>
             </div>
           </el-col>
@@ -338,6 +318,10 @@ function submitProduct() {
     })
   }
   if (imageInfo.value.fileList && imageInfo.value.fileList.length > 0) {
+    if (imageInfo.value.fileList.length < 3) {
+      proxy.$modal.msgError('请上传3张产品图片')
+      return
+    }
     imageInfo.value.fileList.forEach(item => {
       mainUrlsList.push(item.url)
     })
@@ -395,6 +379,7 @@ searchProduct()
   overflow: hidden;
   overflow-y: scroll; */
 }
+
 .form-content {
   width: 100%;
   box-sizing: border-box;
@@ -404,15 +389,18 @@ searchProduct()
   /* padding: 20px; */
   /* background-color: #fff; */
 }
+
 .formHeader {
   margin-bottom: 20px;
   font-size: 22px;
   font-weight: 600;
 }
+
 .nameTip {
   font-size: 13px;
   margin-top: 10px;
 }
+
 .tipCon {
   /* width: 450px; */
   width: fit-content;
@@ -426,23 +414,28 @@ searchProduct()
   font-size: 14px;
   display: flex;
   align-items: center;
+
   span {
     color: rgb(111 111 111);
   }
 }
+
 .commonHeader {
   font-size: 16px;
   margin-bottom: 15px;
 }
+
 .imgTip {
   color: #ccc;
   font-size: 14px;
   margin-bottom: 10px;
 }
+
 .classTip {
   color: #ccc;
   font-size: 14px;
 }
+
 .bottomBtn {
   border-top: 1px solid rgb(247 247 247);
   width: 100%;

src/views/merchandise/components/productBaseInfo.vue

@@ -234,9 +234,9 @@
                       </div>
                     </el-col>
                   </template>
-                  <el-col :span="24" class="addTxt">
+                  <el-col :span="24" class="addTxt" @click="addParams">
                     <el-icon :size="24"><CirclePlus /></el-icon>
-                    <span style="margin-left: 5px" @click="addParams">添加新参数</span>
+                    <span style="margin-left: 5px">添加新参数</span>
                   </el-col>
                 </el-row>
               </el-col>

src/views/merchandise/productsList.vue

@@ -50,6 +50,11 @@
                 <dict-tag :options="product_launch_status" :value="scope.row.status" />
               </template>
             </el-table-column>
+              <el-table-column label="创建时间" prop="createTime" align="left">
+              <template #default="scope">
+                {{ formatIsoToDateTime(scope.row.createTime) }}
+              </template>
+            </el-table-column>
 
             <el-table-column
               label="操作"
@@ -134,6 +139,7 @@
   </div>
 </template>
 <script setup name="InsuranceProduct">
+import { formatIsoToDateTime } from '@/utils/date'
 import { goodsList, changeProductStatus, productApproval } from '@/api/product/index'
 import { ref, watch } from 'vue'
 const router = useRouter()

src/views/system/user/index.vue

@@ -156,7 +156,7 @@
         <el-form-item label="手机号" prop="mobile">
           <el-input v-model="form.mobile" placeholder="请输入手机号" />
         </el-form-item>
-        <el-form-item label="用户属性">
+        <!-- <el-form-item label="用户属性">
           <el-select v-model="form.attribute" placeholder="请输入">
             <el-option
               v-for="item in sys_user_attribute"
@@ -165,7 +165,7 @@
               :value="Number(item.value)"
             />
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="性别">
           <el-radio-group v-model="form.gender">
             <el-radio