diff --git a/jwtech-admin-page/package.json b/jwtech-admin-page/package.json
index 8cd6d408..bbfe0b78 100644
--- a/jwtech-admin-page/package.json
+++ b/jwtech-admin-page/package.json
@@ -43,6 +43,7 @@
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@antv/x6": "^1.28.1",
     "@riophae/vue-treeselect": "0.4.0",
+    "@supermap/iclient-ol": "^11.1.1",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^1.0.2",
     "axios": "0.18.1",
@@ -68,7 +69,6 @@
     "node-sass": "^4.12.0",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
-    "ol": "^6.4.0",
     "path-to-regexp": "2.4.0",
     "pdfjs-dist": "^3.1.81",
     "quill": "^2.0.0-dev.3",
diff --git a/jwtech-admin-page/src/components/map/index.vue b/jwtech-admin-page/src/components/map/index.vue
index e9d88a68..304ed464 100644
--- a/jwtech-admin-page/src/components/map/index.vue
+++ b/jwtech-admin-page/src/components/map/index.vue
@@ -21,7 +21,7 @@ import OSM from "ol/source/OSM";
 import WMTS from "ol/source/WMTS";
 import WMTSTileGrid from "ol/tilegrid/WMTS.js";
 import VectorSource from "ol/source/Vector.js";
-// import TileSuperMapRest from "ol/source/TileSuperMapRest.js";
+import { TileSuperMapRest } from "@supermap/iclient-ol/mapping/TileSuperMapRest";
 
 import VectorLayer from "ol/layer/Vector.js";
 import { Style, Fill, Stroke, Circle, Text } from "ol/style";
@@ -151,20 +151,20 @@ export default {
         //   url: 'http://19.25.37.27:8081/gmap/proxyHandler?serviceCode={{serviceCode}}&url=https://ztn-data.gdgov.cn:8581/GatewayMsg/http/api/proxy/invoke',
         //   type: 'YZT-WMTS'
         // },
-        {
-          index: 1,
-          code: "YZT1597746916315",
-          name: "广东7_17级界线电子地图",
-          url: "http://19.25.37.27:8081/gmap/proxyHandler?serviceCode={{serviceCode}}&url=https://ztn-data.gdgov.cn:8581/GatewayMsg/http/api/proxy/invoke",
-          type: "YZT-WMTS",
-        },
-        {
-          index: 2,
-          code: "YZT1610609681389",
-          name: "广东2020年7_17级矢量注记",
-          url: "http://19.25.37.27:8081/gmap/proxyHandler?serviceCode={{serviceCode}}&url=https://ztn-data.gdgov.cn:8581/GatewayMsg/http/api/proxy/invoke",
-          type: "YZT-WMTS",
-        },
+        // {
+        //   index: 1,
+        //   code: "YZT1597746916315",
+        //   name: "广东7_17级界线电子地图",
+        //   url: "http://19.25.37.27:8081/gmap/proxyHandler?serviceCode={{serviceCode}}&url=https://ztn-data.gdgov.cn:8581/GatewayMsg/http/api/proxy/invoke",
+        //   type: "YZT-WMTS",
+        // },
+        // {
+        //   index: 2,
+        //   code: "YZT1610609681389",
+        //   name: "广东2020年7_17级矢量注记",
+        //   url: "http://19.25.37.27:8081/gmap/proxyHandler?serviceCode={{serviceCode}}&url=https://ztn-data.gdgov.cn:8581/GatewayMsg/http/api/proxy/invoke",
+        //   type: "YZT-WMTS",
+        // },
         {
           index: 3,
           code: "0",
@@ -179,39 +179,42 @@ export default {
           url: "http://19.25.35.204:31190/iserver/services/map-GuangDongShengDaoLu/rest/maps/广东省道路",
           type: "rest-map",
         },
-        {
-          index: 5,
-          code: "0",
-          text: "",
-          url: "http://19.25.35.204:31190/iserver/services/map-ShengJiXingZhengQuHuaMian/rest/maps/省级行政区划面",
-          type: "rest-map",
-        },
+        // {
+        //   index: 5,
+        //   code: "0",
+        //   text: "",
+        //   url: "http://19.25.35.204:31190/iserver/services/map-ShengJiXingZhengQuHuaMian/rest/maps/省级行政区划面",
+        //   type: "rest-map",
+        // },
         // {
         //   index: 6,
         //   code: '0',
         //   text: '',
         //   url: 'http://19.25.35.204:31190/iserver/services/map-YiZhangTuShuiKu/rest/maps/水库',
         //   type: 'rest-map'
-        // }
+        // },
         // {
         //   index: 7,
         //   code: '0',
         //   text: '',
         //   url: 'http://19.25.35.204:31190/iserver/services/map-ShiJiXingZhengQuHuaMian/rest/maps/市级行政区划面',
         //   type: 'rest-map'
-        // }
+        // },
+        // {
         //   index: 8,
         //   code: '0',
         //   text: '',
         //   url: 'http://19.25.35.204:31190/iserver/services/map-XianJiXingZhengQuHuaMian/rest/maps/县级行政区划面',
         //   type: 'rest-map'
-        // }
+        // },
+        // {
         //   index: 9,
         //   code: '0',
         //   text: '',
         //   url: 'http://19.25.35.204:31190/iserver/services/map-ZhenJiXingZhengQuHuaMian/rest/maps/镇级行政区划面',
         //   type: 'rest-map'
-        // }
+        // },
+        // {
         //   index: 10,
         //   code: '0',
         //   text: '',
@@ -292,6 +295,8 @@ export default {
         xhr.send();
       }
 
+      let that = this;
+
       // 加载wmts服务
       function addYztWmtsLayer(res, index) {
         console.log(layerList[index]);
@@ -342,7 +347,7 @@ export default {
         });
         console.log(source.urls);
         layer.setZIndex(lastIndex);
-        this.map.addLayer(layer);
+        that.map.addLayer(layer);
       }
       // -------------------------------------------------------------------------------------
       // 接入粤政图要素服务(wfs)
@@ -412,7 +417,7 @@ export default {
           source: wfsObj.source,
           style: wfsObj.style,
         });
-        this.map.addLayer(vectorLayer);
+        that.map.addLayer(vectorLayer);
       }
 
       // 接入rest-map服务
@@ -426,7 +431,7 @@ export default {
         });
         let lastIndex = index + 10 * (1 + index);
         restLayer.setZIndex(lastIndex);
-        this.map.addLayer(restLayer);
+        that.map.addLayer(restLayer);
       }
       // 回显
       this.handleReturnShow();
@@ -452,10 +457,10 @@ export default {
             fill: new Fill({
               color: "rgba(255, 255, 255, 0.2)", // 填充颜色
             }),
-            stroke: new Stroke({
-              color: "#409eff", // 边框颜色
-              width: 4, // 边框宽度
-            }),
+            // stroke: new Stroke({
+            //   color: "#409eff", // 边框颜色
+            //   width: 4, // 边框宽度
+            // }),
             image: new Circle({
               radius: 8, // 圆点半径
               fill: new Fill({
@@ -499,20 +504,20 @@ export default {
           source: that.drawVectorSource,
           freehand: false,
           // style: new Style({
+          // fill: new Fill({
+          //   color: 'rgba(255, 255, 255, 0.2)' // 填充颜色
+          // }),
+          // stroke: new Stroke({
+          //   color: "red", // 边框颜色
+          //   width: 4, // 边框宽度
+          // }),
+          // image: new Circle({
+          //   radius: 8, // 圆点半径
           //   fill: new Fill({
-          //     color: 'rgba(255, 255, 255, 0.2)' // 填充颜色
-          //   }),
-          //   stroke: new Stroke({
-          //     color: '#409eff', // 边框颜色
-          //     width: 4 // 边框宽度
-          //   }),
-          //   image: new Circle({
-          //     radius: 8, // 圆点半径
-          //     fill: new Fill({
-          //       color: 'blue' // 圆点填充颜色
-          //     })
+          //     color: 'blue' // 圆点填充颜色
           //   })
           // })
+          // }),
         });
         this.map.addInteraction(that.lineDrawFlag);
       } else {
diff --git a/jwtech-admin-page/src/views/building/contract/index.vue b/jwtech-admin-page/src/views/building/contract/index.vue
index c17a3978..181f581a 100644
--- a/jwtech-admin-page/src/views/building/contract/index.vue
+++ b/jwtech-admin-page/src/views/building/contract/index.vue
@@ -16,7 +16,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <!-- <el-form-item label="合同编号" prop="contractNumber">
         <el-input
diff --git a/jwtech-admin-page/src/views/building/contract/options/acceptancePage.vue b/jwtech-admin-page/src/views/building/contract/options/acceptancePage.vue
index dd4031ed..60eb9e5b 100644
--- a/jwtech-admin-page/src/views/building/contract/options/acceptancePage.vue
+++ b/jwtech-admin-page/src/views/building/contract/options/acceptancePage.vue
@@ -6,7 +6,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="验收时间" prop="acceptanceTime">
         <el-date-picker
diff --git a/jwtech-admin-page/src/views/building/contract/options/alterPage.vue b/jwtech-admin-page/src/views/building/contract/options/alterPage.vue
index 0197d76f..88f2d843 100644
--- a/jwtech-admin-page/src/views/building/contract/options/alterPage.vue
+++ b/jwtech-admin-page/src/views/building/contract/options/alterPage.vue
@@ -6,7 +6,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="变更原因" prop="changeReason">
         <el-input
diff --git a/jwtech-admin-page/src/views/building/contract/options/subcontractPage.vue b/jwtech-admin-page/src/views/building/contract/options/subcontractPage.vue
index 24240559..9fae5a27 100644
--- a/jwtech-admin-page/src/views/building/contract/options/subcontractPage.vue
+++ b/jwtech-admin-page/src/views/building/contract/options/subcontractPage.vue
@@ -6,7 +6,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item
         label="分包合同名称"
diff --git a/jwtech-admin-page/src/views/building/firmInfo/index.vue b/jwtech-admin-page/src/views/building/firmInfo/index.vue
index 04a6ec85..635e2bbe 100644
--- a/jwtech-admin-page/src/views/building/firmInfo/index.vue
+++ b/jwtech-admin-page/src/views/building/firmInfo/index.vue
@@ -15,7 +15,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="项目法人" prop="projectLegalPerson">
         <el-input
diff --git a/jwtech-admin-page/src/views/building/hazardRecord/index.vue b/jwtech-admin-page/src/views/building/hazardRecord/index.vue
index 3a6151f5..63113378 100644
--- a/jwtech-admin-page/src/views/building/hazardRecord/index.vue
+++ b/jwtech-admin-page/src/views/building/hazardRecord/index.vue
@@ -6,7 +6,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="项目名称" prop="entryName">
         <el-input
@@ -40,15 +39,15 @@
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
-        >搜索</el-button
+          >搜索</el-button
         >
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-        >重置</el-button
+          >重置</el-button
         >
       </el-form-item>
     </el-form>
 
-<!--    按钮区-->
+    <!--    按钮区-->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -57,7 +56,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['build:record:add']"
-        >新增</el-button
+          >新增</el-button
         >
       </el-col>
       <el-col :span="1.5">
@@ -68,7 +67,7 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['build:record:edit']"
-        >修改</el-button
+          >修改</el-button
         >
       </el-col>
       <el-col :span="1.5">
@@ -79,7 +78,7 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['build:record:remove']"
-        >删除</el-button
+          >删除</el-button
         >
       </el-col>
       <el-col :span="1.5">
@@ -89,7 +88,7 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['build:record:export']"
-        >导出</el-button
+          >导出</el-button
         >
       </el-col>
       <right-toolbar
@@ -98,8 +97,7 @@
       ></right-toolbar>
     </el-row>
 
-
-<!--    列表-->
+    <!--    列表-->
     <el-table
       v-loading="loading"
       :data="recordList"
@@ -141,7 +139,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['build:record:edit']"
-          >修改</el-button
+            >修改</el-button
           >
           <el-button
             size="mini"
@@ -149,7 +147,7 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['build:record:remove']"
-          >删除</el-button
+            >删除</el-button
           >
         </template>
       </el-table-column>
@@ -163,7 +161,6 @@
       @pagination="getList"
     />
 
-
     <!-- 添加或修改隐患记录登记信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="90%" append-to-body>
       <el-row :gutter="15">
diff --git a/jwtech-admin-page/src/views/building/investment/index.vue b/jwtech-admin-page/src/views/building/investment/index.vue
index cb4c37c3..68ddfd9f 100644
--- a/jwtech-admin-page/src/views/building/investment/index.vue
+++ b/jwtech-admin-page/src/views/building/investment/index.vue
@@ -7,17 +7,15 @@
         v-for="(item, index) in routeList"
         :key="item + index"
         :to="{ path: item.path }"
-      >{{ item.routeName }}</el-breadcrumb-item
+        >{{ item.routeName }}</el-breadcrumb-item
       >
     </el-breadcrumb>
 
-
     <el-form
       :model="queryParams"
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="项目名称" prop="entryName">
         <el-input
@@ -51,10 +49,10 @@
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
-        >搜索</el-button
+          >搜索</el-button
         >
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-        >重置</el-button
+          >重置</el-button
         >
       </el-form-item>
     </el-form>
@@ -69,7 +67,7 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['build:record:edit']"
-        >修改</el-button
+          >修改</el-button
         >
       </el-col>
       <el-col :span="1.5">
@@ -80,10 +78,10 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['build:record:remove']"
-        >删除</el-button
+          >删除</el-button
         >
       </el-col>
-<!--      <el-col :span="1.5">
+      <!--      <el-col :span="1.5">
         <el-button
           type="warning"
           icon="el-icon-download"
@@ -99,7 +97,6 @@
       ></right-toolbar>
     </el-row>
 
-
     <!--    列表-->
     <el-table
       v-loading="loading"
@@ -120,9 +117,6 @@
       <el-table-column label="已下达金额" align="center" prop="releaseFunds" />
       <el-table-column label="合同支付" align="center" prop="contractPayment" />
 
-
-
-
       <el-table-column
         label="创建时间"
         align="center"
@@ -146,7 +140,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['build:record:edit']"
-          >修改</el-button
+            >修改</el-button
           >
           <el-button
             size="mini"
@@ -154,7 +148,7 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['build:record:remove']"
-          >删除</el-button
+            >删除</el-button
           >
         </template>
       </el-table-column>
@@ -167,15 +161,19 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
-
-
   </div>
 </template>
 
 <script>
-import {listInfo,getInfo,addInfo,updateInfo,delInfo,exportInfo } from "@/api/build/projectInfo";
-import {getSourceFundsList} from "@/api/build/sourceFunds";
+import {
+  listInfo,
+  getInfo,
+  addInfo,
+  updateInfo,
+  delInfo,
+  exportInfo,
+} from "@/api/build/projectInfo";
+import { getSourceFundsList } from "@/api/build/sourceFunds";
 
 export default {
   name: "investment",
@@ -240,7 +238,7 @@ export default {
       form: {},
       // 表单校验
       rules: {},
-      fundsList:[],
+      fundsList: [],
     };
   },
   created() {
@@ -265,7 +263,6 @@ export default {
           this.recordList.released += item.releaseFunds;
         }
       })*/
-
     },
     projectTypeFormat(row, column) {
       return this.selectDictLabel(this.projectTypeOptions, row.projectType);
@@ -360,7 +357,7 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getInfo(id).then((response) => {
-        console.log(response.data)
+        console.log(response.data);
         this.routeList.push({
           path: "/building/investment/options",
           routeName: "投资落实",
@@ -371,7 +368,11 @@ export default {
         this.$store.commit("setRouteList", JSON.stringify(this.routeList));
         // 跳转到选项卡页面
         this.$router.push({
-          path: "/building/investment/options?proNo=" + response.data.proNo+"&proCode="+response.data.proCode,
+          path:
+            "/building/investment/options?proNo=" +
+            response.data.proNo +
+            "&proCode=" +
+            response.data.proCode,
         });
       });
     },
diff --git a/jwtech-admin-page/src/views/building/investment/options/purposeFunds.vue b/jwtech-admin-page/src/views/building/investment/options/purposeFunds.vue
index b318a72f..6d69c7cf 100644
--- a/jwtech-admin-page/src/views/building/investment/options/purposeFunds.vue
+++ b/jwtech-admin-page/src/views/building/investment/options/purposeFunds.vue
@@ -5,7 +5,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="合同名称" prop="projectName">
         <el-input
diff --git a/jwtech-admin-page/src/views/building/investment/options/sourceFunds.vue b/jwtech-admin-page/src/views/building/investment/options/sourceFunds.vue
index 874837ca..800a8bfe 100644
--- a/jwtech-admin-page/src/views/building/investment/options/sourceFunds.vue
+++ b/jwtech-admin-page/src/views/building/investment/options/sourceFunds.vue
@@ -5,10 +5,7 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
-
-
       <el-form-item label="下达日期" prop="releaseTime">
         <el-date-picker
           clearable
@@ -25,9 +22,8 @@
 
       <el-form-item>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-        >重置
-        </el-button
-        >
+          >重置
+        </el-button>
       </el-form-item>
     </el-form>
 
@@ -39,9 +35,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['build:sourceFunds:add']"
-        >新增
-        </el-button
-        >
+          >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -51,9 +46,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['build:sourceFunds:edit']"
-        >修改
-        </el-button
-        >
+          >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -63,9 +57,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['build:sourceFunds:remove']"
-        >删除
-        </el-button
-        >
+          >删除
+        </el-button>
       </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
@@ -78,7 +71,7 @@
       :data="subcontractsList"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" align="center" fixed/>
+      <el-table-column type="selection" width="55" align="center" fixed />
       <el-table-column
         label="序号"
         type="index"
@@ -87,152 +80,150 @@
         fixed
       />
 
+      <!--      <el-table v-loading="loading" :data="historyList" @selection-change="handleSelectionChange"-->
+      <!--                :row-key="getRowKeys"-->
+      <!--                :expand-row-keys="expands"-->
+      <!--                @expand-change="handledetail">-->
+      <!--        <el-table-column type="expand">-->
+      <!--          <template slot-scope="props">-->
+      <!--            <el-table v-loading="loading"-->
+      <!--                      :data="infoList"-->
+      <!--                      :row-style="{background:'rgb(48,133,154)',color:'#bbcafb',opacity:1,}"-->
+      <!--                      :header-cell-style="{opacity:1,background:'rgb(48,133,154)',color:'#bbcafb'}"-->
+      <!--                      @selection-change="xthandleSelectionChange">-->
+      <!--              <el-table-column type="selection" width="55" align="center"/>-->
+      <!--              <el-table-column label="标题" align="center" prop="detailsTitle"/>-->
+      <!--              <el-table-column label="排序" align="center" prop="sort"/>-->
+      <!--              <el-table-column label="展示位" align="center" prop="code">-->
+      <!--                <template slot-scope="scope">-->
+      <!--                  <dict-tag :options="dict.type.sys_details_code" :value="scope.row.code"/>-->
+      <!--                </template>-->
+      <!--              </el-table-column>-->
+      <!--              <el-table-column label="类型" align="center" prop="detailsType">-->
+      <!--                <template slot-scope="scope">-->
+      <!--                  <dict-tag :options="dict.type.sys_content_type" :value="scope.row.detailsType"/>-->
+      <!--                </template>-->
+      <!--              </el-table-column>-->
+      <!--              <el-table-column label="是否发布" align="center" prop="xqIsRelease">-->
+      <!--                <template slot-scope="scope">-->
+      <!--                  <el-switch-->
+      <!--                    v-model="scope.row.xqIsRelease"-->
+      <!--                    active-value="1"-->
+      <!--                    inactive-value="0"-->
+      <!--                    @change="xtswitchChange($event,scope.row)"-->
+      <!--                  >-->
+      <!--                  </el-switch>-->
+      <!--                </template>-->
+      <!--              </el-table-column>-->
+      <!--              <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+      <!--                <template slot-scope="scope">-->
+      <!--                  <el-button-->
+      <!--                    size="mini"-->
+      <!--                    type="text"-->
+      <!--                    icon="el-icon-view"-->
+      <!--                    @click="xthandleLook(scope.row)"-->
+      <!--                    v-hasPermi="['system:info:query']"-->
+      <!--                  >查看-->
+      <!--                  </el-button>-->
+      <!--                  <el-button-->
+      <!--                    size="mini"-->
+      <!--                    type="text"-->
+      <!--                    icon="el-icon-edit"-->
+      <!--                    @click="xthandleUpdate(scope.row)"-->
+      <!--                    v-hasPermi="['system:info:edit']"-->
+      <!--                  >修改-->
+      <!--                  </el-button>-->
+      <!--                  <el-button-->
+      <!--                    size="mini"-->
+      <!--                    type="text"-->
+      <!--                    icon="el-icon-delete"-->
+      <!--                    @click="xthandleDelete(scope.row)"-->
+      <!--                    v-hasPermi="['system:info:remove']"-->
+      <!--                  >删除-->
+      <!--                  </el-button>-->
+      <!--                </template>-->
+      <!--              </el-table-column>-->
+      <!--            </el-table>-->
+      <!--            <pagination-->
+      <!--              v-show="xttotal>0"-->
+      <!--              :total="xttotal"-->
+      <!--              :page.sync="currentOpenRow.pageNum"-->
+      <!--              :limit.sync="currentOpenRow.pageSize"-->
+      <!--              @pagination="getxtList"-->
+      <!--            />-->
+      <!--          </template>-->
+      <!--        </el-table-column>-->
+      <!--        <el-table-column label="名称" align="center" prop="historyName"/>-->
+      <!--        <el-table-column label="排序" align="center" prop="historySort"/>-->
+      <!--        <el-table-column label="标题图片" align="center" prop="filePath">-->
+      <!--          <template slot-scope="scope">-->
+      <!--            <el-image-->
+      <!--              v-if="undefined!=scope.row.filePath && ''!=scope.row.filePath && null!=scope.row.filePath && 'null'!=scope.row.filePath"-->
+      <!--              style="width: 100px; height: 100px;cursor: pointer"-->
+      <!--              :src="returnImgPath(scope.row.filePath)">-->
+      <!--            </el-image>-->
+      <!--            <span v-else>未上传文件</span>-->
 
-<!--      <el-table v-loading="loading" :data="historyList" @selection-change="handleSelectionChange"-->
-<!--                :row-key="getRowKeys"-->
-<!--                :expand-row-keys="expands"-->
-<!--                @expand-change="handledetail">-->
-<!--        <el-table-column type="expand">-->
-<!--          <template slot-scope="props">-->
-<!--            <el-table v-loading="loading"-->
-<!--                      :data="infoList"-->
-<!--                      :row-style="{background:'rgb(48,133,154)',color:'#bbcafb',opacity:1,}"-->
-<!--                      :header-cell-style="{opacity:1,background:'rgb(48,133,154)',color:'#bbcafb'}"-->
-<!--                      @selection-change="xthandleSelectionChange">-->
-<!--              <el-table-column type="selection" width="55" align="center"/>-->
-<!--              <el-table-column label="标题" align="center" prop="detailsTitle"/>-->
-<!--              <el-table-column label="排序" align="center" prop="sort"/>-->
-<!--              <el-table-column label="展示位" align="center" prop="code">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <dict-tag :options="dict.type.sys_details_code" :value="scope.row.code"/>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--              <el-table-column label="类型" align="center" prop="detailsType">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <dict-tag :options="dict.type.sys_content_type" :value="scope.row.detailsType"/>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--              <el-table-column label="是否发布" align="center" prop="xqIsRelease">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <el-switch-->
-<!--                    v-model="scope.row.xqIsRelease"-->
-<!--                    active-value="1"-->
-<!--                    inactive-value="0"-->
-<!--                    @change="xtswitchChange($event,scope.row)"-->
-<!--                  >-->
-<!--                  </el-switch>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--              <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <el-button-->
-<!--                    size="mini"-->
-<!--                    type="text"-->
-<!--                    icon="el-icon-view"-->
-<!--                    @click="xthandleLook(scope.row)"-->
-<!--                    v-hasPermi="['system:info:query']"-->
-<!--                  >查看-->
-<!--                  </el-button>-->
-<!--                  <el-button-->
-<!--                    size="mini"-->
-<!--                    type="text"-->
-<!--                    icon="el-icon-edit"-->
-<!--                    @click="xthandleUpdate(scope.row)"-->
-<!--                    v-hasPermi="['system:info:edit']"-->
-<!--                  >修改-->
-<!--                  </el-button>-->
-<!--                  <el-button-->
-<!--                    size="mini"-->
-<!--                    type="text"-->
-<!--                    icon="el-icon-delete"-->
-<!--                    @click="xthandleDelete(scope.row)"-->
-<!--                    v-hasPermi="['system:info:remove']"-->
-<!--                  >删除-->
-<!--                  </el-button>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--            </el-table>-->
-<!--            <pagination-->
-<!--              v-show="xttotal>0"-->
-<!--              :total="xttotal"-->
-<!--              :page.sync="currentOpenRow.pageNum"-->
-<!--              :limit.sync="currentOpenRow.pageSize"-->
-<!--              @pagination="getxtList"-->
-<!--            />-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="名称" align="center" prop="historyName"/>-->
-<!--        <el-table-column label="排序" align="center" prop="historySort"/>-->
-<!--        <el-table-column label="标题图片" align="center" prop="filePath">-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-image-->
-<!--              v-if="undefined!=scope.row.filePath && ''!=scope.row.filePath && null!=scope.row.filePath && 'null'!=scope.row.filePath"-->
-<!--              style="width: 100px; height: 100px;cursor: pointer"-->
-<!--              :src="returnImgPath(scope.row.filePath)">-->
-<!--            </el-image>-->
-<!--            <span v-else>未上传文件</span>-->
-
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        &lt;!&ndash;      <el-table-column label="创建时间" align="center" prop="historyCreatetime" />&ndash;&gt;-->
-<!--        &lt;!&ndash;      <el-table-column label="更新时间" align="center" prop="historyUpdatetime" />&ndash;&gt;-->
-<!--        <el-table-column label="是否发布" align="center" prop="isRelease">-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-switch-->
-<!--              v-model="scope.row.isRelease"-->
-<!--              active-value="1"-->
-<!--              inactive-value="0"-->
-<!--              @change="switchChange($event,scope.row)"-->
-<!--            >-->
-<!--            </el-switch>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-button-->
-<!--              size="mini"-->
-<!--              type="text"-->
-<!--              icon="el-icon-view"-->
-<!--              @click="dshandleLook(scope.row)"-->
-<!--              v-hasPermi="['system:history:show']"-->
-<!--            >查看-->
-<!--            </el-button>-->
-<!--            <el-button-->
-<!--              size="mini"-->
-<!--              type="text"-->
-<!--              icon="el-icon-edit"-->
-<!--              @click="handleUpdate(scope.row)"-->
-<!--              v-hasPermi="['system:history:edit']"-->
-<!--            >修改-->
-<!--            </el-button>-->
-<!--            <el-button-->
-<!--              size="mini"-->
-<!--              type="text"-->
-<!--              icon="el-icon-delete"-->
-<!--              @click="handleDelete(scope.row)"-->
-<!--              v-hasPermi="['system:history:remove']"-->
-<!--            >删除-->
-<!--            </el-button>-->
-<!--            <el-button-->
-<!--              size="mini"-->
-<!--              type="text"-->
-<!--              icon="el-icon-plus"-->
-<!--              @click="addxt(scope.row)"-->
-<!--              v-hasPermi="['system:info:add']"-->
-<!--            >新建详情-->
-<!--            </el-button>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--      </el-table>-->
+      <!--          </template>-->
+      <!--        </el-table-column>-->
+      <!--        &lt;!&ndash;      <el-table-column label="创建时间" align="center" prop="historyCreatetime" />&ndash;&gt;-->
+      <!--        &lt;!&ndash;      <el-table-column label="更新时间" align="center" prop="historyUpdatetime" />&ndash;&gt;-->
+      <!--        <el-table-column label="是否发布" align="center" prop="isRelease">-->
+      <!--          <template slot-scope="scope">-->
+      <!--            <el-switch-->
+      <!--              v-model="scope.row.isRelease"-->
+      <!--              active-value="1"-->
+      <!--              inactive-value="0"-->
+      <!--              @change="switchChange($event,scope.row)"-->
+      <!--            >-->
+      <!--            </el-switch>-->
+      <!--          </template>-->
+      <!--        </el-table-column>-->
+      <!--        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+      <!--          <template slot-scope="scope">-->
+      <!--            <el-button-->
+      <!--              size="mini"-->
+      <!--              type="text"-->
+      <!--              icon="el-icon-view"-->
+      <!--              @click="dshandleLook(scope.row)"-->
+      <!--              v-hasPermi="['system:history:show']"-->
+      <!--            >查看-->
+      <!--            </el-button>-->
+      <!--            <el-button-->
+      <!--              size="mini"-->
+      <!--              type="text"-->
+      <!--              icon="el-icon-edit"-->
+      <!--              @click="handleUpdate(scope.row)"-->
+      <!--              v-hasPermi="['system:history:edit']"-->
+      <!--            >修改-->
+      <!--            </el-button>-->
+      <!--            <el-button-->
+      <!--              size="mini"-->
+      <!--              type="text"-->
+      <!--              icon="el-icon-delete"-->
+      <!--              @click="handleDelete(scope.row)"-->
+      <!--              v-hasPermi="['system:history:remove']"-->
+      <!--            >删除-->
+      <!--            </el-button>-->
+      <!--            <el-button-->
+      <!--              size="mini"-->
+      <!--              type="text"-->
+      <!--              icon="el-icon-plus"-->
+      <!--              @click="addxt(scope.row)"-->
+      <!--              v-hasPermi="['system:info:add']"-->
+      <!--            >新建详情-->
+      <!--            </el-button>-->
+      <!--          </template>-->
+      <!--        </el-table-column>-->
+      <!--      </el-table>-->
       <pagination
-        v-show="total>0"
+        v-show="total > 0"
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
         @pagination="getList"
       />
 
-
       <el-table-column
         label="下达日期"
         align="center"
@@ -240,9 +231,7 @@
         min-width="120"
       >
         <template slot-scope="scope">
-          <span>{{
-              parseTime(scope.row.releaseTime, "{y}-{m}-{d}")
-            }}</span>
+          <span>{{ parseTime(scope.row.releaseTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
 
@@ -294,18 +283,16 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['build:sourceFunds:edit']"
-          >修改
-          </el-button
-          >
+            >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['build:sourceFunds:remove']"
-          >删除
-          </el-button
-          >
+            >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -345,7 +332,9 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="中央资金" prop="centralArrangedFunds">
-              <el-input v-model="form.centralArrangedFunds" placeholder="请输入中央资金"
+              <el-input
+                v-model="form.centralArrangedFunds"
+                placeholder="请输入中央资金"
               >
                 <template slot="append">万元</template>
               </el-input>
@@ -356,9 +345,9 @@
               <el-input
                 v-model="form.provincialFunding"
                 placeholder="请输入省级资金"
-                >
-                  <template slot="append">万元</template>
-                </el-input>
+              >
+                <template slot="append">万元</template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -366,28 +355,34 @@
               <el-input
                 v-model="form.cityLevelFunds"
                 placeholder="请输入地市级资金"
-                >
+              >
                 <template slot="append">万元</template>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="县级资金" prop="countyLevelFunds">
-              <el-input v-model="form.countyLevelFunds" placeholder="请输入县级资金"
+              <el-input
+                v-model="form.countyLevelFunds"
+                placeholder="请输入县级资金"
               >
                 <template slot="append">万元</template>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="乡镇及群众自筹和其他投资" prop="townshipInvestments">
-              <el-input v-model="form.townshipInvestments" placeholder="请输入乡镇及群众自筹和其他投资"
+            <el-form-item
+              label="乡镇及群众自筹和其他投资"
+              prop="townshipInvestments"
+            >
+              <el-input
+                v-model="form.townshipInvestments"
+                placeholder="请输入乡镇及群众自筹和其他投资"
               >
                 <template slot="append">万元</template>
               </el-input>
             </el-form-item>
           </el-col>
-
         </el-form>
       </el-row>
       <div slot="footer" class="dialog-footer">
@@ -405,7 +400,8 @@ import {
   addFunds,
   updateFunds,
   delFunds,
-  exportFunds, getSourceFundsList,
+  exportFunds,
+  getSourceFundsList,
 } from "@/api/build/sourceFunds";
 
 export default {
@@ -465,7 +461,6 @@ export default {
   //   },
   // },
   methods: {
-
     getList() {
       if (this.$route.query.proNo) {
         this.queryParams.data.proNo = this.$route.query.proNo;
@@ -596,8 +591,7 @@ export default {
             this.getList();
             this.msgSuccess("删除成功");
           })
-          .catch(function () {
-          });
+          .catch(function () {});
       } else {
         this.$message.warning("请选择要删除的数据！！");
       }
diff --git a/jwtech-admin-page/src/views/building/projectFiling/index.vue b/jwtech-admin-page/src/views/building/projectFiling/index.vue
index 99c96c8e..05b48a20 100644
--- a/jwtech-admin-page/src/views/building/projectFiling/index.vue
+++ b/jwtech-admin-page/src/views/building/projectFiling/index.vue
@@ -15,7 +15,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="项目类型" prop="projectType">
         <el-cascader
diff --git a/jwtech-admin-page/src/views/building/projectInfo/index copy.vue b/jwtech-admin-page/src/views/building/projectInfo/index copy.vue
index 4806dd1e..4bfea310 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/index copy.vue	
+++ b/jwtech-admin-page/src/views/building/projectInfo/index copy.vue	
@@ -16,7 +16,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="项目名称" prop="projectName">
         <el-input
diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract.vue
index bda7e42e..c2a30854 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract.vue
+++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract.vue
@@ -6,7 +6,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <!-- <el-form-item label="合同编号" prop="contractNumber">
         <el-input
diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract/index.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract/index.vue
index 0e90f8d6..e0b534ae 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract/index.vue
+++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract/index.vue
@@ -904,6 +904,7 @@ export default {
     },
     // 表单重置
     reset() {
+      this.contractFileList = [];
       this.form = {
         id: null,
         contractNumber: null,
diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract/options/acceptancePage.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract/options/acceptancePage.vue
index 822e8efb..6988adbd 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract/options/acceptancePage.vue
+++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract/options/acceptancePage.vue
@@ -6,7 +6,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="验收时间" prop="acceptanceTime">
         <el-date-picker
diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract/options/alterPage.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract/options/alterPage.vue
index 5ceb34e9..b0926e0f 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract/options/alterPage.vue
+++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract/options/alterPage.vue
@@ -6,7 +6,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="变更原因" prop="changeReason">
         <el-input
diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract/options/subcontractPage.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract/options/subcontractPage.vue
index 2d74ec91..df413aa1 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract/options/subcontractPage.vue
+++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract/options/subcontractPage.vue
@@ -6,7 +6,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item
         label="分包合同名称"
diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/designChangeInformation.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/designChangeInformation.vue
index ceeb54a0..f3e4aab4 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/designChangeInformation.vue
+++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/designChangeInformation.vue
@@ -519,7 +519,7 @@ export default {
         changeReason: null,
         changeContent: null,
         changeApplicant: null,
-        approvalStatus: "0",
+        approvalStatus: null,
         approvalTime: null,
         approvalOpinions: null,
         proCode: null,
@@ -544,7 +544,7 @@ export default {
           changeReason: null,
           changeContent: null,
           changeApplicant: null,
-          approvalStatus: "0",
+          approvalStatus: null,
           approvalTime: null,
           approvalOpinions: null,
           proCode: null,
diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/investment/options/purposeFunds.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/investment/options/purposeFunds.vue
index 16580aff..e998da50 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/investment/options/purposeFunds.vue
+++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/investment/options/purposeFunds.vue
@@ -888,6 +888,7 @@ export default {
               if (response.code === 200) {
                 this.msgSuccess("修改成功");
                 this.open = false;
+                this.getList();
               }
             });
           } else {
diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/clockingIn.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/clockingIn.vue
index b21f1390..7b3ffd84 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/clockingIn.vue
+++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/clockingIn.vue
@@ -9,7 +9,7 @@
       <el-form-item label="姓名" prop="name">
         <el-input
           v-model="queryParams.data.name"
-          placeholder="请输入身份证号码"
+          placeholder="请输入姓名"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -177,8 +177,10 @@
             clearable
             size="small"
             style="width: 100%"
+            @focus="setOptionWidth"
           >
             <el-option
+              :style="{ width: selectOptionWidth }"
               v-for="dict in peasantWorkers"
               :key="dict.id"
               :label="dict.name"
@@ -300,6 +302,20 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        idNo: [
+          { required: true, message: "请输入身份证", trigger: "blur" },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+          {
+            pattern:
+              /^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
+            message: "请输入正确的身份证号",
+            trigger: "blur",
+          },
+        ],
+        name: [
+          { required: true, message: "请输入姓名", trigger: "blur" },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
         attendanceYear: [
           { required: true, message: "请选择考勤年月", trigger: "blur" },
         ],
@@ -314,6 +330,7 @@ export default {
         ],
       },
       peasantWorkers: [],
+      selectOptionWidth: null,
     };
   },
   created() {
@@ -329,6 +346,12 @@ export default {
     });
   },
   methods: {
+    // 下拉框弹出时，设置弹框的宽度
+    setOptionWidth(event) {
+      this.$nextTick(() => {
+        this.selectOptionWidth = event.srcElement.offsetWidth + "px";
+      });
+    },
     getOtherMsg(msg) {
       this.form.idNo = msg.idNo;
       this.form.belowUnit = msg.belowUnit;
diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/payroll.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/payroll.vue
index 511e25fe..d65749f7 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/payroll.vue
+++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/payroll.vue
@@ -260,7 +260,7 @@
       :close-on-click-modal="false"
     >
       <el-row :gutter="15">
-        <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+        <el-form ref="form" :model="form" :rules="rules" label-width="142px">
           <el-col :span="12">
             <el-form-item label="银行账户" prop="bankAccount">
               <!-- <el-input
@@ -305,8 +305,10 @@
                 clearable
                 size="small"
                 style="width: 100%"
+                @focus="setOptionWidth"
               >
                 <el-option
+                  :style="{ width: selectOptionWidth }"
                   v-for="dict in peasantWorkers"
                   :key="dict.id"
                   :label="dict.name"
@@ -459,7 +461,20 @@ export default {
         bankSerialNumber: [
           { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
-        idNo: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        idNo: [
+          { required: true, message: "请输入身份证", trigger: "blur" },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+          {
+            pattern:
+              /^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
+            message: "请输入正确的身份证号",
+            trigger: "blur",
+          },
+        ],
+        name: [
+          { required: true, message: "请输入姓名", trigger: "blur" },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
         bankSerialNumber: [
           { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
@@ -493,6 +508,7 @@ export default {
       },
       peasantWorkers: [],
       zhangHaoList: [],
+      selectOptionWidth: null,
     };
   },
   created() {
@@ -517,6 +533,12 @@ export default {
     });
   },
   methods: {
+    // 下拉框弹出时，设置弹框的宽度
+    setOptionWidth(event) {
+      this.$nextTick(() => {
+        this.selectOptionWidth = event.srcElement.offsetWidth + "px";
+      });
+    },
     getOtherMsg(msg) {
       this.form.idNo = msg.idNo;
       // this.form.belowUnit = msg.belowUnit;
diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/realNameSystem.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/realNameSystem.vue
index e05ed4a8..38118458 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/realNameSystem.vue
+++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/realNameSystem.vue
@@ -374,8 +374,20 @@ export default {
         socialCreditCode: [
           { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
-        idNo: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
-        name: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        idNo: [
+          { required: true, message: "请输入身份证", trigger: "blur" },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+          {
+            pattern:
+              /^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
+            message: "请输入正确的身份证号",
+            trigger: "blur",
+          },
+        ],
+        name: [
+          { required: true, message: "请输入姓名", trigger: "blur" },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
         nation: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
         nativePlace: [
           { max: 250, message: "字符长度最大为250", trigger: "blur" },
diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl.vue
index 0e3b7348..0e9820fe 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl.vue
+++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl.vue
@@ -6,7 +6,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="数源部门" prop="projectName">
         <el-input
diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/itemDivision/components/segmentProject.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/itemDivision/components/segmentProject.vue
index d9d48998..5d0d282c 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/itemDivision/components/segmentProject.vue
+++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/itemDivision/components/segmentProject.vue
@@ -369,7 +369,7 @@ export default {
         divisionalWorkCode: [
           { required: true, message: "请输入分部工程编号", trigger: "blur" },
           {
-            pattern: /[\\u4e00-\\u9fa5]$/,
+            pattern: /^[^\u4e00-\u9fa5]+$/,
             message: "编号不得出现中文",
             trigger: "blur",
           },
diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/itemDivision/components/unitProject.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/itemDivision/components/unitProject.vue
index af02a8a6..34899e39 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/itemDivision/components/unitProject.vue
+++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/itemDivision/components/unitProject.vue
@@ -219,7 +219,7 @@ export default {
         unitProjectCode: [
           { required: true, message: "请输入单位工程编号", trigger: "blur" },
           {
-            pattern: /[\\u4e00-\\u9fa5]$/,
+            pattern: /^[^\u4e00-\u9fa5]+$/,
             message: "编号不得出现中文",
             trigger: "blur",
           },
diff --git a/jwtech-admin-page/src/views/earlyStage/projectInfo/index.vue b/jwtech-admin-page/src/views/earlyStage/projectInfo/index.vue
index 72722f5c..5d4e765d 100644
--- a/jwtech-admin-page/src/views/earlyStage/projectInfo/index.vue
+++ b/jwtech-admin-page/src/views/earlyStage/projectInfo/index.vue
@@ -5,7 +5,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="专题项目名称" prop="projectName">
         <el-input
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/index.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/index.vue
index a86602c0..97d83a0c 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/index.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/index.vue
@@ -16,7 +16,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="项目类型" prop="projectType">
         <el-cascader
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/baseMsg.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/baseMsg.vue
index 7b7b46ee..1bd7a463 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/baseMsg.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/baseMsg.vue
@@ -2,10 +2,10 @@
   <div class="app-container">
     <div class="listTitle">
       <span>项目基本信息</span>
-      <span class="addBtn" @click="handleUpdate">
+      <!-- <span class="addBtn" @click="handleUpdate">
         <i class="el-icon-edit-outline"></i>
         编辑
-      </span>
+      </span> -->
     </div>
     <el-descriptions
       class="margin-top"
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract.vue
index bda7e42e..c2a30854 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract.vue
@@ -6,7 +6,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <!-- <el-form-item label="合同编号" prop="contractNumber">
         <el-input
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract/index.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract/index.vue
index 935a15e6..7a1d5c58 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract/index.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract/index.vue
@@ -6,7 +6,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <!-- <el-form-item label="合同编号" prop="contractNumber">
         <el-input
@@ -56,7 +55,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           icon="el-icon-plus"
@@ -87,7 +86,7 @@
           v-hasPermi="['build:info:remove']"
           >删除</el-button
         >
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -267,30 +266,30 @@
         fixed="right"
       >
         <template slot-scope="scope">
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-view"
             @click="viewInfo(scope.row)"
             v-hasPermi="['build:info:view']"
             >查看</el-button
-          >
+          > -->
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-view"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['build:info:edit']"
-            >管理合同</el-button
+            >查看合同信息</el-button
           >
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['build:info:remove']"
             >删除</el-button
-          >
+          > -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract/options/acceptancePage.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract/options/acceptancePage.vue
index 822e8efb..37dac05d 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract/options/acceptancePage.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract/options/acceptancePage.vue
@@ -6,7 +6,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="验收时间" prop="acceptanceTime">
         <el-date-picker
@@ -68,38 +67,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['build:acc:add']"
-          >新增</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['build:acc:edit']"
-          >修改</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['build:acc:remove']"
-          >删除</el-button
-        >
-      </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -168,7 +135,7 @@
             @click="viewInfo(scope.row)"
             >查看</el-button
           >
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -183,7 +150,7 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['build:acc:remove']"
             >删除</el-button
-          >
+          > -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract/options/alterPage.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract/options/alterPage.vue
index 5ceb34e9..f07a9cc6 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract/options/alterPage.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract/options/alterPage.vue
@@ -6,7 +6,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="变更原因" prop="changeReason">
         <el-input
@@ -40,38 +39,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['build:change:add']"
-          >新增</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['build:change:edit']"
-          >修改</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['build:change:remove']"
-          >删除</el-button
-        >
-      </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -165,7 +132,7 @@
             @click="viewInfo(scope.row)"
             >查看</el-button
           >
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -180,7 +147,7 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['build:change:remove']"
             >删除</el-button
-          >
+          > -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract/options/basePage.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract/options/basePage.vue
index 2056c3ee..693c162e 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract/options/basePage.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract/options/basePage.vue
@@ -1,218 +1,100 @@
 <template>
   <div>
     <el-row v-loading="loading">
-      <el-form
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="150px"
-        v-show="!loading"
+      <el-descriptions
+        class="margin-top"
+        :column="2"
+        border
+        :labelStyle="{
+          'text-align': 'left',
+          width: '180px',
+          height: '50px',
+        }"
+        :contentStyle="{ minWidth: '350px' }"
       >
-        <!-- <el-col :span="12">
-          <el-form-item label="合同编号" prop="contractNumber">
-            <el-input
-              v-model="form.contractNumber"
-              placeholder="请输入合同编号"
-            />
-          </el-form-item>
-        </el-col> -->
-        <!-- <el-col :span="24">
-          <el-form-item label="项目名称" prop="projectName">
-            <el-input
-              v-model="form.projectName"
-              placeholder="请选择项目名称"
-              readonly
-            />
-          </el-form-item>
-        </el-col> -->
-        <el-col :span="24">
-          <el-form-item label="合同名称" prop="contractName">
-            <el-input
-              v-model="form.contractName"
-              placeholder="请输入合同名称"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="承建单位" prop="constructionUnit">
-            <el-input
-              v-model="form.constructionUnit"
-              placeholder="请输入承建单位"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="合同状态">
-            <el-select
-              v-model="form.contractStatus"
-              placeholder="请选择合同状态"
-              filterable
-              clearable
-              size="small"
-              style="width: 100%"
+        <el-descriptions-item>
+          <template slot="label"> 合同名称 </template>
+          {{ this.form.contractName }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 合同编号 </template>
+          {{ this.form.contractNumber }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 承建单位 </template>
+          {{ this.form.constructionUnit }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 合同状态 </template>
+          {{ engineeringGradeFormat(this.form) }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 标段名称 </template>
+          {{ this.form.sectionName }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 合同金额（万元） </template>
+          {{ this.form.contractAmount }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 合同工期 </template>
+          {{ this.form.contractDuration }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 签订时间 </template>
+          {{ this.form.signingTime }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 开工时间 </template>
+          {{ this.form.commencementTime }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 支付周期 </template>
+          {{ this.form.paymentCycle }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 履约保函提交时间 </template>
+          {{ this.form.submissionTime }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 支付条款 </template>
+          {{ this.form.paymentTerms }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 项目负责人 </template>
+          {{ this.form.projectLeader }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 项目技术负责人 </template>
+          {{ this.form.projectTechnicalLeader }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 专职安全生产负责人 </template>
+          {{ this.form.safetyProductionManager }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 质量负责人 </template>
+          {{ this.form.qualityLeader }}
+        </el-descriptions-item>
+        <el-descriptions-item span="2">
+          <template slot="label"> 合同文件 </template>
+          <template v-if="this.form.contractFile">
+            <div
+              v-for="(item, index) in JSON.parse(this.form.contractFile)"
+              :key="item + index"
             >
-              <el-option
-                v-for="dict in contractStatusOptions"
-                :key="dict.dictLabel + dict.id"
-                :label="dict.dictLabel"
-                :value="dict.dictValue"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="标段名称" prop="sectionName">
-            <el-input v-model="form.sectionName" placeholder="请输入标段名称" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="合同金额" prop="contractAmount">
-            <el-input
-              v-model="form.contractAmount"
-              placeholder="请输入合同金额"
-            >
-              <template slot="append">万元</template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="合同工期" prop="contractDuration">
-            <el-input
-              v-model="form.contractDuration"
-              placeholder="请输入合同工期"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="签订时间" prop="signingTime">
-            <el-date-picker
-              clearable
-              size="small"
-              style="width: 100%"
-              v-model="form.signingTime"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="选择签订时间"
-            >
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="开工时间" prop="commencementTime">
-            <el-date-picker
-              clearable
-              size="small"
-              style="width: 100%"
-              v-model="form.commencementTime"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="选择开工时间"
-            >
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="支付周期" prop="paymentCycle">
-            <el-input
-              v-model="form.paymentCycle"
-              placeholder="请输入支付周期"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="履约保函提交时间" prop="submissionTime">
-            <el-date-picker
-              clearable
-              size="small"
-              style="width: 100%"
-              v-model="form.submissionTime"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="选择履约保函提交时间"
-            >
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="支付条款" prop="paymentTerms">
-            <el-input
-              v-model="form.paymentTerms"
-              placeholder="请输入支付条款"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="项目负责人" prop="projectLeader">
-            <el-input
-              v-model="form.projectLeader"
-              placeholder="请输入项目负责人"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="项目技术负责人" prop="projectTechnicalLeader">
-            <el-input
-              v-model="form.projectTechnicalLeader"
-              placeholder="请输入项目技术负责人"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item
-            label="专职安全生产负责人"
-            prop="safetyProductionManager"
-          >
-            <el-input
-              v-model="form.safetyProductionManager"
-              placeholder="请输入专职安全生产负责人"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="质量负责人" prop="qualityLeader">
-            <el-input
-              v-model="form.qualityLeader"
-              placeholder="请输入质量负责人"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="合同文件" prop="contractFile">
-            <!-- <el-input
-              v-model="form.contractFile"
-              type="textarea"
-              placeholder="请输入内容"
-            /> -->
-            <el-upload
-              class="upload-demo"
-              action="thinking/common/upload"
-              :headers="headers"
-              :before-upload="
-                (file) => $fileBeforeUpload(file, 'contractFileList')
-              "
-              :on-preview="handlePreview"
-              :on-remove="handleRemove"
-              :before-remove="beforeRemove"
-              multiple
-              :on-success="submitUpload"
-              :file-list="contractFileList"
-            >
-              <el-button size="small" type="primary" plain>
-                <i class="el-icon-upload el-icon--right"></i>
-                点击上传
-              </el-button>
-              <div slot="tip" class="el-upload__tip">
-                支持jpg/png/pdf/word/excel文件等，不超过100M
-              </div>
-            </el-upload>
-          </el-form-item>
-        </el-col>
-      </el-form>
+              {{ item.name }}
+
+              <i
+                class="el-icon-download"
+                @click="downloadFile2(item, index)"
+                style="cursor: pointer"
+              ></i>
+            </div>
+          </template>
+        </el-descriptions-item>
+      </el-descriptions>
     </el-row>
-    <div v-show="!loading" class="btn">
-      <el-button type="primary" @click="submitForm">确 定</el-button>
-      <el-button @click="cancel">取 消</el-button>
-    </div>
   </div>
 </template>
 <script>
@@ -333,6 +215,13 @@ export default {
     },
   },
   methods: {
+    // 合同状态字典翻译
+    engineeringGradeFormat(row, column) {
+      return this.selectDictLabel(
+        this.contractStatusOptions,
+        row.contractStatus
+      );
+    },
     getList() {
       this.loading = true;
       this.form = this.conForm;
@@ -415,6 +304,11 @@ export default {
       // 删除文件
       this.contractFileList.splice(index, 1);
     },
+    // 查看信息中, 下载
+    downloadFile2(info, index) {
+      console.log(info);
+      this.handlePreview(info);
+    },
     // 点击预览的文件进行下载
     handlePreview(file) {
       // console.log(file);
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract/options/examinePage.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract/options/examinePage.vue
index 903a9395..5a3abce5 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract/options/examinePage.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract/options/examinePage.vue
@@ -6,7 +6,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="82px"
     >
       <el-form-item label="合同申请人" prop="applicant">
         <el-input
@@ -40,7 +39,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           icon="el-icon-plus"
@@ -71,7 +70,7 @@
           v-hasPermi="['build:appr:remove']"
           >删除</el-button
         >
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -156,7 +155,7 @@
             @click="viewInfo(scope.row)"
             >查看</el-button
           >
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -171,7 +170,7 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['build:appr:remove']"
             >删除</el-button
-          >
+          > -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract/options/subcontractPage.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract/options/subcontractPage.vue
index 43dc6873..8ef4ce90 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract/options/subcontractPage.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/contract/options/subcontractPage.vue
@@ -6,13 +6,8 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
-      <el-form-item
-        label="分包合同名称"
-        prop="subcontractName"
-        label-width="96px"
-      >
+      <el-form-item label="分包合同名称" prop="subcontractName">
         <el-input
           clearable
           size="small"
@@ -46,38 +41,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['build:subcontracts:add']"
-          >新增</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['build:subcontracts:edit']"
-          >修改</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['build:subcontracts:remove']"
-          >删除</el-button
-        >
-      </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -174,7 +137,7 @@
             @click="viewInfo(scope.row)"
             >查看</el-button
           >
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -189,7 +152,7 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['build:subcontracts:remove']"
             >删除</el-button
-          >
+          > -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/designChangeInformation.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/designChangeInformation.vue
index 2ed791b4..d8143db8 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/designChangeInformation.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/designChangeInformation.vue
@@ -6,15 +6,14 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="变更类型" prop="changeType">
         <el-select
           v-model="queryParams.data.changeType"
           placeholder="请选择变更类型"
           clearable
-          size="small"
           @change="handleQuery"
+          size="small"
         >
           <el-option
             v-for="dict in changeTypeOptions"
@@ -58,7 +57,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           icon="el-icon-plus"
@@ -89,19 +88,14 @@
           v-hasPermi="['build:change:remove']"
           >删除</el-button
         >
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
       ></right-toolbar>
     </el-row>
 
-    <el-table
-      v-loading="loading"
-      :data="changeList"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" align="center" fixed />
+    <el-table v-loading="loading" :data="changeList">
       <el-table-column
         label="序号"
         type="index"
@@ -190,7 +184,7 @@
             v-hasPermi="['build:change:view']"
             >查看</el-button
           >
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -205,7 +199,7 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['build:change:remove']"
             >删除</el-button
-          >
+          > -->
         </template>
       </el-table-column>
     </el-table>
@@ -521,7 +515,7 @@ export default {
         changeReason: null,
         changeContent: null,
         changeApplicant: null,
-        approvalStatus: "0",
+        approvalStatus: null,
         approvalTime: null,
         approvalOpinions: null,
         proCode: null,
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/firmInfo.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/firmInfo.vue
index 12ecb7e5..055496fe 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/firmInfo.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/firmInfo.vue
@@ -53,10 +53,10 @@
     <!-- 设计单位 -->
     <div class="listTitle">
       <span>设计单位</span>
-      <span class="addBtn" @click="handleAdd('0')">
+      <!-- <span class="addBtn" @click="handleAdd('0')">
         <i class="el-icon-plus"></i>
         添加
-      </span>
+      </span> -->
     </div>
     <el-table
       v-loading="loading"
@@ -90,6 +90,12 @@
         min-width="150"
       />
       <el-table-column
+        label="单位统一社会信用代码"
+        align="center"
+        prop="socialCreditCode"
+        min-width="150"
+      />
+      <!-- <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -97,13 +103,13 @@
         fixed="right"
       >
         <template slot-scope="scope">
-          <!-- <el-button
+          <el-button
             size="mini"
             type="text"
             icon="el-icon-view"
             @click="viewInfo(scope.row)"
             >查看</el-button
-          > -->
+          >
           <el-button
             size="mini"
             type="text"
@@ -121,16 +127,16 @@
             >删除</el-button
           >
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <!-- 施工单位 -->
     <div class="listTitle">
       <span>施工单位</span>
-      <span class="addBtn" @click="handleAdd('1')">
+      <!-- <span class="addBtn" @click="handleAdd('1')">
         <i class="el-icon-plus"></i>
         添加
-      </span>
+      </span> -->
     </div>
     <el-table
       v-loading="loading"
@@ -164,6 +170,13 @@
         min-width="150"
       />
       <el-table-column
+        label="单位统一社会信用代码"
+        align="center"
+        prop="socialCreditCode"
+        min-width="150"
+      />
+
+      <!-- <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -171,13 +184,13 @@
         fixed="right"
       >
         <template slot-scope="scope">
-          <!-- <el-button
+          <el-button
             size="mini"
             type="text"
             icon="el-icon-view"
             @click="viewInfo(scope.row)"
             >查看</el-button
-          > -->
+          >
           <el-button
             size="mini"
             type="text"
@@ -195,16 +208,16 @@
             >删除</el-button
           >
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <!-- 监理单位 -->
     <div class="listTitle">
       <span>监理单位</span>
-      <span class="addBtn" @click="handleAdd('2')">
+      <!-- <span class="addBtn" @click="handleAdd('2')">
         <i class="el-icon-plus"></i>
         添加
-      </span>
+      </span> -->
     </div>
     <el-table
       v-loading="loading"
@@ -238,6 +251,13 @@
         min-width="150"
       />
       <el-table-column
+        label="单位统一社会信用代码"
+        align="center"
+        prop="socialCreditCode"
+        min-width="150"
+      />
+
+      <!-- <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -245,13 +265,13 @@
         fixed="right"
       >
         <template slot-scope="scope">
-          <!-- <el-button
+          <el-button
             size="mini"
             type="text"
             icon="el-icon-view"
             @click="viewInfo(scope.row)"
             >查看</el-button
-          > -->
+          >
           <el-button
             size="mini"
             type="text"
@@ -269,16 +289,16 @@
             >删除</el-button
           >
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <!-- 其他单位 -->
     <div class="listTitle">
       <span>其他单位</span>
-      <span class="addBtn" @click="handleAdd('3')">
+      <!-- <span class="addBtn" @click="handleAdd('3')">
         <i class="el-icon-plus"></i>
         添加
-      </span>
+      </span> -->
     </div>
     <el-table
       v-loading="loading"
@@ -312,6 +332,13 @@
         min-width="150"
       />
       <el-table-column
+        label="单位统一社会信用代码"
+        align="center"
+        prop="socialCreditCode"
+        min-width="150"
+      />
+
+      <!-- <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -319,13 +346,13 @@
         fixed="right"
       >
         <template slot-scope="scope">
-          <!-- <el-button
+          <el-button
             size="mini"
             type="text"
             icon="el-icon-view"
             @click="viewInfo(scope.row)"
             >查看</el-button
-          > -->
+          >
           <el-button
             size="mini"
             type="text"
@@ -343,7 +370,7 @@
             >删除</el-button
           >
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <!-- 添加或修改单位信息对话框 -->
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/investment/index.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/investment/index.vue
index 60aa936c..2a96cfbf 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/investment/index.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/investment/index.vue
@@ -20,7 +20,7 @@
     <el-tabs
       v-model="activeName"
       @tab-click="handleClick"
-      style="margin-bottom: 20px"
+      style="height: 750px; margin-bottom: 20px"
     >
       <el-tab-pane label="资金下达" name="sourceFunds" :lazy="true">
         <sourceFunds
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/investment/options/index.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/investment/options/index.vue
index 30dff63c..5406d19b 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/investment/options/index.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/investment/options/index.vue
@@ -6,7 +6,7 @@
         v-for="(item, index) in routeList"
         :key="item + index"
         :to="routeList.length !== index + 1 ? { path: item.path } : undefined"
-        >{{ item.routeName }}</el-breadcrumb-item
+      >{{ item.routeName }}</el-breadcrumb-item
       >
     </el-breadcrumb>
 
@@ -17,9 +17,13 @@
     >
     </el-page-header>
 
-    <el-tabs v-model="activeName" @tab-click="handleClick">
+    <el-tabs
+      v-model="activeName"
+      @tab-click="handleClick"
+      style="height: 750px; margin-bottom: 20px"
+    >
       <el-tab-pane label="资金来源" name="sourceFunds">
-        <sourceFunds :formData="formData" ref="sourceFunds" />
+        <sourceFunds  :formData="formData" ref="sourceFunds" />
       </el-tab-pane>
 
       <el-tab-pane
@@ -29,12 +33,13 @@
       >
         <purposeFunds />
       </el-tab-pane>
+
     </el-tabs>
   </div>
 </template>
 <script>
-import sourceFunds from "@/views/evaluationEarlyWarning/earlyWarningManage/warning/options/investment/options/sourceFunds.vue";
-import purposeFunds from "@/views/evaluationEarlyWarning/earlyWarningManage/warning/options/investment/options/purposeFunds.vue";
+import sourceFunds from "@/views/building/investment/options/sourceFunds.vue";
+import purposeFunds from "@/views/building/investment/options/purposeFunds.vue";
 
 import {
   listFunds,
@@ -56,7 +61,7 @@ export default {
       activeName: "sourceFunds",
       routeList: [],
       formData: [],
-      form: {},
+      form:{},
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -66,7 +71,7 @@ export default {
           proCode: null,
           proNo: null,
         },
-      },
+      }
     };
   },
   created() {
@@ -78,8 +83,8 @@ export default {
       this.$router.back();
     },
     getList() {
-      this.queryParams.data.proNo = this.$route.query.proNo;
-      this.queryParams.data.proCode = this.$route.query.proCode;
+      this.queryParams.data.proNo= this.$route.query.proNo;
+      this.queryParams.data.proCode= this.$route.query.proCode;
       getSourceFundsList(this.queryParams).then((response) => {
         this.formData = response.records;
         console.log("this.formData", this.formData);
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/investment/options/purposeFunds.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/investment/options/purposeFunds.vue
index 146be219..eacad94a 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/investment/options/purposeFunds.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/investment/options/purposeFunds.vue
@@ -5,7 +5,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="合同名称" prop="projectName">
         <el-input
@@ -141,7 +140,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               label="操作"
               width="180"
               align="center"
@@ -165,7 +164,7 @@
                   >删除
                 </el-button>
               </template>
-            </el-table-column>
+            </el-table-column> -->
           </el-table>
         </template>
       </el-table-column>
@@ -225,7 +224,7 @@
         width="175"
       />
 
-      <el-table-column
+      <!-- <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -241,17 +240,9 @@
             v-hasPermi="['build:sourceFunds:pay']"
             >资金支付
           </el-button>
-          <!--          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['build:sourceFunds:remove']"
-          >删除
-          </el-button
-          >-->
+
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination
@@ -274,7 +265,7 @@
       :close-on-click-modal="false"
     >
       <el-row :gutter="15">
-        <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+        <el-form ref="form" :model="form" :rules="rules" label-width="138px">
           <el-col :span="12">
             <el-form-item label="支付条款" prop="paymentTerms">
               <el-input v-model="form.paymentTerms" placeholder="支付条款" />
@@ -337,6 +328,118 @@
               </el-input>
             </el-form-item>
           </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="本期中央应付金额" prop="centerPayableAmount">
+              <el-input
+                v-model="form.centerPayableAmount"
+                placeholder="请输入本期中央应付金额"
+              >
+                <template slot="append">万元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="本期中央实付金额" prop="centerPaidinAmount">
+              <el-input
+                v-model="form.centerPaidinAmount"
+                placeholder="请输入本期中央实付金额"
+              >
+                <template slot="append">万元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item
+              label="本期省级应付金额"
+              prop="provincialPayableAmount"
+            >
+              <el-input
+                v-model="form.provincialPayableAmount"
+                placeholder="请输入本期省级应付金额"
+              >
+                <template slot="append">万元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="本期省级实付金额"
+              prop="provincialPaidinAmount"
+            >
+              <el-input
+                v-model="form.provincialPaidinAmount"
+                placeholder="请输入本期省级实付金额"
+              >
+                <template slot="append">万元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="本期市级应付金额" prop="cityPayableAmount">
+              <el-input
+                v-model="form.cityPayableAmount"
+                placeholder="请输入本期市级应付金额"
+              >
+                <template slot="append">万元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="本期市级实付金额" prop="cityPaidinAmount">
+              <el-input
+                v-model="form.cityPaidinAmount"
+                placeholder="请输入本期市级实付金额"
+              >
+                <template slot="append">万元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="本期县级应付金额" prop="countyPayableAmount">
+              <el-input
+                v-model="form.countyPayableAmount"
+                placeholder="请输入本期县级应付金额"
+              >
+                <template slot="append">万元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="本期县级实付金额" prop="countyPaidinAmount">
+              <el-input
+                v-model="form.countyPaidinAmount"
+                placeholder="请输入本期县级实付金额"
+              >
+                <template slot="append">万元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="本期地方应付金额" prop="townshipPayableAmount">
+              <el-input
+                v-model="form.townshipPayableAmount"
+                placeholder="请输入本期地方应付金额"
+              >
+                <template slot="append">万元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="本期地方实付金额" prop="townshipPaidinAmount">
+              <el-input
+                v-model="form.townshipPaidinAmount"
+                placeholder="请输入本期地方实付金额"
+              >
+                <template slot="append">万元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="12">
             <el-form-item label="本期暂扣款" prop="temporaryWithholding">
               <el-input
@@ -347,6 +450,7 @@
               </el-input>
             </el-form-item>
           </el-col>
+
           <el-col :span="12">
             <el-form-item label="项目法人审核人" prop="auditor">
               <el-input
@@ -523,6 +627,55 @@ export default {
           },
         ],
         temporaryWithholding: [
+          { required: true, message: "请输入金额", trigger: "blur" },
+          {
+            pattern:
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
+            trigger: "blur",
+          },
+        ],
+
+        centerPayableAmount: [
+          { required: true, message: "请输入金额", trigger: "blur" },
+          {
+            pattern:
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
+            trigger: "blur",
+          },
+        ],
+        centerPaidinAmount: [
+          { required: true, message: "请输入金额", trigger: "blur" },
+          {
+            pattern:
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
+            trigger: "blur",
+          },
+        ],
+
+        provincialPayableAmount: [
+          { required: true, message: "请输入金额", trigger: "blur" },
+          {
+            pattern:
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
+            trigger: "blur",
+          },
+        ],
+        provincialPaidinAmount: [
+          { required: true, message: "请输入金额", trigger: "blur" },
+          {
+            pattern:
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
+            trigger: "blur",
+          },
+        ],
+
+        cityPayableAmount: [
+          { required: true, message: "请输入金额", trigger: "blur" },
           {
             pattern:
               /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
@@ -530,6 +683,55 @@ export default {
             trigger: "blur",
           },
         ],
+        cityPaidinAmount: [
+          { required: true, message: "请输入金额", trigger: "blur" },
+          {
+            pattern:
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
+            trigger: "blur",
+          },
+        ],
+
+        countyPayableAmount: [
+          { required: true, message: "请输入金额", trigger: "blur" },
+          {
+            pattern:
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
+            trigger: "blur",
+          },
+        ],
+        countyPaidinAmount: [
+          { required: true, message: "请输入金额", trigger: "blur" },
+          {
+            pattern:
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
+            trigger: "blur",
+          },
+        ],
+
+        townshipPayableAmount: [
+          { required: true, message: "请输入金额", trigger: "blur" },
+          {
+            pattern:
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
+            trigger: "blur",
+          },
+        ],
+
+        townshipPaidinAmount: [
+          { required: true, message: "请输入金额", trigger: "blur" },
+          {
+            pattern:
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
+            trigger: "blur",
+          },
+        ],
+
         auditor: [{ max: 255, message: "字符长度最大为255", trigger: "blur" }],
         agent: [{ max: 255, message: "字符长度最大为255", trigger: "blur" }],
       },
@@ -676,7 +878,6 @@ export default {
             updateFunds(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("修改成功");
-                this.getList();
                 this.open = false;
               }
             });
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/investment/options/sourceFunds.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/investment/options/sourceFunds.vue
index 79ff86d0..722d9a3b 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/investment/options/sourceFunds.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/investment/options/sourceFunds.vue
@@ -5,7 +5,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="下达日期" prop="releaseTime">
         <el-date-picker
@@ -29,7 +28,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           icon="el-icon-plus"
@@ -60,19 +59,14 @@
           v-hasPermi="['build:sourceFunds:remove']"
           >删除
         </el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
       ></right-toolbar>
     </el-row>
 
-    <el-table
-      v-loading="loading"
-      :data="subcontractsList"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" align="center" fixed />
+    <el-table v-loading="loading" :data="subcontractsList">
       <el-table-column
         label="序号"
         type="index"
@@ -285,7 +279,7 @@
         prop="townshipInvestments"
         min-width="230"
       />
-
+      <!-- 
       <el-table-column
         label="操作"
         align="center"
@@ -311,7 +305,7 @@
             >删除
           </el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/clockingIn.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/clockingIn.vue
index 5ca181d7..b02e8202 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/clockingIn.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/clockingIn.vue
@@ -5,12 +5,11 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
-      <el-form-item label="姓名" prop="name" label-width="40px">
+      <el-form-item label="姓名" prop="name">
         <el-input
           v-model="queryParams.data.name"
-          placeholder="请输入身份证号码"
+          placeholder="请输入姓名"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -31,7 +30,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           icon="el-icon-plus"
@@ -62,19 +61,15 @@
           v-hasPermi="['build:attendance:remove']"
           >删除</el-button
         >
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
       ></right-toolbar>
     </el-row>
 
-    <el-table
-      v-loading="loading"
-      :data="attendanceList"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" align="center" fixed />
+    <el-table v-loading="loading" :data="attendanceList">
+      <!-- <el-table-column type="selection" width="55" align="center" fixed /> -->
       <el-table-column
         label="序号"
         type="index"
@@ -124,7 +119,7 @@
         min-width="180"
       />
 
-      <el-table-column
+      <!-- <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -149,7 +144,7 @@
             >删除</el-button
           >
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/marginAccount.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/marginAccount.vue
index e857be6f..7301247d 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/marginAccount.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/marginAccount.vue
@@ -5,7 +5,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="收取方式" prop="incomeExpenditureMethods">
         <el-select
@@ -52,7 +51,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           icon="el-icon-plus"
@@ -83,19 +82,15 @@
           v-hasPermi="['build:ensure:remove']"
           >删除</el-button
         >
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
       ></right-toolbar>
     </el-row>
 
-    <el-table
-      v-loading="loading"
-      :data="ensureList"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" align="center" fixed />
+    <el-table v-loading="loading" :data="ensureList">
+      <!-- <el-table-column type="selection" width="55" align="center" fixed /> -->
       <el-table-column
         label="序号"
         type="index"
@@ -271,7 +266,7 @@
           <span>{{ parseTime(scope.row.incomeTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -296,7 +291,7 @@
             >删除</el-button
           >
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/payroll.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/payroll.vue
index 220ce7ff..06c7faeb 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/payroll.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/payroll.vue
@@ -5,7 +5,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <!-- <el-form-item label="银行账户" prop="bankAccount">
         <el-input
@@ -34,7 +33,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      <el-form-item label="务工人员姓名" prop="name" label-width="96px">
+      <el-form-item label="务工人员姓名" prop="name">
         <el-input
           v-model="queryParams.data.name"
           placeholder="请输入务工人员姓名"
@@ -106,7 +105,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           icon="el-icon-plus"
@@ -137,19 +136,15 @@
           v-hasPermi="['build:payable:remove']"
           >删除</el-button
         >
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
       ></right-toolbar>
     </el-row>
 
-    <el-table
-      v-loading="loading"
-      :data="payableList"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" align="center" fixed />
+    <el-table v-loading="loading" :data="payableList">
+      <!-- <el-table-column type="selection" width="55" align="center" fixed /> -->
       <el-table-column
         label="序号"
         type="index"
@@ -216,7 +211,7 @@
         prop="salaryPayableMethods"
         min-width="120"
       />
-      <el-table-column
+      <!-- <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -241,7 +236,7 @@
             >删除</el-button
           >
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/realNameSystem.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/realNameSystem.vue
index c2082b63..e4292a87 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/realNameSystem.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/realNameSystem.vue
@@ -5,7 +5,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <!-- <el-form-item
         label="所属单位统一社会信用代码"
@@ -29,7 +28,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      <el-form-item label="姓名" prop="name" label-width="40px">
+      <el-form-item label="姓名" prop="name">
         <el-input
           v-model="queryParams.data.name"
           placeholder="请输入姓名"
@@ -84,7 +83,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           icon="el-icon-plus"
@@ -115,19 +114,15 @@
           v-hasPermi="['build:realName:remove']"
           >删除</el-button
         >
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
       ></right-toolbar>
     </el-row>
 
-    <el-table
-      v-loading="loading"
-      :data="realNameList"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" align="center" fixed />
+    <el-table v-loading="loading" :data="realNameList">
+      <!-- <el-table-column type="selection" width="55" align="center" fixed /> -->
       <el-table-column
         label="序号"
         type="index"
@@ -182,7 +177,7 @@
         prop="nativePlace"
         min-width="120"
       />
-      <el-table-column
+      <!-- <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -207,7 +202,7 @@
             >删除</el-button
           >
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/preparationForConstruction.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/preparationForConstruction.vue
index feddd559..e8309e91 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/preparationForConstruction.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/preparationForConstruction.vue
@@ -3,10 +3,10 @@
   <div class="app-container">
     <div class="listTitle" style="border-left: 0">
       <span></span>
-      <span class="addBtn" @click="handleUpdate">
+      <!-- <span class="addBtn" @click="handleUpdate">
         <i class="el-icon-edit-outline"></i>
         编辑
-      </span>
+      </span> -->
     </div>
 
     <div class="listTitle">
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/projectAcceptance.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/projectAcceptance.vue
index 2eebb0fe..2e9278bd 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/projectAcceptance.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/projectAcceptance.vue
@@ -3,10 +3,10 @@
   <div class="app-container">
     <div class="listTitle" style="border-left: 0">
       <span></span>
-      <span class="addBtn" @click="handleUpdate">
+      <!-- <span class="addBtn" @click="handleUpdate">
         <i class="el-icon-edit-outline"></i>
         编辑
-      </span>
+      </span> -->
     </div>
 
     <div class="listTitle">
@@ -419,9 +419,7 @@
               class="upload-demo"
               action="thinking/common/upload"
               :headers="headers"
-                :before-upload="
-                    (file) => $fileBeforeUpload(file, 'fileList2')
-                  "
+               :before-upload="(file) => $fileBeforeUpload(file, 'fileList2')"
               :on-preview="handlePreview"
               :on-remove="handleRemove2"
               :before-remove="beforeRemove"
@@ -445,9 +443,7 @@
               class="upload-demo"
               action="thinking/common/upload"
               :headers="headers"
-                :before-upload="
-                    (file) => $fileBeforeUpload(file, 'fileList3')
-                  "
+               :before-upload="(file) => $fileBeforeUpload(file, 'fileList3')"
               :on-preview="handlePreview"
               :on-remove="handleRemove3"
               :before-remove="beforeRemove"
@@ -1052,7 +1048,6 @@ export default {
     };
   },
   created() {
-    console.log(77777, this.projectName);
     this.getList();
     this.getDicts("whether").then((response) => {
       this.whetherOptions = response.data;
@@ -1119,21 +1114,14 @@ export default {
       this.loading = true;
       this.projectAcceptanceMsg.projectName =
         this.projectName + "[" + this.proCode + "]";
-      this.projectAcceptanceMsg.projectLegal = this.projectLegalPerson;
-      // console.log(22222, this.projectAcceptanceMsg);
+
       this.queryParams.data.proNo = this.proNo;
       this.queryParams.data.proCode = this.proCode;
       listAcc(this.queryParams).then((response) => {
-        // this.projectAcceptanceMsg.projectName =
-        //   this.projectName + "[" + this.proCode + "]";
-        // this.projectAcceptanceMsg.projectLegal = this.projectLegalPerson;
+        this.projectAcceptanceMsg.projectName = this.projectName;
+        this.projectAcceptanceMsg.projectLegal = this.projectLegalPerson;
         if (response.records[0]) {
           this.projectAcceptanceMsg = response.records[0];
-          this.projectAcceptanceMsg.projectName =
-            this.projectAcceptanceMsg.projectName +
-            "[" +
-            this.projectAcceptanceMsg.proCode +
-            "]";
           // this.projectAcceptanceMsg.projectName = this.projectName;
           // this.projectAcceptanceMsg.projectLegal = this.projectLegalPerson;
           // console.log(8888888888888, this.projectLegalPerson);
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/projectLegalPersonEvaluation.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/projectLegalPersonEvaluation.vue
index da79abb6..0b4e5157 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/projectLegalPersonEvaluation.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/projectLegalPersonEvaluation.vue
@@ -5,7 +5,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="评价状态" prop="evaluateStatus">
         <el-select
@@ -48,7 +47,7 @@
           >新增</el-button
         >
       </el-col> -->
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           icon="el-icon-edit"
@@ -58,7 +57,7 @@
           v-hasPermi="['build:evaluate:edit']"
           >修改</el-button
         >
-      </el-col>
+      </el-col> -->
       <!-- <el-col :span="1.5">
         <el-button
           type="danger"
@@ -141,10 +140,12 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-view"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['build:evaluate:edit']"
-            >{{ scope.row.evaluateStatus == 0 ? "评价" : "修改" }}</el-button
+            >{{
+              scope.row.evaluateStatus == 0 ? "待评价" : "查看评价"
+            }}</el-button
           >
           <!-- <el-button
             size="mini"
@@ -286,6 +287,7 @@
                     扣
                     <!-- oninput="if ( value  > sub.children[0] ? sub.children[0].score:0)  value  = sub.children[0] ? sub.children[0].score:0; value = value .replace(/^0|[^0-9]/g,'')" -->
                     <el-input
+                      readonly
                       v-model.number="
                         evalForm.score[`${sub.ordered + '-' + 'S1'}`]
                       "
@@ -307,6 +309,7 @@
                   >
                     <!-- <span>空</span> -->
                     <el-input
+                      readonly
                       v-model="evalForm.reason[`${sub.ordered + '-' + 'R1'}`]"
                       placeholder="扣分原因"
                       style="width: 90%"
@@ -348,6 +351,7 @@
                       <!-- <span>空</span> -->
                       扣
                       <el-input
+                        readonly
                         v-model.number="
                           evalForm.score[
                             `${sub.ordered + '-' + 'S' + (index + 1)}`
@@ -371,6 +375,7 @@
                     >
                       <!-- <span>空</span> -->
                       <el-input
+                        readonly
                         v-model="
                           evalForm.reason[
                             `${sub.ordered + '-' + 'R' + (index + 1)}`
@@ -404,7 +409,41 @@
       </div>
 
       <el-divider content-position="left"> 成果及附件 </el-divider>
-      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+      <el-descriptions
+        class="margin-top"
+        :column="2"
+        border
+        :labelStyle="{
+          'text-align': 'left',
+          width: '300px',
+          height: '50px',
+        }"
+        :contentStyle="{ minWidth: '250px' }"
+      >
+        <el-descriptions-item span="2">
+          <template slot="label"> 阶段性交付成果 </template>
+          {{ this.form.stagedPaymentResults }}
+        </el-descriptions-item>
+        <el-descriptions-item span="2">
+          <template slot="label"> 附件 </template>
+          <template v-if="this.form.attachment">
+            <div
+              v-for="(item, index) in JSON.parse(this.form.attachment)"
+              :key="item + index"
+            >
+              {{ item.name }}
+
+              <i
+                class="el-icon-download"
+                @click="downloadFile2(item, index)"
+                style="cursor: pointer"
+              ></i>
+            </div>
+          </template>
+        </el-descriptions-item>
+      </el-descriptions>
+
+      <!-- <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="阶段性交付成果" prop="stagedPaymentResults">
           <el-input
             v-model="form.stagedPaymentResults"
@@ -416,7 +455,7 @@
             class="upload-demo"
             action="thinking/common/upload"
             :headers="headers"
-            :before-upload="(file) => $fileBeforeUpload(file, 'fileList')"
+             :before-upload="(file) => $fileBeforeUpload(file, 'fileList')"
             :on-preview="handlePreview"
             :on-remove="handleRemove"
             :before-remove="beforeRemove"
@@ -433,11 +472,12 @@
             </div>
           </el-upload>
         </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
+      </el-form> -->
+
+      <!-- <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
-      </div>
+      </div> -->
     </el-dialog>
 
     <!-- <div v-html="evalData[0].children[0].assessmentContent" style="white-space: pre-wrap;"></div> -->
@@ -633,7 +673,7 @@ export default {
           contractName: null,
           legalPerson: null,
           cycle: null,
-          evaluateStatus: "0",
+          evaluateStatus: null,
           remarks: null,
           createUid: null,
           updateUid: null,
@@ -689,7 +729,7 @@ export default {
         );
         this.totalScore = startScore;
         this.open = true;
-        this.title = "修改项目法人评价";
+        this.title = "查看项目法人评价";
       });
     },
     /** 提交按钮 */
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl.vue
index 0e3b7348..0e9820fe 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl.vue
@@ -6,7 +6,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="数源部门" prop="projectName">
         <el-input
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/EngineeringQualitySupervisionAndInspection.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/EngineeringQualitySupervisionAndInspection.vue
index f2838f38..e5e92236 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/EngineeringQualitySupervisionAndInspection.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/EngineeringQualitySupervisionAndInspection.vue
@@ -5,7 +5,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="检查单位" prop="inspectUnit">
         <el-input
@@ -48,7 +47,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           icon="el-icon-plus"
@@ -79,7 +78,7 @@
           v-hasPermi="['build:inspect:remove']"
           >删除</el-button
         >
-      </el-col>
+      </el-col> -->
 
       <right-toolbar
         :showSearch.sync="showSearch"
@@ -90,10 +89,8 @@
     <el-table
       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
         label="序号"
         type="index"
@@ -106,8 +103,8 @@
         label="检查内容"
         align="center"
         prop="inspectContent"
-        show-overflow-tooltip
         min-width="120"
+        show-overflow-tooltip
       />
       <el-table-column
         label="检查时间"
@@ -142,10 +139,10 @@
         label="整改落实情况"
         align="center"
         prop="rectificationContent"
-        show-overflow-tooltip
         min-width="120"
+        show-overflow-tooltip
       />
-      <el-table-column
+      <!-- <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -170,7 +167,7 @@
             >删除</el-button
           >
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/components/divAssess.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/components/divAssess.vue
index b8640b0a..ea50f77e 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/components/divAssess.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/components/divAssess.vue
@@ -50,7 +50,7 @@
         prop="divisionalAttachment"
       /> -->
 
-      <el-table-column
+      <!-- <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -74,7 +74,7 @@
             >删除</el-button
           >
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination
@@ -182,9 +182,7 @@
           <el-input
             v-model="form.majorCellRate"
             placeholder="请输入关键部位和重要隐藏单元优良率"
-          >
-            <template slot="append">%</template>
-          </el-input>
+          />
         </el-form-item>
         <el-form-item label="分部工程质量评定表" prop="divisionalAttachment">
           <el-input
@@ -259,36 +257,7 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-        unitName: [
-          {
-            required: true,
-            message: "请选择单位工程名称",
-            trigger: "blur",
-          },
-        ],
-        divisionalWork: [
-          {
-            required: true,
-            message: "请选择分部工程名称",
-            trigger: "blur",
-          },
-        ],
-        cellProjectRate: [
-          {
-            pattern: /^(([1-9]?\d(\.\d{1,2})?)|100|100.00)$/,
-            message: "请输入0-100数字,可保留两位小数",
-            trigger: "blur",
-          },
-        ],
-        majorCellRate: [
-          {
-            pattern: /^(([1-9]?\d(\.\d{1,2})?)|100|100.00)$/,
-            message: "请输入0-100数字,可保留两位小数",
-            trigger: "blur",
-          },
-        ],
-      },
+      rules: {},
       unitProjectOptions: [],
       divProjectOptions: [],
       divProjectOptionsStatus: true,
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/components/unitAssess.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/components/unitAssess.vue
index 16ce2065..92c361dd 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/components/unitAssess.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/components/unitAssess.vue
@@ -39,7 +39,7 @@
         min-width="120"
       />
 
-      <el-table-column
+      <!-- <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -63,7 +63,7 @@
             >删除</el-button
           >
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination
@@ -200,29 +200,7 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-        unitName: [
-          {
-            required: true,
-            message: "请选择单位工程名称",
-            trigger: "blur",
-          },
-        ],
-        majorDivisionalRate: [
-          {
-            pattern: /^(([1-9]?\d(\.\d{1,2})?)|100|100.00)$/,
-            message: "请输入0-100数字,可保留两位小数",
-            trigger: "blur",
-          },
-        ],
-        appearanceRate: [
-          {
-            pattern: /^(([1-9]?\d(\.\d{1,2})?)|100|100.00)$/,
-            message: "请输入0-100数字,可保留两位小数",
-            trigger: "blur",
-          },
-        ],
-      },
+      rules: {},
       unitProjectOptions: [],
     };
   },
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/components/viewReport.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/components/viewReport.vue
index 6031efcf..a7239d92 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/components/viewReport.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/components/viewReport.vue
@@ -78,7 +78,6 @@
       :close-on-click-modal="false"
     >
       <el-table v-loading="reportLoading" :data="reportDetailList">
-        <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" type="index" width="50" align="center" />
         <el-table-column
           label="检测报告名称"
@@ -143,7 +142,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column
+        <!-- <el-table-column
           label="操作"
           align="center"
           class-name="small-padding fixed-width"
@@ -167,7 +166,7 @@
               >删除</el-button
             >
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
       <pagination
         v-show="reportTotal > 0"
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/engineeringQualityEvaluation.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/engineeringQualityEvaluation.vue
index 3260920a..673352f8 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/engineeringQualityEvaluation.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/engineeringQualityEvaluation.vue
@@ -3,10 +3,10 @@
     <!-- ===============分部工程质量评定==================== -->
     <div class="listTitle">
       <span>分部工程质量评定</span>
-      <span class="addBtn" @click="openDivDiglog">
+      <!-- <span class="addBtn" @click="openDivDiglog">
         <i class="el-icon-plus"></i>
         新增
-      </span>
+      </span> -->
     </div>
     <divAssess
       ref="divAssess"
@@ -36,8 +36,12 @@
               label-width="124px"
               prop="isEvaluate"
             >
-              <el-radio v-model="form.isEvaluate" label="1">是</el-radio>
-              <el-radio v-model="form.isEvaluate" label="0">否</el-radio>
+              <el-radio v-model="form.isEvaluate" label="1" disabled
+                >是</el-radio
+              >
+              <el-radio v-model="form.isEvaluate" label="0" disabled
+                >否</el-radio
+              >
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -54,6 +58,7 @@
                 type="date"
                 value-format="yyyy-MM-dd"
                 placeholder="选择评定时间"
+                disabled
               >
               </el-date-picker>
             </el-form-item>
@@ -71,6 +76,7 @@
                 clearable
                 size="small"
                 style="width: 100%"
+                disabled
               >
                 <el-option
                   v-for="dict in qualityLevelOptions"
@@ -81,9 +87,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="24" style="text-align: right; margin-top: 10px">
-            <el-button type="primary" @click="submitForm">保存</el-button>
-          </el-col>
         </el-form>
       </el-row>
     </div>
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/engineeringQualityInspection.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/engineeringQualityInspection.vue
index adc62f13..412a05d3 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/engineeringQualityInspection.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/engineeringQualityInspection.vue
@@ -5,7 +5,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="申请时间" prop="applyTime">
         <el-date-picker
@@ -64,7 +63,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           icon="el-icon-plus"
@@ -73,7 +72,7 @@
           v-hasPermi="['build:supervision:add']"
           >新增质量监督申请</el-button
         >
-      </el-col>
+      </el-col> -->
       <!-- <el-col :span="1.5">
         <el-button
           type="success"
@@ -85,7 +84,7 @@
           >修改申请内容</el-button
         >
       </el-col> -->
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="danger"
           icon="el-icon-delete"
@@ -95,7 +94,7 @@
           v-hasPermi="['build:supervision:remove']"
           >删除</el-button
         >
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -149,8 +148,8 @@
         label="质监内容"
         align="center"
         prop="supervisionResult"
-        show-overflow-tooltip
         min-width="120"
+        show-overflow-tooltip
       />
       <el-table-column
         label="操作"
@@ -160,14 +159,14 @@
         fixed="right"
       >
         <template slot-scope="scope">
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdateReport(scope.row)"
             v-hasPermi="['build:supervision:upload']"
             >上传检测报告</el-button
-          >
+          > -->
           <el-button
             size="mini"
             type="text"
@@ -176,14 +175,14 @@
             v-hasPermi="['build:supervision:view']"
             >查看监督结果</el-button
           >
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['build:supervision:remove']"
             >删除</el-button
-          >
+          > -->
         </template>
       </el-table-column>
     </el-table>
@@ -1021,7 +1020,7 @@ export default {
     // 表格中下载
     downloadFile(scope, index) {
       console.log(scope);
-      let file = JSON.parse(scope.row.reportAttachment)[index];
+      let file = JSON.parse(scope.row.contractFile)[index];
       this.handlePreview(file);
     },
     // 查看信息中, 下载
@@ -1059,6 +1058,11 @@ export default {
   },
 };
 </script>
+<style lang="scss">
+.myTooltips {
+  max-width: 60vw;
+}
+</style>
 <style lang="scss" scoped>
 @import "@/assets/css/dialog.scss";
 ::v-deep {
@@ -1068,6 +1072,7 @@ export default {
     overflow-y: auto;
   }
 }
+
 .reportForm ::v-deep {
   .el-dialog {
     margin-top: 2vh !important;
@@ -1101,8 +1106,3 @@ export default {
   color: #36b29e;
 }
 </style>
-<style lang="scss">
-.myTooltips {
-  max-width: 60vw;
-}
-</style>
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/itemDivision/components/itemDivisionIdea.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/itemDivision/components/itemDivisionIdea.vue
index 06ee457d..2549447b 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/itemDivision/components/itemDivisionIdea.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/itemDivision/components/itemDivisionIdea.vue
@@ -1,37 +1,36 @@
 <template>
   <div>
-    <el-row>
-      <el-form ref="form" :model="form" :rules="rules" label-width="124px">
-        <el-col :span="24">
-          <el-form-item label="项目划分确认意见">
-            <el-upload
-              class="upload-demo"
-              action="thinking/common/upload"
-              :headers="headers"
-              :before-upload="(file) => $fileBeforeUpload(file, 'fileList')"
-              :on-preview="handlePreview"
-              :on-remove="handleRemove"
-              :before-remove="beforeRemove"
-              multiple
-              :on-success="submitUpload"
-              :file-list="fileList"
-            >
-              <el-button size="small" type="primary" plain>
-                <i class="el-icon-upload el-icon--right"></i>
-                点击上传
-              </el-button>
-              <div slot="tip" class="el-upload__tip">
-                支持jpg/png/pdf/word/excel文件等，不超过100M
-              </div>
-            </el-upload>
-          </el-form-item>
-        </el-col>
-      </el-form>
-    </el-row>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm">确 定</el-button>
-      <el-button @click="cancel">取 消</el-button>
-    </div>
+    <el-descriptions
+      class="margin-top"
+      :column="2"
+      border
+      :labelStyle="{
+        'text-align': 'left',
+        width: '300px',
+        height: '50px',
+      }"
+      :contentStyle="{ minWidth: '250px' }"
+    >
+      <el-descriptions-item span="2">
+        <template slot="label"> 项目划分确认意见 </template>
+        <template v-if="this.form.projectDivisionAttachment">
+          <div
+            v-for="(item, index) in JSON.parse(
+              this.form.projectDivisionAttachment
+            )"
+            :key="item + index"
+          >
+            {{ item.name }}
+
+            <i
+              class="el-icon-download"
+              @click="downloadFile2(item, index)"
+              style="cursor: pointer"
+            ></i>
+          </div>
+        </template>
+      </el-descriptions-item>
+    </el-descriptions>
   </div>
 </template>
 <script>
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/itemDivision/components/itemDivisionManage.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/itemDivision/components/itemDivisionManage.vue
index b31458fd..4a7ece80 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/itemDivision/components/itemDivisionManage.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/itemDivision/components/itemDivisionManage.vue
@@ -114,10 +114,11 @@
           <el-input v-model="form.owerDept" placeholder="请输入单位工程编号" />
         </el-form-item>
       </el-form> -->
-      <div slot="footer" class="dialog-footer">
+
+      <!-- <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
-      </div>
+      </div> -->
     </el-dialog>
   </div>
 </template>
@@ -241,7 +242,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加项目划分";
+      this.title = "查看项目划分";
     },
     // 取消按钮
     cancel() {
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/itemDivision/components/segmentProject.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/itemDivision/components/segmentProject.vue
index dd68a786..59a99caf 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/itemDivision/components/segmentProject.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/itemDivision/components/segmentProject.vue
@@ -1,139 +1,5 @@
 <template>
-  <div style="padding-bottom: 20px">
-    <div class="formBox">
-      <div class="dialog-footer">
-        <el-button @click="submitForm">保 存</el-button>
-      </div>
-
-      <el-form ref="form" :model="form" :rules="rules" label-width="180px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="单位工程名称" prop="unitProjectName">
-              <!-- <el-input
-                v-model="form.unitProjectName"
-                placeholder="请输入单位工程名称"
-              /> -->
-              <el-select
-                v-model="form.unitProjectName"
-                placeholder="请选择单位工程名称"
-                clearable
-                size="small"
-                style="width: 100%"
-              >
-                <el-option
-                  v-for="dict in unitProjectList"
-                  :key="dict.id"
-                  :label="dict.unitProjectName"
-                  :value="dict.unitProjectName"
-                  @click.native="chooseUnitProjectName(dict.id)"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="是否主要分部工程" prop="isMajor">
-              <!-- <el-input
-            v-model="form.isMajor"
-            placeholder="请选择是否主要分部工程"
-          /> -->
-              <el-select
-                v-model="form.isMajor"
-                placeholder="请选择是否主要分部工程"
-                clearable
-                size="small"
-                style="width: 100%"
-              >
-                <el-option
-                  v-for="dict in whetherOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="分部工程名称" prop="divisionalWork">
-              <el-input
-                v-model="form.divisionalWork"
-                placeholder="请输入分部工程名称"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="分部工程编号" prop="divisionalWorkCode">
-              <el-input
-                v-model="form.divisionalWorkCode"
-                placeholder="请输入分部工程编号"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="单元工程数量（个）" prop="unitNumber">
-              <el-input
-                v-model="form.unitNumber"
-                placeholder="请输入单元工程数量"
-              />
-            </el-form-item>
-          </el-col>
-          <!-- <el-col :span="12" style="height: 51px">
-            <div
-              style="
-                height: 46px;
-                display: flex;
-                justify-content: center;
-                align-items: center;
-              "
-            >
-              <el-button icon="el-icon-circle-plus-outline"
-                >新增重要单元</el-button
-              >
-            </div>
-          </el-col> -->
-        </el-row>
-        <!-- 表格头 -->
-        <!-- <el-row>
-          <el-col :span="8">
-            <div class="tableTitle">单元工程名称</div>
-          </el-col>
-          <el-col :span="8">
-            <div class="tableTitle">单元工程编号</div>
-          </el-col>
-          <el-col :span="4">
-            <div class="tableTitle">位置</div>
-          </el-col>
-          <el-col :span="4">
-            <div class="tableTitle">操作</div>
-          </el-col>
-        </el-row> -->
-        <!-- 列表项 -->
-        <!-- <el-row>
-          <el-col :span="8">
-
-            <el-input v-model="value" placeholder="请输入单元工程名称" />
-
-          </el-col>
-          <el-col :span="8">
-
-            <el-input v-model="value" placeholder="请输入单元工程编号" />
-          
-          </el-col>
-          <el-col :span="4">
-          
-            <el-input v-model="value" placeholder="请输入位置" />
-          
-          </el-col>
-          <el-col :span="4" style="text-align: center">
-            <el-button type="primary" plain>删除</el-button>
-          </el-col>
-        </el-row> -->
-
-        <!-- <el-form-item label="单位id" prop="unitId">
-          <el-input v-model="form.unitId" placeholder="请输入单位id" />
-        </el-form-item> -->
-      </el-form>
-    </div>
-
+  <div style="padding: 20px">
     <div class="listTitle" style="margin-top: 0">
       <span>分部工程划分</span>
     </div>
@@ -173,7 +39,7 @@
         prop="unitNumber"
       />
       <el-table-column label="单位id" align="center" prop="unitId" />
-      <el-table-column
+      <!-- <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -196,7 +62,7 @@
             >删除</el-button
           >
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination
@@ -375,7 +241,7 @@ export default {
         divisionalWorkCode: [
           { required: true, message: "请输入分部工程编号", trigger: "blur" },
           {
-            pattern: /[\\u4e00-\\u9fa5]$/,
+            pattern: /^[^\u4e00-\u9fa5]+$/,
             message: "编号不得出现中文",
             trigger: "blur",
           },
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/itemDivision/components/unitProject.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/itemDivision/components/unitProject.vue
index f1c809d2..2d1f81f6 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/itemDivision/components/unitProject.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/itemDivision/components/unitProject.vue
@@ -1,7 +1,7 @@
 <template>
-  <div style="padding-bottom: 20px">
+  <div style="padding: 20px">
     <!-- 添加单位工程 -->
-    <div class="formBox">
+    <!-- <div class="formBox">
       <el-form ref="form" :model="form" :rules="rules" label-width="180px">
         <el-form-item label="所属标段" prop="belongsSection">
           <el-input
@@ -26,7 +26,7 @@
       <div class="dialog-footer">
         <el-button @click="submitForm">保 存</el-button>
       </div>
-    </div>
+    </div> -->
 
     <div class="listTitle" style="margin-top: 0">
       <span>单位工程划分</span>
@@ -50,7 +50,7 @@
         align="center"
         prop="unitProjectCode"
       />
-      <el-table-column
+      <!-- <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -73,7 +73,7 @@
             >删除</el-button
           >
         </template>
-      </el-table-column>
+      </el-table-column> -->
 
       <!-- <el-table-column
         label="操作"
@@ -219,7 +219,7 @@ export default {
         unitProjectCode: [
           { required: true, message: "请输入单位工程编号", trigger: "blur" },
           {
-            pattern: /[\\u4e00-\\u9fa5]$/,
+            pattern: /^[^\u4e00-\u9fa5]+$/,
             message: "编号不得出现中文",
             trigger: "blur",
           },
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/itemDivision/index.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/itemDivision/index.vue
index eb2d8e55..2aef8811 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/itemDivision/index.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/itemDivision/index.vue
@@ -7,8 +7,8 @@
     <div class="listTitle">
       <span>项目划分管理</span>
       <span class="addBtn" @click="openDiglog">
-        <i class="el-icon-plus"></i>
-        划分内容
+        <i class="el-icon-view"></i>
+        查看划分内容
       </span>
     </div>
     <itemDivisionManage
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/responsibilitySystem.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/responsibilitySystem.vue
index d2b5bb89..46fc7b12 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/responsibilitySystem.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/responsibilitySystem.vue
@@ -9,212 +9,148 @@
     <div class="listTitle">
       <span>质量终身责任制落实</span>
     </div>
-    <el-form ref="form" :model="form" :rules="rules" label-width="250px">
-      <el-form-item
-        label="项目法人单位工程质量终身责任承诺书"
-        prop="enginerQualityAttachment"
-      >
-        <!-- <el-input
-          v-model="form.enginerQualityAttachment"
-          placeholder="请输入项目法人单位工程质量终身责任承诺书"
-        /> -->
-        <el-upload
-          class="upload-demo"
-          action="thinking/common/upload"
-          :headers="headers"
-          :before-upload="(file) => $fileBeforeUpload(file, 'fileList1')"
-          :on-preview="handlePreview"
-          :on-remove="handleRemove1"
-          :before-remove="beforeRemove"
-          multiple
-          :on-success="submitUpload1"
-          :file-list="fileList1"
-        >
-          <el-button size="small" type="primary" plain>
-            <i class="el-icon-upload el-icon--right"></i>
-            点击上传
-          </el-button>
-          <div slot="tip" class="el-upload__tip">
-            支持jpg/png/pdf/word/excel文件等，不超过100M
+    <el-descriptions
+      class="margin-top"
+      :column="2"
+      border
+      :labelStyle="{
+        'text-align': 'left',
+        width: '300px',
+        height: '50px',
+      }"
+      :contentStyle="{ minWidth: '250px' }"
+    >
+      <el-descriptions-item span="2">
+        <template slot="label"> 项目法人单位工程质量终身责任承诺书 </template>
+        <template v-if="this.form.enginerQualityAttachment">
+          <div
+            v-for="(item, index) in JSON.parse(
+              this.form.enginerQualityAttachment
+            )"
+            :key="item + index"
+          >
+            {{ item.name }}
+
+            <i
+              class="el-icon-download"
+              @click="downloadFile2(item, index)"
+              style="cursor: pointer"
+            ></i>
           </div>
-        </el-upload>
-      </el-form-item>
-      <el-form-item
-        label="设计单位工程质量终身责任承诺书"
-        prop="designUnitAttachment"
-      >
-        <!-- <el-input
-          v-model="form.designUnitAttachment"
-          placeholder="请输入设计单位工程质量终身责任承诺书"
-        /> -->
-        <el-upload
-          class="upload-demo"
-          action="thinking/common/upload"
-          :headers="headers"
-          :before-upload="(file) => $fileBeforeUpload(file, 'fileList2')"
-          :on-preview="handlePreview"
-          :on-remove="handleRemove2"
-          :before-remove="beforeRemove"
-          multiple
-          :on-success="submitUpload2"
-          :file-list="fileList2"
-        >
-          <el-button size="small" type="primary" plain>
-            <i class="el-icon-upload el-icon--right"></i>
-            点击上传
-          </el-button>
-          <div slot="tip" class="el-upload__tip">
-            支持jpg/png/pdf/word/excel文件等，不超过100M
+        </template>
+      </el-descriptions-item>
+      <el-descriptions-item span="2">
+        <template slot="label"> 设计单位工程质量终身责任承诺书 </template>
+        <template v-if="this.form.designUnitAttachment">
+          <div
+            v-for="(item, index) in JSON.parse(this.form.designUnitAttachment)"
+            :key="item + index"
+          >
+            {{ item.name }}
+
+            <i
+              class="el-icon-download"
+              @click="downloadFile2(item, index)"
+              style="cursor: pointer"
+            ></i>
           </div>
-        </el-upload>
-      </el-form-item>
-      <el-form-item
-        label="勘测单位工程质量终身责任承诺书"
-        prop="surveyUnitAttachment"
-      >
-        <!-- <el-input
-          v-model="form.surveyUnitAttachment"
-          placeholder="请输入勘测单位工程质量终身责任承诺书"
-        /> -->
-        <el-upload
-          class="upload-demo"
-          action="thinking/common/upload"
-          :headers="headers"
-          :before-upload="(file) => $fileBeforeUpload(file, 'fileList3')"
-          :on-preview="handlePreview"
-          :on-remove="handleRemove3"
-          :before-remove="beforeRemove"
-          multiple
-          :on-success="submitUpload3"
-          :file-list="fileList3"
-        >
-          <el-button size="small" type="primary" plain>
-            <i class="el-icon-upload el-icon--right"></i>
-            点击上传
-          </el-button>
-          <div slot="tip" class="el-upload__tip">
-            支持jpg/png/pdf/word/excel文件等，不超过100M
+        </template>
+      </el-descriptions-item>
+
+      <el-descriptions-item span="2">
+        <template slot="label"> 勘测单位工程质量终身责任承诺书 </template>
+        <template v-if="this.form.surveyUnitAttachment">
+          <div
+            v-for="(item, index) in JSON.parse(this.form.surveyUnitAttachment)"
+            :key="item + index"
+          >
+            {{ item.name }}
+
+            <i
+              class="el-icon-download"
+              @click="downloadFile2(item, index)"
+              style="cursor: pointer"
+            ></i>
           </div>
-        </el-upload>
-      </el-form-item>
-      <el-form-item
-        label="施工单位工程质量终身责任承诺书"
-        prop="constructionUnitAttachment"
-      >
-        <!-- <el-input
-          v-model="form.constructionUnitAttachment"
-          placeholder="请输入施工单位工程质量终身责任承诺书"
-        /> -->
-        <el-upload
-          class="upload-demo"
-          action="thinking/common/upload"
-          :headers="headers"
-          :before-upload="(file) => $fileBeforeUpload(file, 'fileList4')"
-          :on-preview="handlePreview"
-          :on-remove="handleRemove4"
-          :before-remove="beforeRemove"
-          multiple
-          :on-success="submitUpload4"
-          :file-list="fileList4"
-        >
-          <el-button size="small" type="primary" plain>
-            <i class="el-icon-upload el-icon--right"></i>
-            点击上传
-          </el-button>
-          <div slot="tip" class="el-upload__tip">
-            支持jpg/png/pdf/word/excel文件等，不超过100M
+        </template>
+      </el-descriptions-item>
+      <el-descriptions-item span="2">
+        <template slot="label"> 施工单位工程质量终身责任承诺书 </template>
+        <template v-if="this.form.constructionUnitAttachment">
+          <div
+            v-for="(item, index) in JSON.parse(
+              this.form.constructionUnitAttachment
+            )"
+            :key="item + index"
+          >
+            {{ item.name }}
+
+            <i
+              class="el-icon-download"
+              @click="downloadFile2(item, index)"
+              style="cursor: pointer"
+            ></i>
           </div>
-        </el-upload>
-      </el-form-item>
-      <el-form-item
-        label="监理单位工程质量终身责任承诺书"
-        prop="supervisionUnitAttachment"
-      >
-        <!-- <el-input
-          v-model="form.supervisionUnitAttachment"
-          placeholder="请输入监理单位工程质量终身责任承诺书"
-        /> -->
-        <el-upload
-          class="upload-demo"
-          action="thinking/common/upload"
-          :headers="headers"
-          :before-upload="(file) => $fileBeforeUpload(file, 'fileList5')"
-          :on-preview="handlePreview"
-          :on-remove="handleRemove5"
-          :before-remove="beforeRemove"
-          multiple
-          :on-success="submitUpload5"
-          :file-list="fileList5"
-        >
-          <el-button size="small" type="primary" plain>
-            <i class="el-icon-upload el-icon--right"></i>
-            点击上传
-          </el-button>
-          <div slot="tip" class="el-upload__tip">
-            支持jpg/png/pdf/word/excel文件等，不超过100M
+        </template>
+      </el-descriptions-item>
+      <el-descriptions-item span="2">
+        <template slot="label"> 监理单位工程质量终身责任承诺书 </template>
+        <template v-if="this.form.supervisionUnitAttachment">
+          <div
+            v-for="(item, index) in JSON.parse(
+              this.form.supervisionUnitAttachment
+            )"
+            :key="item + index"
+          >
+            {{ item.name }}
+
+            <i
+              class="el-icon-download"
+              @click="downloadFile2(item, index)"
+              style="cursor: pointer"
+            ></i>
           </div>
-        </el-upload>
-      </el-form-item>
-      <el-form-item
-        label="质量检测单位工程质量终身责任承诺书"
-        prop="inspectionUnitAttachment"
-      >
-        <!-- <el-input
-          v-model="form.inspectionUnitAttachment"
-          placeholder="请输入质量检测单位工程质量终身责任承诺书"
-        /> -->
-        <el-upload
-          class="upload-demo"
-          action="thinking/common/upload"
-          :headers="headers"
-          :before-upload="(file) => $fileBeforeUpload(file, 'fileList6')"
-          :on-preview="handlePreview"
-          :on-remove="handleRemove6"
-          :before-remove="beforeRemove"
-          multiple
-          :on-success="submitUpload6"
-          :file-list="fileList6"
-        >
-          <el-button size="small" type="primary" plain>
-            <i class="el-icon-upload el-icon--right"></i>
-            点击上传
-          </el-button>
-          <div slot="tip" class="el-upload__tip">
-            支持jpg/png/pdf/word/excel文件等，不超过100M
+        </template>
+      </el-descriptions-item>
+      <el-descriptions-item span="2">
+        <template slot="label"> 质量检测单位工程质量终身责任承诺书 </template>
+        <template v-if="this.form.inspectionUnitAttachment">
+          <div
+            v-for="(item, index) in JSON.parse(
+              this.form.inspectionUnitAttachment
+            )"
+            :key="item + index"
+          >
+            {{ item.name }}
+
+            <i
+              class="el-icon-download"
+              @click="downloadFile2(item, index)"
+              style="cursor: pointer"
+            ></i>
           </div>
-        </el-upload>
-      </el-form-item>
-      <el-form-item label="永久性责任标牌" prop="responsibilitySignAttachment">
-        <!-- <el-input
-          v-model="form.responsibilitySignAttachment"
-          placeholder="请输入永久性责任标牌"
-        /> -->
-        <el-upload
-          class="upload-demo"
-          action="thinking/common/upload"
-          :headers="headers"
-          :before-upload="(file) => $fileBeforeUpload(file, 'fileList7')"
-          :on-preview="handlePreview"
-          :on-remove="handleRemove7"
-          :before-remove="beforeRemove"
-          multiple
-          :on-success="submitUpload7"
-          :file-list="fileList7"
-        >
-          <el-button size="small" type="primary" plain>
-            <i class="el-icon-upload el-icon--right"></i>
-            点击上传
-          </el-button>
-          <div slot="tip" class="el-upload__tip">
-            支持jpg/png/pdf/word/excel文件等，不超过100M
+        </template>
+      </el-descriptions-item>
+      <el-descriptions-item span="2">
+        <template slot="label"> 永久性责任标牌 </template>
+        <template v-if="this.form.responsibilitySignAttachment">
+          <div
+            v-for="(item, index) in JSON.parse(
+              this.form.responsibilitySignAttachment
+            )"
+            :key="item + index"
+          >
+            {{ item.name }}
+
+            <i
+              class="el-icon-download"
+              @click="downloadFile2(item, index)"
+              style="cursor: pointer"
+            ></i>
           </div>
-        </el-upload>
-      </el-form-item>
-    </el-form>
-    <div class="dialog-footer">
-      <el-button type="primary" @click="submitForm">确 定</el-button>
-      <el-button @click="cancel">取 消</el-button>
-    </div>
+        </template>
+      </el-descriptions-item>
+    </el-descriptions>
   </div>
 </template>
 <script>
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/safetyRecord.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/safetyRecord.vue
index 4563e18a..c57d4ebe 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/safetyRecord.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/qualityControl/options/safetyRecord.vue
@@ -2,10 +2,10 @@
   <div class="app-container">
     <div class="listTitle">
       <span>整体措施方案</span>
-      <span class="addBtn" @click="handleAdd(1)">
+      <!-- <span class="addBtn" @click="handleAdd(1)">
         <i class="el-icon-plus"></i>
         添加
-      </span>
+      </span> -->
     </div>
     <el-table v-loading="loading" :data="filingsList1">
       <el-table-column label="序号" type="index" width="50" align="center" />
@@ -52,7 +52,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column
+      <!-- <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -77,15 +77,15 @@
             >删除</el-button
           >
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <div class="listTitle">
       <span>度汛方案</span>
-      <span class="addBtn" @click="handleAdd(2)">
+      <!-- <span class="addBtn" @click="handleAdd(2)">
         <i class="el-icon-plus"></i>
         添加
-      </span>
+      </span> -->
     </div>
     <el-table v-loading="loading" :data="filingsList2">
       <el-table-column label="序号" type="index" width="50" align="center" />
@@ -166,7 +166,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column
+      <!-- <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -191,7 +191,7 @@
             >删除</el-button
           >
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <!-- <pagination
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/scheduleManagement.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/scheduleManagement.vue
index 35906d42..e5b8ef32 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/scheduleManagement.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/scheduleManagement.vue
@@ -6,9 +6,8 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
-      <el-form-item label="月度" prop="monthly" label-width="40px">
+      <el-form-item label="月度" prop="monthly">
         <el-date-picker
           v-model="queryParams.data.monthly"
           type="month"
@@ -17,7 +16,7 @@
           placeholder="请选择月度"
           clearable
           size="small"
-          @keyup.enter.native="handleQuery"
+          @change="handleQuery"
         />
       </el-form-item>
 
@@ -40,13 +39,13 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button
+        <!-- <el-button
           type="cyan"
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
           >搜索</el-button
-        >
+        > -->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
           >重置</el-button
         >
@@ -64,7 +63,8 @@
           >新增</el-button
         >
       </el-col> -->
-      <el-col :span="1.5">
+
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           icon="el-icon-edit"
@@ -85,19 +85,15 @@
           v-hasPermi="['build:progress:remove']"
           >删除</el-button
         >
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
       ></right-toolbar>
     </el-row>
 
-    <el-table
-      v-loading="loading"
-      :data="progressList"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" align="center" fixed />
+    <el-table v-loading="loading" :data="progressList">
+      <!-- <el-table-column type="selection" width="55" align="center" fixed /> -->
       <el-table-column
         label="序号"
         type="index"
@@ -211,7 +207,7 @@
             v-hasPermi="['build:progress:view']"
             >查看</el-button
           >
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -226,7 +222,7 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['build:progress:remove']"
             >删除</el-button
-          >
+          > -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/supervisionAndManagement/index.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/supervisionAndManagement/index.vue
index bd568162..2a728b37 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/supervisionAndManagement/index.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/supervisionAndManagement/index.vue
@@ -8,10 +8,10 @@
     <!-- 会议纪要 -->
     <div class="listTitle">
       <span>会议纪要</span>
-      <span class="addBtn" @click="openDiglog">
+      <!-- <span class="addBtn" @click="openDiglog">
         <i class="el-icon-plus"></i>
         添加
-      </span>
+      </span> -->
     </div>
     <record ref="record" :proNo="proNo" :proCode="proCode" />
   </div>
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/supervisionAndManagement/options/record.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/supervisionAndManagement/options/record.vue
index 80417876..db1e7115 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/supervisionAndManagement/options/record.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/supervisionAndManagement/options/record.vue
@@ -1,12 +1,7 @@
 <template>
   <!--  会议-->
   <div class="app-container">
-    <el-table
-      v-loading="loading"
-      :data="recordList"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table v-loading="loading" :data="recordList">
       <el-table-column label="序号" type="index" width="50" align="center" />
       <el-table-column
         label="项目编码"
@@ -81,7 +76,7 @@
             v-hasPermi="['build:record:view']"
             >查看</el-button
           >
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -96,7 +91,7 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['build:record:remove']"
             >删除</el-button
-          >
+          > -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/supervisionAndManagement/options/supervision.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/supervisionAndManagement/options/supervision.vue
index a66ab1d0..beaa4139 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/supervisionAndManagement/options/supervision.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/supervisionAndManagement/options/supervision.vue
@@ -5,6 +5,7 @@
         <el-input
           v-model="form.constructionControlUnit"
           placeholder="请输入监理单位"
+          readonly
         />
       </el-form-item>
       <el-form-item label="监理人员" prop="supervisionPersonnel">
@@ -29,10 +30,10 @@
         />
       </el-form-item>
     </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm">保 存</el-button>
-      <!-- <el-button @click="cancel">取 消</el-button> -->
-    </div>
+    <!-- <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="cancel">取 消</el-button>
+    </div> -->
   </div>
 </template>
 
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/warnMsg/index.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/warnMsg/index.vue
index b0c8c102..cc7cec31 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/warnMsg/index.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/warnMsg/index.vue
@@ -29,12 +29,18 @@
         min-width="120"
       />
       <el-table-column
-        label="预警状态"
+        label="处置状态"
         align="center"
         prop="resultType"
         :formatter="resultTypeFormat"
         min-width="120"
       />
+      <el-table-column
+        label="预警状态（字段还没有）"
+        align="center"
+        prop="111"
+        min-width="120"
+      />
       <el-table-column
         label="流程节点"
         align="center"
@@ -311,7 +317,7 @@
       width="1000px"
       append-to-body
       :close-on-click-modal="false"
-      @close="close"
+      @close="close('warn')"
     >
       <el-form
         ref="warnForm"
@@ -385,7 +391,7 @@
       width="1000px"
       append-to-body
       :close-on-click-modal="false"
-      @close="close"
+      @close="close('examine')"
     >
       <el-descriptions
         class="margin-top"
@@ -478,6 +484,8 @@
             v-model="remark"
             placeholder="请输入不通过意见"
             type="textarea"
+            maxlength="250"
+            show-word-limit
             style="margin-bottom: 10px"
           ></el-input>
           <div style="text-align: right; margin: 0">
@@ -614,6 +622,7 @@ export default {
             message: "请输入经办人",
             trigger: "blur",
           },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         handlePhone: [
           {
@@ -638,6 +647,7 @@ export default {
             message: "请输入审核人",
             trigger: "blur",
           },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         checkPhone: [
           {
@@ -678,42 +688,48 @@ export default {
     });
   },
   methods: {
-    close() {
-      // this.warnForm = {
-      //   createUid: null,
-      //   updateUid: null,
-      //   proCode: null,
-      //   proNo: null,
-      //   owerDept: null,
-      //   resultId: null,
-      //   handleUser: null,
-      //   checkUser: null,
-      //   opinion: null,
-      //   handlePhone: null,
-      //   checkPhone: null,
-      //   attachment: null,
-      // };
-      // this.examineForm = {
-      //   createUid: null,
-      //   updateUid: null,
-      //   proCode: null,
-      //   proNo: null,
-      //   owerDept: null,
-      //   resultId: null,
-      //   handleUser: null,
-      //   checkUser: null,
-      //   opinion: null,
-      //   handlePhone: null,
-      //   checkPhone: null,
-      //   attachment: null,
-      // };
-      // this.resetForm("warnForm");
-      // this.resetForm("examineForm");
+    close(type) {
+      if (type === "warn") {
+        this.warnForm = {
+          createUid: null,
+          updateUid: null,
+          proCode: null,
+          proNo: null,
+          owerDept: null,
+          resultId: null,
+          handleUser: null,
+          checkUser: null,
+          opinion: null,
+          handlePhone: null,
+          checkPhone: null,
+          attachment: null,
+        };
+        this.resetForm("warnForm");
+      } else if (type === "examine") {
+        this.examineForm = {
+          createUid: null,
+          updateUid: null,
+          proCode: null,
+          proNo: null,
+          owerDept: null,
+          resultId: null,
+          handleUser: null,
+          checkUser: null,
+          opinion: null,
+          handlePhone: null,
+          checkPhone: null,
+          attachment: null,
+        };
+
+        this.resetForm("examineForm");
+      }
     },
     dealWarn() {
+      this.getWarnData();
       this.warnOpen = true;
     },
     examineWarn() {
+      this.getWarnData();
       this.examineOpen = true;
     },
     getWarnData(id) {
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/projectBrief/index.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/projectBrief/index.vue
index 808ef3ba..287eba21 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/projectBrief/index.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/projectBrief/index.vue
@@ -16,7 +16,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="项目名称" prop="projectName">
         <el-input
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/regulatoryInspection/editPart.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/regulatoryInspection/editPart.vue
index 462c6130..f42ac0ba 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/regulatoryInspection/editPart.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/regulatoryInspection/editPart.vue
@@ -187,7 +187,7 @@
         </el-form-item>
       </el-form>
       <responsibleUnit
-        v-if="open"
+        v-if="open && form.id"
         :isAdd="isAdd"
         :inspectionId="inspectionId"
         :rectificationId="form.id"
@@ -286,7 +286,14 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        issuingUnit: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        documentNumber: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+      },
       // 请求头
       headers: {
         jianwei: "jwtech " + getToken(),
@@ -309,6 +316,7 @@ export default {
       this.queryParams.data.inspectionId = this.inspectionId;
       listRectification(this.queryParams).then((response) => {
         this.rectificationList = response.records;
+        console.log("this.rectificationList", this.rectificationList);
         this.total = response.total;
         this.loading = false;
       });
@@ -323,7 +331,7 @@ export default {
     },
     unitArrayFormat(row) {
       let res = "";
-      row.unitArray.forEach((item) => {
+      row.unitArray?.forEach((item) => {
         // this.unitOptions.forEach((sub) => {
         //   if (item === sub.enterpriseName) {
         res = res + item + "、";
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/regulatoryInspection/index.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/regulatoryInspection/index.vue
index 41211945..9559b669 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/regulatoryInspection/index.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/regulatoryInspection/index.vue
@@ -14,7 +14,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="项目名称" prop="projectName">
         <el-input
@@ -33,11 +32,7 @@
           ></el-button>
         </el-input>
       </el-form-item>
-      <el-form-item
-        label="监督检查类型"
-        prop="inspectionTypes"
-        label-width="96px"
-      >
+      <el-form-item label="监督检查类型" prop="inspectionTypes">
         <el-select
           v-model="queryParams.data.inspectionTypes"
           placeholder="请选择监督检查类型"
@@ -549,6 +544,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        inspectionPerson: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
         projectName: [
           {
             required: true,
diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/regulatoryInspection/responsibleUnit.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/regulatoryInspection/responsibleUnit.vue
index 01efdffe..4f0f8f5a 100644
--- a/jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/regulatoryInspection/responsibleUnit.vue
+++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/regulatoryInspection/responsibleUnit.vue
@@ -332,7 +332,11 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        rectificationSituation: [
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
+        ],
+      },
       // 请求头
       headers: {
         jianwei: "jwtech " + getToken(),
diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/index.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/index.vue
index ea2255b2..a09027be 100644
--- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/index.vue
+++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/index.vue
@@ -14,7 +14,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="企业名称" prop="enterpriseName">
         <el-input
diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/performanceRecord.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/performanceRecord.vue
index 609ba257..68017d1c 100644
--- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/performanceRecord.vue
+++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/performanceRecord.vue
@@ -5,7 +5,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="项目名称" prop="projectName">
         <el-input
diff --git a/jwtech-admin-page/src/views/project/proposal/index.vue b/jwtech-admin-page/src/views/project/proposal/index.vue
index 2880349a..faef298c 100644
--- a/jwtech-admin-page/src/views/project/proposal/index.vue
+++ b/jwtech-admin-page/src/views/project/proposal/index.vue
@@ -448,6 +448,7 @@
                 value-format="yyyy-MM-dd"
                 placeholder="选择上报日期"
                 style="width: 100%"
+                :picker-options="pickerOptions"
               >
               </el-date-picker>
             </el-form-item>
@@ -462,6 +463,7 @@
                 value-format="yyyy-MM-dd"
                 placeholder="选择审批日期"
                 style="width: 100%"
+                :picker-options="pickerOptions"
               >
               </el-date-picker>
             </el-form-item>
@@ -688,6 +690,12 @@ import { regionData, codeToText, TextToCode } from "element-china-area-data";
 export default {
   data() {
     return {
+      // 禁选当前时间之后的时间
+      pickerOptions: {
+        disabledDate: (time) => {
+          return time.getTime() > new Date().getTime();
+        },
+      },
       areasOptionProps: {
         emitPath: false,
         checkStrictly: true, //选择任意一级
@@ -719,6 +727,18 @@ export default {
       projectinfoList: [],
       // 表单校验
       rules: {
+        reportTime: [
+          {
+            trigger: "blur",
+            validator: this.compareTime,
+          },
+        ],
+        approvalTime: [
+          {
+            trigger: "blur",
+            validator: this.compareTime,
+          },
+        ],
         isBelongPlanning: [
           {
             required: true,
@@ -827,6 +847,21 @@ export default {
     });
   },
   methods: {
+    compareTime(rule, value, callback) {
+      if (this.form.reportTime && this.form.approvalTime) {
+        //  dateStr = dateStr.substring(0,19);
+        let dateStr1 = this.form.reportTime.replace(/-/g, "/");
+        let dateStr2 = this.form.approvalTime.replace(/-/g, "/");
+        let timeTamp1 = new Date(dateStr1).getTime();
+        let timeTamp2 = new Date(dateStr2).getTime();
+        // console.log(1111, timeTamp1, timeTamp2);
+        if (timeTamp1 <= timeTamp2) {
+          callback();
+        } else {
+          callback(new Error("上报时间不能晚于审批时间"));
+        }
+      }
+    },
     formatAdcd(row) {
       if (row.adcd) {
         let provinceCode = row.adcd.slice(0, 2);
diff --git a/jwtech-admin-page/src/views/project/special/options/ContractPage.vue b/jwtech-admin-page/src/views/project/special/options/ContractPage.vue
index 0d8bc68d..7a29720d 100644
--- a/jwtech-admin-page/src/views/project/special/options/ContractPage.vue
+++ b/jwtech-admin-page/src/views/project/special/options/ContractPage.vue
@@ -5,7 +5,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="合同名称" prop="contractName">
         <el-input
diff --git a/jwtech-admin-page/src/views/project/special/options/ImplementationPage.vue b/jwtech-admin-page/src/views/project/special/options/ImplementationPage.vue
index a11ef908..f200882a 100644
--- a/jwtech-admin-page/src/views/project/special/options/ImplementationPage.vue
+++ b/jwtech-admin-page/src/views/project/special/options/ImplementationPage.vue
@@ -5,7 +5,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="规划名称" prop="planningName">
         <el-input
@@ -477,7 +476,7 @@ export default {
       rules: {
         projectName: [
           { required: true, message: "请输入规划名称", trigger: "blur" },
-          {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         projectStartTime: [
           { required: true, message: "选择项目开始时间", trigger: "blur" },
@@ -487,10 +486,10 @@ export default {
         ],
         projectLeader: [
           { required: true, message: "请输入项目负责人", trigger: "blur" },
-          {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         projectProgressArrange: [
-          {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
       },
       // 是否到位字典
diff --git a/jwtech-admin-page/src/views/project/special/options/documentPage.vue b/jwtech-admin-page/src/views/project/special/options/documentPage.vue
index 3d87640d..ffa00fd5 100644
--- a/jwtech-admin-page/src/views/project/special/options/documentPage.vue
+++ b/jwtech-admin-page/src/views/project/special/options/documentPage.vue
@@ -23,7 +23,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="文档名称" prop="documentName">
         <el-input
diff --git a/jwtech-admin-page/src/views/project/special/options/resultsPage.vue b/jwtech-admin-page/src/views/project/special/options/resultsPage.vue
index af589116..e5fd7b9d 100644
--- a/jwtech-admin-page/src/views/project/special/options/resultsPage.vue
+++ b/jwtech-admin-page/src/views/project/special/options/resultsPage.vue
@@ -6,7 +6,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="规划名称" prop="evaluationName">
         <el-input
diff --git a/jwtech-admin-page/src/views/project/special/options/taskPage.vue b/jwtech-admin-page/src/views/project/special/options/taskPage.vue
index 5e79d03f..95648afa 100644
--- a/jwtech-admin-page/src/views/project/special/options/taskPage.vue
+++ b/jwtech-admin-page/src/views/project/special/options/taskPage.vue
@@ -6,7 +6,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="规划名称" prop="projectName">
         <el-input
diff --git a/jwtech-admin-page/src/views/projectStatistics/projectProcess/contract.vue b/jwtech-admin-page/src/views/projectStatistics/projectProcess/contract.vue
index bda7e42e..c2a30854 100644
--- a/jwtech-admin-page/src/views/projectStatistics/projectProcess/contract.vue
+++ b/jwtech-admin-page/src/views/projectStatistics/projectProcess/contract.vue
@@ -6,7 +6,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <!-- <el-form-item label="合同编号" prop="contractNumber">
         <el-input
diff --git a/jwtech-admin-page/src/views/projectStatistics/projectProcess/contract/options/basePage.vue b/jwtech-admin-page/src/views/projectStatistics/projectProcess/contract/options/basePage.vue
index 6eb89e7b..693c162e 100644
--- a/jwtech-admin-page/src/views/projectStatistics/projectProcess/contract/options/basePage.vue
+++ b/jwtech-admin-page/src/views/projectStatistics/projectProcess/contract/options/basePage.vue
@@ -304,6 +304,11 @@ export default {
       // 删除文件
       this.contractFileList.splice(index, 1);
     },
+    // 查看信息中, 下载
+    downloadFile2(info, index) {
+      console.log(info);
+      this.handlePreview(info);
+    },
     // 点击预览的文件进行下载
     handlePreview(file) {
       // console.log(file);
diff --git a/jwtech-admin-page/src/views/projectStatistics/projectProcess/designChangeInformation.vue b/jwtech-admin-page/src/views/projectStatistics/projectProcess/designChangeInformation.vue
index 09fc1419..d8143db8 100644
--- a/jwtech-admin-page/src/views/projectStatistics/projectProcess/designChangeInformation.vue
+++ b/jwtech-admin-page/src/views/projectStatistics/projectProcess/designChangeInformation.vue
@@ -6,7 +6,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="变更类型" prop="changeType">
         <el-select
@@ -516,7 +515,7 @@ export default {
         changeReason: null,
         changeContent: null,
         changeApplicant: null,
-        approvalStatus: "0",
+        approvalStatus: null,
         approvalTime: null,
         approvalOpinions: null,
         proCode: null,
@@ -541,7 +540,7 @@ export default {
           changeReason: null,
           changeContent: null,
           changeApplicant: null,
-          approvalStatus: "0",
+          approvalStatus: null,
           approvalTime: null,
           approvalOpinions: null,
           proCode: null,
diff --git a/jwtech-admin-page/src/views/projectStatistics/projectProcess/peasantWorkerSystem/options/clockingIn.vue b/jwtech-admin-page/src/views/projectStatistics/projectProcess/peasantWorkerSystem/options/clockingIn.vue
index b6f4e8a6..b02e8202 100644
--- a/jwtech-admin-page/src/views/projectStatistics/projectProcess/peasantWorkerSystem/options/clockingIn.vue
+++ b/jwtech-admin-page/src/views/projectStatistics/projectProcess/peasantWorkerSystem/options/clockingIn.vue
@@ -9,7 +9,7 @@
       <el-form-item label="姓名" prop="name">
         <el-input
           v-model="queryParams.data.name"
-          placeholder="请输入身份证号码"
+          placeholder="请输入姓名"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
diff --git a/jwtech-admin-page/src/views/projectStatistics/projectProcess/projectLegalPersonEvaluation.vue b/jwtech-admin-page/src/views/projectStatistics/projectProcess/projectLegalPersonEvaluation.vue
index 0c93822a..0b4e5157 100644
--- a/jwtech-admin-page/src/views/projectStatistics/projectProcess/projectLegalPersonEvaluation.vue
+++ b/jwtech-admin-page/src/views/projectStatistics/projectProcess/projectLegalPersonEvaluation.vue
@@ -5,7 +5,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="评价状态" prop="evaluateStatus">
         <el-select
@@ -674,7 +673,7 @@ export default {
           contractName: null,
           legalPerson: null,
           cycle: null,
-          evaluateStatus: "0",
+          evaluateStatus: null,
           remarks: null,
           createUid: null,
           updateUid: null,
@@ -730,7 +729,7 @@ export default {
         );
         this.totalScore = startScore;
         this.open = true;
-        this.title = "修改项目法人评价";
+        this.title = "查看项目法人评价";
       });
     },
     /** 提交按钮 */
diff --git a/jwtech-admin-page/src/views/projectStatistics/projectProcess/qualityControl.vue b/jwtech-admin-page/src/views/projectStatistics/projectProcess/qualityControl.vue
index 0e3b7348..0e9820fe 100644
--- a/jwtech-admin-page/src/views/projectStatistics/projectProcess/qualityControl.vue
+++ b/jwtech-admin-page/src/views/projectStatistics/projectProcess/qualityControl.vue
@@ -6,7 +6,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="数源部门" prop="projectName">
         <el-input
diff --git a/jwtech-admin-page/src/views/projectStatistics/projectProcess/qualityControl/options/engineeringQualityInspection.vue b/jwtech-admin-page/src/views/projectStatistics/projectProcess/qualityControl/options/engineeringQualityInspection.vue
index 09ddfdba..7d8efbdd 100644
--- a/jwtech-admin-page/src/views/projectStatistics/projectProcess/qualityControl/options/engineeringQualityInspection.vue
+++ b/jwtech-admin-page/src/views/projectStatistics/projectProcess/qualityControl/options/engineeringQualityInspection.vue
@@ -11,10 +11,11 @@
           clearable
           size="small"
           style="width: 100%"
-          v-model="queryParams.applyTime"
+          v-model="queryParams.data.applyTime"
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="选择申请时间"
+          @change="handleQuery"
         >
         </el-date-picker>
       </el-form-item>
@@ -636,7 +637,7 @@ export default {
           // 按哪个字段排序
           orderBy: "create_time",
           // desc降序，升序asc
-          sort: "desc",
+          sortBy: "desc",
         },
       },
       // 查询参数
@@ -661,7 +662,7 @@ export default {
           // 按哪个字段排序
           orderBy: "create_time",
           // desc降序，升序asc
-          sort: "desc",
+          sortBy: "desc",
         },
       },
       // 表单参数
@@ -835,6 +836,13 @@ export default {
           proCode: null,
           proNo: null,
         },
+        // 排序方式
+        params: {
+          // 按哪个字段排序
+          orderBy: "create_time",
+          // desc降序，升序asc
+          sortBy: "desc",
+        },
       };
       this.resetForm("form");
     },
diff --git a/jwtech-admin-page/src/views/projectStatistics/projectProcess/qualityControl/options/itemDivision/components/itemDivisionManage.vue b/jwtech-admin-page/src/views/projectStatistics/projectProcess/qualityControl/options/itemDivision/components/itemDivisionManage.vue
index e04e6440..4a7ece80 100644
--- a/jwtech-admin-page/src/views/projectStatistics/projectProcess/qualityControl/options/itemDivision/components/itemDivisionManage.vue
+++ b/jwtech-admin-page/src/views/projectStatistics/projectProcess/qualityControl/options/itemDivision/components/itemDivisionManage.vue
@@ -242,7 +242,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加项目划分";
+      this.title = "查看项目划分";
     },
     // 取消按钮
     cancel() {
diff --git a/jwtech-admin-page/src/views/projectStatistics/projectProcess/qualityControl/options/itemDivision/components/segmentProject.vue b/jwtech-admin-page/src/views/projectStatistics/projectProcess/qualityControl/options/itemDivision/components/segmentProject.vue
index aca0b9e8..59a99caf 100644
--- a/jwtech-admin-page/src/views/projectStatistics/projectProcess/qualityControl/options/itemDivision/components/segmentProject.vue
+++ b/jwtech-admin-page/src/views/projectStatistics/projectProcess/qualityControl/options/itemDivision/components/segmentProject.vue
@@ -241,7 +241,7 @@ export default {
         divisionalWorkCode: [
           { required: true, message: "请输入分部工程编号", trigger: "blur" },
           {
-            pattern: /[\\u4e00-\\u9fa5]$/,
+            pattern: /^[^\u4e00-\u9fa5]+$/,
             message: "编号不得出现中文",
             trigger: "blur",
           },
diff --git a/jwtech-admin-page/src/views/projectStatistics/projectProcess/qualityControl/options/itemDivision/components/unitProject.vue b/jwtech-admin-page/src/views/projectStatistics/projectProcess/qualityControl/options/itemDivision/components/unitProject.vue
index 28656f30..2d1f81f6 100644
--- a/jwtech-admin-page/src/views/projectStatistics/projectProcess/qualityControl/options/itemDivision/components/unitProject.vue
+++ b/jwtech-admin-page/src/views/projectStatistics/projectProcess/qualityControl/options/itemDivision/components/unitProject.vue
@@ -219,7 +219,7 @@ export default {
         unitProjectCode: [
           { required: true, message: "请输入单位工程编号", trigger: "blur" },
           {
-            pattern: /[\\u4e00-\\u9fa5]$/,
+            pattern: /^[^\u4e00-\u9fa5]+$/,
             message: "编号不得出现中文",
             trigger: "blur",
           },
diff --git a/jwtech-admin-page/src/views/projectStatistics/projectProcess/scheduleManagement.vue b/jwtech-admin-page/src/views/projectStatistics/projectProcess/scheduleManagement.vue
index b67fb866..e5b8ef32 100644
--- a/jwtech-admin-page/src/views/projectStatistics/projectProcess/scheduleManagement.vue
+++ b/jwtech-admin-page/src/views/projectStatistics/projectProcess/scheduleManagement.vue
@@ -6,9 +6,8 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
-      <el-form-item label="月度" prop="monthly" label-width="40px">
+      <el-form-item label="月度" prop="monthly">
         <el-date-picker
           v-model="queryParams.data.monthly"
           type="month"
@@ -644,7 +643,7 @@ export default {
         projectOverallWorkload: null,
         projectOverallInvestmentBenefit: null,
         monthlyReportFile: null,
-        fillingStatus: "0",
+        fillingStatus: null,
         proCode: null,
         proNo: null,
         createUid: null,
@@ -673,7 +672,7 @@ export default {
           projectOverallWorkload: null,
           projectOverallInvestmentBenefit: null,
           monthlyReportFile: null,
-          fillingStatus: "0",
+          fillingStatus: null,
           proCode: null,
           proNo: null,
           createUid: null,
diff --git a/jwtech-admin-page/src/views/projectStatistics/projectStatisticsInvest/index.vue b/jwtech-admin-page/src/views/projectStatistics/projectStatisticsInvest/index.vue
index 5a54e9e8..bf13a7f3 100644
--- a/jwtech-admin-page/src/views/projectStatistics/projectStatisticsInvest/index.vue
+++ b/jwtech-admin-page/src/views/projectStatistics/projectStatisticsInvest/index.vue
@@ -15,7 +15,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="项目类型" prop="projectType">
         <el-cascader
diff --git a/jwtech-admin-page/src/views/projectStatistics/projectStatisticsMsg/index.vue b/jwtech-admin-page/src/views/projectStatistics/projectStatisticsMsg/index.vue
index 2dd68145..972e6018 100644
--- a/jwtech-admin-page/src/views/projectStatistics/projectStatisticsMsg/index.vue
+++ b/jwtech-admin-page/src/views/projectStatistics/projectStatisticsMsg/index.vue
@@ -15,7 +15,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="项目类型" prop="projectType">
         <el-cascader
diff --git a/jwtech-admin-page/src/views/projectStatistics/projectStatisticsProgress/index.vue b/jwtech-admin-page/src/views/projectStatistics/projectStatisticsProgress/index.vue
index 1105c27b..e32cce0b 100644
--- a/jwtech-admin-page/src/views/projectStatistics/projectStatisticsProgress/index.vue
+++ b/jwtech-admin-page/src/views/projectStatistics/projectStatisticsProgress/index.vue
@@ -15,7 +15,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="项目类型" prop="projectType">
         <el-cascader
diff --git a/jwtech-admin-page/src/views/projectStatistics/projectStatisticsSort/components/list.vue b/jwtech-admin-page/src/views/projectStatistics/projectStatisticsSort/components/list.vue
index ed401762..0c0b19fc 100644
--- a/jwtech-admin-page/src/views/projectStatistics/projectStatisticsSort/components/list.vue
+++ b/jwtech-admin-page/src/views/projectStatistics/projectStatisticsSort/components/list.vue
@@ -6,7 +6,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="项目类型" prop="projectType">
         <el-cascader
diff --git a/jwtech-admin-page/src/views/system/config/index.vue b/jwtech-admin-page/src/views/system/config/index.vue
index 539fa4b3..31671de6 100644
--- a/jwtech-admin-page/src/views/system/config/index.vue
+++ b/jwtech-admin-page/src/views/system/config/index.vue
@@ -5,7 +5,6 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
     >
       <el-form-item label="参数名称" prop="configName">
         <el-input
@@ -101,16 +100,16 @@
           >删除</el-button
         >
       </el-col>
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="warning"-->
-<!--          icon="el-icon-download"-->
-<!--          size="mini"-->
-<!--          @click="handleExport"-->
-<!--          v-hasPermi="['system:config:export']"-->
-<!--          >导出</el-button-->
-<!--        >-->
-<!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="warning"-->
+      <!--          icon="el-icon-download"-->
+      <!--          size="mini"-->
+      <!--          @click="handleExport"-->
+      <!--          v-hasPermi="['system:config:export']"-->
+      <!--          >导出</el-button-->
+      <!--        >-->
+      <!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -282,17 +281,16 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        data:{
+        data: {
           configName: undefined,
           configKey: undefined,
           configType: undefined,
-          timeView:{
-            beginTime:null,
-            endTime:null,
-            timeField:"create_time"
-          }
+          timeView: {
+            beginTime: null,
+            endTime: null,
+            timeField: "create_time",
+          },
         },
-
       },
       // 表单参数
       form: {},
@@ -320,20 +318,18 @@ export default {
     /** 查询参数列表 */
     getList() {
       this.loading = true;
-      if(this.dateRange){
-        this.queryParams.data.timeView.beginTime = this.dateRange[0]
-        this.queryParams.data.timeView.endTime = this.dateRange[1]
-      }else{
-        this.queryParams.data.timeView.beginTime = null
-        this.queryParams.data.timeView.endTime = null
+      if (this.dateRange) {
+        this.queryParams.data.timeView.beginTime = this.dateRange[0];
+        this.queryParams.data.timeView.endTime = this.dateRange[1];
+      } else {
+        this.queryParams.data.timeView.beginTime = null;
+        this.queryParams.data.timeView.endTime = null;
       }
-      listConfig(this.queryParams).then(
-        (response) => {
-          this.configList = response.records;
-          this.total = response.total;
-          this.loading = false;
-        }
-      );
+      listConfig(this.queryParams).then((response) => {
+        this.configList = response.records;
+        this.total = response.total;
+        this.loading = false;
+      });
     },
     // 参数系统内置字典翻译
     typeFormat(row, column) {