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

src/api/system/controlPlan.js

 import request from '@/utils/request'
 
+/**
+ *  查询模板列表
+ */
 export function listTemplate(query) {
     return request({
         url: '/control/template/list',
@@ -7,3 +10,43 @@ export function listTemplate(query) {
         params: query,
     })
 }
+/**
+ *  查询表单
+ */
+export function listTemplateForm(id) {
+    return request({
+        url: '/control/template/template-form',
+        method: 'get',
+        params: {id: id},
+    })
+}
+/**
+ * 查询参数列表
+ */
+export function listTemplateDetail(params) {
+    return request({
+        url: '/control/template/template-detail',
+        method: 'get',
+        params: params,
+    })
+}
+/**
+ * 修改参数
+ */
+export function editTemplateDetail(form) {
+    return request({
+        url: '/control/template/template-detail',
+        method: 'put',
+        params: form,
+    })
+}
+/**
+ * 修改参数
+ */
+export function deleteTemplateDetail(ids) {
+    return request({
+        url: '/control/template/template-detail',
+        method: 'delete',
+        params: {ids},
+    })
+}
\ No newline at end of file

src/api/vehicleModelData/domestic.js

+import request from '@/utils/request'
+
+// 查询国内车型列表
+export function listModel(query) {
+  return request({
+    url: '/control/model/list',
+    method: 'get',
+    params: query,
+  })
+}
+
+// 查询国内车型详细
+export function getModel(id) {
+  return request({
+    url: '/control/model/' + id,
+    method: 'get',
+  })
+}
+
+// 新增国内车型
+export function addModel(data) {
+  return request({
+    url: '/control/model',
+    method: 'post',
+    data: data,
+  })
+}
+
+// 修改国内车型
+export function updateModel(data) {
+  return request({
+    url: '/control/model',
+    method: 'put',
+    data: data,
+  })
+}
+
+// 删除国内车型
+export function delModel(id) {
+  return request({
+    url: '/control/model/' + id,
+    method: 'delete',
+  })
+}

src/views/baseData/vehicleModelData/international/index.vue

+<template>
+国际车型
+</template>
+
+<script>
+export default {
+  name: 'index',
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/controlPlan/fillTemplate/index.vue → src/views/controlPlan/baseConfig/fillTemplate/index.vue

@@ -5,7 +5,7 @@
         :model="queryParams"
         :inline="true"
     >
-      <el-form-item label="模板类型" prop="status">
+      <el-form-item label="模板类型" prop="templateType">
         <el-select
             v-model="queryParams.templateType"
             placeholder="请选择"
@@ -20,9 +20,9 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="模板编号" prop="templatecode">
+      <el-form-item label="模板编号" prop="templateCode">
         <el-input
-            v-model="queryParams.templatecode"
+            v-model="queryParams.templateCode"
             placeholder="请输入模板编号"
             clearable
             style="width: 200px"
@@ -50,14 +50,15 @@
     <el-table
         v-loading="loading"
         :data="templateList"
+        border
     >
-      <el-table-column type="index" width="55" align="center" />
-      <el-table-column label="模板类型" align="center" prop="templateType" >
+      <el-table-column label="序号"  width="55" align="center" prop="seq" />
+      <el-table-column label="模板类型" align="center" width="125" prop="templateType" >
         <template #default="scope">
-            <dict-tag :options="control_plan" :value="scope.row.templateType" />
+          <span style="color: #1ab394">{{scope.row.templateType}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="模板编号" align="center" prop="templateCode" >
+      <el-table-column label="模板编号" align="center" width="100" prop="templateCode" >
         <template #default="scope">
           <span style="color: #1ab394">{{scope.row.templateCode}}</span>
         </template>
@@ -67,12 +68,12 @@
           <span style="color: #1ab394">{{scope.row.templateName}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="表单数量" align="center" prop="formCount" >
+      <el-table-column label="表单数量" align="center" width="100" prop="formCount" >
         <template #default="scope">
           <span style="color: #1ab394">{{scope.row.formCount}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime">
+      <el-table-column label="创建时间" align="center"  width="180"  prop="createTime">
         <template #default="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
@@ -87,10 +88,10 @@
           <span>{{ parseTime(scope.row.updateTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="修改人" align="center" prop="updateUser"/>
+      <el-table-column label="修改人" align="center"  width="85" prop="updateName"/>
       <el-table-column
           label="操作"
-          width="180"
+          width="300"
           align="center"
           class-name="small-padding fixed-width"
       >
@@ -99,7 +100,6 @@
               v-hasPermi="['system:post:edit']"
               link
               type="primary"
-              icon="Edit"
               @click="viewDetails(scope.row)"
           >查看详情</el-button
           >
@@ -107,15 +107,13 @@
               v-hasPermi="['system:post:edit']"
               link
               type="primary"
-              icon="Edit"
               @click="handleUpdate(scope.row)"
-          >编辑</el-button
+          >编辑内容</el-button
           >
           <el-button
               v-hasPermi="['system:post:edit']"
               link
               type="primary"
-              icon="Edit"
               @click="restoreDefault(scope.row)"
           >恢复默认</el-button
           >
@@ -155,20 +153,9 @@ const data = reactive({
     postName: undefined,
     status: undefined,
   },
-  rules: {
-    postName: [
-      { required: true, message: '岗位名称不能为空', trigger: 'blur' },
-    ],
-    postCode: [
-      { required: true, message: '岗位编码不能为空', trigger: 'blur' },
-    ],
-    postSort: [
-      { required: true, message: '岗位顺序不能为空', trigger: 'blur' },
-    ],
-  },
 })
 
-const { queryParams, form, rules } = toRefs(data)
+const { queryParams, form,} = toRefs(data)
 
 /** 查询岗位列表 */
 function getList() {
@@ -208,9 +195,12 @@ function resetQuery() {
 
 /** 修改按钮操作 */
 function handleUpdate(row) {
-
+  proxy.$router.push({ path: '/control/baseConfig/fillEdit', query: { id: row.id} });
+}
+/** 查看操作 */
+function viewDetails(row) {
+  proxy.$router.push({ path: '/control/baseConfig/fillView', query: { id: row.id} });
 }
-function viewDetails(row) {}
 function restoreDefault(row) {}
 
 getList()

src/views/controlPlan/baseConfig/fillTemplate/view.vue

+<template>
+  <div class="app-container">
+    <div class="top-header">
+      <el-button class="back-button" @click="handleBack">
+        <span class="back-icon"></span>
+        返回
+      </el-button>
+    </div>
+    <div class="component-selector">
+      <el-tabs v-model="activeTab" class="demo-tabs">
+        <el-tab-pane
+            v-for="(item, index) in formList"
+            :key="index"
+            :label="item.formName"
+            :name="item.id">
+          <component>
+            <el-table
+                v-loading="loading"
+                :data="templateDetailList"
+                border
+            >
+              <el-table-column label="序号" type="index" width="55" align="center" />
+              <el-table-column label="参数组" align="center" prop="parameterGroup" />
+              <el-table-column label="参数项" align="center"  prop="parameterItem" />
+              <el-table-column label="参数值类型" align="center" prop="parameterValueType" />
+              <el-table-column label="显示方式" align="center"  prop="displayMethod" />
+              <el-table-column label="填写方式" align="center"    prop="fillMethod"/>
+            </el-table>
+            <pagination
+                v-show="total > 0"
+                v-model:page="queryParams.pageNum"
+                v-model:limit="queryParams.pageSize"
+                :total="total"
+                @pagination="handlePagination"
+            />
+          </component>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+  </div>
+</template>
+<script setup>
+import {listTemplateDetail, listTemplateForm} from '@/api/system/controlPlan.js'
+const { proxy } = getCurrentInstance();
+import { ref, getCurrentInstance } from 'vue'
+
+const total = ref(0)
+const formList = ref([])
+const activeTab = ref(null) // 默认激活第一个标签页
+const templateDetailList = ref([])
+// 修改data定义方式
+const queryParams = ref({
+  pageNum: 1,
+  pageSize: 10
+})
+
+
+watch(activeTab, (newVal) => {
+  queryParams.value.pageNum = 1 // 切换标签时重置页码
+  getList(newVal)
+})
+const handlePagination = ({ page, limit }) => {
+  queryParams.value.pageNum = page
+  queryParams.value.pageSize = limit
+  getList(activeTab.value)
+}
+function getFrom() {
+  const id = proxy.$route.query.id
+  listTemplateForm(id).then(response => {
+    formList.value = response.data
+    if (formList.value.length > 0) {
+      activeTab.value = formList.value[0].id // 默认第一个标签的id
+      getList(formList.value[0].id) // 初始化加载第一个标签的数据
+    }
+  })
+}
+function getList(formId){
+  listTemplateDetail({
+    id: formId,
+    pageNum: queryParams.value.pageNum,
+    pageSize: queryParams.value.pageSize
+  }).then(response => {
+    templateDetailList.value = response.rows
+    total.value = response.total
+  })
+}
+const handleBack = () => {
+  proxy.$router.push({ path: '/control/baseConfig/fill'});
+}
+onMounted(() => {
+  getFrom();
+})
+</script>
+
+<style scoped lang="scss">
+.top-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 16px;
+}
+</style>

src/views/system/basicdata/businessunit/index.vue

 <template>
   <div class="app-container">
     <div>
-      <el-button type="primary" plain style="float: right;margin: 12px 0;border: 1px solid #0154fb;color: #0154fb;" @click="handleAdd">新建</el-button>
+      <el-button style="float: right;margin: 12px 0;border: 1px solid #0154fb;color: #0154fb;" @click="handleAdd">新建</el-button>
     </div>
 
     <el-table v-loading="loading" :data="unitList" @selection-change="handleSelectionChange" border>
@@ -56,8 +56,8 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
+          <el-button type="primary" @click="submitForm">保 存</el-button>
         </div>
       </template>
     </el-dialog>

src/views/system/role/index.vue

@@ -7,7 +7,7 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="角色名称" prop="roleName">
+      <el-form-item label="" prop="roleName">
         <el-input
           v-model="queryParams.roleName"
           placeholder="角色名称"
@@ -16,7 +16,7 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="status">
+      <el-form-item label="" prop="status">
         <el-select
           v-model="queryParams.status"
           placeholder="角色状态"
@@ -32,28 +32,35 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery" style='background: #0154fb;'>查询</el-button>
+        <el-button
+          type="primary"
+          icon="Search"
+          style="background: #0154fb"
+          @click="handleQuery"
+          >查询</el-button
+        >
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
       <el-button
         v-hasPermi="['system:role:add']"
         type="primary"
         icon="Plus"
+        style="float: right; background: #0154fb"
         @click="handleAdd"
-          style="float: right;background: #0154fb;"
-        >新建角色</el-button>
+        >新建角色</el-button
+      >
       <!--      <el-button type="primary" plain  @click="handleAdd">新建</el-button>-->
     </el-form>
 
-
     <!-- 表格数据 -->
     <el-table
       v-loading="loading"
       :data="roleList"
+      border
       @selection-change="handleSelectionChange"
-      border>
-<!--      <el-table-column type="selection" width="55" align="center" />-->
-      <el-table-column label="序号" prop="roleId" width="120" align="center"/>
+    >
+      <!--      <el-table-column type="selection" width="55" align="center" />-->
+      <el-table-column label="序号" prop="roleId" width="120" align="center" />
       <el-table-column
         label="角色名称"
         prop="roleName"
@@ -68,7 +75,12 @@
         width="150"
         align="center"
       />
-      <el-table-column label="显示顺序" prop="roleSort" width="100" align="center"/>
+      <el-table-column
+        label="显示顺序"
+        prop="roleSort"
+        width="100"
+        align="center"
+      />
       <el-table-column label="角色状态" align="center" width="150" sortable>
         <template #default="scope">
           <el-switch
@@ -79,12 +91,24 @@
           ></el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="200" sortable>
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="200"
+        sortable
+      >
         <template #default="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="修改时间" align="center" prop="updateTime" width="200" sortable>
+      <el-table-column
+        label="修改时间"
+        align="center"
+        prop="updateTime"
+        width="200"
+        sortable
+      >
         <template #default="scope">
           <span>{{ parseTime(scope.row.updateTime) }}</span>
         </template>
@@ -106,7 +130,8 @@
               type="primary"
               icon="Edit"
               @click="handleUpdate(scope.row)"
-            >编辑</el-button>
+              >编辑</el-button
+            >
           </el-tooltip>
           <el-tooltip
             v-if="scope.row.roleId !== 1"
@@ -119,9 +144,10 @@
               type="primary"
               icon="CircleCheck"
               @click="handleDataScope(scope.row)"
-            >分配菜单</el-button>
+              >分配菜单</el-button
+            >
           </el-tooltip>
-          <el-tooltip
+          <!--          <el-tooltip
             v-if="scope.row.roleId !== 1"
             content="分配用户"
             placement="top"
@@ -133,7 +159,7 @@
               icon="User"
               @click="handleAuthUser(scope.row)"
             >分配用户</el-button>
-          </el-tooltip>
+          </el-tooltip>-->
           <el-tooltip
             v-if="scope.row.roleId !== 1"
             content="删除"
@@ -145,7 +171,8 @@
               type="danger"
               icon="Delete"
               @click="handleDelete(scope.row)"
-            >删除</el-button>
+              >删除</el-button
+            >
           </el-tooltip>
         </template>
       </el-table-column>
@@ -674,7 +701,7 @@ function cancelDataScope() {
 getList()
 </script>
 <style scoped>
-.addRoleBtn{
+.addRoleBtn {
   margin-left: 420px;
   margin-right: 0px;
 }