fix: 开发补录订单页面

.idea/workspace.xml

@@ -4,22 +4,34 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="1aa2c051-7c05-4248-a267-bba2d88e533a" name="Changes" comment="fix: 合并">
-      <change beforePath="$PROJECT_DIR$/.env.development" beforeDir="false" afterPath="$PROJECT_DIR$/.env.development" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/.gitignore" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/tenant-Platform.iml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/watcherTasks.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.vscode/extensions.json" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.vscode/settings.json" beforeDir="false" />
+    <list default="true" id="1aa2c051-7c05-4248-a267-bba2d88e533a" name="Changes" comment="">
+      <change afterPath="$PROJECT_DIR$/src/assets/images/additional/car.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/assets/images/additional/info.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/assets/images/additional/insurance.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/assets/images/additional/ower.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/assets/images/additional/quote.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/router/modules/additionalOrder.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/views/additionalOrder/additional/index.vue" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/views/additionalOrder/order/index.vue" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/views/additionalOrder/temporarily/index.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/assets/styles/common/style.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/assets/styles/common/style.scss" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/router/routes.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/router/routes.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/views/personnel/modules/editInstitution.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/personnel/modules/editInstitution.vue" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="TypeScript File" />
+        <option value="vue3" />
+      </list>
+    </option>
+  </component>
   <component name="Git.Merge.Settings">
     <option name="BRANCH" value="origin/wuguojie" />
   </component>
@@ -40,25 +52,35 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
-    &quot;last_opened_file_path&quot;: &quot;/Users/wuguojie/zhangguiding/tenant-Platform&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.standard&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.stylelint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.standard&quot;: &quot;&quot;,
-    &quot;node.js.selected.package.stylelint&quot;: &quot;/Users/wuguojie/zhangguiding/tenant-Platform/node_modules/stylelint&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;prettierjs.PrettierConfiguration.Package&quot;: &quot;/Users/wuguojie/zhangguiding/tenant-Platform/node_modules/prettier&quot;,
-    &quot;ts.external.directory.path&quot;: &quot;/Users/wuguojie/zhangguiding/tenant-Platform/node_modules/typescript/lib&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+    "WebServerToolWindowFactoryState": "false",
+    "last_opened_file_path": "/Users/wuguojie/zhangguiding/tenant-Platform/src/assets/images/additional",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.standard": "true",
+    "node.js.detected.package.stylelint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.standard": "",
+    "node.js.selected.package.stylelint": "/Users/wuguojie/zhangguiding/tenant-Platform/node_modules/stylelint",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "prettierjs.PrettierConfiguration.Package": "/Users/wuguojie/zhangguiding/tenant-Platform/node_modules/prettier",
+    "ts.external.directory.path": "/Users/wuguojie/zhangguiding/tenant-Platform/node_modules/typescript/lib",
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>
+}]]></component>
+  <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/src/assets/images/additional" />
+    </key>
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/src/views/additionalOrder/additional" />
+    </key>
+  </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
@@ -70,6 +92,7 @@
       <workItem from="1741570740692" duration="9614000" />
       <workItem from="1741588506895" duration="25952000" />
       <workItem from="1741742279753" duration="107000" />
+      <workItem from="1741742392145" duration="4703000" />
     </task>
     <task id="LOCAL-00001" summary="fix: 合并">
       <created>1741570841321</created>
@@ -92,15 +115,29 @@
       <option name="project" value="LOCAL" />
       <updated>1741742144445</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <task id="LOCAL-00004" summary="fix: 合并">
+      <created>1741742490825</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1741742490825</updated>
+    </task>
+    <task id="LOCAL-00005" summary="fix: 合并">
+      <created>1741742541247</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1741742541247</updated>
+    </task>
+    <option name="localTasksCounter" value="6" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="3" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="fix: 合并" />
     <MESSAGE value="fix: 合并、添加PDF和word文件预览功能" />
-    <option name="LAST_COMMIT_MESSAGE" value="fix: 合并、添加PDF和word文件预览功能" />
+    <MESSAGE value="fix: 合并" />
+    <option name="LAST_COMMIT_MESSAGE" value="fix: 合并" />
   </component>
 </project>

src/assets/styles/common/style.scss

@@ -13,6 +13,9 @@
 .bg-white{
   background-color: #ffffff;
 }
+.border-6{
+  border-radius: 6px;
+}
 /*
 按钮样式
 is-plain
@@ -35,3 +38,11 @@ is-plain
 .col-33 {
   width: 33%;
 }
+
+/*
+表单样式
+*/
+.white-p24{
+  background: #FFFFFF;
+  padding: 24px;
+}

src/router/modules/additionalOrder.ts

@@ -0,0 +1,77 @@
+import type { RouteRecordRaw } from 'vue-router'
+
+const Layout = () => import('@/layouts/index.vue')
+
+const routes: RouteRecordRaw = {
+  path: '/additionalOrder/index',
+  component: Layout,
+  redirect: '/additionalOrder/additional/index',
+  name: 'AdditionalOrder',
+  meta: {
+    title: '补录订单',
+  },
+  children: [
+    {
+      path: 'additionalOrderIndex',
+      name: 'AdditionalOrderIndex',
+      component: () => import('@/views/additionalOrder/additional/index.vue'),
+      meta: {
+        title: '补录订单',
+      },
+      // children:[
+      //   {
+      //     path: 'agreementAdd',
+      //     name: 'AgreementAdd',
+      //     component: () => import('@/views/quoteConfig/agreement/agreementAdd.vue'),
+      //     meta: {
+      //       title: '协议添加',
+      //       menu: false,
+      //       activeMenu: '/quoteConfig/agreement/agreementIndex',
+      //     },
+      //   },
+      //   {
+      //     path: 'agreementCopy',
+      //     name: 'AgreementCopy',
+      //     component: () => import('@/views/quoteConfig/agreement/agreementCopy.vue'),
+      //     meta: {
+      //       title: '复制协议',
+      //       menu: false,
+      //       activeMenu: '/quoteConfig/agreement/agreementIndex',
+      //     },
+      //   },
+      //   {
+      //     path: 'agreementDetails',
+      //     name: 'AgreementDetails',
+      //     component: () => import('@/views/quoteConfig/agreement/agreementDetails.vue'),
+      //     meta: {
+      //       title: '协议详情',
+      //       menu:false,
+      //       activeMenu: '/quoteConfig/agreement/agreementIndex',
+      //     },
+      //   },
+      // ]
+    },
+
+    {
+      path: 'order',
+      name: 'Order',
+      component: () => import('@/views/additionalOrder/order/index.vue'),
+      meta: {
+        title: '订单管理',
+        // auth:['role.add','role.view','role.delete','role.edit']
+      },
+    },
+
+    {
+      path: 'temporarily',
+      name: 'Temporarily',
+      component: () => import('@/views/additionalOrder/temporarily/index.vue'),
+      meta: {
+        title: '暂存订单管理',
+        // auth:['role.add','role.view','role.delete','role.edit']
+      },
+    }
+  ],
+}
+
+export default routes

src/router/routes.ts

@@ -11,6 +11,7 @@ import content from "./modules/content"
 import marketingManagement from "./modules/marketing";
 import quoteConfig from "./modules/quoteConfig";//报价配置
 import externalAgreement from "./modules/externalAgreement";//外部协议
+import additionalOrder from './modules/additionalOrder.ts'
 // import {  } from "@/store/modules/user";
 // 固定路由（默认路由
 // console.log(useUserStore)
@@ -119,6 +120,13 @@ const asyncRoutes: Route.recordMainRaw[] = [
     },
     children: [quoteConfig,externalAgreement],
   },
+  {
+    meta: {
+      title: '补录订单',
+      icon: "i-uim:box",
+    },
+    children: [additionalOrder],
+  }
   // {
   //   meta: {
   //     title: "租户运营",

src/views/additionalOrder/additional/index.vue

@@ -0,0 +1,66 @@
+<template>
+  <div class="addtional">
+    <el-descriptions title="补录订单业务员信息" class="white-p24 border-6">
+      <el-descriptions-item>
+        <template #default>
+          <el-form :model="form">
+            <el-row :gutter="20">
+              <el-col :span="8">
+                <el-form-item label="业务员：">
+                  <el-input v-model="form.name" placeholder="输入业务员工姓名，手机号，工号查找"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="工号类型：">
+                  <el-select v-model="form.type">
+                    <el-option label="类型1" value="1" key="1"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="归属：">
+                  <el-cascader
+                    clearable
+                    style="width: 100%"
+                    v-model="form.deptId"
+                    :options="institutionList"
+                    :props="tableProps"
+                  ></el-cascader>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </template>
+      </el-descriptions-item>
+    </el-descriptions>
+    
+  </div>
+</template>
+
+<script setup lang="ts">
+import api from '@/api'
+// 查询条件
+let form = ref({})
+// 归属机构
+let institutionList = ref([])
+const tableProps = ref({
+  value: "id",
+  label: "name",
+  children: "children",
+  checkStrictly: true,
+})
+
+</script>
+
+<style scoped lang="scss">
+@use "@/assets/styles/common/style";
+.addtional{
+  width: calc(100% - 20px);
+  height: calc(100vh - 140px);
+  overflow: hidden;
+  margin: 10px;
+  :deep(.el-form-item) {
+    margin-bottom: 0;
+  }
+}
+</style>

src/views/additionalOrder/order/index.vue

@@ -0,0 +1,13 @@
+<template>
+  <div>
+    订单管理
+  </div>
+</template>
+
+<script setup>
+
+</script>
+
+<style scoped>
+
+</style>

src/views/additionalOrder/temporarily/index.vue

@@ -0,0 +1,13 @@
+<template>
+  <div>
+    暂存订单管理
+  </div>
+</template>
+
+<script setup>
+
+</script>
+
+<style scoped>
+
+</style>

src/views/personnel/modules/editInstitution.vue

@@ -352,7 +352,7 @@ const confirm = async (formEl: FormInstance | undefined) => {
         api.institutionApi
           .institutionAdd({
             ...obj,
-            system: localStorage.getItem("login_system") || "",
+            systemCode: localStorage.getItem("login_system") || "",
             province: form.area[0],
             city: form.area[1],
             area: form.area[2],
@@ -372,7 +372,7 @@ const confirm = async (formEl: FormInstance | undefined) => {
         api.institutionApi
           .institutionEdit({
             ...obj,
-            system: localStorage.getItem("login_system") || "",
+            systemCode: localStorage.getItem("login_system") || "",
             province: form.area[0],
             city: form.area[1],
             area: form.area[2],