bug

Signed-off-by: lijunqing <lijunqing@dashoo.cn>

src/dashoo.cn/frontend_web/src/components/oilsupplier/auditbuslist.vue

@@ -7,7 +7,7 @@
           <el-button type="primary" size="mini"  v-if ="Visiblebtn =='0'" @click="AuditEntity">提交审批</el-button>
         </span>
       </div>
-      <el-table :data="auditbusList" border>
+      <el-table :data="auditbusList" border height="calc(100vh - 435px)" size="mini">
         <el-table-column label="操作" width="90" align="center" fixed v-if="Visiblebtn != '10'">
           <template slot-scope="scope">
             <el-popover trigger="hover" width="700" placement="right" @show="getopinonList(scope.row)">
@@ -34,6 +34,15 @@
         </el-table-column>
         <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
         <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
+         <el-table-column prop="CertSubStatus" label="状态" show-overflow-tooltip>
+            <template slot-scope="scope">
+            <span v-if="scope.row.CertSubStatus=='1'"
+                  style="color:#67C23A">准入</span>
+            <span v-else-if="scope.row.CertSubStatus>'1'"
+                  style="color:#E6A23C">暂停</span>
+            <span v-else>——</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"

src/dashoo.cn/frontend_web/src/components/oilsupplier/auditfilelist.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-table :data="auditfileList" border>
+    <el-table :data="auditfileList" border size="mini">
       <!-- <el-table-column label="操作" width="150" align="center" fixed>
         <template slot-scope="scope">
           <el-button type="primary" plain size="mini" title="编辑" @click="openDialog(scope.row)">编辑</el-button>
@@ -126,13 +126,13 @@
       },
       BusinessForm: {}
     },
-    created() {},
+    created () {},
     computed: {
       ...mapGetters({
         session: 'session'
       })
     },
-    data() {
+    data () {
       return {
         auditfileList: [],
         techList: [],
@@ -166,21 +166,21 @@
         selfVisible: this.visible, // 避免vue双向绑定警告
 
         waituploads: [], // 等待上传的附件列表
-        doclist: [],
+        doclist: []
       }
     },
     methods: {
-      initData() {
+      initData () {
         let _this = this
         const params = {
           SupplierId: this.SupplierId,
           SupplierTypeCode: this.SupplierTypeCode,
           _currentPage: 1,
-          _size: 1000,
+          _size: 1000
         }
         this.$axios.get('supplierfile/filelist', {
-            params
-          })
+          params
+        })
           .then(res => {
             _this.auditfileList = res.data.items
             _this.currentItemCount = res.data.currentItemCount
@@ -190,7 +190,7 @@
             console.error(err)
           })
       },
-      getCode() {
+      getCode () {
         if (this.businessList && this.businessList.length > 0) {
           for (var i = 0; i < this.businessList.length; i++) {
             if (this.SubfileForm.SupplierCertSubId == this.businessList[i].Id) {
@@ -199,7 +199,7 @@
           }
         }
       },
-      makesure() {
+      makesure () {
         if (this.Title == '新增文件') {
           if (this.$refs.refuploadattach.uploadFiles && this.$refs.refuploadattach.uploadFiles.length > 0) {
             // 上传附件是否完成判断
@@ -229,7 +229,7 @@
           }
         }
       },
-      addSubfile() {
+      addSubfile () {
         let _this = this
         _this.SubfileForm.SupplierId = parseInt(_this.SubfileForm.SupplierId)
         _this.SubfileForm.SupplierCertSubId = parseInt(_this.SubfileForm.SupplierCertSubId)
@@ -238,7 +238,7 @@
             if (res.data.code === 0) {
               _this.$message({
                 type: 'success',
-                message: res.data.message,
+                message: res.data.message
               })
               this.visible = false
               this.initData()
@@ -254,7 +254,7 @@
             console.error(err)
           })
       },
-      editSubfile() {
+      editSubfile () {
         let _this = this
         _this.SubfileForm.SupplierId = parseInt(_this.SubfileForm.SupplierId)
         _this.SubfileForm.SupplierCertSubId = parseInt(_this.SubfileForm.SupplierCertSubId)
@@ -263,7 +263,7 @@
             if (res.data.code === 0) {
               _this.$message({
                 type: 'success',
-                message: res.data.message,
+                message: res.data.message
               })
               this.visible = false
               this.initData()
@@ -279,36 +279,36 @@
             console.error(err)
           })
       },
-      deletedata(val) {
-        let _this = this;
-        _this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          })
+      deletedata (val) {
+        let _this = this
+      _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
           .then(() => {
             _this.$axios.delete('supplierfile/subfiledelete/' + val.Id, {})
               .then(function (response) {
                 // response
                 if (response.data.code === 0) {
                   _this.$message({
-                    type: "success",
+                    type: 'success',
                     message: response.data.message
-                  });
-                  _this.initData();
-                } else {
+                  })
+                _this.initData()
+              } else {
                   _this.$message({
-                    type: "warning",
+                    type: 'warning',
                     message: response.data.message
-                  });
-                }
+                  })
+              }
               })
               .catch(function (error) {
-                console.log(error);
-              });
-          })
-          .catch(() => {});
-      },
+                console.log(error)
+            })
+        })
+          .catch(() => {})
+    },
       //   showDialog() {
       //     this.Title = '新增文件'
       //     this.SubfileForm.Id = ''
@@ -328,7 +328,7 @@
       //     this.SubfileForm.IsDelete = 0
       //     this.visible = true
       //   },
-      openDialog(val) {
+      openDialog (val) {
         this.Title = '编辑文件'
         this.SubfileForm.Id = val.Id
         this.SubfileForm.SupplierId = val.SupplierId
@@ -354,8 +354,8 @@
         this.SubfileForm.IsDelete = val.IsDelete
         this.visible = true
       },
-      //文档列表
-      getwendanginfo(iUrl) {
+      // 文档列表
+      getwendanginfo (iUrl) {
         let _this = this
         _this.doclist = []
         let exArr = iUrl.split('|')
@@ -365,11 +365,11 @@
         }
         _this.doclist.push(params)
       },
-      fileurlcut(val) {
+      fileurlcut (val) {
         let fileurlall = val
-        let fileurl = fileurlall.split("|")
+        let fileurl = fileurlall.split('|')
         let retUrl = fileurl[0]
-        //内网服务器专用
+        // 内网服务器专用
         if (process.client && retUrl.indexOf('/upfile') === 0) {
           const myDomain = window.location.host
           retUrl = myDomain + '/' + retUrl
@@ -377,7 +377,7 @@
         return retUrl
       },
 
-      beforeAvatarUpload(file) {
+      beforeAvatarUpload (file) {
         let isLt50m = file.size / 1024 / 1024 / 50 < 1
         if (!isLt50m) {
           this.$message.error('上传文件大小不能超过 50MB!')
@@ -385,14 +385,14 @@
         }
         return true
       },
-      uploadrequest(option) {
+      uploadrequest (option) {
         let _this = this
         if (process.client) {
           const myDomain = window.location.host
           axios.post(process.env.upfilehost, {})
             .then(function (res) {
               if (res.data && res.data.fid && res.data.fid !== '') {
-                if ( res.data.publicUrl.indexOf('/upfile') === 0 ) {
+                if (res.data.publicUrl.indexOf('/upfile') === 0) {
                   option.action = `http://${myDomain}/${res.data.publicUrl}/${res.data.fid}`
                 } else {
                   option.action = `http://${res.data.publicUrl}/${res.data.fid}`
@@ -419,7 +419,7 @@
         }
       },
       // 判断附件是否上传成功
-      attachissuccess() {
+      attachissuccess () {
         if (this.$refs.refuploadattach.uploadFiles && this.$refs.refuploadattach.uploadFiles.length > 0) {
           for (let i = 0; i < this.$refs.refuploadattach.uploadFiles.length; i++) {
             if (this.$refs.refuploadattach.uploadFiles[i].status !== 'success') {
@@ -429,7 +429,7 @@
         }
         return true
       },
-      getattachissuccess() {
+      getattachissuccess () {
         this.SubfileForm.FileUrl = ''
         if (this.$refs.refuploadattach.uploadFiles && this.$refs.refuploadattach.uploadFiles.length > 0) {
           for (let i = 0; i < this.$refs.refuploadattach.uploadFiles.length; i++) {
@@ -445,26 +445,26 @@
           }
         }
       },
-      clickachment(url, uid) {
+      clickachment (url, uid) {
         window.open(`http://${url}`)
       },
-      deletefile() {
+      deletefile () {
         let _this = this
         _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          })
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
           .then(() => {
             _this.doclist = []
           })
           .catch(() => {})
       },
 
-      seachdata() {
+      seachdata () {
         this.initData()
       },
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T00:00:00Z') {
@@ -477,10 +477,9 @@
           val = val.replace('T', ' ')
           return val.substring(0, 10)
         }
-      },
+      }
     }
   }
-
 </script>
 
 <style lang='scss'>

src/dashoo.cn/frontend_web/src/components/oilsupplier/businesslist.vue

@@ -16,7 +16,7 @@
          <el-table-column prop="CertSubStatus" label="状态" show-overflow-tooltip>
             <template slot-scope="scope">
             <span v-if="scope.row.CertSubStatus=='1'"
-                  style="color:#67C23A">正常</span>
+                  style="color:#67C23A">准入</span>
             <span v-else-if="scope.row.CertSubStatus>'1'"
                   style="color:#E6A23C">暂停</span>
             <span v-else>——</span>

src/dashoo.cn/frontend_web/src/components/oilsupplier/equipmentlist.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-table :data="equipmentList" border>
+    <el-table :data="equipmentList" border size="mini">
       <el-table-column label="操作" width="150" align="center" fixed>
         <template slot-scope="scope">
           <el-button type="primary" plain size="mini" title="编辑" @click="openDialog(scope.row)" :disabled="!canadd">
@@ -67,7 +67,7 @@
       visible: {
         type: Boolean,
         default: false
-      },
+      }
     },
     created () {
       this.initData()
@@ -92,12 +92,12 @@
           MainEquipment: '',
           Specifications: '',
           Number: '',
-          Remark: '',
+          Remark: ''
         },
         selfVisible: this.visible, // 避免vue双向绑定警告
         currentPage: 1, // 分页
         size: 10,
-        currentItemCount: 0,
+        currentItemCount: 0
       }
     },
     methods: {
@@ -108,17 +108,17 @@
         this.Status = status
         this.initData()
       },
-      initData() {
+      initData () {
         let _this = this
         const params = {
           SupplierCertId: this.SupplierCertId,
           SupplierTypeCode: this.SupplierTypeCode,
           _currentPage: this.currentPage,
-          _size: this.size,
+          _size: this.size
         }
         this.$axios.get('majorequip/equipmentlist', {
-            params
-          })
+          params
+        })
           .then(res => {
             _this.equipmentList = res.data.items
             _this.currentItemCount = res.data.currentItemCount
@@ -128,14 +128,14 @@
             console.error(err)
           })
       },
-      savedata() {
+      savedata () {
         if (this.Title == '企业主要设备') {
           this.addEquipment()
         } else if (this.Title == '编辑企业主要设备') {
           this.editEquipment()
         }
       },
-      addEquipment() {
+      addEquipment () {
         let _this = this
         _this.EquipmentForm.SupplierCertId = parseInt(_this.EquipmentForm.SupplierCertId)
         _this.$axios.post('/majorequip/addequipment/', _this.EquipmentForm)
@@ -143,7 +143,7 @@
             if (res.data.code === 0) {
               _this.$message({
                 type: 'success',
-                message: res.data.message,
+                message: res.data.message
               })
               this.visible = false
               this.initData()
@@ -158,7 +158,7 @@
             console.error(err)
           })
       },
-      editEquipment() {
+      editEquipment () {
         let _this = this
         _this.EquipmentForm.SupplierCertId = parseInt(_this.EquipmentForm.SupplierCertId)
         _this.$axios.put('/majorequip/editequipment/' + _this.EquipmentForm.Id, _this.EquipmentForm)
@@ -166,7 +166,7 @@
             if (res.data.code === 0) {
               _this.$message({
                 type: 'success',
-                message: res.data.message,
+                message: res.data.message
               })
               this.visible = false
               this.initData()
@@ -181,37 +181,37 @@
             console.error(err)
           })
       },
-      deletedata(val) {
-        let _this = this;
-        _this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          })
+      deletedata (val) {
+        let _this = this
+      _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
           .then(() => {
             _this.$axios.delete('majorequip/equipmentdelete/' + val.Id, {})
               .then(function (response) {
                 // response
                 if (response.data.code === 0) {
                   _this.$message({
-                    type: "success",
+                    type: 'success',
                     message: response.data.message
-                  });
-                  _this.initData();
-                } else {
+                  })
+                _this.initData()
+              } else {
                   _this.$message({
-                    type: "warning",
+                    type: 'warning',
                     message: response.data.message
-                  });
-                }
+                  })
+              }
               })
               .catch(function (error) {
-                console.log(error);
-              });
-          })
-          .catch(() => {});
-      },
-      showDialog() {
+                console.log(error)
+            })
+        })
+          .catch(() => {})
+    },
+      showDialog () {
         this.Title = '企业主要设备'
         this.EquipmentForm.Id = 0
         this.EquipmentForm.SupplierCertId = this.SupplierCertId
@@ -222,7 +222,7 @@
         this.EquipmentForm.Remark = ''
         this.visible = true
       },
-      openDialog(val) {
+      openDialog (val) {
         this.Title = '编辑企业主要设备'
         this.EquipmentForm.Id = val.Id
         this.EquipmentForm.SupplierCertId = val.SupplierCertId
@@ -233,19 +233,19 @@
         this.EquipmentForm.Remark = val.Remark
         this.visible = true
       },
-      seachdata() {
+      seachdata () {
         this.initData()
       },
-      handleSizeChange(value) {
+      handleSizeChange (value) {
         this.size = value
         this.currentPage = 1
         this.initData()
       },
-      handleCurrentChange(value) {
+      handleCurrentChange (value) {
         this.currentPage = value
         this.initData()
       },
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -256,10 +256,9 @@
           val = val.replace('T', ' ')
           return val.substring(0, 10)
         }
-      },
+      }
     }
   }
-
 </script>
 
 <style>

src/dashoo.cn/frontend_web/src/components/oilsupplier/goodslist.vue

@@ -19,7 +19,7 @@
         <el-table-column prop="CertSubStatus" label="状态" show-overflow-tooltip>
             <template slot-scope="scope">
             <span v-if="scope.row.CertSubStatus=='1'"
-                  style="color:#67C23A">正常</span>
+                  style="color:#67C23A">准入</span>
             <span v-else-if="scope.row.CertSubStatus>'1'"
                   style="color:#E6A23C">暂停</span>
             <span v-else>——</span>

src/dashoo.cn/frontend_web/src/components/oilsupplier/patentlist.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-table :data="patentList" border :stripe="true">
+    <el-table :data="patentList" border :stripe="true"  size="mini">
       <el-table-column label="操作" width="150" align="center" fixed>
         <template slot-scope="scope">
           <el-button type="primary" plain size="mini" title="编辑" @click="openDialog(scope.row)" :disabled="!canadd">编辑
@@ -80,7 +80,7 @@
       SupplierTypeCode: {
         type: String,
         default: '0'
-      },*/
+      }, */
       canadd: {
         type: Boolean,
         default: false
@@ -88,9 +88,9 @@
       visible: {
         type: Boolean,
         default: false
-      },
+      }
     },
-    created() {
+    created () {
       this.initData()
     },
     computed: {
@@ -98,7 +98,7 @@
         session: 'session'
       })
     },
-    data() {
+    data () {
       return {
         SupplierId: '0',
         SupplierCertId: '0',
@@ -114,33 +114,33 @@
           Content: '',
           ApprovalAuthority: '',
           ApprovalDate: new Date(),
-          Remark: '',
+          Remark: ''
         },
         selfVisible: this.visible,
         currentPage: 1, // 分页
         size: 10,
-        currentItemCount: 0,
+        currentItemCount: 0
       }
     },
     methods: {
-      getvalue(serviceId, SupplierTypeCode, certId) {
+      getvalue (serviceId, SupplierTypeCode, certId) {
         // this.SupplierId = serviceId
         this.SupplierTypeCode = SupplierTypeCode
         this.SupplierCertId = certId
         this.initData()
       },
-      initData() {
+      initData () {
         let _this = this
         // request
         const params = {
           SupplierCertId: this.SupplierCertId,
           SupplierTypeCode: this.SupplierTypeCode,
           _currentPage: this.currentPage,
-          _size: this.size,
+          _size: this.size
         }
         this.$axios.get('patent/patentlist', {
-            params
-          })
+          params
+        })
           .then(res => {
             _this.patentList = res.data.items
             _this.currentItemCount = res.data.currentItemCount
@@ -150,14 +150,14 @@
             console.error(err)
           })
       },
-      savedata() {
+      savedata () {
         if (this.Title == '专利及专有技术') {
           this.addPantent()
         } else if (this.Title == '编辑专利及专有技术') {
           this.editPantent()
         }
       },
-      addPantent() {
+      addPantent () {
         let _this = this
         _this.PatentForm.SupplierCertId = parseInt(_this.PatentForm.SupplierCertId)
         _this.$axios.post('/patent/addpatent', _this.PatentForm)
@@ -165,7 +165,7 @@
             if (res.data.code === 0) {
               _this.$message({
                 type: 'success',
-                message: res.data.message,
+                message: res.data.message
               })
               this.visible = false
               this.initData()
@@ -180,7 +180,7 @@
             console.error(err)
           })
       },
-      editPantent() {
+      editPantent () {
         let _this = this
         _this.PatentForm.SupplierCertId = parseInt(_this.PatentForm.SupplierCertId)
         _this.$axios.put('/patent/editpatent/' + _this.PatentForm.Id, _this.PatentForm)
@@ -188,7 +188,7 @@
             if (res.data.code === 0) {
               _this.$message({
                 type: 'success',
-                message: res.data.message,
+                message: res.data.message
               })
               this.visible = false
               this.initData()
@@ -203,37 +203,37 @@
             console.error(err)
           })
       },
-      deletedata(val) {
-        let _this = this;
-        _this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          })
+      deletedata (val) {
+        let _this = this
+      _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
           .then(() => {
             _this.$axios.delete('patent/patentdelete/' + val.Id, {})
               .then(function (response) {
                 // response
                 if (response.data.code === 0) {
                   _this.$message({
-                    type: "success",
+                    type: 'success',
                     message: response.data.message
-                  });
-                  _this.initData();
-                } else {
+                  })
+                _this.initData()
+              } else {
                   _this.$message({
-                    type: "warning",
+                    type: 'warning',
                     message: response.data.message
-                  });
-                }
+                  })
+              }
               })
               .catch(function (error) {
-                console.log(error);
-              });
-          })
-          .catch(() => {});
-      },
-      showDialog() {
+                console.log(error)
+            })
+        })
+          .catch(() => {})
+    },
+      showDialog () {
         this.Title = '专利及专有技术'
         this.PatentForm.Id = 0
         this.PatentForm.SupplierCertId = this.SupplierCertId
@@ -245,7 +245,7 @@
         this.PatentForm.Remark = ''
         this.visible = true
       },
-      openDialog(val) {
+      openDialog (val) {
         this.Title = '编辑专利及专有技术'
         this.PatentForm.Id = val.Id
         this.PatentForm.SupplierCertId = val.SupplierCertId
@@ -257,19 +257,19 @@
         this.PatentForm.Remark = val.Remark
         this.visible = true
       },
-      seachdata() {
+      seachdata () {
         this.initData()
       },
-      handleSizeChange(value) {
+      handleSizeChange (value) {
         this.size = value
         this.currentPage = 1
         this.initData()
       },
-      handleCurrentChange(value) {
+      handleCurrentChange (value) {
         this.currentPage = value
         this.initData()
       },
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -280,10 +280,9 @@
           val = val.replace('T', ' ')
           return val.substring(0, 10)
         }
-      },
+      }
     }
   }
-
 </script>
 
 <style>

src/dashoo.cn/frontend_web/src/components/oilsupplier/performancelist.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-table :data="performanceList" border>
+    <el-table :data="performanceList" border  size="mini">
       <el-table-column label="操作" width="150" align="center" fixed>
         <template slot-scope="scope">
           <el-button type="primary" plain size="mini" title="编辑" @click="openDialog(scope.row)" :disabled="!canadd">编辑
@@ -103,7 +103,7 @@
       SupplierTypeCode: {
         type: String,
         default: '0'
-      },*/
+      }, */
       canadd: {
         type: Boolean,
         default: false
@@ -111,9 +111,9 @@
       visible: {
         type: Boolean,
         default: false
-      },
+      }
     },
-    created() {
+    created () {
       this.initData()
     },
     computed: {
@@ -121,7 +121,7 @@
         session: 'session'
       })
     },
-    data() {
+    data () {
       return {
         SupplierId: '0',
         SupplierCertId: '0',
@@ -139,7 +139,7 @@
           StartTime: new Date(),
           StopTime: new Date(),
           Tudge: '',
-          Remark: '',
+          Remark: ''
         },
         rules: {
           Tudge: [{
@@ -151,27 +151,27 @@
         selfVisible: this.visible, // 避免vue双向绑定警告
         currentPage: 1, // 分页
         size: 10,
-        currentItemCount: 0,
+        currentItemCount: 0
       }
     },
     methods: {
-      getvalue(serviceId, SupplierTypeCode, certId) {
+      getvalue (serviceId, SupplierTypeCode, certId) {
         // this.SupplierId = serviceId
         this.SupplierTypeCode = SupplierTypeCode
         this.SupplierCertId = certId
         this.initData()
       },
-      initData() {
+      initData () {
         let _this = this
         const params = {
           SupplierCertId: this.SupplierCertId,
           SupplierTypeCode: this.SupplierTypeCode,
           _currentPage: this.currentPage,
-          _size: this.size,
+          _size: this.size
         }
         this.$axios.get('performance/performancelist', {
-            params
-          })
+          params
+        })
           .then(res => {
             _this.performanceList = res.data.items
             _this.currentItemCount = res.data.currentItemCount
@@ -181,11 +181,11 @@
             console.error(err)
           })
       },
-      savedata(formName) {
+      savedata (formName) {
         this.$refs[formName].validate((valid) => {
           if (valid) {
             if (this.Title == '近三年主要业绩') {
-              console.log("1111",this.Title)
+              console.log('1111', this.Title)
               this.addPerformance()
             } else if (this.Title == '编辑近三年主要业绩') {
               this.editPerformance()
@@ -196,7 +196,7 @@
           }
         })
       },
-      addPerformance() {
+      addPerformance () {
         let _this = this
         _this.PerformanceForm.SupplierCertId = parseInt(_this.PerformanceForm.SupplierCertId)
         _this.$axios.post('/performance/addperformance/', _this.PerformanceForm)
@@ -204,7 +204,7 @@
             if (res.data.code === 0) {
               _this.$message({
                 type: 'success',
-                message: res.data.message,
+                message: res.data.message
               })
               this.visible = false
               this.initData()
@@ -219,7 +219,7 @@
             console.error(err)
           })
       },
-      editPerformance() {
+      editPerformance () {
         let _this = this
         _this.PerformanceForm.SupplierCertId = parseInt(_this.PerformanceForm.SupplierCertId)
         _this.$axios.put('/performance/editperformance/' + _this.PerformanceForm.Id, _this.PerformanceForm)
@@ -227,7 +227,7 @@
             if (res.data.code === 0) {
               _this.$message({
                 type: 'success',
-                message: res.data.message,
+                message: res.data.message
               })
               this.visible = false
               this.initData()
@@ -242,37 +242,37 @@
             console.error(err)
           })
       },
-      deletedata(val) {
-        let _this = this;
-        _this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          })
+      deletedata (val) {
+        let _this = this
+      _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
           .then(() => {
             _this.$axios.delete('performance/performancedelete/' + val.Id, {})
               .then(function (response) {
                 // response
                 if (response.data.code === 0) {
                   _this.$message({
-                    type: "success",
+                    type: 'success',
                     message: response.data.message
-                  });
-                  _this.initData();
-                } else {
+                  })
+                _this.initData()
+              } else {
                   _this.$message({
-                    type: "warning",
+                    type: 'warning',
                     message: response.data.message
-                  });
-                }
+                  })
+              }
               })
               .catch(function (error) {
-                console.log(error);
-              });
-          })
-          .catch(() => {});
-      },
-      showDialog() {
+                console.log(error)
+            })
+        })
+          .catch(() => {})
+    },
+      showDialog () {
         this.Title = '近三年主要业绩'
         this.PerformanceForm.Id = 0
         this.PerformanceForm.SupplierCertId = this.SupplierCertId
@@ -286,7 +286,7 @@
         this.PerformanceForm.Remark = ''
         this.visible = true
       },
-      openDialog(val) {
+      openDialog (val) {
         this.Title = '编辑近三年主要业绩'
         this.PerformanceForm.Id = val.Id
         this.PerformanceForm.SupplierCertId = val.SupplierCertId
@@ -300,19 +300,19 @@
         this.PerformanceForm.Remark = val.Remark
         this.visible = true
       },
-      seachdata() {
+      seachdata () {
         this.initData()
       },
-      handleSizeChange(value) {
+      handleSizeChange (value) {
         this.size = value
         this.currentPage = 1
         this.initData()
       },
-      handleCurrentChange(value) {
+      handleCurrentChange (value) {
         this.currentPage = value
         this.initData()
       },
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -323,10 +323,9 @@
           val = val.replace('T', ' ')
           return val.substring(0, 10)
         }
-      },
+      }
     }
   }
-
 </script>
 
 <style>

src/dashoo.cn/frontend_web/src/components/oilsupplier/subfilelist.vue

@@ -12,10 +12,19 @@
           提交
         </el-button> -->
       </div>
-      <el-table :data="businessList" border bordertooltip-effect="dark" height="calc(100vh - 435px)" @selection-change="handleSelectionChange"> 
+      <el-table :data="businessList" size="mini" border bordertooltip-effect="dark" height="calc(100vh - 435px)" @selection-change="handleSelectionChange"> 
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
         <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="CertSubStatus" label="状态" show-overflow-tooltip>
+            <template slot-scope="scope">
+            <span v-if="scope.row.CertSubStatus=='1'"
+                  style="color:#67C23A">准入</span>
+            <span v-else-if="scope.row.CertSubStatus>'1'"
+                  style="color:#E6A23C">暂停</span>
+            <span v-else>——</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
       </el-table>
        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
@@ -29,7 +38,7 @@
         <span style="font-weight: bold"> 企业资质</span>
         <el-button style="float: right; padding: 3px 0" type="text" @click="showDialog" v-if="canadd || newcanadd">添加</el-button>
       </div>
-      <el-table :data="subfileList" border>
+      <el-table :data="subfileList" border size="mini">
         <el-table-column label="操作" width="150" align="center" fixed>
           <template slot-scope="scope">
             <el-button type="primary" plain size="mini" title="上传" @click="openDialog(scope.row)" :disabled="!canadd && !newcanadd">上传
@@ -255,7 +264,7 @@
           SupplierTypeCode: this.SupplierTypeCode,
           SubClassIds: this.SubClassIds.join(),
           _currentPage: 1,
-          _size: 1000
+          _size: 10000
         }
         _this.$axios.get('supplierfile/filelist', {
           params
@@ -283,6 +292,7 @@
           params
         })
           .then(res => {
+            console.log(res)
             _this.businessList = res.data.items
             _this.currentItem_Count = res.data.currentItemCount
           })

src/dashoo.cn/frontend_web/src/components/oilsupplier/techlist.vue

@@ -21,7 +21,7 @@
          <el-table-column prop="CertSubStatus" label="状态" show-overflow-tooltip>
             <template slot-scope="scope">
             <span v-if="scope.row.CertSubStatus=='1'"
-                  style="color:#67C23A">正常</span>
+                  style="color:#67C23A">准入</span>
             <span v-else-if="scope.row.CertSubStatus>'1'"
                   style="color:#E6A23C">暂停</span>
             <span v-else>——</span>

src/dashoo.cn/frontend_web/src/components/oilsupplier/winninglist.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-table :data="winningList" border :stripe="true">
+    <el-table :data="winningList" border :stripe="true"  size="mini">
       <el-table-column label="操作" width="150" align="center" fixed>
         <template slot-scope="scope">
           <el-button type="primary" plain size="mini" title="编辑" @click="openDialog(scope.row)" :disabled="!canadd">编辑
@@ -71,7 +71,7 @@
       SupplierTypeCode: {
         type: String,
         default: '0'
-      },*/
+      }, */
       canadd: {
         type: Boolean,
         default: false
@@ -79,9 +79,9 @@
       visible: {
         type: Boolean,
         default: false
-      },
+      }
     },
-    created() {
+    created () {
       this.initData()
     },
     computed: {
@@ -89,7 +89,7 @@
         session: 'session'
       })
     },
-    data() {
+    data () {
       return {
         winningList: [],
         Title: '',
@@ -101,33 +101,33 @@
           Authorities: '',
           OwnerUnit: '',
           WinningTime: new Date(),
-          Remark: '',
+          Remark: ''
         },
         selfVisible: this.visible,
         currentPage: 1, // 分页
         size: 10,
-        currentItemCount: 0,
+        currentItemCount: 0
       }
     },
     methods: {
-      getvalue(serviceId, SupplierTypeCode, certId) {
+      getvalue (serviceId, SupplierTypeCode, certId) {
         // this.SupplierId = serviceId
         this.SupplierTypeCode = SupplierTypeCode
         this.SupplierCertId = certId
         this.initData()
       },
-      initData() {
+      initData () {
         let _this = this
         // request
         const params = {
           SupplierCertId: this.SupplierCertId,
           SupplierTypeCode: this.SupplierTypeCode,
           _currentPage: this.currentPage,
-          _size: this.size,
+          _size: this.size
         }
         this.$axios.get('winning/winninglist', {
-            params
-          })
+          params
+        })
           .then(res => {
             _this.winningList = res.data.items
             _this.currentItemCount = res.data.currentItemCount
@@ -137,14 +137,14 @@
             console.error(err)
           })
       },
-      savedata() {
+      savedata () {
         if (this.Title == '近三年省部级及以上获奖项目') {
           this.addWinning()
         } else if (this.Title == '编辑近三年省部级及以上获奖项目') {
           this.editWinning()
         }
       },
-      addWinning() {
+      addWinning () {
         let _this = this
         _this.WinningForm.SupplierCertId = parseInt(_this.WinningForm.SupplierCertId)
         _this.$axios.post('/winning/addwinning', _this.WinningForm)
@@ -152,7 +152,7 @@
             if (res.data.code === 0) {
               _this.$message({
                 type: 'success',
-                message: res.data.message,
+                message: res.data.message
               })
               this.visible = false
               this.initData()
@@ -167,7 +167,7 @@
             console.error(err)
           })
       },
-      editWinning() {
+      editWinning () {
         let _this = this
         _this.WinningForm.SupplierCertId = parseInt(_this.WinningForm.SupplierCertId)
         _this.$axios.put('/winning/editwinning/' + _this.WinningForm.Id, _this.WinningForm)
@@ -175,7 +175,7 @@
             if (res.data.code === 0) {
               _this.$message({
                 type: 'success',
-                message: res.data.message,
+                message: res.data.message
               })
               this.visible = false
               this.initData()
@@ -190,37 +190,37 @@
             console.error(err)
           })
       },
-      deletedata(val) {
-        let _this = this;
-        _this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          })
+      deletedata (val) {
+        let _this = this
+      _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",
+                    type: 'success',
                     message: response.data.message
-                  });
-                  _this.initData();
-                } else {
+                  })
+                _this.initData()
+              } else {
                   _this.$message({
-                    type: "warning",
+                    type: 'warning',
                     message: response.data.message
-                  });
-                }
+                  })
+              }
               })
               .catch(function (error) {
-                console.log(error);
-              });
-          })
-          .catch(() => {});
-      },
-      showDialog() {
+                console.log(error)
+            })
+        })
+          .catch(() => {})
+    },
+      showDialog () {
         this.Title = '近三年省部级及以上获奖项目'
         this.WinningForm.Id = 0
         this.WinningForm.SupplierCertId = this.SupplierCertId
@@ -231,7 +231,7 @@
         this.WinningForm.Remark = ''
         this.visible = true
       },
-      openDialog(val) {
+      openDialog (val) {
         this.Title = '编辑近三年省部级及以上获奖项目'
         this.WinningForm.Id = val.Id
         this.WinningForm.SupplierCertId = val.SupplierCertId
@@ -242,19 +242,19 @@
         this.WinningForm.Remark = val.Remark
         this.visible = true
       },
-      seachdata() {
+      seachdata () {
         this.initData()
       },
-      handleSizeChange(value) {
+      handleSizeChange (value) {
         this.size = value
         this.currentPage = 1
         this.initData()
       },
-      handleCurrentChange(value) {
+      handleCurrentChange (value) {
         this.currentPage = value
         this.initData()
       },
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -265,10 +265,9 @@
           val = val.replace('T', ' ')
           return val.substring(0, 10)
         }
-      },
+      }
     }
   }
-
 </script>
 
 <style>

src/dashoo.cn/frontend_web/src/components/workflow/wfbackhistory.vue

@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="6">
         <el-card class="box-card">
-          <el-table :data="historyList" border @row-click="rowclick">
+          <el-table :data="historyList" border @row-click="rowclick" size="mini">
             <el-table-column prop="BusinessKey" sortable min-width="130" label="审核记录" align="center" show-overflow-tooltip></el-table-column>
           </el-table>
         </el-card>

src/dashoo.cn/frontend_web/src/components/workflow/wfhistory.vue

@@ -1,6 +1,6 @@
 <template>
   <div style="overflow: auto">
-    <el-table :data="historyTask" border>
+    <el-table :data="historyTask" border size="mini">
       <el-table-column prop="taskName" sortable min-width="130" label="当前状态" align="center" show-overflow-tooltip></el-table-column>
       <el-table-column prop="remarks" sortable min-width="130" label="审批意见" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
@@ -69,7 +69,7 @@
       }
     },
 
-    data() {
+    data () {
       return {
         baseurl: process.env.baseURL,
         process: '',
@@ -78,17 +78,17 @@
         selfVisible: this.visible, // 避免vue双向绑定警告
         historyTask: [],
         tmp_historyTask: [],
-        userlist: [],
+        userlist: []
       }
     },
     methods: {
-      getHistoryTask() {
+      getHistoryTask () {
         this.tmp_historyTask = []
         let _this = this
         const params = {
           process: _this.entryinfo.process,
           business: _this.entryinfo.business,
-          instance: _this.entryinfo.instance,
+          instance: _this.entryinfo.instance
         }
         this.$axios.get('workflow/historytask', {
           params
@@ -114,29 +114,29 @@
             console.error(err)
           })
       },
-      assigneeToAssignee(val) {
+      assigneeToAssignee (val) {
         for (let i = 0; i < this.userlist.length; i++) {
           if (val == this.userlist[i].Id) {
             return this.userlist[i].Realname
           }
         }
       },
-      assigneeToUsers(users) {
-        let userNames = ""
+      assigneeToUsers (users) {
+        let userNames = ''
         let userArr = users.split(',')
-        for(let idx=0; idx<userArr.length; idx++) {
+        for (let idx = 0; idx < userArr.length; idx++) {
           let val = userArr[idx]
           for (let i = 0; i < this.userlist.length; i++) {
             if (parseInt(val) == parseInt(this.userlist[i].Id)) {
-              userNames += this.userlist[i].Realname + ", "
+              userNames += this.userlist[i].Realname + ', '
             }
           }
         }
-        if(userNames.length > 0) {
-          userNames = userNames.substring(0, userNames.length-2)
+        if (userNames.length > 0) {
+          userNames = userNames.substring(0, userNames.length - 2)
         }
-        return userNames;
-      },
+        return userNames
+    },
       getuserlist (val) {
         // let params = {
         //   userids: val
@@ -152,8 +152,8 @@
             console.error(err)
           })
       },
-      timestampToTime(val) {
-        var date = new Date(val) //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+      timestampToTime (val) {
+        var date = new Date(val) // 时间戳为10位需*1000，时间戳为13位的话不需乘1000
         var Y = date.getFullYear() + '-'
         var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'
         var D = date.getDate() + ' '
@@ -162,7 +162,7 @@
         var s = date.getSeconds()
         return Y + M + D + h + m + s
       },
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -177,10 +177,9 @@
           val = val.replace('T', ' ')
           return val.substring(0, 19)
         }
-      },
+      }
     }
   }
-
 </script>
 
 <style>

src/dashoo.cn/frontend_web/src/components/workflow/wfmultihistory.vue

@@ -1,6 +1,6 @@
 <template>
   <div style="overflow: auto">
-    <el-table :data="historyTask" border>
+    <el-table :data="historyTask" border size="mini">
       <el-table-column prop="taskName" sortable min-width="130" label="当前状态" align="center" show-overflow-tooltip></el-table-column>
       <el-table-column prop="remarks" sortable min-width="130" label="审批意见" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
@@ -77,7 +77,7 @@
         instance: '',
         selfVisible: this.visible, // 避免vue双向绑定警告
         historyTask: [],
-        userlist: [],
+        userlist: []
       }
     },
     methods: {
@@ -129,30 +129,29 @@
             console.error(err)
           })
       },
-      assigneeToAssignee(val) {
+      assigneeToAssignee (val) {
         for (let i = 0; i < this.userlist.length; i++) {
           if (val == this.userlist[i].Id) {
             return this.userlist[i].Realname
           }
         }
-        
       },
-      assigneeToUsers(users) {
-        let userNames = ""
+      assigneeToUsers (users) {
+        let userNames = ''
         let userArr = users.split(',')
-        for(let idx=0; idx<userArr.length; idx++) {
+        for (let idx = 0; idx < userArr.length; idx++) {
           let val = userArr[idx]
           for (let i = 0; i < this.userlist.length; i++) {
             if (parseInt(val) == parseInt(this.userlist[i].Id)) {
-              userNames += this.userlist[i].Realname + ", "
+              userNames += this.userlist[i].Realname + ', '
             }
           }
         }
-        if(userNames.length > 0) {
-          userNames = userNames.substring(0, userNames.length-2)
+        if (userNames.length > 0) {
+          userNames = userNames.substring(0, userNames.length - 2)
         }
-        return userNames;
-      },
+        return userNames
+    },
       getuserlist (val) {
         this.$axios.post('workflow/userlist_post?userids=' + val)
           .then(res => {
@@ -165,8 +164,8 @@
             console.error(err)
           })
       },
-      timestampToTime(val) {
-        var date = new Date(val) //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+      timestampToTime (val) {
+        var date = new Date(val) // 时间戳为10位需*1000，时间戳为13位的话不需乘1000
         var Y = date.getFullYear() + '-'
         var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'
         var D = date.getDate() + ' '
@@ -175,7 +174,7 @@
         var s = date.getSeconds()
         return Y + M + D + h + m + s
       },
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -190,10 +189,9 @@
           val = val.replace('T', ' ')
           return val.substring(0, 19)
         }
-      },
+      }
     }
   }
-
 </script>
 
 <style>