EOEG SAI

- 修改台账表头的TPM状态字段内容，修改为“现场已完成/现场未完成”
- 移除SAI级别小问号提示图标
- 隐患仅保留“不安全状态”和“不安全行为”单选框，删除对应的下拉框数据

ui/src/views/approve/approveDetail/eoeg-sai-apply-detail.vue

@@ -113,7 +113,7 @@
               </el-select>
             </el-form-item>
           </el-descriptions-item>
-          <el-descriptions-item label="片区" :span="1" v-if="dataForm.saiType == 'SAI' || (dataForm.saiType == 'TPM' && dataForm.tpmStatus == '未完成')">
+          <el-descriptions-item label="片区" :span="1" v-if="dataForm.saiType == 'SAI' || (dataForm.saiType == 'TPM' && dataForm.tpmStatus == '现场未完成')">
             <el-form-item prop="workArea">
               <el-select
                 disabled
@@ -126,7 +126,7 @@
               </el-select>
             </el-form-item>
           </el-descriptions-item>
-          <el-descriptions-item label="整改负责人" v-if="dataForm.saiType == 'SAI' || (dataForm.saiType == 'TPM' && dataForm.tpmStatus == '未完成')">
+          <el-descriptions-item label="整改负责人" v-if="dataForm.saiType == 'SAI' || (dataForm.saiType == 'TPM' && dataForm.tpmStatus == '现场未完成')">
             <el-form-item prop="executor">
               <el-select
                 filterable
@@ -185,27 +185,27 @@
           </el-descriptions-item>
           <el-descriptions-item label="隐患" :span="3" v-if="dataForm.saiType == 'SAI'">
             <el-radio v-model="unsafeChoice" label="1" style="margin-right: 10px;" :disabled="applyDisabled" @change="handleUnsafeChoiceChange">不安全状态</el-radio>
-            <el-form-item prop="unsafeStatus" style="display: inline-block;">
-              <el-select :disabled="applyDisabled" v-model="dataForm.unsafeStatus" placeholder="请选择不安全状态" style="margin-right: 20px;" clearable>
-                <el-option
-                  v-for="dict in unsafeStatusOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                ></el-option>
-              </el-select>
-            </el-form-item>
+            <!--<el-form-item prop="unsafeStatus" style="display: inline-block;">-->
+              <!--<el-select :disabled="applyDisabled" v-model="dataForm.unsafeStatus" placeholder="请选择不安全状态" style="margin-right: 20px;" clearable>-->
+                <!--<el-option-->
+                  <!--v-for="dict in unsafeStatusOptions"-->
+                  <!--:key="dict.dictValue"-->
+                  <!--:label="dict.dictLabel"-->
+                  <!--:value="dict.dictValue"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
             <el-radio v-model="unsafeChoice" label="2" style="margin-right: 10px;" :disabled="applyDisabled" @change="handleUnsafeChoiceChange">不安全行为</el-radio>
-            <el-form-item prop="unsafeAction" style="display: inline-block;">
-              <el-select :disabled="applyDisabled" v-model="dataForm.unsafeAction" placeholder="请选择不安全行为" clearable>
-                <el-option
-                  v-for="dict in unsafeActionOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                ></el-option>
-              </el-select>
-            </el-form-item>
+            <!--<el-form-item prop="unsafeAction" style="display: inline-block;">-->
+              <!--<el-select :disabled="applyDisabled" v-model="dataForm.unsafeAction" placeholder="请选择不安全行为" clearable>-->
+                <!--<el-option-->
+                  <!--v-for="dict in unsafeActionOptions"-->
+                  <!--:key="dict.dictValue"-->
+                  <!--:label="dict.dictLabel"-->
+                  <!--:value="dict.dictValue"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
           </el-descriptions-item>
           <el-descriptions-item label="登记时间">
             <el-form-item prop="applyDate">

ui/src/views/production/eoegapply/all/index.vue

@@ -17,8 +17,8 @@
         <el-select
           v-model="queryParams.tpmStatus"
           placeholder="请选择TPM状态">
-          <el-option key="未完成" label="未完成" value="未完成"></el-option>
-          <el-option key="已完成" label="已完成" value="已完成"></el-option>
+          <el-option key="现场未完成" label="现场未完成" value="现场未完成"></el-option>
+          <el-option key="现场已完成" label="现场已完成" value="现场已完成"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="登记人部门" prop="applicantDept">
@@ -192,11 +192,11 @@
     <el-table v-loading="loading" :data="applyList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="SAI类型" align="center" prop="saiType" :show-overflow-tooltip="true" width="80"/>
-      <el-table-column label="TPM状态" align="center" prop="tpmStatus" :show-overflow-tooltip="true" width="80">
+      <el-table-column label="TPM状态" align="center" prop="tpmStatus" :show-overflow-tooltip="true" width="100">
         <template slot-scope="scope">
           <span v-if="scope.row.saiType=='TPM'">
-            <span v-if="scope.row.tpmStatus == '已完成'"><el-tag type="success">已完成</el-tag></span>
-            <span v-if="scope.row.tpmStatus == '未完成'"><el-tag type="info">未完成</el-tag></span>
+            <span v-if="scope.row.tpmStatus == '现场已完成'"><el-tag type="success">现场已完成</el-tag></span>
+            <span v-if="scope.row.tpmStatus == '现场未完成'"><el-tag type="info">现场未完成</el-tag></span>
           </span>
           <span v-if="scope.row.saiType=='SAI'">/</span>
         </template>
@@ -204,14 +204,14 @@
       <el-table-column label="问题描述" align="center" prop="description" :show-overflow-tooltip="true" width="200"/>
       <el-table-column label="片区" align="center" prop="workArea" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <span v-if="scope.row.saiType=='TPM' && scope.row.tpmStatus == '已完成'">/</span>
-          <span v-if="!(scope.row.saiType=='TPM' && scope.row.tpmStatus == '已完成')">{{scope.row.workArea}}</span>
+          <span v-if="scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场已完成'">/</span>
+          <span v-if="!(scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场已完成')">{{scope.row.workArea}}</span>
         </template>
       </el-table-column>
       <el-table-column label="申请状态" align="center" prop="applyStatus" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <span v-if="scope.row.saiType=='TPM' && scope.row.tpmStatus == '已完成'">/</span>
-          <span v-if="!(scope.row.saiType=='TPM' && scope.row.tpmStatus == '已完成')">
+          <span v-if="scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场已完成'">/</span>
+          <span v-if="!(scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场已完成')">
             <span v-if="scope.row.applyStatus == 0"><el-tag type="info">未提交</el-tag></span>
             <span v-if="scope.row.applyStatus == 1"><el-tag type="warning">待评估</el-tag></span>
             <span v-if="scope.row.applyStatus == 2"><el-tag type="warning">进行中</el-tag></span>
@@ -227,8 +227,8 @@
       <el-table-column label="当前处理人" align="center" prop="handlerName" :show-overflow-tooltip="true"/>
       <el-table-column label="整改负责人" align="center" prop="executorName" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <span v-if="scope.row.saiType=='TPM' && scope.row.tpmStatus == '已完成'">/</span>
-          <span v-if="!(scope.row.saiType=='TPM' && scope.row.tpmStatus == '已完成')">{{scope.row.executorName}}</span>
+          <span v-if="scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场已完成'">/</span>
+          <span v-if="!(scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场已完成')">{{scope.row.executorName}}</span>
         </template>
       </el-table-column>
       <el-table-column label="登记时间" align="center" prop="applyDate" width="100" sortable>
@@ -238,14 +238,14 @@
       </el-table-column>
       <el-table-column label="预计完成时间" align="center" prop="estimateFinishDate" width="100" sortable>
         <template slot-scope="scope">
-          <span v-if="scope.row.saiType=='TPM' && scope.row.tpmStatus == '已完成'">/</span>
-          <span v-if="!(scope.row.saiType=='TPM' && scope.row.tpmStatus == '已完成')">{{ parseTime(scope.row.estimateFinishDate, '{y}-{m}-{d}') }}</span>
+          <span v-if="scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场已完成'">/</span>
+          <span v-if="!(scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场已完成')">{{ parseTime(scope.row.estimateFinishDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="实际完成时间" align="center" prop="actualFinishDate" width="100">
         <template slot-scope="scope">
-          <span v-if="scope.row.saiType=='TPM' && scope.row.tpmStatus == '已完成'">/</span>
-          <span v-if="!(scope.row.saiType=='TPM' && scope.row.tpmStatus == '已完成')">{{ parseTime(scope.row.actualFinishDate, '{y}-{m}-{d}') }}</span>
+          <span v-if="scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场已完成'">/</span>
+          <span v-if="!(scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场已完成')">{{ parseTime(scope.row.actualFinishDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="SAI级别" align="center" prop="saiLevel" :show-overflow-tooltip="true">
@@ -279,7 +279,7 @@
             size="mini"
             type="text"
             @click="processImg(scope.row.processId)"
-            v-if="scope.row.applyStatus != 0 && (scope.row.saiType=='SAI' || (scope.row.saiType=='TPM' && scope.row.tpmStatus == '未完成'))"
+            v-if="scope.row.applyStatus != 0 && (scope.row.saiType=='SAI' || (scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场未完成'))"
           >{{ $t('流程图') }}</el-button>
           <!--<el-button-->
             <!--size="mini"-->
@@ -325,8 +325,8 @@
               <el-select
                 v-model="form.tpmStatus"
                 placeholder="请选择TPM状态">
-                <el-option key="未完成" label="未完成" value="未完成"></el-option>
-                <el-option key="已完成" label="已完成" value="已完成"></el-option>
+                <el-option key="现场未完成" label="现场未完成" value="现场未完成"></el-option>
+                <el-option key="现场已完成" label="现场已完成" value="现场已完成"></el-option>
               </el-select>
             </el-form-item>
           </el-descriptions-item>
@@ -382,9 +382,9 @@
             </el-form-item>
           </el-descriptions-item>
           <el-descriptions-item label="问题描述" :span="3">
-            <el-form-item prop="description">
-              <el-input v-model="form.description" placeholder="请输入问题描述" type="textarea" :rows="3" />
-            </el-form-item>
+          <el-form-item prop="description">
+            <el-input v-model="form.description" placeholder="请输入问题描述" type="textarea" :rows="3" />
+          </el-form-item>
           </el-descriptions-item>
           <el-descriptions-item label="采取的措施" :span="3">
             <el-form-item prop="reaction">
@@ -398,9 +398,9 @@
                 <el-option key="2" label="2" value="2"></el-option>
                 <el-option key="3" label="3" value="3"></el-option>
               </el-select>
-              <span @click="saiTypeInfo = true" style="padding-left: 5px; cursor: pointer;">
-                <i class="el-icon-question"></i>
-              </span>
+              <!--<span @click="saiTypeInfo = true" style="padding-left: 5px; cursor: pointer;">-->
+              <!--<i class="el-icon-question"></i>-->
+              <!--</span>-->
             </el-form-item>
           </el-descriptions-item>
           <el-descriptions-item label="SAI类别" :span="2" v-if="form.saiType == 'SAI'">
@@ -420,7 +420,7 @@
               </el-select>
             </el-form-item>
           </el-descriptions-item>
-          <el-descriptions-item label="片区" :span="1" v-if="form.saiType == 'SAI' || (form.saiType == 'TPM' && form.tpmStatus == '未完成')">
+          <el-descriptions-item label="片区" :span="1" v-if="form.saiType == 'SAI' || (form.saiType == 'TPM' && form.tpmStatus == '现场未完成')">
             <el-form-item prop="workArea">
               <el-select
                 @change="handleSaiCategoryChange"
@@ -433,7 +433,7 @@
               </el-select>
             </el-form-item>
           </el-descriptions-item>
-          <el-descriptions-item label="整改负责人" :span="2" v-if="form.saiType == 'SAI' || (form.saiType == 'TPM' && form.tpmStatus == '未完成')">
+          <el-descriptions-item label="整改负责人" :span="2" v-if="form.saiType == 'SAI' || (form.saiType == 'TPM' && form.tpmStatus == '现场未完成')">
             <el-form-item prop="executor">
               <el-select
                 filterable
@@ -452,27 +452,27 @@
           </el-descriptions-item>
           <el-descriptions-item label="隐患" :span="3" v-if="form.saiType == 'SAI'">
             <el-radio v-model="unsafeChoice" label="1" @change="handleUnsafeChoiceChange" style="margin-right: 10px;">不安全状态</el-radio>
-            <el-form-item prop="unsafeStatus" style="display: inline-block;">
-              <el-select v-model="form.unsafeStatus" filterable placeholder="请选择不安全状态" :disabled="unsafeStatusDisabled" style="margin-right: 20px;" clearable>
-                <el-option
-                  v-for="dict in unsafeStatusOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                ></el-option>
-              </el-select>
-            </el-form-item>
+            <!--<el-form-item prop="unsafeStatus" style="display: inline-block;">-->
+              <!--<el-select v-model="form.unsafeStatus" filterable placeholder="请选择不安全状态" :disabled="unsafeStatusDisabled" style="margin-right: 20px;" clearable>-->
+                <!--<el-option-->
+                  <!--v-for="dict in unsafeStatusOptions"-->
+                  <!--:key="dict.dictValue"-->
+                  <!--:label="dict.dictLabel"-->
+                  <!--:value="dict.dictValue"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
             <el-radio v-model="unsafeChoice" label="2" @change="handleUnsafeChoiceChange" style="margin-right: 10px;">不安全行为</el-radio>
-            <el-form-item prop="unsafeAction" style="display: inline-block;">
-              <el-select v-model="form.unsafeAction" filterable placeholder="请选择不安全行为" :disabled="unsafeActionDisabled" clearable>
-                <el-option
-                  v-for="dict in unsafeActionOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                ></el-option>
-              </el-select>
-            </el-form-item>
+            <!--<el-form-item prop="unsafeAction" style="display: inline-block;">-->
+              <!--<el-select v-model="form.unsafeAction" filterable placeholder="请选择不安全行为" :disabled="unsafeActionDisabled" clearable>-->
+                <!--<el-option-->
+                  <!--v-for="dict in unsafeActionOptions"-->
+                  <!--:key="dict.dictValue"-->
+                  <!--:label="dict.dictLabel"-->
+                  <!--:value="dict.dictValue"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
           </el-descriptions-item>
           <el-descriptions-item label="附件" :span="3">
             <el-form-item label="" prop="fileUrl">
@@ -550,8 +550,8 @@
         </el-descriptions>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="form.saiType == 'TPM' && form.tpmStatus == '已完成'" type="primary" @click="submitForm">保 存 TPM</el-button>
-        <el-button v-if="form.saiType == 'TPM' && form.tpmStatus == '未完成'" type="primary" @click="handleSaveAndSubmit">提 交 TPM</el-button>
+        <el-button v-if="form.saiType == 'TPM' && form.tpmStatus == '现场已完成'" type="primary" @click="submitForm">保 存 TPM</el-button>
+        <el-button v-if="form.saiType == 'TPM' && form.tpmStatus == '现场未完成'" type="primary" @click="handleSaveAndSubmit">提 交 TPM</el-button>
         <el-button v-if="form.saiType == 'SAI'" type="primary" @click="handleSaveAndSubmit" :disabled="submitDisabled">提 交 SAI</el-button>
         <el-button v-if="form.saiType == 'SAI'" @click="submitForm" :disabled="submitDisabled">保 存 SAI</el-button>
         <el-button @click="cancel">取 消</el-button>

ui/src/views/production/eoegapply/mine/index.vue

@@ -17,8 +17,8 @@
         <el-select
           v-model="queryParams.tpmStatus"
           placeholder="请选择TPM状态">
-          <el-option key="未完成" label="未完成" value="未完成"></el-option>
-          <el-option key="已完成" label="已完成" value="已完成"></el-option>
+          <el-option key="现场未完成" label="现场未完成" value="现场未完成"></el-option>
+          <el-option key="现场已完成" label="现场已完成" value="现场已完成"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="登记人部门" prop="applicantDept">
@@ -185,11 +185,11 @@
     <el-table v-loading="loading" :data="applyList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="SAI类型" align="center" prop="saiType" :show-overflow-tooltip="true" width="80"/>
-      <el-table-column label="TPM状态" align="center" prop="tpmStatus" :show-overflow-tooltip="true" width="80">
+      <el-table-column label="TPM状态" align="center" prop="tpmStatus" :show-overflow-tooltip="true" width="100">
         <template slot-scope="scope">
           <span v-if="scope.row.saiType=='TPM'">
-            <span v-if="scope.row.tpmStatus == '已完成'"><el-tag type="success">已完成</el-tag></span>
-            <span v-if="scope.row.tpmStatus == '未完成'"><el-tag type="info">未完成</el-tag></span>
+            <span v-if="scope.row.tpmStatus == '现场已完成'"><el-tag type="success">现场已完成</el-tag></span>
+            <span v-if="scope.row.tpmStatus == '现场未完成'"><el-tag type="info">现场未完成</el-tag></span>
           </span>
           <span v-if="scope.row.saiType=='SAI'">/</span>
         </template>
@@ -197,14 +197,14 @@
       <el-table-column label="问题描述" align="center" prop="description" :show-overflow-tooltip="true" width="200"/>
       <el-table-column label="片区" align="center" prop="workArea" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <span v-if="scope.row.saiType=='TPM' && scope.row.tpmStatus == '已完成'">/</span>
-          <span v-if="!(scope.row.saiType=='TPM' && scope.row.tpmStatus == '已完成')">{{scope.row.workArea}}</span>
+          <span v-if="scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场已完成'">/</span>
+          <span v-if="!(scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场已完成')">{{scope.row.workArea}}</span>
         </template>
       </el-table-column>
       <el-table-column label="申请状态" align="center" prop="applyStatus" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <span v-if="scope.row.saiType=='TPM' && scope.row.tpmStatus == '已完成'">/</span>
-          <span v-if="!(scope.row.saiType=='TPM' && scope.row.tpmStatus == '已完成')">
+          <span v-if="scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场已完成'">/</span>
+          <span v-if="!(scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场已完成')">
             <span v-if="scope.row.applyStatus == 0"><el-tag type="info">未提交</el-tag></span>
             <span v-if="scope.row.applyStatus == 1"><el-tag type="warning">待评估</el-tag></span>
             <span v-if="scope.row.applyStatus == 2"><el-tag type="warning">进行中</el-tag></span>
@@ -220,8 +220,8 @@
       <el-table-column label="当前处理人" align="center" prop="handlerName" :show-overflow-tooltip="true"/>
       <el-table-column label="整改负责人" align="center" prop="executorName" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <span v-if="scope.row.saiType=='TPM' && scope.row.tpmStatus == '已完成'">/</span>
-          <span v-if="!(scope.row.saiType=='TPM' && scope.row.tpmStatus == '已完成')">{{scope.row.executorName}}</span>
+          <span v-if="scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场已完成'">/</span>
+          <span v-if="!(scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场已完成')">{{scope.row.executorName}}</span>
         </template>
       </el-table-column>
       <el-table-column label="登记时间" align="center" prop="applyDate" width="100" sortable>
@@ -231,14 +231,14 @@
       </el-table-column>
       <el-table-column label="预计完成时间" align="center" prop="estimateFinishDate" width="100" sortable>
         <template slot-scope="scope">
-          <span v-if="scope.row.saiType=='TPM' && scope.row.tpmStatus == '已完成'">/</span>
-          <span v-if="!(scope.row.saiType=='TPM' && scope.row.tpmStatus == '已完成')">{{ parseTime(scope.row.estimateFinishDate, '{y}-{m}-{d}') }}</span>
+          <span v-if="scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场已完成'">/</span>
+          <span v-if="!(scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场已完成')">{{ parseTime(scope.row.estimateFinishDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="实际完成时间" align="center" prop="actualFinishDate" width="100">
         <template slot-scope="scope">
-          <span v-if="scope.row.saiType=='TPM' && scope.row.tpmStatus == '已完成'">/</span>
-          <span v-if="!(scope.row.saiType=='TPM' && scope.row.tpmStatus == '已完成')">{{ parseTime(scope.row.actualFinishDate, '{y}-{m}-{d}') }}</span>
+          <span v-if="scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场已完成'">/</span>
+          <span v-if="!(scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场已完成')">{{ parseTime(scope.row.actualFinishDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="SAI级别" align="center" prop="saiLevel" :show-overflow-tooltip="true">
@@ -272,7 +272,7 @@
             size="mini"
             type="text"
             @click="processImg(scope.row.processId)"
-            v-if="scope.row.applyStatus != 0 && (scope.row.saiType=='SAI' || (scope.row.saiType=='TPM' && scope.row.tpmStatus == '未完成'))"
+            v-if="scope.row.applyStatus != 0 && (scope.row.saiType=='SAI' || (scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场未完成'))"
           >{{ $t('流程图') }}</el-button>
           <!--<el-button-->
             <!--size="mini"-->
@@ -318,8 +318,8 @@
               <el-select
                 v-model="form.tpmStatus"
                 placeholder="请选择TPM状态">
-                <el-option key="未完成" label="未完成" value="未完成"></el-option>
-                <el-option key="已完成" label="已完成" value="已完成"></el-option>
+                <el-option key="现场未完成" label="现场未完成" value="现场未完成"></el-option>
+                <el-option key="现场已完成" label="现场已完成" value="现场已完成"></el-option>
               </el-select>
             </el-form-item>
           </el-descriptions-item>
@@ -391,9 +391,9 @@
                 <el-option key="2" label="2" value="2"></el-option>
                 <el-option key="3" label="3" value="3"></el-option>
               </el-select>
-              <span @click="saiTypeInfo = true" style="padding-left: 5px; cursor: pointer;">
-                <i class="el-icon-question"></i>
-              </span>
+              <!--<span @click="saiTypeInfo = true" style="padding-left: 5px; cursor: pointer;">-->
+                <!--<i class="el-icon-question"></i>-->
+              <!--</span>-->
             </el-form-item>
           </el-descriptions-item>
           <el-descriptions-item label="SAI类别" :span="2" v-if="form.saiType == 'SAI'">
@@ -413,7 +413,7 @@
               </el-select>
             </el-form-item>
           </el-descriptions-item>
-          <el-descriptions-item label="片区" :span="1" v-if="form.saiType == 'SAI' || (form.saiType == 'TPM' && form.tpmStatus == '未完成')">
+          <el-descriptions-item label="片区" :span="1" v-if="form.saiType == 'SAI' || (form.saiType == 'TPM' && form.tpmStatus == '现场未完成')">
             <el-form-item prop="workArea">
               <el-select
                 @change="handleSaiCategoryChange"
@@ -426,7 +426,7 @@
               </el-select>
             </el-form-item>
           </el-descriptions-item>
-          <el-descriptions-item label="整改负责人" :span="2" v-if="form.saiType == 'SAI' || (form.saiType == 'TPM' && form.tpmStatus == '未完成')">
+          <el-descriptions-item label="整改负责人" :span="2" v-if="form.saiType == 'SAI' || (form.saiType == 'TPM' && form.tpmStatus == '现场未完成')">
             <el-form-item prop="executor">
               <el-select
                 filterable
@@ -445,27 +445,27 @@
           </el-descriptions-item>
           <el-descriptions-item label="隐患" :span="3" v-if="form.saiType == 'SAI'">
             <el-radio v-model="unsafeChoice" label="1" @change="handleUnsafeChoiceChange" style="margin-right: 10px;">不安全状态</el-radio>
-            <el-form-item prop="unsafeStatus" style="display: inline-block;">
-              <el-select v-model="form.unsafeStatus" filterable placeholder="请选择不安全状态" :disabled="unsafeStatusDisabled" style="margin-right: 20px;" clearable>
-                <el-option
-                  v-for="dict in unsafeStatusOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                ></el-option>
-              </el-select>
-            </el-form-item>
+            <!--<el-form-item prop="unsafeStatus" style="display: inline-block;">-->
+              <!--<el-select v-model="form.unsafeStatus" filterable placeholder="请选择不安全状态" :disabled="unsafeStatusDisabled" style="margin-right: 20px;" clearable>-->
+                <!--<el-option-->
+                  <!--v-for="dict in unsafeStatusOptions"-->
+                  <!--:key="dict.dictValue"-->
+                  <!--:label="dict.dictLabel"-->
+                  <!--:value="dict.dictValue"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
             <el-radio v-model="unsafeChoice" label="2" @change="handleUnsafeChoiceChange" style="margin-right: 10px;">不安全行为</el-radio>
-            <el-form-item prop="unsafeAction" style="display: inline-block;">
-              <el-select v-model="form.unsafeAction" filterable placeholder="请选择不安全行为" :disabled="unsafeActionDisabled" clearable>
-                <el-option
-                  v-for="dict in unsafeActionOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                ></el-option>
-              </el-select>
-            </el-form-item>
+            <!--<el-form-item prop="unsafeAction" style="display: inline-block;">-->
+              <!--<el-select v-model="form.unsafeAction" filterable placeholder="请选择不安全行为" :disabled="unsafeActionDisabled" clearable>-->
+                <!--<el-option-->
+                  <!--v-for="dict in unsafeActionOptions"-->
+                  <!--:key="dict.dictValue"-->
+                  <!--:label="dict.dictLabel"-->
+                  <!--:value="dict.dictValue"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
           </el-descriptions-item>
           <el-descriptions-item label="附件" :span="3">
             <el-form-item label="" prop="fileUrl">
@@ -543,8 +543,8 @@
         </el-descriptions>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="form.saiType == 'TPM' && form.tpmStatus == '已完成'" type="primary" @click="submitForm">保 存 TPM</el-button>
-        <el-button v-if="form.saiType == 'TPM' && form.tpmStatus == '未完成'" type="primary" @click="handleSaveAndSubmit">提 交 TPM</el-button>
+        <el-button v-if="form.saiType == 'TPM' && form.tpmStatus == '现场已完成'" type="primary" @click="submitForm">保 存 TPM</el-button>
+        <el-button v-if="form.saiType == 'TPM' && form.tpmStatus == '现场未完成'" type="primary" @click="handleSaveAndSubmit">提 交 TPM</el-button>
         <el-button v-if="form.saiType == 'SAI'" type="primary" @click="handleSaveAndSubmit" :disabled="submitDisabled">提 交 SAI</el-button>
         <el-button v-if="form.saiType == 'SAI'" @click="submitForm" :disabled="submitDisabled">保 存 SAI</el-button>
         <el-button @click="cancel">取 消</el-button>

ui/src/views/production/eoegapply/pending/index.vue

@@ -17,8 +17,8 @@
         <el-select
           v-model="queryParams.tpmStatus"
           placeholder="请选择TPM状态">
-          <el-option key="未完成" label="未完成" value="未完成"></el-option>
-          <el-option key="已完成" label="已完成" value="已完成"></el-option>
+          <el-option key="现场未完成" label="现场未完成" value="现场未完成"></el-option>
+          <el-option key="现场已完成" label="现场已完成" value="现场已完成"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="登记人部门" prop="applicantDept">
@@ -185,11 +185,11 @@
     <el-table v-loading="loading" :data="applyList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="SAI类型" align="center" prop="saiType" :show-overflow-tooltip="true" width="80"/>
-      <el-table-column label="TPM状态" align="center" prop="tpmStatus" :show-overflow-tooltip="true" width="80">
+      <el-table-column label="TPM状态" align="center" prop="tpmStatus" :show-overflow-tooltip="true" width="100">
         <template slot-scope="scope">
           <span v-if="scope.row.saiType=='TPM'">
-            <span v-if="scope.row.tpmStatus == '已完成'"><el-tag type="success">已完成</el-tag></span>
-            <span v-if="scope.row.tpmStatus == '未完成'"><el-tag type="info">未完成</el-tag></span>
+            <span v-if="scope.row.tpmStatus == '现场已完成'"><el-tag type="success">已完成</el-tag></span>
+            <span v-if="scope.row.tpmStatus == '现场未完成'"><el-tag type="info">未完成</el-tag></span>
           </span>
           <span v-if="scope.row.saiType=='SAI'">/</span>
         </template>
@@ -197,14 +197,14 @@
       <el-table-column label="问题描述" align="center" prop="description" :show-overflow-tooltip="true" width="200"/>
       <el-table-column label="片区" align="center" prop="workArea" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <span v-if="scope.row.saiType=='TPM' && scope.row.tpmStatus == '已完成'">/</span>
-          <span v-if="!(scope.row.saiType=='TPM' && scope.row.tpmStatus == '已完成')">{{scope.row.workArea}}</span>
+          <span v-if="scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场已完成'">/</span>
+          <span v-if="!(scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场已完成')">{{scope.row.workArea}}</span>
         </template>
       </el-table-column>
       <el-table-column label="申请状态" align="center" prop="applyStatus" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <span v-if="scope.row.saiType=='TPM' && scope.row.tpmStatus == '已完成'">/</span>
-          <span v-if="!(scope.row.saiType=='TPM' && scope.row.tpmStatus == '已完成')">
+          <span v-if="scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场已完成'">/</span>
+          <span v-if="!(scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场已完成')">
             <span v-if="scope.row.applyStatus == 0"><el-tag type="info">未提交</el-tag></span>
             <span v-if="scope.row.applyStatus == 1"><el-tag type="warning">待评估</el-tag></span>
             <span v-if="scope.row.applyStatus == 2"><el-tag type="warning">进行中</el-tag></span>
@@ -220,8 +220,8 @@
       <el-table-column label="当前处理人" align="center" prop="handlerName" :show-overflow-tooltip="true"/>
       <el-table-column label="整改负责人" align="center" prop="executorName" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <span v-if="scope.row.saiType=='TPM' && scope.row.tpmStatus == '已完成'">/</span>
-          <span v-if="!(scope.row.saiType=='TPM' && scope.row.tpmStatus == '已完成')">{{scope.row.executorName}}</span>
+          <span v-if="scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场已完成'">/</span>
+          <span v-if="!(scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场已完成')">{{scope.row.executorName}}</span>
         </template>
       </el-table-column>
       <el-table-column label="登记时间" align="center" prop="applyDate" width="100" sortable>
@@ -231,14 +231,14 @@
       </el-table-column>
       <el-table-column label="预计完成时间" align="center" prop="estimateFinishDate" width="100" sortable>
         <template slot-scope="scope">
-          <span v-if="scope.row.saiType=='TPM' && scope.row.tpmStatus == '已完成'">/</span>
-          <span v-if="!(scope.row.saiType=='TPM' && scope.row.tpmStatus == '已完成')">{{ parseTime(scope.row.estimateFinishDate, '{y}-{m}-{d}') }}</span>
+          <span v-if="scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场已完成'">/</span>
+          <span v-if="!(scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场已完成')">{{ parseTime(scope.row.estimateFinishDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="实际完成时间" align="center" prop="actualFinishDate" width="100">
         <template slot-scope="scope">
-          <span v-if="scope.row.saiType=='TPM' && scope.row.tpmStatus == '已完成'">/</span>
-          <span v-if="!(scope.row.saiType=='TPM' && scope.row.tpmStatus == '已完成')">{{ parseTime(scope.row.actualFinishDate, '{y}-{m}-{d}') }}</span>
+          <span v-if="scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场已完成'">/</span>
+          <span v-if="!(scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场已完成')">{{ parseTime(scope.row.actualFinishDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="SAI级别" align="center" prop="saiLevel" :show-overflow-tooltip="true">
@@ -272,7 +272,7 @@
             size="mini"
             type="text"
             @click="processImg(scope.row.processId)"
-            v-if="scope.row.applyStatus != 0 && (scope.row.saiType=='SAI' || (scope.row.saiType=='TPM' && scope.row.tpmStatus == '未完成'))"
+            v-if="scope.row.applyStatus != 0 && (scope.row.saiType=='SAI' || (scope.row.saiType=='TPM' && scope.row.tpmStatus == '现场未完成'))"
           >{{ $t('流程图') }}</el-button>
           <!--<el-button-->
             <!--size="mini"-->
@@ -318,8 +318,8 @@
               <el-select
                 v-model="form.tpmStatus"
                 placeholder="请选择TPM状态">
-                <el-option key="未完成" label="未完成" value="未完成"></el-option>
-                <el-option key="已完成" label="已完成" value="已完成"></el-option>
+                <el-option key="现场未完成" label="现场未完成" value="现场未完成"></el-option>
+                <el-option key="现场已完成" label="现场已完成" value="现场已完成"></el-option>
               </el-select>
             </el-form-item>
           </el-descriptions-item>
@@ -391,9 +391,9 @@
                 <el-option key="2" label="2" value="2"></el-option>
                 <el-option key="3" label="3" value="3"></el-option>
               </el-select>
-              <span @click="saiTypeInfo = true" style="padding-left: 5px; cursor: pointer;">
-                <i class="el-icon-question"></i>
-              </span>
+              <!--<span @click="saiTypeInfo = true" style="padding-left: 5px; cursor: pointer;">-->
+                <!--<i class="el-icon-question"></i>-->
+              <!--</span>-->
             </el-form-item>
           </el-descriptions-item>
           <el-descriptions-item label="SAI类别" :span="2" v-if="form.saiType == 'SAI'">
@@ -413,7 +413,7 @@
               </el-select>
             </el-form-item>
           </el-descriptions-item>
-          <el-descriptions-item label="片区" :span="1" v-if="form.saiType == 'SAI' || (form.saiType == 'TPM' && form.tpmStatus == '未完成')">
+          <el-descriptions-item label="片区" :span="1" v-if="form.saiType == 'SAI' || (form.saiType == 'TPM' && form.tpmStatus == '现场未完成')">
             <el-form-item prop="workArea">
               <el-select
                 @change="handleSaiCategoryChange"
@@ -426,7 +426,7 @@
               </el-select>
             </el-form-item>
           </el-descriptions-item>
-          <el-descriptions-item label="整改负责人" :span="2" v-if="form.saiType == 'SAI' || (form.saiType == 'TPM' && form.tpmStatus == '未完成')">
+          <el-descriptions-item label="整改负责人" :span="2" v-if="form.saiType == 'SAI' || (form.saiType == 'TPM' && form.tpmStatus == '现场未完成')">
             <el-form-item prop="executor">
               <el-select
                 filterable
@@ -445,27 +445,27 @@
           </el-descriptions-item>
           <el-descriptions-item label="隐患" :span="3" v-if="form.saiType == 'SAI'">
             <el-radio v-model="unsafeChoice" label="1" @change="handleUnsafeChoiceChange" style="margin-right: 10px;">不安全状态</el-radio>
-            <el-form-item prop="unsafeStatus" style="display: inline-block;">
-              <el-select v-model="form.unsafeStatus" filterable placeholder="请选择不安全状态" :disabled="unsafeStatusDisabled" style="margin-right: 20px;" clearable>
-                <el-option
-                  v-for="dict in unsafeStatusOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                ></el-option>
-              </el-select>
-            </el-form-item>
+            <!--<el-form-item prop="unsafeStatus" style="display: inline-block;">-->
+              <!--<el-select v-model="form.unsafeStatus" filterable placeholder="请选择不安全状态" :disabled="unsafeStatusDisabled" style="margin-right: 20px;" clearable>-->
+                <!--<el-option-->
+                  <!--v-for="dict in unsafeStatusOptions"-->
+                  <!--:key="dict.dictValue"-->
+                  <!--:label="dict.dictLabel"-->
+                  <!--:value="dict.dictValue"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
             <el-radio v-model="unsafeChoice" label="2" @change="handleUnsafeChoiceChange" style="margin-right: 10px;">不安全行为</el-radio>
-            <el-form-item prop="unsafeAction" style="display: inline-block;">
-              <el-select v-model="form.unsafeAction" filterable placeholder="请选择不安全行为" :disabled="unsafeActionDisabled" clearable>
-                <el-option
-                  v-for="dict in unsafeActionOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                ></el-option>
-              </el-select>
-            </el-form-item>
+            <!--<el-form-item prop="unsafeAction" style="display: inline-block;">-->
+              <!--<el-select v-model="form.unsafeAction" filterable placeholder="请选择不安全行为" :disabled="unsafeActionDisabled" clearable>-->
+                <!--<el-option-->
+                  <!--v-for="dict in unsafeActionOptions"-->
+                  <!--:key="dict.dictValue"-->
+                  <!--:label="dict.dictLabel"-->
+                  <!--:value="dict.dictValue"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
           </el-descriptions-item>
           <el-descriptions-item label="附件" :span="3">
             <el-form-item label="" prop="fileUrl">
@@ -543,8 +543,8 @@
         </el-descriptions>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="form.saiType == 'TPM' && form.tpmStatus == '已完成'" type="primary" @click="submitForm">保 存 TPM</el-button>
-        <el-button v-if="form.saiType == 'TPM' && form.tpmStatus == '未完成'" type="primary" @click="handleSaveAndSubmit">提 交 TPM</el-button>
+        <el-button v-if="form.saiType == 'TPM' && form.tpmStatus == '现场已完成'" type="primary" @click="submitForm">保 存 TPM</el-button>
+        <el-button v-if="form.saiType == 'TPM' && form.tpmStatus == '现场未完成'" type="primary" @click="handleSaveAndSubmit">提 交 TPM</el-button>
         <el-button v-if="form.saiType == 'SAI'" type="primary" @click="handleSaveAndSubmit" :disabled="submitDisabled">提 交 SAI</el-button>
         <el-button v-if="form.saiType == 'SAI'" @click="submitForm" :disabled="submitDisabled">保 存 SAI</el-button>
         <el-button @click="cancel">取 消</el-button>