cq

ui/src/views/ehs/environapproval/index.vue

@@ -253,6 +253,18 @@
           </el-col>
         </el-row>
         <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('是否需要跟进')" prop="follow">
+              <el-select v-model="form.follow" :placeholder="$t('请选择') + $t('是否需要跟进')">
+                <el-option
+                  v-for="dict in followOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('证书有效期')">
               <el-date-picker
@@ -269,18 +281,6 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item :label="$t('是否需要跟进')" prop="follow">
-              <el-select v-model="form.follow" :placeholder="$t('请选择') + $t('是否需要跟进')">
-                <el-option
-                  v-for="dict in followOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">

ui/src/views/ehs/fireapproval/index.vue

@@ -135,132 +135,196 @@
     />
 
     <!-- 添加或修改消防批文清单对话框 -->
-    <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item :label="$t('装置名称')" prop="plantCode">
-          <el-select v-model="form.plantCode" :placeholder="$t('请选择') + $t('装置名称')">
-            <el-option
-              v-for="dict in plantCodeOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('消防批文部门')" prop="division">
-          <el-input v-model="form.division" :placeholder="$t('请输入') + $t('消防批文部门')" />
-        </el-form-item>
-        <el-form-item :label="$t('批文名称')" prop="approvalname">
-          <el-input v-model="form.approvalname" :placeholder="$t('请输入') + $t('批文名称')" />
-        </el-form-item>
-        <el-form-item :label="$t('文件编号')" prop="fileno">
-          <el-input v-model="form.fileno" :placeholder="$t('请输入') + $t('文件编号')" />
-        </el-form-item>
-        <el-form-item :label="$t('批准日期')" prop="effetivedate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.effetivedate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            :placeholder="$t('请选择') + $t('批准日期')">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item :label="$t('适用范围')" prop="scope">
-          <el-input
-            type="textarea"
-            :rows="4"
-            :placeholder="$t('请输入') + $t('适用范围')"
-            v-model="form.scope">
-          </el-input>
-        </el-form-item>
-        <el-form-item :label="$t('相关法规')" prop="relatedlaw">
-          <el-input v-model="form.relatedlaw" :placeholder="$t('请选择') + $t('相关法规')" />
-        </el-form-item>
-        <el-form-item :label="$t('审批单位')" prop="responsauth">
-          <el-input v-model="form.responsauth" :placeholder="$t('请选择') + $t('审批单位')" />
-        </el-form-item>
-        <el-form-item :label="$t('有效期是否永久')" prop="isPermanent">
-          <el-select v-model="form.isPermanent" :placeholder="$t('请选择') + $t('有效期是否永久')" @change="permanentChange($event)">
-            <el-option
-              v-for="dict in isPermanentOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="parseInt(dict.dictValue)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('证书有效期')" label-width="50">
-          <el-date-picker
-            v-model="chooseDate"
-            type="daterange"
-            align="right"
-            unlink-panels
-            :range-separator="$t('至')"
-            :start-placeholder="$t('开始日期')"
-            :end-placeholder="$t('结束日期')"
-            value-format="yyyy-MM-dd"
-            :picker-options="pickerOptions"
-            :disabled="canChange">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item :label="$t('是否需要跟进')" prop="follow">
-          <el-select v-model="form.follow" :placeholder="$t('请选择') + $t('是否需要跟进')">
-            <el-option
-              v-for="dict in followOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('使用/储存/废物最大量')" prop="allowance">
-          <el-input v-model="form.allowance" :placeholder="$t('请输入') + $t('使用/储存/废物最大量')" />
-        </el-form-item>
-        <el-form-item :label="$t('排放/监控要求')" prop="requirements">
-          <el-input v-model="form.requirements" :placeholder="$t('请输入') + $t('排放/监控要求')" />
-        </el-form-item>
-        <el-form-item :label="$t('主要内容')" prop="content">
-          <el-input v-model="form.content" type="textarea" :placeholder="$t('请输入') + $t('主要内容')" />
-        </el-form-item>
-        <el-form-item :label="$t('负责人')" prop="owner">
-          <el-input v-model="form.owner" :placeholder="$t('请选择') + $t('负责人')" />
-        </el-form-item>
-        <el-form-item :label="$t('回顾人')" prop="reviewer">
-          <el-select v-model="form.reviewer" filterable :placeholder="$t('请选择') + $t('回顾人')">
-            <el-option
-              v-for="dict in reviewerOptions"
-              :key="dict.staffid"
-              :label="dict.name"
-              :value="dict.staffid">
-              <span style="float: left">{{ dict.name }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ dict.staffid }}</span>
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('本次回顾日期')" prop="reviewdate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.reviewdate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            :placeholder="$t('请选择') + $t('本次回顾日期')">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item :label="$t('回顾结果')" prop="reviewResult">
-          <el-input v-model="form.reviewResult" :placeholder="$t('请输入') + $t('回顾结果')" />
-        </el-form-item>
-        <el-form-item :label="$t('下次回顾日期')" prop="nextreviewdate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.nextreviewdate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            :placeholder="$t('请选择') + $t('下次回顾日期')">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item :label="$t('备注')" prop="remarks">
-          <el-input v-model="form.remarks" :placeholder="$t('请输入') + $t('备注')" />
-        </el-form-item>
-          <el-form-item :label="$t('归属部门')" prop="deptId">
+    <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="1200px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('装置名称')" prop="plantCode">
+              <el-select v-model="form.plantCode" :placeholder="$t('请选择') + $t('装置名称')">
+                <el-option
+                  v-for="dict in plantCodeOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('消防批文部门')" prop="division">
+              <el-input v-model="form.division" :placeholder="$t('请输入') + $t('消防批文部门')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('批文名称')" prop="approvalname">
+              <el-input v-model="form.approvalname" :placeholder="$t('请输入') + $t('批文名称')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('文件编号')" prop="fileno">
+              <el-input v-model="form.fileno" :placeholder="$t('请输入') + $t('文件编号')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('批准日期')" prop="effetivedate">
+              <el-date-picker clearable size="small" style="width: 200px"
+                              v-model="form.effetivedate"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              :placeholder="$t('请选择') + $t('批准日期')">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('适用范围')" prop="scope">
+              <el-input
+                type="textarea"
+                :rows="4"
+                :placeholder="$t('请输入') + $t('适用范围')"
+                v-model="form.scope">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('相关法规')" prop="relatedlaw">
+              <el-input v-model="form.relatedlaw" :placeholder="$t('请选择') + $t('相关法规')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('审批单位')" prop="responsauth">
+              <el-input v-model="form.responsauth" :placeholder="$t('请选择') + $t('审批单位')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('有效期是否永久')" prop="isPermanent">
+              <el-select v-model="form.isPermanent" :placeholder="$t('请选择') + $t('有效期是否永久')" @change="permanentChange($event)">
+                <el-option
+                  v-for="dict in isPermanentOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="parseInt(dict.dictValue)"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('是否需要跟进')" prop="follow">
+              <el-select v-model="form.follow" :placeholder="$t('请选择') + $t('是否需要跟进')">
+                <el-option
+                  v-for="dict in followOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('证书有效期')">
+              <el-date-picker
+                v-model="chooseDate"
+                type="daterange"
+                align="right"
+                unlink-panels
+                :range-separator="$t('至')"
+                :start-placeholder="$t('开始日期')"
+                :end-placeholder="$t('结束日期')"
+                value-format="yyyy-MM-dd"
+                :picker-options="pickerOptions"
+                :disabled="canChange">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('使用/储存/废物最大量')" prop="allowance">
+              <el-input v-model="form.allowance" :placeholder="$t('请输入') + $t('使用/储存/废物最大量')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('排放/监控要求')" prop="requirements">
+              <el-input v-model="form.requirements" :placeholder="$t('请输入') + $t('排放/监控要求')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('主要内容')" prop="content">
+              <el-input v-model="form.content" type="textarea" :placeholder="$t('请输入') + $t('主要内容')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('负责人')" prop="owner">
+              <el-input v-model="form.owner" :placeholder="$t('请选择') + $t('负责人')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('回顾人')" prop="reviewer">
+              <el-select v-model="form.reviewer" filterable :placeholder="$t('请选择') + $t('回顾人')">
+                <el-option
+                  v-for="dict in reviewerOptions"
+                  :key="dict.staffid"
+                  :label="dict.name"
+                  :value="dict.staffid">
+                  <span style="float: left">{{ dict.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ dict.staffid }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('本次回顾日期')" prop="reviewdate">
+              <el-date-picker clearable size="small" style="width: 200px"
+                              v-model="form.reviewdate"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              :placeholder="$t('请选择') + $t('本次回顾日期')">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('回顾结果')" prop="reviewResult">
+              <el-input v-model="form.reviewResult" :placeholder="$t('请输入') + $t('回顾结果')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('下次回顾日期')" prop="nextreviewdate">
+              <el-date-picker clearable size="small" style="width: 200px"
+                              v-model="form.nextreviewdate"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              :placeholder="$t('请选择') + $t('下次回顾日期')">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('备注')" prop="remarks">
+              <el-input v-model="form.remarks" :placeholder="$t('请输入') + $t('备注')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('归属部门')" prop="deptId">
               <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :placeholder="$t('请选择') + $t('归属部门')" />
-          </el-form-item>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">{{ $t('确 定') }}</el-button>

ui/src/views/ehs/healthapproval/index.vue

@@ -156,108 +156,166 @@
     />
 
     <!-- 添加或修改卫生批文清单对话框 -->
-    <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item :label="$t('批文名称')" prop="approvalname">
-          <el-input v-model="form.approvalname" :placeholder="$t('请输入') + $t('批文名称')" />
-        </el-form-item>
-        <el-form-item :label="$t('证书编号')" prop="certno">
-          <el-input v-model="form.certno" :placeholder="$t('请输入') + $t('证书编号')" />
-        </el-form-item>
-        <el-form-item :label="$t('批准日期')" prop="effetivedate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.effetivedate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            :placeholder="$t('请选择') + $t('批准日期')">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item :label="$t('适用范围')" prop="scope">
-          <el-input v-model="form.scope" type="textarea" :placeholder="$t('请输入') + $t('适用范围')" />
-        </el-form-item>
-        <el-form-item :label="$t('相关法规')" prop="relatedlaw">
-          <el-input v-model="form.relatedlaw" :placeholder="$t('请输入') + $t('相关法规')" />
-        </el-form-item>
-        <el-form-item :label="$t('审批单位')" prop="responsauth">
-          <el-input v-model="form.responsauth" :placeholder="$t('请输入') + $t('审批单位')" />
-        </el-form-item>
-        <el-form-item :label="$t('证书')+ ' '+ $t('有效期是否永久')" prop="isPermanent">
-          <el-select v-model="form.isPermanent" :placeholder="$t('请选择') + $t('证书') + ' '+ $t('有效期是否永久')">
-            <el-option
-              v-for="dict in isPermanentOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="parseInt(dict.dictValue)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('证书有效期')" prop="validityBefore">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.validityBefore"
-            type="date"
-            value-format="yyyy-MM-dd"
-            :placeholder="$t('请选择') + $t('证书有效期')">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item :label="$t('是否需要跟进')" prop="follow">
-          <el-select v-model="form.follow" :placeholder="$t('请选择') + $t('是否需要跟进')">
-            <el-option
-              v-for="dict in followOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('使用/储存/废物最大量')" prop="allowance">
-          <el-input v-model="form.allowance" :placeholder="$t('请输入') + $t('使用/储存/废物最大量')" />
-        </el-form-item>
-        <el-form-item :label="$t('排放/监控要求')" prop="requirements">
-          <el-input v-model="form.requirements" :placeholder="$t('请输入') + $t('排放/监控要求')" />
-        </el-form-item>
-        <el-form-item :label="$t('主要内容')" prop="scope">
-          <el-input v-model="form.content" type="textarea" :placeholder="$t('请输入') + $t('主要内容')" />
-        </el-form-item>
-        <el-form-item :label="$t('负责人')" prop="owner">
-          <el-input v-model="form.owner" :placeholder="$t('请输入') + $t('负责人')" />
-        </el-form-item>
-        <el-form-item :label="$t('回顾人')" prop="reviewer">
-          <el-select v-model="form.reviewer" filterable :placeholder="$t('请选择') + $t('回顾人')">
-            <el-option
-              v-for="dict in reviewerOptions"
-              :key="dict.staffid"
-              :label="dict.name"
-              :value="dict.staffid">
-              <span style="float: left">{{ dict.name }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ dict.staffid }}</span>
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('本次回顾日期')" prop="reviewdate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.reviewdate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            :placeholder="$t('请选择') + $t('本次回顾日期')">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item :label="$t('回顾结果')" prop="reviewResult">
-          <el-input v-model="form.reviewResult" :placeholder="$t('请输入') + $t('回顾结果')" />
-        </el-form-item>
-        <el-form-item :label="$t('下次回顾日期')" prop="nextreviewdate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.nextreviewdate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            :placeholder="$t('请选择') + $t('下次回顾日期')">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item :label="$t('备注')" prop="remarks">
-          <el-input v-model="form.remarks" :placeholder="$t('请输入') +$t('备注')" />
-        </el-form-item>
-          <el-form-item :label="$t('归属部门')" prop="deptId">
+    <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="1200px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('批文名称')" prop="approvalname">
+              <el-input v-model="form.approvalname" :placeholder="$t('请输入') + $t('批文名称')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('证书编号')" prop="certno">
+              <el-input v-model="form.certno" :placeholder="$t('请输入') + $t('证书编号')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('批准日期')" prop="effetivedate">
+              <el-date-picker clearable size="small" style="width: 200px"
+                              v-model="form.effetivedate"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              :placeholder="$t('请选择') + $t('批准日期')">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('适用范围')" prop="scope">
+              <el-input v-model="form.scope" type="textarea" :placeholder="$t('请输入') + $t('适用范围')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('相关法规')" prop="relatedlaw">
+              <el-input v-model="form.relatedlaw" :placeholder="$t('请输入') + $t('相关法规')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('审批单位')" prop="responsauth">
+              <el-input v-model="form.responsauth" :placeholder="$t('请输入') + $t('审批单位')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('证书')+ ' '+ $t('有效期是否永久')" prop="isPermanent">
+              <el-select v-model="form.isPermanent" :placeholder="$t('请选择') + $t('证书') + ' '+ $t('有效期是否永久')">
+                <el-option
+                  v-for="dict in isPermanentOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="parseInt(dict.dictValue)"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('是否需要跟进')" prop="follow">
+              <el-select v-model="form.follow" :placeholder="$t('请选择') + $t('是否需要跟进')">
+                <el-option
+                  v-for="dict in followOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('证书有效期')" prop="validityBefore">
+              <el-date-picker clearable size="small" style="width: 200px"
+                              v-model="form.validityBefore"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              :placeholder="$t('请选择') + $t('证书有效期')">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('使用/储存/废物最大量')" prop="allowance">
+              <el-input v-model="form.allowance" :placeholder="$t('请输入') + $t('使用/储存/废物最大量')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('排放/监控要求')" prop="requirements">
+              <el-input v-model="form.requirements" :placeholder="$t('请输入') + $t('排放/监控要求')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('主要内容')" prop="scope">
+              <el-input v-model="form.content" type="textarea" :placeholder="$t('请输入') + $t('主要内容')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('负责人')" prop="owner">
+              <el-input v-model="form.owner" :placeholder="$t('请输入') + $t('负责人')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('回顾人')" prop="reviewer">
+              <el-select v-model="form.reviewer" filterable :placeholder="$t('请选择') + $t('回顾人')">
+                <el-option
+                  v-for="dict in reviewerOptions"
+                  :key="dict.staffid"
+                  :label="dict.name"
+                  :value="dict.staffid">
+                  <span style="float: left">{{ dict.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ dict.staffid }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('本次回顾日期')" prop="reviewdate">
+              <el-date-picker clearable size="small" style="width: 200px"
+                              v-model="form.reviewdate"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              :placeholder="$t('请选择') + $t('本次回顾日期')">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('回顾结果')" prop="reviewResult">
+              <el-input v-model="form.reviewResult" :placeholder="$t('请输入') + $t('回顾结果')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('下次回顾日期')" prop="nextreviewdate">
+              <el-date-picker clearable size="small" style="width: 200px"
+                              v-model="form.nextreviewdate"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              :placeholder="$t('请选择') + $t('下次回顾日期')">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('备注')" prop="remarks">
+              <el-input v-model="form.remarks" :placeholder="$t('请输入') +$t('备注')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('归属部门')" prop="deptId">
               <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :placeholder="$t('请选择') + $t('归属部门')" />
-          </el-form-item>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">{{ $t('确 定') }}</el-button>

ui/src/views/ehs/safetyapproval/index.vue

@@ -141,129 +141,189 @@
     />
 
     <!-- 添加或修改安全批文清单对话框 -->
-    <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="900px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item :label="$t('装置名称')" prop="plantCode">
-          <el-select v-model="form.plantCode" :placeholder="$t('请选择') + $t('装置名称')">
-            <el-option
-              v-for="dict in plantCodeOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('批文名称')" prop="approvalname">
-          <el-input v-model="form.approvalname" :placeholder="$t('请输入') + $t('批文名称')" />
-        </el-form-item>
-        <el-form-item :label="$t('证书编号')" prop="certno">
-          <el-input v-model="form.certno" :placeholder="$t('请输入') + $t('证书编号')" />
-        </el-form-item>
-        <el-form-item :label="$t('批准日期')" prop="effetivedate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.effetivedate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            :placeholder="$t('请选择') + $t('批准日期')">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item :label="$t('适用范围')" prop="scope">
-          <el-input
-            type="textarea"
-            :rows="4"
-            :placeholder="$t('请输入') + $t('适用范围')"
-            v-model="form.scope">
-          </el-input>
-        </el-form-item>
-        <el-form-item :label="$t('相关法规')" prop="relatedlaw">
-          <el-input v-model="form.relatedlaw" :placeholder="$t('请输入') + $t('相关法规')" />
-        </el-form-item>
-        <el-form-item :label="$t('审批单位')" prop="responsauth">
-          <el-input v-model="form.responsauth" :placeholder="$t('请输入') + $t('审批单位')" />
-        </el-form-item>
-        <el-form-item :label="$t('有效期是否永久')" prop="isPermanent">
-          <el-select v-model="form.isPermanent" :placeholder="$t('请选择') + $t('有效期是否永久')" @change="permanentChange($event)">
-            <el-option
-              v-for="dict in isPermanentOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="parseInt(dict.dictValue)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('证书有效期')" label-width="50">
-          <el-date-picker
-            v-model="chooseDate"
-            type="daterange"
-            align="right"
-            unlink-panels
-            :range-separator="$t('至')"
-            :start-placeholder="$t('开始日期')"
-            :end-placeholder="$t('结束日期')"
-            value-format="yyyy-MM-dd"
-            :picker-options="pickerOptions"
-            :disabled="canChange">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item :label="$t('是否需要跟进')" prop="follow">
-          <el-select v-model="form.follow" :placeholder="$t('请选择') + $t('是否需要跟进')">
-            <el-option
-              v-for="dict in followOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('使用/储存/废物最大量')" prop="allowance">
-          <el-input v-model="form.allowance" :placeholder="$t('请输入') + $t('使用/储存/废物最大量')" />
-        </el-form-item>
-        <el-form-item :label="$t('排放/监控要求')" prop="requirements">
-          <el-input v-model="form.requirements" :placeholder="$t('请输入') + $t('排放/监控要求')" />
-        </el-form-item>
-        <el-form-item :label="$t('主要内容')" prop="content">
-          <el-input v-model="form.content" type="textarea" :placeholder="$t('请输入') + $t('主要内容')" />
-        </el-form-item>
-        <el-form-item :label="$t('负责人')" prop="owner">
-          <el-input v-model="form.owner" :placeholder="$t('请输入') + $t('负责人')" />
-        </el-form-item>
-        <el-form-item :label="$t('回顾人')" prop="reviewer">
-          <el-select v-model="form.reviewer" filterable :placeholder="$t('请选择') + $t('回顾人')">
-            <el-option
-              v-for="dict in reviewerOptions"
-              :key="dict.staffid"
-              :label="dict.name"
-              :value="dict.staffid">
-              <span style="float: left">{{ dict.name }}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ dict.staffid }}</span>
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('本次回顾日期')" prop="reviewdate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.reviewdate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            :placeholder="$t('请选择') + $t('本次回顾日期')">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item :label="$t('回顾结果')" prop="reviewResult">
-          <el-input v-model="form.reviewResult" :placeholder="$t('请输入') + $t('回顾结果')" />
-        </el-form-item>
-        <el-form-item :label="$t('下次回顾日期')" prop="nextreviewdate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.nextreviewdate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            :placeholder="$t('请选择') + $t('下次回顾日期')">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item :label="$t('备注')" prop="remarks">
-          <el-input v-model="form.remarks" :placeholder="$t('请输入') + $t('备注')" />
-        </el-form-item>
-          <el-form-item :label="$t('归属部门')" prop="deptId">
+    <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="1200px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('装置名称')" prop="plantCode">
+              <el-select v-model="form.plantCode" :placeholder="$t('请选择') + $t('装置名称')">
+                <el-option
+                  v-for="dict in plantCodeOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('批文名称')" prop="approvalname">
+              <el-input v-model="form.approvalname" :placeholder="$t('请输入') + $t('批文名称')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('证书编号')" prop="certno">
+              <el-input v-model="form.certno" :placeholder="$t('请输入') + $t('证书编号')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('批准日期')" prop="effetivedate">
+              <el-date-picker clearable size="small" style="width: 200px"
+                              v-model="form.effetivedate"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              :placeholder="$t('请选择') + $t('批准日期')">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('适用范围')" prop="scope">
+              <el-input
+                type="textarea"
+                :rows="4"
+                :placeholder="$t('请输入') + $t('适用范围')"
+                v-model="form.scope">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('相关法规')" prop="relatedlaw">
+              <el-input v-model="form.relatedlaw" :placeholder="$t('请输入') + $t('相关法规')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('审批单位')" prop="responsauth">
+              <el-input v-model="form.responsauth" :placeholder="$t('请输入') + $t('审批单位')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('有效期是否永久')" prop="isPermanent">
+              <el-select v-model="form.isPermanent" :placeholder="$t('请选择') + $t('有效期是否永久')" @change="permanentChange($event)">
+                <el-option
+                  v-for="dict in isPermanentOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="parseInt(dict.dictValue)"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('是否需要跟进')" prop="follow">
+              <el-select v-model="form.follow" :placeholder="$t('请选择') + $t('是否需要跟进')">
+                <el-option
+                  v-for="dict in followOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('证书有效期')">
+              <el-date-picker
+                v-model="chooseDate"
+                type="daterange"
+                align="right"
+                unlink-panels
+                :range-separator="$t('至')"
+                :start-placeholder="$t('开始日期')"
+                :end-placeholder="$t('结束日期')"
+                value-format="yyyy-MM-dd"
+                :picker-options="pickerOptions"
+                :disabled="canChange">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('使用/储存/废物最大量')" prop="allowance">
+              <el-input v-model="form.allowance" :placeholder="$t('请输入') + $t('使用/储存/废物最大量')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('排放/监控要求')" prop="requirements">
+              <el-input v-model="form.requirements" :placeholder="$t('请输入') + $t('排放/监控要求')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('主要内容')" prop="content">
+              <el-input v-model="form.content" type="textarea" :placeholder="$t('请输入') + $t('主要内容')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('负责人')" prop="owner">
+              <el-input v-model="form.owner" :placeholder="$t('请输入') + $t('负责人')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('回顾人')" prop="reviewer">
+              <el-select v-model="form.reviewer" filterable :placeholder="$t('请选择') + $t('回顾人')">
+                <el-option
+                  v-for="dict in reviewerOptions"
+                  :key="dict.staffid"
+                  :label="dict.name"
+                  :value="dict.staffid">
+                  <span style="float: left">{{ dict.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ dict.staffid }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('本次回顾日期')" prop="reviewdate">
+              <el-date-picker clearable size="small" style="width: 200px"
+                              v-model="form.reviewdate"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              :placeholder="$t('请选择') + $t('本次回顾日期')">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('回顾结果')" prop="reviewResult">
+              <el-input v-model="form.reviewResult" :placeholder="$t('请输入') + $t('回顾结果')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('下次回顾日期')" prop="nextreviewdate">
+              <el-date-picker clearable size="small" style="width: 200px"
+                              v-model="form.nextreviewdate"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              :placeholder="$t('请选择') + $t('下次回顾日期')">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('备注')" prop="remarks">
+              <el-input v-model="form.remarks" :placeholder="$t('请输入') + $t('备注')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('归属部门')" prop="deptId">
               <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :placeholder="$t('请选择') + $t('归属部门')" />
-          </el-form-item>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">{{ $t('确 定') }}</el-button>