修改bug

src/dashoo.cn/frontend_web/src/api/oilcontract/evaluationItems.js

@@ -15,9 +15,16 @@ export default {
   //     method: 'GET',
   //   });
   // },
-  evaluationItemsOnelist(entityId, myAxios) {
+  // evaluationItemsOnelist(entityId, myAxios) {
+  //   return myAxios({
+  //     url: '/evaluation-items/onelist/'+entityId,
+  //     method: 'GET',
+  //   });
+  // },
+  // 最初始的上级节点
+  evaluationItemsOnelist(entityId,type, myAxios) {
     return myAxios({
-      url: '/evaluation-items/onelist/'+entityId,
+      url: '/evaluation-items/onelist/'+entityId+'/'+type,
       method: 'GET',
     });
   },

src/dashoo.cn/frontend_web/src/api/oilcontract/permission.js

@@ -0,0 +1,10 @@
+export default {
+    permissionIsauth(params, myAxios) {
+      return myAxios({
+        url: '/permission/isauth',
+        method: 'GET',
+        params: params
+      });
+    },
+    
+}

src/dashoo.cn/frontend_web/src/components/oilcontract/submitPopup.vue

@@ -66,7 +66,7 @@
       <span slot="footer"
             class="dialog-footer">
         <el-button size="mini"
-                   @click="dialogVisible = false">取 消</el-button>
+                   @click="dialogVisibleCom = false">取 消</el-button>
         <el-button size="mini"
                    type="primary"
                    @click="secondaryUnitSubmitApply" :loading="loading">确定</el-button>

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

@@ -33,9 +33,10 @@
         </el-form>
       </div>
       <el-table id="rebateSetTable" stripe size="mini" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-        <el-table-column label="操作" header-align="center" width="160" align="center" fixed>
+        <el-table-column label="操作" header-align="center" width="210" align="center" fixed>
           <template slot-scope="scope">
-              <el-button type="text"  size="small" icon="el-icon-edit"  @click="onNavigateScore(scope.row)">编辑</el-button>
+              <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-popover placement="top" title="提示" :ref="'popover-' + `${scope.$index}`">
                 <el-alert
@@ -48,7 +49,7 @@
                 <div style="text-align: right; margin: 0">
                   <el-button type="primary" size="mini" @click="deleteEntity(scope.row,scope.$index)">删除</el-button>
                 </div>
-                <el-button slot="reference" type="text" icon="el-icon-delete" style="margin-left:3px" size="small" >
+                <el-button slot="reference" v-if="deleteBoolean" type="text" icon="el-icon-delete" style="margin-left:3px" size="small" >
                   删除
                 </el-button>
               </el-popover>
@@ -242,6 +243,7 @@
 <script>
   import { mapGetters } from 'vuex';
   import api from '@/api/oilcontract/contractSumScore';
+  import permissionApi from '@/api/oilcontract/permission';
   import FileSaver from 'file-saver'
   import XLSX from 'xlsx'
 
@@ -322,6 +324,8 @@
 
     data() {
       return {
+        editeBoolean:false,
+        deleteBoolean:false,
         tableWidth:"290px",
         dialogVisible: false,
         //列表数据
@@ -365,8 +369,39 @@
       //查询列表
       this.initDatas();
       //this.getDictOptions()
+      this.statusFun()
     },
     methods: {
+      //状态判断
+      statusFun(){
+        var data = {
+          percode:'oil_contract.SumStore.Delete',
+        }
+        permissionApi.permissionIsauth(data, this.$axios).then(res => {
+          console.log('权限',res.data)
+          if(res.data.code==0){
+            if(res.data.message=='有权限'){
+              this.deleteBoolean = true
+            }
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+
+        var data = {
+          percode:'oil_contract.SumStore.Edit',
+        }
+        permissionApi.permissionIsauth(data, this.$axios).then(res => {
+          console.log('权限',res.data)
+          if(res.data.code==0){
+            if(res.data.message=='有权限'){
+              this.editeBoolean = true
+            }
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       initDatas() {
         //分页及列表条件
         // <el-option label="物资类" value="01" key="01"></el-option>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis-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-basis-year/_opera/operation.vue

@@ -112,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>
@@ -185,7 +185,7 @@
           </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>
 
@@ -214,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({
@@ -317,7 +318,8 @@
         //下拉选择项
         //wellNoOptions: [],
         //supervisersOptions: [],
-
+        
+        departmentBoolean:false,
       }
     },
     watch:{
@@ -335,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查审核流程
@@ -389,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()
       },
       // 获取编辑信息
@@ -401,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
@@ -419,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)
           });

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

@@ -1,5 +1,5 @@
 
-
+ 
 <template>
   <div>
     <el-breadcrumb class="heading">
@@ -33,7 +33,7 @@
         </el-form>
       </div>
       <el-table id="rebateSetTable" stripe size="mini" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-        <el-table-column label="操作" header-align="center" width="100" align="center" fixed>
+        <el-table-column label="操作" header-align="center" width="100" align="center" fixed v-if="jurisdictionBoolean">
           <template slot-scope="scope">
               <el-button type="text" title="生成" size="small" icon="el-icon-edit" @click="onNavigateScore(scope.row)">生成</el-button>
           </template>
@@ -204,6 +204,7 @@
 <script>
   import { mapGetters } from 'vuex';
   import api from '@/api/oilcontract/contractSumScore';
+  import permissionApi from '@/api/oilcontract/permission';
   import FileSaver from 'file-saver'
   import XLSX from 'xlsx'
 
@@ -281,7 +282,7 @@
           Remark: '',
 
         },
-
+        jurisdictionBoolean:false,
       }
     },
     created() {
@@ -290,8 +291,25 @@
       //查询列表
       this.initDatas();
       //this.getDictOptions()
+      this.permissionIsauth()
     },
     methods: {
+      // 判断权限
+      permissionIsauth(){
+        var data = {
+          percode:'oil_contract.SumStore.Add',
+        }
+        permissionApi.permissionIsauth(data, this.$axios).then(res => {
+          if(res.data.code==0){
+            if(res.data.message=='有权限'){
+              this.jurisdictionBoolean = true
+            }
+          }
+          console.log('判断是否有权限',res)
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       initDatas() {
         //分页及列表条件
         // <el-option label="物资类" value="01" key="01"></el-option>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis/_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>
@@ -100,15 +100,15 @@
         <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">
+        <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>
 
@@ -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({
@@ -203,6 +204,8 @@
         auditBtnBooleanZhuan:true,
         auditstepcode:'',
 
+        departmentBoolean:false,
+
       }
     },
     created() {
@@ -226,9 +229,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,28 +326,31 @@
             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('业绩评价填写的分数有误');
+            }
+          })
         }
       },
       //专业处室评价
@@ -425,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-basis/_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-basis/index.vue

@@ -37,7 +37,7 @@
       <el-table size="mini" stripe id="rebateSetTable" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" min-width="160" align="center" fixed>
           <template slot-scope="scope">
-            <el-button type="text" title="编辑" size="small" icon="el-icon-edit" @click="onNavigateEvaluate(scope.row)">编辑</el-button>
+            <el-button v-if="editeBoolean" 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=""
@@ -49,7 +49,7 @@
               <div style="text-align: right; margin: 0">
                 <el-button type="primary" size="mini" @click="deleteEntity(scope.row,scope.$index)">删除</el-button>
               </div>
-              <el-button slot="reference" type="text" style="margin-left:3px" icon="el-icon-delete" size="small" >删除</el-button>
+              <el-button slot="reference" v-if="deleteBoolean" type="text" style="margin-left:3px" icon="el-icon-delete" size="small" >删除</el-button>
             </el-popover>
           </template>
         </el-table-column>
@@ -183,6 +183,7 @@
   import { mapGetters } from 'vuex';
   import api from '@/api/oilcontract/contract';
   import apiReview from '@/api/oilcontract/contractReview';
+  import permissionApi from '@/api/oilcontract/permission';
   import FileSaver from 'file-saver'
   import XLSX from 'xlsx'
 
@@ -239,6 +240,8 @@
 
     data() {
       return {
+        editeBoolean:false,
+        deleteBoolean:false,
         dialogVisible: false,
         //列表数据
         entityList: [],
@@ -290,7 +293,6 @@
           ModifiedOn: '',
           ModifiedUserId: '',
           ModifiedBy: '',
-
         },
         tableColumns: [
 
@@ -402,9 +404,40 @@
       //查询列表
       this.initDatas();
       //this.getDictOptions()
+      this.statusFun()
     },
     methods: {
+      //状态判断
+      statusFun(){
+        var data = {
+          percode:'oil_contract.Review.Delete',
+        }
+        permissionApi.permissionIsauth(data, this.$axios).then(res => {
+          console.log('权限',res.data)
+          if(res.data.code==0){
+            if(res.data.message=='有权限'){
+              this.deleteBoolean = true
+            }
+          }
+        }).catch(err => {
+          console.error(err)
+        })
 
+        var data = {
+          percode:'oil_contract.Review.Edit',
+        }
+        permissionApi.permissionIsauth(data, this.$axios).then(res => {
+          console.log('权限',res.data)
+          if(res.data.code==0){
+            if(res.data.message=='有权限'){
+              this.editeBoolean = true
+            }
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+
+      },
       //跳转评价
       onNavigateEvaluate(item){
         console.log('跳转',item)

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

@@ -42,9 +42,10 @@
           v-if="selectBoolean"
           width="70">
         </el-table-column>
-        <el-table-column label="操作" min-width="160" align="center" fixed>
+        <el-table-column label="操作" min-width="210" align="center" fixed>
           <template slot-scope="scope">
-              <el-button type="text"  size="small" icon="el-icon-edit"  @click="onNavigateScore(scope.row)">编辑</el-button>
+              <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-popover placement="top" title="提示" :ref="'popover-' + `${scope.$index}`">
               <el-alert
@@ -57,7 +58,7 @@
               <div style="text-align: right; margin: 0">
                 <el-button type="primary" size="mini" @click="deleteEntity(scope.row,scope.$index)">删除</el-button>
               </div>
-              <el-button slot="reference" type="text" icon="el-icon-delete" style="margin-left:3px" size="small" >
+              <el-button slot="reference"  v-if="deleteBoolean" type="text" icon="el-icon-delete" style="margin-left:3px" size="small" >
                 删除
               </el-button>
             </el-popover>
@@ -192,6 +193,7 @@
 <script>
   import { mapGetters } from 'vuex';
   import api from '@/api/oilcontract/contractSumScore';
+  import permissionApi from '@/api/oilcontract/permission';
   import FileSaver from 'file-saver'
   import XLSX from 'xlsx'
 
@@ -265,6 +267,8 @@
 
     data() {
       return {
+        editeBoolean:false,
+        deleteBoolean:false,
         selectBoolean:false,//表格选项框
         dialogVisible: false,
         //列表数据
@@ -304,8 +308,39 @@
       //查询列表
       this.initDatas();
       //this.getDictOptions()
+      this.statusFun()
     },
     methods: {
+      //状态判断
+      statusFun(){
+        var data = {
+          percode:'oil_contract.SumStore.Delete',
+        }
+        permissionApi.permissionIsauth(data, this.$axios).then(res => {
+          console.log('权限',res.data)
+          if(res.data.code==0){
+            if(res.data.message=='有权限'){
+              this.deleteBoolean = true
+            }
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      
+        var data = {
+          percode:'oil_contract.SumStore.Edit',
+        }
+        permissionApi.permissionIsauth(data, this.$axios).then(res => {
+          console.log('权限',res.data)
+          if(res.data.code==0){
+            if(res.data.message=='有权限'){
+              this.editeBoolean = true
+            }
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       //选择选项
       onSelectChange(item,index){
         console.log(222,item,index)

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

@@ -32,7 +32,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>

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

@@ -33,7 +33,7 @@
         </el-form>
       </div>
       <el-table id="rebateSetTable" stripe size="mini" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-        <el-table-column label="操作" header-align="center" width="100" align="center" fixed>
+        <el-table-column label="操作" v-if="jurisdictionBoolean" header-align="center" width="100" align="center" fixed>
             <template slot-scope="scope">
                 <el-button type="text" title="生成" size="small" icon="el-icon-edit" @click="onNavigateScore(scope.row)">生成</el-button>
             </template>
@@ -141,6 +141,7 @@
 <script>
   import { mapGetters } from 'vuex';
   import api from '@/api/oilcontract/contractSumScore';
+  import permissionApi from '@/api/oilcontract/permission';
   import FileSaver from 'file-saver'
   import XLSX from 'xlsx'
 
@@ -188,6 +189,7 @@
         },
         //查询时间new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()
         CreateOn: [],
+        jurisdictionBoolean:false,
         //查询项
         searchFormReset: {},
         searchForm: {
@@ -253,7 +255,8 @@
             label: '评价结果',
             width: 100,
             sort: true
-          }]
+          }],
+          
       }
     },
     created() {
@@ -262,8 +265,25 @@
       //查询列表
       this.initDatas();
       //this.getDictOptions()
+      this.permissionIsauth()
     },
     methods: {
+      // 判断权限
+      permissionIsauth(){
+        var data = {
+          percode:'oil_contract.SumStore.Add',
+        }
+        permissionApi.permissionIsauth(data, this.$axios).then(res => {
+          if(res.data.code==0){
+            if(res.data.message=='有权限'){
+              this.jurisdictionBoolean = true
+            }
+          }
+          console.log('判断是否有权限',res)
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       initDatas() {
         //分页及列表条件
         let params = {

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

@@ -37,7 +37,7 @@
       <el-table size="mini" stripe id="rebateSetTable" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" min-width="160" align="center" fixed>
           <template slot-scope="scope">
-            <el-button type="text" title="编辑" size="small" icon="el-icon-edit" @click="onNavigateEvaluate(scope.row)">编辑</el-button>
+            <el-button type="text" v-if="editeBoolean" title="编辑" size="small" icon="el-icon-edit" @click="onNavigateEvaluate(scope.row)">编辑</el-button>
 
             <el-popover placement="top" title="提示" :ref="'popover-' + `${scope.$index}`">
               <el-alert
@@ -50,7 +50,7 @@
               <div style="text-align: right; margin: 0">
                 <el-button type="primary" size="mini" @click="deleteEntity(scope.row,scope.$index)">删除</el-button>
               </div>
-              <el-button slot="reference" type="text" style="margin-left:3px" icon="el-icon-delete" size="small" >删除</el-button>
+              <el-button slot="reference"  v-if="deleteBoolean" type="text" style="margin-left:3px" icon="el-icon-delete" size="small" >删除</el-button>
             </el-popover>
           </template>
         </el-table-column>
@@ -180,6 +180,7 @@
 <script>
   import { mapGetters } from 'vuex';
   import api from '@/api/oilcontract/contract';
+  import permissionApi from '@/api/oilcontract/permission';
   import FileSaver from 'file-saver'
   import XLSX from 'xlsx'
 
@@ -240,6 +241,8 @@
 
     data() {
       return {
+        editeBoolean:false,
+        deleteBoolean:false,
         dialogVisible: false,
         //列表数据
         entityList: [],
@@ -403,9 +406,38 @@
       //查询列表
       this.initDatas();
       //this.getDictOptions()
+      this.statusFun()
     },
     methods: {
-
+      //状态判断
+      statusFun(){
+        var data = {
+          percode:'oil_contract.Review.Delete',
+        }
+        permissionApi.permissionIsauth(data, this.$axios).then(res => {
+          console.log('权限',res.data)
+          if(res.data.code==0){
+            if(res.data.message=='有权限'){
+              this.deleteBoolean = true
+            }
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+        var data = {
+          percode:'oil_contract.Review.Delete',
+        }
+        permissionApi.permissionIsauth(data, this.$axios).then(res => {
+          console.log('权限',res.data)
+          if(res.data.code==0){
+            if(res.data.message=='有权限'){
+              this.deleteBoolean = true
+            }
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       //跳转评价
       onNavigateEvaluate(item){
         console.log('跳转',item)

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

@@ -14,8 +14,9 @@
           <i class="icon icon-table2"></i> {{formData.Id==0?'新增':'编辑'}}
         </span>
         <span style="float: right;">
-          <el-button type="primary" size="mini" v-if="formData.Id!=0" @click="issueVisible=true">下发</el-button>
-          <el-button type="primary" size="mini" @click="onFinish">完结</el-button>
+          <!-- 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="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>
           <router-link :to="'/oilcontract/contract-import'">
@@ -28,9 +29,9 @@
           <el-col :span="8">
             <el-form-item label="合同分类" prop="ContractClass">
               <el-select  v-model="formData.ContractClass" placeholder="请选择" style="width: 100%" @change="onSelectType">
-                <el-option label="物资类" value="01" key="01"></el-option>
-                <el-option label="基建类" value="02" key="02"></el-option>
-                <el-option label="技术服务" value="03" key="03"></el-option>
+                <el-option label="供应商" value="01" key="01"></el-option>
+                <el-option label="承包商" value="02" key="02"></el-option>
+                <el-option label="服务商" value="03" key="03"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -50,7 +51,7 @@
 
           <el-col :span="8">
             <el-form-item label="合同编号" prop="ContractNo">
-              <el-input v-model="formData.ContractNo" placeholder="请输入" type="number"  style="width: 100%"></el-input>
+              <el-input v-model="formData.ContractNo" placeholder="请输入"   style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
 
@@ -218,13 +219,13 @@
       title="下发工单"
       :visible.sync="issueVisible"
       width="50%">
-        <div style="width: 100%;display: flex;justify-content: center;">
-          <el-form :inline="true" ref="issueFrom" :model="issueFrom" class="demo-form-inline" :rules="issueRules">
+        <div style="width: 100%;display: flex;justify-content: center;height: ;">
+          <el-form :inline="true" ref="issueFrom" :model="issueFrom" class="demo-form-inline " :rules="issueRules">
 
-            <el-form-item label="选择部门"  prop="region" >
+            <el-form-item label="选择部门"  prop="region">
               <!-- @change="orgChange" -->
-              <el-select filterable ref="issueFromSelect" v-model="issueFrom.region" placeholder="请选择审核单位"  style="width: 100%;" >
-                <el-option v-for="item in orgOptions" :key="item.Id" :label="item.Fullname" :value="item.Id" style="width: 100%"></el-option>
+              <el-select filterable ref="issueFromSelect" v-model="issueFrom.region" class="select_form" placeholder="请选择下发单位"  style="width: 100%;">
+                <el-option v-for="item in orgOptions" :key="item.Id" :label="item.Fullname" :value="item.Id" style="width: 100%;"></el-option>
               </el-select>
             </el-form-item>
           </el-form>
@@ -399,7 +400,7 @@
           // ModifiedUserId: '',
           // ModifiedBy: '',
           //缺少
-          SubPackage: '',
+          SubPackage: 0,
           ContractClass: ''
 
         },
@@ -409,6 +410,7 @@
         //下拉选择项
         //wellNoOptions: [],
         //supervisersOptions: [],
+        successBoolean:false,
 
       }
     },
@@ -426,6 +428,7 @@
       if(this.serviceId != 'add' && this.serviceId>0) {
         this.formData.Id = this.serviceId;
         this.initDatas();
+        this.successBoolean = true
       } else {
         this.formData.Id = 0;
       }
@@ -516,7 +519,7 @@
           api.getEntity(this.formData.Id, this.$axios).then(res => {
             console.log('返给我的数据',res.data)
             this.formData = res.data;
-
+            this.successBoolean = true
             this.onSelectType(this.formData.ContractClass,1)
           }).catch(err => {
             console.error(err)
@@ -671,9 +674,16 @@
 
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
   .fromClass /deep/ .el-input{
     width: 100% !important;
   }
+  .select_form /deep/ .el-select-dropdown{
+    height: 120px;
+    overflow: hidden;
+  }
+  .select_form /deep/ .el-scrollbar{
+    height: 120px;
+  }
 
 </style>

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

@@ -57,9 +57,9 @@
               <div style="text-align: right; margin: 0">
                 <el-button type="primary" size="mini" @click="deleteEntity(scope.row,scope.$index)">删除</el-button>
               </div>
-              <el-button slot="reference" type="text" style="margin-left:3px" icon="el-icon-delete" size="small" >删除</el-button>
+              <el-button slot="reference" type="text" v-if="deleteBoolean" style="margin-left:3px" icon="el-icon-delete" size="small" >删除</el-button>
             </el-popover>
-            <el-button type="text"  size="small" style="margin-left:3px"  icon="el-icon-edit-outline" @click="onNavigateEvaluate(scope.row)">评价</el-button>
+            <el-button type="text"  size="small" v-if="evaluateBoolean" style="margin-left:3px"  icon="el-icon-edit-outline" @click="onNavigateEvaluate(scope.row)">评价</el-button>
           </template>
         </el-table-column>
 
@@ -255,6 +255,8 @@
 <script>
   import { mapGetters } from 'vuex';
   import api from '@/api/oilcontract/contract';
+  import permissionApi from '@/api/oilcontract/permission';
+
 
   export default {
     computed: {
@@ -283,7 +285,7 @@
           }else{
             return item
           }
-    
+
         }
       }
     },
@@ -291,6 +293,8 @@
 
     data() {
       return {
+        evaluateBoolean:false,
+        deleteBoolean:false,
         // 控制删除框
         deleteConfirmFlagIndex:null,
 
@@ -348,13 +352,6 @@
 
         },
         tableColumns: [
-
-          {
-            prop: "Id",
-            label: 'ID',
-            width: 100,
-            sort: true
-          },
           // {
           //   prop: "SupplierId",
           //   label: '供应商ID',
@@ -540,8 +537,9 @@
             label: '备注',
             width: 100,
             sort: true
-          }]
+          }],
       }
+
     },
     created() {
       //查询条件初始值备份
@@ -549,8 +547,39 @@
       //查询列表
       this.initDatas();
       //this.getDictOptions()
+      // 状态判断
+      this.statusFun()
     },
     methods: {
+      //状态判断
+      statusFun(){
+        var data = {
+          percode:'oil_contract.Review.Add',
+        }
+        permissionApi.permissionIsauth(data, this.$axios).then(res => {
+          console.log('权限',res.data)
+          if(res.data.code==0){
+            if(res.data.message=='有权限'){
+              this.evaluateBoolean = true
+            }
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+        var datas = {
+          percode:'oil_contract_Delete',
+        }
+        permissionApi.permissionIsauth(datas, this.$axios).then(res => {
+          console.log('权限',res.data)
+          if(res.data.code==0){
+            if(res.data.message=='有权限'){
+              this.deleteBoolean = true
+            }
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       //跳转评价
       onNavigateEvaluate(item){
         // <el-option label="供应商" value="01" key="01"></el-option>

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

@@ -45,9 +45,10 @@
           v-if="selectBoolean"
           width="70">
         </el-table-column>
-        <el-table-column label="操作" min-width="160" align="center" fixed>
+        <el-table-column label="操作" min-width="210" align="center" fixed>
           <template slot-scope="scope">
-              <el-button type="text"  size="small" icon="el-icon-edit"  @click="onNavigateScore(scope.row)">编辑</el-button>
+              <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-popover placement="top" title="提示" :ref="'popover-' + `${scope.$index}`">
               <el-alert
@@ -60,7 +61,7 @@
               <div style="text-align: right; margin: 0">
                 <el-button type="primary" size="mini" @click="deleteEntity(scope.row,scope.$index)">删除</el-button>
               </div>
-              <el-button slot="reference" type="text" icon="el-icon-delete" style="margin-left:3px" size="small" >
+              <el-button slot="reference" v-if="deleteBoolean" type="text" icon="el-icon-delete" style="margin-left:3px" size="small" >
                 删除
               </el-button>
             </el-popover>
@@ -200,6 +201,7 @@
 <script>
   import { mapGetters } from 'vuex';
   import api from '@/api/oilcontract/contractSumScore';
+  import permissionApi from '@/api/oilcontract/permission';
   import FileSaver from 'file-saver'
   import XLSX from 'xlsx'
 
@@ -270,6 +272,8 @@
 
     data() {
       return {
+        editeBoolean:false,
+        deleteBoolean:false,
         selectBoolean:false,//表格选项框
         dialogVisible: false,
         //列表数据
@@ -309,8 +313,39 @@
       //查询列表
       this.initDatas();
       //this.getDictOptions()
+      this.statusFun()
     },
     methods: {
+      //状态判断
+      statusFun(){
+        var data = {
+          percode:'oil_contract.SumStore.Delete',
+        }
+        permissionApi.permissionIsauth(data, this.$axios).then(res => {
+          console.log('权限',res.data)
+          if(res.data.code==0){
+            if(res.data.message=='有权限'){
+              this.deleteBoolean = true
+            }
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      
+        var data = {
+          percode:'oil_contract.SumStore.Edit',
+        }
+        permissionApi.permissionIsauth(data, this.$axios).then(res => {
+          console.log('权限',res.data)
+          if(res.data.code==0){
+            if(res.data.message=='有权限'){
+              this.editeBoolean = true
+            }
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       //选择选项
       onSelectChange(item,index){
         console.log(222,item,index)

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

@@ -33,7 +33,7 @@
         </el-form>
       </div>
       <el-table id="rebateSetTable" stripe size="mini" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-        <el-table-column label="操作" header-align="center" width="100" align="center" fixed>
+        <el-table-column v-if="jurisdictionBoolean" label="操作" header-align="center" width="100" align="center" fixed>
           <template slot-scope="scope">
               <el-button type="text" title="生成" size="small" icon="el-icon-edit" @click="onNavigateScore(scope.row)">生成</el-button>
           </template>
@@ -132,6 +132,7 @@
 <script>
   import { mapGetters } from 'vuex';
   import api from '@/api/oilcontract/contractSumScore';
+  import permissionApi from '@/api/oilcontract/permission';
   import FileSaver from 'file-saver'
   import XLSX from 'xlsx'
 
@@ -165,6 +166,7 @@
 
     data() {
       return {
+        jurisdictionBoolean:false,
         dialogVisible: false,
         //列表数据
         entityList: [],
@@ -202,8 +204,25 @@
       //查询列表
       this.initDatas();
       //this.getDictOptions()
+      this.permissionIsauth()
     },
     methods: {
+      // 判断权限
+      permissionIsauth(){
+        var data = {
+          percode:'oil_contract.SumStore.Add',
+        }
+        permissionApi.permissionIsauth(data, this.$axios).then(res => {
+          if(res.data.code==0){
+            if(res.data.message=='有权限'){
+              this.jurisdictionBoolean = true
+            }
+          }
+          console.log('判断是否有权限',res)
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       initDatas() {
         //分页及列表条件
         // <el-option label="物资类" value="01" key="01"></el-option>

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

@@ -37,7 +37,7 @@
       <el-table size="mini" id="rebateSetTable" stripe :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" min-width="160" align="center" fixed>
           <template slot-scope="scope">
-            <el-button type="text" title="编辑" size="small" icon="el-icon-edit" @click="onNavigateEvaluate(scope.row)">编辑</el-button>
+            <el-button v-if="editeBoolean" 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
@@ -50,7 +50,7 @@
               <div style="text-align: right; margin: 0">
                 <el-button type="primary" size="mini" @click="deleteEntity(scope.row,scope.$index)">删除</el-button>
               </div>
-              <el-button slot="reference" type="text" style="margin-left:3px" icon="el-icon-delete" size="small" >删除</el-button>
+              <el-button slot="reference" v-if="deleteBoolean" type="text" style="margin-left:3px" icon="el-icon-delete" size="small" >删除</el-button>
             </el-popover>
           </template>
         </el-table-column>
@@ -181,6 +181,7 @@
 <script>
   import { mapGetters } from 'vuex';
   import api from '@/api/oilcontract/contract';
+  import permissionApi from '@/api/oilcontract/permission';
   import FileSaver from 'file-saver'
   import XLSX from 'xlsx'
 
@@ -241,6 +242,8 @@
 
     data() {
       return {
+        editeBoolean:false,
+        deleteBoolean:false,
         dialogVisible: false,
         //列表数据
         entityList: [],
@@ -394,96 +397,6 @@
             sort: true
           },
 
-          // {
-          //   prop: "ConstructionUnit",
-          //   label: '建设单位',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "ConstructionOwner",
-          //   label: '建设负责人',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "ConstructionTelphone",
-          //   label: '手机号',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "BuildUnit",
-          //   label: '施工单位',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "BuildOwner",
-          //   label: '施工负责人',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "BuildTelphone",
-          //   label: '手机号',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "SuperviseUnit",
-          //   label: '监理单位',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "SuperviseOwner",
-          //   label: '监理负责人',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "SuperviseTelphone",
-          //   label: '手机号',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "QualityUnit",
-          //   label: '质量监督单位',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "QualityOwner",
-          //   label: '质量监督负责人',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "QualityTelphone",
-          //   label: '手机号',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "Remark",
-          //   label: '备注',
-          //   width: 100,
-          //   sort: true
-          // }
           ]
       }
     },
@@ -495,7 +408,37 @@
       //this.getDictOptions()
     },
     methods: {
-
+      //状态判断
+      statusFun(){
+        var data = {
+          percode:'oil_contract.Review.Delete',
+        }
+        permissionApi.permissionIsauth(data, this.$axios).then(res => {
+          console.log('权限',res.data)
+          if(res.data.code==0){
+            if(res.data.message=='有权限'){
+              this.deleteBoolean = true
+            }
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      
+        var data = {
+          percode:'oil_contract.Review.Edit',
+        }
+        permissionApi.permissionIsauth(data, this.$axios).then(res => {
+          console.log('权限',res.data)
+          if(res.data.code==0){
+            if(res.data.message=='有权限'){
+              this.editeBoolean = true
+            }
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      
+      },
       //跳转评价
       onNavigateEvaluate(item){
         console.log('跳转',item)

src/dashoo.cn/frontend_web/src/pages/oilcontract/evaluation-items/_opera/operation.vue

@@ -21,15 +21,15 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="上级节点" prop="ParentId">
-              <el-select v-model="formData.ParentId" placeholder="请选择" :disabled="superiorDisabled" >
+              <el-select v-model="formData.ParentId" placeholder="请选择" :disabled="superiorDisabled" style="width: 100%;">
                 <el-option :label="item.Content" :value="item.Id" v-for="(item,index) of oneList" :key="item.Id" ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="分类" prop="Type">
-              <el-select v-model="formData.Type" placeholder="请选择" >
+            <el-form-item label="分类" prop="Type" >
+              <el-select v-model="formData.Type" placeholder="请选择" style="width: 100%;">
                 <el-option key="03" label="服务商" value="03"></el-option>
                 <el-option key="01" label="供应商" value="01"></el-option>
                 <el-option key="02" label="承包商" value="02"></el-option>
@@ -50,7 +50,7 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="级别" prop="LevelCode">
+            <el-form-item label="级别" prop="LevelCode" style="width: 100%;">
               <el-select v-model="formData.LevelCode" placeholder="请选择" @change="onLevelChange" >
                 <el-option :key="1" label="一级" :value="1"></el-option>
                 <el-option :key="2" label="二级" :value="2"></el-option>
@@ -162,7 +162,7 @@
     },
     created() {
       this.serviceId = this.$route.params.opera;
-      this.getDictOptions();
+      // this.getDictOptions();
       this.evaluationItemsOnelist()
       console.log(this.serviceId);
       if(this.serviceId != 'add' && this.serviceId>0) {
@@ -175,12 +175,13 @@
     methods: {
       // 获取一级节点
       evaluationItemsOnelist() {
-        api.evaluationItemsOnelist(0,this.$axios).then(res => {
+        api.evaluationItemsOnelist(0,0,this.$axios).then(res => {
           console.log('一级节点',res)
           this.oneList = res.data.items
         }).catch(err => {
           console.error(err)
         })
+
       },
       onLevelChange(index){
         console.log(index)
@@ -205,22 +206,22 @@
         // });
       },
 
-      getDictOptions() {
-        api.getDictList(this.$axios).then(res => {
-          //this.wellNoOptions = res.data.items['WellNo']
-          //this.supervisersOptions = res.data.items['Supervisers']
-        }).catch(err => {
-          console.error(err)
-        })
+      // getDictOptions() {
+      //   api.getDictList(this.$axios).then(res => {
+      //     //this.wellNoOptions = res.data.items['WellNo']
+      //     //this.supervisersOptions = res.data.items['Supervisers']
+      //   }).catch(err => {
+      //     console.error(err)
+      //   })
 
-        api.evaluationItemsOnelist(0,this.$axios).then(res => {
-          console.log('一级节点',res)
-          this.oneList = res.data.items
-        }).catch(err => {
-          console.error(err)
-        })
+      //   api.evaluationItemsOnelist(0,this.$axios).then(res => {
+      //     console.log('一级节点',res)
+      //     this.oneList = res.data.items
+      //   }).catch(err => {
+      //     console.error(err)
+      //   })
 
-      },
+      // },
 
       //保存信息
       saveEntity() {

src/dashoo.cn/frontend_web/src/pages/oilcontract/evaluation-items/index.vue

@@ -87,9 +87,19 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="12">
+            <el-form-item label="分类" >
+              <el-select v-model="searchForm.Type" placeholder="请选择" @change="searchFormType">
+                <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="12">
             <el-form-item label="上级节点" prop="ParentId">
-              <el-select v-model="searchForm.ParentId" placeholder="请选择" :disabled="superiorDisabled" >
+              <el-select  v-model="searchForm.ParentId" placeholder="请选择" :disabled="superiorDisabled" >
                 <el-option :label="item.Content" :value="item.Id" v-for="(item,index) of oneList" :key="item.Id" ></el-option>
               </el-select>
             </el-form-item>
@@ -100,15 +110,7 @@
               <el-input size="mini" v-model="searchForm.Type" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col> -->
-          <el-col :span="12">
-            <el-form-item label="分类" >
-              <el-select v-model="searchForm.Type" placeholder="请选择" >
-                <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="12">
             <el-form-item label="序号">
@@ -304,6 +306,10 @@
       this.evaluationItemsOnelist()
     },
     methods: {
+      searchFormType(e){
+        console.log(e)
+        
+      },
       onLevelChange(index){
         console.log(index)
         if(index==1){
@@ -342,7 +348,7 @@
       },
       // 获取一级节点
       evaluationItemsOnelist() {
-        api.evaluationItemsOnelist(0,this.$axios).then(res => {
+        api.evaluationItemsOnelist(0,0,this.$axios).then(res => {
           console.log('一级节点',res)
           this.oneList = res.data.items
         }).catch(err => {