update

jwtech-admin-page/src/views/building/peasantWorkerSystem/options/generalView.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="statistics-container">
-    <table class="custom-table">
+    <table class="custom-table" v-if="false">
       <tr>
         <td colspan="5">
           <span class="label">项目名称：</span>{{ projectInfo.projectName }}
@@ -36,6 +36,52 @@
       </tr>
     </table>
 
+    <el-descriptions
+      :column="3"
+      border
+      :content-style="rowCenter"
+      :label-style="labelRowCenter"
+      style="width: 100%;"
+    >
+      <el-descriptions-item label="项目名称：" span="3">
+        {{ projectInfo.projectName }}
+      </el-descriptions-item>
+      <el-descriptions-item label="农民工总数：">
+        {{ projectInfo.totalNum  }}
+      </el-descriptions-item>
+      <el-descriptions-item label="进场人数：">
+        {{ projectInfo.enterNum }}
+      </el-descriptions-item>
+      <el-descriptions-item label="退场人数：">
+        {{ projectInfo.exitNum }}
+      </el-descriptions-item>
+      <el-descriptions-item label="开工日期：">
+        {{ projectInfo.commencementDate }}
+      </el-descriptions-item>
+      <el-descriptions-item label="开设工资专用账户时间：" :span="2">
+        {{ projectInfo.payrollAccountTime }}
+        <span style="color: green" v-if="projectInfo.dedicatedAccountWarning=='(工资专用账户按要求在开工开始30天内创建)'">{{ projectInfo.dedicatedAccountWarning }}</span>
+          <span style="color: red" v-else>{{ projectInfo.dedicatedAccountWarning }}</span>
+      </el-descriptions-item>
+      <el-descriptions-item label="每月平均发放工资金额：">
+        {{ projectInfo.averageSalary }}
+      </el-descriptions-item>
+      <el-descriptions-item label="累计拖欠工资总金额：">
+        {{ projectInfo.unpaidWagesAmount }}
+      </el-descriptions-item>
+      <el-descriptions-item label="累计农民工工资保证金：">
+        {{ projectInfo.wageDeposit }}
+      </el-descriptions-item>
+      <el-descriptions-item label="累计发放工资总金额：">
+        {{ projectInfo.totalSalary }}
+      </el-descriptions-item>
+      <el-descriptions-item label="工资专用账户余额：">
+        {{ projectInfo.payrollAccountBalance }}
+        <span style="color: green" v-if="projectInfo.balanceWarning=='(工资专用账户余额预计满足发放农民工工资)'">{{ projectInfo.balanceWarning }}</span>
+        <span style="color: red" v-else>{{ projectInfo.balanceWarning }}</span>
+      </el-descriptions-item>
+    </el-descriptions>
+
     <el-card shadow="hover" class="attendance-statistics">
       <div slot="header" class="card-header">
         <span>考勤情况统计</span>
@@ -58,6 +104,14 @@ export default {
   props: ["proNo", "proCode"],
   data() {
     return {
+      rowCenter: {
+        borderColor: "#DADCE3"
+      },
+      labelRowCenter: {
+        width: "175px",
+        borderColor: "#DADCE3",
+        backgroundColor: "#59b39e12",
+      },
       queryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -137,8 +191,8 @@ export default {
   padding: 20px;
   display: flex;
   flex-wrap: wrap;
-  gap: 20px;
-  justify-content: center;
+  gap: 30px;
+  justify-content: flex-start;
 }
 
 .card-header {
@@ -149,7 +203,7 @@ export default {
 
 .el-card {
   width: 100%;
-  max-width: 800px;
+  max-width: unset;
   margin-bottom: 20px;
 }
 
@@ -196,7 +250,7 @@ export default {
 
 .el-card {
   width: 100%;
-  max-width: 800px;
+  max-width: unset;
   margin-bottom: 20px;
 }
 

jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/certificate.vue

@@ -273,6 +273,12 @@
           >
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input
+            v-model="form.remark"
+            placeholder="请输入备注"
+          />
+        </el-form-item>
         <el-form-item label="附件" prop="attachment">
           <!-- <el-input v-model="form.attachment" placeholder="请输入附件" /> -->
           <el-upload
@@ -507,6 +513,7 @@ export default {
         updateTime: null,
         remark: null,
         owerDept: null,
+        remark:null
       };
       this.resetForm("form");
     },

jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/personInfo.vue

@@ -376,6 +376,12 @@ export default {
         personType: [
           { required: true, message: "请选择人员类型", trigger: "blur" },
         ],
+        commencementYear: [
+          { required: true, message: "选择从业开始年份", trigger: "blur" },
+        ],
+        enterTime: [
+          { required: true, message: "选择入职时间", trigger: "blur" },
+        ],
         appointmentLetterNumber: [
           { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],

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

@@ -635,7 +635,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加综合信息";
+      this.title = "添加政策文件";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -647,7 +647,7 @@ export default {
           this.fileList1 = JSON.parse(this.form.attachment);
         }
         this.open = true;
-        this.title = "修改综合信息";
+        this.title = "修改政策文件";
       });
     },
     /** 提交按钮 */