Selaa lähdekoodia

字体调整
Signed-off-by: lijunqing <lijunqing@dashoo.cn>

lijunqing 6 vuotta sitten
vanhempi
commit
01e2f67501

+ 83 - 84
src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/index.vue

@@ -64,6 +64,9 @@
           </el-table-column> -->
           <el-table-column prop="AccessCardNo" label="准入编码" sortable min-width="110" align="center"
             show-overflow-tooltip>
+          <template slot-scope="scope" >
+             <span style="font-family:'黑体';font-size:13px">{{scope.row.AccessCardNo}}</span>
+          </template>
           </el-table-column>
           <el-table-column prop="SupplierTypeName" label="准入类别" sortable min-width="110" align="center"
             show-overflow-tooltip>
@@ -202,8 +205,8 @@
 <script>
   import {
     mapGetters
-  } from 'vuex';
-  import WfHistory from '@/components/workflow/wfmultihistory.vue'
+  } from 'vuex'
+import WfHistory from '@/components/workflow/wfmultihistory.vue'
   import supplierapi from '@/api/oilsupplier/supplier'
   import api from '@/api/oilsupplier/annualaudit'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
@@ -222,7 +225,7 @@
     },
     name: 'annualaudit',
 
-    data() {
+    data () {
       return {
         chooseAuditorVisible: false,
         orgtreelist: [],
@@ -239,27 +242,27 @@
         auditerOption: [],
         auditer: '',
         auditerName: '',
-        //列表数据
+        // 列表数据
         selectsupplierlist: [],
         entityList: [],
-        //分页参数
+        // 分页参数
         size: 10,
         currentPage: 1,
         currentItemCount: 0,
-        //列表排序
+        // 列表排序
         Column: {
           Order: '',
           Prop: ''
         },
-        //工作流
+        // 工作流
         entrydetail: {
           process: 'oil_audit_apply',
           business: '',
-          instance: '',
+          instance: ''
         },
-        //查询时间
+        // 查询时间
         CreateOn: '',
-        //查询项
+        // 查询项
         searchFormReset: {},
         entityForm: {
           Id: '',
@@ -301,14 +304,14 @@
           CreateBy: '',
           ModifiedOn: '',
           ModifiedUserId: '',
-          ModifiedBy: '',
+          ModifiedBy: ''
         },
         rules: {
           SupplierId: [{
             required: true,
             message: '请选择企业名称',
             trigger: 'blur'
-          }, ],
+          } ],
           SupplierTypeName: [{
             required: true,
             message: '请选择准入类别',
@@ -327,28 +330,28 @@
         },
         IsCompanyUser: 0,
         supplierList: [],
-        suplen: 1,
+        suplen: 1
       }
     },
-    created() {
+    created () {
       this.IsCompanyUser = this.authUser.Profile.IsCompanyUser
-      //查询条件初始值备份
+      // 查询条件初始值备份
       Object.assign(this.searchFormReset, this.searchForm)
-      //查询列表
+      // 查询列表
       this.initDatas()
-      //this.getselectsupplier()
+      // this.getselectsupplier()
       this.getorgtreelist()
       this.getDictOptions()
       this.getSupplierList()
     },
     methods: {
-      initDatas() {
-        //分页及列表条件
+      initDatas () {
+        // 分页及列表条件
         let params = {
           _currentPage: this.currentPage,
           _size: this.size,
           Order: this.Column.Order,
-          Prop: this.Column.Prop,
+          Prop: this.Column.Prop
         }
         let myCreateOn = []
         // 解析时间
@@ -359,9 +362,9 @@
           myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
           myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
         }
-        //查询条件
+        // 查询条件
         Object.assign(params, this.searchForm)
-        //访问接口
+        // 访问接口
         api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
@@ -369,18 +372,18 @@
           console.error(err)
         })
       },
-      getSupplierList() {
+      getSupplierList () {
         let _this = this
         _this.supplierList = []
         let params = {
-          SuppTypeCode: '',
+          SuppTypeCode: ''
         }
         _this.$axios.get('/annualaudit/getsupplier', {params})
           .then(res => {
             _this.supplierList = res.data
             if (_this.supplierList) {
               _this.suplen = _this.supplierList.length
-            }else{
+            } else {
               _this.suplen = 0
             }
             if (_this.IsCompanyUser == 1 && _this.supplierList) {
@@ -392,14 +395,14 @@
             console.error(err)
           })
       },
-      getorgtreelist() {
+      getorgtreelist () {
         let _this = this
         let params = {
           IsInnerOrganize: 1
         }
         _this.$axios.get('organizes/orgalllist', {
-            params
-          })
+          params
+        })
           .then(res => {
             _this.orgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
             if (_this.authUser.Profile.IsCompanyUser === 0) {
@@ -413,54 +416,53 @@
             console.error(err)
           })
       },
-      setAuditer(val, name) {
+      setAuditer (val, name) {
         this.auditer = val
         this.auditerName = name
         this.chooseAuditorVisible = false
       },
-      chooseAuditorShow() {
+      chooseAuditorShow () {
         this.$refs['chooseAuditor'].getorgtreelist(this.entityForm.SupplierTypeName)
         this.chooseAuditorVisible = true
       },
-      supplierchange(value) {
-        let obj = {};
+      supplierchange (value) {
+        let obj = {}
         obj = this.selectsupplierlist.find((item) => {
-          return item.Id === value;
-        });
+          return item.Id === value
+        })
         this.entityForm.SupplierName = obj.Realname
       },
-      addAnnualAudit() {
+      addAnnualAudit () {
         this.$refs['EntityFormref'].validate((valid) => {
           if (valid) {
             this.entityForm.auditer = this.auditer
             api.addEntity(this.entityForm, this.entityForm.auditer, this.$axios).then(res => {
               if (res.data.code === 0) {
-                //保存成功后,初始化数据,变成修改
-                this.entityForm.Id = res.data.item;
-                this.initDatas();
+                // 保存成功后,初始化数据,变成修改
+                this.entityForm.Id = res.data.item
+                this.initDatas()
                 this.addshow = false
                 this.$message({
                   type: 'success',
                   message: res.data.message
-                });
-
+                })
               } else {
                 this.$message({
                   type: 'warning',
                   message: res.data.message
-                });
+                })
               }
             }).catch(err => {
               console.error(err)
-            });
+            })
           }
         })
       },
-      addaudit() {
+      addaudit () {
         this.addshow = true
       },
 
-      getselectsupplier() {
+      getselectsupplier () {
         api.getSupList(this.$axios).then(res => {
           if (res.data.items.length != 0) {
             for (var i = 0; i < res.data.items.length; i++) {
@@ -475,14 +477,14 @@
         })
       },
 
-      getorgtreelist() {
+      getorgtreelist () {
         let _this = this
         let params = {
           IsInnerOrganize: 1
         }
         _this.$axios.get('organizes/orgalllist', {
-            params
-          })
+          params
+        })
           .then(res => {
             _this.orgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
           })
@@ -491,15 +493,15 @@
           })
       },
 
-      getDictOptions() {
+      getDictOptions () {
         supplierapi.getDictList(this.$axios).then(res => {
           this.dictData = res.data.items
-          //this.organizeOption = res.data.items['Organizes']
+          // this.organizeOption = res.data.items['Organizes']
         }).catch(err => {
           console.error(err)
         })
       },
-      checkSupplierTypeName(val) {
+      checkSupplierTypeName (val) {
         if (val == '01') {
           return '物资类'
         } else if (val == '02') {
@@ -509,15 +511,15 @@
         }
       },
 
-      searchCommand(command) {
+      searchCommand (command) {
         if (command == 'search') {
           this.dialogVisible = true
         } else if (command == 'clear') {
           this.clearSearch()
         }
       },
-      //列表排序功能
-      orderby(column) {
+      // 列表排序功能
+      orderby (column) {
         if (column.order == 'ascending') {
           this.Column.Order = 'asc'
         } else if (column.order == 'descending') {
@@ -526,69 +528,67 @@
         this.Column.Prop = column.prop
         this.initDatas()
       },
-      clearSearch() {
-        Object.assign(this.searchForm, this.searchFormReset);
-        //this.searchForm = this.searchFormReset;
+      clearSearch () {
+        Object.assign(this.searchForm, this.searchFormReset)
+        // this.searchForm = this.searchFormReset;
         this.CreateOn = ''
         this.initDatas()
       },
-      handleSearch() {
-        this.currentPage = 1;
-        this.dialogVisible = false;
-        this.initDatas();
+      handleSearch () {
+        this.currentPage = 1
+        this.dialogVisible = false
+        this.initDatas()
       },
-      handleCurrentChange(value) {
+      handleCurrentChange (value) {
         this.currentPage = value
         this.initDatas()
       },
-      handleSizeChange(value) {
+      handleSizeChange (value) {
         this.size = value
         this.currentPage = 1
         this.initDatas()
       },
-      deleteEntity(row) {
+      deleteEntity (row) {
         api.deleteEntity(row.Id, this.$axios).then(res => {
           if (res.data.code === 0) {
-            this.initDatas();
+            this.initDatas()
             this.$message({
               type: 'success',
               message: res.data.message
-            });
-
+            })
           } else {
             this.$message({
               type: 'warning',
               message: res.data.message
-            });
+            })
           }
         }).catch(err => {
           console.error(err)
-        });
+        })
       },
 
-      getvalues(val) {
+      getvalues (val) {
         this.entrydetail.business = val.Id
         this.entrydetail.instance = val.WorkflowId
         this.historyVisible = true
       },
 
-      MoreCmdClick(cmd) {
+      MoreCmdClick (cmd) {
         if (cmd.Command == 'History') {
           this.getvalues(cmd.row)
-
         } else if (cmd.Command == 'Delete') {
           this.deleteEntity(cmd.row)
         }
       },
 
-      GetCommand(cmdType, row) {
+      GetCommand (cmdType, row) {
         let cmd = {}
         cmd.Command = cmdType
         cmd.row = row
         return cmd
       },
 
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T00:00:00Z') {
@@ -603,20 +603,19 @@
         }
       },
 
-      formatDateTime(date) {
-        var y = date.getFullYear();
-        var m = date.getMonth() + 1;
-        m = m < 10 ? ('0' + m) : m;
-        var d = date.getDate();
-        d = d < 10 ? ('0' + d) : d;
-        var h = date.getHours();
-        var minute = date.getMinutes();
-        minute = minute < 10 ? ('0' + minute) : minute;
-        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
+      formatDateTime (date) {
+        var y = date.getFullYear()
+        var m = date.getMonth() + 1
+        m = m < 10 ? ('0' + m) : m
+        var d = date.getDate()
+        d = d < 10 ? ('0' + d) : d
+        var h = date.getHours()
+        var minute = date.getMinutes()
+        minute = minute < 10 ? ('0' + minute) : minute
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute
       }
     }
   }
-
 </script>
 
 <style lang="scss">

+ 97 - 98
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/index.vue

@@ -84,6 +84,7 @@
                          :prop="column.prop" sortable :width="column.width" :label="column.label" align="center" show-overflow-tooltip>
           <template slot-scope="scope" >
             <span v-if="column.prop == 'SetupTime'">{{ jstimehandle(scope.row.SetupTime+'') }}</span>
+             <span v-else-if="column.prop == 'AccessCardNo'" style="font-family:'黑体';font-size:13px">{{scope.row.AccessCardNo}}</span>
             <span v-else>{{ scope.row[column.prop] }}</span>
           </template>
         </el-table-column>
@@ -479,22 +480,22 @@
       return {
         canApply: false,
         dialogVisible: false,
-        //列表数据
+        // 列表数据
         entityList: [],
         Type: '',
-        //分页参数
+        // 分页参数
         size: 10,
         currentPage: 1,
         currentItemCount: 0,
-        //列表排序
+        // 列表排序
         Column: {
           Order: '',
           Prop: ''
         },
-        //查询时间
+        // 查询时间
         CreateOn: null,
-        /*CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],*/
-        //查询项
+        /* CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],*/
+        // 查询项
         searchFormReset: {},
         searchForm: {
           Id: '',
@@ -554,7 +555,7 @@
           CreateBy: '',
           ModifiedOn: '',
           ModifiedUserId: '',
-          ModifiedBy: '',
+          ModifiedBy: ''
 
         },
         tableColumns: [
@@ -564,30 +565,30 @@
            label: '',
            width: 100,
            sort: true
-           },*/
+           }, */
 
           {
-            prop: "AccessCardNo",
+            prop: 'AccessCardNo',
             label: '准入证编号',
             width: 240,
             sort: true
           },
 
           {
-            prop: "SupplierTypeName",
+            prop: 'SupplierTypeName',
             label: '准入类别',
             width: 150,
             sort: true
           },
 
           {
-            prop: "SupplierName",
+            prop: 'SupplierName',
             label: '企业名称',
             width: 240,
             sort: true
           },
 
-          /*{
+          /* {
            prop: "OilCertificateNo",
            label: '中石油供应商证书号',
            width: 100,
@@ -601,14 +602,14 @@
            sort: true
            },*/
 
-          /*{
+          /* {
            prop: "MgrUnit",
            label: '管理单位',
            width: 100,
            sort: true
            },*/
 
-          /*{
+          /* {
            prop: "OperType",
            label: '经营方式',
            width: 100,
@@ -634,16 +635,16 @@
            label: '施工队伍名称',
            width: 100,
            sort: true
-           },*/
+           }, */
 
           {
-            prop: "CommercialNo",
+            prop: 'CommercialNo',
             label: '工商注册号',
             width: 240,
             sort: true
           },
 
-          /*{
+          /* {
            prop: "OrganCode",
            label: '组织机构代码',
            width: 100,
@@ -651,7 +652,7 @@
            },*/
 
           {
-            prop: "CountryTaxNo",
+            prop: 'CountryTaxNo',
             label: '税务登记证编号',
             width: 220,
             sort: true
@@ -662,10 +663,10 @@
            label: '税务登记证地税编号',
            width: 100,
            sort: true
-           },*/
+           }, */
 
           {
-            prop: "Address",
+            prop: 'Address',
             label: '单位地址',
             width: 280,
             sort: true
@@ -704,7 +705,7 @@
            label: '邮编',
            width: 200,
            sort: true
-           },*/
+           }, */
 
           /*{
            prop: "QualitySystemCert",
@@ -788,108 +789,108 @@
            label: '行业类别名称',
            width: 100,
            sort: true
-           },*/
+           }, */
 
           {
-            prop: "RegCapital",
+            prop: 'RegCapital',
             label: '注册资本',
             width: 150,
             sort: true
           },
 
           {
-            prop: "Currency",
+            prop: 'Currency',
             label: '币种',
             width: 100,
             sort: true
           },
 
           {
-            prop: "ContactName",
+            prop: 'ContactName',
             label: '联系人姓名',
             width: 140,
             sort: true
           },
 
           {
-            prop: "CompanyType",
+            prop: 'CompanyType',
             label: '公司类型',
             width: 150,
             sort: true
           },
 
           {
-            prop: "SetupTime",
+            prop: 'SetupTime',
             label: '成立时间',
             width: 220,
             sort: true
           },
 
           {
-            prop: "DepositBank",
+            prop: 'DepositBank',
             label: '开户银行',
             width: 220,
             sort: true
           },
 
           {
-            prop: "BankAccount",
+            prop: 'BankAccount',
             label: '银行账号',
             width: 220,
             sort: true
           },
 
           {
-            prop: "EMail",
+            prop: 'EMail',
             label: '电子邮箱',
             width: 220,
             sort: true
           },
 
           {
-            prop: "BankCreditRating",
+            prop: 'BankCreditRating',
             label: '银行信用等级',
             width: 220,
             sort: true
           },
 
           {
-            prop: "Mobile",
+            prop: 'Mobile',
             label: '移动电话',
             width: 220,
             sort: true
           },
 
           {
-            prop: "Telphone",
+            prop: 'Telphone',
             label: '固定电话',
             width: 220,
             sort: true
           },
 
           {
-            prop: "Fax",
+            prop: 'Fax',
             label: '传真',
             width: 220,
             sort: true
           },
 
           {
-            prop: "CompanyTel",
+            prop: 'CompanyTel',
             label: '公司电话',
             width: 220,
             sort: true
           },
 
           {
-            prop: "QQ",
+            prop: 'QQ',
             label: 'QQ号码',
             width: 220,
             sort: true
           },
 
           {
-            prop: "CompanyUrl",
+            prop: 'CompanyUrl',
             label: '公司网址',
             width: 220,
             sort: true
@@ -914,10 +915,10 @@
            label: '业务类型(1战略合作,2内部多经,3区域关键,4专业化实施)',
            width: 100,
            sort: true
-           },*/
+           }, */
 
           {
-            prop: "Remark",
+            prop: 'Remark',
             label: '备注',
             width: 220,
             sort: true
@@ -927,24 +928,24 @@
       }
     },
     created () {
-      this.isCanApply();
-      //查询条件初始值备份
-      Object.assign(this.searchFormReset, this.searchForm);
-      //查询列表
-      this.initDatas();
-      //this.getDictOptions()
-    },
+      this.isCanApply()
+    //查询条件初始值备份
+    Object.assign(this.searchFormReset, this.searchForm)
+    //查询列表
+    this.initDatas()
+    //this.getDictOptions()
+  },
 
     methods: {
-        checkStatus(val){
-        if (val=='0' || val=='' || val=='-1' || val=='-2' || val=='-4'){
+      checkStatus (val) {
+        if (val == '0' || val == '' || val == '-1' || val == '-2' || val == '-4') {
           return false
-        }else{
+        } else{
           return true
         }
       },
-      initDatas() {
-        //分页及列表条件
+      initDatas () {
+        // 分页及列表条件
         let params = {
           _currentPage: this.currentPage,
           _size: this.size,
@@ -961,9 +962,9 @@
           myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
           myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
         }
-        //查询条件
+        // 查询条件
         Object.assign(params, this.searchForm)
-        //访问接口
+        // 访问接口
         api.getCertList(myCreateOn.join(','), params, this.$axios).then(res => {
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
@@ -972,10 +973,10 @@
         })
       },
 
-      getDictOptions() {
+      getDictOptions () {
         api.getDictList(this.$axios).then(res => {
-          //this.dictOptions.customerList = res.data.items['customerList']
-          //this.dictOptions.projectList = res.data.items['projectList']
+          // this.dictOptions.customerList = res.data.items['customerList']
+          // this.dictOptions.projectList = res.data.items['projectList']
 
         }).catch(err => {
           console.error(err)
@@ -990,15 +991,15 @@
           this.Type = 'basisedit'
         }
       },
-      searchCommand(command) {
+      searchCommand (command) {
         if (command == 'search') {
           this.dialogVisible = true
         } else if (command == 'clear') {
           this.clearSearch()
         }
       },
-      //列表排序功能
-      orderby(column) {
+      // 列表排序功能
+      orderby (column) {
         if (column.order == 'ascending') {
           this.Column.Order = 'asc'
         } else if (column.order == 'descending') {
@@ -1007,62 +1008,61 @@
         this.Column.Prop = column.prop
         this.initDatas()
       },
-      clearSearch() {
-        Object.assign(this.searchForm, this.searchFormReset);
-        //this.searchForm = this.searchFormReset;
-        this.CreateOn = ''
+      clearSearch () {
+        Object.assign(this.searchForm, this.searchFormReset)
+      //this.searchForm = this.searchFormReset;
+      this.CreateOn = ''
         this.initDatas()
       },
-      handleSearch() {
-        this.currentPage = 1;
-        this.dialogVisible = false;
-        this.initDatas();
-      },
-      handleCurrentChange(value) {
+      handleSearch () {
+        this.currentPage = 1
+      this.dialogVisible = false
+      this.initDatas()
+    },
+      handleCurrentChange (value) {
         this.currentPage = value
         this.initDatas()
       },
-      handleSizeChange(value) {
+      handleSizeChange (value) {
         this.size = value
         this.currentPage = 1
         this.initDatas()
       },
-      deleteEntity(row) {
-        row.deleteConfirmFlag = false;
-        api.deleteAllEntity(row.Id,row.SupplierTypeCode, this.$axios).then(res => {
+      deleteEntity (row) {
+        row.deleteConfirmFlag = false
+      api.deleteAllEntity(row.Id, row.SupplierTypeCode, this.$axios).then(res => {
           if (res.data.code === 0) {
-            this.initDatas();
-            this.isCanApply();
-            this.$message({
+            this.initDatas()
+          this.isCanApply()
+          this.$message({
               type: 'success',
               message: res.data.message
-            });
+            })
 
-          } else {
+        } else {
             this.$message({
               type: 'warning',
               message: res.data.message
-            });
-          }
+            })
+        }
         }).catch(err => {
           console.error(err)
-        });
-      },
+        })
+    },
 
       isCanApply () {
         api.isCanApply('01', this.$axios).then(res => {
           if (res.data.code === 0) {
             this.canApply = true
-
           } else {
             this.canApply = false
           }
         }).catch(err => {
           console.error(err)
-        });
-      },
+        })
+    },
 
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -1075,20 +1075,19 @@
         }
       },
 
-      formatDateTime(date) {
-        var y = date.getFullYear();
-        var m = date.getMonth() + 1;
-        m = m < 10 ? ('0' + m) : m;
-        var d = date.getDate();
-        d = d < 10 ? ('0' + d) : d;
-        var h = date.getHours();
-        var minute = date.getMinutes();
-        minute = minute < 10 ? ('0' + minute) : minute;
-        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
-      }
+      formatDateTime (date) {
+        var y = date.getFullYear()
+      var m = date.getMonth() + 1
+      m = m < 10 ? ('0' + m) : m
+      var d = date.getDate()
+      d = d < 10 ? ('0' + d) : d
+      var h = date.getHours()
+      var minute = date.getMinutes()
+      minute = minute < 10 ? ('0' + minute) : minute
+      return y + '-' + m + '-' + d + ' ' + h + ':' + minute
+    }
     }
   }
-
 </script>
 
 <style lang="scss">

+ 89 - 89
src/dashoo.cn/frontend_web/src/pages/oilsupplier/suppliernopass/index.vue

@@ -64,6 +64,7 @@
                          :prop="column.prop" sortable :width="column.width" :label="column.label" align="center" show-overflow-tooltip>
           <template slot-scope="scope" >
             <span v-if="column.prop == 'SetupTime'">{{ jstimehandle(scope.row.SetupTime+'') }}</span>
+             <span v-else-if="column.prop == 'AccessCardNo'" style="font-family:'黑体';font-size:13px">{{scope.row.AccessCardNo}}</span>
             <span v-else>{{ scope.row[column.prop] }}</span>
           </template>
         </el-table-column>
@@ -455,20 +456,20 @@
     data () {
       return {
         dialogVisible: false,
-        //列表数据
+        // 列表数据
         entityList: [],
-        //分页参数
+        // 分页参数
         size: 10,
         currentPage: 1,
         currentItemCount: 0,
-        //列表排序
+        // 列表排序
         Column: {
           Order: '',
           Prop: ''
         },
-        //查询时间
+        // 查询时间
         CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
-        //查询项
+        // 查询项
         searchFormReset: {},
         searchForm: {
           SupplierTypeName: ''
@@ -480,30 +481,30 @@
            label: '',
            width: 100,
            sort: true
-           },*/
+           }, */
 
           {
-            prop: "AccessCardNo",
+            prop: 'AccessCardNo',
             label: '准入证编号',
             width: 240,
             sort: true
           },
 
           {
-            prop: "SupplierTypeName",
+            prop: 'SupplierTypeName',
             label: '准入类别',
             width: 150,
             sort: true
           },
 
           {
-            prop: "SupplierName",
+            prop: 'SupplierName',
             label: '企业名称',
             width: 240,
             sort: true
           },
 
-          /*{
+          /* {
            prop: "OilCertificateNo",
            label: '中石油供应商证书号',
            width: 100,
@@ -522,14 +523,14 @@
            label: '管理单位',
            width: 100,
            sort: true
-           },*/
+           }, */
 
           /*{
            prop: "OperType",
            label: '经营方式',
            width: 100,
            sort: true
-           },*/
+           }, */
 
           /*{
            prop: "Country",
@@ -550,16 +551,16 @@
            label: '施工队伍名称',
            width: 100,
            sort: true
-           },*/
+           }, */
 
           {
-            prop: "CommercialNo",
+            prop: 'CommercialNo',
             label: '工商注册号',
             width: 260,
             sort: true
           },
 
-          /*{
+          /* {
            prop: "OrganCode",
            label: '组织机构代码',
            width: 100,
@@ -567,7 +568,7 @@
            },*/
 
           {
-            prop: "CountryTaxNo",
+            prop: 'CountryTaxNo',
             label: '税务登记证编号',
             width: 260,
             sort: true
@@ -578,10 +579,10 @@
            label: '税务登记证地税编号',
            width: 100,
            sort: true
-           },*/
+           }, */
 
           {
-            prop: "Address",
+            prop: 'Address',
             label: '单位地址',
             width: 280,
             sort: true
@@ -620,9 +621,9 @@
            label: '邮编',
            width: 200,
            sort: true
-           },*/
+           }, */
 
-          /*{
+          /* {
            prop: "QualitySystemCert",
            label: '质量管理体系认证情况及认证机构',
            width: 300,
@@ -707,105 +708,105 @@
            },*/
 
           {
-            prop: "RegCapital",
+            prop: 'RegCapital',
             label: '注册资本',
             width: 150,
             sort: true
           },
 
           {
-            prop: "Currency",
+            prop: 'Currency',
             label: '币种',
             width: 100,
             sort: true
           },
 
           {
-            prop: "ContactName",
+            prop: 'ContactName',
             label: '联系人姓名',
             width: 140,
             sort: true
           },
 
           {
-            prop: "CompanyType",
+            prop: 'CompanyType',
             label: '公司类型',
             width: 150,
             sort: true
           },
 
           {
-            prop: "SetupTime",
+            prop: 'SetupTime',
             label: '成立时间',
             width: 220,
             sort: true
           },
 
           {
-            prop: "DepositBank",
+            prop: 'DepositBank',
             label: '开户银行',
             width: 220,
             sort: true
           },
 
           {
-            prop: "BankAccount",
+            prop: 'BankAccount',
             label: '银行账号',
             width: 220,
             sort: true
           },
 
           {
-            prop: "EMail",
+            prop: 'EMail',
             label: '电子邮箱',
             width: 220,
             sort: true
           },
 
           {
-            prop: "BankCreditRating",
+            prop: 'BankCreditRating',
             label: '银行信用等级',
             width: 220,
             sort: true
           },
 
           {
-            prop: "Mobile",
+            prop: 'Mobile',
             label: '移动电话',
             width: 220,
             sort: true
           },
 
           {
-            prop: "Telphone",
+            prop: 'Telphone',
             label: '固定电话',
             width: 220,
             sort: true
           },
 
           {
-            prop: "Fax",
+            prop: 'Fax',
             label: '传真',
             width: 220,
             sort: true
           },
 
           {
-            prop: "CompanyTel",
+            prop: 'CompanyTel',
             label: '公司电话',
             width: 220,
             sort: true
           },
 
           {
-            prop: "QQ",
+            prop: 'QQ',
             label: 'QQ号码',
             width: 220,
             sort: true
           },
 
           {
-            prop: "CompanyUrl",
+            prop: 'CompanyUrl',
             label: '公司网址',
             width: 220,
             sort: true
@@ -830,10 +831,10 @@
            label: '业务类型(1战略合作,2内部多经,3区域关键,4专业化实施)',
            width: 100,
            sort: true
-           },*/
+           }, */
 
           {
-            prop: "Remark",
+            prop: 'Remark',
             label: '备注',
             width: 220,
             sort: true
@@ -843,16 +844,16 @@
       }
     },
     created () {
-      //查询条件初始值备份
-      Object.assign(this.searchFormReset, this.searchForm);
-      //查询列表
-      this.initDatas();
-      //this.getDictOptions()
-    },
+      // 查询条件初始值备份
+      Object.assign(this.searchFormReset, this.searchForm)
+    //查询列表
+    this.initDatas()
+    //this.getDictOptions()
+  },
 
     methods: {
-      initDatas() {
-        //分页及列表条件
+      initDatas () {
+        // 分页及列表条件
         let params = {
           _currentPage: this.currentPage,
           _size: this.size,
@@ -870,9 +871,9 @@
           myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
           myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
         }
-        //查询条件
+        // 查询条件
         Object.assign(params, this.searchForm)
-        //访问接口
+        // 访问接口
         api.getStoreList(myCreateOn.join(','), params, this.$axios).then(res => {
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
@@ -884,50 +885,50 @@
       //  列表打印导出功能
       exportExcel () {
         /* generate workbook object from table */
-        let table = document.querySelector("#rebateSetTable").cloneNode(true); //克隆备份(原table不动)
-        // 因为element-ui的表格的fixed属性导致多出一个table,会下载重复内容,这里删除掉
-        table.removeChild(table.querySelector(".el-table__fixed-right")) //删掉备份的子节点
+        let table = document.querySelector('#rebateSetTable').cloneNode(true) //克隆备份(原table不动)
+      // 因为element-ui的表格的fixed属性导致多出一个table,会下载重复内容,这里删除掉
+      table.removeChild(table.querySelector('.el-table__fixed-right')) // 删掉备份的子节点
         let wb = XLSX.utils.table_to_book(table, {
           raw: true
         })
         /* get binary string as output */
         let wbout = XLSX.write(wb, {
-          bookType: "xlsx",
+          bookType: 'xlsx',
           bookSST: true,
-          type: "array"
+          type: 'array'
         })
         try {
           FileSaver.saveAs(
             new Blob([wbout], {
-              type: "application/octet-stream"
+              type: 'application/octet-stream'
             }),
-            "SupplierNopass.xlsx"
+            'SupplierNopass.xlsx'
           )
         } catch (e) {
-          if (typeof console !== "undefined") console.log(e, wbout)
+          if (typeof console !== 'undefined') console.log(e, wbout)
         }
         return wbout
       },
 
-      getDictOptions() {
+      getDictOptions () {
         api.getDictList(this.$axios).then(res => {
-          //this.dictOptions.customerList = res.data.items['customerList']
-          //this.dictOptions.projectList = res.data.items['projectList']
+          // this.dictOptions.customerList = res.data.items['customerList']
+          // this.dictOptions.projectList = res.data.items['projectList']
 
         }).catch(err => {
           console.error(err)
         })
       },
 
-      searchCommand(command) {
+      searchCommand (command) {
         if (command === 'search') {
           this.dialogVisible = true
         } else if (command === 'clear') {
           this.clearSearch()
         }
       },
-      //列表排序功能
-      orderby(column) {
+      // 列表排序功能
+      orderby (column) {
         if (column.order === 'ascending') {
           this.Column.Order = 'asc'
         } else if (column.order === 'descending') {
@@ -936,10 +937,10 @@
         this.Column.Prop = column.prop
         this.initDatas()
       },
-      clearSearch() {
-        Object.assign(this.searchForm, this.searchFormReset);
-        // this.searchForm = this.searchFormReset
-        this.CreateOn = ''
+      clearSearch () {
+        Object.assign(this.searchForm, this.searchFormReset)
+      // this.searchForm = this.searchFormReset
+      this.CreateOn = ''
         this.initDatas()
       },
       handleSearch () {
@@ -956,28 +957,28 @@
         this.currentPage = 1
         this.initDatas()
       },
-      deleteEntity(row) {
-        row.deleteConfirmFlag = false;
-        api.deleteEntity(row.Id, this.$axios).then(res => {
+      deleteEntity (row) {
+        row.deleteConfirmFlag = false
+      api.deleteEntity(row.Id, this.$axios).then(res => {
           if (res.data.code === 0) {
-            this.initDatas();
-            this.$message({
+            this.initDatas()
+          this.$message({
               type: 'success',
               message: res.data.message
-            });
+            })
 
-          } else {
+        } else {
             this.$message({
               type: 'warning',
               message: res.data.message
-            });
-          }
+            })
+        }
         }).catch(err => {
           console.error(err)
-        });
-      },
+        })
+    },
 
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -990,20 +991,19 @@
         }
       },
 
-      formatDateTime(date) {
-        var y = date.getFullYear();
-        var m = date.getMonth() + 1;
-        m = m < 10 ? ('0' + m) : m;
-        var d = date.getDate();
-        d = d < 10 ? ('0' + d) : d;
-        var h = date.getHours();
-        var minute = date.getMinutes();
-        minute = minute < 10 ? ('0' + minute) : minute;
-        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
-      }
+      formatDateTime (date) {
+        var y = date.getFullYear()
+      var m = date.getMonth() + 1
+      m = m < 10 ? ('0' + m) : m
+      var d = date.getDate()
+      d = d < 10 ? ('0' + d) : d
+      var h = date.getHours()
+      var minute = date.getMinutes()
+      minute = minute < 10 ? ('0' + minute) : minute
+      return y + '-' + m + '-' + d + ' ' + h + ':' + minute
+    }
     }
   }
-
 </script>
 
 <style lang="scss">

+ 91 - 91
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierps/index.vue

@@ -68,6 +68,7 @@
                          :prop="column.prop" sortable :width="column.width" :label="column.label" align="center" show-overflow-tooltip>
           <template slot-scope="scope" >
             <span v-if="column.prop == 'SetupTime'">{{ jstimehandle(scope.row.SetupTime+'') }}</span>
+            <span v-else-if="column.prop == 'AccessCardNo'" style="font-family:'黑体';font-size:13px">{{scope.row.AccessCardNo}}</span>
             <span v-else>{{ scope.row[column.prop] }}</span>
           </template>
         </el-table-column>
@@ -465,20 +466,20 @@
     data () {
       return {
         dialogVisible: false,
-        //列表数据
+        // 列表数据
         entityList: [],
-        //分页参数
+        // 分页参数
         size: 10,
         currentPage: 1,
         currentItemCount: 0,
-        //列表排序
+        // 列表排序
         Column: {
           Order: '',
           Prop: ''
         },
-        //查询时间
+        // 查询时间
         CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
-        //查询项
+        // 查询项
         searchFormReset: {},
         searchForm: {
           SupplierTypeName: ''
@@ -547,30 +548,30 @@
            label: '',
            width: 100,
            sort: true
-           },*/
+           }, */
 
           {
-            prop: "AccessCardNo",
+            prop: 'AccessCardNo',
             label: '准入证编号',
             width: 240,
             sort: true
           },
 
           {
-            prop: "SupplierTypeName",
+            prop: 'SupplierTypeName',
             label: '准入类别',
             width: 150,
             sort: true
           },
 
           {
-            prop: "SupplierName",
+            prop: 'SupplierName',
             label: '企业名称',
             width: 240,
             sort: true
           },
 
-          /*{
+          /* {
            prop: "OilCertificateNo",
            label: '中石油供应商证书号',
            width: 100,
@@ -589,16 +590,16 @@
            label: '管理单位',
            width: 100,
            sort: true
-           },*/
+           }, */
 
           /*{
            prop: "OperType",
            label: '经营方式',
            width: 100,
            sort: true
-           },*/
+           }, */
 
-          /*{
+          /* {
            prop: "Country",
            label: '国家',
            width: 100,
@@ -620,13 +621,13 @@
            },*/
 
           {
-            prop: "CommercialNo",
+            prop: 'CommercialNo',
             label: '工商注册号',
             width: 260,
             sort: true
           },
 
-          /*{
+          /* {
            prop: "OrganCode",
            label: '组织机构代码',
            width: 100,
@@ -634,7 +635,7 @@
            },*/
 
           {
-            prop: "CountryTaxNo",
+            prop: 'CountryTaxNo',
             label: '税务登记证编号',
             width: 260,
             sort: true
@@ -645,16 +646,16 @@
            label: '税务登记证地税编号',
            width: 100,
            sort: true
-           },*/
+           }, */
 
           {
-            prop: "Address",
+            prop: 'Address',
             label: '单位地址',
             width: 280,
             sort: true
           },
 
-          /*{
+          /* {
            prop: "Province",
            label: '省直辖市',
            width: 200,
@@ -771,114 +772,114 @@
            label: '行业类别名称',
            width: 100,
            sort: true
-           },*/
+           }, */
 
           {
-            prop: "RegCapital",
+            prop: 'RegCapital',
             label: '注册资本',
             width: 150,
             sort: true
           },
 
           {
-            prop: "Currency",
+            prop: 'Currency',
             label: '币种',
             width: 100,
             sort: true
           },
 
           {
-            prop: "ContactName",
+            prop: 'ContactName',
             label: '联系人姓名',
             width: 140,
             sort: true
           },
 
           {
-            prop: "CompanyType",
+            prop: 'CompanyType',
             label: '公司类型',
             width: 150,
             sort: true
           },
 
           {
-            prop: "SetupTime",
+            prop: 'SetupTime',
             label: '成立时间',
             width: 220,
             sort: true
           },
 
           {
-            prop: "DepositBank",
+            prop: 'DepositBank',
             label: '开户银行',
             width: 220,
             sort: true
           },
 
           {
-            prop: "BankAccount",
+            prop: 'BankAccount',
             label: '银行账号',
             width: 220,
             sort: true
           },
 
           {
-            prop: "EMail",
+            prop: 'EMail',
             label: '电子邮箱',
             width: 220,
             sort: true
           },
 
           {
-            prop: "BankCreditRating",
+            prop: 'BankCreditRating',
             label: '银行信用等级',
             width: 220,
             sort: true
           },
 
           {
-            prop: "Mobile",
+            prop: 'Mobile',
             label: '移动电话',
             width: 220,
             sort: true
           },
 
           {
-            prop: "Telphone",
+            prop: 'Telphone',
             label: '固定电话',
             width: 220,
             sort: true
           },
 
           {
-            prop: "Fax",
+            prop: 'Fax',
             label: '传真',
             width: 220,
             sort: true
           },
 
           {
-            prop: "CompanyTel",
+            prop: 'CompanyTel',
             label: '公司电话',
             width: 220,
             sort: true
           },
 
           {
-            prop: "QQ",
+            prop: 'QQ',
             label: 'QQ号码',
             width: 220,
             sort: true
           },
 
           {
-            prop: "CompanyUrl",
+            prop: 'CompanyUrl',
             label: '公司网址',
             width: 220,
             sort: true
           },
 
-          /*{
+          /* {
            prop: "SpecSupplier",
            label: '是否特殊业务供应商(可不招标)',
            width: 100,
@@ -900,7 +901,7 @@
            },*/
 
           {
-            prop: "Remark",
+            prop: 'Remark',
             label: '备注',
             width: 220,
             sort: true
@@ -910,16 +911,16 @@
       }
     },
     created () {
-      //查询条件初始值备份
-      Object.assign(this.searchFormReset, this.searchForm);
-      //查询列表
-      this.initDatas();
-      //this.getDictOptions()
-    },
+      // 查询条件初始值备份
+      Object.assign(this.searchFormReset, this.searchForm)
+    //查询列表
+    this.initDatas()
+    //this.getDictOptions()
+  },
 
     methods: {
-      initDatas() {
-        //分页及列表条件
+      initDatas () {
+        // 分页及列表条件
         let params = {
           _currentPage: this.currentPage,
           _size: this.size,
@@ -937,9 +938,9 @@
           myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
           myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
         }
-        //查询条件
+        // 查询条件
         Object.assign(params, this.searchForm)
-        //访问接口
+        // 访问接口
         api.getJZPSCertList(myCreateOn.join(','), params, this.$axios).then(res => {
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
@@ -948,52 +949,52 @@
         })
       },
 
-      getDictOptions() {
+      getDictOptions () {
         api.getDictList(this.$axios).then(res => {
-          //this.dictOptions.customerList = res.data.items['customerList']
-          //this.dictOptions.projectList = res.data.items['projectList']
+          // this.dictOptions.customerList = res.data.items['customerList']
+          // this.dictOptions.projectList = res.data.items['projectList']
 
         }).catch(err => {
           console.error(err)
         })
       },
 
-      //列表打印导出功能
-      exportExcel() {
+      // 列表打印导出功能
+      exportExcel () {
         /* generate workbook object from table */
-        let table = document.querySelector("#rebateSetTable").cloneNode(true); //克隆备份(原table不动)
-        // 因为element-ui的表格的fixed属性导致多出一个table,会下载重复内容,这里删除掉
-        table.removeChild(table.querySelector(".el-table__fixed-right")) //删掉备份的子节点
+        let table = document.querySelector('#rebateSetTable').cloneNode(true) //克隆备份(原table不动)
+      // 因为element-ui的表格的fixed属性导致多出一个table,会下载重复内容,这里删除掉
+      table.removeChild(table.querySelector('.el-table__fixed-right')) // 删掉备份的子节点
         let wb = XLSX.utils.table_to_book(table, {
           raw: true
         })
         /* get binary string as output */
         let wbout = XLSX.write(wb, {
-          bookType: "xlsx",
+          bookType: 'xlsx',
           bookSST: true,
-          type: "array"
+          type: 'array'
         })
         try {
           FileSaver.saveAs(
             new Blob([wbout], {
-              type: "application/octet-stream"
+              type: 'application/octet-stream'
             }),
-            "CentralizedReview.xlsx"
+            'CentralizedReview.xlsx'
           )
         } catch (e) {
-          if (typeof console !== "undefined") console.log(e, wbout)
+          if (typeof console !== 'undefined') console.log(e, wbout)
         }
         return wbout
       },
-      searchCommand(command) {
+      searchCommand (command) {
         if (command === 'search') {
           this.dialogVisible = true
         } else if (command === 'clear') {
           this.clearSearch()
         }
       },
-      //列表排序功能
-      orderby(column) {
+      // 列表排序功能
+      orderby (column) {
         if (column.order === 'ascending') {
           this.Column.Order = 'asc'
         } else if (column.order === 'descending') {
@@ -1002,10 +1003,10 @@
         this.Column.Prop = column.prop
         this.initDatas()
       },
-      clearSearch() {
-        Object.assign(this.searchForm, this.searchFormReset);
-        // this.searchForm = this.searchFormReset
-        this.CreateOn = ''
+      clearSearch () {
+        Object.assign(this.searchForm, this.searchFormReset)
+      // this.searchForm = this.searchFormReset
+      this.CreateOn = ''
         this.initDatas()
       },
       handleSearch () {
@@ -1022,28 +1023,28 @@
         this.currentPage = 1
         this.initDatas()
       },
-      deleteEntity(row) {
-        row.deleteConfirmFlag = false;
-        api.deleteEntity(row.Id, this.$axios).then(res => {
+      deleteEntity (row) {
+        row.deleteConfirmFlag = false
+      api.deleteEntity(row.Id, this.$axios).then(res => {
           if (res.data.code === 0) {
-            this.initDatas();
-            this.$message({
+            this.initDatas()
+          this.$message({
               type: 'success',
               message: res.data.message
-            });
+            })
 
-          } else {
+        } else {
             this.$message({
               type: 'warning',
               message: res.data.message
-            });
-          }
+            })
+        }
         }).catch(err => {
           console.error(err)
-        });
-      },
+        })
+    },
 
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -1056,20 +1057,19 @@
         }
       },
 
-      formatDateTime(date) {
-        var y = date.getFullYear();
-        var m = date.getMonth() + 1;
-        m = m < 10 ? ('0' + m) : m;
-        var d = date.getDate();
-        d = d < 10 ? ('0' + d) : d;
-        var h = date.getHours();
-        var minute = date.getMinutes();
-        minute = minute < 10 ? ('0' + minute) : minute;
-        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
-      }
+      formatDateTime (date) {
+        var y = date.getFullYear()
+      var m = date.getMonth() + 1
+      m = m < 10 ? ('0' + m) : m
+      var d = date.getDate()
+      d = d < 10 ? ('0' + d) : d
+      var h = date.getHours()
+      var minute = date.getMinutes()
+      minute = minute < 10 ? ('0' + minute) : minute
+      return y + '-' + m + '-' + d + ' ' + h + ':' + minute
+    }
     }
   }
-
 </script>
 
 <style lang="scss">

+ 99 - 100
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/index.vue

@@ -64,6 +64,7 @@
                          :prop="column.prop" sortable :width="column.width" :label="column.label" align="center" show-overflow-tooltip>
           <template slot-scope="scope" >
             <span v-if="column.prop == 'SetupTime'">{{ jstimehandle(scope.row.SetupTime+'') }}</span>
+            <span v-else-if="column.prop == 'AccessCardNo'" style="font-family:'黑体';font-size:13px">{{scope.row.AccessCardNo}}</span>
             <span v-else>{{ scope.row[column.prop] }}</span>
           </template>
         </el-table-column>
@@ -455,55 +456,55 @@
     data () {
       return {
         dialogVisible: false,
-        //列表数据
+        // 列表数据
         entityList: [],
-        //分页参数
+        // 分页参数
         size: 10,
         currentPage: 1,
         currentItemCount: 0,
-        //列表排序
+        // 列表排序
         Column: {
           Order: '',
           Prop: ''
         },
-        //查询时间
+        // 查询时间
         CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
-        //查询项
+        // 查询项
         searchFormReset: {},
         searchForm: {
           SupplierTypeName: ''
         },
         tableColumns: [
 
-          /*{
+          /* {
            prop: "Id",
            label: '',
            width: 100,
            sort: true
-           },*/
+           }, */
 
           {
-            prop: "AccessCardNo",
+            prop: 'AccessCardNo',
             label: '准入证编号',
             width: 240,
             sort: true
           },
 
           {
-            prop: "SupplierTypeName",
+            prop: 'SupplierTypeName',
             label: '准入类别',
             width: 150,
             sort: true
           },
 
           {
-            prop: "SupplierName",
+            prop: 'SupplierName',
             label: '企业名称',
             width: 240,
             sort: true
           },
 
-          /*{
+          /* {
            prop: "OilCertificateNo",
            label: '中石油供应商证书号',
            width: 100,
@@ -515,23 +516,23 @@
            label: '级别',
            width: 100,
            sort: true
-           },*/
+           }, */
 
-          /*{
+          /* {
            prop: "MgrUnit",
            label: '管理单位',
            width: 100,
            sort: true
-           },*/
+           }, */
 
-          /*{
+          /* {
            prop: "OperType",
            label: '经营方式',
            width: 100,
            sort: true
-           },*/
+           }, */
 
-          /*{
+          /* {
            prop: "Country",
            label: '国家',
            width: 100,
@@ -550,44 +551,44 @@
            label: '施工队伍名称',
            width: 100,
            sort: true
-           },*/
+           }, */
 
           {
-            prop: "CommercialNo",
+            prop: 'CommercialNo',
             label: '工商注册号',
             width: 260,
             sort: true
           },
 
-          /*{
+          /* {
            prop: "OrganCode",
            label: '组织机构代码',
            width: 100,
            sort: true
-           },*/
+           }, */
 
           {
-            prop: "CountryTaxNo",
+            prop: 'CountryTaxNo',
             label: '税务登记证编号',
             width: 260,
             sort: true
           },
 
-          /*{
+          /* {
            prop: "LocalTaxNo",
            label: '税务登记证地税编号',
            width: 100,
            sort: true
-           },*/
+           }, */
 
           {
-            prop: "Address",
+            prop: 'Address',
             label: '单位地址',
             width: 280,
             sort: true
           },
 
-          /*{
+          /* {
            prop: "Province",
            label: '省直辖市',
            width: 200,
@@ -620,9 +621,9 @@
            label: '邮编',
            width: 200,
            sort: true
-           },*/
+           }, */
 
-          /*{
+          /* {
            prop: "QualitySystemCert",
            label: '质量管理体系认证情况及认证机构',
            width: 300,
@@ -704,114 +705,114 @@
            label: '行业类别名称',
            width: 100,
            sort: true
-           },*/
+           }, */
 
           {
-            prop: "RegCapital",
+            prop: 'RegCapital',
             label: '注册资本',
             width: 150,
             sort: true
           },
 
           {
-            prop: "Currency",
+            prop: 'Currency',
             label: '币种',
             width: 100,
             sort: true
           },
 
           {
-            prop: "ContactName",
+            prop: 'ContactName',
             label: '联系人姓名',
             width: 140,
             sort: true
           },
 
           {
-            prop: "CompanyType",
+            prop: 'CompanyType',
             label: '公司类型',
             width: 150,
             sort: true
           },
 
           {
-            prop: "SetupTime",
+            prop: 'SetupTime',
             label: '成立时间',
             width: 220,
             sort: true
           },
 
           {
-            prop: "DepositBank",
+            prop: 'DepositBank',
             label: '开户银行',
             width: 220,
             sort: true
           },
 
           {
-            prop: "BankAccount",
+            prop: 'BankAccount',
             label: '银行账号',
             width: 220,
             sort: true
           },
 
           {
-            prop: "EMail",
+            prop: 'EMail',
             label: '电子邮箱',
             width: 220,
             sort: true
           },
 
           {
-            prop: "BankCreditRating",
+            prop: 'BankCreditRating',
             label: '银行信用等级',
             width: 220,
             sort: true
           },
 
           {
-            prop: "Mobile",
+            prop: 'Mobile',
             label: '移动电话',
             width: 220,
             sort: true
           },
 
           {
-            prop: "Telphone",
+            prop: 'Telphone',
             label: '固定电话',
             width: 220,
             sort: true
           },
 
           {
-            prop: "Fax",
+            prop: 'Fax',
             label: '传真',
             width: 220,
             sort: true
           },
 
           {
-            prop: "CompanyTel",
+            prop: 'CompanyTel',
             label: '公司电话',
             width: 220,
             sort: true
           },
 
           {
-            prop: "QQ",
+            prop: 'QQ',
             label: 'QQ号码',
             width: 220,
             sort: true
           },
 
           {
-            prop: "CompanyUrl",
+            prop: 'CompanyUrl',
             label: '公司网址',
             width: 220,
             sort: true
           },
 
-          /*{
+          /* {
            prop: "SpecSupplier",
            label: '是否特殊业务供应商(可不招标)',
            width: 100,
@@ -830,10 +831,10 @@
            label: '业务类型(1战略合作,2内部多经,3区域关键,4专业化实施)',
            width: 100,
            sort: true
-           },*/
+           }, */
 
           {
-            prop: "Remark",
+            prop: 'Remark',
             label: '备注',
             width: 220,
             sort: true
@@ -843,25 +844,25 @@
       }
     },
     created () {
-      //查询条件初始值备份
-      Object.assign(this.searchFormReset, this.searchForm);
-      //查询列表
-      this.initDatas();
-      //this.getDictOptions()
-    },
+      // 查询条件初始值备份
+      Object.assign(this.searchFormReset, this.searchForm)
+      // 查询列表
+      this.initDatas()
+    // this.getDictOptions()
+  },
 
     methods: {
-      changeFlag(val){
-        if(val=="物资类"){
-          return "goodsedit"
-        }else if(val=="基建类"){
-          return "basisedit"
-        }else{
-          return "techedit"
+      changeFlag (val) {
+        if (val == '物资类') {
+          return 'goodsedit'
+        } else if (val == '基建类') {
+          return 'basisedit'
+        } else {
+          return 'techedit'
         }
       },
-      initDatas() {
-        //分页及列表条件
+      initDatas () {
+        // 分页及列表条件
         let params = {
           _currentPage: this.currentPage,
           _size: this.size,
@@ -879,9 +880,9 @@
           myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
           myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
         }
-        //查询条件
+        // 查询条件
         Object.assign(params, this.searchForm)
-        //访问接口
+        // 访问接口
         api.getStoreList(myCreateOn.join(','), params, this.$axios).then(res => {
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
@@ -889,52 +890,52 @@
           console.error(err)
         })
       },
-      //列表打印导出功能
-      exportExcel() {
+      // 列表打印导出功能
+      exportExcel () {
         /* generate workbook object from table */
-        let table = document.querySelector("#rebateSetTable").cloneNode(true); //克隆备份(原table不动)
+        let table = document.querySelector('#rebateSetTable').cloneNode(true) // 克隆备份(原table不动)
         // 因为element-ui的表格的fixed属性导致多出一个table,会下载重复内容,这里删除掉
-        table.removeChild(table.querySelector(".el-table__fixed-right")) //删掉备份的子节点
+        table.removeChild(table.querySelector('.el-table__fixed-right')) // 删掉备份的子节点
         let wb = XLSX.utils.table_to_book(table, {
           raw: true
         })
         /* get binary string as output */
         let wbout = XLSX.write(wb, {
-          bookType: "xlsx",
+          bookType: 'xlsx',
           bookSST: true,
-          type: "array"
+          type: 'array'
         })
         try {
           FileSaver.saveAs(
             new Blob([wbout], {
-              type: "application/octet-stream"
+              type: 'application/octet-stream'
             }),
-            "SupplierStorage.xlsx"
+            'SupplierStorage.xlsx'
           )
         } catch (e) {
-          if (typeof console !== "undefined") console.log(e, wbout)
+          if (typeof console !== 'undefined') console.log(e, wbout)
         }
         return wbout
       },
-      getDictOptions() {
+      getDictOptions () {
         api.getDictList(this.$axios).then(res => {
-          //this.dictOptions.customerList = res.data.items['customerList']
-          //this.dictOptions.projectList = res.data.items['projectList']
+          // this.dictOptions.customerList = res.data.items['customerList']
+          // this.dictOptions.projectList = res.data.items['projectList']
 
         }).catch(err => {
           console.error(err)
         })
       },
 
-      searchCommand(command) {
+      searchCommand (command) {
         if (command === 'search') {
           this.dialogVisible = true
         } else if (command === 'clear') {
           this.clearSearch()
         }
       },
-      //列表排序功能
-      orderby(column) {
+      // 列表排序功能
+      orderby (column) {
         if (column.order === 'ascending') {
           this.Column.Order = 'asc'
         } else if (column.order === 'descending') {
@@ -943,8 +944,8 @@
         this.Column.Prop = column.prop
         this.initDatas()
       },
-      clearSearch() {
-        Object.assign(this.searchForm, this.searchFormReset);
+      clearSearch () {
+        Object.assign(this.searchForm, this.searchFormReset)
         // this.searchForm = this.searchFormReset
         this.CreateOn = ''
         this.initDatas()
@@ -963,28 +964,27 @@
         this.currentPage = 1
         this.initDatas()
       },
-      deleteEntity(row) {
-        row.deleteConfirmFlag = false;
+      deleteEntity (row) {
+        row.deleteConfirmFlag = false
         api.deleteEntity(row.Id, this.$axios).then(res => {
           if (res.data.code === 0) {
-            this.initDatas();
+            this.initDatas()
             this.$message({
               type: 'success',
               message: res.data.message
-            });
-
+            })
           } else {
             this.$message({
               type: 'warning',
               message: res.data.message
-            });
+            })
           }
         }).catch(err => {
           console.error(err)
-        });
+        })
       },
 
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -997,20 +997,19 @@
         }
       },
 
-      formatDateTime(date) {
-        var y = date.getFullYear();
-        var m = date.getMonth() + 1;
-        m = m < 10 ? ('0' + m) : m;
-        var d = date.getDate();
-        d = d < 10 ? ('0' + d) : d;
-        var h = date.getHours();
-        var minute = date.getMinutes();
-        minute = minute < 10 ? ('0' + minute) : minute;
-        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
+      formatDateTime (date) {
+        var y = date.getFullYear()
+        var m = date.getMonth() + 1
+        m = m < 10 ? ('0' + m) : m
+        var d = date.getDate()
+        d = d < 10 ? ('0' + d) : d
+        var h = date.getHours()
+        var minute = date.getMinutes()
+        minute = minute < 10 ? ('0' + minute) : minute
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute
       }
     }
   }
-
 </script>
 
 <style lang="scss">

+ 2 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/index.vue

@@ -71,6 +71,7 @@
                          :prop="column.prop" sortable :width="column.width" :label="column.label" align="center" show-overflow-tooltip>
           <template slot-scope="scope" >
             <span v-if="column.prop == 'SetupTime'">{{ jstimehandle(scope.row.SetupTime+'') }}</span>
+            <span v-else-if="column.prop == 'AccessCardNo'" style="font-family:'黑体';font-size:13px">{{scope.row.AccessCardNo}}</span>
             <span v-else>{{ scope.row[column.prop] }}</span>
           </template>
         </el-table-column>
@@ -863,7 +864,7 @@
           return 'goodsedit'
         } else if (val == '基建类') {
           return 'basisedit'
-        } else{
+        } else {
           return 'techedit'
         }
       },

+ 5 - 1
src/dashoo.cn/frontend_web/src/pages/select/companyselect/index.vue

@@ -79,7 +79,11 @@
           </template>
         </el-table-column>
         <!--内框表格剩余栏显示-->
-        <el-table-column label="准入编码" width="100px" prop="AccessCardNo" sortable align="center"></el-table-column>
+        <el-table-column label="准入编码" width="100px" prop="AccessCardNo" sortable align="center">
+           <template slot-scope="scope" >
+             <span style="font-family:'黑体';font-size:13px">{{scope.row.AccessCardNo}}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="企业名称" min-width="300px" prop="SupplierName" sortable align="center"></el-table-column>
         <el-table-column label="准入类别" prop="SupplierTypeCode" align="center">
           <template slot-scope="scope">