报修和巡检优化

src/utils/dict.js

@@ -90,6 +90,7 @@ DictCache.TYPE = {
   SBPOSITION_TYPE: 'SBPOSITION_TYPE', // 位置类型,
   SBINFO_DEPRECIATIONTYPE: 'SBINFO_DEPRECIATIONTYPE', // 折旧方式
   SBINFO_LEVEL: 'SBINFO_LEVEL', // 设备等级
+  FILL_GATHER_TASK_LEVEL: 'FILL_GATHER_TASK_LEVEL', // 巡检任务等级
   RANLIAO_TYPE: 'RANLIAO_TYPE', // 燃料类别
   SB_COLOR: 'SB_COLOR', // 设备颜色
   SB_MEASURE_RESULT: 'SB_MEASURE_RESULT', // 检定结论
@@ -134,6 +135,8 @@ DictCache.TYPE = {
   SPARE_RESTORE_FORM_TYPE: 'SPARE_RESTORE_FORM_TYPE', // 退库类型，
   SPARE_RESTORE_FORM_STATUS: 'SPARE_RESTORE_FORM_STATUS', // 退库登记单状态，
   REPAIR_APPLICATION_FORM_SOURCE: 'REPAIR_APPLICATION_FORM_SOURCE', // 报修来源
+  REPAIR_APPLICATION_TYPE: 'REPAIR_APPLICATION_TYPE', // 工作类型
+  REPAIR_APPLICATION_PROFESSOR: 'REPAIR_APPLICATION_PROFESSOR', // 检维修单位
   REPAIR_APPLICATION_FORM_CATEGORY: 'REPAIR_APPLICATION_FORM_CATEGORY', // 维修类别
   REPAIR_APPLICATION_FORM_LEVEL: 'REPAIR_APPLICATION_FORM_LEVEL', // 紧急等级
   REPAIR_APPLICATION_FORM_STATUS: 'REPAIR_APPLICATION_FORM_STATUS', // 报修状态

src/views/fill/gather/modules/CreateTaskForm.vue

@@ -24,6 +24,22 @@
             <a-input v-decorator="['name', {rules: [{required: true, message: '巡检任务名称不能为空'}]}]" />
           </a-form-item>
         </a-col>
+        <a-col :sm="20" >
+          <a-form-item
+            label="任务等级"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-select v-decorator="['taskLevel', {initialValue:'A级', rules: [{required: true, message: '任务等级不能为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="(label,value) in levelMap"
+                :key="value"
+                :label="label"
+                :value="label">{{ label }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
 
         <a-col :sm="20" >
           <a-form-item
@@ -161,6 +177,7 @@ export default {
     return {
       form: this.$form.createForm(this),
       visible: false,
+      levelMap: {},
       ipqcMap: [],
       model: {},
       sbIds: [],
@@ -175,6 +192,7 @@ export default {
   },
   created () {
     this.getUser()
+    this.levelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.FILL_GATHER_TASK_LEVEL)
   },
   methods: {
     base (record) {

src/views/fill/task/FillGatherTask.vue

@@ -28,7 +28,7 @@
       <div class="table-operator" style="margin-bottom: 8px;">
         <a-row>
           <a-col :md="16">
-            <a-button v-if="$auth('fill-fills-add')" type="primary" icon="plus" @click="handleAdd()">新增</a-button>
+<!--            <a-button v-if="$auth('fill-fills-add')" type="primary" icon="plus" @click="handleAdd()">新增</a-button>-->
             <a-button
               style="margin-left: 8px"
               v-if="$auth('fill-fills-export')"

src/views/repair/application-form/modules/BaseForm.vue

@@ -67,6 +67,38 @@
             </a-select>
           </a-form-item>
         </row-item>
+        <row-item>
+          <a-form-item
+            label="检维修单位"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-select @change="changePlanFlag" v-decorator="['repairProfessor', {rules: [{required: true, message: '检修专业不能为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="(label,value) in professorMap"
+                :key="value"
+                :label="label"
+                :value="parseInt(value)">{{ label }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </row-item>
+        <row-item>
+          <a-form-item
+            label="工作类型"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-select @change="changePlanFlag" v-decorator="['repairType', {rules: [{required: true, message: '工作类型不能为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="(label,value) in repairTypeMap"
+                :key="value"
+                :label="label"
+                :value="parseInt(value)">{{ label }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </row-item>
         <row-item>
           <a-form-item
             label="车间具体位置"
@@ -130,7 +162,7 @@
             <a-input
               style="width: 100%"
               suffix="小时"
-              v-decorator="['limitHours']" />
+              v-decorator="['limitHours', {rules: [{required: true, message: '要求时间不能为空'}]}]" />
           </a-form-item>
         </row-item>
         <row-item>
@@ -283,6 +315,8 @@ export default {
     return {
       confirmLoading: false,
       modalTitle: null,
+      professorMap: {},
+      repairTypeMap: {},
       form: this.$form.createForm(this),
       visible: false,
       sbId: null,
@@ -327,6 +361,8 @@ export default {
     this.needStopMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
     this.categoryMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_CATEGORY)
     this.repairDeptMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_DEPT_CATEGORY)
+    this.repairTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_TYPE)
+    this.professorMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_PROFESSOR)
     this.getUsers()
   },
   methods: {

src/views/repair/application-form/modules/TicketForm.vue

@@ -102,35 +102,35 @@
           </tr>
           <tr>
             <td colspan="3">工作类型</td>
-            <td colspan="27">
+            <td colspan="27" >
               <a-radio-group v-model="value4">
                 <a-radio :value="1">
-                  <a-icon class="check" v-show="value4 ==1" type="check" />普通作业
+                  <a-icon class="check" v-show="value4 ==1" type="check" /><span style='font-size: 13px;'>普通作业</span>
                 </a-radio>
                 <a-radio :value="2">
-                  <a-icon class="check" v-show="value4 ==2" type="check" />动火作业
+                  <a-icon class="check" v-show="value4 ==2" type="check" /><span style='font-size: 13px;'>动火作业</span>
                 </a-radio>
                 <a-radio :value="3">
-                  <a-icon class="check" v-show="value4 ==3" type="check" />受限空间作业
+                  <a-icon class="check" v-show="value4 ==3" type="check" /><span style='font-size: 13px;'>受限空间作业</span>
                 </a-radio>
                 <a-radio :value="4">
-                  <a-icon class="check" v-show="value4 ==4" type="check" />高处作业
+                  <a-icon class="check" v-show="value4 ==4" type="check" /><span style='font-size: 13px;'>高处作业</span>
                 </a-radio>
                 <a-radio :value="5">
-                  <a-icon class="check" v-show="value4 ==5" type="check" />吊装作业
+                  <a-icon class="check" v-show="value4 ==5" type="check" /><span style='font-size: 13px;'>吊装作业</span>
                 </a-radio>
                 <a-radio :value="6">
-                  <a-icon class="check" v-show="value4 ==6" type="check" />动土作业
+                  <a-icon class="check" v-show="value4 ==6" type="check" /><span style='font-size: 13px;'>动土作业</span>
                 </a-radio>
                 <a-radio :value="7">
-                  <a-icon class="check" v-show="value4 ==7" type="check" />断路作业
+                  <a-icon class="check" v-show="value4 ==7" type="check" /><span style='font-size: 13px;'>断路作业</span>
                 </a-radio>
                 <a-radio :value="8">
-                  <a-icon class="check" v-show="value4 ==8" type="check" />设备检修作业
+                  <a-icon class="check" v-show="value4 ==8" type="check" /><span style='font-size: 13px;'>设备检修作业</span>
+                </a-radio>
+                <a-radio :value="9">
+                  <a-icon class="check" v-show="value4 ==9" type="check" /><span style='font-size: 13px;'>盲板抽堵作业</span>
                 </a-radio>
-<!--                <a-radio :value="9">
-                  <a-icon class="check" v-show="value4 ==9" type="check" />盲板抽堵作业
-                </a-radio>-->
               </a-radio-group></td>
           </tr>
           <tr>
@@ -259,7 +259,9 @@ export default {
         'repairMan': null,
         'content': null,
         'sbPositionName': null,
-        'requireHours': null
+        'requireHours': null,
+        'repairProfessor': null,
+        'repairType': null
       }
     }
   },
@@ -270,6 +272,8 @@ export default {
     base (record) {
       this.visible = true
       this.model = record
+      this.value2 = this.model.repairProfessor
+      this.value4 = this.model.repairType
       this.value5 = this.model.content
     },
     handleCancel (values) {