From ee04c80924b9d912cb1e8b04f806d91485f48c16 Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Mon, 8 Apr 2024 15:41:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E8=AE=B0=E5=BD=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/szxc/workrecard/index.vue | 130 ++++++++++++-------
 1 file changed, 86 insertions(+), 44 deletions(-)

diff --git a/ruoyi-ui/src/views/szxc/workrecard/index.vue b/ruoyi-ui/src/views/szxc/workrecard/index.vue
index 9141087..b61206c 100644
--- a/ruoyi-ui/src/views/szxc/workrecard/index.vue
+++ b/ruoyi-ui/src/views/szxc/workrecard/index.vue
@@ -164,31 +164,30 @@
     />
 
     <!-- 添加或修改工作记录对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
 
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row :gutter="10">
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="标题" prop="title">
               <el-input v-model="form.title" placeholder="请输入标题" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="所属网格" prop="deptId">
               <treeselect v-model="form.deptId" :options="deptOptions" :disable-branch-nodes="true"
                           placeholder="请选择所属网格" style="width:100%;" @select="selectedTree"/>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+        </el-row>
+
+        <el-row :gutter="10">
+          <el-col :span="12">
             <el-form-item label="工作人员" prop="workerName">
               <el-input v-model="form.workerName" placeholder="请输入工作人员" />
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row :gutter="10">
-
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="提报日期" prop="submitDate">
               <el-date-picker clearable style="width: 100%"
                               v-model="form.submitDate"
@@ -198,30 +197,33 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="开始时间" prop="startDate">
-              <el-date-picker clearable style="width: 100%"
-                              v-model="form.startDate"
-                              type="date"
-                              value-format="yyyy-MM-dd"
-                              placeholder="请选择开始时间">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="结束时间" prop="endDate">
-              <el-date-picker clearable style="width: 100%"
-                              v-model="form.endDate"
-                              type="date"
-                              value-format="yyyy-MM-dd"
-                              placeholder="请选择结束时间">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
         </el-row>
 
         <el-row :gutter="10">
-          <el-col :span="8">
+        <el-col :span="12">
+          <el-form-item label="开始时间" prop="startDate">
+            <el-date-picker clearable style="width: 100%"
+                            v-model="form.startDate"
+                            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="endDate">
+            <el-date-picker clearable style="width: 100%"
+                            v-model="form.endDate"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="请选择结束时间">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        </el-row>
+
+        <el-row :gutter="10">
+          <el-col :span="12">
             <el-form-item label="类别" prop="type">
               <el-select
                          v-model="form.type"
@@ -238,22 +240,39 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="16">
-            <el-form-item label="图片" prop="picture">
-              <image-upload v-model="form.picture"/>
+          <el-col :span="12">
+            <el-form-item label="审核状态" prop="gzStatus">
+              <el-select
+                v-model="form.gzStatus"
+                placeholder="审核状态"
+                clearable
+                style="width:100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.szxc_audit_status"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row :gutter="10">
-          <el-col :span="12">
-            <el-form-item label="内容">
-              <editor v-model="form.content" :min-height="150"/>
+          <el-col :span="24">
+            <el-form-item label="图片" prop="picture">
+              <image-upload v-model="form.picture"/>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="24">
+            <el-form-item label="内容" prop="content">
+              <editor v-model="form.content" :min-height="192"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
             <el-form-item label="审核备注" prop="shRemark">
-              <el-input v-model="form.shRemark" type="textarea" :rows="10" placeholder="请输入审核备注" />
+              <el-input v-model="form.shRemark" type="textarea" placeholder="请输入审核备注" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -323,14 +342,38 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        workerName: [
-          { required: true, message: "工作人员不能为空", trigger: "blur" }
-        ],
         title: [
           { required: true, message: "标题不能为空", trigger: "blur" }
         ],
         deptId: [
-          { required: true, message: "部门id不能为空", trigger: "blur" }
+          { required: true, message: "所属网格不能为空", trigger: "blur" }
+        ],
+        workerName: [
+          { required: true, message: "工作人员不能为空", trigger: "blur" }
+        ],
+        submitDate: [
+          { required: true, message: "提报日期不能为空", trigger: "blur" }
+        ],
+        startDate: [
+          { required: true, message: "开始时间不能为空", trigger: "blur" }
+        ],
+        endDate: [
+          { required: true, message: "结束时间不能为空", trigger: "blur" }
+        ],
+        type: [
+          { required: true, message: "类别不能为空", trigger: "blur" }
+        ],
+        gzStatus: [
+          { required: true, message: "审核状态不能为空", trigger: "blur" }
+        ],
+        picture: [
+          { required: true, message: "图片不能为空", trigger: "blur" }
+        ],
+        content: [
+          { required: true, message: "内容不能为空", trigger: "blur" }
+        ],
+        shRemark: [
+          { required: true, message: "审核备注不能为空", trigger: "blur" }
         ],
       }
     };
@@ -431,7 +474,6 @@ export default {
               this.getList();
             });
           } else {
-            this.form.gzStatus = '0'
             addWorkrecard(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;