CCAP控制计划管理-历史控制计划查询

src/api/CCAPControlPlanManagement/CCAPControlPlanManagement.js

@@ -15,12 +15,11 @@ export function getAllBusinessUnitName() {
     method: 'get',
   })
 }
-// 查询CCAP控制计划历史列表
-export function getCCAPPlanHistoryList(query) {
+// 查询所有车型代码
+export function getAllvehicleModelCode() {
   return request({
-    url: '/ccapPlan/hisList',
+    url: '/control/notificationManagement/getAllModelCode',
     method: 'get',
-    params: query
   })
 }
 // 删除控制计划
@@ -38,3 +37,11 @@ export function undoPlan(data) {
     data: data
   })
 }
+// 查询CCAP控制计划历史列表
+export function getCCAPPlanHistoryList(query) {
+  return request({
+    url: '/control/ccapPlan/hisList',
+    method: 'get',
+    params: query
+  })
+}

src/locales/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/history/cn.json

@@ -3,6 +3,7 @@
   "reset": "重置",
   "pleaseChoose": "请选择",
   "pleaseEnter": "请输入",
+  "pleaseChooseOrEnter": "请选择或输入",
   "businessDivision": "事业部",
   "vehicleTypeCode": "车型代码",
   "vehicleTypeSeries": "车型系列",

src/locales/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/history/en.json

@@ -3,6 +3,7 @@
   "reset": "Reset",
   "pleaseChoose": "Please Choose",
   "pleaseEnter": "Please Enter",
+  "pleaseChooseOrEnter": "Please choose or enter",
   "businessDivision": "Business division",
   "vehicleTypeCode": "Vehicle Type Code",
   "vehicleTypeSeries": "Vehicle Type Series",

src/views/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/history.vue

 <template>
   <div class="app-container">
-    <el-form v-model="queryParams" ref="queryRef" :inline="true" >
-      <!-- 事业部 -->
-      <el-form-item :label="`${cn.businessDivision}/${en.businessDivision}`"  prop="businessUnitId">
-        <el-select
-          v-model="queryParams.businessUnitId"
-          :placeholder="`${cn.pleaseChoose}/${en.pleaseChoose}`"
-          clearable
-          style="width: 200px"
-        >
-          <el-option
-            v-for="item in businessList"
-            :label="item.businessUnitName"
-            :value="item.businessUnitName"
-          />
-        </el-select>
-      </el-form-item>
-      <!-- 车型代码 -->
-      <el-form-item :label="`${cn.vehicleTypeCode}/${en.vehicleTypeCode}`" prop="status">
-        <el-select
-          v-model="queryParams"
-          :placeholder="`${cn.pleaseChoose}/${en.pleaseChoose}`"
-          clearable
-          style="width: 200px"
-        >
-          <el-option
-            v-for="dict in businessList"
-            :label="dict.businessUnitName"
-            :value="dict.id"
-          />
-        </el-select>
-      </el-form-item>
-      <!-- 车型系列 -->
-      <el-form-item :label="`${cn.vehicleTypeSeries}/${en.vehicleTypeSeries}`" prop="status">
-        <el-select
-          v-model="queryParams"
-          :placeholder="`${cn.pleaseChoose}/${en.pleaseChoose}`"
-          clearable
-          style="width: 200px"
-        >
-          <el-option
-            v-for="dict in businessList"
-            :label="dict.businessUnitName"
-            :value="dict.id"
-          />
-        </el-select>
-      </el-form-item>
-      <!-- 生产地址 -->
-      <el-form-item :label="`${cn.productionAddress}/${en.productionAddress}`" prop="templateCode">
-        <el-input
-          v-model="queryParams"
-          :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
-          clearable
-          style="width: 200px"
-        />
-      </el-form-item>
-      <!-- 版本号 -->
-      <el-form-item :label="`${cn.versionNumber}/${en.versionNumber}`" prop="templateCode">
-        <el-input
-          v-model="queryParams"
-          placeholder="A0-Z9"
-          clearable
-          disabled
-          style="width: 200px"
-        />
-      </el-form-item>
-      <!-- 创建人 -->
-      <el-form-item :label="`${cn.creator}/${en.creator}`" prop="templateCode">
-        <el-input
-          v-model="queryParams"
-          :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
-          clearable
-          style="width: 200px"
-        />
-      </el-form-item>
-      <!-- 生产厂 -->
-      <el-form-item :label="`${cn.productionPlant}/${en.productionPlant}`" prop="templateCode">
-        <el-input
-          v-model="queryParams"
-          :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
-          clearable
-          style="width: 200px"
-        />
-      </el-form-item>
-      <!-- 搜索、重置 按钮 -->
-      <el-form-item>
-        <el-button style="width: 110px" class="btn-A" @click="handleQuery">{{cn.search}}/{{en.search}}</el-button>
-        <el-button style="width: 110px" class="btn-B" @click="resetQuery">{{cn.reset}}/{{en.reset}}</el-button>
-      </el-form-item>
+    <el-form v-model="queryParams" ref="queryRef" :inline="true">
+      <el-row :gutter="20">
+        <!-- 控制计划编号 -->
+        <el-col :span="8">
+          <el-form-item :label="`${cn.controlPlanNumber}/${en.controlPlanNumber}`" prop="controlPlanNumber">
+            <el-input
+              v-model="queryParams.controlPlanNumber"
+              :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+              clearable
+              style="width: 200px"
+            />
+          </el-form-item>
+        </el-col>
+        <!-- 事业部 -->
+        <el-col :span="8">
+          <el-form-item :label="`${cn.businessDivision}/${en.businessDivision}`" prop="businessUnitId">
+            <el-select
+              v-model="queryParams.businessUnitId"
+              :placeholder="`${cn.pleaseChoose}/${en.pleaseChoose}`"
+              clearable
+              style="width: 200px"
+            >
+              <el-option
+                v-for="item in businessList"
+                :label="item.businessUnitName"
+                :value="item.businessUnitName"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <!-- 车型代码 -->
+        <el-col :span="8">
+          <el-form-item :label="`${cn.vehicleTypeCode}/${en.vehicleTypeCode}`" prop="vehicleModelCode">
+            <el-select
+              v-model="queryParams.vehicleModelCode"
+              :placeholder="`${cn.pleaseChooseOrEnter}/${en.pleaseChooseOrEnter}`"
+              clearable
+              filterable
+              style="width: 200px"
+            >
+              <el-option
+                v-for="item in vehicleModelCodeList"
+                :label="item.vehicleModelCode"
+                :value="item.vehicleModelCode"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <!-- 车型系列 -->
+        <el-col :span="8">
+          <el-form-item :label="`${cn.vehicleTypeSeries}/${en.vehicleTypeSeries}`" prop="vehicleSeries">
+            <el-select
+              v-model="queryParams.vehicleSeries"
+              :placeholder="`${cn.pleaseChoose}/${en.pleaseChoose}`"
+              clearable
+              style="width: 200px"
+            >
+              <el-option
+                v-for="dict in vehicle_model_series"
+                :key="dict.key"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <!-- 生产地址 -->
+          <el-form-item :label="`${cn.productionAddress}/${en.productionAddress}`" prop="productionAddress">
+            <el-input
+              v-model="queryParams.productionAddress"
+              :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+              clearable
+              style="width: 200px"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <!-- 版本号 -->
+          <el-form-item :label="`${cn.versionNumber}/${en.versionNumber}`" prop="versionNumber">
+            <el-input
+              v-model="queryParams.versionNumber"
+              placeholder="A0 - Z9"
+              clearable
+              disabled
+              style="width: 200px"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="16">
+          <!-- 生产厂 -->
+          <el-form-item :label="`${cn.productionPlant}/${en.productionPlant}`" prop="productionFactory">
+            <el-input
+              v-model="queryParams.productionFactory"
+              :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+              clearable
+              style="width: 200px"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item class="button-container">
+            <el-button style="width: 110px" class="btn-A" @click="handleQuery">{{ cn.search }}/{{ en.search }}</el-button>
+            <el-button style="width: 110px" class="btn-B" @click="resetQuery">{{ cn.reset }}/{{ en.reset }}</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
 
     <el-table :data="tableList">
@@ -256,37 +279,81 @@ import cn from '@/locales/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/
 import en from '@/locales/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/history/en.json'
 import { ref } from 'vue'
 import {
-  getAllBusinessUnitName,
+  getAllBusinessUnitName, getAllvehicleModelCode,
   getCCAPPlanHistoryList,
   getCCAPPlanList,
 } from '@/api/CCAPControlPlanManagement/CCAPControlPlanManagement.js'
+import { getDicts } from '@/api/system/dict/data.js'
+import { ElMessage } from 'element-plus'
+const router = useRouter()
+const { proxy } = getCurrentInstance();
+const {vehicle_model_series, control_plan_status} = proxy.useDict('vehicle_model_series','control_plan_status');
+
 
 const total = ref(0);
 const queryParams = ref({
   pageNum: 1,
   pageSize: 10,
+  controlPlanNumber:null,
   businessUnitId:null,
   vehicleModelCode:null,
   vehicleSeries:null,
+  productionAddress:null,
   versionNumber:null,
-  controlPlanStatus:null,
-  createBy:null
+  productionFactory:null
 });
-
 const businessList = ref([]);
+const vehicleModelCodeList = ref([])
 const tableList = ref([]);
 
 function getAllBusinessUnit() {
   getAllBusinessUnitName().then(res => {
-    businessList.value = res.data
+    businessList.value = res.rows
+  })
+}
+
+function getAllVehicleModelCode() {
+  getAllvehicleModelCode().then(res => {
+    vehicleModelCodeList.value = res.data
   })
 }
+
 function getList() {
   getCCAPPlanHistoryList(queryParams.value).then(res => {
     total.value = res.total
     tableList.value = res.rows
+    console.log("列表",tableList.value)
   });
 }
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  queryParams.value = {
+    pageNum: 1,
+    pageSize: 10,
+    controlPlanNumber:null,
+    businessUnitId:null,
+    vehicleModelCode:null,
+    vehicleSeries:null,
+    productionAddress:null,
+    versionNumber:null,
+    productionFactory:null
+  };
+  handleQuery();
+}
+
+onMounted(()=>{
+  getList()
+  getAllBusinessUnit()
+  getAllVehicleModelCode()
+})
 </script>
 
 <style scoped lang="scss">