修改bug2

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

@@ -171,10 +171,10 @@ module.exports = {
 
 
   axios: {
-    //baseURL: '//192.168.1.44:10091/api/' // 本机开发使用
-     baseURL: '//localhost:10091/api/' // 本机开发使用
+    // baseURL: '//192.168.1.44: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/_opera/operation.vue

@@ -190,7 +190,7 @@
         </el-tab-pane>
 
          <!-- :disabled="formData.Status==0" -->
-        <el-tab-pane label="审批流程" name="6" >
+        <el-tab-pane label="审批流程" name="6" v-if="formData.Id!=0">
           <el-card class="box-card mycard">
             <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
           </el-card>
@@ -318,7 +318,7 @@
         //下拉选择项
         //wellNoOptions: [],
         //supervisersOptions: [],
-        
+
         departmentBoolean:false,
       }
     },

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

@@ -109,7 +109,7 @@
           <base-list ref="evaluation_listType_one" :evaluateId="formData.Id"  category="0" :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBoolean"></base-list>
         </el-tab-pane>
         <el-tab-pane  v-if="departmentBoolean&&contractData.ContractClass=='02'" label="专业处室基本条件评价" name="5">
-          <base-list ref="evaluation_listtype_two" :evaluateId="formData.Id"  category="1" :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBooleanZhuan"></base-list>
+          <base-list ref="evaluation_listType_two" :evaluateId="formData.Id"  category="1" :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBooleanZhuan"></base-list>
         </el-tab-pane>
 
         <el-tab-pane label="审批流程" name="6" :disabled="formData.Status==0">
@@ -217,7 +217,8 @@
       // this.getDictOptions();
 
       this.IsFinal   = this.$route.query.IsFinal;
-      if(this.IsFinal==undefined || this.IsFinal == "") this.IsFinal = 0; 
+      
+      if(this.IsFinal==undefined || this.IsFinal == "") this.IsFinal = 0;
 
       if(this.serviceId != 'add' && this.serviceId>0) {
         this.formData.Id = this.serviceId;
@@ -355,7 +356,6 @@
       },
       //专业处室评价
       majorEvaluate(){
-
         var formData = this.evaluation_list
         api.saveSecEvaluation(this.formData.Id,formData, this.$axios).then(res => {
           console.log('新增',res)
@@ -376,7 +376,7 @@
         var formData = {
           ContractId:this.contractData.Id,
           Items:this.evaluation_list,
-          IsFinal:this.IsFinal,           //是否履行，最终
+          IsFinal:Number(this.IsFinal) ,           //是否履行，最终
         }
         api.addContractEvaluate(formData, this.$axios).then(res => {
           console.log('新增',res)

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

@@ -38,6 +38,7 @@
         <el-table-column label="操作" min-width="160" 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-popover placement="top" title="提示" :ref="'popover-' + `${scope.$index}`">
               <el-alert
                 title=""

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

@@ -138,7 +138,7 @@
         var list = []
         for(var index in item){
           var data = {
-            value : item[index],
+            value : '1',
             name : index
           }
           if(index=='B1'){
@@ -169,7 +169,7 @@
             data.key = '未发生严重扰乱集团公司工程建设市场秩序、提供虚假材料和信息的行为'
             list[6] = data
           }
-          if(index=='B7'){
+          if(index=='B8'){
             data.key = '承包商能在规定时间内向评价单位提交基本条件评价所需相关证明文件，办理评价相关手续'
             list[7] = data
           }

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

@@ -21,6 +21,7 @@
            <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" v-if="formData.Status=='0'||(formData.Status=='4'&&auditBtn)" @click="saveEntity">保存</el-button>
           <el-button @click="onBack" type="primary" size="mini" style="margin-left: 8px">返回</el-button>
         </span>
@@ -32,46 +33,41 @@
             <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="产品质量(30分)" 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="售后服务(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%">
@@ -96,7 +92,7 @@
         </el-tab-pane>
 
         <!-- 专业处室 -->
-        <el-tab-pane label="专业处室评价信息" name="3" v-if="(formData.Status=='4'||Number(formData.Status)>4)&&formData.ContractClass=='02'">
+        <el-tab-pane label="专业处室评价信息" name="3" v-if="departmentBoolean&&formData.ContractClass=='02'">
           <el-card class="box-card" style="mini-height: calc(100vh - 113px);">
             <el-form label-width="160px" ref="EntityForm" :model="evaluateDataZhuan" :rules="rules">
               <el-row>
@@ -169,12 +165,12 @@
           </el-card>
         </el-tab-pane>
         <!-- 专业处室 -->
-        <el-tab-pane label="专业处室条件评价" name="4" v-if="(formData.Status=='4'||Number(formData.Status)>4)&&formData.ContractClass=='02'">
+        <el-tab-pane label="专业处室条件评价" name="4" v-if="departmentBoolean&&formData.ContractClass=='02'">
           <baseList ref="evaluateDataZhuanRef" :baseData="evaluateDataZhuan" :evaluateId="formData.Id" :category="1" :ContractClass="formData.ContractClass" :disabledForm="auditBtnBooleanZhuan"></baseList>
         </el-tab-pane>
 
          <!-- :disabled="formData.Status==0" -->
-        <el-tab-pane label="审批流程" name="6" >
+        <el-tab-pane label="审批流程" name="6" v-if="formData.Id!=0">
           <el-card class="box-card mycard">
             <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
           </el-card>
@@ -198,6 +194,7 @@
   import baseList from './baselist'
   import WfHistory from '@/components/workflow/wfhistory.vue'
   import apiCert from '@/api/oilsupplier/suppliercert'
+  import permissionApi from '@/api/oilcontract/permission';
   export default {
     computed: {
       ...mapGetters({
@@ -302,6 +299,7 @@
         //wellNoOptions: [],
         //supervisersOptions: [],
 
+        departmentBoolean:false,
       }
     },
     watch:{
@@ -319,9 +317,25 @@
          this.nowItem = this.$route.query.item
          this.initPage(this.$route.query.item)
       }
-
+      this.statusFun()
     },
     methods: {
+      //状态判断
+      statusFun(){
+        var data = {
+          percode:'oil_contract.SumStore.Department',
+        }
+        permissionApi.permissionIsauth(data, this.$axios).then(res => {
+          console.log('权限',res.data)
+          if(res.data.code==0){
+            if(res.data.message=='有权限'){
+              this.departmentBoolean = true
+            }
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       //刷新数据接口
       refreshPage(){
         //拿id查审核流程
@@ -373,7 +387,7 @@
         this.evaluateData.SumScore6    = item.Score6
         this.evaluateData.SumScore7    = item.Score7
         this.evaluateData.SumScore8    = item.Score8
-        this.evaluateData.Conclusion   = item.Evaluate
+        this.evaluateData.Conclusion   = Number(item.Evaluate)
         // this.getList()
       },
       // 获取编辑信息
@@ -385,6 +399,7 @@
             var item = res.data
             this.formData                  = res.data;
             this.evaluateData              = res.data;
+            this.evaluateData.Conclusion   = Number(item.Conclusion)
             this.entrydetail.business      = item.Id
             this.entrydetail.instance      = item.WorkflowId
             this.entrydetail.process       = item.ProcessKey
@@ -403,6 +418,7 @@
             console.log('用id去查详情信息',res)
             var item = res.data
             this.evaluateDataZhuan         = res.data;
+            this.evaluateDataZhuan.Conclusion   = Number(item.Conclusion)
           }).catch(err => {
             console.error(err)
           });
@@ -454,11 +470,6 @@
           this.evaluateDataZhuan['B'+i] = parseInt(this.typeList[i-1].value)
         }
         var formData = this.evaluateDataZhuan
-        // formData.Id = this.formData.Id
-        // {
-        //   evaluateId:this.formData.Id,
-        //   Items:this.evaluateDataZhuan,
-        // }
         api.saveSecEvaluation(this.formData.Id,formData, this.$axios).then(res => {
           console.log('新增',res)
           if(res.data.code==0){

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods/_opera/evaluate.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=='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="Number(formData.Status)<=0&&formData.Id!=0" @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>
@@ -27,7 +27,7 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick(2)">复审</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick(1)">提交审核</el-button> -->
 
-          <el-button type="primary" size="mini" v-if="formData.Status=='0'||(formData.Status=='4'&&auditBtn)" @click="onSeaveBigAdd">保存</el-button>
+          <el-button type="primary" size="mini" v-if="Number(formData.Status)<=0||(formData.Status=='4'&&auditBtn)" @click="onSeaveBigAdd">保存</el-button>
           <el-button @click="onBack" type="primary" size="mini" style="margin-left: 8px">返回</el-button>
         </span>
       </div>
@@ -40,58 +40,63 @@
                 <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
               </span> -->
             </div>
-            <el-form label-width="110px" ref="EntityForm" :model="formData">
+            <el-form label-width="160px" ref="EntityForm" :model="evaluateData" :rules="rules">
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="供应商名称">
-                    <el-select ref="SupplierSelect" v-model="contractData.SupplierName" :disabled="true" placeholder="请选择" style="width: 100%" ></el-select>
+                    <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="供应项目名称">
-                    <el-input :disabled="disabled" v-model="contractData.ProjectName" placeholder="请输入"  style="width: 100%"></el-input>
+                  <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="工程地点" >
-                    <el-input :disabled="disabled" v-model="contractData.ProjectPlace" placeholder="请输入"  style="width: 100%"></el-input>
+            
+                <el-col :span="8" >
+                  <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="合同编号">
-                    <el-input :disabled="disabled" v-model="contractData.ContractNo" placeholder="请输入"  style="width: 100%"></el-input>
+            
+                <el-col :span="8" >
+                  <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="项目负责人" >
-                    <el-input :disabled="disabled" v-model="contractData.ProjectOwner" placeholder="请输入"  style="width: 100%"></el-input>
+            
+                <el-col :span="8" >
+                  <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="项目类别">
-                    <el-select :disabled="disabled" v-model="contractData.ProjectType" placeholder="请选择" style="width: 100%">
-                      <el-option key="1" label="咨询" value="1"></el-option>
-                      <el-option key="2" label="勘探" value="2"></el-option>
-                      <el-option key="3" label="设计" value="3"></el-option>
-                      <el-option key="4" label="施工" value="4"></el-option>
-                    </el-select>
+            
+                <el-col :span="8" >
+                  <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="是否分包">
-                    <!-- SubPackage -->
-                    <el-select :disabled="disabled" placeholder="请选择" v-model="contractData.SubPackage" style="width: 100%">
-                      <el-option :key="1" label="是" :value="1"></el-option>
-                      <el-option :key="2" label="否" :value="2"></el-option>
+            
+                <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%">
+                      <el-option :key="1" label="优秀" :value="1"></el-option>
+                      <el-option :key="2" label="合格" :value="2"></el-option>
+                      <el-option :key="3" label="不合格" :value="3"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
+                <el-col :span="24">
+                  <el-form-item label="备注">
+                    <el-input type="textarea" :disabled="!auditBtnBoolean" v-model="evaluateData.Note" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
               </el-row>
             </el-form>
 
@@ -100,16 +105,16 @@
         <el-tab-pane label="业绩评价" name="2"   >
           <evaluation-list ref="evaluation_list_one"   :evaluateId="formData.Id" category="0" :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBoolean"></evaluation-list>
         </el-tab-pane>
-
-        <el-tab-pane v-if="formData.Status=='4'||Number(formData.Status)>4" label="专业处室业绩评价" name="3" >
+        <!-- v-if="formData.Status=='4'||Number(formData.Status)>4" -->
+        <el-tab-pane  label="专业处室业绩评价" name="3" v-if="departmentBoolean">
           <evaluation-list ref="evaluation_list_two" :evaluateId="formData.Id"  category="1" :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBooleanZhuan"></evaluation-list>
         </el-tab-pane>
 
         <el-tab-pane label="基本条件评价" name="4" v-if="contractData.ContractClass=='02'">
           <base-list ref="evaluation_listType_one" :evaluateId="formData.Id"  category="0" :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBoolean"></base-list>
         </el-tab-pane>
-        <el-tab-pane  v-if="(formData.Status=='4'||Number(formData.Status)>4)&&contractData.ContractClass=='02'" label="专业处室基本条件评价" name="5">
-          <base-list ref="evaluation_listtype_two" :evaluateId="formData.Id"  category="1" :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBooleanZhuan"></base-list>
+        <el-tab-pane  v-if="departmentBoolean&&contractData.ContractClass=='02'" label="专业处室基本条件评价" name="5">
+          <base-list ref="evaluation_listType_two" :evaluateId="formData.Id"  category="1" :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBooleanZhuan"></base-list>
         </el-tab-pane>
 
         <el-tab-pane label="审批流程" name="6" :disabled="formData.Status==0">
@@ -146,6 +151,7 @@
   import WfHistory from '@/components/workflow/wfhistory.vue'
   import apiSupplier from '@/api/oilsupplier/supplier'
   import apiCert from '@/api/oilsupplier/suppliercert'
+  import permissionApi from '@/api/oilcontract/permission';
   export default {
     computed: {
       ...mapGetters({
@@ -203,6 +209,8 @@
         auditBtnBooleanZhuan:true,
         auditstepcode:'',
 
+        departmentBoolean:false,
+
       }
     },
     created() {
@@ -214,8 +222,8 @@
       // this.getDictOptions();
 
       this.IsFinal   = this.$route.query.IsFinal;
-      if(this.IsFinal==undefined || this.IsFinal == "") this.IsFinal = 0; 
 
+      if(this.IsFinal==undefined || this.IsFinal == "") this.IsFinal = 0;
 
       if(this.serviceId != 'add' && this.serviceId>0) {
         this.formData.Id = this.serviceId;
@@ -227,9 +235,25 @@
         this.approvalProcess.disabled = true
         this.contractData = this.$route.query.item
       }
-
+      this.statusFun()
     },
     methods: {
+      //状态判断
+      statusFun(){
+        var data = {
+          percode:'oil_contract.Review.Department',
+        }
+        permissionApi.permissionIsauth(data, this.$axios).then(res => {
+          console.log('权限',res.data)
+          if(res.data.code==0){
+            if(res.data.message=='有权限'){
+              this.departmentBoolean = true
+            }
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       //刷新数据接口
       refreshPage(){
         //拿id查审核流程
@@ -308,33 +332,35 @@
             this.evaluation_list = this.evaluation_list.concat(this.$refs.evaluation_listType_one.entityListData.entityList)
           }
           // 获取第一列评价格式
-          var fractionBoolean_1 = this.$refs.evaluation_list_one.fractionBoolean
-          if(fractionBoolean_1){
-            if(this.formData.Id == 0||this.formData.Id == undefined||this.formData.Id == null){
-              this.addEvaluate()
-            }else{
-              this.updateEvaluate()
+          // var fractionBoolean_1 = this.$refs.evaluation_list_one.fractionBoolean
+          this.$refs.evaluation_list_one.$refs.formEvaluation.validate((valid) => {
+            if (valid) {
+              if(this.formData.Id == 0||this.formData.Id == undefined||this.formData.Id == null){
+                this.addEvaluate()
+              }else{
+                this.updateEvaluate()
+              }
+            } else {
+              this.$message.error('业绩评价填写的分数有误');
             }
-          }else{
-            this.$message.error('业绩评价填写的分数有误');
-          }
+          })
         }else{//专业处室评价
           this.evaluation_list = this.$refs.evaluation_list_two.entityListData.entityList
           if(this.contractData.ContractClass=='02'){
             this.evaluation_list = this.evaluation_list.concat(this.$refs.evaluation_listType_two.entityListData.entityList)
           }
-          // 获取第一列评价格式
-          var fractionBoolean_1 = this.$refs.evaluation_list_two.fractionBoolean
-          if(fractionBoolean_1){
-            this.majorEvaluate()
-          }else{
-            this.$message.error('业绩评价填写的分数有误');
-          }
+          // 获取第一列评价格式c
+          this.$refs.evaluation_list_one.$refs.formEvaluation.validate((valid) => {
+            if (valid) {
+              this.majorEvaluate()
+            } else {
+              this.$message.error('业绩评价填写的分数有误');
+            }
+          })
         }
       },
       //专业处室评价
       majorEvaluate(){
-
         var formData = this.evaluation_list
         api.saveSecEvaluation(this.formData.Id,formData, this.$axios).then(res => {
           console.log('新增',res)
@@ -355,7 +381,7 @@
         var formData = {
           ContractId:this.contractData.Id,
           Items:this.evaluation_list,
-          IsFinal:this.IsFinal,           //是否履行，最终
+          IsFinal:Number(this.IsFinal) ,           //是否履行，最终
         }
         api.addContractEvaluate(formData, this.$axios).then(res => {
           console.log('新增',res)
@@ -426,7 +452,7 @@
           }else{
             this.auditBtnBooleanZhuan = false
           }
-          if(this.formData.Status=='0'){
+          if(Number(this.formData.Status)<=0){
             this.auditBtnBoolean = true
           }else{
             this.auditBtnBoolean = false

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form ref="form" :model="entityListData" label-width="0px" :rules="rules">
+    <el-form ref="formEvaluation" :model="entityListData" label-width="0px" :rules="rules">
 
       <el-table highlight-current-row :data="entityListData.entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
         <el-table-column
@@ -41,7 +41,7 @@
           <template slot-scope="scope">
             <el-form-item  style="margin-bottom: 0px;" :prop="'entityList.' + scope.$index + '.Score'" :rules="rules.relation">
               <span v-if="scope.row.LevelCode==1" style="font-weight: bold">{{scoreFun(scope.row.typeStatus,scope.$index)}}</span>
-              <el-input v-else size="mini" type="number" placeholder="实得分数" :disabled="!disabledForm" v-model="scope.row.Score" @input="onInputFen(scope.$index,scope.row.NormalScore)"></el-input>
+              <el-input v-else size="mini" :min="0" :max="scope.row.NormalScore" type="number" placeholder="实得分数" :disabled="!disabledForm" v-model="scope.row.Score" @input="onInputFen(scope.$index,scope.row.NormalScore)"></el-input>
             </el-form-item>
           </template>
         </el-table-column>
@@ -63,6 +63,11 @@
           </template>
         </el-table-column>
       </el-table>
+      <div class="" style="display: flex;align-items: center;justify-content: flex-end;margin: 18px 0;">
+        <div>标准总分：{{standardNum}}分</div>
+        <div style="margin-left: 18px;margin-right: 140px;">实得总分：{{getNumFun()}}分</div>
+      </div>
+
 
     </el-form>
 
@@ -131,7 +136,6 @@
     computed:{
       scoreFun:function(){
         return function(type,k){
-
           var num = 0;
           var list = this.entityListData.entityList
           for(var index = 0 ; index < list.length ; index++){
@@ -140,21 +144,37 @@
               num = num + Number(list[index].Score)
             }
           }
-          this.entityListData.entityList[k].Score = String(num)
-          // console.log(222,k,this.entityListData.entityList[k])
+          if(this.entityListData.entityList[k].Score != String(num)){
+            // this.getNum = this.getNum + Number(num)
+            this.entityListData.entityList[k].Score = String(num)
+          }
           return num
         }
       },
+      getNumFun:function(){
+        return function(){
+          var num = 0;
+          var list = this.entityListData.entityList
+          for(var index = 0 ; index < list.length ; index++){
+            var code = Number(list[index].LevelCode)
+            if(list[index].LevelCode == 1){
+              num = num + Number(list[index].Score)
+            }
+          }
+          return num
+        }
+      }
     },
     data() {
       var validatePass = (rule, value, callback) => {
         var num = Number(value)
-        if (num == '') {
+        console.log(99999,num,num == '',num > Number(this.branchNum))
+        if (num == ''&&num != 0) {
           this.fractionBoolean = false
           callback(new Error('请输入分值'));
           return
         }
-        if (num > this.branchNum) {
+        if (num > Number(this.branchNum)) {
           this.fractionBoolean = false
           callback(new Error('不能大于规定的分值'));
           return
@@ -222,6 +242,8 @@
           TypeCode: '03'
         },
         entityListItemIndex:'',
+        standardNum:0,//标准分数
+        getNum:0,//实得总分
 
       }
     },
@@ -245,6 +267,7 @@
         var data = {
           Category:1,
         }
+        this.standardNum = 0,
         api.evaluationItemsOnelist(data,this.ContractClass,this.$axios).then(res => {
           console.log('上级节点内容',res)
           var data = res.data.items
@@ -254,11 +277,13 @@
             data[index].Score = '0'
             list.push(data[index])
 
+            this.standardNum = this.standardNum + parseInt(data[index].NormalScore)
             if(data[index].Son!=null&&data[index].Son!=undefined){
               for(var k = 0 ; k < data[index].Son.length ; k++){
                 data[index].Son[k].typeStatus = index
-                data[index].Son[k].Score = '0'
+                data[index].Son[k].Score = data[index].Son[k].NormalScore
                 list.push(data[index].Son[k])
+                // parseInt(data[index].Son[k].NormalScore)
               }
             }
           }
@@ -268,7 +293,7 @@
           console.error(err)
         })
       },
-      //初始数据
+      //编辑初始数据
       editDatas() {
         var data = {
           ContentReviewId:this.evaluateId,
@@ -286,7 +311,7 @@
             if(data[index].Son!=null&&data[index].Son!=undefined){
               for(var k = 0 ; k < data[index].Son.length ; k++){
                 data[index].Son[k].typeStatus = index
-                data[index].Son[k].Score = data[index].Son[k].Score==undefined||data[index].Son[k].Score==''?'0':data[index].Score
+                data[index].Son[k].Score = data[index].Son[k].Score==undefined||data[index].Son[k].Score==''?'0':data[index].Son[k].Score
                 list.push(data[index].Son[k])
               }
             }
@@ -315,7 +340,6 @@
         // this.entityListData.entityList[index].Score = fen
       },
 
-
       getDictOptions() {
         api.getDictList(this.$axios).then(res => {
           //this.dictOptions.customerList = res.data.items['customerList']

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

@@ -38,6 +38,7 @@
         <el-table-column label="操作" min-width="160" 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" title="编辑" size="small" icon="el-icon-edit" @click="onNavigateEvaluate(scope.row)">查看</el-button>
 
             <el-popover placement="top" title="提示" :ref="'popover-' + `${scope.$index}`">
               <el-alert

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

@@ -15,7 +15,7 @@
         </span>
         <span style="float: right;">
           <!-- v-if="formData.Id!=0&&formData.Status==7" -->
-          <el-button type="primary" size="mini"  @click="issueVisible=true">下发</el-button>
+          <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"  @click="exportExcel">导出</el-button>
           <el-button type="primary" size="mini" :loading="addloading" @click="saveEntity">保存</el-button>
@@ -251,10 +251,11 @@
   import evaluationList from './evaluationlist'
   import util from '@/utils/util'
   import apiType from '@/api/oilsupplier/suppliercert'
+  import permissionApi from '@/api/oilcontract/permission';
+
   import FileSaver from 'file-saver'
   import XLSX from 'xlsx'
 
-
   export default {
     computed: {
       ...mapGetters({
@@ -411,6 +412,7 @@
         //wellNoOptions: [],
         //supervisersOptions: [],
         successBoolean:false,
+        issueVisibleButton:false,
 
       }
     },
@@ -432,17 +434,28 @@
       } else {
         this.formData.Id = 0;
       }
+      this.statusFun()
     },
     methods: {
+      //状态判断
+      statusFun(){
+        var data = {
+          percode:'oil_contract_order',
+        }
+        permissionApi.permissionIsauth(data, this.$axios).then(res => {
+          console.log('权限',res.data)
+          if(res.data.code==0){
+            if(res.data.message=='有权限'){
+              this.issueVisibleButton = true
+            }
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       //合同完结
       onFinish(){
-
-         var index = (this.formData.ContractClass)
-
-        api.contractOrderFinish(this.formData.Id, this.$axios).then(res => {
-          console.log('完结成功',res)
-          if(res.data.code==0){
-            //this.$message({message: res.data.message,type: 'success'});
+        var index = (this.formData.ContractClass)
             var name = ''
             switch(index){
               case "01":
@@ -463,12 +476,6 @@
                 // type:1,
               }
             })
-          }else{
-            this.$message({message: res.data.message,type: 'error'});
-          }
-        }).catch(err => {
-          console.error(err)
-        })
       },
       //合同下发确定
       onIssueFromSubmit(){

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

@@ -282,6 +282,21 @@
               default:
               return '--'
             }
+          }else if(name == 'Status'){
+            var items = Number(item)
+            switch(items){
+              case 1:
+                return '未履行'
+              break;
+              case 2:
+                return '履行中'
+              break;
+              case 3:
+                return '已完结'
+              break;
+              default:
+              return '--'
+            }
           }else{
             return item
           }
@@ -371,6 +386,12 @@
             width: 100,
             sort: true
           },
+          {
+            prop: "Status",
+            label: '项目类别',
+            width: 100,
+            sort: true
+          },
           {
             prop: "ContractClass",
             label: '项目类别',

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

@@ -138,7 +138,7 @@
         var list = []
         for(var index in item){
           var data = {
-            value : item[index],
+            value : '1',
             name : index
           }
           if(index=='B1'){
@@ -169,7 +169,7 @@
             data.key = '未发生严重扰乱集团公司工程建设市场秩序、提供虚假材料和信息的行为'
             list[6] = data
           }
-          if(index=='B7'){
+          if(index=='B8'){
             data.key = '承包商能在规定时间内向评价单位提交基本条件评价所需相关证明文件，办理评价相关手续'
             list[7] = data
           }

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

@@ -21,7 +21,7 @@
            <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" v-if="formData.Status=='0'||(formData.Status=='4'&&auditBtn)" @click="saveEntity">保存</el-button>
           <el-button @click="onBack" type="primary" size="mini" style="margin-left: 8px">返回</el-button>
         </span>
@@ -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,29 +45,49 @@
                 </el-col>
 
                 <el-col :span="8" >
-                  <el-form-item label="项目管理(40分)" prop="SumScore1">
+                  <el-form-item label="项目组织实施(10分)" 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="项目职业健康安全与环境管理(20分)" 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="项目成本管理(5分)" 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%">
@@ -92,7 +112,7 @@
         </el-tab-pane>
 
         <!-- 专业处室 -->
-        <el-tab-pane label="专业处室评价信息" name="3" v-if="(formData.Status=='4'||Number(formData.Status)>4)&&formData.ContractClass=='02'">
+        <el-tab-pane label="专业处室评价信息" name="3" v-if="departmentBoolean&&formData.ContractClass=='02'">
           <el-card class="box-card" style="mini-height: calc(100vh - 113px);">
             <el-form label-width="160px" ref="EntityForm" :model="evaluateDataZhuan" :rules="rules">
               <el-row>
@@ -165,12 +185,12 @@
           </el-card>
         </el-tab-pane>
         <!-- 专业处室 -->
-        <el-tab-pane label="专业处室条件评价" name="4" v-if="(formData.Status=='4'||Number(formData.Status)>4)&&formData.ContractClass=='02'">
+        <el-tab-pane label="专业处室条件评价" name="4" v-if="departmentBoolean&&formData.ContractClass=='02'">
           <baseList ref="evaluateDataZhuanRef" :baseData="evaluateDataZhuan" :evaluateId="formData.Id" :category="1" :ContractClass="formData.ContractClass" :disabledForm="auditBtnBooleanZhuan"></baseList>
         </el-tab-pane>
 
          <!-- :disabled="formData.Status==0" -->
-        <el-tab-pane label="审批流程" name="6" >
+        <el-tab-pane label="审批流程" name="6" v-if="formData.Id!=0">
           <el-card class="box-card mycard">
             <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
           </el-card>
@@ -194,6 +214,7 @@
   import baseList from './baselist'
   import WfHistory from '@/components/workflow/wfhistory.vue'
   import apiCert from '@/api/oilsupplier/suppliercert'
+  import permissionApi from '@/api/oilcontract/permission';
   export default {
     computed: {
       ...mapGetters({
@@ -298,6 +319,7 @@
         //wellNoOptions: [],
         //supervisersOptions: [],
 
+        departmentBoolean:false,
       }
     },
     watch:{
@@ -315,9 +337,25 @@
          this.nowItem = this.$route.query.item
          this.initPage(this.$route.query.item)
       }
-
+      this.statusFun()
     },
     methods: {
+      //状态判断
+      statusFun(){
+        var data = {
+          percode:'oil_contract.SumStore.Department',
+        }
+        permissionApi.permissionIsauth(data, this.$axios).then(res => {
+          console.log('权限',res.data)
+          if(res.data.code==0){
+            if(res.data.message=='有权限'){
+              this.departmentBoolean = true
+            }
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       //刷新数据接口
       refreshPage(){
         //拿id查审核流程
@@ -369,7 +407,7 @@
         this.evaluateData.SumScore6    = item.Score6
         this.evaluateData.SumScore7    = item.Score7
         this.evaluateData.SumScore8    = item.Score8
-        this.evaluateData.Conclusion   = item.Evaluate
+        this.evaluateData.Conclusion   = Number(item.Evaluate)
         // this.getList()
       },
       // 获取编辑信息
@@ -381,6 +419,7 @@
             var item = res.data
             this.formData                  = res.data;
             this.evaluateData              = res.data;
+            this.evaluateData.Conclusion   = Number(item.Conclusion)
             this.entrydetail.business      = item.Id
             this.entrydetail.instance      = item.WorkflowId
             this.entrydetail.process       = item.ProcessKey
@@ -399,6 +438,7 @@
             console.log('用id去查详情信息',res)
             var item = res.data
             this.evaluateDataZhuan         = res.data;
+            this.evaluateDataZhuan.Conclusion   = Number(item.Conclusion)
           }).catch(err => {
             console.error(err)
           });
@@ -450,11 +490,6 @@
           this.evaluateDataZhuan['B'+i] = parseInt(this.typeList[i-1].value)
         }
         var formData = this.evaluateDataZhuan
-        // formData.Id = this.formData.Id
-        // {
-        //   evaluateId:this.formData.Id,
-        //   Items:this.evaluateDataZhuan,
-        // }
         api.saveSecEvaluation(this.formData.Id,formData, this.$axios).then(res => {
           console.log('新增',res)
           if(res.data.code==0){

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service/_opera/evaluate.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=='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="Number(formData.Status)<=0&&formData.Id!=0" @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>
@@ -27,7 +27,7 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick(2)">复审</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick(1)">提交审核</el-button> -->
 
-          <el-button type="primary" size="mini" v-if="formData.Status=='0'||(formData.Status=='4'&&auditBtn)" @click="onSeaveBigAdd">保存</el-button>
+          <el-button type="primary" size="mini" v-if="Number(formData.Status)<=0||(formData.Status=='4'&&auditBtn)" @click="onSeaveBigAdd">保存</el-button>
           <el-button @click="onBack" type="primary" size="mini" style="margin-left: 8px">返回</el-button>
         </span>
       </div>
@@ -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>
@@ -100,16 +100,16 @@
         <el-tab-pane label="业绩评价" name="2"   >
           <evaluation-list ref="evaluation_list_one"   :evaluateId="formData.Id" category="0" :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBoolean"></evaluation-list>
         </el-tab-pane>
-
-        <el-tab-pane v-if="formData.Status=='4'||Number(formData.Status)>4" label="专业处室业绩评价" name="3" >
+        <!-- v-if="formData.Status=='4'||Number(formData.Status)>4" -->
+        <el-tab-pane  label="专业处室业绩评价" name="3" v-if="departmentBoolean">
           <evaluation-list ref="evaluation_list_two" :evaluateId="formData.Id"  category="1" :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBooleanZhuan"></evaluation-list>
         </el-tab-pane>
 
         <el-tab-pane label="基本条件评价" name="4" v-if="contractData.ContractClass=='02'">
           <base-list ref="evaluation_listType_one" :evaluateId="formData.Id"  category="0" :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBoolean"></base-list>
         </el-tab-pane>
-        <el-tab-pane  v-if="(formData.Status=='4'||Number(formData.Status)>4)&&contractData.ContractClass=='02'" label="专业处室基本条件评价" name="5">
-          <base-list ref="evaluation_listtype_two" :evaluateId="formData.Id"  category="1" :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBooleanZhuan"></base-list>
+        <el-tab-pane  v-if="departmentBoolean&&contractData.ContractClass=='02'" label="专业处室基本条件评价" name="5">
+          <base-list ref="evaluation_listType_two" :evaluateId="formData.Id"  category="1" :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBooleanZhuan"></base-list>
         </el-tab-pane>
 
         <el-tab-pane label="审批流程" name="6" :disabled="formData.Status==0">
@@ -146,6 +146,7 @@
   import WfHistory from '@/components/workflow/wfhistory.vue'
   import apiSupplier from '@/api/oilsupplier/supplier'
   import apiCert from '@/api/oilsupplier/suppliercert'
+  import permissionApi from '@/api/oilcontract/permission';
   export default {
     computed: {
       ...mapGetters({
@@ -162,6 +163,7 @@
     data() {
       return {
         IsFinal:0,
+
         routeData:{},//上一页面传过来的值
         routeDataType:'',//上一页面传过来的type
 
@@ -202,6 +204,8 @@
         auditBtnBooleanZhuan:true,
         auditstepcode:'',
 
+        departmentBoolean:false,
+
       }
     },
     created() {
@@ -213,9 +217,8 @@
       // this.getDictOptions();
 
       this.IsFinal   = this.$route.query.IsFinal;
-
-      console.log('跳转数据2',this.$route.query)
-      if(this.IsFinal==undefined || this.IsFinal == "") this.IsFinal = 0; 
+      
+      if(this.IsFinal==undefined || this.IsFinal == "") this.IsFinal = 0;
 
       if(this.serviceId != 'add' && this.serviceId>0) {
         this.formData.Id = this.serviceId;
@@ -227,9 +230,25 @@
         this.approvalProcess.disabled = true
         this.contractData = this.$route.query.item
       }
-
+      this.statusFun()
     },
     methods: {
+      //状态判断
+      statusFun(){
+        var data = {
+          percode:'oil_contract.Review.Department',
+        }
+        permissionApi.permissionIsauth(data, this.$axios).then(res => {
+          console.log('权限',res.data)
+          if(res.data.code==0){
+            if(res.data.message=='有权限'){
+              this.departmentBoolean = true
+            }
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       //刷新数据接口
       refreshPage(){
         //拿id查审核流程
@@ -307,35 +326,36 @@
           if(this.contractData.ContractClass=='02'){
             this.evaluation_list = this.evaluation_list.concat(this.$refs.evaluation_listType_one.entityListData.entityList)
           }
-          // this.evaluation_list = this.evaluation_list.concat(this.$refs.evaluation_listType_one.entityListData.entityList)
           // 获取第一列评价格式
-          var fractionBoolean_1 = this.$refs.evaluation_list_one.fractionBoolean
-          if(fractionBoolean_1){
-            if(this.formData.Id == 0||this.formData.Id == undefined||this.formData.Id == null){
-              this.addEvaluate()
-            }else{
-              this.updateEvaluate()
+          // var fractionBoolean_1 = this.$refs.evaluation_list_one.fractionBoolean
+          this.$refs.evaluation_list_one.$refs.formEvaluation.validate((valid) => {
+            if (valid) {
+              if(this.formData.Id == 0||this.formData.Id == undefined||this.formData.Id == null){
+                this.addEvaluate()
+              }else{
+                this.updateEvaluate()
+              }
+            } else {
+              this.$message.error('业绩评价填写的分数有误');
             }
-          }else{
-            this.$message.error('业绩评价填写的分数有误');
-          }
+          })
         }else{//专业处室评价
           this.evaluation_list = this.$refs.evaluation_list_two.entityListData.entityList
           if(this.contractData.ContractClass=='02'){
             this.evaluation_list = this.evaluation_list.concat(this.$refs.evaluation_listType_two.entityListData.entityList)
           }
-          // 获取第一列评价格式
-          var fractionBoolean_1 = this.$refs.evaluation_list_two.fractionBoolean
-          if(fractionBoolean_1){
-            this.majorEvaluate()
-          }else{
-            this.$message.error('业绩评价填写的分数有误');
-          }
+          // 获取第一列评价格式c
+          this.$refs.evaluation_list_one.$refs.formEvaluation.validate((valid) => {
+            if (valid) {
+              this.majorEvaluate()
+            } else {
+              this.$message.error('业绩评价填写的分数有误');
+            }
+          })
         }
       },
       //专业处室评价
       majorEvaluate(){
-
         var formData = this.evaluation_list
         api.saveSecEvaluation(this.formData.Id,formData, this.$axios).then(res => {
           console.log('新增',res)
@@ -356,7 +376,7 @@
         var formData = {
           ContractId:this.contractData.Id,
           Items:this.evaluation_list,
-          IsFinal:this.IsFinal,           //是否履行，最终
+          IsFinal:Number(this.IsFinal) ,           //是否履行，最终
         }
         api.addContractEvaluate(formData, this.$axios).then(res => {
           console.log('新增',res)
@@ -427,7 +447,7 @@
           }else{
             this.auditBtnBooleanZhuan = false
           }
-          if(this.formData.Status=='0'){
+          if(Number(this.formData.Status)<=0){
             this.auditBtnBoolean = true
           }else{
             this.auditBtnBoolean = false

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form ref="form" :model="entityListData" label-width="0px" :rules="rules">
+    <el-form ref="formEvaluation" :model="entityListData" label-width="0px" :rules="rules">
 
       <el-table highlight-current-row :data="entityListData.entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
         <el-table-column
@@ -41,7 +41,7 @@
           <template slot-scope="scope">
             <el-form-item  style="margin-bottom: 0px;" :prop="'entityList.' + scope.$index + '.Score'" :rules="rules.relation">
               <span v-if="scope.row.LevelCode==1" style="font-weight: bold">{{scoreFun(scope.row.typeStatus,scope.$index)}}</span>
-              <el-input v-else size="mini" type="number" placeholder="实得分数" :disabled="!disabledForm" v-model="scope.row.Score" @input="onInputFen(scope.$index,scope.row.NormalScore)"></el-input>
+              <el-input v-else size="mini" :min="0" :max="scope.row.NormalScore" type="number" placeholder="实得分数" :disabled="!disabledForm" v-model="scope.row.Score" @input="onInputFen(scope.$index,scope.row.NormalScore)"></el-input>
             </el-form-item>
           </template>
         </el-table-column>
@@ -63,6 +63,11 @@
           </template>
         </el-table-column>
       </el-table>
+      <div class="" style="display: flex;align-items: center;justify-content: flex-end;margin: 18px 0;">
+        <div>标准总分：{{standardNum}}分</div>
+        <div style="margin-left: 18px;margin-right: 140px;">实得总分：{{getNumFun()}}分</div>
+      </div>
+
 
     </el-form>
 
@@ -131,7 +136,6 @@
     computed:{
       scoreFun:function(){
         return function(type,k){
-
           var num = 0;
           var list = this.entityListData.entityList
           for(var index = 0 ; index < list.length ; index++){
@@ -140,21 +144,37 @@
               num = num + Number(list[index].Score)
             }
           }
-          this.entityListData.entityList[k].Score = String(num)
-          // console.log(222,k,this.entityListData.entityList[k])
+          if(this.entityListData.entityList[k].Score != String(num)){
+            // this.getNum = this.getNum + Number(num)
+            this.entityListData.entityList[k].Score = String(num)
+          }
           return num
         }
       },
+      getNumFun:function(){
+        return function(){
+          var num = 0;
+          var list = this.entityListData.entityList
+          for(var index = 0 ; index < list.length ; index++){
+            var code = Number(list[index].LevelCode)
+            if(list[index].LevelCode == 1){
+              num = num + Number(list[index].Score)
+            }
+          }
+          return num
+        }
+      }
     },
     data() {
       var validatePass = (rule, value, callback) => {
         var num = Number(value)
-        if (num == '') {
+        console.log(99999,num,num == '',num > Number(this.branchNum))
+        if (num == ''&&num != 0) {
           this.fractionBoolean = false
           callback(new Error('请输入分值'));
           return
         }
-        if (num > this.branchNum) {
+        if (num > Number(this.branchNum)) {
           this.fractionBoolean = false
           callback(new Error('不能大于规定的分值'));
           return
@@ -222,6 +242,8 @@
           TypeCode: '03'
         },
         entityListItemIndex:'',
+        standardNum:0,//标准分数
+        getNum:0,//实得总分
 
       }
     },
@@ -245,6 +267,7 @@
         var data = {
           Category:1,
         }
+        this.standardNum = 0,
         api.evaluationItemsOnelist(data,this.ContractClass,this.$axios).then(res => {
           console.log('上级节点内容',res)
           var data = res.data.items
@@ -254,11 +277,13 @@
             data[index].Score = '0'
             list.push(data[index])
 
+            this.standardNum = this.standardNum + parseInt(data[index].NormalScore)
             if(data[index].Son!=null&&data[index].Son!=undefined){
               for(var k = 0 ; k < data[index].Son.length ; k++){
                 data[index].Son[k].typeStatus = index
-                data[index].Son[k].Score = '0'
+                data[index].Son[k].Score = data[index].Son[k].NormalScore
                 list.push(data[index].Son[k])
+                // parseInt(data[index].Son[k].NormalScore)
               }
             }
           }
@@ -268,7 +293,7 @@
           console.error(err)
         })
       },
-      //初始数据
+      //编辑初始数据
       editDatas() {
         var data = {
           ContentReviewId:this.evaluateId,
@@ -286,7 +311,7 @@
             if(data[index].Son!=null&&data[index].Son!=undefined){
               for(var k = 0 ; k < data[index].Son.length ; k++){
                 data[index].Son[k].typeStatus = index
-                data[index].Son[k].Score = data[index].Son[k].Score==undefined||data[index].Son[k].Score==''?'0':data[index].Score
+                data[index].Son[k].Score = data[index].Son[k].Score==undefined||data[index].Son[k].Score==''?'0':data[index].Son[k].Score
                 list.push(data[index].Son[k])
               }
             }
@@ -315,7 +340,6 @@
         // this.entityListData.entityList[index].Score = fen
       },
 
-
       getDictOptions() {
         api.getDictList(this.$axios).then(res => {
           //this.dictOptions.customerList = res.data.items['customerList']

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

@@ -38,6 +38,7 @@
         <el-table-column label="操作" min-width="160" 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-popover placement="top" title="提示" :ref="'popover-' + `${scope.$index}`">
               <el-alert