From af75159618b6b090710b9515bc789fa9accdc3bd Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 06 九月 2023 15:44:35 +0800
Subject: [PATCH] 	modified:   src/api/standardLibrary.js 	modified:   src/views/basicData/index.vue 	modified:   src/views/experiment/inspectionApplication/index.vue 	modified:   src/views/laboratory/ledger/index.vue 	modified:   src/views/standardLibrary/index.vue

---
 src/views/laboratory/ledger/index.vue |   30 +++---------------------------
 1 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/src/views/laboratory/ledger/index.vue b/src/views/laboratory/ledger/index.vue
index 51edbca..0bf4c01 100644
--- a/src/views/laboratory/ledger/index.vue
+++ b/src/views/laboratory/ledger/index.vue
@@ -606,7 +606,7 @@
     },
     measureFormVisible(newVal){
       if(newVal === false){
-        this.resetForm("addmeasureForm");
+        this.cancelAddMeasure();
       }
     }
   },
@@ -639,7 +639,6 @@
     // 鑾峰彇鍒嗙被鏁版嵁
     async getThreeData() {
       const { data } = await getClassifyList()
-      // console.log(data)
       this.classTree = data.map(item => {
         if (item.children) {
           item.children = item.children.map(childrenItem => {
@@ -672,17 +671,14 @@
       const { data } = await getInstrumentDetail({ InstrumentId: row.id })
       this.equipmentDetail = data
       this.equipmentform = data
-      console.log(this.equipmentform)
       const { data: pointList } = await getEquipmentPointList({ InstrumentId: this.equipmentDetail.id })
       this.codePointsTable = pointList
       const { data: informationList } = await getMetricalInformationList({ InstrumentId: this.equipmentDetail.id })
       this.measureTable = informationList
-      console.log(informationList)
     },
     // 鑺傜偣鐐瑰嚮澶勭悊
     nodeClickHandler(data, node, element) {
       this.nodeclicked = data
-      console.log(data)
       // 鍙湁鏁版嵁涓惡甯d鎵嶈兘鍙戦�佹煡璇㈣姹�
       if (data.id) {
         this.getEquipmentTable({ classifyId: data.id, pageSize: this.pageSize, pageNo: this.currentPage, whetherWhether: this.isOut })
@@ -690,7 +686,6 @@
     },
     // 鑾峰彇浠櫒鍒楄〃鏁版嵁
     async getEquipmentTable(ages) {
-      // console.log('鏉′欢瀵硅薄', ages)
       const { data } = await getInstrumentList(ages)
       this.equipmentTable = data.row
       this.total = data.total
@@ -709,14 +704,8 @@
     handleCurrentChange() {
       // 褰撳墠椤垫洿鏀�
     },
-    // 鏄剧ず璁惧鐮佺偣
-    addCodePoints() {
-      // 娣诲姞鏂扮爜鐐癸紝娓呯┖鍘熸暟缁�
-      this.codePointesTableStatus = true
-    },
     // 鏂板璁惧鐮佺偣
     addNewCodePoints() {
-      console.log(this.equipmentDetail.id);
       this.codePointesTableStatus = true;
       const newObj = {}
       newObj.isInput = true,
@@ -814,10 +803,10 @@
       this.$refs[formName].resetFields();
     },
     cancelAddMeasure() {
-      this.$refs['upload'].clearFiles();
       this.measureForm.file = null;
       this.measureFormVisible = false
       this.resetForm('addmeasureForm');
+      this.$refs['upload'].clearFiles();
     },
     // 娣诲姞璁￠噺淇℃伅
     async addMeasure() {
@@ -829,7 +818,6 @@
             this.measureForm.beginDate = parseTime(this.measureForm.date[0], '{y}-{m}-{d}')
             this.measureForm.endDate = parseTime(this.measureForm.date[1], '{y}-{m}-{d}')
           }
-          console.log(this.measureForm)
           const formData = new FormData()
           if(this.measureForm.file == null || this.measureForm.file == ""){
             this.$message.warning("璇烽�夋嫨瑕佷笂浼犵殑鏂囦欢!");
@@ -837,16 +825,11 @@
           }else{
             formData.append('file', this.measureForm.file?.raw, this.measureForm.file?.name)
           }
-          console.log(this.measureForm)
           for (const key in this.measureForm) {
-            console.log(key)
-            // if (key === 'file') return
             formData.append(key, this.measureForm[key])
           }
-          console.log(formData)
           try {
-            const { data } = await addMetricalInformation(formData)
-            console.log(data)
+            await addMetricalInformation(formData)
             this.$message.success('娣诲姞鎴愬姛')
             const { data: informationList } = await getMetricalInformationList({ InstrumentId: this.equipmentDetail.id })
             this.measureTable = informationList
@@ -857,8 +840,6 @@
           }
           this.measureForm.file = null;
           this.$refs['upload'].clearFiles();
-        }else{
-          console.log(32);
         }
       });
     },
@@ -868,7 +849,6 @@
       this.codePointsTable = []
       this.measureTable = []
       this.measureForm.file = null;
-      this.$refs['upload'].clearFiles();
     },
     // 鍏抽棴娣诲姞淇敼璁惧鎶藉眽
     closeAddOrChangeDrawer() {
@@ -878,7 +858,6 @@
     },
     // 鏂囦欢涓婁紶
     handleUpload(file, fileList) {
-      console.log(file, fileList)
       this.measureForm.file = file
     },
     // 鏍规嵁杈撳叆鐨勮澶囩紪鍙凤紝璁惧鍚嶇О鎴栬�呭瀷鍙疯鏍煎叧閿瓧杩涜杩囨护鍒楄〃
@@ -896,7 +875,6 @@
       this.equipmentTable = this.oldtableData
     },
     getConditionTable() {
-      // console.log(this.radioValue)
       let filteredTable = this.oldtableData.filter(item => {
         return item.conditions === this.radioValue
       })
@@ -939,12 +917,10 @@
             let expireItem
             for (expireItem of this.expireData) {
               this.equipmentTable = this.oldtableData.filter(item => {
-                console.log(this.radioValue)
                 console.log('item', item)
                 console.log('expireItem', expireItem)
                 return item.conditions === this.radioValue && item.equipment_code === expireItem.equipment_code
               })
-              console.log(this.equipmentTable)
             }
           } else {
             this.equipmentTable = this.expireData

--
Gitblit v1.9.3