feat:新增品牌名称下拉框

src/api/BaseInternationalKeyComponents/BaseInternationalKeyComponents.js

@@ -47,10 +47,14 @@ export function delLogic(id) {
 }
 
 // 升版
-export function upgradeBaseInternational(id) {
+export function upgradeBaseInternational(formData,id) {
   return request({
     url: '/control/baseInternationalKeyComponentsList/upGrade/' + id,
-    method: 'post'
+    method: 'post',
+    data: formData,
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
   })
 }
 // 生成清单版本号、清单号
@@ -76,3 +80,10 @@ export function getBaseInternationalDepartment() {
     method: 'get'
   })
 }
+// 获取品牌名称
+export function getBrandName() {
+  return request({
+    url: '/control/brandData/allList?type=国际',
+    method: 'get',
+  })
+}

src/api/BaseInternationalKeyComponents/BaseInternationalKeyComponentsDetail.js

@@ -42,3 +42,12 @@ export function delDetail(componentsListId) {
     method: 'delete'
   })
 }
+
+// 校对生产厂
+export function checkProductionFactory(componentListId) {
+  return request({
+    url: '/control/baseInternationalKeyComponentsDetail/checkProductionFactory' + componentListId,
+    method: 'get'
+  })
+}
+

src/views/baseData/criticalPartsList/BaseInternationalKeyComponents/index.vue

@@ -58,11 +58,14 @@
         />
       </el-form-item>
       <el-form-item label="品牌" prop="brand">
-        <el-input
-            v-model="queryParams.brand"
-            placeholder="请输入品牌"
-            @keyup.enter="handleQuery"
-        />
+        <el-select v-model="queryParams.brand" placeholder="请选择" clearable size="default" style="width: 193px">
+          <el-option
+              v-for="item in brandOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="数据状态" prop="dataStatus">
         <el-select v-model="queryParams.dataStatus" placeholder="请选择" clearable size="default" style="width: 193px">
@@ -105,25 +108,25 @@
     <!-- 列表   -->
     <el-table v-loading="loading" :data="baseInternationalList">
       <el-table-column label="序号" type="index" width="75" align="center"/>
-      <el-table-column label="事业部" align="center" prop="division" width="100" sortable/>
-      <el-table-column label="适用市场" align="center" prop="applicableMarket" width="100" sortable>
+      <el-table-column label="事业部" align="center" prop="division" width="90" sortable/>
+      <el-table-column label="适用市场" align="center" prop="applicableMarket" width="200" sortable>
         <template #default="scope">
           {{ isNotEmpty(scope.row.applicableMarket) }}
         </template>
       </el-table-column>
       <el-table-column label="车型代码" align="center" prop="modelCode" width="100" sortable/>
       <el-table-column label="动力类型" align="center" prop="powerType" width="100" sortable/>
-      <el-table-column label="发动机型号" align="center" prop="engineModel" width="126" sortable>
+      <el-table-column label="发动机型号" align="center" prop="engineModel" width="190" sortable>
         <template #default="scope">
           {{ isNotEmpty(scope.row.engineModel) }}
         </template>
       </el-table-column>
-      <el-table-column label="动力电池型号" align="center" prop="powerBatteryModel" width="126" sortable>
+      <el-table-column label="动力电池型号" align="center" prop="powerBatteryModel" width="190" sortable>
         <template #default="scope">
           {{ isNotEmpty(scope.row.powerBatteryModel) }}
         </template>
       </el-table-column>
-      <el-table-column label="变速器型号" align="center" prop="transmissionModel" width="150" sortable>
+      <el-table-column label="变速器型号" align="center" prop="transmissionModel" width="190" sortable>
         <template #default="scope">
           {{ isNotEmpty(scope.row.transmissionModel) }}
         </template>
@@ -134,13 +137,13 @@
           <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') || '--' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="品牌" align="center" prop="brand" width="120" sortable>
+      <el-table-column label="品牌" align="center" prop="brand" width="220" sortable>
         <template #default="scope">
-          {{ isNotEmpty(scope.row.brand) }}
+          {{ getBrandLabelsByIds(scope.row.brand) }}
         </template>
       </el-table-column>
-      <el-table-column label="数据状态" align="center" prop="dataStatus" width="150" sortable/>
-      <el-table-column label="清单编号" align="center" prop="listCode" width="100" sortable/>
+      <el-table-column label="数据状态" align="center" prop="dataStatus" width="100" sortable/>
+      <el-table-column label="清单编号" align="center" prop="listCode" width="160" sortable/>
       <el-table-column label="操作" align="center" fixed="right" width="260px">
         <template #default="scope">
           <el-button link type="primary" @click="handleUpdate(scope.row)" v-if="scope.row.dataStatus === '未生效'">
@@ -153,7 +156,8 @@
           <el-button link type="primary" @click="handleUpload(scope.row)" v-if="scope.row.dataStatus === '未生效'">
             上传文件
           </el-button>
-          <el-button link type="danger" @click="handleUndo(scope.row)" v-if="scope.row.dataStatus === '未生效'">删除
+          <el-button link type="danger" @click="handleUndo(scope.row)" v-if="scope.row.dataStatus === '未生效'">
+            删除
           </el-button>
         </template>
       </el-table-column>
@@ -490,7 +494,7 @@
           {{ form.division }}
         </el-form-item>
         <el-form-item label="品牌">
-          {{ isNotEmpty(form.brand) }}
+          {{ getBrandLabelsByIds(form.brand) }}
         </el-form-item>
         <el-form-item label="车型代码">
           {{ form.modelCode }}
@@ -524,11 +528,10 @@
         v-model="undoDialogVisible"
         title=""
         align-center
-        style="width: 400px;height: 195px;margin-top: 300px" :fullscreen="true"
+        style="width: 400px;height: 195px;margin-top: 300px"
     >
       <template #header>
-        <div>提示</div>
-        <div>Prompt</div>
+        <div>提示/Prompt</div>
       </template>
       <div style="display: flex;align-items: center;">
         <el-icon style="color: orange;font-size: 18px;margin:5px">
@@ -557,7 +560,7 @@ import {
   addBaseInternational,
   updateBaseInternational,
   getBaseInternationalNo,
-  getBaseInternationalDepartment
+  getBaseInternationalDepartment, upgradeBaseInternational,getBrandName
 } from "@/api/BaseInternationalKeyComponents/BaseInternationalKeyComponents.js";
 import {getMarket} from "@/api/BaseIntlPartTemplate/BaseIntlPartTemplateDetail.js";
 import {getAllUnit} from "@/api/BaseIntlPartTemplate/BaseIntlPartTemplate.js";
@@ -677,21 +680,15 @@ function getApplicableMarket() {
       }
     })
   })
-  // 品牌 todo
-  brandOptions.value = [
-    {
-      value: '品牌1',
-      label: '品牌1'
-    },
-    {
-      value: '品牌2',
-      label: '品牌2'
-    },
-    {
-      value: '品牌3',
-      label: '品牌3'
-    },
-  ]
+  // 品牌
+  getBrandName().then(response => {
+    brandOptions.value = response.data.map(item => {
+      return {
+        value: item.id,
+        label: item.brand
+      }
+    })
+  })
   // 车型代码 todo
   modelCodeOptions.value = [
     {
@@ -772,6 +769,14 @@ function getApplicableMarket() {
     }
   ]
 }
+// 根据品牌id获取品牌名称
+const getBrandLabelsByIds = (brandIds) => {
+  if (!Array.isArray(brandIds)) return '--';
+  const labels = brandOptions.value
+      .filter(item => brandIds.includes(item.value))
+      .map(item => item.label);
+  return labels.length ? labels.join('、') : '--';
+}
 
 // 查看数据
 function handleView(row) {
@@ -960,8 +965,8 @@ function submitForm() {
         const formData = new FormData();
         formData.append('baseInternationalKeyComponentsList', JSON.stringify(form.value));
         formData.append('file', fileNew.value);
-        addBaseInternational(formData).then(response => {
-          if (response.msg != null) {
+                addBaseInternational(formData).then(response => {
+          if (response.code === 200) {
             proxy.$modal.msgSuccess("新增成功");
             openAdd.value = false;
             fileNew.value = null;
@@ -975,7 +980,7 @@ function submitForm() {
 
 // 升版--提交按钮
 function submitUpgradeForm(id) {
-  proxy.$refs["baseInternationalRef"].validate(valid => {
+
     const formData = new FormData();
     if (fileNew.value) {
       formData.append('file', fileNew.value);
@@ -983,13 +988,7 @@ function submitUpgradeForm(id) {
       proxy.$modal.msgError("请上传文件");
       return;
     }
-    request('/control/baseInternationalKeyComponentsList/upGrade/' + id, {
-      method: 'post',
-      data: formData,
-      headers: {
-        'Content-Type': 'multipart/form-data'
-      }
-    }).then(response => {
+      upgradeBaseInternational(formData, id).then(response => {
       if (response.code === 200){
         proxy.$modal.msgSuccess("升版成功");
         openUpgrade.value = false;
@@ -997,12 +996,10 @@ function submitUpgradeForm(id) {
         getList();
       }
     })
-  });
 }
 
 // 上传文件--提交按钮
 function submitUploadForm() {
-  proxy.$refs["baseInternationalRef"].validate(valid => {
     const formData = new FormData();
     if (fileNew.value) {
       formData.append('file', fileNew.value);
@@ -1025,7 +1022,6 @@ function submitUploadForm() {
         getList();
       }
      })
-  });
 }
 
 const delId = ref(null)

src/views/baseData/criticalPartsList/BaseInternationalKeyComponentsDetail/index.vue

@@ -296,9 +296,10 @@
 import {
   listDetail,
   updateDetail,
-  getDetail
+  getDetail, checkProductionFactory
 } from "@/api/BaseInternationalKeyComponents/BaseInternationalKeyComponentsDetail.js";
 import {getBaseInternational, updateBaseInternationalStatus} from "@/api/BaseInternationalKeyComponents/BaseInternationalKeyComponents.js";
+import request from '@/utils/request'
 
 const { proxy } = getCurrentInstance();
 const { p8_post_production_unit } = proxy.useDict('p8_post_production_unit');
@@ -435,10 +436,12 @@ function handleUpdateDataStatus(componentsListId) {
     getList();
   });
 }
-// 校对生产厂 todo 进入页面自动加载
+// 校对生产厂 todo
 function handleVerify() {
-  // 根据componentsListId
-
+  checkProductionFactory(componentsListId).then(response => {
+    proxy.$modal.msgSuccess("校对完成");
+    getList();
+  })
 }
 // 填写校对备注 todo
 function handleVerifyRemark(row) {
@@ -477,11 +480,10 @@ function submitForm() {
 
 // 上传文件--提交按钮
 function submitUploadForm() {
-  proxy.$refs["baseInternationalRef"].validate(valid => {
     const formData = new FormData();
     if (fileNew.value) {
       formData.append('file', fileNew.value);
-    }else {
+    } else {
       proxy.$modal.msgError("请上传文件");
       return;
     }
@@ -492,14 +494,13 @@ function submitUploadForm() {
         'Content-Type': 'multipart/form-data'
       }
     }).then(response => {
-      if (response.code === 200){
+      if (response.code === 200) {
         proxy.$modal.msgSuccess(response.msg);
         fileNew.value = null
         openUpload.value = false;
         getList();
       }
     })
-  })
 }
 // 上传文件
 function handleUpload() {
@@ -517,6 +518,7 @@ function onBack() {
   proxy.$router.push({ path: '/baseData/criticalPartsList/BaseInternationalKeyComponents'});
 }
 getList();
+handleVerify();
 </script>
 <style scoped>