ppe

master/src/main/java/com/ruoyi/project/production/controller/TPpeCmldefLockerController.java

@@ -36,7 +36,7 @@ public class TPpeCmldefLockerController extends BaseController
     /**
      * 查询自行车棚防化靴/防化服柜子列表
      */
-    @PreAuthorize("@ss.hasPermi('production:cmldefLocker:list')")
+
     @GetMapping("/list")
     public TableDataInfo list(TPpeCmldefLocker tPpeCmldefLocker)
     {
@@ -48,7 +48,7 @@ public class TPpeCmldefLockerController extends BaseController
     /**
      * 导出自行车棚防化靴/防化服柜子列表
      */
-    @PreAuthorize("@ss.hasPermi('production:cmldefLocker:export')")
+
     @Log(title = "自行车棚防化靴/防化服柜子", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TPpeCmldefLocker tPpeCmldefLocker)
@@ -61,7 +61,7 @@ public class TPpeCmldefLockerController extends BaseController
     /**
      * 获取自行车棚防化靴/防化服柜子详细信息
      */
-    @PreAuthorize("@ss.hasPermi('production:cmldefLocker:query')")
+
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -71,7 +71,7 @@ public class TPpeCmldefLockerController extends BaseController
     /**
      * 新增自行车棚防化靴/防化服柜子
      */
-    @PreAuthorize("@ss.hasPermi('production:cmldefLocker:add')")
+
     @Log(title = "自行车棚防化靴/防化服柜子", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPpeCmldefLocker tPpeCmldefLocker)
@@ -82,7 +82,7 @@ public class TPpeCmldefLockerController extends BaseController
     /**
      * 修改自行车棚防化靴/防化服柜子
      */
-    @PreAuthorize("@ss.hasPermi('production:cmldefLocker:edit')")
+
     @Log(title = "自行车棚防化靴/防化服柜子", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPpeCmldefLocker tPpeCmldefLocker)
@@ -93,7 +93,7 @@ public class TPpeCmldefLockerController extends BaseController
     /**
      * 删除自行车棚防化靴/防化服柜子
      */
-    @PreAuthorize("@ss.hasPermi('production:cmldefLocker:remove')")
+
     @Log(title = "自行车棚防化靴/防化服柜子", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

master/src/main/java/com/ruoyi/project/production/controller/TPpeMainController.java

@@ -43,7 +43,7 @@ public class TPpeMainController extends BaseController {
     /**
      * 查询员工PPE检查记录列表
      */
-    @PreAuthorize("@ss.hasPermi('production:main:list')")
+
     @GetMapping("/list")
     public TableDataInfo list(TPpeMain tPpeMain) {
         startPage();
@@ -55,7 +55,7 @@ public class TPpeMainController extends BaseController {
     /**
      * 查询员工PPE检查记录列表
      */
-    @PreAuthorize("@ss.hasPermi('production:main:list')")
+
     @GetMapping("/lastCheckData")
     public AjaxResult lastCheckData(TPpeMain tPpeMain) {
         List<TPpeMain> list = tPpeMainService.selectTPpeMainList(tPpeMain);
@@ -81,7 +81,7 @@ public class TPpeMainController extends BaseController {
     /**
      * 导出员工PPE检查记录列表
      */
-    @PreAuthorize("@ss.hasPermi('production:main:export')")
+
     @Log(title = "员工PPE检查记录", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TPpeMain tPpeMain) {
@@ -93,7 +93,7 @@ public class TPpeMainController extends BaseController {
     /**
      * 获取员工PPE检查记录详细信息
      */
-    @PreAuthorize("@ss.hasPermi('production:main:query')")
+
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tPpeMainService.selectTPpeMainById(id));
@@ -102,7 +102,7 @@ public class TPpeMainController extends BaseController {
     /**
      * 新增员工PPE检查记录
      */
-    @PreAuthorize("@ss.hasPermi('production:main:add')")
+
     @Log(title = "员工PPE检查记录", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPpeMain tPpeMain) {
@@ -142,7 +142,7 @@ public class TPpeMainController extends BaseController {
     /**
      * 修改员工PPE检查记录
      */
-    @PreAuthorize("@ss.hasPermi('production:main:edit')")
+
     @Log(title = "员工PPE检查记录", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPpeMain tPpeMain) {
@@ -152,7 +152,7 @@ public class TPpeMainController extends BaseController {
     /**
      * 删除员工PPE检查记录
      */
-    @PreAuthorize("@ss.hasPermi('production:main:remove')")
+
     @Log(title = "员工PPE检查记录", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {

master/src/main/java/com/ruoyi/project/production/controller/TPpeStaffLockerController.java

@@ -36,7 +36,7 @@ public class TPpeStaffLockerController extends BaseController
     /**
      * 查询自行车棚员工PPE柜列表
      */
-    @PreAuthorize("@ss.hasPermi('production:staffLocker:list')")
+
     @GetMapping("/list")
     public TableDataInfo list(TPpeStaffLocker tPpeStaffLocker)
     {
@@ -48,7 +48,7 @@ public class TPpeStaffLockerController extends BaseController
     /**
      * 导出自行车棚员工PPE柜列表
      */
-    @PreAuthorize("@ss.hasPermi('production:staffLocker:export')")
+
     @Log(title = "自行车棚员工PPE柜", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TPpeStaffLocker tPpeStaffLocker)
@@ -61,7 +61,7 @@ public class TPpeStaffLockerController extends BaseController
     /**
      * 获取自行车棚员工PPE柜详细信息
      */
-    @PreAuthorize("@ss.hasPermi('production:staffLocker:query')")
+
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -71,7 +71,7 @@ public class TPpeStaffLockerController extends BaseController
     /**
      * 新增自行车棚员工PPE柜
      */
-    @PreAuthorize("@ss.hasPermi('production:staffLocker:add')")
+
     @Log(title = "自行车棚员工PPE柜", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPpeStaffLocker tPpeStaffLocker)
@@ -82,7 +82,7 @@ public class TPpeStaffLockerController extends BaseController
     /**
      * 修改自行车棚员工PPE柜
      */
-    @PreAuthorize("@ss.hasPermi('production:staffLocker:edit')")
+
     @Log(title = "自行车棚员工PPE柜", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPpeStaffLocker tPpeStaffLocker)
@@ -93,7 +93,7 @@ public class TPpeStaffLockerController extends BaseController
     /**
      * 删除自行车棚员工PPE柜
      */
-    @PreAuthorize("@ss.hasPermi('production:staffLocker:remove')")
+
     @Log(title = "自行车棚员工PPE柜", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

master/src/main/java/com/ruoyi/project/production/controller/TPpeWardrobeController.java

@@ -36,7 +36,7 @@ public class TPpeWardrobeController extends BaseController
     /**
      * 查询更衣柜列表
      */
-    @PreAuthorize("@ss.hasPermi('production:wardrobe:list')")
+
     @GetMapping("/list")
     public TableDataInfo list(TPpeWardrobe tPpeWardrobe)
     {
@@ -48,7 +48,7 @@ public class TPpeWardrobeController extends BaseController
     /**
      * 导出更衣柜列表
      */
-    @PreAuthorize("@ss.hasPermi('production:wardrobe:export')")
+
     @Log(title = "更衣柜", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TPpeWardrobe tPpeWardrobe)
@@ -61,7 +61,7 @@ public class TPpeWardrobeController extends BaseController
     /**
      * 获取更衣柜详细信息
      */
-    @PreAuthorize("@ss.hasPermi('production:wardrobe:query')")
+
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -71,7 +71,7 @@ public class TPpeWardrobeController extends BaseController
     /**
      * 新增更衣柜
      */
-    @PreAuthorize("@ss.hasPermi('production:wardrobe:add')")
+
     @Log(title = "更衣柜", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPpeWardrobe tPpeWardrobe)
@@ -82,7 +82,7 @@ public class TPpeWardrobeController extends BaseController
     /**
      * 修改更衣柜
      */
-    @PreAuthorize("@ss.hasPermi('production:wardrobe:edit')")
+
     @Log(title = "更衣柜", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPpeWardrobe tPpeWardrobe)
@@ -93,7 +93,7 @@ public class TPpeWardrobeController extends BaseController
     /**
      * 删除更衣柜
      */
-    @PreAuthorize("@ss.hasPermi('production:wardrobe:remove')")
+
     @Log(title = "更衣柜", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

ui/src/views/production/person/index.vue

@@ -138,357 +138,272 @@
           {{ postFormat(detail.row) }}
         </el-descriptions-item>
       </el-descriptions>
-      <el-table v-if="detail.row.sex!=1" :data="detail.staffLocker" border>
-        <el-table-column align="center" label="自行车棚员工PPE柜">
-          <el-table-column align="center" label="PPE种类" prop="ppeType">
-            <template slot-scope="scope">
-              <div v-if="detail.isEdit||detail.isAdd">
-                <el-input v-model="scope.row.ppeType" placehoder="请输入PPE种类"/>
-              </div>
-              <span v-else>{{ scope.row.ppeType }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="检查内容">
-            <el-table-column align="center" label="应配备岗位" prop="usePost">
-              <template slot-scope="scope">
-                <div v-if="detail.isEdit||detail.isAdd">
-                  <el-select v-model="scope.row.usePost" clearable multiple placeholder="请选择应配备岗位" size="small">
-                    <el-option
-                        v-for="dict in ppePostOptions"
-                        :key="dict.dictValue"
-                        :label="dict.dictLabel"
-                        :value="dict.dictValue"
-                    />
-                  </el-select>
-                </div>
-                <span v-else>{{ scope.row.usePost }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="是否配备" prop="isEquip">
-              <template slot-scope="scope">
-                <div v-if="detail.isEdit||detail.isAdd">
-                  <el-select v-model="scope.row.isEquip" clearable placeholder="请选择是否配备" size="small">
-                    <el-option
-                        v-for="dict in ppeCheckOptions"
-                        :key="dict.dictValue"
-                        :label="dict.dictLabel"
-                        :value="dict.dictValue"
-                    />
-                  </el-select>
-                </div>
-                <span v-else>{{ scope.row.isEquip }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="是否无破损、未被污染" prop="isPollution">
-              <template slot-scope="scope">
-                <div v-if="detail.isEdit||detail.isAdd">
-                  <el-select v-model="scope.row.isPollution" clearable placeholder="请选择是否无破损、未被污染"
-                             size="small">
-                    <el-option
-                        v-for="dict in ppeCheckOptions"
-                        :key="dict.dictValue"
-                        :label="dict.dictLabel"
-                        :value="dict.dictValue"
-                    />
-                  </el-select>
-                </div>
-                <span v-else>{{ scope.row.isPollution }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="摆放符合要求" prop="putAsRequired">
-              <template slot-scope="scope">
-                <div v-if="detail.isEdit||detail.isAdd">
-                  <el-select v-model="scope.row.putAsRequired" clearable placeholder="请选择是否摆放符合要求"
-                             size="small">
-                    <el-option
-                        v-for="dict in ppeCheckOptions"
-                        :key="dict.dictValue"
-                        :label="dict.dictLabel"
-                        :value="dict.dictValue"
-                    />
-                  </el-select>
-                </div>
-                <span v-else>{{ scope.row.putAsRequired }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="是否按要求贴“使用时间卡”" prop="isRequire">
-              <template slot-scope="scope">
-                <div v-if="detail.isEdit||detail.isAdd">
-                  <el-select v-model="scope.row.isRequire" clearable placeholder="请选择是否按要求贴“使用时间卡"
-                             size="small">
-                    <el-option
-                        v-for="dict in ppeCheckOptions"
-                        :key="dict.dictValue"
-                        :label="dict.dictLabel"
-                        :value="dict.dictValue"
-                    />
-                  </el-select>
-                </div>
-                <span v-else>{{ scope.row.isRequire }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="是否在使用有效期内" prop="isValidity">
-              <template slot-scope="scope">
-                <div v-if="detail.isEdit||detail.isAdd">
-                  <el-select v-model="scope.row.isValidity" clearable placeholder="请选择是否在使用有效期内"
-                             size="small">
-                    <el-option
-                        v-for="dict in ppeCheckOptions"
-                        :key="dict.dictValue"
-                        :label="dict.dictLabel"
-                        :value="dict.dictValue"
-                    />
-                  </el-select>
-                </div>
-                <span v-else>{{ scope.row.isValidity }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="检验合格的标识在有效期内" prop="isIdentification">
-              <template slot-scope="scope">
-                <div v-if="detail.isEdit||detail.isAdd">
-                  <el-select v-model="scope.row.isIdentification" clearable
-                             placeholder="请选择是否检验合格的标识在有效期内" size="small">
-                    <el-option
-                        v-for="dict in ppeCheckOptions"
-                        :key="dict.dictValue"
-                        :label="dict.dictLabel"
-                        :value="dict.dictValue"
-                    />
-                  </el-select>
-                </div>
-                <span v-else>{{ scope.row.isIdentification }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="是否配有专用湿巾" prop="isWetTissue">
-              <template slot-scope="scope">
-                <div v-if="detail.isEdit||detail.isAdd">
-                  <el-select v-model="detail.isWetTissue" clearable placeholder="请选择是否配有专用湿巾" size="small">
-                    <el-option
-                        v-for="dict in ppeCheckOptions"
-                        :key="dict.dictValue"
-                        :label="dict.dictLabel"
-                        :value="dict.dictValue"
-                    />
-                  </el-select>
-                </div>
-                <span v-else>{{ scope.row.isWetTissue }}</span>
-              </template>
-            </el-table-column>
-          </el-table-column>
-          <el-table-column
-              v-if="detail.isAdd||detail.isEdit"
-              label="操作"
-              width="100px">
-            <template slot-scope="scope">
-              <el-button
-                  size="small"
-                  type="text"
-                  @click.native.prevent="deleteRow(scope.$index, detail.staffLocker)">
-                移除
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table-column>
-      </el-table>
-      <div v-if="detail.isAdd||detail.isEdit" style="margin-top: 10px">
-        <el-input v-model="detail.staffRemark" placeholder="请输入备注" style="width: 100%"
-                  type="textarea"/>
-        <!--<el-form>
-          <el-form-item label="备注" label-width="80px" prop="detail.staffRemark">
-          </el-form-item>
-        </el-form>-->
-      </div>
-      <el-descriptions v-else :column="1" border class="margin-top" size="default">
-        <el-descriptions-item label="备注" label-style="width:100px">
-          {{ detail.staffRemark }}
-        </el-descriptions-item>
-      </el-descriptions>
       <div>
-        <el-button v-if="detail.isAdd||detail.isEdit"
-                   icon="el-icon-plus"
-                   type="text"
-                   @click="addRow(detail.staffLocker)">
-          添加一行
-        </el-button>
-      </div>
-
-      <el-table v-if="detail.row.sex!=1" :data="detail.cmldefLocker" border style="margin: 20px 0 0 0;">
-        <el-table-column align="center" label="自行车棚防化靴/防化服柜">
-          <el-table-column align="center" label="PPE种类" prop="ppeType">
-            <template slot-scope="scope">
-              <div v-if="detail.isEdit||detail.isAdd">
-                <el-input v-model="scope.row.ppeType" placehoder="请输入PPE种类"/>
-              </div>
-              <span v-else>{{ scope.row.ppeType }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="检查内容">
-            <el-table-column align="center" label="应配备岗位" prop="usePost">
-              <template slot-scope="scope">
-                <div v-if="detail.isEdit||detail.isAdd">
-                  <el-select v-model="scope.row.usePost" clearable multiple placeholder="请选择应配备岗位" size="small">
-                    <el-option
-                        v-for="dict in ppePostOptions"
-                        :key="dict.dictValue"
-                        :label="dict.dictLabel"
-                        :value="dict.dictValue"
-                    />
-                  </el-select>
-                </div>
-                <span v-else>{{ scope.row.usePost }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="是否配备" prop="isEquip">
+        <el-table v-if="detail.row.sex!=1" :data="detail.staffLocker" border>
+          <el-table-column align="center" label="自行车棚员工PPE柜">
+            <el-table-column align="center" label="PPE种类" prop="ppeType">
               <template slot-scope="scope">
                 <div v-if="detail.isEdit||detail.isAdd">
-                  <el-select v-model="scope.row.isEquip" clearable placeholder="请选择是否配备" size="small">
-                    <el-option
-                        v-for="dict in ppeCheckOptions"
-                        :key="dict.dictValue"
-                        :label="dict.dictLabel"
-                        :value="dict.dictValue"
-                    />
-                  </el-select>
+                  <el-input v-model="scope.row.ppeType" placehoder="请输入PPE种类"/>
                 </div>
-                <span v-else>{{ scope.row.isEquip }}</span>
+                <span v-else>{{ scope.row.ppeType }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="center" label="是否无破损、未被污染" prop="isPollution">
-              <template slot-scope="scope">
-                <div v-if="detail.isEdit||detail.isAdd">
-                  <el-select v-model="scope.row.isPollution" clearable placeholder="请选择是否无破损、未被污染"
-                             size="small">
-                    <el-option
-                        v-for="dict in ppeCheckOptions"
-                        :key="dict.dictValue"
-                        :label="dict.dictLabel"
-                        :value="dict.dictValue"
-                    />
-                  </el-select>
-                </div>
-                <span v-else>{{ scope.row.isPollution }}</span>
-              </template>
+            <el-table-column align="center" label="检查内容">
+              <el-table-column align="center" label="应配备岗位" prop="usePost">
+                <template slot-scope="scope">
+                  <div v-if="detail.isEdit||detail.isAdd">
+                    <el-select v-model="scope.row.usePost" clearable multiple placeholder="请选择应配备岗位"
+                               size="small">
+                      <el-option
+                          v-for="dict in ppePostOptions"
+                          :key="dict.dictValue"
+                          :label="dict.dictLabel"
+                          :value="dict.dictValue"
+                      />
+                    </el-select>
+                  </div>
+                  <span v-else>{{ scope.row.usePost }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="是否配备" prop="isEquip">
+                <template slot-scope="scope">
+                  <div v-if="detail.isEdit||detail.isAdd">
+                    <el-select v-model="scope.row.isEquip" clearable placeholder="请选择是否配备" size="small">
+                      <el-option
+                          v-for="dict in ppeCheckOptions"
+                          :key="dict.dictValue"
+                          :label="dict.dictLabel"
+                          :value="dict.dictValue"
+                      />
+                    </el-select>
+                  </div>
+                  <span v-else>{{ scope.row.isEquip }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="是否无破损、未被污染" prop="isPollution">
+                <template slot-scope="scope">
+                  <div v-if="detail.isEdit||detail.isAdd">
+                    <el-select v-model="scope.row.isPollution" clearable placeholder="请选择是否无破损、未被污染"
+                               size="small">
+                      <el-option
+                          v-for="dict in ppeCheckOptions"
+                          :key="dict.dictValue"
+                          :label="dict.dictLabel"
+                          :value="dict.dictValue"
+                      />
+                    </el-select>
+                  </div>
+                  <span v-else>{{ scope.row.isPollution }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="摆放符合要求" prop="putAsRequired">
+                <template slot-scope="scope">
+                  <div v-if="detail.isEdit||detail.isAdd">
+                    <el-select v-model="scope.row.putAsRequired" clearable placeholder="请选择是否摆放符合要求"
+                               size="small">
+                      <el-option
+                          v-for="dict in ppeCheckOptions"
+                          :key="dict.dictValue"
+                          :label="dict.dictLabel"
+                          :value="dict.dictValue"
+                      />
+                    </el-select>
+                  </div>
+                  <span v-else>{{ scope.row.putAsRequired }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="是否按要求贴“使用时间卡”" prop="isRequire">
+                <template slot-scope="scope">
+                  <div v-if="detail.isEdit||detail.isAdd">
+                    <el-select v-model="scope.row.isRequire" clearable placeholder="请选择是否按要求贴“使用时间卡"
+                               size="small">
+                      <el-option
+                          v-for="dict in ppeCheckOptions"
+                          :key="dict.dictValue"
+                          :label="dict.dictLabel"
+                          :value="dict.dictValue"
+                      />
+                    </el-select>
+                  </div>
+                  <span v-else>{{ scope.row.isRequire }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="是否在使用有效期内" prop="isValidity">
+                <template slot-scope="scope">
+                  <div v-if="detail.isEdit||detail.isAdd">
+                    <el-select v-model="scope.row.isValidity" clearable placeholder="请选择是否在使用有效期内"
+                               size="small">
+                      <el-option
+                          v-for="dict in ppeCheckOptions"
+                          :key="dict.dictValue"
+                          :label="dict.dictLabel"
+                          :value="dict.dictValue"
+                      />
+                    </el-select>
+                  </div>
+                  <span v-else>{{ scope.row.isValidity }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="检验合格的标识在有效期内" prop="isIdentification">
+                <template slot-scope="scope">
+                  <div v-if="detail.isEdit||detail.isAdd">
+                    <el-select v-model="scope.row.isIdentification" clearable
+                               placeholder="请选择是否检验合格的标识在有效期内" size="small">
+                      <el-option
+                          v-for="dict in ppeCheckOptions"
+                          :key="dict.dictValue"
+                          :label="dict.dictLabel"
+                          :value="dict.dictValue"
+                      />
+                    </el-select>
+                  </div>
+                  <span v-else>{{ scope.row.isIdentification }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="是否配有专用湿巾" prop="isWetTissue">
+                <template slot-scope="scope">
+                  <div v-if="detail.isEdit||detail.isAdd">
+                    <el-select v-model="detail.isWetTissue" clearable placeholder="请选择是否配有专用湿巾" size="small">
+                      <el-option
+                          v-for="dict in ppeCheckOptions"
+                          :key="dict.dictValue"
+                          :label="dict.dictLabel"
+                          :value="dict.dictValue"
+                      />
+                    </el-select>
+                  </div>
+                  <span v-else>{{ scope.row.isWetTissue }}</span>
+                </template>
+              </el-table-column>
             </el-table-column>
-            <el-table-column align="center" label="摆放符合要求" prop="putAsRequired">
-              <template slot-scope="scope">
-                <div v-if="detail.isEdit||detail.isAdd">
-                  <el-select v-model="scope.row.putAsRequired" clearable placeholder="请选择是否摆放符合要求"
-                             size="small">
-                    <el-option
-                        v-for="dict in ppeCheckOptions"
-                        :key="dict.dictValue"
-                        :label="dict.dictLabel"
-                        :value="dict.dictValue"
-                    />
-                  </el-select>
-                </div>
-                <span v-else>{{ scope.row.putAsRequired }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="检验合格的标识在有效期内" prop="isIdentification">
+            <el-table-column
+                v-if="detail.isAdd||detail.isEdit"
+                label="操作"
+                width="100px">
               <template slot-scope="scope">
-                <div v-if="detail.isEdit||detail.isAdd">
-                  <el-select v-model="scope.row.isIdentification" clearable
-                             placeholder="请选择是否检验合格的标识在有效期内" size="small">
-                    <el-option
-                        v-for="dict in ppeCheckOptions"
-                        :key="dict.dictValue"
-                        :label="dict.dictLabel"
-                        :value="dict.dictValue"
-                    />
-                  </el-select>
-                </div>
-                <span v-else>{{ scope.row.isIdentification }}</span>
+                <el-button
+                    size="small"
+                    type="text"
+                    @click.native.prevent="deleteRow(scope.$index, detail.staffLocker)">
+                  移除
+                </el-button>
               </template>
             </el-table-column>
           </el-table-column>
-          <el-table-column
-              v-if="detail.isAdd||detail.isEdit"
-              label="操作"
-              width="100px">
-            <template slot-scope="scope">
-              <el-button
-                  size="small"
-                  type="text"
-                  @click.native.prevent="deleteRow(scope.$index, detail.cmldefLocker)">
-                移除
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table-column>
-      </el-table>
-      <div v-if="detail.isAdd||detail.isEdit" style="margin-top: 10px">
-        <el-input v-model="detail.cmldefRemark" placeholder="请输入备注" style="width: 100%"
-                  type="textarea"/>
-        <!--<el-form>
-          <el-form-item label="备注" label-width="80px" prop="detail.cmldefRemark">
-          </el-form-item>
-        </el-form>-->
-      </div>
-      <el-descriptions v-else :column="1" border class="margin-top" size="default">
-        <el-descriptions-item label="备注" label-style="width:100px">
-          {{ detail.cmldefRemark }}
-        </el-descriptions-item>
-      </el-descriptions>
-      <div>
-        <el-button v-if="detail.isAdd||detail.isEdit"
-                   icon="el-icon-plus"
-                   type="text"
-                   @click="addRow(detail.cmldefLocker)">
-          添加一行
-        </el-button>
-      </div>
+        </el-table>
+        <div v-if="detail.isAdd||detail.isEdit" style="margin-top: 10px">
+          <el-input v-model="detail.staffRemark" placeholder="请输入备注" style="width: 100%"
+                    type="textarea"/>
+          <!--<el-form>
+            <el-form-item label="备注" label-width="80px" prop="detail.staffRemark">
+            </el-form-item>
+          </el-form>-->
+        </div>
+        <el-descriptions v-else :column="1" border class="margin-top" size="default">
+          <el-descriptions-item label="备注" label-style="width:100px">
+            {{ detail.staffRemark }}
+          </el-descriptions-item>
+        </el-descriptions>
+        <div>
+          <el-button v-if="detail.isAdd||detail.isEdit"
+                     icon="el-icon-plus"
+                     type="text"
+                     @click="addRow(detail.staffLocker)">
+            添加一行
+          </el-button>
+        </div>
 
-      <el-table :data="detail.wardrobe" border style="margin: 20px 0 0 0;">
-        <el-table-column align="center" label="更衣柜">
-          <el-table-column align="center" label="检查内容">
-            <el-table-column align="center" label="没有存放污染工作服/工作鞋">
+        <el-table v-if="detail.row.sex!=1" :data="detail.cmldefLocker" border style="margin: 20px 0 0 0;">
+          <el-table-column align="center" label="自行车棚防化靴/防化服柜">
+            <el-table-column align="center" label="PPE种类" prop="ppeType">
               <template slot-scope="scope">
                 <div v-if="detail.isEdit||detail.isAdd">
-                  <el-select v-model="scope.row.noPollution" clearable
-                             placeholder="请选择是否没有存放污染工作服/工作鞋" size="small">
-                    <el-option
-                        v-for="dict in ppeCheckOptions"
-                        :key="dict.dictValue"
-                        :label="dict.dictLabel"
-                        :value="dict.dictValue"
-                    />
-                  </el-select>
+                  <el-input v-model="scope.row.ppeType" placehoder="请输入PPE种类"/>
                 </div>
-                <span v-else>{{ scope.row.noPollution }}</span>
+                <span v-else>{{ scope.row.ppeType }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="center" label="摆放符合要求">
-              <template slot-scope="scope">
-                <div v-if="detail.isEdit||detail.isAdd">
-                  <el-select v-model="scope.row.putAsRequired" clearable
-                             placeholder="请选择是否摆放符合要求" size="small">
-                    <el-option
-                        v-for="dict in ppeCheckOptions"
-                        :key="dict.dictValue"
-                        :label="dict.dictLabel"
-                        :value="dict.dictValue"
-                    />
-                  </el-select>
-                </div>
-                <span v-else>{{ scope.row.putAsRequired }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="未存放食物/饮料">
-              <template slot-scope="scope">
-                <div v-if="detail.isEdit||detail.isAdd">
-                  <el-select v-model="scope.row.noFood" clearable
-                             placeholder="请选择是否未存放食物/饮料" size="small">
-                    <el-option
-                        v-for="dict in ppeCheckOptions"
-                        :key="dict.dictValue"
-                        :label="dict.dictLabel"
-                        :value="dict.dictValue"
-                    />
-                  </el-select>
-                </div>
-                <span v-else>{{ scope.row.noFood }}</span>
-              </template>
+            <el-table-column align="center" label="检查内容">
+              <el-table-column align="center" label="应配备岗位" prop="usePost">
+                <template slot-scope="scope">
+                  <div v-if="detail.isEdit||detail.isAdd">
+                    <el-select v-model="scope.row.usePost" clearable multiple placeholder="请选择应配备岗位"
+                               size="small">
+                      <el-option
+                          v-for="dict in ppePostOptions"
+                          :key="dict.dictValue"
+                          :label="dict.dictLabel"
+                          :value="dict.dictValue"
+                      />
+                    </el-select>
+                  </div>
+                  <span v-else>{{ scope.row.usePost }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="是否配备" prop="isEquip">
+                <template slot-scope="scope">
+                  <div v-if="detail.isEdit||detail.isAdd">
+                    <el-select v-model="scope.row.isEquip" clearable placeholder="请选择是否配备" size="small">
+                      <el-option
+                          v-for="dict in ppeCheckOptions"
+                          :key="dict.dictValue"
+                          :label="dict.dictLabel"
+                          :value="dict.dictValue"
+                      />
+                    </el-select>
+                  </div>
+                  <span v-else>{{ scope.row.isEquip }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="是否无破损、未被污染" prop="isPollution">
+                <template slot-scope="scope">
+                  <div v-if="detail.isEdit||detail.isAdd">
+                    <el-select v-model="scope.row.isPollution" clearable placeholder="请选择是否无破损、未被污染"
+                               size="small">
+                      <el-option
+                          v-for="dict in ppeCheckOptions"
+                          :key="dict.dictValue"
+                          :label="dict.dictLabel"
+                          :value="dict.dictValue"
+                      />
+                    </el-select>
+                  </div>
+                  <span v-else>{{ scope.row.isPollution }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="摆放符合要求" prop="putAsRequired">
+                <template slot-scope="scope">
+                  <div v-if="detail.isEdit||detail.isAdd">
+                    <el-select v-model="scope.row.putAsRequired" clearable placeholder="请选择是否摆放符合要求"
+                               size="small">
+                      <el-option
+                          v-for="dict in ppeCheckOptions"
+                          :key="dict.dictValue"
+                          :label="dict.dictLabel"
+                          :value="dict.dictValue"
+                      />
+                    </el-select>
+                  </div>
+                  <span v-else>{{ scope.row.putAsRequired }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="检验合格的标识在有效期内" prop="isIdentification">
+                <template slot-scope="scope">
+                  <div v-if="detail.isEdit||detail.isAdd">
+                    <el-select v-model="scope.row.isIdentification" clearable
+                               placeholder="请选择是否检验合格的标识在有效期内" size="small">
+                      <el-option
+                          v-for="dict in ppeCheckOptions"
+                          :key="dict.dictValue"
+                          :label="dict.dictLabel"
+                          :value="dict.dictValue"
+                      />
+                    </el-select>
+                  </div>
+                  <span v-else>{{ scope.row.isIdentification }}</span>
+                </template>
+              </el-table-column>
             </el-table-column>
             <el-table-column
                 v-if="detail.isAdd||detail.isEdit"
@@ -498,45 +413,134 @@
                 <el-button
                     size="small"
                     type="text"
-                    @click.native.prevent="deleteRow(scope.$index, detail.wardrobe)">
+                    @click.native.prevent="deleteRow(scope.$index, detail.cmldefLocker)">
                   移除
                 </el-button>
               </template>
             </el-table-column>
           </el-table-column>
-        </el-table-column>
-      </el-table>
-      <div v-if="detail.isAdd||detail.isEdit" style="margin-top: 10px">
-        <el-input v-model="detail.wardrobeRemark" placeholder="请输入备注" style="width: 100%"
-                  type="textarea"/>
-        <!--<el-form>
-          <el-form-item label="备注" label-width="80px" prop="detail.wardrobeRemark">
-          </el-form-item>
-        </el-form>-->
-      </div>
-      <el-descriptions v-else :column="1" border class="margin-top" size="default">
-        <el-descriptions-item label="备注" label-style="width:100px">
-          {{ detail.wardrobeRemark }}
-        </el-descriptions-item>
-      </el-descriptions>
-      <div>
-        <el-button v-if="detail.isAdd||detail.isEdit"
-                   icon="el-icon-plus"
-                   type="text"
-                   @click="addRow(detail.wardrobe)">
-          添加一行
-        </el-button>
-      </div>
+        </el-table>
+        <div v-if="detail.isAdd||detail.isEdit" style="margin-top: 10px">
+          <el-input v-model="detail.cmldefRemark" placeholder="请输入备注" style="width: 100%"
+                    type="textarea"/>
+          <!--<el-form>
+            <el-form-item label="备注" label-width="80px" prop="detail.cmldefRemark">
+            </el-form-item>
+          </el-form>-->
+        </div>
+        <el-descriptions v-else :column="1" border class="margin-top" size="default">
+          <el-descriptions-item label="备注" label-style="width:100px">
+            {{ detail.cmldefRemark }}
+          </el-descriptions-item>
+        </el-descriptions>
+        <div>
+          <el-button v-if="detail.isAdd||detail.isEdit"
+                     icon="el-icon-plus"
+                     type="text"
+                     @click="addRow(detail.cmldefLocker)">
+            添加一行
+          </el-button>
+        </div>
 
-      <div v-if="detail.isEdit||detail.isAdd" slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitDetail">{{ $t('确 定') }}</el-button>
-        <el-button @click="cancelDetail">{{ $t('取 消') }}</el-button>
-      </div>
+        <el-table :data="detail.wardrobe" border style="margin: 20px 0 0 0;">
+          <el-table-column align="center" label="更衣柜">
+            <el-table-column align="center" label="检查内容">
+              <el-table-column align="center" label="没有存放污染工作服/工作鞋">
+                <template slot-scope="scope">
+                  <div v-if="detail.isEdit||detail.isAdd">
+                    <el-select v-model="scope.row.noPollution" clearable
+                               placeholder="请选择是否没有存放污染工作服/工作鞋" size="small">
+                      <el-option
+                          v-for="dict in ppeCheckOptions"
+                          :key="dict.dictValue"
+                          :label="dict.dictLabel"
+                          :value="dict.dictValue"
+                      />
+                    </el-select>
+                  </div>
+                  <span v-else>{{ scope.row.noPollution }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="摆放符合要求">
+                <template slot-scope="scope">
+                  <div v-if="detail.isEdit||detail.isAdd">
+                    <el-select v-model="scope.row.putAsRequired" clearable
+                               placeholder="请选择是否摆放符合要求" size="small">
+                      <el-option
+                          v-for="dict in ppeCheckOptions"
+                          :key="dict.dictValue"
+                          :label="dict.dictLabel"
+                          :value="dict.dictValue"
+                      />
+                    </el-select>
+                  </div>
+                  <span v-else>{{ scope.row.putAsRequired }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="未存放食物/饮料">
+                <template slot-scope="scope">
+                  <div v-if="detail.isEdit||detail.isAdd">
+                    <el-select v-model="scope.row.noFood" clearable
+                               placeholder="请选择是否未存放食物/饮料" size="small">
+                      <el-option
+                          v-for="dict in ppeCheckOptions"
+                          :key="dict.dictValue"
+                          :label="dict.dictLabel"
+                          :value="dict.dictValue"
+                      />
+                    </el-select>
+                  </div>
+                  <span v-else>{{ scope.row.noFood }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                  v-if="detail.isAdd||detail.isEdit"
+                  label="操作"
+                  width="100px">
+                <template slot-scope="scope">
+                  <el-button
+                      size="small"
+                      type="text"
+                      @click.native.prevent="deleteRow(scope.$index, detail.wardrobe)">
+                    移除
+                  </el-button>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+        </el-table>
+        <div v-if="detail.isAdd||detail.isEdit" style="margin-top: 10px">
+          <el-input v-model="detail.wardrobeRemark" placeholder="请输入备注" style="width: 100%"
+                    type="textarea"/>
+          <!--<el-form>
+            <el-form-item label="备注" label-width="80px" prop="detail.wardrobeRemark">
+            </el-form-item>
+          </el-form>-->
+        </div>
+        <el-descriptions v-else :column="1" border class="margin-top" size="default">
+          <el-descriptions-item label="备注" label-style="width:100px">
+            {{ detail.wardrobeRemark }}
+          </el-descriptions-item>
+        </el-descriptions>
+        <div>
+          <el-button v-if="detail.isAdd||detail.isEdit"
+                     icon="el-icon-plus"
+                     type="text"
+                     @click="addRow(detail.wardrobe)">
+            添加一行
+          </el-button>
+        </div>
+
+        <div v-if="detail.isEdit||detail.isAdd" slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitDetail">{{ $t('确 定') }}</el-button>
+          <el-button @click="cancelDetail">{{ $t('取 消') }}</el-button>
+        </div>
 
-      <div v-if="!detail.isEdit&&!detail.isAdd&&detail.checker&&detail.checkDate"
-           style="width: 100%;font-size: 20px;text-align: center;margin-top: 20px">
-        检查人：<span style="text-decoration: underline;margin-right: 200px">{{ detail.checker }}</span>
-        检查时间：<span style="text-decoration: underline;">{{ detail.checkDate }}</span>
+        <div v-if="!detail.isEdit&&!detail.isAdd&&detail.checker&&detail.checkDate"
+             style="width: 100%;font-size: 20px;text-align: center;margin-top: 20px">
+          检查人：<span style="text-decoration: underline;margin-right: 200px">{{ detail.checker }}</span>
+          检查时间：<span style="text-decoration: underline;">{{ detail.checkDate }}</span>
+        </div>
       </div>
     </el-dialog>