完善

src/utils/dict.js

@@ -157,6 +157,7 @@ DictCache.TYPE = {
   REPAIR_TECHNOLOGY_TYPE: 'REPAIR_TECHNOLOGY_TYPE', // 费用类别
   PURCHASE_STORE_FORM_STATUS: 'PURCHASE_STORE_FORM_STATUS', // 采购入库状态,
   REPAIR_DEPT_CATEGORY: 'REPAIR_DEPT_CATEGORY', // 维修部门集合
+  REPAIR_FORM_TYPE: 'REPAIR_FORM_TYPE', // 报修类型
   /* 点巡检模块 */
   CHECK_STANDARD_PARAM_TYPE: 'CHECK_STANDARD_PARAM_TYPE', // 标准参数类型
   CHECK_STANDARD_TYPE: 'CHECK_STANDARD_TYPE', // 检查类型

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

@@ -119,6 +119,22 @@
             </a-select>
           </a-form-item>
         </row-item>
+        <row-item>
+          <a-form-item
+            label="报修类型"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-select v-decorator="['repairFormType', {rules: [{required: true, message: '报修类型不能为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="(label,value) in repairFormTypeMap"
+                :key="value"
+                :label="label"
+                :value="value">{{ label }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </row-item>
         <row-item>
           <a-form-item
             label="维修专业"
@@ -507,6 +523,7 @@ export default {
       levelMap: {},
       questionMap: {},
       dispatchUserList: {},
+      repairFormTypeMap: {},
       treeData: [],
       sbPositionData: [],
 
@@ -552,6 +569,8 @@ export default {
     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.repairFormTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_FORM_TYPE)
+
     this.getUsers()
     this.getSbPositions()
     querySbPosition().then(res => {

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

@@ -76,8 +76,8 @@
               <a-descriptions-item label="报修单号">{{ model.no }}</a-descriptions-item>
               <a-descriptions-item label="设备位号">{{ model.positionNo }}</a-descriptions-item>
               <a-descriptions-item label="设备名称">{{ model.sbName }}</a-descriptions-item>
-<!--              <a-descriptions-item label="机电仪位号">{{ model.parentSbNo }}</a-descriptions-item>-->
-<!--              <a-descriptions-item label="父位号">{{ model.selfParentNo }}</a-descriptions-item>-->
+              <!--              <a-descriptions-item label="机电仪位号">{{ model.parentSbNo }}</a-descriptions-item>-->
+              <!--              <a-descriptions-item label="父位号">{{ model.selfParentNo }}</a-descriptions-item>-->
               <a-descriptions-item label="报修车间">{{ model.sbPositionName }}</a-descriptions-item>
               <a-descriptions-item label="车间具体位置">{{ model.sbCph }}</a-descriptions-item>
               <a-descriptions-item label="工单类别">{{ BaseTool.Object.getField(planFlagMap,model.category) }}</a-descriptions-item>
@@ -88,6 +88,7 @@
               <a-descriptions-item v-else label="计划性维修级别">{{ model.repairPlanLevel }}</a-descriptions-item>
               <a-descriptions-item label="送修部门">{{ model.name }}</a-descriptions-item>
               <a-descriptions-item label="维修工程师" >{{ model.checkUserName }}</a-descriptions-item>
+              <a-descriptions-item label="报修类型" >{{ repairFormTypeMap[model.repairFormType] }}</a-descriptions-item>
               <a-descriptions-item label="委托内容描述" :span="3"> <span v-html="model.content "></span><a-divider type="vertical" /><a @click="handleEdit(model)">编辑</a> </a-descriptions-item>
               <a-descriptions-item label="报修图片" :span="3">
                 <div v-if="model.applicationFileList != null && model.applicationFileList.length > 0">
@@ -492,6 +493,7 @@ export default {
       repairStatus: [],
       levelMap: {},
       descripitionMap: {},
+      repairFormTypeMap: {},
       selectedRowKeys: [],
       statusMap: {},
       outStoreStatusMap: {},
@@ -923,6 +925,7 @@ export default {
   created () {
     // 下拉框map
     this.levelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.LEVEL_TYPE)
+    this.repairFormTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_FORM_TYPE)
 
     this.sourceMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_SOURCE)
     // this.levelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_LEVEL)

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

@@ -291,16 +291,8 @@
                     title="确定签字？"
                     @confirm="handleSign('trustDeptManager')">签字</operation-button> -->
                 </div>
-                <div style="flex:1">特殊作业监护人:<a-input style="width:150px" placeholder="属地监护 " /></div>
-                <div style="flex:1">确认完工: <span>
-                  {{ model.validate }}
-                </span>
-                  <operation-button
-                    v-if="(!model.validate ||model.validate ==='')"
-                    :type="2"
-                    :showDivider="false"
-                    title="确定签字？"
-                    @confirm="handleSign('validate')">签字</operation-button>
+                <div style="flex:1">特殊作业监护人:</div>
+                <div style="flex:1">确认完工:
                 </div>
               </div>
             </td>