2023-09-27 设备和质量修改

src/views/modules/eam/eamWorkOrderForDefect.vue

@@ -738,7 +738,13 @@
           checkerName: '',
           difficultyLevel: '',
           difficultyRemark: '',
-          status: ''
+          status: '',
+          updateBy: this.$store.state.user.name,
+          createBy: this.$store.state.user.name,
+          planDesc: '',
+          disposalMeasures: '',
+          defectID: '',
+          remark: ''
         },
         submitModelFlag: false,
         detailData: {},
@@ -971,9 +977,13 @@
         this.submitData.orderNo = this.detailData.orderNo
         this.submitData.planID = this.detailData.planID
         this.submitData.objectID = this.detailData.objectID
+        this.submitData.planDesc = this.detailData.planDesc
+        this.submitData.disposalMeasures = this.detailData.disposalMeasures
+        this.submitData.defectID = this.detailData.defectID
+        this.submitData.remark = this.detailData.remark
         this.submitData.difficultyLevel = ''
         this.submitData.difficultyRemark = ''
-        if (this.detailData.status === '已完工'){
+        if (this.detailData.status === '已完工') {
           this.$confirm(`是否取消审核?`, '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
@@ -999,7 +1009,7 @@
             })
           }).catch(() => {
           })
-        }else {
+        } else {
           this.submitData.status = '已完工'
           this.submitModelFlag = true
         }
@@ -1048,6 +1058,8 @@
           planDate: row.planDate,
           reachDate: row.reachDate,
           actualDate: row.actualDate,
+          planDesc: row.planDesc,
+          disposalMeasures: row.disposalMeasures
         }
         this.detailModelFlag = true;
       },

src/views/modules/eam/eamWorkPlanForCheck.vue

@@ -2343,8 +2343,7 @@
                 message: '操作成功',
                 type: 'success',
                 duration: 1500,
-                onClose: () => {
-                }
+                onClose: () => {}
               })
             } else {
               this.$alert(data.msg, '错误', {

src/views/modules/eam/eam_knowledge_base.vue

@@ -260,6 +260,7 @@
         uploadUrl: "",
         currentRow: {},
         searchData: {
+          site: this.$store.state.user.site,
           objectId: '',
           defectId: '',
           defectReason: '',
@@ -328,7 +329,9 @@
         modalDisableFlag: false,
         modalData: {
           flag: '',
-          createBy: this.$store.state.user.name,
+          site: this.$store.state.user.site,
+          createBy: '',
+          updateBy: '',
           num: '',
           objectId: '',
           objectName: '',
@@ -453,10 +456,21 @@
             status: true,
             fixed: '',
           },
+          {
+            columnProp: 'createBy',
+            align: 'center',
+            columnLabel: '上传人',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
           {
             columnProp: 'updateDate',
             align: 'center',
-            columnLabel: '操作时间',
+            columnLabel: '更新时间',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -465,9 +479,9 @@
             fixed: '',
           },
           {
-            columnProp: 'createBy',
+            columnProp: 'updateBy',
             align: 'center',
-            columnLabel: '操作员',
+            columnLabel: '更新人',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -602,10 +616,10 @@
         this.searchData.page = this.pageIndex
         getKnowledgeBaseList(this.searchData).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.page.list;
-            this.pageIndex = data.page.currPage;
-            this.pageSize = data.page.pageSize;
-            this.totalPage = data.page.totalCount;
+            this.dataList = data.page.list
+            this.pageIndex = data.page.currPage
+            this.pageSize = data.page.pageSize
+            this.totalPage = data.page.totalCount
             //判断是否全部存在数据
             if(this.totalPage > 0){
               //设置选中行
@@ -631,6 +645,7 @@
       addModal(){
         this.modalData = {
           flag: '1',
+          site: this.$store.state.user.site,
           createBy: this.$store.state.user.name,
           num: '',
           objectId: '',
@@ -651,7 +666,8 @@
       updateModal(row){
         this.modalData = {
           flag:'2',
-          createBy: this.$store.state.user.name,
+          site: this.$store.state.user.site,
+          updateBy: this.$store.state.user.name,
           num: row.num,
           objectId: row.objectId,
           objectName: row.objectName,
@@ -669,43 +685,43 @@
       },
       // 新增/修改设备知识库
       saveData(){
-        if (this.modalData.objectId == '' || this.modalData.objectId == null) {
+        if (this.modalData.objectId === '' || this.modalData.objectId == null) {
           this.$alert('请选择设备编码！', '错误', {
             confirmButtonText: '确定'
           })
           return false
         }
-        if (this.modalData.objectName == '' || this.modalData.objectName == null) {
+        if (this.modalData.objectName === '' || this.modalData.objectName == null) {
           this.$alert('请选择设备名称！', '错误', {
             confirmButtonText: '确定'
           })
           return false
         }
-        if (this.modalData.defectId == '' || this.modalData.defectId == null) {
+        if (this.modalData.defectId === '' || this.modalData.defectId == null) {
           this.$alert('请选择故障编码！', '错误', {
             confirmButtonText: '确定'
           })
           return false
         }
-        if (this.modalData.fileType == '' || this.modalData.fileType == null) {
+        if (this.modalData.fileType === '' || this.modalData.fileType == null) {
           this.$alert('请选择类型！', '错误', {
             confirmButtonText: '确定'
           })
           return false
         }
-        if (this.modalData.defectDescribe == '' || this.modalData.defectDescribe == null) {
+        if (this.modalData.defectDescribe === '' || this.modalData.defectDescribe == null) {
           this.$alert('请填写故障描述！', '错误', {
             confirmButtonText: '确定'
           })
           return false
         }
-        if (this.modalData.disposalMeasures == '' || this.modalData.disposalMeasures == null) {
+        if (this.modalData.disposalMeasures === '' || this.modalData.disposalMeasures == null) {
           this.$alert('请填写处置措施！', '错误', {
             confirmButtonText: '确定'
           })
           return false
         }
-        if(this.modalData.flag=='1'){
+        if(this.modalData.flag === '1'){
           saveKnowledgeBase(this.modalData).then(({data}) => {
             if (data && data.code === 0) {
               this.getDataList()
@@ -779,7 +795,7 @@
           type: 'warning'
         }).then(() => {
           deleteObjectFile(row).then(({data}) => {
-            if (data && data.code == 0) {
+            if (data && data.code === 0) {
               this.getFileContentData();
               this.$message({
                 message: '操作成功',
@@ -799,7 +815,7 @@
       },
       // 批量删除
       deleteSome() {
-        if(this.dataListSelections.length == 0){
+        if(this.dataListSelections.length === 0){
           this.$alert('请勾选要删除的内容！', '错误', {
             confirmButtonText: '确定'
           })
@@ -837,6 +853,7 @@
       // 刷新派设备文档的列表
       getFileContentData() {
         let currentData = {
+          orderRef1: this.$store.state.user.site,
           orderRef2: this.currentRow.num
         }
         getFileContentList(currentData).then(({data}) => {
@@ -865,16 +882,16 @@
           objectName: this.currentRow.objectName,
           defectId: this.currentRow.defectId,
           defectReason: this.currentRow.defectReason,
-        };
+        }
         //打开组件 去做新增业务
         this.$nextTick(() => {
-          this.$refs.comEamKnowledgeBaseUploadFile.init(currentData);
+          this.$refs.comEamKnowledgeBaseUploadFile.init(currentData)
         })
       },
 
       // 设置当前的行
       setCurrentRow(row, column, event) {
-        this.currentRow = JSON.parse(JSON.stringify(row));
+        this.currentRow = JSON.parse(JSON.stringify(row))
       },
       // 当前值发生变化的时候修改
       changeCurrentRow(row, oldRow){
@@ -952,10 +969,8 @@
         })
       },
       startDownload() {
-
       },
       finishDownload() {
-
       },
       fields() {
         let json = "{"
@@ -970,8 +985,6 @@
         let s = eval("(" + json + ")")
         return s
       },
-
-
     },
   }
 </script>