修改bug完成

src/dashoo.cn/frontend_web/nuxt.config.js

@@ -172,9 +172,9 @@ module.exports = {
 
   axios: {
     // baseURL: '//192.168.1.44:10091/api/' // 本机开发使用
-     // baseURL: '//localhost:10091/api/' // 本机开发使用
+     baseURL: '//localhost:10091/api/' // 本机开发使用
     // baseURL: '//192.168.1.41:10091/api/' // 本机开发使用
-    baseURL: '//192.168.124.13:10091/api/' // 本机开发使用
+    // baseURL: '//192.168.124.13:10091/api/' // 本机开发使用
 
     /* --------Nuxt Start发版用 START-------------- */
     // baseURL: '/api/'

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis-year-check/index.vue

@@ -36,7 +36,7 @@
         <el-table-column label="操作" header-align="center" width="210" align="center" fixed>
           <template slot-scope="scope">
               <el-button type="text" v-if="editeBoolean"  size="small" icon="el-icon-edit"  @click="onNavigateScore(scope.row)">编辑</el-button>
-              <el-button type="text"   size="small" icon="el-icon-edit"  @click="onNavigateScore(scope.row)">查看</el-button>
+              <el-button type="text" v-else  size="small" icon="el-icon-edit"  @click="onNavigateScore(scope.row)">查看</el-button>
 
               <el-popover placement="top" title="提示" :ref="'popover-' + `${scope.$index}`">
                 <el-alert
@@ -280,10 +280,10 @@
                 return '待交费'
               break;
               case 7:
-                return '待入库'
+                return '待企管法规处审批'
               break;
               case 8:
-                return '完成'
+                return '已完成'
               break;
               default:
                 return '审核未通过'

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis-year/_opera/baselist.vue

@@ -138,38 +138,45 @@
         var list = []
         for(var index in item){
           var data = {
-            value : '1',
             name : index
           }
           if(index=='B1'){
+            data.value = item['B1']
             data.key = '法人资格和相应的资质证明文件应满足要求且持续有效'
             list[0] = data
           }
           if(index=='B2'){
+            data.value = item['B2']
             data.key = '国家有关部门、行业颁发的生产经营、安全生产许可证应满足要求且持续有效'
             list[1] = data
           }
           if(index=='B3'){
+            data.value = item['B3']
             data.key = '质量、职业健康与安全、环境管理体系应通过认证且持续有效'
             list[2] = data
           }
           if(index=='B4'){
+            data.value = item['B4']
             data.key = '近一年内未发生较大及以上质量、生产安全事故和严重环境污染事件'
             list[3] = data
           }
           if(index=='B5'){
+            data.value = item['B5']
             data.key = '应继续保持具有与其资质等级相适应的生产经营能力、良好业绩及社会信誉'
             list[4] = data
           }
           if(index=='B6'){
+            data.value = item['B6']
             data.key = '未发生违规分包和违法转包，允许其他企业挂靠、出借资质证明文件及有关资格证书的情况'
             list[5] = data
           }
           if(index=='B7'){
+            data.value = item['B7']
             data.key = '未发生严重扰乱集团公司工程建设市场秩序、提供虚假材料和信息的行为'
             list[6] = data
           }
           if(index=='B8'){
+            data.value = item['B8']
             data.key = '承包商能在规定时间内向评价单位提交基本条件评价所需相关证明文件，办理评价相关手续'
             list[7] = data
           }

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

@@ -14,12 +14,12 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='7'&&auditBtn" @click="commonAuditClick(7)">企管法规处</el-button>
+           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='7'&&auditBtn" @click="commonAuditClick(7)">企管法规处审批</el-button>
            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='4'&&auditBtn" @click="commonAuditClick(4)">专业处室审核</el-button>
-           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='3'&&auditBtn" @click="commonAuditClick(3)">专业科室接收</el-button>
+           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='3'&&auditBtn" @click="commonAuditClick(3)">专业处室分办</el-button>
            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='2'&&auditBtn" @click="commonAuditClick(2)">复审</el-button>
            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='1'&&auditBtn" @click="commonAuditClick(1)">初审</el-button>
-           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='0'&&formData.Id!=0" @click="commonAuditClick(0)">提交审核</el-button>
+           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='0'&&formData.Id!=0&&checkBoolean" @click="commonAuditClick(0)">提交审核</el-button>
 
 
           <el-button type="primary" size="mini" v-if="formData.Status=='0'||(formData.Status=='4'&&auditBtn)" @click="saveEntity">保存</el-button>
@@ -190,7 +190,7 @@
         </el-tab-pane>
 
          <!-- :disabled="formData.Status==0" -->
-        <el-tab-pane label="审批流程" name="6" v-if="formData.Id!=0">
+        <el-tab-pane label="审批流程" name="6" v-if="formData.Id!=0&&formData.Status!=0">
           <el-card class="box-card mycard">
             <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
           </el-card>
@@ -320,6 +320,7 @@
         //supervisersOptions: [],
 
         departmentBoolean:false,
+        checkBoolean:false,
       }
     },
     watch:{
@@ -355,6 +356,19 @@
         }).catch(err => {
           console.error(err)
         })
+        var data = {
+          percode:'oil_contract.SumStore.Check',
+        }
+        permissionApi.permissionIsauth(data, this.$axios).then(res => {
+          console.log('权限',res.data)
+          if(res.data.code==0){
+            if(res.data.message=='有权限'){
+              this.checkBoolean = true
+            }
+          }
+        }).catch(err => {
+          console.error(err)
+        })
       },
       //刷新数据接口
       refreshPage(){

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis/_opera/evaluate.vue

@@ -19,7 +19,7 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='3'&&auditBtn" @click="commonAuditClick(3)">专业处室分办</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='2'&&auditBtn" @click="commonAuditClick(2)">复审</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='1'&&auditBtn" @click="commonAuditClick(1)">初审</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="Number(formData.Status)<=0&&formData.Id!=0" @click="commonAuditClick(0)">提交审核</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="Number(formData.Status)<=0&&formData.Id!=0&&checkBUtton" @click="commonAuditClick(0)">提交审核</el-button>
 
       <!--    <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick(7)">企管法规处</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick(4)">专业处室审核</el-button>
@@ -205,6 +205,7 @@
         auditstepcode:'',
 
         departmentBoolean:false,
+        checkBUtton:false,//提交审核按钮
 
       }
     },
@@ -248,6 +249,20 @@
         }).catch(err => {
           console.error(err)
         })
+        var data = {
+          percode:'oil_contract.Review.Check',
+        }
+        permissionApi.permissionIsauth(data, this.$axios).then(res => {
+          console.log('权限',res.data)
+          if(res.data.code==0){
+            if(res.data.message=='有权限'){
+              this.checkBUtton = true
+            }
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+
       },
       //刷新数据接口
       refreshPage(){
@@ -342,7 +357,7 @@
                 this.updateEvaluate()
               }
             } else {
-              this.$message.error('业绩评价填写的分数有误'); 
+              this.$message.error('业绩评价填写的分数有误');
             }
           })
         }else{//专业处室评价

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis/index.vue

@@ -38,7 +38,7 @@
         <el-table-column label="操作" min-width="210" align="center" fixed>
           <template slot-scope="scope">
             <el-button v-if="editeBoolean" type="text" title="编辑" size="small" icon="el-icon-edit" @click="onNavigateEvaluate(scope.row)">编辑</el-button>
-            <el-button  type="text" title="编辑" size="small" icon="el-icon-edit" @click="onNavigateEvaluate(scope.row)">查看</el-button>
+            <el-button v-else type="text" title="编辑" size="small" icon="el-icon-edit" @click="onNavigateEvaluate(scope.row)">查看</el-button>
             <el-popover placement="top" title="提示" :ref="'popover-' + `${scope.$index}`">
               <el-alert
                 title=""

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods-year-check/index.vue

@@ -45,7 +45,7 @@
         <el-table-column label="操作" min-width="210" align="center" fixed>
           <template slot-scope="scope">
               <el-button type="text"  v-if="editeBoolean" size="small" icon="el-icon-edit"  @click="onNavigateScore(scope.row)">编辑</el-button>
-              <el-button type="text"   size="small" icon="el-icon-edit"  @click="onNavigateScore(scope.row)">查看</el-button>
+              <el-button type="text"  v-else size="small" icon="el-icon-edit"  @click="onNavigateScore(scope.row)">查看</el-button>
 
             <el-popover placement="top" title="提示" :ref="'popover-' + `${scope.$index}`">
               <el-alert
@@ -248,16 +248,13 @@
                 return '待交费'
               break;
               case 7:
-                return '待入库'
+                return '待企管法规处审批'
               break;
               case 8:
-                return '完成'
-              break;
-              case 9:
-                return '审核未通过'
+                return '已完成'
               break;
               default:
-                return '--'
+                return '审核未通过'
               break;
             }
         }
@@ -326,7 +323,7 @@
         }).catch(err => {
           console.error(err)
         })
-      
+
         var data = {
           percode:'oil_contract.SumStore.Edit',
         }

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods-year/_opera/baselist.vue

@@ -138,38 +138,45 @@
         var list = []
         for(var index in item){
           var data = {
-            value : '1',
             name : index
           }
           if(index=='B1'){
+            data.value = item['B1']
             data.key = '法人资格和相应的资质证明文件应满足要求且持续有效'
             list[0] = data
           }
           if(index=='B2'){
+            data.value = item['B2']
             data.key = '国家有关部门、行业颁发的生产经营、安全生产许可证应满足要求且持续有效'
             list[1] = data
           }
           if(index=='B3'){
+            data.value = item['B3']
             data.key = '质量、职业健康与安全、环境管理体系应通过认证且持续有效'
             list[2] = data
           }
           if(index=='B4'){
+            data.value = item['B4']
             data.key = '近一年内未发生较大及以上质量、生产安全事故和严重环境污染事件'
             list[3] = data
           }
           if(index=='B5'){
+            data.value = item['B5']
             data.key = '应继续保持具有与其资质等级相适应的生产经营能力、良好业绩及社会信誉'
             list[4] = data
           }
           if(index=='B6'){
+            data.value = item['B6']
             data.key = '未发生违规分包和违法转包，允许其他企业挂靠、出借资质证明文件及有关资格证书的情况'
             list[5] = data
           }
           if(index=='B7'){
+            data.value = item['B7']
             data.key = '未发生严重扰乱集团公司工程建设市场秩序、提供虚假材料和信息的行为'
             list[6] = data
           }
           if(index=='B8'){
+            data.value = item['B8']
             data.key = '承包商能在规定时间内向评价单位提交基本条件评价所需相关证明文件，办理评价相关手续'
             list[7] = data
           }

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

@@ -14,12 +14,12 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='7'&&auditBtn" @click="commonAuditClick(7)">企管法规处</el-button>
+           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='7'&&auditBtn" @click="commonAuditClick(7)">企管法规处审批</el-button>
            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='4'&&auditBtn" @click="commonAuditClick(4)">专业处室审核</el-button>
-           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='3'&&auditBtn" @click="commonAuditClick(3)">专业科室接收</el-button>
+           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='3'&&auditBtn" @click="commonAuditClick(3)">专业处室分办</el-button>
            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='2'&&auditBtn" @click="commonAuditClick(2)">复审</el-button>
            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='1'&&auditBtn" @click="commonAuditClick(1)">初审</el-button>
-           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='0'&&formData.Id!=0" @click="commonAuditClick(0)">提交审核</el-button>
+           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='0'&&formData.Id!=0&&checkBoolean" @click="commonAuditClick(0)">提交审核</el-button>
 
 
           <el-button type="primary" size="mini" v-if="formData.Status=='0'||(formData.Status=='4'&&auditBtn)" @click="saveEntity">保存</el-button>
@@ -33,41 +33,46 @@
             <el-form label-width="160px" ref="EntityForm" :model="evaluateData" :rules="rules">
               <el-row>
                 <el-col :span="8">
-                  <el-form-item label="服务商名称">
+                  <el-form-item label="供应商名称">
                     <el-input disabled="disabled" v-model="evaluateData.SupplierName"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
-            
+
                 <el-col :span="8">
                   <el-form-item label="评价得分" prop="SumScore">
                     <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore" ::max="100" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
-            
+
                 <el-col :span="8" >
-                  <el-form-item label="项目管理(40分)" prop="SumScore1">
+                  <el-form-item label="产品质量(30分)" prop="SumScore1">
                     <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore1" :max="10" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
-            
+
                 <el-col :span="8" >
-                  <el-form-item label="HES管理(30分)" prop="SumScore2">
+                  <el-form-item label="合同履行(20分)" prop="SumScore2">
                     <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore2" :max="20" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
-            
+
                 <el-col :span="8" >
-                  <el-form-item label="合同履行(15分)" prop="SumScore3">
+                  <el-form-item label="售后服务(15分)" prop="SumScore3">
                     <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore3" :max="20" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
-            
+
                 <el-col :span="8" >
-                  <el-form-item label="企业诚信(15分)" prop="SumScore4">
+                  <el-form-item label="诚信经营(15分)" prop="SumScore4">
                     <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore4" :max="5" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
-            
+
+                <el-col :span="8" >
+                  <el-form-item label="协同响应(20分)" prop="SumScore5">
+                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore5" :max="10" :min="0" placeholder="请输入"  style="width: 100%" />
+                  </el-form-item>
+                </el-col>
                 <el-col :span="8" >
                   <el-form-item label="评价结果" prop="Conclusion">
                     <el-select :disabled="!auditBtnBoolean" v-model="evaluateData.Conclusion" placeholder="请选择" style="width: 100%">
@@ -170,7 +175,7 @@
         </el-tab-pane>
 
          <!-- :disabled="formData.Status==0" -->
-        <el-tab-pane label="审批流程" name="6" v-if="formData.Id!=0">
+        <el-tab-pane label="审批流程" name="6" v-if="formData.Id!=0&&formData.Status!=0">
           <el-card class="box-card mycard">
             <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
           </el-card>
@@ -300,6 +305,7 @@
         //supervisersOptions: [],
 
         departmentBoolean:false,
+        checkBoolean:false,
       }
     },
     watch:{
@@ -335,6 +341,20 @@
         }).catch(err => {
           console.error(err)
         })
+        var data = {
+          percode:'oil_contract.SumStore.Check',
+        }
+        permissionApi.permissionIsauth(data, this.$axios).then(res => {
+          console.log('权限',res.data)
+          if(res.data.code==0){
+            if(res.data.message=='有权限'){
+              this.checkBoolean = true
+            }
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+        
       },
       //刷新数据接口
       refreshPage(){

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods/_opera/evaluate.vue

@@ -4,14 +4,14 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/oilcontract/contract-basis' }">承包商合同表</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilcontract/contract-basis' }">供应商合同表</el-breadcrumb-item>
       <el-breadcrumb-item>编辑</el-breadcrumb-item>
     </el-breadcrumb>
 
     <el-card class="box-card" style="mini-height: calc(100vh - 113px);">
       <div slot="header">
         <span>
-          <i class="icon icon-table2"></i> 编辑 - 承包商合同
+          <i class="icon icon-table2"></i> 编辑 - 供应商合同
         </span>
         <span style="float: right;">
           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='7'&&auditBtn" @click="commonAuditClick(7)">企管法规处审批</el-button>
@@ -19,7 +19,7 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='3'&&auditBtn" @click="commonAuditClick(3)">专业处室分办</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='2'&&auditBtn" @click="commonAuditClick(2)">复审</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='1'&&auditBtn" @click="commonAuditClick(1)">初审</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="Number(formData.Status)<=0&&formData.Id!=0" @click="commonAuditClick(0)">提交审核</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="Number(formData.Status)<=0&&formData.Id!=0&&checkBUtton" @click="commonAuditClick(0)">提交审核</el-button>
 
       <!--    <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick(7)">企管法规处</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick(4)">专业处室审核</el-button>
@@ -205,6 +205,7 @@
         auditstepcode:'',
 
         departmentBoolean:false,
+        checkBUtton:false,
 
       }
     },
@@ -248,6 +249,19 @@
         }).catch(err => {
           console.error(err)
         })
+        var data = {
+          percode:'oil_contract.Review.Check',
+        }
+        permissionApi.permissionIsauth(data, this.$axios).then(res => {
+          console.log('权限',res.data)
+          if(res.data.code==0){
+            if(res.data.message=='有权限'){
+              this.checkBUtton = true
+            }
+          }
+        }).catch(err => {
+          console.error(err)
+        })
       },
       //刷新数据接口
       refreshPage(){

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods/index.vue

@@ -38,7 +38,7 @@
         <el-table-column label="操作" min-width="210" align="center" fixed>
           <template slot-scope="scope">
             <el-button type="text" v-if="editeBoolean" title="编辑" size="small" icon="el-icon-edit" @click="onNavigateEvaluate(scope.row)">编辑</el-button>
-            <el-button  type="text"  size="small" icon="el-icon-edit" @click="onNavigateEvaluate(scope.row)">查看</el-button>
+            <el-button  type="text" v-else size="small" icon="el-icon-edit" @click="onNavigateEvaluate(scope.row)">查看</el-button>
 
             <el-popover placement="top" title="提示" :ref="'popover-' + `${scope.$index}`">
               <el-alert
@@ -219,16 +219,13 @@
                 return '待交费'
               break;
               case 7:
-                return '待入库'
+                return '待企管法规处审批'
               break;
               case 8:
-                return '完成'
-              break;
-              case 9:
-                return '审核未通过'
+                return '已完成'
               break;
               default:
-                return '--'
+                return '审核未通过'
               break;
             }
           }else{

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

@@ -16,7 +16,7 @@
         <span style="float: right;">
           <!-- v-if="formData.Id!=0&&formData.Status==7" -->
           <el-button type="primary" size="mini" v-if="issueVisibleButton" @click="issueVisible=true">下发</el-button>
-          <el-button type="primary" size="mini" v-if="successBoolean" @click="onFinish">完结</el-button>
+          <el-button type="primary" size="mini" v-if="succseButton" @click="onFinish">完结</el-button>
           <el-button type="primary" size="mini" v-if="successBoolean"  @click="exportExcel">导出</el-button>
           <el-button type="primary" size="mini" :loading="addloading" @click="saveEntity">保存</el-button>
           <router-link :to="'/oilcontract/contract-import'">
@@ -69,7 +69,7 @@
 
           <el-col :span="8">
             <el-form-item label="联系人电话" prop="Telephone">
-              <el-input v-model="formData.Telephone" placeholder="请输入" type="number" maxlength="11" style="width: 100%"></el-input>
+              <el-input v-model="formData.Telephone" placeholder="请输入"  maxlength="11" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
 
@@ -414,6 +414,7 @@
         //supervisersOptions: [],
         successBoolean:false,
         issueVisibleButton:false,
+        succseButton:false,
 
       }
     },
@@ -453,6 +454,19 @@
         }).catch(err => {
           console.error(err)
         })
+        var data = {
+          percode:'oil_contract_finish',
+        }
+        permissionApi.permissionIsauth(data, this.$axios).then(res => {
+          console.log('权限',res.data)
+          if(res.data.code==0){
+            if(res.data.message=='有权限'){
+              this.succseButton = true
+            }
+          }
+        }).catch(err => {
+          console.error(err)
+        })
       },
       //合同完结
       onFinish(){

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service-year-check/index.vue

@@ -48,7 +48,7 @@
         <el-table-column label="操作" min-width="210" align="center" fixed>
           <template slot-scope="scope">
               <el-button type="text" v-if="editeBoolean" size="small" icon="el-icon-edit"  @click="onNavigateScore(scope.row)">编辑</el-button>
-              <el-button type="text"   size="small" icon="el-icon-edit"  @click="onNavigateScore(scope.row)">查看</el-button>
+              <el-button type="text" v-else  size="small" icon="el-icon-edit"  @click="onNavigateScore(scope.row)">查看</el-button>
 
             <el-popover placement="top" title="提示" :ref="'popover-' + `${scope.$index}`">
               <el-alert
@@ -256,10 +256,10 @@
                 return '待交费'
               break;
               case 7:
-                return '待入库'
+                return '待企管法规处审批'
               break;
               case 8:
-                return '完成'
+                return '已完成'
               break;
               default:
                 return '审核未通过'

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service-year/_opera/baselist.vue

@@ -138,38 +138,45 @@
         var list = []
         for(var index in item){
           var data = {
-            value : '1',
             name : index
           }
           if(index=='B1'){
+            data.value = item['B1']
             data.key = '法人资格和相应的资质证明文件应满足要求且持续有效'
             list[0] = data
           }
           if(index=='B2'){
+            data.value = item['B2']
             data.key = '国家有关部门、行业颁发的生产经营、安全生产许可证应满足要求且持续有效'
             list[1] = data
           }
           if(index=='B3'){
+            data.value = item['B3']
             data.key = '质量、职业健康与安全、环境管理体系应通过认证且持续有效'
             list[2] = data
           }
           if(index=='B4'){
+            data.value = item['B4']
             data.key = '近一年内未发生较大及以上质量、生产安全事故和严重环境污染事件'
             list[3] = data
           }
           if(index=='B5'){
+            data.value = item['B5']
             data.key = '应继续保持具有与其资质等级相适应的生产经营能力、良好业绩及社会信誉'
             list[4] = data
           }
           if(index=='B6'){
+            data.value = item['B6']
             data.key = '未发生违规分包和违法转包，允许其他企业挂靠、出借资质证明文件及有关资格证书的情况'
             list[5] = data
           }
           if(index=='B7'){
+            data.value = item['B7']
             data.key = '未发生严重扰乱集团公司工程建设市场秩序、提供虚假材料和信息的行为'
             list[6] = data
           }
           if(index=='B8'){
+            data.value = item['B8']
             data.key = '承包商能在规定时间内向评价单位提交基本条件评价所需相关证明文件，办理评价相关手续'
             list[7] = data
           }

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

@@ -14,12 +14,12 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='7'&&auditBtn" @click="commonAuditClick(7)">企管法规处</el-button>
+           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='7'&&auditBtn" @click="commonAuditClick(7)">企管法规处审批</el-button>
            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='4'&&auditBtn" @click="commonAuditClick(4)">专业处室审核</el-button>
-           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='3'&&auditBtn" @click="commonAuditClick(3)">专业科室接收</el-button>
+           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='3'&&auditBtn" @click="commonAuditClick(3)">专业处室分办</el-button>
            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='2'&&auditBtn" @click="commonAuditClick(2)">复审</el-button>
            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='1'&&auditBtn" @click="commonAuditClick(1)">初审</el-button>
-           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='0'&&formData.Id!=0" @click="commonAuditClick(0)">提交审核</el-button>
+           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='0'&&formData.Id!=0&&checkBoolean" @click="commonAuditClick(0)">提交审核</el-button>
 
 
           <el-button type="primary" size="mini" v-if="formData.Status=='0'||(formData.Status=='4'&&auditBtn)" @click="saveEntity">保存</el-button>
@@ -33,7 +33,7 @@
             <el-form label-width="160px" ref="EntityForm" :model="evaluateData" :rules="rules">
               <el-row>
                 <el-col :span="8">
-                  <el-form-item label="承包商名称">
+                  <el-form-item label="服务商名称">
                     <el-input disabled="disabled" v-model="evaluateData.SupplierName"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
@@ -45,49 +45,29 @@
                 </el-col>
 
                 <el-col :span="8" >
-                  <el-form-item label="项目组织实施(10分)" prop="SumScore1">
+                  <el-form-item label="项目管理(40分)" prop="SumScore1">
                     <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore1" :max="10" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8" >
-                  <el-form-item label="项目质量管理(20分)" prop="SumScore2">
+                  <el-form-item label="HES管理(30分)" prop="SumScore2">
                     <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore2" :max="20" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8" >
-                  <el-form-item label="项目职业健康安全与环境管理(20分)" prop="SumScore3">
+                  <el-form-item label="合同履行(15分)" prop="SumScore3">
                     <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore3" :max="20" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8" >
-                  <el-form-item label="项目成本管理(5分)" prop="SumScore4">
+                  <el-form-item label="企业诚信(15分)" prop="SumScore4">
                     <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore4" :max="5" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="8" >
-                  <el-form-item label="项目进度管理(10分)" prop="SumScore5">
-                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore5" :max="10" :min="0" placeholder="请输入"  style="width: 100%" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8" >
-                  <el-form-item label="项目分包管理(15分)" prop="SumScore6">
-                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore6" :max="15" :min="0" placeholder="请输入"  style="width: 100%" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8" >
-                  <el-form-item label="信息资料管理(10分)" prop="SumScore7">
-                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore7" :max="10" :min="0" placeholder="请输入"  style="width: 100%" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8" >
-                  <el-form-item label="诚信履约(10分)" prop="SumScore8">
-                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore8" :max="10" :min="0" placeholder="请输入"  style="width: 100%" />
-                  </el-form-item>
-                </el-col>
                 <el-col :span="8" >
                   <el-form-item label="评价结果" prop="Conclusion">
                     <el-select :disabled="!auditBtnBoolean" v-model="evaluateData.Conclusion" placeholder="请选择" style="width: 100%">
@@ -190,7 +170,7 @@
         </el-tab-pane>
 
          <!-- :disabled="formData.Status==0" -->
-        <el-tab-pane label="审批流程" name="6" v-if="formData.Id!=0">
+        <el-tab-pane label="审批流程" name="6" v-if="formData.Id!=0&&formData.Status!=0">
           <el-card class="box-card mycard">
             <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
           </el-card>
@@ -320,6 +300,7 @@
         //supervisersOptions: [],
 
         departmentBoolean:false,
+        checkBoolean:false,
       }
     },
     watch:{
@@ -355,6 +336,19 @@
         }).catch(err => {
           console.error(err)
         })
+        var data = {
+          percode:'oil_contract.SumStore.Check',
+        }
+        permissionApi.permissionIsauth(data, this.$axios).then(res => {
+          console.log('权限',res.data)
+          if(res.data.code==0){
+            if(res.data.message=='有权限'){
+              this.checkBoolean = true
+            }
+          }
+        }).catch(err => {
+          console.error(err)
+        })
       },
       //刷新数据接口
       refreshPage(){

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service/_opera/evaluate.vue

@@ -4,14 +4,14 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/oilcontract/contract-basis' }">承包商合同表</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilcontract/contract-basis' }">服务商合同表</el-breadcrumb-item>
       <el-breadcrumb-item>编辑</el-breadcrumb-item>
     </el-breadcrumb>
 
     <el-card class="box-card" style="mini-height: calc(100vh - 113px);">
       <div slot="header">
         <span>
-          <i class="icon icon-table2"></i> 编辑 - 承包商合同
+          <i class="icon icon-table2"></i> 编辑 - 服务商合同
         </span>
         <span style="float: right;">
           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='7'&&auditBtn" @click="commonAuditClick(7)">企管法规处审批</el-button>
@@ -19,7 +19,7 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='3'&&auditBtn" @click="commonAuditClick(3)">专业处室分办</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='2'&&auditBtn" @click="commonAuditClick(2)">复审</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='1'&&auditBtn" @click="commonAuditClick(1)">初审</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="Number(formData.Status)<=0&&formData.Id!=0" @click="commonAuditClick(0)">提交审核</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="Number(formData.Status)<=0&&formData.Id!=0&&checkBUtton" @click="commonAuditClick(0)">提交审核</el-button>
 
       <!--    <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick(7)">企管法规处</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick(4)">专业处室审核</el-button>
@@ -49,7 +49,7 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="承包项目名称">
+                  <el-form-item label="服务项目名称">
                     <el-input :disabled="disabled" v-model="contractData.ProjectName" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
@@ -205,6 +205,7 @@
         auditstepcode:'',
 
         departmentBoolean:false,
+        checkBUtton:false,
 
       }
     },
@@ -248,6 +249,19 @@
         }).catch(err => {
           console.error(err)
         })
+        var data = {
+          percode:'oil_contract.Review.Check',
+        }
+        permissionApi.permissionIsauth(data, this.$axios).then(res => {
+          console.log('权限',res.data)
+          if(res.data.code==0){
+            if(res.data.message=='有权限'){
+              this.checkBUtton = true
+            }
+          }
+        }).catch(err => {
+          console.error(err)
+        })
       },
       //刷新数据接口
       refreshPage(){

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service/index.vue

@@ -38,7 +38,7 @@
         <el-table-column label="操作" min-width="210" align="center" fixed>
           <template slot-scope="scope">
             <el-button v-if="editeBoolean" type="text" title="编辑" size="small" icon="el-icon-edit" @click="onNavigateEvaluate(scope.row)">编辑</el-button>
-            <el-button  type="text" title="编辑" size="small" icon="el-icon-edit" @click="onNavigateEvaluate(scope.row)">查看</el-button>
+            <el-button v-else type="text" title="编辑" size="small" icon="el-icon-edit" @click="onNavigateEvaluate(scope.row)">查看</el-button>
 
             <el-popover placement="top" title="提示" :ref="'popover-' + `${scope.$index}`">
               <el-alert
@@ -220,16 +220,13 @@
                 return '待交费'
               break;
               case 7:
-                return '待入库'
+                return '待企管法规处审批'
               break;
               case 8:
-                return '完成'
-              break;
-              case 9:
-                return '审核未通过'
+                return '已完成'
               break;
               default:
-                return '--'
+                return '审核未通过'
               break;
             }
           }else{