Просмотр исходного кода

PSSR确认日期选择器修改

jiangbiao 6 месяцев назад
Родитель
Сommit
6360bfdc33
41 измененных файлов с 54 добавлено и 301 удалено
  1. 1 9
      ui/src/views/pssr/airtight/index.vue
  2. 1 9
      ui/src/views/pssr/analyzer/index.vue
  3. 3 11
      ui/src/views/pssr/blind/index.vue
  4. 1 9
      ui/src/views/pssr/circuit/index.vue
  5. 1 17
      ui/src/views/pssr/cleaning/index.vue
  6. 1 9
      ui/src/views/pssr/frame/index.vue
  7. 1 9
      ui/src/views/pssr/franklinism/index.vue
  8. 1 9
      ui/src/views/pssr/gasdetector/index.vue
  9. 1 1
      ui/src/views/pssr/hygiene/index.vue
  10. 1 9
      ui/src/views/pssr/instrumentCalibration/index.vue
  11. 1 17
      ui/src/views/pssr/laboratory/index.vue
  12. 1 9
      ui/src/views/pssr/lighting/index.vue
  13. 1 9
      ui/src/views/pssr/lock/index.vue
  14. 6 23
      ui/src/views/pssr/material/index.vue
  15. 6 23
      ui/src/views/pssr/materialRaw/index.vue
  16. 1 9
      ui/src/views/pssr/measure/index.vue
  17. 1 1
      ui/src/views/pssr/moc/index.vue
  18. 1 9
      ui/src/views/pssr/motor/index.vue
  19. 1 1
      ui/src/views/pssr/nitrogen/index.vue
  20. 1 9
      ui/src/views/pssr/overhaulExchanger/index.vue
  21. 1 9
      ui/src/views/pssr/overhaulFilter/index.vue
  22. 1 9
      ui/src/views/pssr/overhaulPipe/index.vue
  23. 1 1
      ui/src/views/pssr/overhaulPump/index.vue
  24. 1 9
      ui/src/views/pssr/overhaulTower/index.vue
  25. 1 9
      ui/src/views/pssr/overhaulValve/index.vue
  26. 1 1
      ui/src/views/pssr/patrol/index.vue
  27. 2 7
      ui/src/views/pssr/pipe/index.vue
  28. 1 9
      ui/src/views/pssr/power/index.vue
  29. 1 1
      ui/src/views/pssr/programme/index.vue
  30. 1 1
      ui/src/views/pssr/protection/index.vue
  31. 1 17
      ui/src/views/pssr/public/index.vue
  32. 1 1
      ui/src/views/pssr/pumpCleaning/index.vue
  33. 1 1
      ui/src/views/pssr/pumpFill/index.vue
  34. 1 1
      ui/src/views/pssr/pumpOverhaul/index.vue
  35. 1 1
      ui/src/views/pssr/safetyBleed/index.vue
  36. 1 1
      ui/src/views/pssr/safetyBreath/index.vue
  37. 1 1
      ui/src/views/pssr/safetyBrust/index.vue
  38. 1 1
      ui/src/views/pssr/safetyFlamearrester/index.vue
  39. 1 1
      ui/src/views/pssr/safetyValve/index.vue
  40. 1 9
      ui/src/views/pssr/torchvoc/index.vue
  41. 1 9
      ui/src/views/pssr/vessel/index.vue

+ 1 - 9
ui/src/views/pssr/airtight/index.vue

@@ -260,14 +260,6 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="确认日期" prop="confirmationDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.confirmationDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择确认日期">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注" />
         </el-form-item>
@@ -303,7 +295,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationDate">
+        <el-form-item label="时间" prop="confirmationDate" v-hasPermi="['pssr:date:edit']">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"

+ 1 - 9
ui/src/views/pssr/analyzer/index.vue

@@ -243,14 +243,6 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="确认时间" prop="confirmationDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.confirmationDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择确认时间">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注" />
         </el-form-item>
@@ -286,7 +278,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"

+ 3 - 11
ui/src/views/pssr/blind/index.vue

@@ -329,19 +329,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="确认时间" prop="installDate">
-              <el-date-picker clearable size="small" style="width: 200px"
-                              v-model="form.installDate"
-                              type="date"
-                              value-format="yyyy-MM-dd"
-                              placeholder="选择确认时间">
-              </el-date-picker>
+            <el-form-item label="备注" prop="remarks">
+              <el-input v-model="form.remarks" placeholder="请输入备注"/>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="备注" prop="remarks">
-          <el-input v-model="form.remarks" placeholder="请输入备注"/>
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -383,7 +375,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="installDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="installDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.installDate"
                           type="date"

+ 1 - 9
ui/src/views/pssr/circuit/index.vue

@@ -278,14 +278,6 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="确认时间" prop="confirmationDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.confirmationDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择确认时间">
-          </el-date-picker>
-        </el-form-item>
         <!--<el-form-item label="删除状态" prop="delFlag">-->
           <!--<el-input v-model="form.delFlag" placeholder="请输入删除状态" />-->
         <!--</el-form-item>-->
@@ -352,7 +344,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"

+ 1 - 17
ui/src/views/pssr/cleaning/index.vue

@@ -19,14 +19,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="确认时间" prop="confirmationDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-                        v-model="queryParams.confirmationDate"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="选择确认时间">
-        </el-date-picker>
-      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -250,14 +242,6 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="确认时间" prop="confirmationDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-                          v-model="form.confirmationDate"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="选择确认时间">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注"/>
         </el-form-item>
@@ -293,7 +277,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"

+ 1 - 9
ui/src/views/pssr/frame/index.vue

@@ -282,14 +282,6 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="确认时间" prop="confirmationDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-                          v-model="form.confirmationDate"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="选择确认时间">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注"/>
         </el-form-item>
@@ -325,7 +317,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"

+ 1 - 9
ui/src/views/pssr/franklinism/index.vue

@@ -224,14 +224,6 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="确认时间" prop="confirmationDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.confirmationDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择确认时间">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注" />
         </el-form-item>
@@ -267,7 +259,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"

+ 1 - 9
ui/src/views/pssr/gasdetector/index.vue

@@ -233,14 +233,6 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="确认时间" prop="confirmationDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.confirmationDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择确认时间">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注" />
         </el-form-item>
@@ -276,7 +268,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"

+ 1 - 1
ui/src/views/pssr/hygiene/index.vue

@@ -333,7 +333,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"

+ 1 - 9
ui/src/views/pssr/instrumentCalibration/index.vue

@@ -246,14 +246,6 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="确认时间" prop="confirmationDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.confirmationDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择确认时间">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注" />
         </el-form-item>
@@ -289,7 +281,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"

+ 1 - 17
ui/src/views/pssr/laboratory/index.vue

@@ -28,14 +28,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="确认时间" prop="confirmationDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.confirmationDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择确认时间">
-        </el-date-picker>
-      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -261,14 +253,6 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="确认时间" prop="confirmationDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.confirmationDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择确认时间">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注" />
         </el-form-item>
@@ -304,7 +288,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"

+ 1 - 9
ui/src/views/pssr/lighting/index.vue

@@ -229,14 +229,6 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="确认时间" prop="confirmationDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-                          v-model="form.confirmationDate"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="选择确认时间">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注" />
         </el-form-item>
@@ -272,7 +264,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"

+ 1 - 9
ui/src/views/pssr/lock/index.vue

@@ -294,14 +294,6 @@
           <el-radio v-model="form.noDamage" label="✔" border>✔</el-radio>
           <el-radio v-model="form.noDamage" label="✖" border>✖</el-radio>
         </el-form-item>
-        <el-form-item label="确认时间" prop="confirmationDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-                          v-model="form.confirmationDate"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="选择确认时间">
-          </el-date-picker>
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -332,7 +324,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"

+ 6 - 23
ui/src/views/pssr/material/index.vue

@@ -1,37 +1,28 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="Utility consumption quantity" prop="utilityQuantity">
+      <el-form-item label="公用工程物料" prop="utilityQuantity">
         <el-input
           v-model="queryParams.utilityQuantity"
-          placeholder="请输入Utility consumption quantity"
+          placeholder="请输入公用工程物料"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="Quantity" prop="quantity">
+      <el-form-item label="数量" prop="quantity">
         <el-input
           v-model="queryParams.quantity"
-          placeholder="请输入Quantity"
+          placeholder="请输入数量"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="Unit" prop="unit">
+      <el-form-item label="单元" prop="unit">
         <el-input
           v-model="queryParams.unit"
-          placeholder="请输入Unit"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="Note" prop="note">
-        <el-input
-          v-model="queryParams.note"
-          placeholder="请输入Note"
+          placeholder="请输入单元"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -271,14 +262,6 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="确认时间" prop="confirmationDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-                          v-model="form.confirmationDate"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="选择时间">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注" />
         </el-form-item>

+ 6 - 23
ui/src/views/pssr/materialRaw/index.vue

@@ -1,37 +1,28 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="Raw material" prop="utilityQuantity">
+      <el-form-item label="原料" prop="utilityQuantity">
         <el-input
           v-model="queryParams.utilityQuantity"
-          placeholder="请输入Raw Material"
+          placeholder="请输入原料"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="Quantity" prop="quantity">
+      <el-form-item label="数量" prop="quantity">
         <el-input
           v-model="queryParams.quantity"
-          placeholder="请输入Quantity"
+          placeholder="请输入数量"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="Unit" prop="unit">
+      <el-form-item label="单元" prop="unit">
         <el-input
           v-model="queryParams.unit"
-          placeholder="请输入Unit"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="Note" prop="note">
-        <el-input
-          v-model="queryParams.note"
-          placeholder="请输入Note"
+          placeholder="请输入单元"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -271,14 +262,6 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="确认时间" prop="confirmationDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-                          v-model="form.confirmationDate"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="选择时间">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注" />
         </el-form-item>

+ 1 - 9
ui/src/views/pssr/measure/index.vue

@@ -258,14 +258,6 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="确认时间" prop="confirmationDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-                          v-model="form.confirmationDate"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="选择确认时间">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注"/>
         </el-form-item>
@@ -301,7 +293,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"

+ 1 - 1
ui/src/views/pssr/moc/index.vue

@@ -313,7 +313,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"

+ 1 - 9
ui/src/views/pssr/motor/index.vue

@@ -240,14 +240,6 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="检查时间" prop="confirmationDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.confirmationDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择检查时间">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注" />
         </el-form-item>
@@ -283,7 +275,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"

+ 1 - 1
ui/src/views/pssr/nitrogen/index.vue

@@ -289,7 +289,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"

+ 1 - 9
ui/src/views/pssr/overhaulExchanger/index.vue

@@ -244,14 +244,6 @@
         <el-form-item label="图号" prop="pidNo">
           <el-input v-model="form.pidNo" placeholder="请输入图号"/>
         </el-form-item>
-        <el-form-item label="完成时间" prop="completionDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-                          v-model="form.completionDate"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="选择完成时间">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="确认人" prop="confirmedPerson">
           <el-select v-model="form.confirmedPerson" clearable filterable style="width: 100%;"
                      placeholder="请选择确认人">
@@ -286,7 +278,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="completionDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="completionDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.completionDate"
                           type="date"

+ 1 - 9
ui/src/views/pssr/overhaulFilter/index.vue

@@ -238,14 +238,6 @@
         <el-form-item label="QTY数量" prop="qtyNum">
           <el-input v-model="form.qtyNum" placeholder="请输入QTY数量"/>
         </el-form-item>
-        <el-form-item label="完成日期" prop="completionDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-                          v-model="form.completionDate"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="选择完成日期">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="负责人" prop="respPerson">
           <el-select v-model="form.respPerson" clearable filterable style="width: 100%;"
                      placeholder="请选择确认人">
@@ -281,7 +273,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="时间" prop="completionDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="completionDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.completionDate"
                           type="date"

+ 1 - 9
ui/src/views/pssr/overhaulPipe/index.vue

@@ -214,14 +214,6 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="完成时间" prop="confirmationDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-                          v-model="form.confirmationDate"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="选择完成时间">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注"/>
         </el-form-item>
@@ -248,7 +240,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="时间" prop="confirmationDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"

+ 1 - 1
ui/src/views/pssr/overhaulPump/index.vue

@@ -260,7 +260,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="时间" prop="completionDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="completionDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.completionDate"
                           type="date"

+ 1 - 9
ui/src/views/pssr/overhaulTower/index.vue

@@ -244,14 +244,6 @@
         <el-form-item label="图号" prop="pidNo">
           <el-input v-model="form.pidNo" placeholder="请输入图号"/>
         </el-form-item>
-        <el-form-item label="完成时间" prop="completionDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-                          v-model="form.completionDate"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="选择完成时间">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="确认人" prop="confirmedPerson">
           <el-select v-model="form.confirmedPerson" clearable filterable style="width: 100%;"
                      placeholder="请选择确认人">
@@ -287,7 +279,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="时间" prop="completionDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="completionDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.completionDate"
                           type="date"

+ 1 - 9
ui/src/views/pssr/overhaulValve/index.vue

@@ -240,14 +240,6 @@
             <el-option label="维修" value="维修"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="完成日期" prop="doneDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-                          v-model="form.doneDate"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="选择完成日期">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="确认人" prop="identifyingPerson">
           <el-select v-model="form.identifyingPerson" clearable filterable style="width: 100%;"
                      placeholder="请选择确认人">
@@ -282,7 +274,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="doneDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="doneDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.doneDate"
                           type="date"

+ 1 - 1
ui/src/views/pssr/patrol/index.vue

@@ -81,7 +81,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="时间" prop="confirmationDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"

+ 2 - 7
ui/src/views/pssr/pipe/index.vue

@@ -201,11 +201,6 @@
           <span>{{ scope.row.confirm2Name }}</span>
         </template>
       </u-table-column>
-      <u-table-column label="时间" align="center" prop="confirmationDate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </u-table-column>
       <u-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <u-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <u-table-column label="操作" align="center" fixed="right" width="120" v-if="isApprove==0" class-name="small-padding fixed-width">
@@ -295,7 +290,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"
@@ -339,7 +334,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"

+ 1 - 9
ui/src/views/pssr/power/index.vue

@@ -204,14 +204,6 @@
             <el-radio label="✖">✖</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="确认时间" prop="confirmationDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.confirmationDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择确认时间">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="确认人1" prop="confirm1">
           <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
                      placeholder="请选择确认人1">
@@ -265,7 +257,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"

+ 1 - 1
ui/src/views/pssr/programme/index.vue

@@ -311,7 +311,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"

+ 1 - 1
ui/src/views/pssr/protection/index.vue

@@ -262,7 +262,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"

+ 1 - 17
ui/src/views/pssr/public/index.vue

@@ -64,14 +64,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="确认时间" prop="confirmationDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.confirmationDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择确认时间">
-        </el-date-picker>
-      </el-form-item>
       <!--<el-form-item label="创建人" prop="createrCode">-->
         <!--<el-input-->
           <!--v-model="queryParams.createrCode"-->
@@ -374,14 +366,6 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="确认时间" prop="confirmationDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.confirmationDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择确认时间">
-          </el-date-picker>
-        </el-form-item>
         <!--<el-form-item label="删除状态" prop="delFlag">-->
           <!--<el-input v-model="form.delFlag" placeholder="请输入删除状态" />-->
         <!--</el-form-item>-->
@@ -448,7 +432,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"

+ 1 - 1
ui/src/views/pssr/pumpCleaning/index.vue

@@ -283,7 +283,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"

+ 1 - 1
ui/src/views/pssr/pumpFill/index.vue

@@ -291,7 +291,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"

+ 1 - 1
ui/src/views/pssr/pumpOverhaul/index.vue

@@ -280,7 +280,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"

+ 1 - 1
ui/src/views/pssr/safetyBleed/index.vue

@@ -317,7 +317,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationTime">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationTime">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationTime"
                           type="date"

+ 1 - 1
ui/src/views/pssr/safetyBreath/index.vue

@@ -317,7 +317,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationTime">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationTime">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationTime"
                           type="date"

+ 1 - 1
ui/src/views/pssr/safetyBrust/index.vue

@@ -327,7 +327,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationTime">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationTime">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationTime"
                           type="date"

+ 1 - 1
ui/src/views/pssr/safetyFlamearrester/index.vue

@@ -303,7 +303,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationTime">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationTime">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationTime"
                           type="date"

+ 1 - 1
ui/src/views/pssr/safetyValve/index.vue

@@ -314,7 +314,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationTime">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationTime">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationTime"
                           type="date"

+ 1 - 9
ui/src/views/pssr/torchvoc/index.vue

@@ -246,14 +246,6 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="确认时间" prop="confirmationDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.confirmationDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择确认时间">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注" />
         </el-form-item>
@@ -289,7 +281,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"

+ 1 - 9
ui/src/views/pssr/vessel/index.vue

@@ -295,14 +295,6 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-                          v-model="form.confirmationDate"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="选择时间">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注"/>
         </el-form-item>
@@ -338,7 +330,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="confirmationDate">
+        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"