From f4665a681ae69a217286b193355b5c7ec0345e1b Mon Sep 17 00:00:00 2001
From: PQZ <pangqingzhou@gmail.com>
Date: Thu, 8 Aug 2024 11:41:02 +0800
Subject: [PATCH 1/3] 1

---
 src/api/base/cont/index.js                    |  53 ++++++
 src/views/base/cont/form/ContTempForm.vue     | 130 +++++++++++++
 src/views/base/cont/index.vue                 | 175 ++++++++++++++++++
 .../base/customer/components/CorpCustomer.vue |   2 +-
 .../customer/components/PrivateCustomer.vue   |   2 +-
 .../base/customer/components/TodoCustomer.vue |   2 +-
 6 files changed, 361 insertions(+), 3 deletions(-)
 create mode 100644 src/api/base/cont/index.js
 create mode 100644 src/views/base/cont/form/ContTempForm.vue
 create mode 100644 src/views/base/cont/index.vue

diff --git a/src/api/base/cont/index.js b/src/api/base/cont/index.js
new file mode 100644
index 0000000..a208702
--- /dev/null
+++ b/src/api/base/cont/index.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 创建合同模板
+export function createContTemp(data) {
+  return request({
+    url: '/base/cont-temp/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新合同模板
+export function updateContTemp(data) {
+  return request({
+    url: '/base/cont-temp/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除合同模板
+export function deleteContTemp(id) {
+  return request({
+    url: '/base/cont-temp/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得合同模板
+export function getContTemp(id) {
+  return request({
+    url: '/base/cont-temp/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得合同模板分页
+export function getContTempPage(params) {
+  return request({
+    url: '/base/cont-temp/page',
+    method: 'get',
+    params
+  })
+}
+// 导出合同模板 Excel
+export function exportContTempExcel(params) {
+  return request({
+    url: '/base/cont-temp/export-excel',
+    method: 'get',
+    params,
+    responseType: 'blob'
+  })
+}
\ No newline at end of file
diff --git a/src/views/base/cont/form/ContTempForm.vue b/src/views/base/cont/form/ContTempForm.vue
new file mode 100644
index 0000000..ac611c6
--- /dev/null
+++ b/src/views/base/cont/form/ContTempForm.vue
@@ -0,0 +1,130 @@
+<template>
+  <div class="app-container">
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="45%" v-dialogDrag append-to-body>
+      <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="100px">
+                    <el-form-item label="模板编号" prop="tempCode">
+                      <el-input v-model="formData.tempCode" placeholder="请输入模板编号" />
+                    </el-form-item>
+                    <el-form-item label="模板类型" prop="tempType">
+                      <el-select v-model="formData.tempType" placeholder="请选择模板类型">
+                            <el-option label="请选择字典生成" value="" />
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="模板用途" prop="tempUse">
+                      <el-input v-model="formData.tempUse" placeholder="请输入模板用途" />
+                    </el-form-item>
+                    <el-form-item label="模板名称" prop="tempName">
+                      <el-input v-model="formData.tempName" placeholder="请输入模板名称" />
+                    </el-form-item>
+                    <el-form-item label="是否有效（0否；1是）" prop="isValid">
+                      <el-input v-model="formData.isValid" placeholder="请输入是否有效（0否；1是）" />
+                    </el-form-item>
+                    <el-form-item label="状态" prop="status">
+                      <el-radio-group v-model="formData.status">
+                            <el-radio label="1">请选择字典生成</el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                    <el-form-item label="模板内容">
+                      <Editor v-model="formData.tempContent" :min-height="192"/>
+                    </el-form-item>
+      </el-form>
+              <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import * as ContTempApi from '@/api/base/cont';
+  import Editor from '@/components/Editor';
+      export default {
+    name: "ContTempForm",
+    components: {
+          Editor,
+                    },
+    data() {
+      return {
+        // 弹出层标题
+        dialogTitle: "",
+        // 是否显示弹出层
+        dialogVisible: false,
+        // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+        formLoading: false,
+        // 表单参数
+        formData: {
+                            id: undefined,
+                            tempCode: undefined,
+                            tempType: undefined,
+                            tempUse: undefined,
+                            tempName: undefined,
+                            isValid: undefined,
+                            status: undefined,
+                            tempContent: undefined,
+        },
+        // 表单校验
+        formRules: {
+        },
+                        };
+    },
+    methods: {
+      /** 打开弹窗 */
+     async open(id) {
+        this.dialogVisible = true;
+        this.reset();
+        // 修改时，设置数据
+        if (id) {
+          this.formLoading = true;
+          try {
+            const res = await ContTempApi.getContTemp(id);
+            this.formData = res.data;
+            this.title = "修改合同模板";
+          } finally {
+            this.formLoading = false;
+          }
+        }
+        this.title = "新增合同模板";
+              },
+      /** 提交按钮 */
+      async submitForm() {
+        // 校验主表
+        await this.$refs["formRef"].validate();
+                  this.formLoading = true;
+        try {
+          const data = this.formData;
+                  // 修改的提交
+          if (data.id) {
+            await ContTempApi.updateContTemp(data);
+            this.$modal.msgSuccess("修改成功");
+            this.dialogVisible = false;
+            this.$emit('success');
+            return;
+          }
+          // 添加的提交
+          await ContTempApi.createContTemp(data);
+          this.$modal.msgSuccess("新增成功");
+          this.dialogVisible = false;
+          this.$emit('success');
+        } finally {
+          this.formLoading = false;
+        }
+      },
+                      /** 表单重置 */
+      reset() {
+        this.formData = {
+                            id: undefined,
+                            tempCode: undefined,
+                            tempType: undefined,
+                            tempUse: undefined,
+                            tempName: undefined,
+                            isValid: undefined,
+                            status: undefined,
+                            tempContent: undefined,
+        };
+        this.resetForm("formRef");
+      }
+    }
+  };
+</script>
\ No newline at end of file
diff --git a/src/views/base/cont/index.vue b/src/views/base/cont/index.vue
new file mode 100644
index 0000000..1434059
--- /dev/null
+++ b/src/views/base/cont/index.vue
@@ -0,0 +1,175 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="模板编号" prop="tempCode">
+        <el-input v-model="queryParams.tempCode" placeholder="请输入模板编号" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="模板类型" prop="tempType">
+        <el-select v-model="queryParams.tempType" placeholder="请选择模板类型" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="模板用途" prop="tempUse">
+        <el-input v-model="queryParams.tempUse" placeholder="请输入模板用途" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="模板名称" prop="tempName">
+        <el-input v-model="queryParams.tempName" placeholder="请输入模板名称" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="是否有效（0否；1是）" prop="isValid">
+        <el-input v-model="queryParams.isValid" placeholder="请输入是否有效（0否；1是）" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" 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>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)"
+                   v-hasPermi="['base:cont-temp:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                   v-hasPermi="['base:cont-temp:export']">导出</el-button>
+      </el-col>
+              <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+            <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+            <el-table-column label="主键标识" align="center" prop="id" />
+      <el-table-column label="模板编号" align="center" prop="tempCode" />
+      <el-table-column label="模板类型" align="center" prop="tempType" />
+      <el-table-column label="模板用途" align="center" prop="tempUse" />
+      <el-table-column label="模板名称" align="center" prop="tempName" />
+      <el-table-column label="是否有效（0否；1是）" align="center" prop="isValid" />
+      <el-table-column label="状态" align="center" prop="status" />
+      <el-table-column label="模板内容" align="center" prop="tempContent" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+                     v-hasPermi="['base:cont-temp:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['base:cont-temp:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+    <!-- 对话框(添加 / 修改) -->
+    <ContTempForm ref="formRef" @success="getList" />
+    </div>
+</template>
+
+<script>
+import * as ContTempApi from '@/api/base/cont';
+import ContTempForm from '@/views/base/cont/form/ContTempForm.vue';
+export default {
+  name: "ContTemp",
+  components: {
+          ContTempForm,
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+              // 总条数
+        total: 0,
+      // 合同模板列表
+      list: [],
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 选中行
+      currentRow: {},
+      // 查询参数
+      queryParams: {
+                    pageNo: 1,
+            pageSize: 10,
+        tempCode: null,
+        tempType: null,
+        tempUse: null,
+        tempName: null,
+        isValid: null,
+        status: null,
+        tempContent: null,
+        createTime: [],
+      },
+            };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    async getList() {
+      try {
+      this.loading = true;
+              const res = await ContTempApi.getContTempPage(this.queryParams);
+        this.list = res.data.records;
+        this.total = res.data.total;
+      } finally {
+        this.loading = false;
+      }
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 添加/修改操作 */
+    openForm(id) {
+      this.$refs["formRef"].open(id);
+    },
+    /** 删除按钮操作 */
+    async handleDelete(row) {
+      const id = row.id;
+      await this.$modal.confirm('是否确认删除合同模板编号为"' + id + '"的数据项?')
+      try {
+       await ContTempApi.deleteContTemp(id);
+       await this.getList();
+       this.$modal.msgSuccess("删除成功");
+      } catch {}
+    },
+    /** 导出按钮操作 */
+    async handleExport() {
+      await this.$modal.confirm('是否确认导出所有合同模板数据项?');
+      try {
+        this.exportLoading = true;
+        const data = await ContTempApi.exportContTempExcel(this.queryParams);
+        this.$download.excel(data, '合同模板.xls');
+      } catch {
+      } finally {
+        this.exportLoading = false;
+      }
+    },
+              }
+};
+</script>
diff --git a/src/views/base/customer/components/CorpCustomer.vue b/src/views/base/customer/components/CorpCustomer.vue
index 4349140..19086bc 100644
--- a/src/views/base/customer/components/CorpCustomer.vue
+++ b/src/views/base/customer/components/CorpCustomer.vue
@@ -45,7 +45,7 @@
             size="mini"
             style="width: 100%">
             <el-table-column align="center" prop="cusName" label="经办人姓名" width="100"/>
-            <el-table-column width="50" label="性别" align="center" prop="sex">
+            <el-table-column width="60" label="性别" align="center" prop="sex">
               <template v-slot="scope">
                 <dict-tag :type="DICT_TYPE.DICT_SYS_USER_SEX" :value="scope.row.sex"/>
               </template>
diff --git a/src/views/base/customer/components/PrivateCustomer.vue b/src/views/base/customer/components/PrivateCustomer.vue
index f573ed0..281aae3 100644
--- a/src/views/base/customer/components/PrivateCustomer.vue
+++ b/src/views/base/customer/components/PrivateCustomer.vue
@@ -40,7 +40,7 @@
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column width="50" label="性别" align="center" prop="sex">
+      <el-table-column width="60" label="性别" align="center" prop="sex">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.DICT_SYS_USER_SEX" :value="scope.row.sex" />
         </template>
diff --git a/src/views/base/customer/components/TodoCustomer.vue b/src/views/base/customer/components/TodoCustomer.vue
index 26d1c35..a7bf372 100644
--- a/src/views/base/customer/components/TodoCustomer.vue
+++ b/src/views/base/customer/components/TodoCustomer.vue
@@ -35,7 +35,7 @@
 
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column width="100" label="客户名称" align="center" prop="cusName"/>
-      <el-table-column width="50" label="性别" align="center" prop="sex">
+      <el-table-column width="60" label="性别" align="center" prop="sex">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.DICT_SYS_USER_SEX" :value="scope.row.sex" />
         </template>

From 18c84d27caa78a3b0dd2e14418119f31f786e68a Mon Sep 17 00:00:00 2001
From: PQZ <pangqingzhou@gmail.com>
Date: Thu, 8 Aug 2024 17:35:27 +0800
Subject: [PATCH 2/3] 1

---
 src/components/DocAlert/index.vue             |  10 +-
 src/utils/dict.js                             |   6 +
 src/views/base/cont/form/ContTempForm.vue     | 277 ++++++++++--------
 src/views/base/cont/index.vue                 | 133 +++++----
 .../base/customer/components/CorpCustomer.vue |   5 -
 .../customer/components/PrivateCustomer.vue   |   5 -
 .../base/customer/components/TodoCustomer.vue |   5 -
 7 files changed, 238 insertions(+), 203 deletions(-)

diff --git a/src/components/DocAlert/index.vue b/src/components/DocAlert/index.vue
index 5692989..637de4a 100644
--- a/src/components/DocAlert/index.vue
+++ b/src/components/DocAlert/index.vue
@@ -1,9 +1,9 @@
 <template>
-  <el-alert v-if="enable()" type="success" show-icon>
-    <template slot="title">
-      <div @click="goToUrl">{{ '【' + title + '】文档地址：' + url }}</div>
-    </template>
-  </el-alert>
+<!--  <el-alert v-if="enable()" type="success" show-icon>-->
+<!--    <template slot="title">-->
+<!--      <div @click="goToUrl">{{ '【' + title + '】文档地址：' + url }}</div>-->
+<!--    </template>-->
+<!--  </el-alert>-->
 </template>
 
 <script>
diff --git a/src/utils/dict.js b/src/utils/dict.js
index 8a19a68..92968ce 100644
--- a/src/utils/dict.js
+++ b/src/utils/dict.js
@@ -108,6 +108,12 @@ export const DICT_TYPE = {
   DICT_BASE_LABEL_TYPE : 'base_label_type',
   //业务分类
   DICT_BASE_LABEL_BUSI_TYPE : 'label_busi_type',
+  //合同模板类型
+  DICT_BASE_CONT_TEMP_TYPE : 'cont_temp_type',
+  //合同使用场景
+  DICT_BASE_CONT_TEMP_USE : 'cont_temp_use',
+  //合同是否有效
+  DICT_BASE_CONT_IS_VALID : 'cont_is_valid',
 }
 
 /**
diff --git a/src/views/base/cont/form/ContTempForm.vue b/src/views/base/cont/form/ContTempForm.vue
index ac611c6..df719b6 100644
--- a/src/views/base/cont/form/ContTempForm.vue
+++ b/src/views/base/cont/form/ContTempForm.vue
@@ -1,130 +1,147 @@
-<template>
-  <div class="app-container">
-    <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="45%" v-dialogDrag append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="100px">
-                    <el-form-item label="模板编号" prop="tempCode">
-                      <el-input v-model="formData.tempCode" placeholder="请输入模板编号" />
-                    </el-form-item>
-                    <el-form-item label="模板类型" prop="tempType">
-                      <el-select v-model="formData.tempType" placeholder="请选择模板类型">
-                            <el-option label="请选择字典生成" value="" />
-                      </el-select>
-                    </el-form-item>
-                    <el-form-item label="模板用途" prop="tempUse">
-                      <el-input v-model="formData.tempUse" placeholder="请输入模板用途" />
-                    </el-form-item>
-                    <el-form-item label="模板名称" prop="tempName">
-                      <el-input v-model="formData.tempName" placeholder="请输入模板名称" />
-                    </el-form-item>
-                    <el-form-item label="是否有效（0否；1是）" prop="isValid">
-                      <el-input v-model="formData.isValid" placeholder="请输入是否有效（0否；1是）" />
-                    </el-form-item>
-                    <el-form-item label="状态" prop="status">
-                      <el-radio-group v-model="formData.status">
-                            <el-radio label="1">请选择字典生成</el-radio>
-                      </el-radio-group>
-                    </el-form-item>
-                    <el-form-item label="模板内容">
-                      <Editor v-model="formData.tempContent" :min-height="192"/>
-                    </el-form-item>
-      </el-form>
-              <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button>
-        <el-button @click="dialogVisible = false">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-  import * as ContTempApi from '@/api/base/cont';
-  import Editor from '@/components/Editor';
-      export default {
-    name: "ContTempForm",
-    components: {
-          Editor,
-                    },
-    data() {
-      return {
-        // 弹出层标题
-        dialogTitle: "",
-        // 是否显示弹出层
-        dialogVisible: false,
-        // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-        formLoading: false,
-        // 表单参数
-        formData: {
-                            id: undefined,
-                            tempCode: undefined,
-                            tempType: undefined,
-                            tempUse: undefined,
-                            tempName: undefined,
-                            isValid: undefined,
-                            status: undefined,
-                            tempContent: undefined,
-        },
-        // 表单校验
-        formRules: {
-        },
-                        };
-    },
-    methods: {
-      /** 打开弹窗 */
-     async open(id) {
-        this.dialogVisible = true;
-        this.reset();
-        // 修改时，设置数据
-        if (id) {
-          this.formLoading = true;
-          try {
-            const res = await ContTempApi.getContTemp(id);
-            this.formData = res.data;
-            this.title = "修改合同模板";
-          } finally {
-            this.formLoading = false;
-          }
-        }
-        this.title = "新增合同模板";
-              },
-      /** 提交按钮 */
-      async submitForm() {
-        // 校验主表
-        await this.$refs["formRef"].validate();
-                  this.formLoading = true;
-        try {
-          const data = this.formData;
-                  // 修改的提交
-          if (data.id) {
-            await ContTempApi.updateContTemp(data);
-            this.$modal.msgSuccess("修改成功");
-            this.dialogVisible = false;
-            this.$emit('success');
-            return;
-          }
-          // 添加的提交
-          await ContTempApi.createContTemp(data);
-          this.$modal.msgSuccess("新增成功");
-          this.dialogVisible = false;
-          this.$emit('success');
-        } finally {
-          this.formLoading = false;
-        }
-      },
-                      /** 表单重置 */
-      reset() {
-        this.formData = {
-                            id: undefined,
-                            tempCode: undefined,
-                            tempType: undefined,
-                            tempUse: undefined,
-                            tempName: undefined,
-                            isValid: undefined,
-                            status: undefined,
-                            tempContent: undefined,
-        };
-        this.resetForm("formRef");
-      }
-    }
-  };
-</script>
\ No newline at end of file
+<template>
+  <div class="app-container">
+    <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="100px">
+      <el-row :gutter="1">
+        <el-col :span="5">
+          <el-form-item label="模板名称" prop="tempName">
+            <el-input v-model="formData.tempName" placeholder="请输入模板名称"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item label="模板编码" prop="tempCode">
+            <el-input v-model="formData.tempCode" placeholder="请输入模板编码"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item label="模板类型" prop="tempType">
+            <el-select v-model="formData.tempType" placeholder="请选择模板类型" @keyup.enter.native="handleQuery">
+              <el-option v-for="dict in this.getDictDatas(DICT_TYPE.DICT_BASE_CONT_TEMP_TYPE)"
+                         :key="dict.value" :label="dict.label" :value="dict.value"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item label="模板用途" prop="tempUse">
+            <el-select v-model="formData.tempUse" placeholder="请选择模板类型" @keyup.enter.native="handleQuery">
+              <el-option v-for="dict in this.getDictDatas(DICT_TYPE.DICT_BASE_CONT_TEMP_USE)"
+                         :key="dict.value" :label="dict.label" :value="dict.value"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="模板内容">
+        <Editor :height="500" v-model="formData.tempContent" :min-height="192"/>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" style="text-align: right;" class="dialog-footer">
+      <el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button>
+      <el-button @click="close()">关 闭</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import * as ContTempApi from '@/api/base/cont';
+import Editor from '@/components/Editor';
+
+export default {
+  name: "ContTempForm",
+  components: {
+    Editor,
+  },
+  data() {
+    return {
+
+      // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+      formLoading: false,
+      // 表单参数
+      formData: {
+        id: undefined,
+        tempCode: undefined,
+        tempType: undefined,
+        tempUse: undefined,
+        tempName: undefined,
+        isValid: undefined,
+        status: undefined,
+        tempContent: undefined,
+      },
+      // 表单校验
+      formRules: {
+        tempName: [
+          { required: true, message: '请输入模板名称', trigger: 'blur' },
+        ],
+        tempCode: [
+          { required: true, message: '请输入模板编码', trigger: 'blur' },
+        ],
+        tempType: [
+          { required: true, message: '请选择模板类型', trigger: 'blur' },
+        ],
+        tempUse: [
+          { required: true, message: '请选择模板用途', trigger: 'blur' },
+        ],
+      },
+    };
+  },
+  created() {
+    const id = this.$route.params.id
+    this.open(id)
+  },
+  methods: {
+    close(){
+      this.$router.go(-1);
+    },
+    /** 打开弹窗 */
+    async open(id) {
+      this.reset();
+      // 修改时，设置数据
+      if (id) {
+        this.formLoading = true;
+        try {
+          const res = await ContTempApi.getContTemp(id);
+          this.formData = res.data;
+        } finally {
+          this.formLoading = false;
+        }
+      }
+    },
+    /** 提交按钮 */
+    async submitForm() {
+      debugger
+      // 校验主表
+      await this.$refs["formRef"].validate();
+      this.formLoading = true;
+      try {
+        const data = this.formData;
+        // 修改的提交
+        if (data.id) {
+          await ContTempApi.updateContTemp(data);
+          this.$modal.msgSuccess("修改成功");
+          this.$router.go(-1);
+          return;
+        }
+        // 添加的提交
+        await ContTempApi.createContTemp(data);
+        this.$modal.msgSuccess("新增成功");
+        this.$router.go(-1);
+      } finally {
+        this.formLoading = false;
+      }
+    },
+    /** 表单重置 */
+    reset() {
+      this.formData = {
+        id: undefined,
+        tempCode: undefined,
+        tempType: undefined,
+        tempUse: undefined,
+        tempName: undefined,
+        isValid: undefined,
+        status: undefined,
+        tempContent: undefined,
+      };
+      debugger
+      this.resetForm("formRef");
+    }
+  }
+};
+</script>
diff --git a/src/views/base/cont/index.vue b/src/views/base/cont/index.vue
index 1434059..75a5d4c 100644
--- a/src/views/base/cont/index.vue
+++ b/src/views/base/cont/index.vue
@@ -2,31 +2,20 @@
   <div class="app-container">
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="模板编号" prop="tempCode">
-        <el-input v-model="queryParams.tempCode" placeholder="请输入模板编号" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="模板类型" prop="tempType">
-        <el-select v-model="queryParams.tempType" placeholder="请选择模板类型" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="模板用途" prop="tempUse">
-        <el-input v-model="queryParams.tempUse" placeholder="请输入模板用途" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
       <el-form-item label="模板名称" prop="tempName">
         <el-input v-model="queryParams.tempName" placeholder="请输入模板名称" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="是否有效（0否；1是）" prop="isValid">
-        <el-input v-model="queryParams.isValid" placeholder="请输入是否有效（0否；1是）" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
+      <el-form-item label="模板类型" prop="tempType">
+        <el-select v-model="queryParams.tempType" placeholder="请选择模板类型" @keyup.enter.native="handleQuery">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.DICT_BASE_CONT_TEMP_TYPE)"
+                     :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="queryParams.createTime" 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 label="模板用途" prop="tempUse">
+        <el-select v-model="queryParams.tempUse" placeholder="请选择模板类型" @keyup.enter.native="handleQuery">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.DICT_BASE_CONT_TEMP_USE)"
+                     :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -38,24 +27,36 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)"
-                   v-hasPermi="['base:cont-temp:create']">新增</el-button>
+                   v-hasPermi="['base:cont-temp:create']">新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['base:cont-temp:export']">导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+                   :loading="exportLoading"
+                   v-hasPermi="['base:cont-temp:export']">导出
+        </el-button>
       </el-col>
-              <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-            <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-            <el-table-column label="主键标识" align="center" prop="id" />
-      <el-table-column label="模板编号" align="center" prop="tempCode" />
-      <el-table-column label="模板类型" align="center" prop="tempType" />
-      <el-table-column label="模板用途" align="center" prop="tempUse" />
-      <el-table-column label="模板名称" align="center" prop="tempName" />
-      <el-table-column label="是否有效（0否；1是）" align="center" prop="isValid" />
-      <el-table-column label="状态" align="center" prop="status" />
-      <el-table-column label="模板内容" align="center" prop="tempContent" />
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="模板名称" align="center" prop="tempName"/>
+      <el-table-column label="模板编码" align="center" prop="tempCode"/>
+      <el-table-column label="模板类型" align="center" prop="tempType">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.DICT_BASE_CONT_TEMP_TYPE" :value="scope.row.tempType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="模板用途" align="center" prop="tempUse">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.DICT_BASE_CONT_TEMP_USE" :value="scope.row.tempUse" />
+        </template>
+      </el-table-column>
+      <el-table-column label="是否有效" align="center" prop="isValid">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.DICT_BASE_CONT_IS_VALID" :value="scope.row.isValid" />
+        </template>
+      </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -63,10 +64,18 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">
+          <el-button v-if="scope.row.isValid == '0'" size="mini" type="text" icon="el-icon-open" @click="valid(scope.row.id,'1')"
+                     v-hasPermi="['base:cont-temp:update']">启用
+          </el-button>
+          <el-button v-if="scope.row.isValid == '1'" size="mini" type="text" icon="el-icon-open" @click="valid(scope.row.id,'0')"
+                     v-hasPermi="['base:cont-temp:update']">停用
+          </el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
-                     v-hasPermi="['base:cont-temp:update']">修改</el-button>
+                     v-hasPermi="['base:cont-temp:update']">修改
+          </el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['base:cont-temp:delete']">删除</el-button>
+                     v-hasPermi="['base:cont-temp:delete']">删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -74,17 +83,16 @@
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
                 @pagination="getList"/>
     <!-- 对话框(添加 / 修改) -->
-    <ContTempForm ref="formRef" @success="getList" />
-    </div>
+<!--    <ContTempForm ref="formRef" @success="getList"/>-->
+  </div>
 </template>
 
 <script>
 import * as ContTempApi from '@/api/base/cont';
-import ContTempForm from '@/views/base/cont/form/ContTempForm.vue';
+
 export default {
   name: "ContTemp",
   components: {
-          ContTempForm,
   },
   data() {
     return {
@@ -94,8 +102,8 @@ export default {
       exportLoading: false,
       // 显示搜索条件
       showSearch: true,
-              // 总条数
-        total: 0,
+      // 总条数
+      total: 0,
       // 合同模板列表
       list: [],
       // 是否展开，默认全部展开
@@ -106,8 +114,8 @@ export default {
       currentRow: {},
       // 查询参数
       queryParams: {
-                    pageNo: 1,
-            pageSize: 10,
+        pageNo: 1,
+        pageSize: 10,
         tempCode: null,
         tempType: null,
         tempUse: null,
@@ -117,7 +125,7 @@ export default {
         tempContent: null,
         createTime: [],
       },
-            };
+    };
   },
   created() {
     this.getList();
@@ -126,8 +134,8 @@ export default {
     /** 查询列表 */
     async getList() {
       try {
-      this.loading = true;
-              const res = await ContTempApi.getContTempPage(this.queryParams);
+        this.loading = true;
+        const res = await ContTempApi.getContTempPage(this.queryParams);
         this.list = res.data.records;
         this.total = res.data.total;
       } finally {
@@ -146,17 +154,36 @@ export default {
     },
     /** 添加/修改操作 */
     openForm(id) {
-      this.$refs["formRef"].open(id);
+      this.$router.push({
+        name: "ContTempForm",
+        params:{
+          id: id
+        }
+      });
+      // this.$refs["formRef"].open(id);
+    },
+    /**
+     * 启用/停用
+     */
+    async valid(id,isValid){
+      let formData = {
+        id:id,
+        isValid:isValid
+      }
+      await ContTempApi.updateContTemp(formData);
+      this.$modal.msgSuccess("操作成功");
+      this.getList()
     },
     /** 删除按钮操作 */
     async handleDelete(row) {
       const id = row.id;
-      await this.$modal.confirm('是否确认删除合同模板编号为"' + id + '"的数据项?')
+      await this.$modal.confirm('是否确认删除合同模板名称为"' + row.tempName + '"的数据项?')
       try {
-       await ContTempApi.deleteContTemp(id);
-       await this.getList();
-       this.$modal.msgSuccess("删除成功");
-      } catch {}
+        await ContTempApi.deleteContTemp(id);
+        await this.getList();
+        this.$modal.msgSuccess("删除成功");
+      } catch {
+      }
     },
     /** 导出按钮操作 */
     async handleExport() {
@@ -170,6 +197,6 @@ export default {
         this.exportLoading = false;
       }
     },
-              }
+  }
 };
 </script>
diff --git a/src/views/base/customer/components/CorpCustomer.vue b/src/views/base/customer/components/CorpCustomer.vue
index 19086bc..1599615 100644
--- a/src/views/base/customer/components/CorpCustomer.vue
+++ b/src/views/base/customer/components/CorpCustomer.vue
@@ -12,11 +12,6 @@
       <el-form-item label="身份证号" prop="idCard">
         <el-input v-model="queryParams.idCard" placeholder="请输入身份证号" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="客户状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择客户状态" clearable size="small">
-          <el-option label="请选择字典生成" value=""/>
-        </el-select>
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
diff --git a/src/views/base/customer/components/PrivateCustomer.vue b/src/views/base/customer/components/PrivateCustomer.vue
index 281aae3..0ee1367 100644
--- a/src/views/base/customer/components/PrivateCustomer.vue
+++ b/src/views/base/customer/components/PrivateCustomer.vue
@@ -12,11 +12,6 @@
       <el-form-item label="身份证号" prop="idCard">
         <el-input v-model="queryParams.idCard" placeholder="请输入身份证号" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="客户状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择客户状态" clearable size="small">
-          <el-option label="请选择字典生成" value=""/>
-        </el-select>
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
diff --git a/src/views/base/customer/components/TodoCustomer.vue b/src/views/base/customer/components/TodoCustomer.vue
index a7bf372..593f102 100644
--- a/src/views/base/customer/components/TodoCustomer.vue
+++ b/src/views/base/customer/components/TodoCustomer.vue
@@ -12,11 +12,6 @@
       <el-form-item label="身份证号" prop="idCard">
         <el-input v-model="queryParams.idCard" placeholder="请输入身份证号" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="客户状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择客户状态" clearable size="small">
-          <el-option label="请选择字典生成" value=""/>
-        </el-select>
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>

From 40cd85f233f5077c6d5d411cd5c57fecec4f02de Mon Sep 17 00:00:00 2001
From: PQZ <pangqingzhou@gmail.com>
Date: Thu, 8 Aug 2024 20:01:17 +0800
Subject: [PATCH 3/3] 1

---
 src/views/report/goview/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/report/goview/index.vue b/src/views/report/goview/index.vue
index 5cbce7f..0bf8e20 100644
--- a/src/views/report/goview/index.vue
+++ b/src/views/report/goview/index.vue
@@ -11,7 +11,7 @@ export default {
   components: { iFrame },
   data() {
     return {
-      url: 'http://127.0.0.1:3000',
+      url: 'http://192.168.1.17:3000',
     };
   },
 };