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

shj

2022-08-09 b2b4ff03eef667430942928185756f8ab1fd05ed

 src/components/equipmentDailog/Dailog.vue

@@ -6,7 +6,7 @@
            <el-input v-model="form.qName" placeholder="请填写装置设施名称" />
         </el-form-item>
         <el-form-item label="装置设施位号" size="default" prop="positionNum">
            <el-input v-model="form.positionNum" placeholder="请填写装置设施位号" />
            <el-input disabled v-model="form.positionNum" placeholder="请填写装置设施位号" />
         </el-form-item>
         <el-form-item label="装置设施用途" size="default" prop="qUsage">
            <el-input v-model="form.qUsage" placeholder="请填写装置设施用途" />
@@ -14,8 +14,8 @@
         <el-form-item label="装置设施型号" size="default" prop="model">
            <el-input v-model="form.model" placeholder="请填写装置设施型号" />
         </el-form-item>
         <el-form-item label="类型/类别外键" size="default" prop="equipmentTypeId">
            <el-input v-model="form.equipmentTypeId" placeholder="请选择">
         <el-form-item label="类型/类别外键" size="default" prop="equipmentTypeName">
            <el-input v-model="form.equipmentTypeName" placeholder="请选择">
               <template #append>
                  <el-button :icon="Search" @click="opencategory"></el-button>
               </template>
@@ -333,7 +333,7 @@
         </span>
      </template>
   </el-dialog>
   <categoryDailog ref="categoryShow"></categoryDailog>
   <categoryDailog ref="categoryShow" @typeId="Tid"></categoryDailog>
   <regionDailog ref="regionShow"></regionDailog>
   <DailogSearchUser ref="UserShow" @SearchUser="userId"></DailogSearchUser>
   <maintenanceDailog ref="maintenanceShow" @onMain="main"></maintenanceDailog>
@@ -356,6 +356,7 @@
import type { UploadProps, UploadUserFile } from 'element-plus';
import { facilityManagementApi } from '/@/api/facilityManagement';
import { goalManagementApi } from '/@/api/goalManagement';
import {deepClone} from '/@/utils/other'
export default defineComponent({
   components: { categoryDailog, regionDailog, DailogSearchUser, maintenanceDailog, detectDailog, repairDailog, standardDailog },
   setup(props, { emit }) {
@@ -459,7 +460,8 @@

         repaireDetailList: [],

         equipmentTypeId: 1,
         equipmentTypeId: "",
         equipmentTypeName:"",

         useDate: '',

@@ -519,6 +521,7 @@
         qUsage: [],
         model: [],
         equipmentTypeId: [],
         equipmentTypeName:[],
         departmentId: [],
         setPart: [],
         produceTime: [],
@@ -688,28 +691,32 @@
         deleteDId.value.push(tag.id);
      };
      // 回传
      const main = (val: any) => {
      const main = (data: any) => {
         let val=deepClone(data)
         if (index.value == -1) {
            form.value.takecareDetailList.push(val);
         } else {
            form.value.takecareDetailList[index.value] = val;
         }
      };
      const delect = (val: any) => {
      const delect = (data: any) => {
         let val=deepClone(data)
         if (index.value == -1) {
            form.value.testDetailList.push(val);
         } else {
            form.value.testDetailList[index.value] = val;
         }
      };
      const Repair = (val: any) => {
      const Repair = (data: any) => {
         let val=deepClone(data)
         if (index.value == -1) {
            form.value.repaireDetailList.push(val);
         } else {
            form.value.repaireDetailList[index.value] = val;
         }
      };
      const Stand = (val: any) => {
      const Stand = (data: any) => {
         let val=deepClone(data)
         if (index.value == -1) {
            form.value.checkStandardeDetailList.push(val);
         } else {
@@ -726,6 +733,11 @@
            form.value.stopSubmitPersonName = val.realName;
         }
      };
      const Tid=(data:any)=>{
         form.value.equipmentTypeId=data.id
         form.value.equipmentTypeName=data.typeName
         form.value.positionNum=data.sortNum
      }
      //全屏
      const full = ref(false);
      const toggleFullscreen = () => {
@@ -754,6 +766,8 @@
      };
      const data = ref();
      return {
         Tid,
         deepClone,
         rules,
         userId,
         department,