baichengfei 5 éve
szülő
commit
1008e464a8

+ 1 - 3
src/dashoo.cn/frontend_web/src/components/oilsupplier/goodsinfo.vue

@@ -1325,10 +1325,8 @@ export default {
           return
         }
         this.getattachissuccess()
-        console.log('wwwwww')
-
         this.editSubfile()
-        return false;
+        return false
       } else {
         this.$message({
           type: 'warning',

+ 18 - 21
src/dashoo.cn/frontend_web/src/components/oilsupplier/winninglist.vue

@@ -213,34 +213,31 @@
       },
       deletedata (val) {
         let _this = this
-      _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+        _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
-        })
-          .then(() => {
-            _this.$axios.delete('winning/winningdelete/' + val.Id, {})
-              .then(function (response) {
-                // response
-                if (response.data.code === 0) {
-                  _this.$message({
-                    type: 'success',
-                    message: response.data.message
-                  })
+        }).then(() => {
+          _this.$axios.delete('winning/winningdelete/' + val.Id, {})
+            .then(function (response) {
+              // response
+              if (response.data.code === 0) {
+                _this.$message({
+                  type: 'success',
+                  message: response.data.message
+                })
                 _this.initData()
               } else {
-                  _this.$message({
-                    type: 'warning',
-                    message: response.data.message
-                  })
+                _this.$message({
+                  type: 'warning',
+                  message: response.data.message
+                })
               }
-              })
-              .catch(function (error) {
-                console.log(error)
+            }).catch(function (error) {
+              console.log(error)
             })
-        })
-          .catch(() => {})
-    },
+        }).catch(() => {})
+      },
       showDialog () {
         this.Title = '近三年省部级及以上获奖项目'
         this.WinningForm.Id = 0

+ 11 - 12
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -1907,21 +1907,20 @@
             console.error(err)
           })
       },
-       imgFormat(val,index){
-         console.log(val)
-        if(val !=null && val != undefined && val !=''){
+      imgFormat (val, index) {
+        if (val != null && val != undefined && val != '') {
           let fileurlall = val.split('$')[index]
           let fileurl = fileurlall.split('|')
-          if(fileurl[1] != null && fileurl[1] !='' && fileurl[1] != undefined){
-            let Format  = fileurl[1].split(".")
-            if(Format[1]!=null && Format[1] !='' && Format[1] != undefined){
-               let pictureFormat = Format[1];
-              if("jpg"== pictureFormat || "bmp" ==pictureFormat || "png" ==pictureFormat || "gif" ==pictureFormat|| "jpeg" ==pictureFormat){
-                return false;
+          if (fileurl[1] != null && fileurl[1] != '' && fileurl[1] != undefined) {
+            let Format = fileurl[1].split('.')
+            if (Format[1] != null && Format[1] != '' && Format[1] != undefined) {
+              let pictureFormat = Format[1]
+              if (pictureFormat == 'jpg' || pictureFormat == 'bmp' || pictureFormat == 'png' || pictureFormat == 'gif' || pictureFormat == 'jpeg') {
+                return false
               }
             }
           }
-          return true;
+          return true
         }
       },
       fileurlcut (val, index) {
@@ -2228,13 +2227,13 @@
             console.error(err)
           })
       },
-      /*getChooseCode (val) {
+      /* getChooseCode (val) {
         this.dialogFormData.SubClassId = val.Id
         this.dialogFormData.SortFlag = val.Id.toString() // 记录OilBasisBuild表的Id
         this.dialogFormData.Code = val.Code
         this.dialogFormData.Name = val.Name
         this.basisDialog = false
-      },*/
+      }, */
 
       // 根据条件查找基建类层级列表
       seachData () {

+ 12 - 15
src/dashoo.cn/frontend_web/src/pages/setting/samplesite/index.vue

@@ -119,7 +119,7 @@
       this.getsametypetreelist()
     },
     methods: {
-      initData() {
+      initData () {
         let _this = this
         // paginate
         let params = {
@@ -136,9 +136,7 @@
           }
         }
         // request
-        this.$axios.get('samplesite/list', {
-            params
-          })
+        this.$axios.get('samplesite/list', {params})
           .then(res => {
             // response
             this.list = res.data.items
@@ -154,16 +152,16 @@
         this.organname = ''
         this.initData()
       },
-      handleSizeChange(value) {
+      handleSizeChange (value) {
         this.size = value
         this.currentPage = 1
         this.initData()
       },
-      handleCurrentChange(value) {
+      handleCurrentChange (value) {
         this.currentPage = value
         this.initData()
       },
-      resetForm(formName) {
+      resetForm (formName) {
         this.$refs[formName].resetFields()
       },
       getparentnodesbytopnode(v) {
@@ -195,11 +193,11 @@
             console.error(err)
           })
       },
-      jstimehandle(val) {
+      jstimehandle (val) {
         val = val.replace('T', ' ')
         return val.substring(0, 10)
       },
-      deletedata(val) {
+      deletedata (val) {
         let _this = this
         _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
           confirmButtonText: '确定',
@@ -253,24 +251,23 @@
           }
         }
       },
-      onSubmit() {
+      onSubmit () {
         console.log('submit!')
       },
-      handleRemove(file, fileList) {
+      handleRemove (file, fileList) {
       },
-      handlePreview(file) {
+      handlePreview (file) {
       },
-      deleteRow(index, rows) {
+      deleteRow (index, rows) {
         rows.splice(index, 1)
       },
-      clearSearch() {
+      clearSearch () {
         this.searchkey = ''
         this.selectedsamplesite = []
         this.initData()
       }
     }
   }
-
 </script>
 
 <style lang="scss">