前后:hse成绩

src/dashoo.cn/backend/api/controllers/oilsupplier/hsescore.go

@@ -137,10 +137,12 @@ func (this *HSEScoreController) GetSupplierHSEList() {
 	}
 	orderby := "Id"
 	size := 100
+	desc := true
 
 	if IsThree != "" {
 		orderby = "Score"
 		size = 3
+		desc = false
 	}
 
 	//企业用户必须加创建人条件
@@ -150,7 +152,7 @@ func (this *HSEScoreController) GetSupplierHSEList() {
 
 	svc := hsescore.GetHSEScoreService(utils.DBE) //获得数据库引擎
 	var list []hsescore.HSEScore
-	total := svc.GetMyPagingEntitiesWithOrderBytbl("HSEScore", 1, int64(size), orderby, true, &list, where)
+	total := svc.GetMyPagingEntitiesWithOrderBytbl("HSEScore", 1, int64(size), orderby, desc, &list, where)
 	var datainfo DataInfo
 	datainfo.Items = list
 	datainfo.CurrentItemCount = total

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

@@ -1304,7 +1304,8 @@
       hseList() {
         if (this.formData.SupplierId) {
           let params = {
-            SupplierId: this.formData.SupplierId
+            SupplierId: this.formData.SupplierId,
+            IsThree: 1
           }
           hseApi.getSupplierHSEList(params, this.$axios).then(res => {
             this.HSEList = res.data.items
@@ -2273,6 +2274,12 @@
           } else if (val.BeChangeInfo == '3') {
             return '常规'
           }
+        } else if (val.SelectItem === 'HseTraining') {
+          if (val.BeChangeInfo === '0') {
+            return '否'
+          } else if (val.BeChangeInfo === '1') {
+            return '是'
+          }
         } else if (val.SelectItem === 'SetupTime') {
           if (val.BeChangeInfo === '') {
             return '----'
@@ -2296,6 +2303,12 @@
           } else if (val.ChangeInfo === '2') {
             return '多元内部'
           }
+        } else if (val.SelectItem === 'HseTraining') {
+          if (val.ChangeInfo === '0') {
+            return '否'
+          } else if (val.ChangeInfo === '1') {
+            return '是'
+          }
         } else if (val.SelectItem === 'InStyle') {
           if (val.ChangeInfo === '1') {
             return '评审准入'

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

@@ -2393,6 +2393,12 @@
           } else if (val.BeChangeInfo == '3') {
             return '常规'
           }
+        } else if (val.SelectItem === 'HseTraining') {
+          if (val.BeChangeInfo === '0') {
+            return '否'
+          } else if (val.BeChangeInfo === '1') {
+            return '是'
+          }
         } else if (val.SelectItem === 'SetupTime') {
           if (val.BeChangeInfo === '') {
             return '----'
@@ -2416,6 +2422,12 @@
           } else if (val.ChangeInfo === '2') {
             return '多元内部'
           }
+        } else if (val.SelectItem === 'HseTraining') {
+          if (val.ChangeInfo === '0') {
+            return '否'
+          } else if (val.ChangeInfo === '1') {
+            return '是'
+          }
         } else if (val.SelectItem === 'InStyle') {
           if (val.ChangeInfo === '1') {
             return '评审准入'

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

@@ -300,7 +300,6 @@
 
               </el-row>
             </el-form>
-
             <el-form class="formDataInfo" label-position="top" ref="EntityFormCert" :model="supplierData">
               <el-row :gutter="60">
                 <el-col :span="8">
@@ -370,6 +369,34 @@
               </el-row>
 
             </el-form>
+            <el-card class="box-card" v-if="supplierData.HseTraining === '1'">
+              <div slot="header" class="clearfix">
+                <span>HSE培训成绩</span>
+              </div>
+              <div>
+                <el-table size="mini" :data="HSEList" border>
+                  <el-table-column label="序号" width="150" align="center" type="index"></el-table-column>
+                  <el-table-column label="企业名称" min-width="300px" prop="SupplierName" sortable align="center"></el-table-column>
+                  <el-table-column label="姓名" width="120px" prop="Name" sortable align="center"></el-table-column>
+                  <el-table-column label="有效期" width="120px" prop="ApplyTime" sortable align="center">
+                    <template slot-scope="scope">
+                      {{ jstimehandle(scope.row.ApplyTime+'') }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="考试成绩" width="120px" prop="Score" sortable align="center"></el-table-column>
+                  <el-table-column label="培训开始日期" width="120px" prop="StartTime" sortable align="center">
+                    <template slot-scope="scope">
+                      {{ jstimehandle(scope.row.StartTime+'') }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="培训结束日期" width="120px" prop="EndTime" sortable align="center">
+                    <template slot-scope="scope">
+                      {{ jstimehandle(scope.row.EndTime+'') }}
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </div>
+            </el-card>
           </el-tab-pane>
           <el-tab-pane label="企业情况">
             <el-card class="box-card">
@@ -864,6 +891,7 @@
   import PerformanceList from '@/components/oilsupplier/performancelist'
   import PatentList from '@/components/oilsupplier/patentlist'
   import WinningList from '@/components/oilsupplier/winninglist'
+  import hseApi from '@/api/hsescore/hsescore'
   // v-viewer
   import Vue from 'vue'
   import Viewer from 'v-viewer'
@@ -911,6 +939,7 @@
         }
       }
       return {
+        HSEList: [],
         is_todo: '0',
         equipmentList: [], // 企业主要设备
         performanceList: [], // 近三年主要业绩
@@ -1274,6 +1303,19 @@
       // this.changeOrgUnit(this.selectDept)
     },
     methods: {
+      hseList() {
+        if (this.formData.SupplierId) {
+          let params = {
+            SupplierId: this.formData.SupplierId,
+            IsThree: 1
+          }
+          hseApi.getSupplierHSEList(params, this.$axios).then(res => {
+            this.HSEList = res.data.items
+          }).catch(err => {
+            console.error(err)
+          })
+        }
+      },
       initDatas () {
         if (this.formData.Id) {
           suppapi.getEntityAndCert(this.formData.SupplierCertId, this.$axios).then(res => {
@@ -1350,6 +1392,7 @@
           this.getSupplierData()
           this.isAccess()
           this.initDatas()
+          this.hseList()
           // 显示公司名
           _this.supplierOptions = _this.formData.SupplierId.toString()
         }).catch(err => {
@@ -2209,6 +2252,12 @@
           } else if (val.BeChangeInfo == '5') {
             return '内部多元准入'
           }
+        } else if (val.SelectItem === 'HseTraining') {
+          if (val.BeChangeInfo === '0') {
+            return '否'
+          } else if (val.BeChangeInfo === '1') {
+            return '是'
+          }
         } else if (val.SelectItem === 'CredentialFlag') {
           if (val.BeChangeInfo == '1') {
             return '三证合一'
@@ -2240,6 +2289,12 @@
           } else if (val.ChangeInfo === '2') {
             return '多元内部'
           }
+        } else if (val.SelectItem === 'HseTraining') {
+          if (val.ChangeInfo === '0') {
+            return '否'
+          } else if (val.ChangeInfo === '1') {
+            return '是'
+          }
         } else if (val.SelectItem === 'InStyle') {
           if (val.ChangeInfo === '1') {
             return '评审准入'

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

@@ -1501,7 +1501,8 @@
       hseList() {
         if (this.formData.Id) {
           let params = {
-            SupplierId: this.formData.Id
+            SupplierId: this.formData.Id,
+            IsThree: 1
           }
           hseApi.getSupplierHSEList(params, this.$axios).then(res => {
             this.HSEList = res.data.items

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

@@ -1705,7 +1705,8 @@
       hseList() {
         if (this.formData.Id) {
           let params = {
-            SupplierId: this.formData.Id
+            SupplierId: this.formData.Id,
+            IsThree: 1
           }
           hseApi.getSupplierHSEList(params, this.$axios).then(res => {
             this.HSEList = res.data.items

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

@@ -1621,7 +1621,8 @@ import Viewer from 'v-viewer'
       hseList() {
         if (this.formData.Id) {
           let params = {
-            SupplierId: this.formData.Id
+            SupplierId: this.formData.Id,
+            IsThree: 1
           }
           hseApi.getSupplierHSEList(params, this.$axios).then(res => {
             this.HSEList = res.data.items

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

@@ -1508,7 +1508,8 @@
       hseList() {
         if (this.formData.Id) {
           let params = {
-            SupplierId: this.formData.Id
+            SupplierId: this.formData.Id,
+            IsThree: 1
           }
           hseApi.getSupplierHSEList(params, this.$axios).then(res => {
             this.HSEList = res.data.items

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

@@ -1625,7 +1625,8 @@
       hseList() {
         if (this.SuppId) {
           let params = {
-            SupplierId: this.SuppId
+            SupplierId: this.SuppId,
+            IsThree: 1
           }
           hseApi.getSupplierHSEList(params, this.$axios).then(res => {
             this.HSEList = res.data.items
@@ -2185,6 +2186,12 @@
           } else if (val.BeChangeInfo == '2') {
             return '多元内部'
           }
+        } else if (val.SelectItem === 'HseTraining') {
+          if (val.BeChangeInfo === '0') {
+            return '否'
+          } else if (val.BeChangeInfo === '1') {
+            return '是'
+          }
         } else if (val.SelectItem == 'InStyle') {
           if (val.BeChangeInfo == '1') {
             return '评审准入'
@@ -2228,6 +2235,12 @@
           } else if (val.ChangeInfo == '2') {
             return '多元内部'
           }
+        } else if (val.SelectItem === 'HseTraining') {
+          if (val.ChangeInfo === '0') {
+            return '否'
+          } else if (val.ChangeInfo === '1') {
+            return '是'
+          }
         } else if (val.SelectItem == 'InStyle') {
           if (val.ChangeInfo == '1') {
             return '评审准入'

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

@@ -2392,7 +2392,8 @@
       hseList() {
         if (this.formData.Id) {
           let params = {
-            SupplierId: this.formData.Id
+            SupplierId: this.formData.Id,
+            IsThree: 1
           }
           hseApi.getSupplierHSEList(params, this.$axios).then(res => {
             this.HSEList = res.data.items
@@ -2911,6 +2912,12 @@
           } else if (val.BeChangeInfo == '5') {
             return '内部多元准入'
           }
+        } else if (val.SelectItem === 'HseTraining') {
+          if (val.BeChangeInfo === '0') {
+            return '否'
+          } else if (val.BeChangeInfo === '1') {
+            return '是'
+          }
         } else if (val.SelectItem === 'CredentialFlag') {
           if (val.BeChangeInfo == '1') {
             return '三证合一'
@@ -2954,6 +2961,12 @@
           } else if (val.ChangeInfo == '5') {
             return '内部多元准入'
           }
+        } else if (val.SelectItem === 'HseTraining') {
+          if (val.ChangeInfo === '0') {
+            return '否'
+          } else if (val.ChangeInfo === '1') {
+            return '是'
+          }
         } else if (val.SelectItem === 'CredentialFlag') {
           if (val.ChangeInfo == '1') {
             return '三证合一'

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

@@ -1271,7 +1271,8 @@ export default {
     hseList() {
       if (this.formData.Id) {
         let params = {
-          SupplierId: this.formData.Id
+          SupplierId: this.formData.Id,
+          IsThree: 1
         }
         hseApi.getSupplierHSEList(params, this.$axios).then(res => {
           this.HSEList = res.data.items

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

@@ -946,7 +946,8 @@ export default {
     hseList() {
       if (this.formData.Id) {
         let params = {
-          SupplierId: this.formData.Id
+          SupplierId: this.formData.Id,
+          IsThree: 1
         }
         hseApi.getSupplierHSEList(params, this.$axios).then(res => {
           this.HSEList = res.data.items

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

@@ -1816,7 +1816,8 @@
         console.log(this.supplierId, this.formData.supplierId, 'this.supplierId')
         if (this.supplierId) {
           let params = {
-            SupplierId: this.supplierId
+            SupplierId: this.supplierId,
+            IsThree: 1
           }
           hseApi.getSupplierHSEList(params, this.$axios).then(res => {
             this.HSEList = res.data.items
@@ -3118,6 +3119,12 @@
           } else if (val.BeChangeInfo === '2') {
             return '多元内部'
           }
+        } else if (val.SelectItem === 'HseTraining') {
+          if (val.BeChangeInfo === '0') {
+            return '否'
+          } else if (val.BeChangeInfo === '1') {
+            return '是'
+          }
         } else if (val.SelectItem === 'InStyle') {
           if (val.BeChangeInfo == '1') {
             return '评审准入'
@@ -3175,6 +3182,12 @@
           } else if (val.ChangeInfo === '6') {
             return '招标准入'
           }
+        } else if (val.SelectItem === 'HseTraining') {
+          if (val.ChangeInfo === '0') {
+            return '否'
+          } else if (val.ChangeInfo === '1') {
+            return '是'
+          }
         } else if (val.SelectItem === 'CredentialFlag') {
           if (val.ChangeInfo === '1') {
             return '三证合一'

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

@@ -2782,6 +2782,12 @@
           } else if (val.BeChangeInfo === '2') {
             return '多元内部'
           }
+        } else if (val.SelectItem === 'HseTraining') {
+          if (val.BeChangeInfo === '0') {
+            return '否'
+          } else if (val.BeChangeInfo === '1') {
+            return '是'
+          }
         } else if (val.SelectItem === 'InStyle') {
           if (val.BeChangeInfo == '1') {
             return '评审准入'
@@ -2845,6 +2851,12 @@
           } else if (val.ChangeInfo === '3') {
             return '常规'
           }
+        } else if (val.SelectItem === 'HseTraining') {
+          if (val.ChangeInfo === '0') {
+            return '否'
+          } else if (val.ChangeInfo === '1') {
+            return '是'
+          }
         } else if (val.SelectItem === 'SetupTime') {
           if (val.ChangeInfo === '') {
             return '----'

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

@@ -1827,7 +1827,8 @@
       hseList() {
         if (this.formData.SupplierId) {
           let params = {
-            SupplierId: this.formData.SupplierId
+            SupplierId: this.formData.SupplierId,
+            IsThree: 1
           }
           hseApi.getSupplierHSEList(params, this.$axios).then(res => {
             this.HSEList = res.data.items
@@ -2633,6 +2634,12 @@
           } else if (val.BeChangeInfo === '2') {
             return '多元内部'
           }
+        } else if (val.SelectItem === 'HseTraining') {
+          if (val.BeChangeInfo === '0') {
+            return '否'
+          } else if (val.BeChangeInfo === '1') {
+            return '是'
+          }
         } else if (val.SelectItem === 'InStyle') {
           if (val.BeChangeInfo == '1') {
             return '评审准入'
@@ -2696,6 +2703,12 @@
           } else if (val.ChangeInfo === '3') {
             return '常规'
           }
+        } else if (val.SelectItem === 'HseTraining') {
+          if (val.ChangeInfo === '0') {
+            return '否'
+          } else if (val.ChangeInfo === '1') {
+            return '是'
+          }
         } else if (val.SelectItem === 'SetupTime') {
           if (val.ChangeInfo === '') {
             return '----'

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

@@ -703,7 +703,8 @@
       hseList() {
         if (this.formData.Id) {
           let params = {
-            SupplierId: this.formData.Id
+            SupplierId: this.formData.Id,
+            IsThree: 1
           }
           hseApi.getSupplierHSEList(params, this.$axios).then(res => {
             this.HSEList = res.data.items

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

@@ -659,7 +659,8 @@
       hseList() {
         if (this.formData.Id) {
           let params = {
-            SupplierId: this.formData.Id
+            SupplierId: this.formData.Id,
+            IsThree: 1
           }
           hseApi.getSupplierHSEList(params, this.$axios).then(res => {
             this.HSEList = res.data.items

src/dashoo.cn/frontend_web/src/pages/select/processselect/wfmultihistory.vue

@@ -286,7 +286,7 @@
             </el-table-column>
             <el-table-column prop="EffectDate" label="有效日期" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ jstimehandle(scope.row.EffectDate+'') }}
+                {{ jstimehandle2(scope.row.EffectDate+'') }}
               </template>
             </el-table-column>
             <el-table-column prop="OtherRemark" label="描述" show-overflow-tooltip></el-table-column>
@@ -3297,7 +3297,8 @@
       hseList() {
         if (this.formData.Id) {
           let params = {
-            SupplierId: this.formData.Id
+            SupplierId: this.formData.Id,
+            IsThree: 1
           }
           hseApi.getSupplierHSEList(params, this.$axios).then(res => {
             this.HSEList = res.data.items
@@ -4275,6 +4276,12 @@
           } else if (val.BeChangeInfo == '5') {
             return '内部多元准入'
           }
+        } else if (val.SelectItem === 'HseTraining') {
+          if (val.BeChangeInfo === '0') {
+            return '否'
+          } else if (val.BeChangeInfo === '1') {
+            return '是'
+          }
         } else if (val.SelectItem === 'CredentialFlag') {
           if (val.BeChangeInfo == '1') {
             return '三证合一'
@@ -4318,6 +4325,12 @@
           } else if (val.ChangeInfo === '5') {
             return '内部多元准入'
           }
+        } else if (val.SelectItem === 'HseTraining') {
+          if (val.ChangeInfo === '0') {
+            return '否'
+          } else if (val.ChangeInfo === '1') {
+            return '是'
+          }
         } else if (val.SelectItem === 'CredentialFlag') {
           if (val.ChangeInfo === '1') {
             return '三证合一'