代码合并

src/utils/dict.js

@@ -157,7 +157,10 @@ export const DICT_TYPE = {
   COMPLAINT_TYPE: 'complaint_type',
    //  会计凭证完整性
    ACCOUNTING_FILE_STATUS: 'accounting_file_status',
-
+//咨询类型
+CONSULTATION_TYPE: 'consultation_type',
+//资产类型
+  ASSET_TYPE: 'asset_type',
 
 }
 

src/views/ea/electronicAssets/index.vue

@@ -10,12 +10,22 @@
       label-width="98px"
     >
       <el-form-item label="业务实体名称" prop="company">
-        <el-input
+        <el-select
           v-model="queryParams.company"
-          placeholder="请输入业务实体名称"
+          placeholder="请选择业务实体"
+          value-key="id"
+          @change="handleCompanyChange1"
           clearable
           @keyup.enter.native="handleQuery"
-        />
+        >
+          <el-option
+            v-for="item in organizationList"
+            :key="item.id"
+            :value="item"
+            :label="item.organizationName"
+          >
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="资产名称" prop="assetName">
         <el-input
@@ -120,7 +130,11 @@
           <div v-html="scope.row.assetDescription"></div>
         </template>
       </el-table-column> -->
-      <el-table-column label="资产类型" align="center" prop="assetType" />
+      <el-table-column label="资产类型" align="center" prop="assetType">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.ASSET_TYPE" :value="scope.row.assetType" />
+        </template>
+      </el-table-column>
       <el-table-column
         label="购买日期"
         align="center"
@@ -283,10 +297,14 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="资产类型" prop="assetType">
-              <el-input v-model="form.assetType" placeholder="请输入资产类型" />
-              <!-- <el-select v-model="form.assetType" placeholder="请选择资产类型">
-                <el-option label="请选择字典生成" value="" />
-              </el-select> -->
+              <el-select v-model="form.assetType" placeholder="请选择咨询类型	">
+                <el-option
+                  v-for="dict in this.getDictDatas(DICT_TYPE.ASSET_TYPE)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -680,6 +698,9 @@ export default {
       this.form.companyId = val.id;
       this.form.company = val.organizationName;
     },
+    handleCompanyChange1(val) {
+      this.queryParams.company = val.organizationName;
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate((valid) => {

src/views/ea/electronicConsultation/index.vue

@@ -24,7 +24,12 @@
           clearable
           size="small"
         >
-          <el-option label="请选择字典生成" value="" />
+          <el-option
+            v-for="dict in this.getDictDatas(DICT_TYPE.CONSULTATION_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="处理结果	" prop="handleResult">
@@ -143,7 +148,15 @@
         label="咨询类型	"
         align="center"
         prop="consultationType"
-      />
+        width="98px"
+      >
+        <template v-slot="scope">
+          <dict-tag
+            :type="DICT_TYPE.CONSULTATION_TYPE"
+            :value="scope.row.consultationType"
+          />
+        </template>
+      </el-table-column>
       <el-table-column
         label="咨询标题	"
         align="center"
@@ -304,10 +317,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="所属部门	" prop="systemDept">
-              <el-input
-                v-model="form.systemDept"
-                placeholder="请输入所属部门	"
+            <el-form-item label="部门名称" prop="deptName">
+              <treeselect
+                v-model="form.deptId"
+                :options="deptOptions"
+                :show-count="true"
+                :clearable="true"
+                placeholder="请选择归属部门"
+                :normalizer="normalizer"
               />
             </el-form-item>
           </el-col>
@@ -327,7 +344,12 @@
                 v-model="form.consultationType"
                 placeholder="请选择咨询类型	"
               >
-                <el-option label="请选择字典生成" value="" />
+                <el-option
+                  v-for="dict in this.getDictDatas(DICT_TYPE.CONSULTATION_TYPE)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -473,12 +495,17 @@ import Editor from "@/components/Editor";
 import ScrollPane from "@/layout/components/TagsView/ScrollPane";
 import { getSiteTree } from "@/api/setting/organization";
 import { getOrganizationPage } from "@/api/setting/organization";
+import { listSimpleDepts } from "@/api/system/dept";
+import { listSimplePosts } from "@/api/system/post";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "ElectronicConsultation",
   components: {
     ScrollPane,
     Editor,
+    Treeselect,
   },
   data() {
     return {
@@ -487,6 +514,8 @@ export default {
         value: "pId",
         multiple: false,
       },
+      // 部门树选项
+      deptOptions: undefined,
       // 遮罩层
       loading: true,
       optType: undefined,
@@ -539,6 +568,7 @@ export default {
     this.getList();
     this.getSiteList();
     this.getOrganizationList();
+    this.getTreeselect();
   },
   methods: {
     /** 查询列表 */
@@ -551,6 +581,27 @@ export default {
         this.loading = false;
       });
     },
+    /** 查询部门下拉树结构 + 岗位下拉 */
+    getTreeselect() {
+      listSimpleDepts().then((response) => {
+        // 处理 deptOptions 参数
+        this.deptOptions = [];
+        this.deptOptions.push(...this.handleTree(response.data, "id"));
+      });
+      listSimplePosts().then((response) => {
+        // 处理 postOptions 参数
+        this.postOptions = [];
+        this.postOptions.push(...response.data);
+      });
+    },
+    // 格式化部门的下拉框
+    normalizer(node) {
+      return {
+        id: node.id,
+        label: node.name,
+        children: node.children,
+      };
+    },
     // 获取业务实体
     getOrganizationList() {
       getOrganizationPage().then((response) => {

src/views/ea/electronicContracts/index.vue

@@ -380,10 +380,16 @@
               </el-select>
             </el-form-item>
           </el-col>
-
           <el-col :span="8">
-            <el-form-item label="所属部门" prop="deptName">
-              <el-input v-model="form.deptName" placeholder="请输入所属部门" />
+            <el-form-item label="部门名称" prop="deptName">
+              <treeselect
+                v-model="form.deptId"
+                :options="deptOptions"
+                :show-count="true"
+                :clearable="true"
+                placeholder="请选择归属部门"
+                :normalizer="normalizer"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -577,6 +583,10 @@ import ImagePreview from "@/components/ImagePreview";
 import WxVideoPlayer from "@/views/mp/components/wx-video-play/main";
 import { getSiteTree } from "@/api/setting/organization";
 import { getOrganizationPage } from "@/api/setting/organization";
+import { listSimpleDepts } from "@/api/system/dept";
+import { listSimplePosts } from "@/api/system/post";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "ElectronicContracts",
@@ -584,6 +594,7 @@ export default {
     WxVideoPlayer,
     FileUpload,
     ImagePreview,
+    Treeselect,
   },
   data() {
     return {
@@ -594,6 +605,8 @@ export default {
       },
       getFileUrl: process.env.VUE_APP_BASE_API + "/admin-api/infra/file/",
       imgs: null,
+      // 部门树选项
+      deptOptions: undefined,
       // 遮罩层
       loading: true,
       optType: undefined,
@@ -659,6 +672,7 @@ export default {
     this.getList();
     this.getSiteList();
     this.getOrganizationList();
+    this.getTreeselect();
   },
   methods: {
     /** 查询列表 */
@@ -672,6 +686,27 @@ export default {
         console.log(this.list);
       });
     },
+    /** 查询部门下拉树结构 + 岗位下拉 */
+    getTreeselect() {
+      listSimpleDepts().then((response) => {
+        // 处理 deptOptions 参数
+        this.deptOptions = [];
+        this.deptOptions.push(...this.handleTree(response.data, "id"));
+      });
+      listSimplePosts().then((response) => {
+        // 处理 postOptions 参数
+        this.postOptions = [];
+        this.postOptions.push(...response.data);
+      });
+    },
+    // 格式化部门的下拉框
+    normalizer(node) {
+      return {
+        id: node.id,
+        label: node.name,
+        children: node.children,
+      };
+    },
     //获取归档位置
     getSiteList() {
       getSiteTree().then((response) => {

src/views/ea/electronicCustomerComplaint/index.vue

@@ -17,14 +17,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="客户名称" prop="customerName">
-        <el-input
-          v-model="queryParams.customerName"
-          placeholder="请输入客户名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="客诉类型" prop="complaintType">
         <el-select
           v-model="queryParams.complaintType"
@@ -335,8 +327,15 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="所属部门" prop="deptName">
-              <el-input v-model="form.deptName" placeholder="请输入所属部门" />
+            <el-form-item label="部门名称" prop="deptName">
+              <treeselect
+                v-model="form.deptId"
+                :options="deptOptions"
+                :show-count="true"
+                :clearable="true"
+                placeholder="请选择归属部门"
+                :normalizer="normalizer"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -517,11 +516,16 @@ import Editor from "@/components/Editor";
 import { getSiteTree } from "@/api/setting/organization";
 import { getOrganizationPage } from "@/api/setting/organization";
 import { listUser } from "@/api/system/user";
+import { listSimpleDepts } from "@/api/system/dept";
+import { listSimplePosts } from "@/api/system/post";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "ElectronicCustomerComplaint",
   components: {
     Editor,
+    Treeselect,
   },
   data() {
     return {
@@ -530,6 +534,8 @@ export default {
         value: "pId",
         multiple: false,
       },
+      // 部门树选项
+      deptOptions: undefined,
       // 遮罩层
       loading: true,
       optType: undefined,
@@ -585,6 +591,7 @@ export default {
     this.getSiteList();
     this.getOrganizationList();
     this.getUserList();
+    this.getTreeselect();
   },
   methods: {
     /** 查询列表 */
@@ -597,6 +604,27 @@ export default {
         this.loading = false;
       });
     },
+    /** 查询部门下拉树结构 + 岗位下拉 */
+    getTreeselect() {
+      listSimpleDepts().then((response) => {
+        // 处理 deptOptions 参数
+        this.deptOptions = [];
+        this.deptOptions.push(...this.handleTree(response.data, "id"));
+      });
+      listSimplePosts().then((response) => {
+        // 处理 postOptions 参数
+        this.postOptions = [];
+        this.postOptions.push(...response.data);
+      });
+    },
+    // 格式化部门的下拉框
+    normalizer(node) {
+      return {
+        id: node.id,
+        label: node.name,
+        children: node.children,
+      };
+    },
     //获取归档位置
     getSiteList() {
       getSiteTree().then((response) => {

src/views/ea/electronicEmployee/index.vue

@@ -10,11 +10,14 @@
       label-width="98px"
     >
       <el-form-item label="所属部门" prop="deptName">
-        <el-input
-          v-model="queryParams.deptName"
-          placeholder="请输入所属部门"
-          clearable
-          @keyup.enter.native="handleQuery"
+        <treeselect
+          style="width: 190px"
+          v-model="queryParams.deptId"
+          :options="deptOptions"
+          :show-count="true"
+          :clearable="true"
+          placeholder="请选择部门"
+          :normalizer="normalizer"
         />
       </el-form-item>
       <el-form-item label="员工姓名" prop="name">
@@ -56,30 +59,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!--      <el-form-item label="年度" prop="year">-->
-      <!--        <el-date-picker-->
-      <!--          popper-class="due_year"-->
-      <!--          v-model="queryParams.year"-->
-
-      <!--          value-format="Y"-->
-      <!--          type="year"-->
-      <!--          placeholder="请选择会计月份"-->
-      <!--          @keyup.enter.native="handleQuery"-->
-      <!--        >-->
-      <!--        </el-date-picker>-->
-      <!--      </el-form-item>-->
-      <!--      <el-form-item label="月份" prop="period">-->
-      <!--        <el-date-picker-->
-      <!--          popper-class="due_month"-->
-      <!--          v-model="queryParams.period"-->
-      <!--          format="M月"-->
-      <!--          value-format="M"-->
-      <!--          type="month"-->
-      <!--          placeholder="请选择会计月份"-->
-      <!--          @keyup.enter.native="handleQuery"-->
-      <!--        >-->
-      <!--        </el-date-picker>-->
-      <!--       </el-form-item>-->
       <el-form-item label="借阅状态" prop="borrowStatus">
         <el-select
           v-model="queryParams.borrowStatus"
@@ -95,16 +74,6 @@
           />
         </el-select>
       </el-form-item>
-      <!--      <el-form-item label="归档时间" prop="recordTime">-->
-      <!--        <el-date-picker v-model="queryParams.recordTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"-->
-      <!--                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />-->
-      <!--      </el-form-item>-->
-      <!--      <el-form-item label="纸档位置" prop="position">-->
-      <!--        <el-input v-model="queryParams.position" placeholder="请输入纸档位置" clearable @keyup.enter.native="handleQuery"/>-->
-      <!--      </el-form-item>-->
-      <!--      <el-form-item label="完整性" prop="cherks">-->
-      <!--        <el-input v-model="queryParams.cherks" placeholder="请输入完整性" clearable @keyup.enter.native="handleQuery"/>-->
-      <!--      </el-form-item>-->
       <el-form-item label="归档状态" prop="fileStatus">
         <el-select
           v-model="queryParams.fileStatus"
@@ -269,14 +238,8 @@
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
-          <!-- <el-col :span="8">
-            <el-form-item label="制单人" prop="createBy">
-              <el-input v-model="form.createBy" placeholder="请输入制单人" />
-            </el-form-item>
-          </el-col> -->
           <el-col :span="8">
             <el-form-item label="业务实体" prop="company">
-              <!-- <el-input v-model="form.company" placeholder="请输入业务实体" /> -->
               <el-select
                 v-model="form.company"
                 placeholder="请选择业务实体"
@@ -294,8 +257,15 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="所属部门" prop="deptName">
-              <el-input v-model="form.deptName" placeholder="请输入所属部门" />
+            <el-form-item label="部门名称" prop="deptName">
+              <treeselect
+                v-model="form.deptId"
+                :options="deptOptions"
+                :show-count="true"
+                :clearable="true"
+                placeholder="请选择归属部门"
+                :normalizer="normalizer"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -639,11 +609,16 @@ import {
 import Editor from "@/components/Editor";
 import { getOrganizationPage } from "@/api/setting/organization";
 import { getSiteTree } from "@/api/setting/organization";
+import { listSimpleDepts } from "@/api/system/dept";
+import { listSimplePosts } from "@/api/system/post";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "ElectronicEmployee",
   components: {
     Editor,
+    Treeselect,
   },
   data() {
     return {
@@ -652,6 +627,8 @@ export default {
         value: "pId",
         multiple: false,
       },
+      // 部门树选项
+      deptOptions: undefined,
       // 遮罩层
       loading: true,
       optType: undefined,
@@ -705,6 +682,7 @@ export default {
     this.getList();
     this.getOrganizationList();
     this.getSiteList();
+    this.getTreeselect();
   },
   methods: {
     /** 查询列表 */
@@ -717,6 +695,27 @@ export default {
         this.loading = false;
       });
     },
+    /** 查询部门下拉树结构 + 岗位下拉 */
+    getTreeselect() {
+      listSimpleDepts().then((response) => {
+        // 处理 deptOptions 参数
+        this.deptOptions = [];
+        this.deptOptions.push(...this.handleTree(response.data, "id"));
+      });
+      listSimplePosts().then((response) => {
+        // 处理 postOptions 参数
+        this.postOptions = [];
+        this.postOptions.push(...response.data);
+      });
+    },
+    // 格式化部门的下拉框
+    normalizer(node) {
+      return {
+        id: node.id,
+        label: node.name,
+        children: node.children,
+      };
+    },
     //获取归档位置
     getSiteList() {
       getSiteTree().then((response) => {