修改

jwtech-admin-page/src/api/build/gzjb.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询工作简报列表
+export function listGzjb(query) {
+  return request({
+    url: '/build/gzjb/list',
+    method: 'post',
+    data: query
+  })
+}
+
+// 查询工作简报详细
+export function getGzjb(id) {
+  return request({
+    url: '/build/gzjb/' + id,
+    method: 'get'
+  })
+}
+
+// 新增工作简报
+export function addGzjb(data) {
+  return request({
+    url: '/build/gzjb',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改工作简报
+export function updateGzjb(data) {
+  return request({
+    url: '/build/gzjb',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除工作简报
+export function delGzjb(id) {
+  return request({
+    url: '/build/gzjb/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出工作简报
+export function exportGzjb(query) {
+  return request({
+    url: '/build/gzjb/export',
+    method: 'get',
+    params: query
+  })
+}

jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract/options/subcontractPage.vue

@@ -88,6 +88,7 @@
       v-loading="loading"
       :data="subcontractsList"
       @selection-change="handleSelectionChange"
+      tooltip-effect="dark myTooltips"
     >
       <el-table-column type="selection" width="55" align="center" fixed />
       <el-table-column
@@ -132,6 +133,7 @@
         label="承包公司"
         align="center"
         prop="contractingCompany"
+        show-overflow-tooltip
         min-width="120"
       />
       <el-table-column
@@ -150,12 +152,14 @@
         label="工作内容"
         align="center"
         prop="work"
+        show-overflow-tooltip
         min-width="120"
       />
       <el-table-column
         label="工作内容详情"
         align="center"
         prop="jobDetails"
+        show-overflow-tooltip
         min-width="120"
       />
 
@@ -630,6 +634,11 @@ export default {
   },
 };
 </script>
+<style lang="scss">
+.myTooltips {
+  max-width: 60vw;
+}
+</style>
 <style lang="scss" scoped>
 @import "@/assets/css/dialog.scss";
 // ::v-deep {

jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/EngineeringQualitySupervisionAndInspection.vue

@@ -90,6 +90,7 @@
       v-loading="loading"
       :data="inspectList"
       @selection-change="handleSelectionChange"
+      tooltip-effect="dark myTooltips"
     >
       <el-table-column type="selection" width="55" align="center" fixed />
       <el-table-column
@@ -104,6 +105,7 @@
         label="检查内容"
         align="center"
         prop="inspectContent"
+        show-overflow-tooltip
         min-width="120"
       />
       <el-table-column
@@ -139,6 +141,7 @@
         label="整改落实情况"
         align="center"
         prop="rectificationContent"
+        show-overflow-tooltip
         min-width="120"
       />
       <el-table-column
@@ -541,3 +544,8 @@ export default {
   },
 };
 </script>
+<style lang="scss">
+.myTooltips {
+  max-width: 60vw;
+}
+</style>

jwtech-admin-page/src/views/evaluationEarlyWarning/projectBrief/options/index.vue

@@ -23,9 +23,26 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
-      <el-form-item label="项目名称" prop="projectName">
+      <el-form-item label="周期">
+        <el-select
+          v-model="queryParams.data.startDate"
+          placeholder="请选择周期"
+          clearable
+          size="small"
+          style="width: 100%"
+          @change="handleQuery"
+        >
+          <el-option
+            v-for="dict in timeOptions"
+            :key="dict.id"
+            :label="dict.name"
+            :value="dict.startDate"
+            @click.native="getEndDate(dict)"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- <el-form-item label="项目名称" prop="projectName">
         <el-input
           v-model="queryParams.data.projectName"
           placeholder="请输入项目名称"
@@ -54,7 +71,7 @@
           @change="handleQuery"
         >
         </el-cascader>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
           >重置</el-button
@@ -257,6 +274,14 @@
 <script>
 import { listById } from "@/api/warn/projectBrief";
 import { getInfo } from "@/api/build/projectInfo";
+import {
+  listGzjb,
+  getGzjb,
+  delGzjb,
+  addGzjb,
+  updateGzjb,
+  exportGzjb,
+} from "@/api/build/gzjb";
 import { regionData, codeToText, TextToCode } from "element-china-area-data";
 import { getAreasData } from "@/api/areas/index";
 export default {
@@ -284,10 +309,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         ids: null,
-        data: {
+        data: {},
-          startDate: "2024-01-01",
-          endDate: "2024-04-01",
-        },
         // 排序方式
         params: {
           // 按哪个字段排序
@@ -309,6 +331,7 @@ export default {
         emitPath: false,
         checkStrictly: true, //选择任意一级
       },
+      timeOptions: [],
     };
   },
   created() {
@@ -318,8 +341,18 @@ export default {
     });
     this.routeList = JSON.parse(this.$store.state.basePageData.routeList);
     this.getTreeData();
+    listGzjb({ data: {} }).then((res) => {
+      // console.log(4444, res);
+      this.timeOptions = res.records;
+      if (res.records[0]) {
+        this.queryParams.data.startDate = res.records[0].startDate;
+      }
+    });
   },
   methods: {
+    getEndDate(dict) {
+      this.queryParams.data.endDate = dict.endDate;
+    },
     // 工程等别字典翻译
     engineeringGradeFormat(row, column) {
       return this.selectDictLabel(

jwtech-admin-page/src/views/marketSupervision/comprehensiveInfo/index.vue

@@ -14,7 +14,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="40px"
     >
       <el-form-item label="标题" prop="title">
         <el-input
@@ -236,6 +235,7 @@
               :defaultConfig="editorConfig"
               :mode="mode"
               @onCreated="onCreated"
+              @onBlur="checkContent"
             />
           </div>
         </el-form-item>
@@ -397,7 +397,11 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        title: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        region: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        text: [{ max: 65500, message: "字符长度最大为65500", trigger: "blur" }],
+      },
       // 面包屑，路由信息
       routeList: [
         {
@@ -416,8 +420,12 @@ export default {
     this.getList();
   },
   methods: {
+    checkContent() {
+      this.$refs.form.validateField("text");
+    },
     onCreated(editor) {
       this.editor = Object.seal(editor); // 一定要用 Object.seal() ，否则会报错
+      this.editor.blur = this.checkContent;
     },
     /** 查询综合信息列表 */
     getList() {
@@ -435,6 +443,7 @@ export default {
     },
     // 表单重置
     reset() {
+      this.fileList1 = [];
       this.form = {
         id: null,
         title: null,

jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/index.vue

@@ -711,8 +711,8 @@ export default {
         registeredCapital: [
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
-            message: "请输入数字,可保留两位小数",
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
         ],

jwtech-admin-page/src/views/project/bid/options/TenderAnnouncementPage.vue

@@ -811,7 +811,7 @@
       </el-row>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="checkBidContent">取 消</el-button>
+        <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>