Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut

shj

2022-08-10 b42883b36869675c7c10d128e52ef85cbf77d46a

 src/components/equipmentDailog/DailogS.vue

@@ -132,13 +132,13 @@
         </el-row>
         <el-row>
            <el-col :span="11">
               <el-form-item label="备注信息" size="default"> <el-input v-model="form.name" placeholder="请填写备注信息" /> </el-form-item>
               <el-form-item label="备注信息" size="default"> <el-input v-model="form.memo" placeholder="请填写备注信息" /> </el-form-item>
            </el-col>
         </el-row>
      </el-form>
      <el-tabs v-model="activeName" class="demo-tabs">
         <el-tab-pane label="设备保养" name="first">
            <el-button type="primary" size="default" @click="openMaintenance('新增', '')">新增</el-button>
            <el-button type="primary" size="default" @click="openMaintenance('新增', '')" :disabled="disabled">新增</el-button>
            <el-table :data="form.takecareDetailList" style="width: 100%">
               <el-table-column align="center" prop="takecareMemo" label="保养情况" />
               <el-table-column align="center" prop="leadingPersonId" label="保养负责人" />
@@ -146,15 +146,15 @@
               <el-table-column align="center" prop="leadingPersonDepartmentId" label="保养负责人单位" />
               <el-table-column align="center" label="操作">
                  <template #default="scope">
                     <el-button link type="primary" @click="openMaintenance('查看', scope.row)" size="small">查看</el-button>
                     <el-button link type="primary" @click="openMaintenance('修改', scope.row)" size="small">修改</el-button>
                     <el-button link type="primary" @click="deleteA(scope.row)" size="small">删除</el-button>
                     <el-button link type="primary" @click="openMaintenance('查看', scope.row)" size="small" :disabled="disabled">查看</el-button>
                     <el-button link type="primary" @click="openMaintenance('修改', scope.row)" size="small" :disabled="disabled">修改</el-button>
                     <el-button link type="primary" @click="deleteA(scope.row)" size="small" :disabled="disabled">删除</el-button>
                  </template>
               </el-table-column>
            </el-table>
         </el-tab-pane>
         <el-tab-pane label="设备检测" name="second">
            <el-button type="primary" size="default" @click="openDetect('新增', '')">新增</el-button>
            <el-button type="primary" size="default" @click="openDetect('新增', '')" :disabled="disabled">新增</el-button>
            <el-table :data="form.testDetailList" style="width: 100%">
               <el-table-column align="center" prop="testPersonId" label="检测人" />
               <el-table-column align="center" prop="testDate" :formatter="timeDate" label="检测日期" />
@@ -164,15 +164,15 @@
               <el-table-column align="center" prop="testStatus" label="检测状态" />
               <el-table-column align="center" label="操作">
                  <template #default="scope">
                     <el-button link type="primary" @click="openDetect('查看', scope.row)" size="small">查看</el-button>
                     <el-button link type="primary" @click="openDetect('修改', scope.row)" size="small">修改</el-button>
                     <el-button link type="primary" @click="deleteB(scope.row)" size="small">删除</el-button>
                     <el-button link type="primary" @click="openDetect('查看', scope.row)" size="small" :disabled="disabled">查看</el-button>
                     <el-button link type="primary" @click="openDetect('修改', scope.row)" size="small" :disabled="disabled">修改</el-button>
                     <el-button link type="primary" @click="deleteB(scope.row)" size="small" :disabled="disabled">删除</el-button>
                  </template>
               </el-table-column>
            </el-table>
         </el-tab-pane>
         <el-tab-pane label="设备维修" name="third">
            <el-button type="primary" size="default" @click="openRepair('新增', '')">新增</el-button>
            <el-button type="primary" size="default" @click="openRepair('新增', '')" :disabled="disabled">新增</el-button>
            <el-table :data="form.repaireDetailList" style="width: 100%">
               <el-table-column align="center" prop="exceptionInfo" label="设施异常项" />
               <el-table-column align="center" prop="repairStatus" label="维修状态" />
@@ -183,15 +183,15 @@
               <el-table-column align="center" prop="repairEndDate" :formatter="timeDate" label="维修结束日期" />
               <el-table-column align="center" label="操作">
                  <template #default="scope">
                     <el-button link type="primary" @click="openRepair('查看', scope.row)" size="small">查看</el-button>
                     <el-button link type="primary" @click="openRepair('修改', scope.row)" size="small">修改</el-button>
                     <el-button link type="primary" @click="deleteC(scope.row)" size="small">删除</el-button>
                     <el-button link type="primary" @click="openRepair('查看', scope.row)" size="small" :disabled="disabled">查看</el-button>
                     <el-button link type="primary" @click="openRepair('修改', scope.row)" size="small" :disabled="disabled">修改</el-button>
                     <el-button link type="primary" @click="deleteC(scope.row)" size="small" :disabled="disabled">删除</el-button>
                  </template>
               </el-table-column>
            </el-table>
         </el-tab-pane>
         <el-tab-pane label="检查标准设置" name="fourth">
            <el-button type="primary" size="default" @click="openStandard('新增', '')">新增</el-button>
            <el-button type="primary" size="default" @click="openStandard('新增', '')" :disabled="disabled">新增</el-button>
            <el-table :data="form.checkStandardeDetailList" style="width: 100%">
               <el-table-column align="center" type="indexNum" label="序号" width="75" />
               <el-table-column align="center" prop="checkContent" label="检查内容" />
@@ -201,9 +201,9 @@
               <el-table-column align="center" prop="rate" label="频次" />
               <el-table-column align="center" label="操作">
                  <template #default="scope">
                     <el-button link type="primary" @click="openStandard('查看', scope.row)" size="small">查看</el-button>
                     <el-button link type="primary" @click="openStandard('修改', scope.row)" size="small">修改</el-button>
                     <el-button link type="primary" @click="deleteD(scope.row)" size="small">删除</el-button>
                     <el-button link type="primary" @click="openStandard('查看', scope.row)" size="small" :disabled="disabled">查看</el-button>
                     <el-button link type="primary" @click="openStandard('修改', scope.row)" size="small" :disabled="disabled">修改</el-button>
                     <el-button link type="primary" @click="deleteD(scope.row)" size="small" :disabled="disabled">删除</el-button>
                  </template>
               </el-table-column>
            </el-table>
@@ -303,6 +303,7 @@
         toDangerous: '',

         dangerousElement: '',
      memo:'',

         takecareStardardeDetailList: [
            {
@@ -339,10 +340,12 @@
      });
    const ruleFormRef = ref<FormInstance>();
      const titles = ref();
    const titleT = ref();
      const disabled = ref(false);
      const Dailogtype = ref(false);
      const openDailog = (title: string, type: boolean, id: number, num: any) => {
         dialogVisible.value = true;
      titleT.value = title;
         department();
         Dailogtype.value = type;
         if (num == 0) {
@@ -375,6 +378,9 @@
         form.value.delRepaireDetails = deleteCId.value.toString();
         form.value.delCheckStandardeDetails = deleteDId.value.toString();
         dialogVisible.value = false;
      if (titleT.value == '新建') {
        delete form.value.id;
      }
         facilityManagementApi()
            .getkeypointEquipmentInfoAddOrUpdate(form.value)
            .then((res) => {
@@ -642,6 +648,7 @@
         deleteC,
         deleteD,
         timeDate,
      titleT,
      };
   },
});