1

src/views/maintenance/components/programRulesDialog.vue

@@ -29,7 +29,7 @@
         <el-col :span="8">
           <el-form-item label="计划完成时长" prop="duration">
             <div style="display: flex">
-              <el-input type="number" :disabled="dialogTitle === '派单'" v-model="addForm.duration" size="small"
+              <el-input type="number"  v-model="addForm.duration" size="small"
                 placeholder="请输入" @input="formDataDurationTime">
                 <template #suffix>分钟</template>
               </el-input>
@@ -863,7 +863,7 @@ export default {
         // this._getMatterRulesDetails(res.ruleId);
         this.$set(this.addForm, 'code', res.data.code);
         this.$set(this.addForm, 'urgent', JSON.stringify(res.data.urgent));
-        this.$set(this.addForm, 'executorId', res.data.executorId.split(',').filter((i) => i));
+        this.$set(this.addForm, 'executorId', res.data?.executorId?.split(',').filter((i) => i));
         this.$set(this.addForm, 'imageUrl', {});
         // console.log(this.rootData);
         if(res.data.groupId){

src/views/warning/warningMessage/index.vue

@@ -62,8 +62,8 @@
             minWidth: 110,
             formatter: (_row, _column, cellValue) => {
               const map = {
-                1: '提示',
-                2: '一般',
+                1: '轻微',
+                2: '中等',
                 3: '严重',
                 4: '紧急',
                 5: '致命'
@@ -96,15 +96,22 @@
             prop: 'generateDocumentType',
             label: '生成单据类型',
             formatter: (_row, _column, cellValue) => {
-              return cellValue == 1
-                ? '巡点检'
-                : cellValue == 2
-                ? '保养'
-                : cellValue == 3
-                ? '维修'
-                : cellValue == 5
-                ? '量具送检'
-                : '';
+              let message =
+                cellValue == 1
+                  ? '巡点检'
+                  : cellValue == 2
+                  ? '保养'
+                  : cellValue == 3
+                  ? '维修'
+                  : cellValue == 5
+                  ? '量具送检'
+                  : '';
+              if (_row.orderStatusName) {
+                message += ' (' + _row.orderStatusName + ')';
+              } else if (message) {
+                message += ' (待派单)';
+              }
+              return message;
             },
             align: 'center',
             showOverflowTooltip: true,

src/views/warning/warningSetting/components/addWarningDialog.vue

@@ -26,8 +26,8 @@
             <el-col :span="12">
               <el-form-item label="告警级别：" prop="level">
                 <el-select filterable v-model="baseInfoForm.level" size="small">
-                  <el-option label="提示" :value="1"></el-option>
-                  <el-option label="一般" :value="2"></el-option>
+                  <el-option label="轻微" :value="1"></el-option>
+                  <el-option label="中等" :value="2"></el-option>
                   <el-option label="严重" :value="3"></el-option>
                   <el-option label="紧急" :value="4"></el-option>
                   <el-option label="致命" :value="5"></el-option>

src/views/warning/warningSetting/index.vue

@@ -118,7 +118,7 @@
             showOverflowTooltip: true,
             minWidth: 110,
             formatter: (_row, _column, cellValue) => {
-              return { 1: '提示', 2: '一般', 3: '严重', 4: '紧急', 5: '致命' }[
+              return { 1: '轻微', 2: '中等', 3: '严重', 4: '紧急', 5: '致命' }[
                 cellValue
               ];
             }