jiangbiao 1 gadu atpakaļ
vecāks
revīzija
08adb7721b

+ 15 - 1
master/src/main/java/com/ruoyi/project/production/controller/TPpeMatrixController.java

@@ -50,7 +50,11 @@ public class TPpeMatrixController extends BaseController {
         TPpePerson person = tPpePersonService.selectTPpePersonByEmployeeid(tPpeMain.getStaffId());
         TPpeMain main = new TPpeMain();
         List<TPpeWardrobe> wardrobes = new ArrayList<>();
-        wardrobes.add(new TPpeWardrobe());
+        TPpeWardrobe tPpeWardrobe = new TPpeWardrobe();
+        tPpeWardrobe.setPutAsRequired("是");
+        tPpeWardrobe.setNoFood("是");
+        tPpeWardrobe.setNoPollution("是");
+        wardrobes.add(tPpeWardrobe);
         main.setWardrobes(wardrobes);
         String post = "";
         if ("1".equals(person.getSex())) {
@@ -106,11 +110,21 @@ public class TPpeMatrixController extends BaseController {
         for (String checkItem : checkItems) {
             if (checkItem.contains("防化服") || checkItem.contains("防化靴")) {
                 TPpeCmldefLocker tPpeCmldefLocker = new TPpeCmldefLocker();
+                tPpeCmldefLocker.setIsEquip("是");
+                tPpeCmldefLocker.setIsPollution("是");
+                tPpeCmldefLocker.setIsIdentification("是");
+                tPpeCmldefLocker.setPutAsRequired("是");
                 tPpeCmldefLocker.setPpeType(checkItem);
                 tPpeCmldefLocker.setUsePost(post);
                 cmldefLockers.add(tPpeCmldefLocker);
             } else {
                 TPpeStaffLocker tPpeStaffLocker = new TPpeStaffLocker();
+                tPpeStaffLocker.setIsEquip("是");
+                tPpeStaffLocker.setIsPollution("是");
+                tPpeStaffLocker.setIsIdentification("是");
+                tPpeStaffLocker.setPutAsRequired("是");
+                tPpeStaffLocker.setIsRequire("是");
+                tPpeStaffLocker.setIsValidity("是");
                 tPpeStaffLocker.setPpeType(checkItem);
                 tPpeStaffLocker.setUsePost(post);
                 staffLockers.add(tPpeStaffLocker);

+ 17 - 17
master/src/main/resources/mybatis/production/TPpePersonMapper.xml

@@ -35,23 +35,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTPpePersonList" parameterType="TPpePerson" resultMap="TPpePersonResult">
         <include refid="selectTPpePersonVo"/>
         <where>
-            <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>
-            <if test="name != null  and name != ''"> and name like concat(concat('%', #{name}), '%')</if>
-            <if test="employeeid != null  and employeeid != ''"> and employeeid = #{employeeid}</if>
-            <if test="classes != null  and classes != ''"> and classes = #{classes}</if>
-            <if test="sex != null  and sex != ''"> and sex = #{sex}</if>
-            <if test="boiler != null  and boiler != ''"> and boiler = #{boiler}</if>
-            <if test="cracking != null  and cracking != ''"> and cracking = #{cracking}</if>
-            <if test="hotarea != null  and hotarea != ''"> and hotarea = #{hotarea}</if>
-            <if test="coldarea != null  and coldarea != ''"> and coldarea = #{coldarea}</if>
-            <if test="validity != null "> and validity = #{validity}</if>
-            <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
-            <if test="createdate != null "> and createdate = #{createdate}</if>
-            <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
-            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="operator != null  and operator != ''"> and operator = #{operator}</if>
+            <if test="plantCode != null  and plantCode != ''">and plant_code = #{plantCode}</if>
+            <if test="name != null  and name != ''">and name like concat(concat('%', #{name}), '%')</if>
+            <if test="employeeid != null  and employeeid != ''">and employeeid = #{employeeid}</if>
+            <if test="classes != null  and classes != ''">and classes = #{classes}</if>
+            <if test="sex != null  and sex != ''">and sex = #{sex}</if>
+            <if test="boiler =='true'">and boiler = '1'</if>
+            <if test="cracking =='true'">and cracking = '1'</if>
+            <if test="hotarea =='true'">and hotarea = '1'</if>
+            <if test="coldarea =='true'">and coldarea = '1'</if>
+            <if test="validity != null ">and validity = #{validity}</if>
+            <if test="createrCode != null  and createrCode != ''">and creater_code = #{createrCode}</if>
+            <if test="createdate != null ">and createdate = #{createdate}</if>
+            <if test="updaterCode != null  and updaterCode != ''">and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null ">and updatedate = #{updatedate}</if>
+            <if test="remarks != null  and remarks != ''">and remarks = #{remarks}</if>
+            <if test="deptId != null ">and dept_id = #{deptId}</if>
+            <if test="operator =='true'">and operator = '1'</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 105 - 126
ui/src/views/production/person/index.vue

@@ -10,15 +10,6 @@
           @change="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="员工号" prop="employeeid">
-        <el-input
-          v-model="queryParams.employeeid"
-          clearable
-          placeholder="请输入员工号"
-          size="small"
-          @change="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="班组" prop="classes">
         <el-select v-model="queryParams.classes" clearable placeholder="请选择班组" size="small"
                    @change="handleQuery">
@@ -41,6 +32,13 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="岗位">
+        <el-checkbox v-model="queryParams.boiler" value="1" @change="handleQuery">裂解</el-checkbox>
+        <el-checkbox v-model="queryParams.cracking" value="1" @change="handleQuery">热区</el-checkbox>
+        <el-checkbox v-model="queryParams.hotarea" value="1" @change="handleQuery">冷区</el-checkbox>
+        <el-checkbox v-model="queryParams.coldarea" value="1" @change="handleQuery">PGU/AEU</el-checkbox>
+        <el-checkbox v-model="queryParams.operator" value="1" @change="handleQuery">白班操作员</el-checkbox>
+      </el-form-item>
       <el-form-item>
         <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -193,19 +191,19 @@
                 <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-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-radio-group v-model="scope.row.isEquip">
-                        <el-radio-button :label="dict.dictLabel"  v-for="dict in ppeCheckOptions">
-                          {{ dict.dictLabel }}
-                        </el-radio-button>
-                      </el-radio-group>
+                      </el-select>
+                      <!--                      <el-radio-group v-model="scope.row.isEquip">
+                                              <el-radio-button :label="dict.dictLabel"  v-for="dict in ppeCheckOptions">
+                                                {{ dict.dictLabel }}
+                                              </el-radio-button>
+                                            </el-radio-group>-->
                     </div>
                     <span v-else>{{ scope.row.isEquip }}</span>
                   </template>
@@ -213,7 +211,7 @@
                 <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="请选择是否无破损、未被污染"
+                      <el-select v-model="scope.row.isPollution" clearable placeholder="请选择是否无破损、未被污染"
                                  size="small">
                         <el-option
                           v-for="dict in ppeCheckOptions"
@@ -221,12 +219,12 @@
                           :label="dict.dictLabel"
                           :value="dict.dictValue"
                         />
-                      </el-select>-->
-                      <el-radio-group v-model="scope.row.isPollution">
-                        <el-radio-button :label="dict.dictLabel"  v-for="dict in ppeCheckOptions">
-                          {{ dict.dictLabel }}
-                        </el-radio-button>
-                      </el-radio-group>
+                      </el-select>
+                      <!--                      <el-radio-group v-model="scope.row.isPollution">
+                                              <el-radio-button :label="dict.dictLabel"  v-for="dict in ppeCheckOptions">
+                                                {{ dict.dictLabel }}
+                                              </el-radio-button>
+                                            </el-radio-group>-->
                     </div>
                     <span v-else>{{ scope.row.isPollution }}</span>
                   </template>
@@ -234,7 +232,7 @@
                 <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="请选择是否摆放符合要求"
+                      <el-select v-model="scope.row.putAsRequired" clearable placeholder="请选择是否摆放符合要求"
                                  size="small">
                         <el-option
                           v-for="dict in ppeCheckOptions"
@@ -242,12 +240,12 @@
                           :label="dict.dictLabel"
                           :value="dict.dictValue"
                         />
-                      </el-select>-->
-                      <el-radio-group v-model="scope.row.putAsRequired">
-                        <el-radio-button :label="dict.dictLabel"  v-for="dict in ppeCheckOptions">
-                          {{ dict.dictLabel }}
-                        </el-radio-button>
-                      </el-radio-group>
+                      </el-select>
+                      <!--                      <el-radio-group v-model="scope.row.putAsRequired">
+                                              <el-radio-button :label="dict.dictLabel"  v-for="dict in ppeCheckOptions">
+                                                {{ dict.dictLabel }}
+                                              </el-radio-button>
+                                            </el-radio-group>-->
                     </div>
                     <span v-else>{{ scope.row.putAsRequired }}</span>
                   </template>
@@ -255,7 +253,7 @@
                 <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="请选择是否按要求贴“使用时间卡"
+                      <el-select v-model="scope.row.isRequire" clearable placeholder="请选择是否按要求贴“使用时间卡"
                                  size="small">
                         <el-option
                           v-for="dict in ppeCheckOptions"
@@ -263,12 +261,12 @@
                           :label="dict.dictLabel"
                           :value="dict.dictValue"
                         />
-                      </el-select>-->
-                      <el-radio-group v-model="scope.row.isRequire">
-                        <el-radio-button :label="dict.dictLabel"  v-for="dict in ppeCheckOptions">
-                          {{ dict.dictLabel }}
-                        </el-radio-button>
-                      </el-radio-group>
+                      </el-select>
+                      <!--                      <el-radio-group v-model="scope.row.isRequire">
+                                              <el-radio-button :label="dict.dictLabel"  v-for="dict in ppeCheckOptions">
+                                                {{ dict.dictLabel }}
+                                              </el-radio-button>
+                                            </el-radio-group>-->
                     </div>
                     <span v-else>{{ scope.row.isRequire }}</span>
                   </template>
@@ -276,7 +274,7 @@
                 <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="请选择是否在使用有效期内"
+                      <el-select v-model="scope.row.isValidity" clearable placeholder="请选择是否在使用有效期内"
                                  size="small">
                         <el-option
                           v-for="dict in ppeCheckOptions"
@@ -284,12 +282,12 @@
                           :label="dict.dictLabel"
                           :value="dict.dictValue"
                         />
-                      </el-select>-->
-                      <el-radio-group v-model="scope.row.isValidity">
-                        <el-radio-button :label="dict.dictLabel"  v-for="dict in ppeCheckOptions">
-                          {{ dict.dictLabel }}
-                        </el-radio-button>
-                      </el-radio-group>
+                      </el-select>
+                      <!--                      <el-radio-group v-model="scope.row.isValidity">
+                                              <el-radio-button :label="dict.dictLabel"  v-for="dict in ppeCheckOptions">
+                                                {{ dict.dictLabel }}
+                                              </el-radio-button>
+                                            </el-radio-group>-->
                     </div>
                     <span v-else>{{ scope.row.isValidity }}</span>
                   </template>
@@ -297,7 +295,7 @@
                 <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
+                      <el-select v-model="scope.row.isIdentification" clearable
                                  placeholder="请选择是否检验合格的标识在有效期内" size="small">
                         <el-option
                           v-for="dict in ppeCheckOptions"
@@ -305,12 +303,12 @@
                           :label="dict.dictLabel"
                           :value="dict.dictValue"
                         />
-                      </el-select>-->
-                      <el-radio-group v-model="scope.row.isIdentification">
-                        <el-radio-button :label="dict.dictLabel"  v-for="dict in ppeCheckOptions">
-                          {{ dict.dictLabel }}
-                        </el-radio-button>
-                      </el-radio-group>
+                      </el-select>
+                      <!--                      <el-radio-group v-model="scope.row.isIdentification">
+                                              <el-radio-button :label="dict.dictLabel"  v-for="dict in ppeCheckOptions">
+                                                {{ dict.dictLabel }}
+                                              </el-radio-button>
+                                            </el-radio-group>-->
                     </div>
                     <span v-else>{{ scope.row.isIdentification }}</span>
                   </template>
@@ -318,7 +316,7 @@
                 <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="请选择是否配有专用湿巾"
+                      <el-select v-model="detail.isWetTissue" clearable placeholder="请选择是否配有专用湿巾"
                                  size="small">
                         <el-option
                           v-for="dict in ppeCheckOptions"
@@ -326,12 +324,12 @@
                           :label="dict.dictLabel"
                           :value="dict.dictValue"
                         />
-                      </el-select>-->
-                      <el-radio-group v-model="detail.isWetTissue">
-                        <el-radio-button :label="dict.dictLabel"  v-for="dict in ppeCheckOptions">
-                          {{ dict.dictLabel }}
-                        </el-radio-button>
-                      </el-radio-group>
+                      </el-select>
+                      <!--                      <el-radio-group v-model="detail.isWetTissue">
+                                              <el-radio-button :label="dict.dictLabel"  v-for="dict in ppeCheckOptions">
+                                                {{ dict.dictLabel }}
+                                              </el-radio-button>
+                                            </el-radio-group>-->
                     </div>
                     <span v-else>{{ scope.row.isWetTissue }}</span>
                   </template>
@@ -380,19 +378,19 @@
                 <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-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-radio-group v-model="scope.row.isEquip">
-                        <el-radio-button :label="dict.dictLabel"  v-for="dict in ppeCheckOptions">
-                          {{ dict.dictLabel }}
-                        </el-radio-button>
-                      </el-radio-group>
+                      </el-select>
+                      <!--                      <el-radio-group v-model="scope.row.isEquip">
+                                              <el-radio-button :label="dict.dictLabel"  v-for="dict in ppeCheckOptions">
+                                                {{ dict.dictLabel }}
+                                              </el-radio-button>
+                                            </el-radio-group>-->
                     </div>
                     <span v-else>{{ scope.row.isEquip }}</span>
                   </template>
@@ -400,7 +398,7 @@
                 <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="请选择是否无破损、未被污染"
+                      <el-select v-model="scope.row.isPollution" clearable placeholder="请选择是否无破损、未被污染"
                                  size="small">
                         <el-option
                           v-for="dict in ppeCheckOptions"
@@ -408,12 +406,12 @@
                           :label="dict.dictLabel"
                           :value="dict.dictValue"
                         />
-                      </el-select>-->
-                      <el-radio-group v-model="scope.row.isPollution">
-                        <el-radio-button :label="dict.dictLabel"  v-for="dict in ppeCheckOptions">
-                          {{ dict.dictLabel }}
-                        </el-radio-button>
-                      </el-radio-group>
+                      </el-select>
+                      <!--                      <el-radio-group v-model="scope.row.isPollution">
+                                              <el-radio-button :label="dict.dictLabel"  v-for="dict in ppeCheckOptions">
+                                                {{ dict.dictLabel }}
+                                              </el-radio-button>
+                                            </el-radio-group>-->
                     </div>
                     <span v-else>{{ scope.row.isPollution }}</span>
                   </template>
@@ -421,7 +419,7 @@
                 <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="请选择是否摆放符合要求"
+                      <el-select v-model="scope.row.putAsRequired" clearable placeholder="请选择是否摆放符合要求"
                                  size="small">
                         <el-option
                           v-for="dict in ppeCheckOptions"
@@ -429,12 +427,12 @@
                           :label="dict.dictLabel"
                           :value="dict.dictValue"
                         />
-                      </el-select>-->
-                      <el-radio-group v-model="scope.row.putAsRequired">
-                        <el-radio-button :label="dict.dictLabel"  v-for="dict in ppeCheckOptions">
-                          {{ dict.dictLabel }}
-                        </el-radio-button>
-                      </el-radio-group>
+                      </el-select>
+                      <!--                      <el-radio-group v-model="scope.row.putAsRequired">
+                                              <el-radio-button :label="dict.dictLabel"  v-for="dict in ppeCheckOptions">
+                                                {{ dict.dictLabel }}
+                                              </el-radio-button>
+                                            </el-radio-group>-->
                     </div>
                     <span v-else>{{ scope.row.putAsRequired }}</span>
                   </template>
@@ -442,7 +440,7 @@
                 <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
+                      <el-select v-model="scope.row.isIdentification" clearable
                                  placeholder="请选择是否检验合格的标识在有效期内" size="small">
                         <el-option
                           v-for="dict in ppeCheckOptions"
@@ -450,12 +448,12 @@
                           :label="dict.dictLabel"
                           :value="dict.dictValue"
                         />
-                      </el-select>-->
-                      <el-radio-group v-model="scope.row.isIdentification">
-                        <el-radio-button :label="dict.dictLabel"  v-for="dict in ppeCheckOptions">
-                          {{ dict.dictLabel }}
-                        </el-radio-button>
-                      </el-radio-group>
+                      </el-select>
+                      <!--                      <el-radio-group v-model="scope.row.isIdentification">
+                                              <el-radio-button :label="dict.dictLabel"  v-for="dict in ppeCheckOptions">
+                                                {{ dict.dictLabel }}
+                                              </el-radio-button>
+                                            </el-radio-group>-->
                     </div>
                     <span v-else>{{ scope.row.isIdentification }}</span>
                   </template>
@@ -501,7 +499,7 @@
               <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
+                    <el-select v-model="scope.row.noPollution" clearable
                                placeholder="请选择是否没有存放污染工作服/工作鞋" size="small">
                       <el-option
                         v-for="dict in ppeCheckOptions"
@@ -509,12 +507,12 @@
                         :label="dict.dictLabel"
                         :value="dict.dictValue"
                       />
-                    </el-select>-->
-                    <el-radio-group v-model="scope.row.noPollution">
-                      <el-radio-button :label="dict.dictLabel"  v-for="dict in ppeCheckOptions">
-                        {{ dict.dictLabel }}
-                      </el-radio-button>
-                    </el-radio-group>
+                    </el-select>
+                    <!--                    <el-radio-group v-model="scope.row.noPollution">
+                                          <el-radio-button :label="dict.dictLabel"  v-for="dict in ppeCheckOptions">
+                                            {{ dict.dictLabel }}
+                                          </el-radio-button>
+                                        </el-radio-group>-->
                   </div>
                   <span v-else>{{ scope.row.noPollution }}</span>
                 </template>
@@ -522,7 +520,7 @@
               <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
+                    <el-select v-model="scope.row.putAsRequired" clearable
                                placeholder="请选择是否摆放符合要求" size="small">
                       <el-option
                         v-for="dict in ppeCheckOptions"
@@ -530,12 +528,12 @@
                         :label="dict.dictLabel"
                         :value="dict.dictValue"
                       />
-                    </el-select>-->
-                    <el-radio-group v-model="scope.row.putAsRequired">
-                      <el-radio-button :label="dict.dictLabel"  v-for="dict in ppeCheckOptions">
-                        {{ dict.dictLabel }}
-                      </el-radio-button>
-                    </el-radio-group>
+                    </el-select>
+                    <!--                    <el-radio-group v-model="scope.row.putAsRequired">
+                                          <el-radio-button :label="dict.dictLabel"  v-for="dict in ppeCheckOptions">
+                                            {{ dict.dictLabel }}
+                                          </el-radio-button>
+                                        </el-radio-group>-->
                   </div>
                   <span v-else>{{ scope.row.putAsRequired }}</span>
                 </template>
@@ -543,7 +541,7 @@
               <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
+                    <el-select v-model="scope.row.noFood" clearable
                                placeholder="请选择是否未存放食物/饮料" size="small">
                       <el-option
                         v-for="dict in ppeCheckOptions"
@@ -551,12 +549,12 @@
                         :label="dict.dictLabel"
                         :value="dict.dictValue"
                       />
-                    </el-select>-->
-                    <el-radio-group v-model="scope.row.noFood">
-                      <el-radio-button :label="dict.dictLabel"  v-for="dict in ppeCheckOptions">
-                        {{ dict.dictLabel }}
-                      </el-radio-button>
-                    </el-radio-group>
+                    </el-select>
+                    <!--                    <el-radio-group v-model="scope.row.noFood">
+                                          <el-radio-button :label="dict.dictLabel"  v-for="dict in ppeCheckOptions">
+                                            {{ dict.dictLabel }}
+                                          </el-radio-button>
+                                        </el-radio-group>-->
                   </div>
                   <span v-else>{{ scope.row.noFood }}</span>
                 </template>
@@ -783,17 +781,6 @@ export default {
   },
   methods: {
     submitDetail() {
-      if (this.detail.staffLocker)
-        this.detail.staffLocker.forEach(item => {
-          if (item.usePost)
-            item.usePost = item.usePost.join(',');
-          item.isWetTissue = this.detail.isWetTissue;
-        })
-      if (this.detail.cmldefLocker)
-        this.detail.cmldefLocker.forEach(item => {
-          if (item.usePost)
-            item.usePost = item.usePost.join(',');
-        })
       let data = {
         deptId: this.detail.row.deptId,
         staffId: this.detail.row.employeeid,
@@ -834,14 +821,6 @@ export default {
       this.detail.cmldefLocker = [];
       this.detail.wardrobe = [];
       listMatrixByPost({staffId: this.detail.row.employeeid}).then(res => {
-        if (res.data.staffLockers)
-          res.data.staffLockers.forEach(item => {
-            item.usePost = item.usePost.split('、');
-          })
-        if (res.data.cmldefLockers)
-          res.data.cmldefLockers.forEach(item => {
-            item.usePost = item.usePost.split('、');
-          })
         this.detail.staffLocker = res.data.staffLockers;
         this.detail.cmldefLocker = res.data.cmldefLockers;
         this.detail.wardrobe = res.data.wardrobes;