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

shj

2022-08-09 c64c8f43ec1a3d88feb1f915fd488040b6358e7d

 src/views/facilityManagement/InstrumentationInformation/index.vue

@@ -46,14 +46,14 @@
                              <el-table ref="multipleTableRef" :data="scope.row.takecareDetailList" style="width: 100%">
                                 <el-table-column property="takecareMemo" align="center" label="保养情况" sortable />
                                 <el-table-column property="leadingPersonId" align="center" label="保养负责人" sortable />
                                 <el-table-column property="takecareDate" align="center" label="保养日期" sortable />
                                 <el-table-column property="takecareDate" align="center" :formatter="timeDate" label="保养日期" sortable />
                                 <el-table-column property="leadingPersonDepartmentId" align="center" label="保养负责人单位" sortable />
                              </el-table>
                           </el-tab-pane>
                           <el-tab-pane label="设备检查" name="second"
                              ><el-table ref="multipleTableRef" :data="scope.row.checkDetailList" style="width: 100%">
                                 <el-table-column property="leadingPersonId" align="center" label="检查人" sortable />
                                 <el-table-column property="createTime" align="center" label="检查日期" sortable />
                                 <el-table-column property="createTime" align="center" :formatter="timeDate" label="检查日期" sortable />
                                 <el-table-column property="name" align="center" label="检查人部门" sortable />
                                 <el-table-column property="takecareMemo" align="center" label="检查结果" sortable />
                                 <el-table-column property="name" align="center" label="检查状态" sortable /> </el-table
@@ -61,7 +61,7 @@
                           <el-tab-pane label="设备检测" name="third">
                              <el-table ref="multipleTableRef" :data="scope.row.testDetailList" style="width: 100%">
                                 <el-table-column property="testPersonId" align="center" label="检测人" sortable />
                                 <el-table-column property="testDate" align="center" label="检测日期" sortable />
                                 <el-table-column property="testDate" align="center" :formatter="timeDate" label="检测日期" sortable />
                                 <el-table-column property="testPersonDepartmentId" align="center" label="检测人单位" sortable />
                                 <el-table-column property="testMemo" align="center" label="检测内容" sortable />
                                 <el-table-column property="testResult" align="center" label="检测结果" sortable />
@@ -75,8 +75,8 @@
                                 <el-table-column property="repairMemo" align="center" label="维修情况" sortable />
                                 <el-table-column property="repairPersonId" align="center" label="维修负责人" sortable />
                                 <el-table-column property="repairPersonDepartmentId" align="center" label="维修负责人单位" sortable />
                                 <el-table-column property="repairStartDate" align="center" label="维修开始日期" sortable />
                                 <el-table-column property="repairEndDate" align="center" label="维修结束日期" sortable />
                                 <el-table-column property="repairStartDate" align="center" :formatter="timeDate" label="维修开始日期" sortable />
                                 <el-table-column property="repairEndDate" align="center" :formatter="timeDate" label="维修结束日期" sortable />
                              </el-table>
                           </el-tab-pane>
                        </el-tabs>
@@ -116,6 +116,7 @@
</template>
<script lang="ts">
import { defineComponent, ref, reactive, watch, onMounted } from 'vue';
import { timeDate } from '/@/assets/index.ts';
import updata from '/@/components/updata/updata.vue';
import Dailog from '/@/components/equipmentDailog/Dailog.vue';
import { ElTree, TabsPaneContext, ElMessage, ElMessageBox } from 'element-plus';
@@ -187,6 +188,8 @@
      };
      // 删除
      const onDelete = (id: number) => {
         let arr=[]
         arr.push(id)
         ElMessageBox.confirm('确定删除所选项吗?', 'Warning', {
            confirmButtonText: '确定',
            cancelButtonText: '取消',
@@ -194,7 +197,7 @@
         })
            .then(() => {
               facilityManagementApi()
                  .getequipmentInfoDelete(id)
                  .getequipmentInfoDelete(arr)
                  .then((res) => {
                     if (res.data.code == 200) {
                        ElMessage({
@@ -224,7 +227,7 @@
         for (let i = 0; i < valId.length; i++) {
            arr.push(valId[i].id);
         }
         deletAll.value = arr.toString();
         deletAll.value = arr
         if (val.length == 1) {
            warning.value = false;
            danger.value = false;
@@ -296,7 +299,7 @@
         return data.typeName.includes(value);
      };
      const handleNodeClick = (data: Tree) => {
         ruleForm.searchParams.positionNum = data.id;
         ruleForm.searchParams.positionNum = data.sortNum;
         listApi();
      };
      const data = ref([]);
@@ -315,6 +318,7 @@
      return {
         handleNodeClick,
         ruleForm,
         timeDate,
         resetForm,
         listApi,
         onAddorUpdata,