隐藏按钮

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

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/basisdataopera.vue

@@ -19,7 +19,7 @@
               <el-step title="待入库"></el-step>
               <el-step title="完成"></el-step>
             </el-steps>
-            <el-button slot="reference" plain size="mini" style="margin-right: 8px">查看进度</el-button>
+            <!-- <el-button slot="reference" plain size="mini" style="margin-right: 8px">查看进度</el-button> -->
           </el-popover>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
@@ -219,8 +219,8 @@
   import api from '@/api/oilsupplier/supplierappendsub'
   import api2 from '@/api/oilsupplier/supplierappend'
   import apiCert from '@/api/oilsupplier/suppliercert'
-  import WfMultiHistory from "@/components/workflow/wfmultihistory.vue";
-  import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
+  import WfMultiHistory from '@/components/workflow/wfmultihistory.vue'
+import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
 
   export default {
     components: {
@@ -234,7 +234,7 @@
     },
     name: 'oilsuppliercertappendsub',
 
-    data() {
+    data () {
       var CheckSelectedOption = (rule, value, callback) => {
         if (this.selectedOrgList && this.selectedOrgList.length < 1) {
           callback(new Error('请选择推荐单位'))
@@ -274,7 +274,7 @@
         aduitlabel: '审核人',
         auditer: '',
         auditerName: '',
-        fushenauditer: '', //复审人员
+        fushenauditer: '', // 复审人员
         auditTitle: '审批',
         companyid: '',
         orgtreeprops: {
@@ -286,55 +286,55 @@
         auditBtn: false,
         auditstepcode: '',
         dictData: null,
-        supplierList: [], //供应方公司列表
-        supplierOptions: '', //已选择的供应方公司列表
+        supplierList: [], // 供应方公司列表
+        supplierOptions: '', // 已选择的供应方公司列表
         // serviceType: '', //服务类型()
-        selectedOptList: [], //已选择的增项分类列表
-        selectedOrgList: [], //已选择的单位列表
-        //增项信息表
+        selectedOptList: [], // 已选择的增项分类列表
+        selectedOrgList: [], // 已选择的单位列表
+        // 增项信息表
         formData: {
           Id: '',
           Step: 1,
           Status: '',
           SupplierId: 1,
           SupplierCertId: 1,
-          RecUnitFlag: '', //推荐单位的级联Id标记
-          RecUnitId: '', //推荐单位编码
-          RecUnitName: '', //推荐单位名称
-          AppendType: '', //增项类别(1 物资类，2 基建类，3 技术服务类)
-          Remark: '', //备注
+          RecUnitFlag: '', // 推荐单位的级联Id标记
+          RecUnitId: '', // 推荐单位编码
+          RecUnitName: '', // 推荐单位名称
+          AppendType: '', // 增项类别(1 物资类，2 基建类，3 技术服务类)
+          Remark: '' // 备注
         },
         entrydetail: {
-          process: "",
-          business: "",
-          instance: "",
-          Status: ""
+          process: '',
+          business: '',
+          instance: '',
+          Status: ''
         },
-        dialogVisible: false, //增项分办
+        dialogVisible: false, // 增项分办
         dialogTitle: '',
         dialogFormData: {
           Id: '',
-          SupplierId: 1, //供方表ID
-          SupplierCertId: 1, //供方证书表ID
-          SupplierCertAppendId: '', //增项信息表ID
-          SubClassId: 2, //分类表主键（物资类或基建类或技术服务类）
-          SortFlag: '', //分类标记
-          Code: '', //分类编码
-          Name: '', //分类名称
-          Remark: '', //备注
+          SupplierId: 1, // 供方表ID
+          SupplierCertId: 1, // 供方证书表ID
+          SupplierCertAppendId: '', // 增项信息表ID
+          SubClassId: 2, // 分类表主键（物资类或基建类或技术服务类）
+          SortFlag: '', // 分类标记
+          Code: '', // 分类编码
+          Name: '', // 分类名称
+          Remark: '' // 备注
         },
-        //列表数据
+        // 列表数据
         entityList: [],
-        //分页参数
+        // 分页参数
         size: 10,
         currentPage: 1,
         currentItemCount: 0,
-        //列表排序
+        // 列表排序
         Column: {
           Order: '',
           Prop: ''
         },
-        //增项表单规则
+        // 增项表单规则
         appendRules: {
           checkSelectedRecUnitName: [{
             required: true,
@@ -345,29 +345,29 @@
             required: true,
             validator: CheckSelectedOption3,
             trigger: 'blur'
-          }],
+          }]
         },
-        //增项分类表单规则
+        // 增项分类表单规则
         sortEntityFormRules: {
           checkSelectedOptList: [{
             required: true,
             validator: CheckSelectedOption2,
             trigger: 'blur'
-          }],
+          }]
         },
         shenheForm: {
           SuccessStatus: 1,
           AuditorRemark: '',
           AppendId: 0,
           Auditer: '',
-          MajorDept: '',
+          MajorDept: ''
         },
-        AppendId: '', //传的参数
+        AppendId: '', // 传的参数
         serviceId: '',
-        editFlag: '', //编辑操作标记
+        editFlag: '' // 编辑操作标记
       }
     },
-    created() {
+    created () {
       this.companyid = this.authUser.Profile.Superior
       // this.serviceType = this.$route.params.opera //获取服务类型
       this.serviceId = this.$route.params.opera
@@ -377,17 +377,17 @@
       this.dialogFormData.SupplierCertAppendId = this.AppendId
       this.getorgtreelist()
       this.getorgtreelistbydeptid()
-      this.getSupplierList() //获取供应方公司列表
+      this.getSupplierList() // 获取供应方公司列表
     },
     methods: {
-      //获取需要修改的增项信息
-      getEntityById() {
+      // 获取需要修改的增项信息
+      getEntityById () {
         let _this = this
         api2.getEntityById(_this.AppendId, _this.$axios).then(res => {
           _this.formData = res.data
           this.entrydetail.process = this.formData.ProcessKey
           this.entrydetail.business = _this.AppendId
-          this.entrydetail.instance = this.formData.WorkFlowId;
+          this.entrydetail.instance = this.formData.WorkFlowId
           this.entrydetail.status = this.formData.Status
           if (this.formData.Status === '1') {
             this.aduitlabel = '复审人员'
@@ -410,14 +410,14 @@
           this.getSortList()
           this.getDictOptions()
           this.isAccess()
-          //显示公司名
+          // 显示公司名
           _this.supplierOptions = _this.formData.SupplierId.toString()
         }).catch(err => {
           console.error(err)
         })
       },
 
-      isAccess() {
+      isAccess () {
         let params = {
           id: this.formData.Id,
           auditstepcode: this.auditstepcode,
@@ -430,7 +430,7 @@
         })
       },
 
-      radioChange() {
+      radioChange () {
         if (this.shenheForm.SuccessStatus === 1) {
           this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
         } else {
@@ -443,15 +443,15 @@
         }
       },
 
-      //获取供应方公司列表
-      getSupplierList() {
+      // 获取供应方公司列表
+      getSupplierList () {
         let _this = this
         let params = {
-          SuppTypeCode: '02',
+          SuppTypeCode: '02'
         }
         _this.$axios.get('/suppliercertappend/getsupplier', {
-            params
-          })
+          params
+        })
           .then(res => {
             _this.supplierList = res.data
           })
@@ -460,9 +460,9 @@
           })
       },
 
-      //获取增项分类表
-      getSortList() {
-        //分页及列表条件
+      // 获取增项分类表
+      getSortList () {
+        // 分页及列表条件
         let params = {
           // _currentPage: this.currentPage,
           // _size: this.size,
@@ -470,10 +470,10 @@
           // Prop: this.Column.Prop,
           SupplierCertAppendId: this.dialogFormData.SupplierCertAppendId,
           SupCertId: this.formData.SupplierCertId,
-          SupTypeCode: "02",
-        };
+          SupTypeCode: '02'
+        }
 
-        //访问接口
+        // 访问接口
         api.getListAppend(params, this.$axios).then(res => {
           this.entityList = res.data.item
           // this.currentItemCount = res.data.currentItemCount
@@ -482,7 +482,7 @@
         })
       },
 
-      AuditEntity() {
+      AuditEntity () {
         this.auditOrgChange()
         if (this.formData.Status === '3') {
           this.dialogAllocation = true
@@ -494,8 +494,8 @@
           this.dialogMakeSure = true
         }
       },
-      //获取资质文件
-      getFileList() {
+      // 获取资质文件
+      getFileList () {
         this.SupplierId = this.formData.SupplierId
         this.SupplierTypeCode = this.formData.AppendType
         let _this = this
@@ -503,11 +503,11 @@
           SupplierId: this.SupplierId,
           SupplierTypeCode: this.SupplierTypeCode,
           _currentPage: 1,
-          _size: 1000,
+          _size: 1000
         }
         _this.$axios.get('supplierfile/filelistappend', {
-            params
-          })
+          params
+        })
           .then(res => {
             _this.subfileList = res.data.items
             _this.currentItemCount = res.data.currentItemCount
@@ -520,11 +520,11 @@
             console.error(err)
           })
       },
-      //审批历史
-      auhistory() {
+      // 审批历史
+      auhistory () {
         this.audithistoryshow = true
       },
-      getDictOptions() {
+      getDictOptions () {
         let params = {
           status: this.formData.Status,
           majorAduit: this.formData.ThirdAudit
@@ -538,14 +538,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')
           })
@@ -553,14 +553,14 @@
             console.error(err)
           })
       },
-      getorgtreelistbydeptid() {
+      getorgtreelistbydeptid () {
         let _this = this
         let params = {
           IsInnerOrganize: 1
         }
         _this.$axios.get('organizes/listbydeptid', {
-            params
-          })
+          params
+        })
           .then(res => {
             _this.secorgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
           })
@@ -568,29 +568,29 @@
             console.error(err)
           })
       },
-      chooseAuditorShow() {
+      chooseAuditorShow () {
         this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
         this.chooseAuditorVisible = true
       },
-      setAuditer(val, name) {
+      setAuditer (val, name) {
         this.auditer = val
         this.auditerName = name
         this.chooseAuditorVisible = false
         this.auditOrgChang(this.auditer)
       },
-      auditOrgChang(val) {
-        let auditstepcode = "SECOND_TRIAL";
-        suppapi
+      auditOrgChang (val) {
+        let auditstepcode = 'SECOND_TRIAL'
+      suppapi
           .getAuditerByFirst(val, auditstepcode, this.$axios)
           .then(res => {
             this.secauditerOptions = res.data.item
           })
           .catch(err => {
-            console.error(err);
-          });
+            console.error(err)
+          })
       },
 
-      auditOrgChange(val) {
+      auditOrgChange (val) {
         console.log(this.formData.Status, 'status')
         let auditstepcode = ''
         if (this.formData.Status === '1') {
@@ -613,7 +613,7 @@
         })
       },
       // 审核通过
-      makeSure() {
+      makeSure () {
         console.log(this.auditer)
         if (this.shenheForm.SuccessStatus === 1) {
           if ((!this.auditer || this.auditer === 0) && this.formData.Status !== '1' && this.formData.Status !== '2' &&
@@ -646,13 +646,13 @@
         this.checkstatus()
       },
 
-      checkstatus() {
+      checkstatus () {
         this.shenheForm.Auditer = this.auditer
         this.shenheForm.MajorDept = this.majorDept[this.majorDept.length - 1]
         let params = {
           FirstAuditName: this.auditer,
           SecondAudit: this.fushenauditer,
-          ThirdAudit: this.majorDept[this.majorDept.length - 1],
+          ThirdAudit: this.majorDept[this.majorDept.length - 1]
         }
         api2.auditEntityFir(this.formData.Id, params, this.shenheForm, this.$axios).then(res => {
           if (res.data.code === 0) {
@@ -675,14 +675,14 @@
           console.error(err)
         })
       },
-      fileurlcut(val, index) {
+      fileurlcut (val, index) {
         let fileurlall = val.split('$')[index]
-        let fileurl = fileurlall.split("|")
+        let fileurl = fileurlall.split('|')
         return fileurl[0]
       },
 
-      //列表排序功能
-      orderby(column) {
+      // 列表排序功能
+      orderby (column) {
         if (column.order == 'ascending') {
           this.Column.Order = 'asc'
         } else if (column.order == 'descending') {
@@ -691,18 +691,18 @@
         this.Column.Prop = column.prop
         this.initData()
       },
-      //分页功能
-      handleCurrentChange(value) {
+      // 分页功能
+      handleCurrentChange (value) {
         this.currentPage = value
         this.initData()
       },
-      handleSizeChange(value) {
+      handleSizeChange (value) {
         this.size = value
         this.currentPage = 1
         this.initData()
       },
 
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -713,8 +713,7 @@
           val = val.replace('T', ' ')
           return val.substring(0, 10)
         }
-      },
+      }
     }
   }
-
 </script>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/goodsdataopera.vue

@@ -19,7 +19,7 @@
               <el-step title="待入库"></el-step>
               <el-step title="完成"></el-step>
             </el-steps>
-            <el-button slot="reference" plain size="mini" style="margin-right: 8px">查看进度</el-button>
+            <!-- <el-button slot="reference" plain size="mini" style="margin-right: 8px">查看进度</el-button> -->
           </el-popover>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
@@ -223,7 +223,7 @@
   import api from '@/api/oilsupplier/supplierappendsub'
   import api2 from '@/api/oilsupplier/supplierappend'
   import apiCert from '@/api/oilsupplier/suppliercert'
-  import WfMultiHistory from "@/components/workflow/wfmultihistory.vue";
+  import WfMultiHistory from '@/components/workflow/wfmultihistory.vue';
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
 
   export default {
@@ -238,7 +238,7 @@
     },
     name: 'oilsuppliercertappendsub',
 
-    data() {
+    data () {
       var CheckSelectedOption = (rule, value, callback) => {
         if (this.selectedOrgList && this.selectedOrgList.length < 1) {
           callback(new Error('请选择推荐单位'))
@@ -262,7 +262,7 @@
       }
       return {
         textplaceholder: '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）',
-        chooseAuditorVisible:false,
+        chooseAuditorVisible: false,
         audithistoryshow: false,
         auditerOptions: [], // 审核人员
         secauditerOptions: [],
@@ -270,7 +270,7 @@
         organizeOption: [],
         orgtreelist: [],
         secorgtreelist: [],
-        majorDept: [100000000, 100000001, 100000071], //专业可是
+        majorDept: [100000000, 100000001, 100000071], // 专业可是
         auditbusList: [], // 待审核业务
         dialogMakeSure: false,
         dialogAllocation: false,
@@ -278,7 +278,7 @@
         aduitlabel: '审核人',
         auditer: '',
         auditerName: '',
-        fushenauditer: '', //复审人员
+        fushenauditer: '', // 复审人员
         auditTitle: '审批',
         companyid: '',
         orgtreeprops: {
@@ -287,58 +287,58 @@
           children: 'children'
         },
         entrydetail: {
-          process: "",
-          business: "",
-          instance: "",
+          process: '',
+          business: '',
+          instance: '',
           status: ''
         },
         auditBtn: false,
         auditstepcode: '',
         dictData: null,
-        supplierList: [], //供应方公司列表
-        supplierOptions: '', //已选择的供应方公司列表
+        supplierList: [], // 供应方公司列表
+        supplierOptions: '', // 已选择的供应方公司列表
         // serviceType: '', //服务类型()
-        selectedOptList: [], //已选择的增项分类列表
-        selectedOrgList: [], //已选择的单位列表
-        //增项信息表
+        selectedOptList: [], // 已选择的增项分类列表
+        selectedOrgList: [], // 已选择的单位列表
+        // 增项信息表
         formData: {
           Id: '',
           Step: 1,
           Status: '',
           SupplierId: 1,
           SupplierCertId: 1,
-          RecUnitFlag: '', //推荐单位的级联Id标记
-          RecUnitId: '', //推荐单位编码
-          RecUnitName: '', //推荐单位名称
-          AppendType: '', //增项类别(1 物资类，2 基建类，3 技术服务类)
-          Remark: '', //备注
+          RecUnitFlag: '', // 推荐单位的级联Id标记
+          RecUnitId: '', // 推荐单位编码
+          RecUnitName: '', // 推荐单位名称
+          AppendType: '', // 增项类别(1 物资类，2 基建类，3 技术服务类)
+          Remark: '' // 备注
         },
         subfileList: [],
-        dialogVisible: false, //增项分办
+        dialogVisible: false, // 增项分办
         dialogTitle: '',
         dialogFormData: {
           Id: '',
-          SupplierId: '', //供方表ID
-          SupplierCertId: '', //供方证书表ID
-          SupplierCertAppendId: '', //增项信息表ID
-          SubClassId: '', //分类表主键（物资类或基建类或技术服务类）
-          SortFlag: '', //分类标记
-          Code: '', //分类编码
-          Name: '', //分类名称
-          Remark: '', //备注
+          SupplierId: '', // 供方表ID
+          SupplierCertId: '', // 供方证书表ID
+          SupplierCertAppendId: '', // 增项信息表ID
+          SubClassId: '', // 分类表主键（物资类或基建类或技术服务类）
+          SortFlag: '', // 分类标记
+          Code: '', // 分类编码
+          Name: '', // 分类名称
+          Remark: '' // 备注
         },
-        //列表数据
+        // 列表数据
         entityList: [],
-        //分页参数
+        // 分页参数
         size: 10,
         currentPage: 1,
         currentItemCount: 0,
-        //列表排序
+        // 列表排序
         Column: {
           Order: '',
           Prop: ''
         },
-        //增项表单规则
+        // 增项表单规则
         appendRules: {
           checkSelectedRecUnitName: [{
             required: true,
@@ -349,29 +349,29 @@
             required: true,
             validator: CheckSelectedOption3,
             trigger: 'blur'
-          }],
+          }]
         },
-        //增项分类表单规则
+        // 增项分类表单规则
         sortEntityFormRules: {
           checkSelectedOptList: [{
             required: true,
             validator: CheckSelectedOption2,
             trigger: 'blur'
-          }],
+          }]
         },
         shenheForm: {
           SuccessStatus: 1,
           AuditorRemark: '',
           AppendId: 0,
           Auditer: '',
-          MajorDept: '',
+          MajorDept: ''
         },
-        AppendId: '', //传的参数
+        AppendId: '', // 传的参数
         serviceId: '',
-        editFlag: '', //编辑操作标记
+        editFlag: '' // 编辑操作标记
       }
     },
-    created() {
+    created () {
       this.companyid = this.authUser.Profile.Superior
       // this.serviceType = this.$route.params.opera //获取服务类型
       this.serviceId = this.$route.params.opera
@@ -381,18 +381,18 @@
       this.dialogFormData.SupplierCertAppendId = this.AppendId
       this.getorgtreelist()
       this.getorgtreelistbydeptid()
-      this.getSupplierList() //获取供应方公司列表
+      this.getSupplierList() // 获取供应方公司列表
     },
     methods: {
-      //获取需要修改的增项信息
-      getEntityById() {
+      // 获取需要修改的增项信息
+      getEntityById () {
         let _this = this
         api2.getEntityById(_this.AppendId, _this.$axios).then(res => {
           _this.formData = res.data
           this.entrydetail.process = this.formData.ProcessKey
           this.entrydetail.business = _this.AppendId
-          this.entrydetail.instance = this.formData.WorkFlowId;
-          this.entrydetail.status = this.formData.Status
+          this.entrydetail.instance = this.formData.WorkFlowId
+        this.entrydetail.status = this.formData.Status
           if (this.formData.Status === '1') {
             this.aduitlabel = '复审人员'
             this.auditTitle = '初审'
@@ -414,14 +414,14 @@
           this.getSortList()
           this.getDictOptions()
           this.isAccess()
-          //显示公司名
+          // 显示公司名
           _this.supplierOptions = _this.formData.SupplierId.toString()
         }).catch(err => {
           console.error(err)
         })
       },
 
-      isAccess() {
+      isAccess () {
         let params = {
           id: this.formData.Id,
           auditstepcode: this.auditstepcode,
@@ -434,11 +434,11 @@
         })
       },
 
-      //获取供应方公司列表
-      getSupplierList() {
+      // 获取供应方公司列表
+      getSupplierList () {
         let _this = this
         let params = {
-          SuppTypeCode: '01',
+          SuppTypeCode: '01'
         }
         _this.$axios.get('/suppliercertappend/getsupplier', {params})
           .then(res => {
@@ -461,8 +461,8 @@
           this.shenheForm.AuditorRemark = ''
         }
       },
-       //获取资质文件
-      getFileList() {
+      // 获取资质文件
+      getFileList () {
         this.SupplierId = this.formData.SupplierId
         this.SupplierTypeCode = this.formData.AppendType
         let _this = this
@@ -470,11 +470,11 @@
           SupplierId: this.SupplierId,
           SupplierTypeCode: this.SupplierTypeCode,
           _currentPage: 1,
-          _size: 1000,
+          _size: 1000
         }
         _this.$axios.get('supplierfile/filelistappend', {
-            params
-          })
+          params
+        })
           .then(res => {
             _this.subfileList = res.data.items
             _this.currentItemCount = res.data.currentItemCount
@@ -487,14 +487,14 @@
             console.error(err)
           })
       },
-      //审批历史
-      auhistory() {
+      // 审批历史
+      auhistory () {
         this.audithistoryshow = true
       },
 
-     //获取增项分类表
-      getSortList() {
-        //分页及列表条件
+      // 获取增项分类表
+      getSortList () {
+        // 分页及列表条件
         let params = {
           // _currentPage: this.currentPage,
           // _size: this.size,
@@ -502,10 +502,10 @@
           // Prop: this.Column.Prop,
           SupplierCertAppendId: this.dialogFormData.SupplierCertAppendId,
           SupCertId: this.formData.SupplierCertId,
-          SupTypeCode: "01",
-        };
-        //访问接口
-        api.getListAppend(params, this.$axios).then(res => {
+          SupTypeCode: '01'
+        }
+      //访问接口
+      api.getListAppend(params, this.$axios).then(res => {
           this.entityList = res.data.item
           // this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
@@ -513,7 +513,7 @@
         })
       },
 
-      AuditEntity() {
+      AuditEntity () {
         this.auditOrgChange()
         if (this.formData.Status === '3') {
           this.dialogAllocation = true
@@ -525,7 +525,7 @@
           this.dialogMakeSure = true
         }
       },
-      getDictOptions() {
+      getDictOptions () {
         let params = {
           status: this.formData.Status,
           majorAduit: this.formData.ThirdAudit
@@ -539,14 +539,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')
           })
@@ -554,14 +554,14 @@
             console.error(err)
           })
       },
-      getorgtreelistbydeptid() {
+      getorgtreelistbydeptid () {
         let _this = this
         let params = {
           IsInnerOrganize: 1
         }
         _this.$axios.get('organizes/listbydeptid', {
-            params
-          })
+          params
+        })
           .then(res => {
             _this.secorgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
           })
@@ -569,30 +569,29 @@
             console.error(err)
           })
       },
-      chooseAuditorShow() {
+      chooseAuditorShow () {
         this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
         this.chooseAuditorVisible = true
       },
-      setAuditer(val, name) {
+      setAuditer (val, name) {
         this.auditer = val
         this.auditerName = name
         this.chooseAuditorVisible = false
         this.auditOrgChang(this.auditer)
       },
-      auditOrgChang(val) {
-        let auditstepcode = "SECOND_TRIAL";
+      auditOrgChang (val) {
+        let auditstepcode = 'SECOND_TRIAL';
         suppapi
           .getAuditerByFirst(val, auditstepcode, this.$axios)
           .then(res => {
             this.secauditerOptions = res.data.item
           })
           .catch(err => {
-            console.error(err);
-          });
-      },
-
-      auditOrgChange() {
+            console.error(err)
+        })
+    },
 
+      auditOrgChange () {
         console.log(this.formData.Status, 'status')
         let auditstepcode = ''
         if (this.formData.Status === '1') {
@@ -615,7 +614,7 @@
         })
       },
       // 审核通过
-      makeSure() {
+      makeSure () {
         console.log(this.auditer)
         if (this.shenheForm.SuccessStatus === 1) {
           if ((!this.auditer || this.auditer === 0) && this.formData.Status !== '1' && this.formData.Status !== '2' &&
@@ -648,13 +647,13 @@
         this.checkstatus()
       },
 
-      checkstatus() {
+      checkstatus () {
         this.shenheForm.Auditer = this.auditer
         this.shenheForm.MajorDept = this.majorDept[this.majorDept.length - 1]
         let params = {
           FirstAuditName: this.auditer,
           SecondAudit: this.fushenauditer,
-          ThirdAudit: this.majorDept[this.majorDept.length - 1],
+          ThirdAudit: this.majorDept[this.majorDept.length - 1]
         }
         api2.auditEntityFir(this.formData.Id, params, this.shenheForm, this.$axios).then(res => {
           if (res.data.code === 0) {
@@ -677,14 +676,14 @@
           console.error(err)
         })
       },
-      fileurlcut(val, index) {
+      fileurlcut (val, index) {
         let fileurlall = val.split('$')[index]
-        let fileurl = fileurlall.split("|")
+        let fileurl = fileurlall.split('|')
         return fileurl[0]
       },
 
-      //列表排序功能
-      orderby(column) {
+      // 列表排序功能
+      orderby (column) {
         if (column.order == 'ascending') {
           this.Column.Order = 'asc'
         } else if (column.order == 'descending') {
@@ -693,18 +692,18 @@
         this.Column.Prop = column.prop
         this.initData()
       },
-      //分页功能
-      handleCurrentChange(value) {
+      // 分页功能
+      handleCurrentChange (value) {
         this.currentPage = value
         this.initData()
       },
-      handleSizeChange(value) {
+      handleSizeChange (value) {
         this.size = value
         this.currentPage = 1
         this.initData()
       },
 
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -715,8 +714,7 @@
           val = val.replace('T', ' ')
           return val.substring(0, 10)
         }
-      },
+      }
     }
   }
-
 </script>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/techdataopera.vue

@@ -19,7 +19,7 @@
               <el-step title="待入库"></el-step>
               <el-step title="完成"></el-step>
             </el-steps>
-            <el-button slot="reference" plain size="mini" style="margin-right: 8px">查看进度</el-button>
+            <!-- <el-button slot="reference" plain size="mini" style="margin-right: 8px">查看进度</el-button> -->
           </el-popover>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
@@ -217,7 +217,7 @@
   import api from '@/api/oilsupplier/supplierappendsub'
   import api2 from '@/api/oilsupplier/supplierappend'
   import apiCert from '@/api/oilsupplier/suppliercert'
-  import WfMultiHistory from "@/components/workflow/wfmultihistory.vue";
+  import WfMultiHistory from '@/components/workflow/wfmultihistory.vue';
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
 
   export default {
@@ -232,7 +232,7 @@
     },
     name: 'oilsuppliercertappendsub',
 
-    data() {
+    data () {
       var CheckSelectedOption = (rule, value, callback) => {
         if (this.selectedOrgList && this.selectedOrgList.length < 1) {
           callback(new Error('请选择推荐单位'))
@@ -256,14 +256,14 @@
       }
       return {
         textplaceholder: '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）',
-        chooseAuditorVisible:false,
+        chooseAuditorVisible: false,
         subfileList: [],
         audithistoryshow: false,
         auditerOptions: [], // 审核人员
         secauditerOptions: [],
         auditerCurOptions: [],
-        orgtreelist: [], //二级单位
-        AuditdialogShow: false, //提交审核弹框
+        orgtreelist: [], // 二级单位
+        AuditdialogShow: false, // 提交审核弹框
         organizeOption: [], // 审批部门
         auditerOption: [], // 审批人
         secorgtreelist: [],
@@ -275,7 +275,7 @@
         aduitlabel: '审核人',
         auditer: '',
         auditerName: '',
-        fushenauditer: '', //复审人员
+        fushenauditer: '', // 复审人员
         auditTitle: '审批',
         auditBtn: false,
         auditstepcode: '',
@@ -287,27 +287,27 @@
           children: 'children'
         },
         FirstAudit: '',
-        supplierList: [], //供应方公司列表
-        supplierOptions: '', //已选择的供应方公司列表
+        supplierList: [], // 供应方公司列表
+        supplierOptions: '', // 已选择的供应方公司列表
         // serviceType: '', //服务类型()
-        selectedOptList: [], //已选择的增项分类列表
+        selectedOptList: [], // 已选择的增项分类列表
         tytreeprops: {
           value: 'id',
           label: 'Name',
           children: 'children'
         },
-        organizeTreeList: [], //推荐单位层级列表
-        selectedOrgList: [], //已选择的单位列表
+        organizeTreeList: [], // 推荐单位层级列表
+        selectedOrgList: [], // 已选择的单位列表
         organizeTreeProps: {
           value: 'id',
           label: 'Fullname',
           children: 'children'
         },
         entrydetail: {
-          process: "",
-          business: "",
-          instance: "",
-          Status: ""
+          process: '',
+          business: '',
+          instance: '',
+          Status: ''
         },
         organizeform: {
           IsInnerOrganize: 1,
@@ -316,7 +316,7 @@
           description: '',
           id: 0
         },
-        //增项信息表
+        // 增项信息表
         formData: {
           Id: '',
           Step: 1,
@@ -324,37 +324,37 @@
           ProcessKey: '',
           SupplierId: 0,
           SupplierCertId: 0,
-          RecUnitFlag: '', //推荐单位的级联Id标记
-          RecUnitId: '', //推荐单位编码
-          RecUnitName: '', //推荐单位名称
-          AppendType: '', //增项类别(01 物资类，02 基建类，03 技术服务类)
-          Remark: '', //备注
+          RecUnitFlag: '', // 推荐单位的级联Id标记
+          RecUnitId: '', // 推荐单位编码
+          RecUnitName: '', // 推荐单位名称
+          AppendType: '', // 增项类别(01 物资类，02 基建类，03 技术服务类)
+          Remark: '' // 备注
         },
-        dialogVisible: false, //增项分办
+        dialogVisible: false, // 增项分办
         dialogTitle: '',
         dialogFormData: {
           Id: '',
-          SupplierId: 0, //供方表ID
-          SupplierCertId: 0, //供方证书表ID
-          SupplierCertAppendId: '', //增项信息表ID
-          SubClassId: 3, //分类表主键（物资类或基建类或技术服务类）
-          SortFlag: '', //分类标记
-          Code: '', //分类编码
-          Name: '', //分类名称
-          Remark: '', //备注
+          SupplierId: 0, // 供方表ID
+          SupplierCertId: 0, // 供方证书表ID
+          SupplierCertAppendId: '', // 增项信息表ID
+          SubClassId: 3, // 分类表主键（物资类或基建类或技术服务类）
+          SortFlag: '', // 分类标记
+          Code: '', // 分类编码
+          Name: '', // 分类名称
+          Remark: '' // 备注
         },
-        //列表数据
+        // 列表数据
         entityList: [],
-        //分页参数
+        // 分页参数
         size: 10,
         currentPage: 1,
         currentItemCount: 0,
-        //列表排序
+        // 列表排序
         Column: {
           Order: '',
           Prop: ''
         },
-        //增项表单规则
+        // 增项表单规则
         appendRules: {
           checkSelectedRecUnitName: [{
             required: true,
@@ -365,29 +365,29 @@
             required: true,
             validator: CheckSelectedOption3,
             trigger: 'blur'
-          }],
+          }]
         },
-        //增项分类表单规则
+        // 增项分类表单规则
         sortEntityFormRules: {
           checkSelectedOptList: [{
             required: true,
             validator: CheckSelectedOption2,
             trigger: 'blur'
-          }],
+          }]
         },
         shenheForm: {
           SuccessStatus: 1,
           AuditorRemark: '',
           AppendId: 0,
           Auditer: '',
-          MajorDept: '',
+          MajorDept: ''
         },
-        AppendId: '', //传的参数
+        AppendId: '', // 传的参数
         serviceId: '',
-        editFlag: '', //编辑操作标记
+        editFlag: '' // 编辑操作标记
       }
     },
-    created() {
+    created () {
       this.companyid = this.authUser.Profile.Superior
       // this.serviceType = this.$route.params.opera //获取服务类型
       this.serviceId = this.$route.params.opera
@@ -397,18 +397,18 @@
       this.dialogFormData.SupplierCertAppendId = this.AppendId
       this.getorgtreelist()
       this.getorgtreelistbydeptid()
-      this.getSupplierList() //获取供应方公司列表
+      this.getSupplierList() // 获取供应方公司列表
     },
     methods: {
-      //获取需要修改的增项信息
-      getEntityById() {
+      // 获取需要修改的增项信息
+      getEntityById () {
         let _this = this
         api2.getEntityById(_this.AppendId, _this.$axios).then(res => {
           _this.formData = res.data
           this.entrydetail.process = this.formData.ProcessKey
           this.entrydetail.business = _this.AppendId
-          this.entrydetail.instance = this.formData.WorkFlowId;
-          this.entrydetail.status = this.formData.Status
+          this.entrydetail.instance = this.formData.WorkFlowId
+        this.entrydetail.status = this.formData.Status
           if (_this.formData.Status === '1') {
             this.aduitlabel = '复审人员'
             this.auditTitle = '初审'
@@ -430,14 +430,14 @@
           this.getFileList()
           this.getDictOptions()
           this.isAccess()
-          //显示公司名
+          // 显示公司名
           _this.supplierOptions = _this.formData.SupplierId.toString()
         }).catch(err => {
           console.error(err)
         })
       },
 
-      isAccess() {
+      isAccess () {
         let params = {
           id: this.formData.Id,
           auditstepcode: this.auditstepcode,
@@ -450,11 +450,11 @@
         })
       },
 
-      //获取供应方公司列表
-      getSupplierList() {
+      // 获取供应方公司列表
+      getSupplierList () {
         let _this = this
         let params = {
-          SuppTypeCode: '03',
+          SuppTypeCode: '03'
         }
         _this.$axios.get('/suppliercertappend/getsupplier', {params})
           .then(res => {
@@ -477,8 +477,8 @@
           this.shenheForm.AuditorRemark = ''
         }
       },
-       //获取资质文件
-      getFileList() {
+      // 获取资质文件
+      getFileList () {
         this.SupplierId = this.formData.SupplierId
         this.SupplierTypeCode = this.formData.AppendType
         let _this = this
@@ -486,11 +486,11 @@
           SupplierId: this.SupplierId,
           SupplierTypeCode: this.SupplierTypeCode,
           _currentPage: 1,
-          _size: 1000,
+          _size: 1000
         }
         _this.$axios.get('supplierfile/filelistappend', {
-            params
-          })
+          params
+        })
           .then(res => {
             _this.subfileList = res.data.items
             _this.currentItemCount = res.data.currentItemCount
@@ -504,14 +504,14 @@
           })
       },
 
-      //审批历史
-      auhistory() {
+      // 审批历史
+      auhistory () {
         this.audithistoryshow = true
       },
 
-       //获取增项分类表
-      getSortList() {
-        //分页及列表条件
+      // 获取增项分类表
+      getSortList () {
+        // 分页及列表条件
         let params = {
           // _currentPage: this.currentPage,
           // _size: this.size,
@@ -519,11 +519,11 @@
           // Prop: this.Column.Prop,
           SupplierCertAppendId: this.dialogFormData.SupplierCertAppendId,
           SupCertId: this.formData.SupplierCertId,
-          SupTypeCode: "03",
-        };
+          SupTypeCode: '03'
+        }
 
-        //访问接口
-        api.getListAppend(params, this.$axios).then(res => {
+      //访问接口
+      api.getListAppend(params, this.$axios).then(res => {
           this.entityList = res.data.item
           // this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
@@ -531,7 +531,7 @@
         })
       },
 
-      AuditEntity() {
+      AuditEntity () {
         this.auditOrgChange()
         if (this.formData.Status === '3') {
           this.dialogAllocation = true
@@ -543,7 +543,7 @@
           this.dialogMakeSure = true
         }
       },
-      getDictOptions() {
+      getDictOptions () {
         let params = {
           status: this.formData.Status,
           majorAduit: this.formData.ThirdAudit
@@ -557,14 +557,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')
           })
@@ -572,14 +572,14 @@
             console.error(err)
           })
       },
-      getorgtreelistbydeptid() {
+      getorgtreelistbydeptid () {
         let _this = this
         let params = {
           IsInnerOrganize: 1
         }
         _this.$axios.get('organizes/listbydeptid', {
-            params
-          })
+          params
+        })
           .then(res => {
             _this.secorgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
           })
@@ -587,29 +587,29 @@
             console.error(err)
           })
       },
-      chooseAuditorShow() {
+      chooseAuditorShow () {
         this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
         this.chooseAuditorVisible = true
       },
-      setAuditer(val, name) {
+      setAuditer (val, name) {
         this.auditer = val
         this.auditerName = name
         this.chooseAuditorVisible = false
         this.auditOrgChang(this.auditer)
       },
-      auditOrgChang(val) {
-        let auditstepcode = "SECOND_TRIAL";
+      auditOrgChang (val) {
+        let auditstepcode = 'SECOND_TRIAL';
         suppapi
           .getAuditerByFirst(val, auditstepcode, this.$axios)
           .then(res => {
             this.secauditerOptions = res.data.item
           })
           .catch(err => {
-            console.error(err);
-          });
-      },
+            console.error(err)
+        })
+    },
 
-      auditOrgChange(val) {
+      auditOrgChange (val) {
         console.log(this.formData.Status, 'status')
         let auditstepcode = ''
         if (this.formData.Status === '1') {
@@ -632,7 +632,7 @@
         })
       },
       // 审核通过
-      makeSure() {
+      makeSure () {
         console.log(this.auditer)
         if (this.shenheForm.SuccessStatus === 1) {
           if ((!this.auditer || this.auditer === 0) && this.formData.Status !== '1' && this.formData.Status !== '2' &&
@@ -665,15 +665,15 @@
         this.checkstatus()
       },
 
-      checkstatus() {
+      checkstatus () {
         this.shenheForm.Auditer = this.auditer
         this.shenheForm.MajorDept = this.majorDept[this.majorDept.length - 1]
         let params = {
           FirstAuditName: this.auditer,
           SecondAudit: this.fushenauditer,
-          ThirdAudit: this.majorDept[this.majorDept.length - 1],
+          ThirdAudit: this.majorDept[this.majorDept.length - 1]
         }
-        console.log("---params",params)
+        console.log('---params', params)
         api2.auditEntityFir(this.formData.Id, params, this.shenheForm, this.$axios).then(res => {
           if (res.data.code === 0) {
             this.getEntityById()
@@ -695,14 +695,14 @@
           console.error(err)
         })
       },
-      fileurlcut(val, index) {
+      fileurlcut (val, index) {
         let fileurlall = val.split('$')[index]
-        let fileurl = fileurlall.split("|")
+        let fileurl = fileurlall.split('|')
         return fileurl[0]
       },
 
-      //列表排序功能
-      orderby(column) {
+      // 列表排序功能
+      orderby (column) {
         if (column.order == 'ascending') {
           this.Column.Order = 'asc'
         } else if (column.order == 'descending') {
@@ -710,18 +710,18 @@
         }
         this.Column.Prop = column.prop
       },
-      //分页功能
-      handleCurrentChange(value) {
+      // 分页功能
+      handleCurrentChange (value) {
         this.currentPage = value
         this.getSortList()
       },
-      handleSizeChange(value) {
+      handleSizeChange (value) {
         this.size = value
         this.currentPage = 1
         this.getSortList()
       },
 
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -732,8 +732,7 @@
           val = val.replace('T', ' ')
           return val.substring(0, 10)
         }
-      },
+      }
     }
   }
-
 </script>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/auditoperation.vue

@@ -19,7 +19,7 @@
               <el-step title="待入库"></el-step>
               <el-step title="完成"></el-step>
             </el-steps>
-            <el-button slot="reference" plain size="mini" style="margin-left: 8px">查看进度</el-button>
+            <!-- <el-button slot="reference" plain size="mini" style="margin-left: 8px">查看进度</el-button> -->
           </el-popover>
           <!-- <el-button type="primary" style="margin-left: 8px;" size="mini" @click="annualAudit()"
             v-if="AnnualStatus == 1 ||AnnualStatus == 2 ||AnnualStatus == 4">审核
@@ -242,8 +242,8 @@
   import {
     mapGetters
   } from 'vuex'
-  import annualapi from '@/api/oilsupplier/annualaudit';
-  import api from '@/api/oilsupplier/supplier'
+  import annualapi from '@/api/oilsupplier/annualaudit'
+import api from '@/api/oilsupplier/supplier'
   import apiCert from '@/api/oilsupplier/suppliercert'
   import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
   import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
@@ -258,7 +258,6 @@
   import SubfileList from '@/components/oilsupplier/subfilelist'
   import WfHistory from '@/components/workflow/wfmultihistory.vue'
 
-
   export default {
     computed: {
       ...mapGetters({
@@ -270,19 +269,19 @@
       WfHistory,
       SupplierCertEdit,
       SubfileList, // 选择企业资质
-      EquipmentList, //企业主要设备
-      PerformanceList, //近三年主要业绩列表
-      PatentList, //专利及专有技术列表
-      WinningList, //近三年省部级及以上获奖项目列表
-      BusinessList, //选择准入范围
+      EquipmentList, // 企业主要设备
+      PerformanceList, // 近三年主要业绩列表
+      PatentList, // 专利及专有技术列表
+      WinningList, // 近三年省部级及以上获奖项目列表
+      BusinessList, // 选择准入范围
       AuditbusList, // 待审核业务
-      TechInfo,
+      TechInfo
     },
     name: 'oiltechnologyserviceEdit',
 
-    data() {
+    data () {
       return {
-        auditBtn:false,
+        auditBtn: false,
         textplaceholder: '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）',
         audithistoryshow: false,
         dialogProfAudit: false,
@@ -292,14 +291,14 @@
         subfileList: [],
         majorDept: [],
         auditbusList: [], // 待审核业务
-        secauditerOptions: [], //专业审批人
-        secorgtreelist: [], //专业审核人部门
-        orgtreelist: [], //专业审核部门
-        equipmentList: [], //企业主要设备
-        performanceList: [], //近三年主要业绩
-        patentList: [], //专利及专有技术
-        winningList: [], //近三年省部级及以上获奖项目
-        businessList: [], //准入业务
+        secauditerOptions: [], // 专业审批人
+        secorgtreelist: [], // 专业审核人部门
+        orgtreelist: [], // 专业审核部门
+        equipmentList: [], // 企业主要设备
+        performanceList: [], // 近三年主要业绩
+        patentList: [], // 专利及专有技术
+        winningList: [], // 近三年省部级及以上获奖项目
+        businessList: [], // 准入业务
         serviceId: '',
         certId: '',
         classId: '',
@@ -385,7 +384,7 @@
           SupplierTypeCode: '',
           SupplierTypeName: '',
           Step: 0,
-          HseTraining: 0,
+          HseTraining: 0
         },
         AnnualStatus: '',
         dialogMakeSure: false,
@@ -420,13 +419,13 @@
           Status: ''
         },
         anndata: [],
-        auditstepcode: '',
+        auditstepcode: ''
       }
     },
-    created() {
+    created () {
       this.companyid = this.authUser.Profile.Superior
-      this.serviceId = this.$route.params.opera;
-      if (this.$route.query.certid) {
+      this.serviceId = this.$route.params.opera
+    if (this.$route.query.certid) {
         this.certId = this.$route.query.certid + ''
       }
 
@@ -434,15 +433,15 @@
       this.WorkflowId = this.$route.query.WorkflowId + ''
       this.annualId = this.$route.query.annualId
       this.Step = parseInt(this.$route.query.Step)
-      //this.getDictOptions()
+      // this.getDictOptions()
       this.formData.Id = this.serviceId
       this.initDatas()
       this.getorgtreelist()
       this.getannualdata()
-      //this.getorgtreelistbydeptid()
+      // this.getorgtreelistbydeptid()
     },
     methods: {
-      inputCompany(val) {
+      inputCompany (val) {
         if (!this.certId) {
           api.getEntityByName(val, this.$axios).then(res => {
             if (res.data && res.data.Id) {
@@ -453,11 +452,11 @@
           })
         }
       },
-      getannualdata() {
+      getannualdata () {
         annualapi.getEntity(this.annualId, this.$axios).then(res => {
           this.anndata = res.data
           if (this.anndata) {
-            console.log("--------",this.anndata)
+            console.log('--------', this.anndata)
             this.entrydetail.business = this.anndata.Id + ''
             this.entrydetail.instance = this.anndata.WorkflowId + ''
             this.entrydetail.Status = this.anndata.Status + ''
@@ -475,9 +474,9 @@
           this.isAccess()
         }).catch(err => {
           console.error(err)
-        });
-      },
-      isAccess() {
+        })
+    },
+      isAccess () {
         let params = {
           id: this.anndata.Id,
           auditstepcode: this.auditstepcode,
@@ -489,19 +488,19 @@
           console.log(err)
         })
       },
-      changeFormData(fdata) {
+      changeFormData (fdata) {
         if (!this.certId) {
           this.SetFormData(fdata)
         }
       },
-      radioChange() {
+      radioChange () {
         if (this.shenheForm.SuccessStatus === 1) {
           this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
         } else {
           this.textplaceholder = '退回意见不能少于5个字'
         }
       },
-      SetFormData(fdata) {
+      SetFormData (fdata) {
         this.isCanUpdateSupplier(fdata.Id)
         this.formData.Id = fdata.Id
         this.formData.SupplierName = fdata.SupplierName
@@ -548,40 +547,40 @@
         this.formData.CompanyUrl = fdata.CompanyUrl
         this.formData.HseTraining = fdata.HseTraining
         this.formData.SpecTypeCode = fdata.SpecTypeCode
-        this.$refs["TechInfo"].CityAry = []
-        this.$refs["TechInfo"].CityAry.push(this.formData.Province)
-        this.$refs["TechInfo"].CityAry.push(this.formData.City)
-        this.$refs["TechInfo"].CityAry.push(this.formData.Street)
-        this.$refs["TechInfo"].LinkCityAry = []
-        this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkProvince)
-        this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkCity)
-        this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkStreet)
-        this.$refs["TechInfo"].UnitRelationAry = []
+        this.$refs['TechInfo'].CityAry = []
+        this.$refs['TechInfo'].CityAry.push(this.formData.Province)
+        this.$refs['TechInfo'].CityAry.push(this.formData.City)
+        this.$refs['TechInfo'].CityAry.push(this.formData.Street)
+        this.$refs['TechInfo'].LinkCityAry = []
+        this.$refs['TechInfo'].LinkCityAry.push(this.formData.LinkProvince)
+        this.$refs['TechInfo'].LinkCityAry.push(this.formData.LinkCity)
+        this.$refs['TechInfo'].LinkCityAry.push(this.formData.LinkStreet)
+        this.$refs['TechInfo'].UnitRelationAry = []
         if (this.formData.SpecTypeCode.length > 0) {
-          this.$refs["TechInfo"].UnitRelationAry = this.formData.SpecTypeCode.split(',')
+          this.$refs['TechInfo'].UnitRelationAry = this.formData.SpecTypeCode.split(',')
         }
       },
 
-      isCanUpdateSupplier(supplierId) {
+      isCanUpdateSupplier (supplierId) {
         api.isCanUpdateSupplier(supplierId, this.$axios).then(res => {
           this.canUpdateSupplier = (res.data.code === 0)
         }).catch(err => {
           console.error(err)
         })
       },
-      equipmentdialog() {
-        this.$refs["equipmentList"].showDialog()
+      equipmentdialog () {
+        this.$refs['equipmentList'].showDialog()
       },
-      performancedialog() {
-        this.$refs["performanceList"].showDialog()
+      performancedialog () {
+        this.$refs['performanceList'].showDialog()
       },
-      patentdialog() {
-        this.$refs["patentList"].showDialog()
+      patentdialog () {
+        this.$refs['patentList'].showDialog()
       },
-      winningdialog() {
-        this.$refs["winningList"].showDialog()
+      winningdialog () {
+        this.$refs['winningList'].showDialog()
       },
-      initDatas() {
+      initDatas () {
         this.isCanUpdateSupplier(this.formData.Id)
         if (this.formData.Id) {
           api.getEntityAndCert(this.certId, this.$axios).then(res => {
@@ -598,17 +597,17 @@
             this.formDataCert.SkillerTotal = this.formData.SkillerTotal
             this.formDataCert.Status = this.formData.Status
             this.formDataCert.WorkflowId = this.formData.WorkflowId
-            this.$refs["TechInfo"].CityAry = []
-            this.$refs["TechInfo"].CityAry.push(this.formData.Province)
-            this.$refs["TechInfo"].CityAry.push(this.formData.City)
-            this.$refs["TechInfo"].CityAry.push(this.formData.Street)
-            this.$refs["TechInfo"].LinkCityAry = []
-            this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkProvince)
-            this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkCity)
-            this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkStreet)
-            this.$refs["TechInfo"].UnitRelationAry = []
+            this.$refs['TechInfo'].CityAry = []
+            this.$refs['TechInfo'].CityAry.push(this.formData.Province)
+            this.$refs['TechInfo'].CityAry.push(this.formData.City)
+            this.$refs['TechInfo'].CityAry.push(this.formData.Street)
+            this.$refs['TechInfo'].LinkCityAry = []
+            this.$refs['TechInfo'].LinkCityAry.push(this.formData.LinkProvince)
+            this.$refs['TechInfo'].LinkCityAry.push(this.formData.LinkCity)
+            this.$refs['TechInfo'].LinkCityAry.push(this.formData.LinkStreet)
+            this.$refs['TechInfo'].UnitRelationAry = []
             if (this.formData.SpecTypeCode.length > 0) {
-              this.$refs["TechInfo"].UnitRelationAry = this.formData.SpecTypeCode.split(',')
+              this.$refs['TechInfo'].UnitRelationAry = this.formData.SpecTypeCode.split(',')
             }
             this.$refs['equipmentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['performanceList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
@@ -617,53 +616,52 @@
             this.$refs['businessList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             if (this.certId && this.WorkflowId) {
-              this.$refs['WfHistory'].getHistoryTask() /*刷新工作流*/
+              this.$refs['WfHistory'].getHistoryTask() /* 刷新工作流*/
             }
-
           }).catch(err => {
             console.error(err)
-          });
-        }
+          })
+      }
       },
 
-      //审批历史
-      auhistory() {
+      // 审批历史
+      auhistory () {
         this.audithistoryshow = true
       },
 
-      getDictOptions() {
+      getDictOptions () {
         annualapi.getDictList(this.$axios).then(res => {
           this.dictData = res.data.items
         }).catch(err => {
           console.error(err)
         })
       },
-      getbuslist() {
+      getbuslist () {
         this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
       },
 
-      getorgtreelist() {
+      getorgtreelist () {
         let _this = this
         let params = {
           IsInnerOrganize: 1
         }
         api.getDictListByStatus(params, this.$axios).then(res => {
-            this.dictData = res.data.items
-            this.orgtreelist = window.toolfun_gettreejson(res.data.items['ProOrgList'], 'id', 'pId', 'id,name')
-          })
+          this.dictData = res.data.items
+          this.orgtreelist = window.toolfun_gettreejson(res.data.items['ProOrgList'], 'id', 'pId', 'id,name')
+        })
           .catch(err => {
             console.error(err)
           })
       },
 
-      getorgtreelistbydeptid() {
+      getorgtreelistbydeptid () {
         let _this = this
         let params = {
           IsInnerOrganize: 1
         }
         _this.$axios.get('organizes/listbydeptid', {
-            params
-          })
+          params
+        })
           .then(res => {
             _this.secorgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
           })
@@ -671,7 +669,7 @@
             console.error(err)
           })
       },
-      auditOrgChange() {
+      auditOrgChange () {
         let auditstepcode = 'PROF_AUDIT'
         api.getAuditerByDept(this.authUser.Profile.DepartmentId, auditstepcode, this.$axios).then(res => {
           this.secauditerOptions = res.data.item
@@ -680,17 +678,17 @@
         })
       },
 
-      annualAudit() {
+      annualAudit () {
         this.shenheForm.AnnualId = parseInt(this.annualId)
         this.dialogMakeSure = true
       },
-      profAudit() {
+      profAudit () {
         this.shenheForm.AnnualId = parseInt(this.annualId)
         this.auditOrgChange()
         this.dialogProfAudit = true
       },
-      //审核通过
-      makeSure() {
+      // 审核通过
+      makeSure () {
         if (this.shenheForm.SuccessStatus === 1) {
           if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3') {
             this.$message({
@@ -710,7 +708,7 @@
         }
         this.checkstatus()
       },
-      checkstatus() {
+      checkstatus () {
         this.shenheForm.SuccessStatus = parseInt(this.shenheForm.SuccessStatus)
         let params = this.shenheForm
         this.$axios.put('/annualaudit/auditfirst?ProfAudit=' + this.ProfAuditThen, params)
@@ -719,7 +717,7 @@
             if (res.data.code === 0) {
               this.$message({
                 type: 'success',
-                message: res.data.message,
+                message: res.data.message
               })
               this.getannualdata()
               this.dialogMakeSure = false
@@ -737,7 +735,7 @@
           })
       },
 
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -750,18 +748,17 @@
         }
       },
 
-      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>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/bassicoperation.vue

@@ -19,7 +19,7 @@
               <el-step title="供方交费"></el-step>
               <el-step title="完成"></el-step>
             </el-steps>
-            <el-button slot="reference" plain size="mini" style="margin-left: 8px">查看进度</el-button>
+            <!-- <el-button slot="reference" plain size="mini" style="margin-left: 8px">查看进度</el-button> -->
           </el-popover>
           <el-button type="primary" style="margin-left: 8px;" size="mini" @click="addshow =true" v-if="Status <= 0">提交审核</el-button>
           <router-link :to="'/oilsupplier/annualaudit/basicindex'">
@@ -254,8 +254,8 @@
     mapGetters
   } from 'vuex'
   import api from '@/api/oilsupplier/supplier'
-  import annualapi from '@/api/oilsupplier/annualaudit';
-  import apiCert from '@/api/oilsupplier/suppliercert'
+  import annualapi from '@/api/oilsupplier/annualaudit'
+import apiCert from '@/api/oilsupplier/suppliercert'
   import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
   import WfHistory from '@/components/workflow/wfmultihistory.vue'
   import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
@@ -270,7 +270,6 @@
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
   import SubfileList from '@/components/oilsupplier/subfilelist'
 
-
   export default {
     computed: {
       ...mapGetters({
@@ -281,11 +280,11 @@
       SupplierFileTable,
       SupplierCertEdit,
       SubfileList, // 选择企业资质
-      EquipmentList, //企业主要装备情况
-      PerformanceList, //近三年主要工程业绩列表
-      PatentList, //专利及专有技术列表
-      WinningList, //近三年省部级及以上获奖项目列表
-      BusinessList, //选择准入范围
+      EquipmentList, // 企业主要装备情况
+      PerformanceList, // 近三年主要工程业绩列表
+      PatentList, // 专利及专有技术列表
+      WinningList, // 近三年省部级及以上获奖项目列表
+      BusinessList, // 选择准入范围
       AuditbusList, // 待审核业务
       BasisInfo,
       WfBackHistory,
@@ -293,11 +292,11 @@
     },
     name: 'oiltechnologyserviceEdit',
 
-    data() {
+    data () {
       return {
         savebtn: true,
         visbtn: '1',
-        fushenauditer: '', //复审人员
+        fushenauditer: '', // 复审人员
         majorDept: [100000000, 100000128, 100000151],
         userOptions: [],
         secauditerOptions: [],
@@ -312,10 +311,10 @@
           children: 'children'
         },
         auditform: {
-          FirstAuditName: "",
-          SecondAudit: "",
-          ThirdAudit: "",
-          AnnualId:'',
+          FirstAuditName: '',
+          SecondAudit: '',
+          ThirdAudit: '',
+          AnnualId: ''
         },
         Step: '',
         subfileList: [], // 资质
@@ -327,11 +326,11 @@
         dictData: null,
         add_flat: true,
         applyLoading: false,
-        equipmentList: [], //企业主要装备情况
-        performanceList: [], //近三年主要工程业绩
-        patentList: [], //专利及专有技术
-        winningList: [], //近三年省部级及以上获奖项目
-        businessList: [], //准入业务
+        equipmentList: [], // 企业主要装备情况
+        performanceList: [], // 近三年主要工程业绩
+        patentList: [], // 专利及专有技术
+        winningList: [], // 近三年省部级及以上获奖项目
+        businessList: [], // 准入业务
         serviceId: '',
         certId: '',
         auditer: '',
@@ -423,7 +422,7 @@
           Step: 0,
           HseTraining: '0',
           AuditIndex: 0,
-          PACNumber: ""
+          PACNumber: ''
         },
 
         formDataCert: {
@@ -457,9 +456,9 @@
         }
       }
     },
-    created() {
-      this.serviceId = this.$route.params.opera;
-      if (this.$route.query.certid) {
+    created () {
+      this.serviceId = this.$route.params.opera
+    if (this.$route.query.certid) {
         this.certId = this.$route.query.certid + ''
       }
       this.Status = this.$route.query.Status + ''
@@ -470,7 +469,7 @@
       this.getDictOptions()
       this.formData.Id = this.serviceId
       this.initDatas()
-      if (this.Status <=1 ) {
+      if (this.Status <= 1) {
         this.savebtn = false
         this.canUpdateSupplier = true
       }
@@ -480,21 +479,21 @@
       this.orgtreeChange(this.majorDept)
     },
     methods: {
-      getstatus(annid) {
+      getstatus (annid) {
         annualapi.getEntity(annid, this.$axios)
           .then(res => {
-            this.formannData = res.data;
-            console.log("--forann-", this.formannData)
+            this.formannData = res.data
+          console.log('--forann-', this.formannData)
             this.Status = this.formannData.Status
             this.entrydetail.business = this.formannData.Id
             this.entrydetail.instance = this.formannData.WorkflowId
             this.entrydetail.Status = this.formannData.Status
           })
           .catch(err => {
-            console.error(err);
-          });
-      },
-      inputCompany(val) {
+            console.error(err)
+        })
+    },
+      inputCompany (val) {
         if (!this.certId) {
           api.getEntityByName(val, this.$axios).then(res => {
             if (res.data && res.data.Id) {
@@ -505,7 +504,7 @@
           })
         }
       },
-      changeFormData(fdata) {
+      changeFormData (fdata) {
         if (!this.certId) {
           this.SetFormData(fdata)
         }
@@ -518,7 +517,7 @@
       //     this.activeName = '1'
       //   }
       // },
-      SetFormData(fdata) {
+      SetFormData (fdata) {
         this.formData.Id = fdata.Id
         this.formData.SupplierName = fdata.SupplierName
         this.formData.OilCertificateNo = fdata.OilCertificateNo
@@ -565,40 +564,40 @@
         this.formData.HseTraining = fdata.HseTraining
         this.formData.SpecTypeCode = fdata.SpecTypeCode
 
-        this.$refs["BasisInfo"].CityAry = []
-        this.$refs["BasisInfo"].CityAry.push(this.formData.Province)
-        this.$refs["BasisInfo"].CityAry.push(this.formData.City)
-        this.$refs["BasisInfo"].CityAry.push(this.formData.Street)
-        this.$refs["BasisInfo"].LinkCityAry = []
-        this.$refs["BasisInfo"].LinkCityAry.push(this.formData.LinkProvince)
-        this.$refs["BasisInfo"].LinkCityAry.push(this.formData.LinkCity)
-        this.$refs["BasisInfo"].LinkCityAry.push(this.formData.LinkStreet)
-        this.$refs["BasisInfo"].UnitRelationAry = []
+        this.$refs['BasisInfo'].CityAry = []
+        this.$refs['BasisInfo'].CityAry.push(this.formData.Province)
+        this.$refs['BasisInfo'].CityAry.push(this.formData.City)
+        this.$refs['BasisInfo'].CityAry.push(this.formData.Street)
+        this.$refs['BasisInfo'].LinkCityAry = []
+        this.$refs['BasisInfo'].LinkCityAry.push(this.formData.LinkProvince)
+        this.$refs['BasisInfo'].LinkCityAry.push(this.formData.LinkCity)
+        this.$refs['BasisInfo'].LinkCityAry.push(this.formData.LinkStreet)
+        this.$refs['BasisInfo'].UnitRelationAry = []
         if (this.formData.SpecTypeCode.length > 0) {
-          this.$refs["BasisInfo"].UnitRelationAry = this.formData.SpecTypeCode.split(',')
+          this.$refs['BasisInfo'].UnitRelationAry = this.formData.SpecTypeCode.split(',')
         }
       },
-      getbuslist() {
+      getbuslist () {
         this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
       },
-      setAuditer(val, name) {
+      setAuditer (val, name) {
         this.auditer = val
         this.auditerName = name
         this.chooseAuditorVisible = false
       },
-      equipmentdialog() {
-        this.$refs["equipmentList"].showDialog()
+      equipmentdialog () {
+        this.$refs['equipmentList'].showDialog()
       },
-      performancedialog() {
-        this.$refs["performanceList"].showDialog()
+      performancedialog () {
+        this.$refs['performanceList'].showDialog()
       },
-      patentdialog() {
-        this.$refs["patentList"].showDialog()
+      patentdialog () {
+        this.$refs['patentList'].showDialog()
       },
-      winningdialog() {
-        this.$refs["winningList"].showDialog()
+      winningdialog () {
+        this.$refs['winningList'].showDialog()
       },
-      initDatas() {
+      initDatas () {
         if (this.formData.Id) {
           api.getEntityAndCert(this.certId, this.$axios).then(res => {
             this.formData = res.data
@@ -614,17 +613,17 @@
             this.formDataCert.SkillerTotal = this.formData.SkillerTotal
             this.formDataCert.Status = this.formData.Status
             this.formDataCert.WorkflowId = this.formData.WorkflowId
-            this.$refs["BasisInfo"].CityAry = []
-            this.$refs["BasisInfo"].CityAry.push(this.formData.Province)
-            this.$refs["BasisInfo"].CityAry.push(this.formData.City)
-            this.$refs["BasisInfo"].CityAry.push(this.formData.Street)
-            this.$refs["BasisInfo"].LinkCityAry = []
-            this.$refs["BasisInfo"].LinkCityAry.push(this.formData.LinkProvince)
-            this.$refs["BasisInfo"].LinkCityAry.push(this.formData.LinkCity)
-            this.$refs["BasisInfo"].LinkCityAry.push(this.formData.LinkStreet)
-            this.$refs["BasisInfo"].UnitRelationAry = []
+            this.$refs['BasisInfo'].CityAry = []
+            this.$refs['BasisInfo'].CityAry.push(this.formData.Province)
+            this.$refs['BasisInfo'].CityAry.push(this.formData.City)
+            this.$refs['BasisInfo'].CityAry.push(this.formData.Street)
+            this.$refs['BasisInfo'].LinkCityAry = []
+            this.$refs['BasisInfo'].LinkCityAry.push(this.formData.LinkProvince)
+            this.$refs['BasisInfo'].LinkCityAry.push(this.formData.LinkCity)
+            this.$refs['BasisInfo'].LinkCityAry.push(this.formData.LinkStreet)
+            this.$refs['BasisInfo'].UnitRelationAry = []
             if (this.formData.SpecTypeCode.length > 0) {
-              this.$refs["BasisInfo"].UnitRelationAry = this.formData.SpecTypeCode.split(',')
+              this.$refs['BasisInfo'].UnitRelationAry = this.formData.SpecTypeCode.split(',')
             }
             this.$refs['equipmentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['performanceList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
@@ -632,14 +631,13 @@
             this.$refs['winningList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['businessList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
-
           }).catch(err => {
             console.error(err)
-          });
-        }
+          })
+      }
       },
 
-      orgtreeChange(val) {
+      orgtreeChange (val) {
         this.userOptions = []
         let deptid = val[val.length - 1]
         let auditstepcode = 'PROF_RECE'
@@ -650,37 +648,37 @@
         })
       },
 
-      auditOrgChang(val) {
-        let auditstepcode = "SECOND_TRIAL";
+      auditOrgChang (val) {
+        let auditstepcode = 'SECOND_TRIAL';
         api
           .getAuditerByFirst(val, auditstepcode, this.$axios)
           .then(res => {
             this.secauditerOptions = res.data.item
           })
           .catch(err => {
-            console.error(err);
-          });
-      },
+            console.error(err)
+        })
+    },
 
-      chooseAuditorShow() {
+      chooseAuditorShow () {
         this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
         this.chooseAuditorVisible = true
       },
-      setAuditer(val, name) {
+      setAuditer (val, name) {
         this.auditer = val
         this.auditerName = name
         this.chooseAuditorVisible = false
         this.auditOrgChang(this.auditer)
       },
 
-      getDictOptions() {
+      getDictOptions () {
         let params = {
-          //status: this.formData.Status,
-          //majorAduit: this.formData.ThirdAudit
+          // status: this.formData.Status,
+          // majorAduit: this.formData.ThirdAudit
         }
         api.getDictListByStatus(params, this.$axios).then(res => {
           this.dictData = res.data.items
-          //this.organizeOption = res.data.items['Organizes']
+          // this.organizeOption = res.data.items['Organizes']
           this.orgtreelist = window.toolfun_gettreejson(res.data.items['ProOrgList'], 'id', 'pId', 'id,name')
           /* this.UnitRelationOptions = res.data.items['UnitRelation']
           this.getCityList(res.data.items['GaodeMapChinaAreas'])
@@ -690,14 +688,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')
           })
@@ -718,7 +716,7 @@
       // },
 
       // 保存信息
-      saveEntity() {
+      saveEntity () {
         let valid1 = false
         let valid2 = false
 
@@ -726,7 +724,7 @@
           valid1 = valid
         })
 
-        this.$refs["BasisInfo"].$refs["EntityFormCert"].validate(vvalid => {
+        this.$refs['BasisInfo'].$refs['EntityFormCert'].validate(vvalid => {
           valid2 = vvalid
         })
 
@@ -737,7 +735,7 @@
             this.formData.SetupTime = new Date(this.formData.SetupTime)
           }
           this.formData.RegCapital = parseFloat(this.formData.RegCapital)
-          this.formData.HseTraining = this.formData.HseTraining + ""
+          this.formData.HseTraining = this.formData.HseTraining + ''
           this.updateEntity()
           return true
         } else {
@@ -745,7 +743,7 @@
         }
       },
 
-      CheckCompanyBase() {
+      CheckCompanyBase () {
         if (!this.formData.Id) {
           this.$message({
             type: 'error',
@@ -763,10 +761,10 @@
         return true
       },
 
-      updateEntity() {
+      updateEntity () {
         annualapi.supupdateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
-            //更新子表
+            // 更新子表
             this.updateNumberEntity()
           } else {
             this.$message({
@@ -780,7 +778,7 @@
       },
 
       // 企业人员结构情况
-      updateNumberEntity() {
+      updateNumberEntity () {
         this.$refs['EntityFormNumber'].validate((valid) => {
           if (valid) {
             if (!this.CheckCompanyBase()) {
@@ -805,12 +803,12 @@
               console.error(err)
             })
           } else {
-            return false;
-          }
+            return false
+        }
         })
       },
 
-      addAnnualAudit() {
+      addAnnualAudit () {
         this.$refs['EntityFormref'].validate((valid) => {
           if (valid) {
             if (this.auditer === '') {
@@ -820,17 +818,17 @@
               })
               return
             }
-            if (this.fushenauditer === "") {
+            if (this.fushenauditer === '') {
               this.$message({
-                type: "warning",
-                message: "请选择复审人！"
+                type: 'warning',
+                message: '请选择复审人！'
               })
               return
             }
             if (this.majorDept.length === 0) {
               this.$message({
-                type: "warning",
-                message: "请选择专业处室！"
+                type: 'warning',
+                message: '请选择专业处室！'
               })
               return
             }
@@ -849,61 +847,60 @@
             this.auditform.AnnualId = this.annualId
             annualapi.commitauditEntity(this.entityForm, this.auditform, this.$axios).then(res => {
               if (res.data.code === 0) {
-                //保存成功后，初始化数据，变成修改
-                this.entityForm.Id = res.data.item;
-                this.getstatus(this.annualId)
-                //this.initDatas();
+                // 保存成功后，初始化数据，变成修改
+                this.entityForm.Id = res.data.item
+              this.getstatus(this.annualId)
+                // this.initDatas();
                 this.addshow = false
                 this.$message({
                   type: 'success',
                   message: res.data.message
-                });
+                })
 
-              } else {
+            } else {
                 this.$message({
                   type: 'warning',
                   message: res.data.message
-                });
-              }
+                })
+            }
             }).catch(err => {
               console.error(err)
-            });
-          }
+            })
+        }
         })
       },
 
-      //审批历史
-      auhistory() {
+      // 审批历史
+      auhistory () {
         this.audithistoryshow = true
       },
 
-      AuditEntity() {
+      AuditEntity () {
         this.applyLoading = true
         apiCert.auditEntity(this.certId, this.$axios).then(res => {
           if (res.data.code === 0) {
-            //保存成功后，初始化数据，变成修改
+            // 保存成功后，初始化数据，变成修改
             this.initDatas()
             this.$message({
               type: 'success',
               message: res.data.message
-            });
-          } else {
+            })
+        } else {
             this.$message({
               type: 'warning',
               message: res.data.message
-            });
-          }
+            })
+        }
           this.applyLoading = false
-
         }).catch(err => {
           console.error(err)
-        });
-      },
+        })
+    },
 
-      nexStepCB() {
+      nexStepCB () {
         this.Step += 1
       },
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -916,18 +913,17 @@
         }
       },
 
-      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>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/goodsoperation.vue

@@ -19,7 +19,7 @@
               <el-step title="供方交费"></el-step>
               <el-step title="完成"></el-step>
             </el-steps>
-            <el-button slot="reference" plain size="mini" style="margin-left: 8px">查看进度</el-button>
+            <!-- <el-button slot="reference" plain size="mini" style="margin-left: 8px">查看进度</el-button> -->
           </el-popover>
           <el-button type="primary" style="margin-left: 8px;" size="mini" @click="addshow =true" v-if="Status <= 0">
             提交审核</el-button>
@@ -258,8 +258,8 @@
     mapGetters
   } from 'vuex'
   import api from '@/api/oilsupplier/supplier'
-  import annualapi from '@/api/oilsupplier/annualaudit';
-  import apiCert from '@/api/oilsupplier/suppliercert'
+  import annualapi from '@/api/oilsupplier/annualaudit'
+import apiCert from '@/api/oilsupplier/suppliercert'
   import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
   import WfHistory from '@/components/workflow/wfmultihistory.vue'
   import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
@@ -269,13 +269,12 @@
   import PatentList from '@/components/oilsupplier/patentlist'
   import WinningList from '@/components/oilsupplier/winninglist'
   import BusinessList from '@/components/oilsupplier/businesslist'
-  import GoodsList from "@/components/oilsupplier/goodslist";
-  import GoodsInfo from "@/components/oilsupplier/goodsinfo";
+  import GoodsList from '@/components/oilsupplier/goodslist';
+  import GoodsInfo from '@/components/oilsupplier/goodsinfo';
   import AuditbusList from '@/components/oilsupplier/auditbuslist'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
   import SubfileList from '@/components/oilsupplier/subfilelist'
 
-
   export default {
     computed: {
       ...mapGetters({
@@ -288,23 +287,23 @@
       WfHistory,
       SupplierCertEdit,
       SubfileList, // 选择企业资质
-      EquipmentList, //企业主要装备情况
-      PerformanceList, //近三年主要工程业绩列表
-      PatentList, //专利及专有技术列表
-      WinningList, //近三年省部级及以上获奖项目列表
-      BusinessList, //选择准入范围
+      EquipmentList, // 企业主要装备情况
+      PerformanceList, // 近三年主要工程业绩列表
+      PatentList, // 专利及专有技术列表
+      WinningList, // 近三年省部级及以上获奖项目列表
+      BusinessList, // 选择准入范围
       AuditbusList, // 待审核业务
       GoodsInfo,
       ChooseAuditor
     },
     name: 'oiltechnologyserviceEdit',
 
-    data() {
+    data () {
       return {
         savebtn: true,
         visbtn: '1',
-        fushenauditer: '', //复审人员
-        majorDept: [100000000, 100000001, 100000071], //专业可是
+        fushenauditer: '', // 复审人员
+        majorDept: [100000000, 100000001, 100000071], // 专业可是
         secauditerOptions: [],
         formannData: {},
         audithistoryshow: false,
@@ -317,10 +316,10 @@
           children: 'children'
         },
         auditform: {
-          FirstAuditName: "",
-          SecondAudit: "",
-          ThirdAudit: "",
-          AnnualId:'',
+          FirstAuditName: '',
+          SecondAudit: '',
+          ThirdAudit: '',
+          AnnualId: ''
         },
         Step: '',
         goodsList: [], // 准入业务
@@ -334,11 +333,11 @@
         dictData: null,
         add_flat: true,
         applyLoading: false,
-        equipmentList: [], //企业主要装备情况
-        performanceList: [], //近三年主要工程业绩
-        patentList: [], //专利及专有技术
-        winningList: [], //近三年省部级及以上获奖项目
-        businessList: [], //准入业务
+        equipmentList: [], // 企业主要装备情况
+        performanceList: [], // 近三年主要工程业绩
+        patentList: [], // 专利及专有技术
+        winningList: [], // 近三年省部级及以上获奖项目
+        businessList: [], // 准入业务
         serviceId: '',
         certId: '',
         auditer: '',
@@ -430,7 +429,7 @@
           Step: 0,
           HseTraining: '0',
           AuditIndex: 0,
-          PACNumber: ""
+          PACNumber: ''
         },
 
         formDataCert: {
@@ -464,9 +463,9 @@
         }
       }
     },
-    created() {
-      this.serviceId = this.$route.params.opera;
-      if (this.$route.query.certid) {
+    created () {
+      this.serviceId = this.$route.params.opera
+    if (this.$route.query.certid) {
         this.certId = this.$route.query.certid + ''
       }
       this.Status = this.$route.query.Status + ''
@@ -488,21 +487,21 @@
       this.orgtreeChange(this.majorDept)
     },
     methods: {
-      getstatus(annid) {
+      getstatus (annid) {
         annualapi.getEntity(annid, this.$axios)
           .then(res => {
-            this.formannData = res.data;
-            console.log("--forann-", this.formannData)
+            this.formannData = res.data
+          console.log('--forann-', this.formannData)
             this.Status = this.formannData.Status
             this.entrydetail.business = this.formannData.Id
             this.entrydetail.instance = this.formannData.WorkflowId
             this.entrydetail.Status = this.formannData.Status
           })
           .catch(err => {
-            console.error(err);
-          });
-      },
-      inputCompany(val) {
+            console.error(err)
+        })
+    },
+      inputCompany (val) {
         if (!this.certId) {
           api.getEntityByName(val, this.$axios).then(res => {
             if (res.data && res.data.Id) {
@@ -513,7 +512,7 @@
           })
         }
       },
-      changeFormData(fdata) {
+      changeFormData (fdata) {
         if (!this.certId) {
           this.SetFormData(fdata)
         }
@@ -526,7 +525,7 @@
       //     this.activeName = '1'
       //   }
       // },
-      SetFormData(fdata) {
+      SetFormData (fdata) {
         this.formData.Id = fdata.Id
         this.formData.SupplierName = fdata.SupplierName
         this.formData.OilCertificateNo = fdata.OilCertificateNo
@@ -573,18 +572,18 @@
         this.formData.HseTraining = fdata.HseTraining
         this.formData.SpecTypeCode = fdata.SpecTypeCode
 
-        this.$refs["GoodsInfo"].CityAry = []
-        this.$refs["GoodsInfo"].CityAry.push(this.formData.Province)
-        this.$refs["GoodsInfo"].CityAry.push(this.formData.City)
-        this.$refs["GoodsInfo"].CityAry.push(this.formData.Street)
-        this.$refs["GoodsInfo"].LinkCityAry = []
-        this.$refs["GoodsInfo"].LinkCityAry.push(this.formData.LinkProvince)
-        this.$refs["GoodsInfo"].LinkCityAry.push(this.formData.LinkCity)
-        this.$refs["GoodsInfo"].LinkCityAry.push(this.formData.LinkStreet)
-        this.$refs["GoodsInfo"].UnitRelationAry = []
+        this.$refs['GoodsInfo'].CityAry = []
+        this.$refs['GoodsInfo'].CityAry.push(this.formData.Province)
+        this.$refs['GoodsInfo'].CityAry.push(this.formData.City)
+        this.$refs['GoodsInfo'].CityAry.push(this.formData.Street)
+        this.$refs['GoodsInfo'].LinkCityAry = []
+        this.$refs['GoodsInfo'].LinkCityAry.push(this.formData.LinkProvince)
+        this.$refs['GoodsInfo'].LinkCityAry.push(this.formData.LinkCity)
+        this.$refs['GoodsInfo'].LinkCityAry.push(this.formData.LinkStreet)
+        this.$refs['GoodsInfo'].UnitRelationAry = []
       },
 
-      CheckCompanyBase() {
+      CheckCompanyBase () {
         if (!this.formData.Id) {
           this.$message({
             type: 'error',
@@ -601,27 +600,27 @@
         }
         return true
       },
-      getbuslist() {
+      getbuslist () {
         this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
       },
-      setAuditer(val, name) {
+      setAuditer (val, name) {
         this.auditer = val
         this.auditerName = name
         this.chooseAuditorVisible = false
       },
-      equipmentdialog() {
-        this.$refs["equipmentList"].showDialog()
+      equipmentdialog () {
+        this.$refs['equipmentList'].showDialog()
       },
-      performancedialog() {
-        this.$refs["performanceList"].showDialog()
+      performancedialog () {
+        this.$refs['performanceList'].showDialog()
       },
-      patentdialog() {
-        this.$refs["patentList"].showDialog()
+      patentdialog () {
+        this.$refs['patentList'].showDialog()
       },
-      winningdialog() {
-        this.$refs["winningList"].showDialog()
+      winningdialog () {
+        this.$refs['winningList'].showDialog()
       },
-      initDatas() {
+      initDatas () {
         console.log(this.formData.Id, 'this.formData.Id')
         if (this.formData.Id) {
           api.getEntityAndCert(this.certId, this.$axios).then(res => {
@@ -638,15 +637,15 @@
             this.formDataCert.SkillerTotal = this.formData.SkillerTotal
             this.formDataCert.Status = this.formData.Status
             this.formDataCert.WorkflowId = this.formData.WorkflowId
-            this.$refs["GoodsInfo"].CityAry = []
-            this.$refs["GoodsInfo"].CityAry.push(this.formData.Province)
-            this.$refs["GoodsInfo"].CityAry.push(this.formData.City)
-            this.$refs["GoodsInfo"].CityAry.push(this.formData.Street)
-            this.$refs["GoodsInfo"].LinkCityAry = []
-            this.$refs["GoodsInfo"].LinkCityAry.push(this.formData.LinkProvince)
-            this.$refs["GoodsInfo"].LinkCityAry.push(this.formData.LinkCity)
-            this.$refs["GoodsInfo"].LinkCityAry.push(this.formData.LinkStreet)
-            this.$refs["GoodsInfo"].UnitRelationAry = []
+            this.$refs['GoodsInfo'].CityAry = []
+            this.$refs['GoodsInfo'].CityAry.push(this.formData.Province)
+            this.$refs['GoodsInfo'].CityAry.push(this.formData.City)
+            this.$refs['GoodsInfo'].CityAry.push(this.formData.Street)
+            this.$refs['GoodsInfo'].LinkCityAry = []
+            this.$refs['GoodsInfo'].LinkCityAry.push(this.formData.LinkProvince)
+            this.$refs['GoodsInfo'].LinkCityAry.push(this.formData.LinkCity)
+            this.$refs['GoodsInfo'].LinkCityAry.push(this.formData.LinkStreet)
+            this.$refs['GoodsInfo'].UnitRelationAry = []
             this.$refs['equipmentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['performanceList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['patentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
@@ -654,59 +653,58 @@
             this.$refs['businessList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             if (this.certId && this.WorkflowId) {
-              this.$refs['WfHistory'].getHistoryTask() /*刷新工作流*/
+              this.$refs['WfHistory'].getHistoryTask() /*刷新工作流 */
             }
-
           }).catch(err => {
             console.error(err)
-          });
-        }
+          })
+      }
       },
 
-      orgtreeChange(val) {
+      orgtreeChange (val) {
         this.userOptions = []
-        if(val){
-        let deptid = val[val.length - 1]
-        let auditstepcode = 'PROF_RECE'
-        api.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
-          this.userOptions = res.data.item
-        }).catch(err => {
-          console.error(err)
-        })
+        if (val) {
+          let deptid = val[val.length - 1]
+          let auditstepcode = 'PROF_RECE'
+          api.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+            this.userOptions = res.data.item
+          }).catch(err => {
+            console.error(err)
+          })
         }
       },
 
-      auditOrgChang(val) {
-        let auditstepcode = "SECOND_TRIAL";
+      auditOrgChang (val) {
+        let auditstepcode = 'SECOND_TRIAL';
         api
           .getAuditerByFirst(val, auditstepcode, this.$axios)
           .then(res => {
             this.secauditerOptions = res.data.item
           })
           .catch(err => {
-            console.error(err);
-          });
-      },
+            console.error(err)
+        })
+    },
 
-      chooseAuditorShow() {
+      chooseAuditorShow () {
         this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
         this.chooseAuditorVisible = true
       },
-      setAuditer(val, name) {
+      setAuditer (val, name) {
         this.auditer = val
         this.auditerName = name
         this.chooseAuditorVisible = false
         this.auditOrgChang(this.auditer)
       },
 
-      getDictOptions() {
+      getDictOptions () {
         let params = {
-          //status: this.formData.Status,
-          //majorAduit: this.formData.ThirdAudit
+          // status: this.formData.Status,
+          // majorAduit: this.formData.ThirdAudit
         }
         api.getDictListByStatus(params, this.$axios).then(res => {
           this.dictData = res.data.items
-          //this.organizeOption = res.data.items['Organizes']
+          // this.organizeOption = res.data.items['Organizes']
           this.orgtreelist = window.toolfun_gettreejson(res.data.items['ProOrgList'], 'id', 'pId', 'id,name')
           /* this.UnitRelationOptions = res.data.items['UnitRelation']
           this.getCityList(res.data.items['GaodeMapChinaAreas'])
@@ -716,15 +714,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')
           })
@@ -745,7 +742,7 @@
       // },
 
       // 保存信息
-      saveEntity() {
+      saveEntity () {
         let valid1 = false
         let valid2 = false
         this.$refs['GoodsInfo'].$refs['EntityForm'].validate((valid) => {
@@ -755,7 +752,7 @@
         this.$refs['GoodsInfo'].$refs['EntityFormCert'].validate((valid) => {
           valid2 = valid
         })
-        
+  
 
         if (valid1 && valid2) {
           if (!this.formData.SetupTime) {
@@ -764,7 +761,7 @@
             this.formData.SetupTime = new Date(this.formData.SetupTime)
           }
           this.formData.RegCapital = parseFloat(this.formData.RegCapital)
-          this.formData.HseTraining = this.formData.HseTraining + ""
+          this.formData.HseTraining = this.formData.HseTraining + ''
           this.updateEntity()
           return true
         } else {
@@ -772,11 +769,11 @@
         }
       },
 
-      updateEntity() {
-        console.log("-----this.formData------",this.formData)
+      updateEntity () {
+        console.log('-----this.formData------', this.formData)
         annualapi.supupdateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
-            //更新子表
+            // 更新子表
             this.updateNumberEntity()
           } else {
             this.$message({
@@ -790,7 +787,7 @@
       },
 
       // 企业人员结构情况
-      updateNumberEntity() {
+      updateNumberEntity () {
         this.$refs['EntityFormNumber'].validate((valid) => {
           if (valid) {
             if (!this.CheckCompanyBase()) {
@@ -798,30 +795,30 @@
             }
             this.formDataCert.InStyle = this.formData.InStyle
             api.updateNumberEntity(this.formData.Id + '_' + this.certId, this.formDataCert, this.$axios).then(
-            res => {
-              if (res.data.code === 0) {
+              res => {
+                if (res.data.code === 0) {
                 // 保存成功后，初始化数据，变成修改
-                this.initDatas()
-                this.$message({
-                  type: 'success',
-                  message: res.data.message
-                })
-              } else {
-                this.$message({
-                  type: 'warning',
-                  message: res.data.message
-                })
-              }
-            }).catch(err => {
+                  this.initDatas()
+                  this.$message({
+                    type: 'success',
+                    message: res.data.message
+                  })
+                } else {
+                  this.$message({
+                    type: 'warning',
+                    message: res.data.message
+                  })
+                }
+              }).catch(err => {
               console.error(err)
             })
           } else {
-            return false;
-          }
+            return false
+        }
         })
       },
 
-      addAnnualAudit() {
+      addAnnualAudit () {
         this.$refs['EntityFormref'].validate((valid) => {
           if (valid) {
             if (this.auditer === '') {
@@ -831,17 +828,17 @@
               })
               return
             }
-            if (this.fushenauditer === "") {
+            if (this.fushenauditer === '') {
               this.$message({
-                type: "warning",
-                message: "请选择复审人！"
+                type: 'warning',
+                message: '请选择复审人！'
               })
               return
             }
             if (this.majorDept.length === 0) {
               this.$message({
-                type: "warning",
-                message: "请选择专业处室！"
+                type: 'warning',
+                message: '请选择专业处室！'
               })
               return
             }
@@ -860,62 +857,61 @@
             this.auditform.AnnualId = this.annualId
             annualapi.commitauditEntity(this.entityForm, this.auditform, this.$axios).then(res => {
               if (res.data.code === 0) {
-                //保存成功后，初始化数据，变成修改
-                this.Status = res.data.item;
-                this.entityForm.Status = this.Status
-                //this.initDatas();
+                // 保存成功后，初始化数据，变成修改
+                this.Status = res.data.item
+              this.entityForm.Status = this.Status
+                // this.initDatas();
                 this.getstatus(this.annualId)
                 this.addshow = false
                 this.$message({
                   type: 'success',
                   message: res.data.message
-                });
+                })
 
-              } else {
+            } else {
                 this.$message({
                   type: 'warning',
                   message: res.data.message
-                });
-              }
+                })
+            }
             }).catch(err => {
               console.error(err)
-            });
-          }
+            })
+        }
         })
       },
 
-      //审批历史
-      auhistory() {
+      // 审批历史
+      auhistory () {
         this.audithistoryshow = true
       },
 
-      AuditEntity() {
+      AuditEntity () {
         this.applyLoading = true
         apiCert.auditEntity(this.certId, this.$axios).then(res => {
           if (res.data.code === 0) {
-            //保存成功后，初始化数据，变成修改
+            // 保存成功后，初始化数据，变成修改
             this.initDatas()
             this.$message({
               type: 'success',
               message: res.data.message
-            });
-          } else {
+            })
+        } else {
             this.$message({
               type: 'warning',
               message: res.data.message
-            });
-          }
+            })
+        }
           this.applyLoading = false
-
         }).catch(err => {
           console.error(err)
-        });
-      },
+        })
+    },
 
-      nexStepCB() {
+      nexStepCB () {
         this.Step += 1
       },
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -928,18 +924,17 @@
         }
       },
 
-      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>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/operation.vue

@@ -19,7 +19,7 @@
               <el-step title="供方交费"></el-step>
               <el-step title="完成"></el-step>
             </el-steps>
-            <el-button slot="reference" plain size="mini" style="margin-left: 8px">查看进度</el-button>
+            <!-- <el-button slot="reference" plain size="mini" style="margin-left: 8px">查看进度</el-button> -->
           </el-popover>
           <el-button type="primary" style="margin-left: 8px;" size="mini" @click="addshow =true" v-if="Status <= 0">
             提交审核</el-button>
@@ -259,8 +259,8 @@
     mapGetters
   } from 'vuex'
   import api from '@/api/oilsupplier/supplier'
-  import annualapi from '@/api/oilsupplier/annualaudit';
-  import apiCert from '@/api/oilsupplier/suppliercert'
+  import annualapi from '@/api/oilsupplier/annualaudit'
+import apiCert from '@/api/oilsupplier/suppliercert'
   import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
   import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
   import WfHistory from '@/components/workflow/wfmultihistory.vue'
@@ -275,7 +275,6 @@
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
   import SubfileList from '@/components/oilsupplier/subfilelist'
 
-
   export default {
     computed: {
       ...mapGetters({
@@ -287,22 +286,22 @@
       WfHistory,
       SupplierCertEdit,
       SubfileList, // 选择企业资质
-      EquipmentList, //企业主要设备
-      PerformanceList, //近三年主要业绩列表
-      PatentList, //专利及专有技术列表
-      WinningList, //近三年省部级及以上获奖项目列表
-      BusinessList, //选择准入范围
+      EquipmentList, // 企业主要设备
+      PerformanceList, // 近三年主要业绩列表
+      PatentList, // 专利及专有技术列表
+      WinningList, // 近三年省部级及以上获奖项目列表
+      BusinessList, // 选择准入范围
       AuditbusList, // 待审核业务
       TechInfo,
       ChooseAuditor
     },
     name: 'oiltechnologyserviceEdit',
 
-    data() {
+    data () {
       return {
         savebtn: true,
         visbtn: '1',
-        fushenauditer: '', //复审人员
+        fushenauditer: '', // 复审人员
         userOptions: [],
         majorDept: [],
         secauditerOptions: [],
@@ -311,10 +310,10 @@
         activeName: '0',
         orgtreelist: [],
         auditform: {
-          FirstAuditName: "",
-          SecondAudit: "",
-          ThirdAudit: "",
-          AnnualId: '',
+          FirstAuditName: '',
+          SecondAudit: '',
+          ThirdAudit: '',
+          AnnualId: ''
         },
         orgtreeprops: {
           value: 'id',
@@ -330,11 +329,11 @@
         dictData: null,
         add_flat: true,
         applyLoading: false,
-        equipmentList: [], //企业主要设备
-        performanceList: [], //近三年主要业绩
-        patentList: [], //专利及专有技术
-        winningList: [], //近三年省部级及以上获奖项目
-        businessList: [], //准入业务
+        equipmentList: [], // 企业主要设备
+        performanceList: [], // 近三年主要业绩
+        patentList: [], // 专利及专有技术
+        winningList: [], // 近三年省部级及以上获奖项目
+        businessList: [], // 准入业务
         serviceId: '',
         certId: '',
         auditer: '',
@@ -427,7 +426,7 @@
           Step: 0,
           HseTraining: '0',
           AuditIndex: 0,
-          PACNumber: ""
+          PACNumber: ''
         },
 
         formDataCert: {
@@ -461,9 +460,9 @@
         }
       }
     },
-    created() {
-      this.serviceId = this.$route.params.opera;
-      if (this.$route.query.certid) {
+    created () {
+      this.serviceId = this.$route.params.opera
+    if (this.$route.query.certid) {
         this.certId = this.$route.query.certid + ''
       }
       this.annualId = this.$route.query.annualId
@@ -484,20 +483,20 @@
       this.orgtreeChange(this.majorDept)
     },
     methods: {
-      getstatus(annid) {
+      getstatus (annid) {
         annualapi.getEntity(annid, this.$axios)
           .then(res => {
-            this.formannData = res.data;
-            this.Status = this.formannData.Status
+            this.formannData = res.data
+          this.Status = this.formannData.Status
             this.entrydetail.business = this.formannData.Id
             this.entrydetail.instance = this.formannData.WorkflowId
             this.entrydetail.Status = this.formannData.Status
           })
           .catch(err => {
-            console.error(err);
-          });
-      },
-      inputCompany(val) {
+            console.error(err)
+        })
+    },
+      inputCompany (val) {
         if (!this.certId) {
           api.getEntityByName(val, this.$axios).then(res => {
             if (res.data && res.data.Id) {
@@ -508,7 +507,7 @@
           })
         }
       },
-      changeFormData(fdata) {
+      changeFormData (fdata) {
         if (!this.certId) {
           this.SetFormData(fdata)
         }
@@ -521,7 +520,7 @@
       //     this.activeName = '1'
       //   }
       // },
-      SetFormData(fdata) {
+      SetFormData (fdata) {
         this.formData.Id = fdata.Id
         this.formData.SupplierName = fdata.SupplierName
         this.formData.OilCertificateNo = fdata.OilCertificateNo
@@ -568,40 +567,40 @@
         this.formData.HseTraining = fdata.HseTraining
         this.formData.SpecTypeCode = fdata.SpecTypeCode
 
-        this.$refs["TechInfo"].CityAry = []
-        this.$refs["TechInfo"].CityAry.push(this.formData.Province)
-        this.$refs["TechInfo"].CityAry.push(this.formData.City)
-        this.$refs["TechInfo"].CityAry.push(this.formData.Street)
-        this.$refs["TechInfo"].LinkCityAry = []
-        this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkProvince)
-        this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkCity)
-        this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkStreet)
-        this.$refs["TechInfo"].UnitRelationAry = []
+        this.$refs['TechInfo'].CityAry = []
+        this.$refs['TechInfo'].CityAry.push(this.formData.Province)
+        this.$refs['TechInfo'].CityAry.push(this.formData.City)
+        this.$refs['TechInfo'].CityAry.push(this.formData.Street)
+        this.$refs['TechInfo'].LinkCityAry = []
+        this.$refs['TechInfo'].LinkCityAry.push(this.formData.LinkProvince)
+        this.$refs['TechInfo'].LinkCityAry.push(this.formData.LinkCity)
+        this.$refs['TechInfo'].LinkCityAry.push(this.formData.LinkStreet)
+        this.$refs['TechInfo'].UnitRelationAry = []
         if (this.formData.SpecTypeCode.length > 0) {
-          this.$refs["TechInfo"].UnitRelationAry = this.formData.SpecTypeCode.split(',')
+          this.$refs['TechInfo'].UnitRelationAry = this.formData.SpecTypeCode.split(',')
         }
       },
-      getbuslist() {
+      getbuslist () {
         this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
       },
-      setAuditer(val, name) {
+      setAuditer (val, name) {
         this.auditer = val
         this.auditerName = name
         this.chooseAuditorVisible = false
       },
-      equipmentdialog() {
-        this.$refs["equipmentList"].showDialog()
+      equipmentdialog () {
+        this.$refs['equipmentList'].showDialog()
       },
-      performancedialog() {
-        this.$refs["performanceList"].showDialog()
+      performancedialog () {
+        this.$refs['performanceList'].showDialog()
       },
-      patentdialog() {
-        this.$refs["patentList"].showDialog()
+      patentdialog () {
+        this.$refs['patentList'].showDialog()
       },
-      winningdialog() {
-        this.$refs["winningList"].showDialog()
+      winningdialog () {
+        this.$refs['winningList'].showDialog()
       },
-      initDatas() {
+      initDatas () {
         if (this.formData.Id) {
           api.getEntityAndCert(this.certId, this.$axios).then(res => {
             this.formData = res.data
@@ -617,17 +616,17 @@
             this.formDataCert.SkillerTotal = this.formData.SkillerTotal
             this.formDataCert.Status = this.formData.Status
             this.formDataCert.WorkflowId = this.formData.WorkflowId
-            this.$refs["TechInfo"].CityAry = []
-            this.$refs["TechInfo"].CityAry.push(this.formData.Province)
-            this.$refs["TechInfo"].CityAry.push(this.formData.City)
-            this.$refs["TechInfo"].CityAry.push(this.formData.Street)
-            this.$refs["TechInfo"].LinkCityAry = []
-            this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkProvince)
-            this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkCity)
-            this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkStreet)
-            this.$refs["TechInfo"].UnitRelationAry = []
+            this.$refs['TechInfo'].CityAry = []
+            this.$refs['TechInfo'].CityAry.push(this.formData.Province)
+            this.$refs['TechInfo'].CityAry.push(this.formData.City)
+            this.$refs['TechInfo'].CityAry.push(this.formData.Street)
+            this.$refs['TechInfo'].LinkCityAry = []
+            this.$refs['TechInfo'].LinkCityAry.push(this.formData.LinkProvince)
+            this.$refs['TechInfo'].LinkCityAry.push(this.formData.LinkCity)
+            this.$refs['TechInfo'].LinkCityAry.push(this.formData.LinkStreet)
+            this.$refs['TechInfo'].UnitRelationAry = []
             if (this.formData.SpecTypeCode.length > 0) {
-              this.$refs["TechInfo"].UnitRelationAry = this.formData.SpecTypeCode.split(',')
+              this.$refs['TechInfo'].UnitRelationAry = this.formData.SpecTypeCode.split(',')
             }
             this.$refs['equipmentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['performanceList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
@@ -636,16 +635,15 @@
             this.$refs['businessList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             if (this.certId && this.WorkflowId) {
-              this.$refs['WfHistory'].getHistoryTask() /*刷新工作流*/
+              this.$refs['WfHistory'].getHistoryTask() /* 刷新工作流*/
             }
-
           }).catch(err => {
             console.error(err)
-          });
-        }
+          })
+      }
       },
 
-      orgtreeChange(val) {
+      orgtreeChange (val) {
         this.userOptions = []
         let deptid = val[val.length - 1]
         let auditstepcode = 'PROF_RECE'
@@ -656,37 +654,37 @@
         })
       },
 
-      auditOrgChang(val) {
-        let auditstepcode = "SECOND_TRIAL";
+      auditOrgChang (val) {
+        let auditstepcode = 'SECOND_TRIAL';
         api
           .getAuditerByFirst(val, auditstepcode, this.$axios)
           .then(res => {
             this.secauditerOptions = res.data.item
           })
           .catch(err => {
-            console.error(err);
-          });
-      },
+            console.error(err)
+        })
+    },
 
-      chooseAuditorShow() {
+      chooseAuditorShow () {
         this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
         this.chooseAuditorVisible = true
       },
-      setAuditer(val, name) {
+      setAuditer (val, name) {
         this.auditer = val
         this.auditerName = name
         this.chooseAuditorVisible = false
         this.auditOrgChang(this.auditer)
       },
 
-      getDictOptions() {
+      getDictOptions () {
         let params = {
           status: this.formData.Status,
           majorAduit: this.formData.ThirdAudit
         }
         api.getDictListByStatus(params, this.$axios).then(res => {
           this.dictData = res.data.items
-          //this.organizeOption = res.data.items['Organizes']
+          // this.organizeOption = res.data.items['Organizes']
           this.orgtreelist = window.toolfun_gettreejson(res.data.items['ProOrgList'], 'id', 'pId', 'id,name')
           /* this.UnitRelationOptions = res.data.items['UnitRelation']
           this.getCityList(res.data.items['GaodeMapChinaAreas'])
@@ -696,14 +694,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')
           })
@@ -713,7 +711,7 @@
       },
 
       // 保存信息
-      saveEntity() {
+      saveEntity () {
         let valid1 = false
         let valid2 = false
 
@@ -721,7 +719,7 @@
           valid1 = valid
         })
 
-        this.$refs["TechInfo"].$refs["EntityFormCert"].validate(vvalid => {
+        this.$refs['TechInfo'].$refs['EntityFormCert'].validate(vvalid => {
           valid2 = vvalid
         })
 
@@ -732,7 +730,7 @@
             this.formData.SetupTime = new Date(this.formData.SetupTime)
           }
           this.formData.RegCapital = parseFloat(this.formData.RegCapital)
-          this.formData.HseTraining = this.formData.HseTraining + ""
+          this.formData.HseTraining = this.formData.HseTraining + ''
           this.updateEntity()
           return true
         } else {
@@ -740,10 +738,10 @@
         }
       },
 
-      updateEntity() {
+      updateEntity () {
         annualapi.supupdateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
-            //更新子表
+            // 更新子表
             this.updateNumberEntity()
           } else {
             this.$message({
@@ -757,7 +755,7 @@
       },
 
       // 企业人员结构情况
-      updateNumberEntity() {
+      updateNumberEntity () {
         this.$refs['EntityFormNumber'].validate((valid) => {
           if (valid) {
             if (!this.CheckCompanyBase()) {
@@ -783,12 +781,12 @@
               console.error(err)
             })
           } else {
-            return false;
-          }
+            return false
+        }
         })
       },
 
-      CheckCompanyBase() {
+      CheckCompanyBase () {
         if (!this.formData.Id) {
           this.$message({
             type: 'error',
@@ -806,7 +804,7 @@
         return true
       },
 
-      addAnnualAudit() {
+      addAnnualAudit () {
         this.$refs['EntityFormref'].validate((valid) => {
           if (valid) {
             if (this.auditer === '') {
@@ -816,17 +814,17 @@
               })
               return
             }
-            if (this.fushenauditer === "") {
+            if (this.fushenauditer === '') {
               this.$message({
-                type: "warning",
-                message: "请选择复审人！"
+                type: 'warning',
+                message: '请选择复审人！'
               })
               return
             }
             if (this.majorDept.length === 0) {
               this.$message({
-                type: "warning",
-                message: "请选择专业处室！"
+                type: 'warning',
+                message: '请选择专业处室！'
               })
               return
             }
@@ -845,61 +843,60 @@
             this.auditform.AnnualId = this.annualId
             annualapi.commitauditEntity(this.entityForm, this.auditform, this.$axios).then(res => {
               if (res.data.code === 0) {
-                //保存成功后，初始化数据，变成修改
-                this.entityForm.Id = res.data.item;
-                //this.initDatas();
-                this.addshow = false
+                // 保存成功后，初始化数据，变成修改
+                this.entityForm.Id = res.data.item
+              //this.initDatas();
+              this.addshow = false
                 this.getstatus(this.annualId)
                 this.$message({
                   type: 'success',
                   message: res.data.message
-                });
+                })
 
-              } else {
+            } else {
                 this.$message({
                   type: 'warning',
                   message: res.data.message
-                });
-              }
+                })
+            }
             }).catch(err => {
               console.error(err)
-            });
-          }
+            })
+        }
         })
       },
 
-      //审批历史
-      auhistory() {
+      // 审批历史
+      auhistory () {
         this.audithistoryshow = true
       },
 
-      AuditEntity() {
+      AuditEntity () {
         this.applyLoading = true
         apiCert.auditEntity(this.certId, this.$axios).then(res => {
           if (res.data.code === 0) {
-            //保存成功后，初始化数据，变成修改
+            // 保存成功后，初始化数据，变成修改
             this.initDatas()
             this.$message({
               type: 'success',
               message: res.data.message
-            });
-          } else {
+            })
+        } else {
             this.$message({
               type: 'warning',
               message: res.data.message
-            });
-          }
+            })
+        }
           this.applyLoading = false
-
         }).catch(err => {
           console.error(err)
-        });
-      },
+        })
+    },
 
-      nexStepCB() {
+      nexStepCB () {
         this.Step += 1
       },
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -912,18 +909,17 @@
         }
       },
 
-      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>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/basisedit.vue

@@ -36,10 +36,10 @@
               <el-step title="待入库"></el-step>
               <el-step title="完成"></el-step>
             </el-steps>
-            <el-button slot="reference"
+            <!-- <el-button slot="reference"
                        plain
                        size="mini"
-                       style="margin-right: 5px">查看进度</el-button>
+                       style="margin-right: 5px">查看进度</el-button> -->
           </el-popover>
           <!--<el-button type="primary" plain size="mini" style="margin-right:3px" v-if="formDataCert.Status == 8"
             @click="annaudit">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/goodsedit.vue

@@ -42,10 +42,10 @@
               <el-step title="待入库"></el-step>
               <el-step title="完成"></el-step>
             </el-steps>
-            <el-button slot="reference"
+            <!-- <el-button slot="reference"
                        plain
                        size="mini"
-                       style="margin-right: 5px">查看进度</el-button>
+                       style="margin-right: 5px">查看进度</el-button> -->
           </el-popover>
           <!--<el-button type="primary" plain size="mini" style="margin-right:3px" v-if="formDataCert.Status == 8"
             @click="annaudit">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/techedit.vue

@@ -36,10 +36,10 @@
               <el-step title="待入库"></el-step>
               <el-step title="完成"></el-step>
             </el-steps>
-            <el-button slot="reference"
+            <!-- <el-button slot="reference"
                        plain
                        size="mini"
-                       style="margin-right: 5px">查看进度</el-button>
+                       style="margin-right: 5px">查看进度</el-button> -->
           </el-popover>
 
           <!--<el-button type="primary" plain size="mini" style="margin-right:3px" v-if="formDataCert.Status == 8"

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -20,7 +20,7 @@
               <el-step title="待入库"></el-step>
               <el-step title="完成"></el-step>
             </el-steps>
-            <el-button slot="reference" plain size="mini" style="margin-right: 8px">查看进度</el-button>
+            <!-- <el-button slot="reference" plain size="mini" style="margin-right: 8px">查看进度</el-button> -->
           </el-popover>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="AuditdialogShow = true"

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -20,7 +20,7 @@
               <el-step title="待入库"></el-step>
               <el-step title="完成"></el-step>
             </el-steps>
-            <el-button slot="reference" plain size="mini" style="margin-right: 8px">查看进度</el-button>
+            <!-- <el-button slot="reference" plain size="mini" style="margin-right: 8px">查看进度</el-button> -->
           </el-popover>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="AuditdialogShow = true"
@@ -1376,7 +1376,7 @@ import uploadajax from '@/assets/js//uploadajax.js'
       },
       auditOrgChang (val) {
         let auditstepcode = 'SECOND_TRIAL'
-      suppapi
+        suppapi
           .getAuditerByFirst(val, auditstepcode, this.$axios)
           .then(res => {
             this.secauditerOptions = res.data.item

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/techdataopera.vue

@@ -20,7 +20,7 @@
               <el-step title="待入库"></el-step>
               <el-step title="完成"></el-step>
             </el-steps>
-            <el-button slot="reference" plain size="mini" style="margin-right: 8px">查看进度</el-button>
+            <!-- <el-button slot="reference" plain size="mini" style="margin-right: 8px">查看进度</el-button> -->
           </el-popover>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="AuditdialogShow = true"
@@ -1231,7 +1231,7 @@ import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
       },
       auditOrgChang (val) {
         let auditstepcode = 'SECOND_TRIAL'
-      suppapi
+        suppapi
           .getAuditerByFirst(val, auditstepcode, this.$axios)
           .then(res => {
             this.secauditerOptions = res.data.item

src/dashoo.cn/frontend_web/src/pages/oilsupplier/suppliernopass/_opera/basisedit.vue

@@ -21,7 +21,7 @@
               <el-step title="待入库"></el-step>
               <el-step title="完成"></el-step>
             </el-steps>
-            <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button>
+            <!-- <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button> -->
           </el-popover>
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this.formData.Status == '-5'" @click="confirm">解锁</el-button>
           <router-link :to="'/oilsupplier/supplierstore/basislist'">
@@ -286,7 +286,7 @@
     },
     name: 'oilsupplierEdit',
 
-    data() {
+    data () {
       return {
         activeName: '0',
         chooseAuditorVisible: false,
@@ -433,7 +433,7 @@
       }
     },
 
-    mounted() {
+    mounted () {
       this.serviceId = this.$route.params.opera + ''
       if (this.$route.query.rtn) {
         this.showReturn = 0
@@ -488,7 +488,7 @@
           })
         })
       },
-      inputCompany(val) {
+      inputCompany (val) {
         if (!this.certId) { // 已经关联到子表了，就不能再切换主表ID了
           api.getEntityByName(val, this.$axios).then(res => {
             if (res.data && res.data.Id) {
@@ -499,12 +499,12 @@
           })
         }
       },
-      changeFormData(fdata) {
+      changeFormData (fdata) {
         if (!this.certId) { // 已经关联到子表了，就不能再切换主表ID了
           this.SetFormData(fdata)
         }
       },
-      SetFormData(fdata) {
+      SetFormData (fdata) {
         this.isCanUpdateSupplier(fdata.Id)
         this.formData.Id = fdata.Id
         this.formData.SupplierName = fdata.SupplierName
@@ -566,27 +566,27 @@
         } */
       },
 
-      isCanUpdateSupplier(supplierId) {
+      isCanUpdateSupplier (supplierId) {
         api.isCanUpdateSupplier(supplierId, this.$axios).then(res => {
           this.canUpdateSupplier = (res.data.code === 0)
         }).catch(err => {
           console.error(err)
         })
       },
-      equipmentdialog() {
+      equipmentdialog () {
         this.$refs['equipmentList'].showDialog()
       },
-      performancedialog() {
+      performancedialog () {
         this.$refs['performanceList'].showDialog()
       },
-      patentdialog() {
+      patentdialog () {
         this.$refs['patentList'].showDialog()
       },
-      winningdialog() {
+      winningdialog () {
         this.$refs['winningList'].showDialog()
       },
 
-      initDatas() {
+      initDatas () {
         this.isCanUpdateSupplier(this.formData.Id)
         if (this.formData.Id) {
           api.getEntityAndCert(this.certId, this.$axios).then(res => {
@@ -624,7 +624,7 @@
             this.backhistroy.certId = this.certId
             this.backhistroy.workflowId = this.formDataCert.WorkflowId
             if (this.certId && this.formDataCert.WorkflowId) {
-              //this.$refs['WfHistory'].getHistoryTask() /* 刷新工作流 */
+              // this.$refs['WfHistory'].getHistoryTask() /* 刷新工作流 */
             }
             this.$refs['equipmentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['performanceList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
@@ -637,7 +637,7 @@
           })
         }
       },
-      getbuslist() {
+      getbuslist () {
         this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
       },
       nextTab () {
@@ -649,7 +649,7 @@
         }
       },
 
-      getDictOptions() {
+      getDictOptions () {
         api.getDictList(this.$axios).then(res => {
           this.dictData = res.data.items
           this.organizeOption = res.data.items['Organizes']
@@ -660,14 +660,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) {
@@ -681,7 +681,7 @@
             console.error(err)
           })
       },
-      auditOrgChang(val) {
+      auditOrgChang (val) {
         let deptid = val[val.length - 1]
         this.auditerOption = []
         this.auditer = ''
@@ -700,7 +700,7 @@
        }, */
 
       // 保存信息
-      saveEntity() {
+      saveEntity () {
         this.$refs['BasisInfo'].$refs['EntityForm'].validate((valid) => {
           if (valid) {
             if (!this.formData.SetupTime) {
@@ -721,11 +721,11 @@
       },
 
       // 保存信息
-      saveCertEntity() {
+      saveCertEntity () {
         this.$refs['SupplierCertEditCompoment'].saveEntity()
       },
 
-      addEntity() {
+      addEntity () {
         this.formData.SupplierTypeCode = '02'
         this.formData.SupplierTypeName = '基建类'
         api.addEntity(this.formData, this.$axios).then(res => {
@@ -749,7 +749,7 @@
         })
       },
 
-      updateEntity() {
+      updateEntity () {
         api.updateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改
@@ -769,7 +769,7 @@
         })
       },
 
-      CheckCompanyBase() {
+      CheckCompanyBase () {
         if (!this.formData.Id) {
           this.$message({
             type: 'error',
@@ -787,7 +787,7 @@
         return true
       },
       // 企业人员结构情况
-      updateNumberEntity() {
+      updateNumberEntity () {
         if (!this.CheckCompanyBase()) {
           return false
         }
@@ -809,19 +809,19 @@
           console.error(err)
         })
       },
-      selectAuditOrg() {
+      selectAuditOrg () {
         this.dialogVisible = true
       },
-      chooseAuditorShow() {
+      chooseAuditorShow () {
         this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
         this.chooseAuditorVisible = true
       },
-      setAuditer(val, name) {
+      setAuditer (val, name) {
         this.auditer = val
         this.auditerName = name
         this.chooseAuditorVisible = false
       },
-      AuditEntity(val) {
+      AuditEntity (val) {
         if (this.auditer === '') {
           this.$message({
             type: 'warning',
@@ -853,11 +853,11 @@
         })
       },
 
-      nexStepCB() {
+      nexStepCB () {
         this.formData.Step += 1
       },
 
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -870,7 +870,7 @@
         }
       },
 
-      formatDateTime(date) {
+      formatDateTime (date) {
         var y = date.getFullYear()
         var m = date.getMonth() + 1
         m = m < 10 ? ('0' + m) : m
@@ -883,7 +883,6 @@
       }
     }
   }
-
 </script>
 
 <style lang="scss">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/suppliernopass/_opera/goodsedit.vue

@@ -21,7 +21,7 @@
               <el-step title="待入库"></el-step>
               <el-step title="完成"></el-step>
             </el-steps>
-            <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button>
+            <!-- <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button> -->
           </el-popover>
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this.formData.Status == '-5'" @click="confirm">解锁</el-button>
           <router-link :to="'/oilsupplier/supplierstore/goodslist'">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/suppliernopass/_opera/techedit.vue

@@ -21,7 +21,7 @@
               <el-step title="待入库"></el-step>
               <el-step title="完成"></el-step>
             </el-steps>
-            <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button>
+            <!-- <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button> -->
           </el-popover>
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '-5'" @click="confirm">解锁</el-button>
           <router-link :to="'/oilsupplier/supplierstore/techlist'">
@@ -291,7 +291,7 @@
     },
     name: 'oilsupplierEdit',
 
-    data() {
+    data () {
       return {
         activeName: '1',
         chooseAuditorVisible: false,
@@ -437,7 +437,7 @@
         }
       }
     },
-    mounted() {
+    mounted () {
       this.serviceId = this.$route.params.opera + ''
       if (this.$route.query.rtn) {
         this.showReturn = 0
@@ -493,7 +493,7 @@
           })
         })
       },
-      inputCompany(val) {
+      inputCompany (val) {
         if (!this.certId) {
           api.getEntityByName(val, this.$axios).then(res => {
             if (res.data && res.data.Id) {
@@ -504,12 +504,12 @@
           })
         }
       },
-      changeFormData(fdata) {
+      changeFormData (fdata) {
         if (!this.certId) {
           this.SetFormData(fdata)
         }
       },
-      SetFormData(fdata) {
+      SetFormData (fdata) {
         this.isCanUpdateSupplier(fdata.Id)
         this.formData.Id = fdata.Id
         this.formData.SupplierName = fdata.SupplierName
@@ -557,41 +557,41 @@
         this.formData.HseTraining = fdata.HseTraining
         this.formData.SpecTypeCode = fdata.SpecTypeCode
 
-        this.$refs["TechInfo"].CityAry = []
-        this.$refs["TechInfo"].CityAry.push(this.formData.Province)
-        this.$refs["TechInfo"].CityAry.push(this.formData.City)
-        this.$refs["TechInfo"].CityAry.push(this.formData.Street)
-        this.$refs["TechInfo"].LinkCityAry = []
-        this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkProvince)
-        this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkCity)
-        this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkStreet)
+        this.$refs['TechInfo'].CityAry = []
+        this.$refs['TechInfo'].CityAry.push(this.formData.Province)
+        this.$refs['TechInfo'].CityAry.push(this.formData.City)
+        this.$refs['TechInfo'].CityAry.push(this.formData.Street)
+        this.$refs['TechInfo'].LinkCityAry = []
+        this.$refs['TechInfo'].LinkCityAry.push(this.formData.LinkProvince)
+        this.$refs['TechInfo'].LinkCityAry.push(this.formData.LinkCity)
+        this.$refs['TechInfo'].LinkCityAry.push(this.formData.LinkStreet)
         /*this.$refs["TechInfo"].UnitRelationAry = []
         if (this.formData.SpecTypeCode.length > 0) {
           this.$refs['TechInfo'].UnitRelationAry = this.formData.SpecTypeCode.split(',')
-        }*/
+        } */
       },
 
-      isCanUpdateSupplier(supplierId) {
+      isCanUpdateSupplier (supplierId) {
         api.isCanUpdateSupplier(supplierId, this.$axios).then(res => {
           this.canUpdateSupplier = (res.data.code === 0)
         }).catch(err => {
           console.error(err)
         })
       },
-      equipmentdialog() {
+      equipmentdialog () {
         this.$refs['equipmentList'].showDialog()
       },
-      performancedialog() {
+      performancedialog () {
         this.$refs['performanceList'].showDialog()
       },
-      patentdialog() {
+      patentdialog () {
         this.$refs['patentList'].showDialog()
       },
-      winningdialog() {
+      winningdialog () {
         this.$refs['winningList'].showDialog()
       },
 
-      initDatas() {
+      initDatas () {
         this.isCanUpdateSupplier(this.formData.Id)
         if (this.formData.Id) {
           api.getEntityAndCert(this.certId, this.$axios).then(res => {
@@ -611,15 +611,15 @@
               this.add_flat = false
             }
             this.formDataCert.WorkflowId = this.formData.WorkflowId
-            this.$refs["TechInfo"].CityAry = []
-            this.$refs["TechInfo"].CityAry.push(this.formData.Province)
-            this.$refs["TechInfo"].CityAry.push(this.formData.City)
-            this.$refs["TechInfo"].CityAry.push(this.formData.Street)
-            this.$refs["TechInfo"].LinkCityAry = []
-            this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkProvince)
-            this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkCity)
-            this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkStreet)
-            /*this.$refs["TechInfo"].UnitRelationAry = []
+            this.$refs['TechInfo'].CityAry = []
+            this.$refs['TechInfo'].CityAry.push(this.formData.Province)
+            this.$refs['TechInfo'].CityAry.push(this.formData.City)
+            this.$refs['TechInfo'].CityAry.push(this.formData.Street)
+            this.$refs['TechInfo'].LinkCityAry = []
+            this.$refs['TechInfo'].LinkCityAry.push(this.formData.LinkProvince)
+            this.$refs['TechInfo'].LinkCityAry.push(this.formData.LinkCity)
+            this.$refs['TechInfo'].LinkCityAry.push(this.formData.LinkStreet)
+            /* this.$refs["TechInfo"].UnitRelationAry = []
 
             if (this.formData.SpecTypeCode.length > 0) {
               this.$refs['TechInfo'].UnitRelationAry = this.formData.SpecTypeCode.split(',')
@@ -631,7 +631,7 @@
             this.backhistroy.workflowId = this.formDataCert.WorkflowId
             /*if (this.certId && this.formDataCert.WorkflowId) {
               this.$refs['WfHistory'].getHistoryTask() /!* 刷新工作流 *!/
-            }*/
+            } */
             this.$refs['equipmentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['performanceList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['patentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
@@ -643,11 +643,11 @@
           })
         }
       },
-      getbuslist() {
+      getbuslist () {
         this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
       },
 
-      getDictOptions() {
+      getDictOptions () {
         api.getDictList(this.$axios).then(res => {
           this.dictData = res.data.items
           this.organizeOption = res.data.items['Organizes']
@@ -658,14 +658,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) {
@@ -679,7 +679,7 @@
             console.error(err)
           })
       },
-      auditOrgChang(val) {
+      auditOrgChang (val) {
         let deptid = val[val.length - 1]
         this.auditerOption = []
         this.auditer = ''
@@ -706,7 +706,7 @@
       }, */
 
       // 保存信息
-      saveEntity() {
+      saveEntity () {
         this.$refs['TechInfo'].$refs['EntityForm'].validate((valid) => {
           if (valid) {
             if (!this.formData.SetupTime) {
@@ -727,11 +727,11 @@
       },
 
       // 保存信息
-      saveCertEntity() {
+      saveCertEntity () {
         this.$refs['SupplierCertEditCompoment'].saveEntity()
       },
 
-      addEntity() {
+      addEntity () {
         this.formData.SupplierTypeCode = '03'
         this.formData.SupplierTypeName = '技术服务类'
         api.addEntity(this.formData, this.$axios).then(res => {
@@ -755,7 +755,7 @@
         })
       },
 
-      updateEntity() {
+      updateEntity () {
         api.updateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改
@@ -775,7 +775,7 @@
         })
       },
 
-      CheckCompanyBase() {
+      CheckCompanyBase () {
         if (!this.formData.Id) {
           this.$message({
             type: 'error',
@@ -793,7 +793,7 @@
         return true
       },
       // 企业人员结构情况
-      updateNumberEntity() {
+      updateNumberEntity () {
         if (!this.CheckCompanyBase()) {
           return false
         }
@@ -815,20 +815,20 @@
           console.error(err)
         })
       },
-      selectAuditOrg() {
+      selectAuditOrg () {
         this.dialogVisible = true
       },
-      chooseAuditorShow() {
+      chooseAuditorShow () {
         this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
         this.chooseAuditorVisible = true
       },
-      setAuditer(val, name) {
+      setAuditer (val, name) {
         this.auditer = val
         this.auditerName = name
         this.chooseAuditorVisible = false
       },
-      AuditEntity() {
-        //this.auditer = val
+      AuditEntity () {
+        // this.auditer = val
         if (this.auditer === '') {
           this.$message({
             type: 'warning',
@@ -860,7 +860,7 @@
         })
       },
 
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -873,7 +873,7 @@
         }
       },
 
-      formatDateTime(date) {
+      formatDateTime (date) {
         var y = date.getFullYear()
         var m = date.getMonth() + 1
         m = m < 10 ? ('0' + m) : m
@@ -886,7 +886,6 @@
       }
     }
   }
-
 </script>
 
 <style lang="scss">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/_opera/basisedit.vue

@@ -22,7 +22,7 @@
               <el-step title="待入库"></el-step>
               <el-step title="完成"></el-step>
             </el-steps>
-            <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button>
+            <!-- <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button> -->
           </el-popover>
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="createWZAccessCardNo">生成准入编码</el-button>
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="saveAccessCardNo">保存准入编码</el-button>
@@ -300,7 +300,7 @@
     },
     name: 'oilsupplierEdit',
 
-    data() {
+    data () {
       return {
         activeName: '0',
         chooseAuditorVisible: false,
@@ -448,7 +448,7 @@
       }
     },
 
-    mounted() {
+    mounted () {
       this.serviceId = this.$route.params.opera + ''
       if (this.$route.query.rtn) {
         this.showReturn = 0
@@ -531,7 +531,7 @@
           })
         })
       },
-      inputCompany(val) {
+      inputCompany (val) {
         if (!this.certId) { // 已经关联到子表了，就不能再切换主表ID了
           api.getEntityByName(val, this.$axios).then(res => {
             if (res.data && res.data.Id) {
@@ -542,12 +542,12 @@
           })
         }
       },
-      changeFormData(fdata) {
+      changeFormData (fdata) {
         if (!this.certId) { // 已经关联到子表了，就不能再切换主表ID了
           this.SetFormData(fdata)
         }
       },
-      SetFormData(fdata) {
+      SetFormData (fdata) {
         this.isCanUpdateSupplier(fdata.Id)
         this.formData.Id = fdata.Id
         this.formData.SupplierName = fdata.SupplierName
@@ -609,27 +609,27 @@
         } */
       },
 
-      isCanUpdateSupplier(supplierId) {
+      isCanUpdateSupplier (supplierId) {
         api.isCanUpdateSupplier(supplierId, this.$axios).then(res => {
           this.canUpdateSupplier = (res.data.code === 0)
         }).catch(err => {
           console.error(err)
         })
       },
-      equipmentdialog() {
+      equipmentdialog () {
         this.$refs['equipmentList'].showDialog()
       },
-      performancedialog() {
+      performancedialog () {
         this.$refs['performanceList'].showDialog()
       },
-      patentdialog() {
+      patentdialog () {
         this.$refs['patentList'].showDialog()
       },
-      winningdialog() {
+      winningdialog () {
         this.$refs['winningList'].showDialog()
       },
 
-      initDatas() {
+      initDatas () {
         this.isCanUpdateSupplier(this.formData.Id)
         if (this.formData.Id) {
           api.getEntityAndCert(this.certId, this.$axios).then(res => {
@@ -667,7 +667,7 @@
             this.backhistroy.certId = this.certId
             this.backhistroy.workflowId = this.formDataCert.WorkflowId
             if (this.certId && this.formDataCert.WorkflowId) {
-              //this.$refs['WfHistory'].getHistoryTask() /* 刷新工作流 */
+              // this.$refs['WfHistory'].getHistoryTask() /* 刷新工作流 */
             }
             this.$refs['equipmentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['performanceList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
@@ -680,7 +680,7 @@
           })
         }
       },
-      getbuslist() {
+      getbuslist () {
         this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
       },
       nextTab () {
@@ -692,7 +692,7 @@
         }
       },
 
-      getDictOptions() {
+      getDictOptions () {
         api.getDictList(this.$axios).then(res => {
           this.dictData = res.data.items
           this.organizeOption = res.data.items['Organizes']
@@ -703,14 +703,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) {
@@ -724,7 +724,7 @@
             console.error(err)
           })
       },
-      auditOrgChang(val) {
+      auditOrgChang (val) {
         let deptid = val[val.length - 1]
         console.log(deptid)
         this.auditerOption = []
@@ -744,7 +744,7 @@
        }, */
 
       // 保存信息
-      saveEntity() {
+      saveEntity () {
         this.$refs['BasisInfo'].$refs['EntityForm'].validate((valid) => {
           if (valid) {
             if (!this.formData.SetupTime) {
@@ -765,11 +765,11 @@
       },
 
       // 保存信息
-      saveCertEntity() {
+      saveCertEntity () {
         this.$refs['SupplierCertEditCompoment'].saveEntity()
       },
 
-      addEntity() {
+      addEntity () {
         this.formData.SupplierTypeCode = '02'
         this.formData.SupplierTypeName = '基建类'
         api.addEntity(this.formData, this.$axios).then(res => {
@@ -793,7 +793,7 @@
         })
       },
 
-      updateEntity() {
+      updateEntity () {
         api.updateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改
@@ -813,7 +813,7 @@
         })
       },
 
-      CheckCompanyBase() {
+      CheckCompanyBase () {
         if (!this.formData.Id) {
           this.$message({
             type: 'error',
@@ -831,7 +831,7 @@
         return true
       },
       // 企业人员结构情况
-      updateNumberEntity() {
+      updateNumberEntity () {
         if (!this.CheckCompanyBase()) {
           return false
         }
@@ -853,19 +853,19 @@
           console.error(err)
         })
       },
-      selectAuditOrg() {
+      selectAuditOrg () {
         this.dialogVisible = true
       },
-      chooseAuditorShow() {
+      chooseAuditorShow () {
         this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
         this.chooseAuditorVisible = true
       },
-      setAuditer(val, name) {
+      setAuditer (val, name) {
         this.auditer = val
         this.auditerName = name
         this.chooseAuditorVisible = false
       },
-      AuditEntity(val) {
+      AuditEntity (val) {
         if (this.auditer === '') {
           this.$message({
             type: 'warning',
@@ -897,11 +897,11 @@
         })
       },
 
-      nexStepCB() {
+      nexStepCB () {
         this.formData.Step += 1
       },
 
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -914,7 +914,7 @@
         }
       },
 
-      formatDateTime(date) {
+      formatDateTime (date) {
         var y = date.getFullYear()
         var m = date.getMonth() + 1
         m = m < 10 ? ('0' + m) : m
@@ -927,7 +927,6 @@
       }
     }
   }
-
 </script>
 
 <style lang="scss">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/_opera/goodsedit.vue

@@ -22,7 +22,7 @@
               <el-step title="待入库"></el-step>
               <el-step title="完成"></el-step>
             </el-steps>
-            <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button>
+            <!-- <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button> -->
           </el-popover>
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="createWZAccessCardNo">生成准入编码</el-button>
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="saveAccessCardNo">保存准入编码</el-button>
@@ -509,7 +509,7 @@
           })
           return
         }
-        this.$confirm('确认提交入库','提示',{
+        this.$confirm('确认提交入库', '提示', {
           confirmButtonText: '确认',
           cancelButtonText: '取消',
           type: 'warning'
@@ -928,7 +928,6 @@
       }
     }
   }
-
 </script>
 
 <style lang="scss">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/_opera/techedit.vue

@@ -22,7 +22,7 @@
               <el-step title="待入库"></el-step>
               <el-step title="完成"></el-step>
             </el-steps>
-            <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button>
+            <!-- <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button> -->
           </el-popover>
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="createJFAccessCardNo">生成准入编码</el-button>
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="saveAccessCardNo">保存准入编码</el-button>
@@ -308,7 +308,7 @@
     },
     name: 'oilsupplierEdit',
 
-    data() {
+    data () {
       return {
         activeName: '1',
         chooseAuditorVisible: false,
@@ -455,7 +455,7 @@
         }
       }
     },
-    mounted() {
+    mounted () {
       this.serviceId = this.$route.params.opera + ''
       if (this.$route.query.rtn) {
         this.showReturn = 0
@@ -540,7 +540,7 @@
           })
         })
       },
-      inputCompany(val) {
+      inputCompany (val) {
         if (!this.certId) {
           api.getEntityByName(val, this.$axios).then(res => {
             if (res.data && res.data.Id) {
@@ -551,12 +551,12 @@
           })
         }
       },
-      changeFormData(fdata) {
+      changeFormData (fdata) {
         if (!this.certId) {
           this.SetFormData(fdata)
         }
       },
-      SetFormData(fdata) {
+      SetFormData (fdata) {
         this.isCanUpdateSupplier(fdata.Id)
         this.formData.Id = fdata.Id
         this.formData.SupplierName = fdata.SupplierName
@@ -604,41 +604,41 @@
         this.formData.HseTraining = fdata.HseTraining
         this.formData.SpecTypeCode = fdata.SpecTypeCode
 
-        this.$refs["TechInfo"].CityAry = []
-        this.$refs["TechInfo"].CityAry.push(this.formData.Province)
-        this.$refs["TechInfo"].CityAry.push(this.formData.City)
-        this.$refs["TechInfo"].CityAry.push(this.formData.Street)
-        this.$refs["TechInfo"].LinkCityAry = []
-        this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkProvince)
-        this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkCity)
-        this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkStreet)
+        this.$refs['TechInfo'].CityAry = []
+        this.$refs['TechInfo'].CityAry.push(this.formData.Province)
+        this.$refs['TechInfo'].CityAry.push(this.formData.City)
+        this.$refs['TechInfo'].CityAry.push(this.formData.Street)
+        this.$refs['TechInfo'].LinkCityAry = []
+        this.$refs['TechInfo'].LinkCityAry.push(this.formData.LinkProvince)
+        this.$refs['TechInfo'].LinkCityAry.push(this.formData.LinkCity)
+        this.$refs['TechInfo'].LinkCityAry.push(this.formData.LinkStreet)
         /*this.$refs["TechInfo"].UnitRelationAry = []
         if (this.formData.SpecTypeCode.length > 0) {
           this.$refs['TechInfo'].UnitRelationAry = this.formData.SpecTypeCode.split(',')
-        }*/
+        } */
       },
 
-      isCanUpdateSupplier(supplierId) {
+      isCanUpdateSupplier (supplierId) {
         api.isCanUpdateSupplier(supplierId, this.$axios).then(res => {
           this.canUpdateSupplier = (res.data.code === 0)
         }).catch(err => {
           console.error(err)
         })
       },
-      equipmentdialog() {
+      equipmentdialog () {
         this.$refs['equipmentList'].showDialog()
       },
-      performancedialog() {
+      performancedialog () {
         this.$refs['performanceList'].showDialog()
       },
-      patentdialog() {
+      patentdialog () {
         this.$refs['patentList'].showDialog()
       },
-      winningdialog() {
+      winningdialog () {
         this.$refs['winningList'].showDialog()
       },
 
-      initDatas() {
+      initDatas () {
         this.isCanUpdateSupplier(this.formData.Id)
         if (this.formData.Id) {
           api.getEntityAndCert(this.certId, this.$axios).then(res => {
@@ -659,15 +659,15 @@
             }
             this.formDataCert.WorkflowId = this.formData.WorkflowId
             console.log(this.formData)
-            this.$refs["TechInfo"].CityAry = []
-            this.$refs["TechInfo"].CityAry.push(this.formData.Province)
-            this.$refs["TechInfo"].CityAry.push(this.formData.City)
-            this.$refs["TechInfo"].CityAry.push(this.formData.Street)
-            this.$refs["TechInfo"].LinkCityAry = []
-            this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkProvince)
-            this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkCity)
-            this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkStreet)
-            /*this.$refs["TechInfo"].UnitRelationAry = []
+            this.$refs['TechInfo'].CityAry = []
+            this.$refs['TechInfo'].CityAry.push(this.formData.Province)
+            this.$refs['TechInfo'].CityAry.push(this.formData.City)
+            this.$refs['TechInfo'].CityAry.push(this.formData.Street)
+            this.$refs['TechInfo'].LinkCityAry = []
+            this.$refs['TechInfo'].LinkCityAry.push(this.formData.LinkProvince)
+            this.$refs['TechInfo'].LinkCityAry.push(this.formData.LinkCity)
+            this.$refs['TechInfo'].LinkCityAry.push(this.formData.LinkStreet)
+            /* this.$refs["TechInfo"].UnitRelationAry = []
 
             if (this.formData.SpecTypeCode.length > 0) {
               this.$refs['TechInfo'].UnitRelationAry = this.formData.SpecTypeCode.split(',')
@@ -679,7 +679,7 @@
             this.backhistroy.workflowId = this.formDataCert.WorkflowId
             /*if (this.certId && this.formDataCert.WorkflowId) {
               this.$refs['WfHistory'].getHistoryTask() /!* 刷新工作流 *!/
-            }*/
+            } */
             this.$refs['equipmentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['performanceList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['patentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
@@ -691,11 +691,11 @@
           })
         }
       },
-      getbuslist() {
+      getbuslist () {
         this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
       },
 
-      getDictOptions() {
+      getDictOptions () {
         api.getDictList(this.$axios).then(res => {
           this.dictData = res.data.items
           this.organizeOption = res.data.items['Organizes']
@@ -706,14 +706,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) {
@@ -727,7 +727,7 @@
             console.error(err)
           })
       },
-      auditOrgChang(val) {
+      auditOrgChang (val) {
         let deptid = val[val.length - 1]
         this.auditerOption = []
         this.auditer = ''
@@ -754,7 +754,7 @@
       }, */
 
       // 保存信息
-      saveEntity() {
+      saveEntity () {
         this.$refs['TechInfo'].$refs['EntityForm'].validate((valid) => {
           if (valid) {
             if (!this.formData.SetupTime) {
@@ -775,11 +775,11 @@
       },
 
       // 保存信息
-      saveCertEntity() {
+      saveCertEntity () {
         this.$refs['SupplierCertEditCompoment'].saveEntity()
       },
 
-      addEntity() {
+      addEntity () {
         this.formData.SupplierTypeCode = '03'
         this.formData.SupplierTypeName = '技术服务类'
         api.addEntity(this.formData, this.$axios).then(res => {
@@ -803,7 +803,7 @@
         })
       },
 
-      updateEntity() {
+      updateEntity () {
         api.updateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改
@@ -823,7 +823,7 @@
         })
       },
 
-      CheckCompanyBase() {
+      CheckCompanyBase () {
         if (!this.formData.Id) {
           this.$message({
             type: 'error',
@@ -841,7 +841,7 @@
         return true
       },
       // 企业人员结构情况
-      updateNumberEntity() {
+      updateNumberEntity () {
         if (!this.CheckCompanyBase()) {
           return false
         }
@@ -863,20 +863,20 @@
           console.error(err)
         })
       },
-      selectAuditOrg() {
+      selectAuditOrg () {
         this.dialogVisible = true
       },
-      chooseAuditorShow() {
+      chooseAuditorShow () {
         this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
         this.chooseAuditorVisible = true
       },
-      setAuditer(val, name) {
+      setAuditer (val, name) {
         this.auditer = val
         this.auditerName = name
         this.chooseAuditorVisible = false
       },
-      AuditEntity() {
-        //this.auditer = val
+      AuditEntity () {
+        // this.auditer = val
         if (this.auditer === '') {
           this.$message({
             type: 'warning',
@@ -908,7 +908,7 @@
         })
       },
 
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -921,7 +921,7 @@
         }
       },
 
-      formatDateTime(date) {
+      formatDateTime (date) {
         var y = date.getFullYear()
         var m = date.getMonth() + 1
         m = m < 10 ? ('0' + m) : m
@@ -934,7 +934,6 @@
       }
     }
   }
-
 </script>
 
 <style lang="scss">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/_opera/basisedit.vue

@@ -22,7 +22,7 @@
               <el-step title="待入库"></el-step>
               <el-step title="完成"></el-step>
             </el-steps>
-            <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button>
+            <!-- <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button> -->
           </el-popover>
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this.formData.Status == '7'" @click="confirm">确认入库</el-button>
           <router-link :to="'/oilsupplier/supplierstore/basislist'">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/_opera/goodsedit.vue

@@ -22,7 +22,7 @@
               <el-step title="待入库"></el-step>
               <el-step title="完成"></el-step>
             </el-steps>
-            <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button>
+            <!-- <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button> -->
           </el-popover>
           <!--<el-button type="primary" size="mini" style="margin-right: 5px" @click="printbtn">打印</el-button>-->
           <router-link :to="'/oilsupplier/supplierstore/goodslist'">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/_opera/techedit.vue

@@ -22,7 +22,7 @@
               <el-step title="待入库"></el-step>
               <el-step title="完成"></el-step>
             </el-steps>
-            <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button>
+            <!-- <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button> -->
           </el-popover>
           <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="confirm">确认入库</el-button>
           <router-link :to="'/oilsupplier/supplierstore/techlist'">