合同编辑加备注;服务商未参加hse的显示文案;日常评价导出新模板

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-import/_opera/operation.vue

@@ -419,7 +419,8 @@
 <!--          </el-col>-->
 <!--        </el-row>-->
 <!--        <el-row>-->
-
+        </el-row>
+        <el-row>
           <el-col :span="24">
             <el-form-item label="备注">
               <el-input type="textarea" v-model="formData.Remark" placeholder="请输入" style="width: 100%"></el-input>

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

@@ -8,6 +8,7 @@
     <el-card class="box-card">
       <div slot="header" class="clearfix">
         <span v-if="formData.SupplierName">{{formData.SupplierName}}</span><span v-else>年审基本信息表</span>
+        <span style="color: red; padding-left: 10px;" v-if="hseStatus && (HSEList == null || HSEList.length === 0)">未参加公司HSE相关培训，不可参与公司范围内现场服务（包括但不限于现场调研、现场作业等。）</span>
         <span style="float: right;">
           <!-- <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button> -->
           <!-- <el-button plain icon="el-icon-right" size="mini" style="margin-right: 5px" @click="nextTab">下一步</el-button> -->
@@ -1107,6 +1108,7 @@ import Viewer from 'v-viewer'
       }
       return {
         HSEList: [],
+        hseStatus: false,
         hseTrainingStatus: false,
         auditBtn: false,
         saveLoading: false,
@@ -1625,6 +1627,7 @@ import Viewer from 'v-viewer'
             IsThree: '1'
           }
           hseApi.getSupplierHSEList(params, this.$axios).then(res => {
+            this.hseStatus = true
             this.HSEList = res.data.items
           }).catch(err => {
             console.error(err)

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

@@ -11,6 +11,7 @@
         <span>
           <i class="icon icon-table2"></i> <span v-if="formData.SupplierName"> {{formData.SupplierName}}</span><span v-else>信息</span>
         </span>
+        <span style="color: red; padding-left: 10px;" v-if="hseStatus && (HSEList == null || HSEList.length === 0)">未参加公司HSE相关培训，不可参与公司范围内现场服务（包括但不限于现场调研、现场作业等。）</span>
         <span style="float: right;">
           <!--<el-button plain icon="el-icon-right" size="mini" style="margin-right: 5px" @click="nextTab">下一步</el-button>-->
           <el-popover>
@@ -657,6 +658,7 @@ export default {
     }
     return {
       HSEList: [],
+      hseStatus: false,
       hseTrainingStatus: false,
       recallApplyVisible: false, // 撤回申请弹出框
       recallApplyBtn: false,
@@ -950,6 +952,7 @@ export default {
           IsThree: '1'
         }
         hseApi.getSupplierHSEList(params, this.$axios).then(res => {
+          this.hseStatus = true
           this.HSEList = res.data.items
         }).catch(err => {
           console.error(err)

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

@@ -10,6 +10,7 @@
         <span>
           <i class="icon icon-table2"></i> {{supplierData.SupplierName}}
         </span>
+        <span style="color: red; padding-left: 10px;" v-if="hseStatus && (HSEList == null || HSEList.length === 0)">未参加公司HSE相关培训，不可参与公司范围内现场服务（包括但不限于现场调研、现场作业等。）</span>
         <span style="float: right;">
           <el-popover>
             <el-steps :active="formData.Step" direction="vertical" align-center finish-status="success">
@@ -1262,6 +1263,7 @@
       }
       return {
         HSEList: [],
+        hseStatus: false,
         hseTrainingStatus: false,
         rulesnum: {
           WorkerTotal: [{
@@ -1831,6 +1833,7 @@
             IsThree: '1'
           }
           hseApi.getSupplierHSEList(params, this.$axios).then(res => {
+            this.hseStatus = true
             this.HSEList = res.data.items
           }).catch(err => {
             console.error(err)

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

@@ -10,6 +10,7 @@
         <span>
           <i class="icon icon-table2"></i> &nbsp;<span v-if="formData.SupplierName">{{formData.SupplierName}}</span><span v-else>信息</span>
         </span>
+        <span style="color: red; padding-left: 10px;" v-if="hseStatus && (HSEList == null || HSEList.length === 0)">未参加公司HSE相关培训，不可参与公司范围内现场服务（包括但不限于现场调研、现场作业等。）</span>
         <span style="float: right;">
           <el-button type="primary" size="mini" style="margin-right: 5px" @click="editIsRestrict('0')" v-if="formData.IsRestrict == '1' && showBtn ">增项限制已开启</el-button>
           <el-button type="primary" size="mini" style="margin-right: 5px" @click="editIsRestrict('1')" v-if="formData.IsRestrict == '0' && showBtn">增项限制已关闭</el-button>
@@ -381,6 +382,7 @@
         appendStatus: true,
         dictData: null,
         applyLoading: false,
+        hseStatus: false,
         HSEList: [],
         equipmentList: [], // 企业主要设备
         performanceList: [], // 近三年主要业绩
@@ -589,6 +591,7 @@
             IsThree: '1'
           }
           hseApi.getSupplierHSEList(params, this.$axios).then(res => {
+            this.hseStatus = true
             this.HSEList = res.data.items
           }).catch(err => {
             console.error(err)