设备管理页面功能修改

hw-ui/src/views/dms/dmsBaseInspectProject/index.vue

@@ -173,10 +173,10 @@
         <el-form-item label="记录方式" prop="recordMethod">
           <el-input v-model="form.recordMethod" placeholder="请输入记录方式" />
         </el-form-item>
-        <el-form-item label="检查类型" prop="inspectType">
-          <el-radio-group v-model="form.inspectType">
+        <el-form-item label="检查类型" prop="inspectProjectProperty">
+          <el-radio-group v-model="form.inspectProjectProperty">
             <el-radio
-              v-for="dict in dict.type.dms_inspect_type"
+              v-for="dict in dict.type.inspect_project_property"
               :key="dict.value"
               :label="dict.value"
             >{{dict.label}}</el-radio>
@@ -211,7 +211,7 @@ import { listDmsBaseInspectProject, getDmsBaseInspectProject, delDmsBaseInspectP
 
 export default {
   name: "DmsBaseInspectProject",
-  dicts:['dms_inspect_type'],
+  dicts:['dms_inspect_type','inspect_project_property'],
   data() {
     return {
       // 遮罩层

hw-ui/src/views/dms/dmsBillsInspectActivity/index.vue

@@ -5,7 +5,7 @@
       <el-row>
         <el-col :span="8" :offset="2">
           <el-form-item label="工单编号" >
-            <el-input v-model="this.dmsBillsInstanceList[0].billsInspectCode" disabled />
+            <el-input v-model="this.dmsBillsInstanceList[0].planInspectCode" disabled />
           </el-form-item>
         </el-col>
 <!--        <el-col :span="8" :offset="2">-->
@@ -20,7 +20,7 @@
         </el-col>
         <el-col :span="8" :offset="2">
           <el-form-item label="创建人" >
-            <el-input v-model="this.dmsBillsInstanceList[0].createBy" disabled />
+            <el-input v-model="this.dmsBillsInstanceList[0].performer" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="8" :offset="2">

hw-ui/src/views/dms/dmsBillsInstance/index.vue

@@ -125,7 +125,7 @@
           <dict-tag :options="dict.type.dms_inspect_type" :value="scope.row.inspectType"/>
         </template>
       </el-table-column>
-      <el-table-column label="巡检编号" align="center" prop="billsInspectCode" />
+      <el-table-column label="巡检编号" align="center" prop="planInspectCode" />
       <el-table-column label="计划开始时间" align="center" prop="planBeginTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.planBeginTime, '{y}-{m}-{d}') }}</span>

hw-ui/src/views/dms/dmsBillsMaintInstance/index.vue

@@ -111,7 +111,7 @@
           <dict-tag :options="dict.type.dms_maint_status" :value="scope.row.maintStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="保养完成率" align="center" prop="maintCompRate" />
+<!--      <el-table-column label="保养完成率" align="center" prop="maintCompRate" />-->
 <!--      <el-table-column label="是否标识：1-是；2-否" align="center" prop="isFlag" />-->
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

hw-ui/src/views/dms/dmsMaintInstanceActivity/index.vue

@@ -20,7 +20,7 @@
         </el-col>
         <el-col :span="8" :offset="2">
           <el-form-item label="申请人" >
-            <el-input v-model="this.dmsBillsMaintInstanceList[0].createBy" disabled />
+            <el-input v-model="this.dmsBillsMaintInstanceList[0].maintSupervisor" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="8" :offset="2">
@@ -47,147 +47,147 @@
 
 
 
-    <el-row>
-      <!--    第一步-->
-      <el-form ref="form" :model="form"  label-width="100px">
-        <h4 class="form-header h4">{{this.wfProcessActivityList[0].processActivityName}}</h4>
-        <el-col :span="8" >
-          <el-form-item label="保养级别" prop="maintlevel">
-            <el-select v-model="form.maintLevel" placeholder="保养级别" :disabled=true>
-              <el-option
-                v-for="item in dict.type.dms_maint_level"
-                :key=" parseInt(item.value)"
-                :label="item.label"
-                :value="parseInt(item.value)">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="保养组别" prop="maintGroup">
-            <el-input v-model="form.maintGroup" placeholder="请输入检修组别"  :disabled=true />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="保养负责人" prop="maintSupervisor">
-            <el-input v-model="form.maintSupervisor" placeholder="请输入检修负责人" :disabled=true />
-          </el-form-item>
-        </el-col>
+<!--    <el-row>-->
+<!--      &lt;!&ndash;    第一步&ndash;&gt;-->
+<!--      <el-form ref="form" :model="form"  label-width="100px">-->
+<!--        <h4 class="form-header h4">{{this.wfProcessActivityList[0].processActivityName}}</h4>-->
+<!--        <el-col :span="8" >-->
+<!--          <el-form-item label="保养级别" prop="maintlevel">-->
+<!--            <el-select v-model="form.maintLevel" placeholder="保养级别" :disabled=true>-->
+<!--              <el-option-->
+<!--                v-for="item in dict.type.dms_maint_level"-->
+<!--                :key=" parseInt(item.value)"-->
+<!--                :label="item.label"-->
+<!--                :value="parseInt(item.value)">-->
+<!--              </el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+<!--        <el-col :span="8">-->
+<!--          <el-form-item label="保养组别" prop="maintGroup">-->
+<!--            <el-input v-model="form.maintGroup" placeholder="请输入检修组别"  :disabled=true />-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+<!--        <el-col :span="8">-->
+<!--          <el-form-item label="保养负责人" prop="maintSupervisor">-->
+<!--            <el-input v-model="form.maintSupervisor" placeholder="请输入检修负责人" :disabled=true />-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
 
 
-        <!--  中间步骤-->
-        <el-form-item  v-for="(repairInstanceActivity,index) in dmsMaintInstanceActivityList"
-                       :key="dmsMaintInstanceActivityList.instanceActivityId"
-                       label-width="0px"
-                       :model="form"
-                       v-if="repairInstanceActivity.processStepOrder!=1"
-        >
-          <h4 class="form-header h4">{{repairInstanceActivity.name}}</h4>
-          <el-col :span="8">
-            <el-form-item label="保养级别" prop="maintLevel">
-              <el-select v-model="form.maintLevel" placeholder="保养级别" :disabled=true>
-                <el-option
-                  v-for="item in dict.type.dms_maint_level"
-                  :key="parseInt(item.value)"
-                  :label="item.label"
-                  :value="parseInt(item.value)"
-                  v-bind:disabled="repairInstanceActivity.processStepOrder!=dmsMaintInstanceActivityList.length+1"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="保养组别">
-              <el-input
-                v-model="repairInstanceActivity.maintGroup"
-                v-bind:disabled="repairInstanceActivity.processStepOrder!=dmsMaintInstanceActivityList.length+1"
-                placeholder="保养组别">
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="保养负责人"
-            >
-              <el-input
-                v-model="repairInstanceActivity.maintSupervisor"
-                v-bind:disabled="repairInstanceActivity.processStepOrder!=dmsMaintInstanceActivityList.length+1"
-                placeholder="保养负责人">
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
+<!--        &lt;!&ndash;  中间步骤&ndash;&gt;-->
+<!--        <el-form-item  v-for="(repairInstanceActivity,index) in dmsMaintInstanceActivityList"-->
+<!--                       :key="dmsMaintInstanceActivityList.instanceActivityId"-->
+<!--                       label-width="0px"-->
+<!--                       :model="form"-->
+<!--                       v-if="repairInstanceActivity.processStepOrder!=1"-->
+<!--        >-->
+<!--          <h4 class="form-header h4">{{repairInstanceActivity.name}}</h4>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="保养级别" prop="maintLevel">-->
+<!--              <el-select v-model="form.maintLevel" placeholder="保养级别" :disabled=true>-->
+<!--                <el-option-->
+<!--                  v-for="item in dict.type.dms_maint_level"-->
+<!--                  :key="parseInt(item.value)"-->
+<!--                  :label="item.label"-->
+<!--                  :value="parseInt(item.value)"-->
+<!--                  v-bind:disabled="repairInstanceActivity.processStepOrder!=dmsMaintInstanceActivityList.length+1"-->
+<!--                >-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="保养组别">-->
+<!--              <el-input-->
+<!--                v-model="repairInstanceActivity.maintGroup"-->
+<!--                v-bind:disabled="repairInstanceActivity.processStepOrder!=dmsMaintInstanceActivityList.length+1"-->
+<!--                placeholder="保养组别">-->
+<!--              </el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="保养负责人"-->
+<!--            >-->
+<!--              <el-input-->
+<!--                v-model="repairInstanceActivity.maintSupervisor"-->
+<!--                v-bind:disabled="repairInstanceActivity.processStepOrder!=dmsMaintInstanceActivityList.length+1"-->
+<!--                placeholder="保养负责人">-->
+<!--              </el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="24">-->
 
-            <el-form-item label="处理意见"
-            >
-              <el-input
-                v-model="repairInstanceActivity.processHandleResolution"
-                v-bind:disabled="repairInstanceActivity.processStepOrder!=dmsMaintInstanceActivityList.length+1"
-                placeholder="处理意见">
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-form-item>
+<!--            <el-form-item label="处理意见"-->
+<!--            >-->
+<!--              <el-input-->
+<!--                v-model="repairInstanceActivity.processHandleResolution"-->
+<!--                v-bind:disabled="repairInstanceActivity.processStepOrder!=dmsMaintInstanceActivityList.length+1"-->
+<!--                placeholder="处理意见">-->
+<!--              </el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-form-item>-->
 
-      </el-form>
-      <!--新增审批流程表单显示-->
-      <el-form ref="form1" :model="form1" label-width="100px"
+<!--      </el-form>-->
+<!--      &lt;!&ndash;新增审批流程表单显示&ndash;&gt;-->
+<!--      <el-form ref="form1" :model="form1" label-width="100px"-->
 
-               v-if="form1.processStepOrder!=wfProcessActivityList.length&&this.isUpdate==true">
-        <h4 class="form-header h4">{{this.wfProcessActivityList[this.dmsMaintInstanceActivityList.length].processActivityName}}</h4>
-        <el-col :span="8">
-          <!--        <el-form-item label="检修类型" prop="repairType"-->
-          <!--        >-->
-          <!--          <el-input-->
-          <!--            v-model="form1.repairType"-->
-          <!--            placeholder="检修类型"-->
-          <!--          >-->
-          <!--          </el-input>-->
-          <!--        </el-form-item>-->
-          <el-form-item label="保养等级" prop="maintLevel">
-            <el-select v-model="form1.maintLevel" placeholder="保养等级" >
-              <el-option
-                v-for="item in dict.type.dms_maint_level"
-                :key="parseInt(item.value)"
-                :label="item.label"
-                :value="parseInt(item.value)"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="保养组别"
-          >
-            <el-input
-              v-model="form1.maintGroup"
-              placeholder="保养组别">
-            </el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="保养负责人"
-          >
-            <el-input
-              v-model="form1.maintSupervisor"
-              placeholder="保养负责人">
-            </el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
+<!--               v-if="form1.processStepOrder!=wfProcessActivityList.length&&this.isUpdate==true">-->
+<!--        <h4 class="form-header h4">{{this.wfProcessActivityList[this.dmsMaintInstanceActivityList.length].processActivityName}}</h4>-->
+<!--        <el-col :span="8">-->
+<!--          &lt;!&ndash;        <el-form-item label="检修类型" prop="repairType"&ndash;&gt;-->
+<!--          &lt;!&ndash;        >&ndash;&gt;-->
+<!--          &lt;!&ndash;          <el-input&ndash;&gt;-->
+<!--          &lt;!&ndash;            v-model="form1.repairType"&ndash;&gt;-->
+<!--          &lt;!&ndash;            placeholder="检修类型"&ndash;&gt;-->
+<!--          &lt;!&ndash;          >&ndash;&gt;-->
+<!--          &lt;!&ndash;          </el-input>&ndash;&gt;-->
+<!--          &lt;!&ndash;        </el-form-item>&ndash;&gt;-->
+<!--          <el-form-item label="保养等级" prop="maintLevel">-->
+<!--            <el-select v-model="form1.maintLevel" placeholder="保养等级" >-->
+<!--              <el-option-->
+<!--                v-for="item in dict.type.dms_maint_level"-->
+<!--                :key="parseInt(item.value)"-->
+<!--                :label="item.label"-->
+<!--                :value="parseInt(item.value)"-->
+<!--              >-->
+<!--              </el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+<!--        <el-col :span="8">-->
+<!--          <el-form-item label="保养组别"-->
+<!--          >-->
+<!--            <el-input-->
+<!--              v-model="form1.maintGroup"-->
+<!--              placeholder="保养组别">-->
+<!--            </el-input>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+<!--        <el-col :span="8">-->
+<!--          <el-form-item label="保养负责人"-->
+<!--          >-->
+<!--            <el-input-->
+<!--              v-model="form1.maintSupervisor"-->
+<!--              placeholder="保养负责人">-->
+<!--            </el-input>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+<!--        <el-col :span="24">-->
 
-          <el-form-item label="处理意见"
-          >
-            <el-input
-              v-model="form1.processHandleResolution"
-              placeholder="处理意见">
-            </el-input>
-          </el-form-item>
-        </el-col>
-        <div  >
-          <el-button type="primary" @click="submitForm">提 交</el-button>
-        </div>
-      </el-form>
+<!--          <el-form-item label="处理意见"-->
+<!--          >-->
+<!--            <el-input-->
+<!--              v-model="form1.processHandleResolution"-->
+<!--              placeholder="处理意见">-->
+<!--            </el-input>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+<!--        <div  >-->
+<!--          <el-button type="primary" @click="submitForm">提 交</el-button>-->
+<!--        </div>-->
+<!--      </el-form>-->
 
 
 
@@ -199,7 +199,7 @@
       <!--      <el-table-column type="selection" width="55" align="center" />-->
       <el-table-column label="计划ID" align="center" prop="planMaintId" />
       <el-table-column label="设备名称" align="center" prop="deviceName" />
-      <el-table-column label="保养部位" align="center" prop="maintStationName" />
+      <el-table-column label="保养部位" align="center" prop="maintStationCode" />
       <el-table-column label="保养标准" align="center" prop="maintProtocol" />
       <el-table-column label="操作描述" align="center" prop="operationDescription" />