Merge remote-tracking branch 'origin/master'

src/views/pms/iotrhdailyreport/approval.vue

@@ -521,9 +521,9 @@ const rules = reactive<FormRules>({
   productionStatus: [{ required: true, message: '请输入生产动态', trigger: 'blur' }],
 
   // 复用规则
-  dailyInjectGasTime: timeRuleItem,
-  dailyInjectWaterTime: timeRuleItem,
-  nonProductionTime: timeRuleItem,
+  // dailyInjectGasTime: timeRuleItem,
+  // dailyInjectWaterTime: timeRuleItem,
+  // nonProductionTime: timeRuleItem,
 
   nptReason: [{ validator: validateNptReason, trigger: ['change', 'blur'] }]
 })
@@ -707,7 +707,7 @@ const submitForm = async (auditStatus: 20 | 30) => {
                   >120% 红色预警
                 </span>
               </div>
-              <div class="flex items-center justify-between">
+              <!-- <div class="flex items-center justify-between">
                 <div class="text-gray-600 dark:text-gray-400">
                   <span class="font-bold text-gray-800 dark:text-gray-200">时间平衡：</span>
                   注气 + 注水 + 非生产 = 24H
@@ -717,7 +717,7 @@ const submitForm = async (auditStatus: 20 | 30) => {
                 >
                   ≠24H 橙色预警
                 </span>
-              </div>
+              </div> -->
             </div>
           </div>
           <!-- <div
@@ -776,6 +776,7 @@ const submitForm = async (auditStatus: 20 | 30) => {
               disabled
             />
           </el-form-item>
+          <!-- :class="{ 'orange-input': sumTimes() !== 24 }" -->
           <el-form-item label="当日注气时间(H)" prop="dailyInjectGasTime">
             <el-input-number
               class="w-full!"
@@ -783,7 +784,6 @@ const submitForm = async (auditStatus: 20 | 30) => {
               v-model="form.dailyInjectGasTime"
               placeholder="请输入当日注气时间(H)"
               disabled
-              :class="{ 'orange-input': sumTimes() !== 24 }"
             />
           </el-form-item>
           <el-form-item label="当日注水时间(H)" prop="dailyInjectWaterTime">
@@ -793,7 +793,6 @@ const submitForm = async (auditStatus: 20 | 30) => {
               v-model="form.dailyInjectWaterTime"
               placeholder="当日注水时间(H)"
               disabled
-              :class="{ 'orange-input': sumTimes() !== 24 }"
             />
           </el-form-item>
           <el-form-item label="非生产时间(H)" prop="nonProductionTime">
@@ -803,7 +802,6 @@ const submitForm = async (auditStatus: 20 | 30) => {
               v-model="form.nonProductionTime"
               placeholder="非生产时间(H)"
               disabled
-              :class="{ 'orange-input': sumTimes() !== 24 }"
             />
           </el-form-item>
           <el-form-item label="非生产时间原因" prop="nptReason">

src/views/pms/iotrhdailyreport/fill.vue

@@ -522,9 +522,9 @@ const rules = reactive<FormRules>({
   productionStatus: [{ required: true, message: '请输入生产动态', trigger: ['change', 'blur'] }],
 
   // 复用规则
-  dailyInjectGasTime: timeRuleItem,
-  dailyInjectWaterTime: timeRuleItem,
-  nonProductionTime: timeRuleItem,
+  // dailyInjectGasTime: timeRuleItem,
+  // dailyInjectWaterTime: timeRuleItem,
+  // nonProductionTime: timeRuleItem,
 
   nptReason: [{ validator: validateNptReason, trigger: ['change', 'blur'] }]
 })
@@ -708,7 +708,7 @@ const submitForm = async () => {
                   >120% 红色预警
                 </span>
               </div>
-              <div class="flex items-center justify-between">
+              <!-- <div class="flex items-center justify-between">
                 <div class="text-gray-600 dark:text-gray-400">
                   <span class="font-bold text-gray-800 dark:text-gray-200">时间平衡：</span>
                   注气 + 注水 + 非生产 = 24H
@@ -718,7 +718,7 @@ const submitForm = async () => {
                 >
                   ≠24H 橙色预警
                 </span>
-              </div>
+              </div> -->
             </div>
           </div>
           <div
@@ -775,13 +775,13 @@ const submitForm = async () => {
               placeholder="请输入当日注水量(方)"
             />
           </el-form-item>
+          <!-- :class="{ 'orange-input': sumTimes() !== 24 }" -->
           <el-form-item label="当日注气时间(H)" prop="dailyInjectGasTime">
             <el-input-number
               class="w-full!"
               :min="0"
               v-model="form.dailyInjectGasTime"
               placeholder="请输入当日注气时间(H)"
-              :class="{ 'orange-input': sumTimes() !== 24 }"
             />
           </el-form-item>
           <el-form-item label="当日注水时间(H)" prop="dailyInjectWaterTime">
@@ -790,7 +790,6 @@ const submitForm = async () => {
               :min="0"
               v-model="form.dailyInjectWaterTime"
               placeholder="当日注水时间(H)"
-              :class="{ 'orange-input': sumTimes() !== 24 }"
             />
           </el-form-item>
           <el-form-item label="非生产时间(H)" prop="nonProductionTime">
@@ -799,7 +798,6 @@ const submitForm = async () => {
               :min="0"
               v-model="form.nonProductionTime"
               placeholder="非生产时间(H)"
-              :class="{ 'orange-input': sumTimes() !== 24 }"
             />
           </el-form-item>
           <el-form-item label="非生产时间原因" prop="nptReason">