修改25号bug，加loading，传参格式，连续保存出错问题

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

@@ -71,6 +71,9 @@ export default {
       method: 'GET',
       params: params
     })
-  }
+  },
+  
+  
+  
 
 }

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

@@ -37,7 +37,7 @@
         </el-form>
       </div>
       <el-table id="rebateSetTable" highlight-current-row stripe size="mini" :data="entityList" border
-                height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby" @selection-change="onSelectAll">
+                height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby" @selection-change="onSelectAll" v-loading="tableLoading">
         <el-table-column v-if="selectAllButtonBoolean" :selectable="selectableFun" type="selection"
                          width="55"></el-table-column>
         <el-table-column label="操作" header-align="center" width="210" align="center" fixed>
@@ -384,6 +384,7 @@ export default {
   },
   data() {
     return {
+      tableLoading: false,
       userSelectBoolean: false,
       eveIdList: 0,
       selectAllButtonBoolean: false,
@@ -517,6 +518,7 @@ export default {
       })
     },
     initDatas() {
+      this.tableLoading = true;
       //分页及列表条件
       // <el-option label="物资类" value="01" key="01"></el-option>
       // <el-option label="基建类" value="02" key="02"></el-option>
@@ -542,9 +544,11 @@ export default {
       Object.assign(params, this.searchForm)
       //访问接口
       api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
+        this.tableLoading = false;
         this.entityList = res.data.items
         this.currentItemCount = res.data.currentItemCount
       }).catch(err => {
+        this.tableLoading = false;
         console.error(err)
       })
     },
@@ -678,7 +682,8 @@ export default {
       this.$router.push({
         path: '/oilcontract/contract-basis-year/' + item.Id + '/operation',
         query: {
-          item: item
+          // item: item,
+          // SupplierId:item.SupplierId,
         }
       })
     },

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-table highlight-current-row :data="typeList" border height="calc(100vh - 243px)" style="width: 100%">
+    <el-table highlight-current-row :data="typeList" border height="calc(100vh - 243px)" style="width: 100%" >
       <el-table-column
         label="序号"
         type="index"

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

@@ -157,7 +157,7 @@
             <el-form label-width="160px" ref="EntityForm2" :model="evaluateDataZhuan" :rules="rules">
               <el-row>
                 <el-col :span="8">
-                  <el-form-item label="服务商名称">
+                  <el-form-item label="承包商名称">
                     <el-input disabled="disabled" v-model="evaluateDataZhuan.SupplierName"
                               style="width: 100%"></el-input>
                   </el-form-item>
@@ -272,7 +272,7 @@
       </el-tabs>
     </el-card>
 
-    <submit-popup ref="submitpopup" :examineType="1" :selectDeptBoolean2="true" :eveId="formData.Id" :formData="formData"
+    <submit-popup ref="submitpopup" :examineType="1" :selectDeptBoolean2="true" :eveId="Number(formData.Id)" :formData="formData"
                  @refreshPage="refreshPage"></submit-popup>
 
   </div>
@@ -389,7 +389,6 @@ export default {
         Id: 0,
         Status: 0,
       },
-      nowItem: {},
 
       editData: {},
       evaluation_list: [],
@@ -408,7 +407,7 @@ export default {
   },
   watch: {},
   created() {
-    console.log('接受操作', this.$route.query.item)
+    // console.log('接受操作', this.$route.query.item)
     this.serviceId = this.$route.params.opera;
     if (this.$route.query.item) {
       if (this.$route.query.item.SupplierId > 0) {
@@ -432,7 +431,6 @@ export default {
       this.formData = this.$route.query.item
       this.formData.Id = 0;
       this.formData.Status = 0
-      this.nowItem = this.$route.query.item
       this.initPage(this.$route.query.item)
     }
     this.statusFun()

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

@@ -32,7 +32,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <el-table id="rebateSetTable" highlight-current-row stripe size="mini" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby" >
+      <el-table id="rebateSetTable" highlight-current-row stripe size="mini" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby" v-loading="tableLoading">
         <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>
@@ -246,6 +246,8 @@
 
     data () {
       return {
+        tableLoading:false,
+
         tableWidth: '290px',
         dialogVisible: false,
         // 列表数据
@@ -309,11 +311,11 @@
         })
       },
       initDatas () {
+        this.tableLoading = true;
         // 分页及列表条件
         // <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>
-
         let params = {
           _currentPage: this.currentPage,
           _size: this.size,
@@ -334,9 +336,11 @@
         Object.assign(params, this.searchForm)
         // 访问接口
         api.GetComputeList(myCreateOn.join(','), params, this.$axios).then(res => {
+          this.tableLoading = false;
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
+          this.tableLoading = false;
           console.error(err)
         })
       },
@@ -467,7 +471,8 @@
         this.$router.push({
           path: '/oilcontract/contract-basis-year/' + 'add' + '/operation',
           query: {
-            item: item
+            item: item,
+            // SupplierId:item.SupplierId,
           }
         })
       }

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-table highlight-current-row :data="entityListData.entityList" border height="calc(100vh - 243px)"
-              style="width: 100%">
+              style="width: 100%" v-loading="tableLoading">
       <el-table-column
         property="SequenceNo"
         label="序号"
@@ -72,6 +72,7 @@ export default {
   },
   data() {
     return {
+      tableLoading: false,
       dialogVisible: false,
       //列表数据
       entityListData: {
@@ -106,15 +107,22 @@ export default {
     } else {
       this.editDatas();
     }
-
-
   },
   methods: {
+    // aa(){
+    //   if (this.evaluateId == 0) {
+    //     this.initDatas();
+    //   } else {
+    //     this.editDatas();
+    //   }
+    // },
     initDatas() {
+      this.tableLoading = true;
       var data = {
         Category: 2,
       }
       api.evaluationItemsOnelist(data, this.ContractClass, this.$axios).then(res => {
+        this.tableLoading = false;
         console.log('上级节点内容', res)
         var data = res.data.items
         var list = []
@@ -138,19 +146,21 @@ export default {
         this.entityListData.entityList = list
         console.log('处理完的数据', list)
       }).catch(err => {
+        this.tableLoading = false;
         console.error(err)
       })
 
     },
     //初始数据
     editDatas() {
+      this.tableLoading = true;
       var data = {
         ContentReviewId: this.evaluateId,
         Category: this.category,
         Type: 2,
       }
       api.contractEvaluationTree(data, this.$axios).then(res => {
-          console.log(6666,res)
+        this.tableLoading = false;
         let data = res.data.items
         let list = []
         if (data) {
@@ -170,6 +180,7 @@ export default {
         this.entityListData.entityList = list
         console.log('处理完的数据', list)
       }).catch(err => {
+        this.tableLoading = false;
         console.error(err)
       })
     },

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

@@ -49,7 +49,7 @@
                 <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="110px" ref="EntityForm" :model="formData" >
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="承包商名称">
@@ -114,7 +114,7 @@
           </el-card>
         </el-tab-pane>
         <el-tab-pane label="业绩评价" name="2">
-          <evaluation-list ref="evaluation_list_one" :evaluateId="formData.Id" category="0"
+          <evaluation-list ref="evaluation_list_one" :evaluateId="formData.Id" category="0" v-if="contractData.ContractClass"
                            :ContractClass="contractData.ContractClass"
                            :disabledForm="auditBtnBoolean"></evaluation-list>
         </el-tab-pane>
@@ -125,7 +125,7 @@
         </el-tab-pane>
         <el-tab-pane label="专业处室业绩评价" name="3"
                      v-if="departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<=-4">
-          <evaluation-list ref="evaluation_list_two" :evaluateId="formData.Id" category="1"
+          <evaluation-list ref="evaluation_list_two" :evaluateId="formData.Id" category="1" v-if="contractData.ContractClass"
                            :ContractClass="contractData.ContractClass"
                            :disabledForm="auditBtnBooleanZhuan"></evaluation-list>
         </el-tab-pane>
@@ -170,6 +170,7 @@ import WfHistory from '@/components/workflow/wfhistory.vue'
 import apiCert from '@/api/oilsupplier/suppliercert'
 import permissionApi from '@/api/oilcontract/permission'
 import submitPopup from '@/components/oilcontract/submitPopup.vue'
+import util from '@/utils/util.js'
 
 export default {
   computed: {
@@ -239,7 +240,7 @@ export default {
     //  this.routeData = this.$route.query.item
     this.routeDataType = this.$route.query.type
 
-    console.log('跳转数据', this.routeData)
+    // console.log('跳转数据', this.routeData)
     this.serviceId = this.$route.params.opera
     //  this.getDictOptions()
 
@@ -255,7 +256,12 @@ export default {
       this.formData.Id = 0
       this.formData.Status = '0'
       this.approvalProcess.disabled = true
-      this.contractData = this.$route.query.item
+      util.contractDetail(this.$route.query.ContractId,this.$axios).then(res => {
+        this.contractData = res.data
+      })
+
+      // this.contractData = this.$route.query.item
+      // console.log(999,this.contractData)
     }
     this.statusFun()
   },
@@ -349,6 +355,7 @@ export default {
         } else {
           this.approvalProcess.disabled = true
         }
+        // this.$refs.evaluation_listType_one.aa()
       })
         .catch(err => {
           console.error(err)

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

@@ -3,7 +3,7 @@
     <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">
+                style="width: 100%" @sort-change="orderby" v-loading="tableLoading">
         <el-table-column
           property="SequenceNo"
           label="序号"
@@ -62,8 +62,8 @@
               title="原因"
               width="200"
               trigger="hover"
-              :content="scope.row.Remark==''||scope.row.Remark==null?'空':scope.row.Remark">
-              <el-button slot="reference" v-if="scope.row.LevelCode!=1" type="primary" icon="el-icon-edit" size="mini"
+              :content="scope.row.Remark==''||scope.row.Remark==null?'空':scope.row.Remark" v-if="scope.row.LevelCode!=1">
+              <el-button slot="reference"  type="primary" icon="el-icon-edit" size="mini"
                          @click="!disabledForm?'':onDialogVisible(scope.row,scope.$index)">编辑
               </el-button>
             </el-popover>
@@ -191,6 +191,7 @@ export default {
       callback();
     };
     return {
+      tableLoading:false,
       fractionBoolean: true,
       dialogVisibleCom: false,
       loading: false,
@@ -264,12 +265,14 @@ export default {
   methods: {
     // 初始数据
     initDatas() {
+      this.tableLoading = true;
       // 普通的传1，条件评价穿2
       var data = {
         Category: 1
       }
       this.standardNum = 0
       api.evaluationItemsOnelist(data, this.ContractClass, this.$axios).then(res => {
+        this.tableLoading = false;
         console.log('上级节点内容', res)
         let data = res.data.items
         let list = []
@@ -291,13 +294,15 @@ export default {
           }
         }
         this.entityListData.entityList = list
-        console.log('处理完的数据', list)
+        console.log('处理完的数据(业绩评价)', list)
       }).catch(err => {
+        this.tableLoading = false;
         console.error(err)
       })
     },
     // 编辑初始数据
     editDatas() {
+      this.tableLoading = true;
       let data = {
         ContentReviewId: this.evaluateId,
         Category: this.category,
@@ -305,6 +310,7 @@ export default {
       }
       this.standardNum = 0
       api.contractEvaluationTree(data, this.$axios).then(res => {
+        this.tableLoading = false;
         console.log('编辑后的内容', this.category, res)
         let data = res.data.items
         let list = []
@@ -325,9 +331,10 @@ export default {
             }
           }
           this.entityListData.entityList = list
-          console.log('处理完的数据', list)
+          console.log('处理完的数据(业绩评价)', list)
         }
       }).catch(err => {
+        this.tableLoading = false;
         console.error(err)
       })
     },

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

@@ -39,7 +39,7 @@
         </el-form>
       </div>
       <el-table size="mini" highlight-current-row stripe id="rebateSetTable" :data="entityList" border
-                height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby" @selection-change="onSelectAll">
+                height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby" @selection-change="onSelectAll" v-loading="tableLoading">
         <el-table-column v-if="selectAllButtonBoolean" :selectable="selectableFun" type="selection"
                          width="55"></el-table-column>
 
@@ -274,6 +274,7 @@ export default {
   },
   data () {
     return {
+      tableLoading:false,//table表格
       userSelectBoolean: false,
       eveIdList: 0,
       selectAllButtonBoolean: false,
@@ -541,12 +542,13 @@ export default {
       this.$router.push({
         path: '/oilcontract/contract-basis/' + item.Id + '/evaluate',
         query: {
-          item: item,
+          ContractId: item.ContractId,
           type: 2
         }
       })
     },
     initDatas () {
+      this.tableLoading = true;
       // 分页及列表条件
       let params = {
         _currentPage: this.currentPage,
@@ -561,7 +563,6 @@ export default {
 
       let myCreateOn = []
       // 解析时间
-      console.log('999999999999999999999999999')
       if (this.CreateOn.length == 2) {
         this.CreateOn[1].setHours(23)
         this.CreateOn[1].setMinutes(59)
@@ -573,10 +574,12 @@ export default {
       Object.assign(params, this.searchForm)
       // 访问接口
       api.getReviewList(myCreateOn.join(','), params, this.$axios).then(res => {
+        this.tableLoading = false;
         console.log('评价接口', res)
         this.entityList = res.data.items
         this.currentItemCount = res.data.currentItemCount
       }).catch(err => {
+        this.tableLoading = false;
         console.error(err)
       })
     },

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

@@ -40,7 +40,7 @@
         </el-form>
       </div>
       <el-table id="rebateSetTable" highlight-current-row stripe size="mini" :data="entityList" border
-                height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby" @selection-change="onSelectAll">
+                height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby" @selection-change="onSelectAll" v-loading="tableLoading">
         <el-table-column v-if="selectAllButtonBoolean" :selectable="selectableFun" type="selection"
                          width="55"></el-table-column>
         <el-table-column
@@ -314,6 +314,8 @@ export default {
   },
   data() {
     return {
+      tableLoading:false,
+      
       userSelectBoolean: false,
       eveIdList: 0,
       selectAllButtonBoolean: false,
@@ -481,6 +483,7 @@ export default {
       })
     },
     initDatas() {
+      this.tableLoading = true;
       //分页及列表条件
       let params = {
         _currentPage: this.currentPage,
@@ -502,9 +505,11 @@ export default {
       Object.assign(params, this.searchForm)
       //访问接口
       api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
+        this.tableLoading = false;
         this.entityList = res.data.items
         this.currentItemCount = res.data.currentItemCount
       }).catch(err => {
+        this.tableLoading = false;
         console.error(err)
       })
     },

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

@@ -32,7 +32,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <el-table id="rebateSetTable" highlight-current-row stripe size="mini" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
+      <el-table id="rebateSetTable" highlight-current-row stripe size="mini" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby" v-loading="tableLoading">
         <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>
@@ -175,6 +175,7 @@
 
     data() {
       return {
+        tableLoading: false,
         dialogVisible: false,
         //列表数据
         entityList: [],
@@ -285,6 +286,7 @@
         })
       },
       initDatas() {
+        this.tableLoading = true;
         //分页及列表条件
         let params = {
           _currentPage: this.currentPage,
@@ -306,9 +308,11 @@
         Object.assign(params, this.searchForm)
         //访问接口
         api.GetComputeList(myCreateOn.join(','), params, this.$axios).then(res => {
+          this.tableLoading = false;
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
+          this.tableLoading = false;
           console.error(err)
         })
       },

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-table highlight-current-row :data="entityListData.entityList" border height="calc(100vh - 243px)" style="width: 100%">
+    <el-table highlight-current-row :data="entityListData.entityList" border height="calc(100vh - 243px)" style="width: 100%" v-loading="tableLoading">
       <el-table-column
         property="SequenceNo"
         label="序号"
@@ -67,6 +67,7 @@
     },
     data() {
       return {
+        tableLoading:false,
         dialogVisible: false,
         //列表数据
         entityListData:{
@@ -106,10 +107,12 @@
     },
     methods: {
       initDatas() {
+        this.tableLoading = true;
         var data = {
           Category:2,
         }
         api.evaluationItemsOnelist(data,this.ContractClass,this.$axios).then(res => {
+          this.tableLoading = false;
           console.log('上级节点内容',res)
           var data = res.data.items
           var list = []
@@ -133,18 +136,21 @@
           this.entityListData.entityList = list
           console.log('处理完的数据',list)
         }).catch(err => {
+          this.tableLoading = false;
           console.error(err)
         })
 
       },
       //初始数据
       editDatas() {
+        this.tableLoading = true;
         var data = {
           ContentReviewId:this.evaluateId,
           Category:this.category,
           Type:2,
         }
         api.contractEvaluationTree(data,this.$axios).then(res => {
+          this.tableLoading = false;
           console.log('编辑后的内容aaaaaaaaaaaaaaaaa',res)
           var data = res.data.items
           var list = []
@@ -163,6 +169,7 @@
           this.entityListData.entityList = list
           console.log('处理完的数据',list)
         }).catch(err => {
+          this.tableLoading = false;
           console.error(err)
         })
       },

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

@@ -114,7 +114,7 @@
           </el-card>
         </el-tab-pane>
         <el-tab-pane label="业绩评价" name="2">
-          <evaluation-list ref="evaluation_list_one" :evaluateId="formData.Id" category="0"
+          <evaluation-list ref="evaluation_list_one" :evaluateId="formData.Id" category="0" v-if="contractData.ContractClass"
                            :ContractClass="contractData.ContractClass"
                            :disabledForm="auditBtnBoolean"></evaluation-list>
         </el-tab-pane>
@@ -125,7 +125,7 @@
         <!-- v-if="formData.Status=='4'||Number(formData.Status)>4" -->
         <el-tab-pane label="专业处室业绩评价" name="3"
                      v-if="departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<=-4">
-          <evaluation-list ref="evaluation_list_two" :evaluateId="formData.Id" category="1"
+          <evaluation-list ref="evaluation_list_two" :evaluateId="formData.Id" category="1" v-if="contractData.ContractClass"
                            :ContractClass="contractData.ContractClass"
                            :disabledForm="auditBtnBooleanZhuan"></evaluation-list>
         </el-tab-pane>
@@ -169,6 +169,7 @@ import WfHistory from '@/components/workflow/wfhistory.vue'
 import apiCert from '@/api/oilsupplier/suppliercert'
 import permissionApi from '@/api/oilcontract/permission'
 import submitPopup from '@/components/oilcontract/submitPopup.vue'
+import util from '@/utils/util.js'
 
 export default {
   computed: {
@@ -237,7 +238,7 @@ export default {
     // this.routeData = this.$route.query.item
     this.routeDataType = this.$route.query.type
 
-    console.log('跳转数据', this.routeData)
+    // console.log('跳转数据', this.routeData)
     this.serviceId = this.$route.params.opera;
     // this.getDictOptions();
 
@@ -253,7 +254,9 @@ export default {
       this.formData.Id = 0;
       this.formData.Status = 0
       this.approvalProcess.disabled = true
-      this.contractData = this.$route.query.item
+      util.contractDetail(this.$route.query.ContractId,this.$axios).then(res => {
+        this.contractData = res.data
+      })
     }
     this.statusFun()
   },

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

@@ -39,7 +39,7 @@
         </el-form>
       </div>
       <el-table size="mini" highlight-current-row stripe id="rebateSetTable" :data="entityList" border
-                height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby" @selection-change="onSelectAll">
+                height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby" @selection-change="onSelectAll" v-loading="tableLoading">
         <el-table-column v-if="selectAllButtonBoolean" :selectable="selectableFun" type="selection"
                          width="55"></el-table-column>
 
@@ -273,6 +273,8 @@ export default {
   },
   data() {
     return {
+      tableLoading:false,
+      
       userSelectBoolean: false,
       eveIdList: 0,
       selectAllButtonBoolean: false,
@@ -536,12 +538,13 @@ export default {
       this.$router.push({
         path: '/oilcontract/contract-goods/' + item.Id + '/evaluate',
         query: {
-          item: item,
+          ContractId: item.ContractId,
           type: 2,
         }
       })
     },
     initDatas() {
+      this.tableLoading = true;
       //分页及列表条件
       let params = {
         _currentPage: this.currentPage,
@@ -567,10 +570,12 @@ export default {
       Object.assign(params, this.searchForm)
       //访问接口
       api.getReviewList(myCreateOn.join(','), params, this.$axios).then(res => {
+        this.tableLoading = false;
         console.log('评价接口', res)
         this.entityList = res.data.items
         this.currentItemCount = res.data.currentItemCount
       }).catch(err => {
+        this.tableLoading = false;
         console.error(err)
       })
     },

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

@@ -35,7 +35,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <el-table size="mini" highlight-current-row stripe :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
+      <el-table size="mini" highlight-current-row stripe :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby" v-loading="tableLoading">
         <el-table-column label="操作" min-width="205" align="center" fixed >
           <template slot-scope="scope">
             <!-- <router-link :to="'/oilsupplier/oilcontract/' + scope.row.Id + '/operation'"> -->
@@ -264,7 +264,7 @@
             :border="true"
             height="500"
             size="small"
-            style="width: 100%">
+            style="width: 100%" v-loading="dialogLoading">
            <el-table-column type="index"  min-width="70" label="序号" align="center" show-overflow-tooltip></el-table-column>
            <el-table-column  prop="SourceSupplierName"  min-width="110" label="企业名称" align="center" show-overflow-tooltip></el-table-column>
            <el-table-column  prop="SupplierName"  width="250" label="确认企业名称" align="center" show-overflow-tooltip >
@@ -421,6 +421,10 @@
     name: 'oilcontract',
     data () {
       return {
+        tableLoading:false,//表格loading
+        dialogLoading:false,
+        
+        
         uploadTrueClickLoading: false,
         rules: {
           name: [
@@ -913,12 +917,13 @@
         this.$router.push({
           path:'/oilcontract/' + name + '/add/evaluate',
           query:{
-            item:item,
+            ContractId:item.Id,
             // type:1,
           }
         })
       },
       initDatas() {
+        this.tableLoading = true;//表格loading
         //分页及列表条件
         let params = {
           _currentPage: this.currentPage,
@@ -940,10 +945,12 @@
         Object.assign(params, this.searchForm)
         //访问接口
         api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
+          this.tableLoading = false;//表格loading
           console.log('列表数据',res.data)
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
+          this.tableLoading = false;//表格loading
           console.error(err)
         })
       },

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

@@ -42,7 +42,7 @@
         </el-form>
       </div>
       <el-table id="rebateSetTable" highlight-current-row stripe size="mini" :data="entityList" border
-                height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby" @selection-change="onSelectAll">
+                height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby" @selection-change="onSelectAll" v-loading="tableLoading">
         <el-table-column v-if="selectAllButtonBoolean" :selectable="selectableFun" type="selection"
                          width="55"></el-table-column>
         <el-table-column
@@ -321,6 +321,7 @@ export default {
   },
   data() {
     return {
+      tableLoading: false,
       userSelectBoolean: false,
       eveIdList: 0,
       selectAllButtonBoolean: false,
@@ -499,6 +500,7 @@ export default {
       })
     },
     initDatas() {
+      this.tableLoading = true;
       //分页及列表条件
       let params = {
         _currentPage: this.currentPage,
@@ -520,9 +522,11 @@ export default {
       Object.assign(params, this.searchForm)
       //访问接口
       api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
+        this.tableLoading = false;
         this.entityList = res.data.items
         this.currentItemCount = res.data.currentItemCount
       }).catch(err => {
+        this.tableLoading = false;
         console.error(err)
       })
     },

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

@@ -32,7 +32,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <el-table id="rebateSetTable" highlight-current-row stripe size="mini" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
+      <el-table id="rebateSetTable" highlight-current-row stripe size="mini" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby" v-loading="tableLoading">
         <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>
@@ -166,6 +166,7 @@
 
     data() {
       return {
+        tableLoading: false,
         jurisdictionBoolean:false,
         dialogVisible: false,
         //列表数据
@@ -224,6 +225,7 @@
         })
       },
       initDatas() {
+        this.tableLoading = true;
         //分页及列表条件
         // <el-option label="物资类" value="01" key="01"></el-option>
         // <el-option label="基建类" value="02" key="02"></el-option>
@@ -249,9 +251,11 @@
         Object.assign(params, this.searchForm)
         //访问接口
         api.GetComputeList(myCreateOn.join(','), params, this.$axios).then(res => {
+          this.tableLoading = false;
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
+          this.tableLoading = false;
           console.error(err)
         })
       },

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

@@ -114,7 +114,7 @@
           </el-card>
         </el-tab-pane>
         <el-tab-pane label="业绩评价" name="2">
-          <evaluation-list ref="evaluation_list_one" :evaluateId="formData.Id" category="0"
+          <evaluation-list ref="evaluation_list_one" :evaluateId="formData.Id" category="0" v-if="contractData.ContractClass"
                            :ContractClass="contractData.ContractClass"
                            :disabledForm="auditBtnBoolean"></evaluation-list>
         </el-tab-pane>
@@ -125,7 +125,7 @@
         <!-- v-if="formData.Status=='4'||Number(formData.Status)>4" -->
         <el-tab-pane label="专业处室业绩评价" name="3"
                      v-if="departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<=-4">
-          <evaluation-list ref="evaluation_list_two" :evaluateId="formData.Id" category="1"
+          <evaluation-list ref="evaluation_list_two" :evaluateId="formData.Id" category="1" v-if="contractData.ContractClass"
                            :ContractClass="contractData.ContractClass"
                            :disabledForm="auditBtnBooleanZhuan"></evaluation-list>
         </el-tab-pane>
@@ -170,6 +170,7 @@ import WfHistory from '@/components/workflow/wfhistory.vue'
 import apiCert from '@/api/oilsupplier/suppliercert'
 import permissionApi from '@/api/oilcontract/permission'
 import submitPopup from '@/components/oilcontract/submitPopup.vue'
+import util from '@/utils/util.js'
 
 export default {
   computed: {
@@ -255,7 +256,9 @@ export default {
       this.formData.Id = 0;
       this.formData.Status = 0
       this.approvalProcess.disabled = true
-      this.contractData = this.$route.query.item
+      util.contractDetail(this.$route.query.ContractId,this.$axios).then(res => {
+        this.contractData = res.data
+      })
     }
     this.statusFun()
   },

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

@@ -39,7 +39,7 @@
         </el-form>
       </div>
       <el-table size="mini" id="rebateSetTable" highlight-current-row stripe :data="entityList" border
-                height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby" @selection-change="onSelectAll">
+                height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby" @selection-change="onSelectAll" v-loading="tableLoading">
         <el-table-column v-if="selectAllButtonBoolean" :selectable="selectableFun" type="selection"
                          width="55"></el-table-column>
         <el-table-column label="操作" min-width="210" align="center" fixed>
@@ -271,6 +271,7 @@ export default {
   },
   data() {
     return {
+      tableLoading: false,
       userSelectBoolean: false,
       eveIdList: 0,
       selectAllButtonBoolean: false,
@@ -534,12 +535,13 @@ export default {
       this.$router.push({
         path: '/oilcontract/contract-service/' + item.Id + '/evaluate',
         query: {
-          item: item,
+          ContractId: item.ContractId,
           type: 2,
         }
       })
     },
     initDatas() {
+      this.tableLoading = true;
       //分页及列表条件
       let params = {
         _currentPage: this.currentPage,
@@ -565,10 +567,12 @@ export default {
       Object.assign(params, this.searchForm)
       //访问接口
       api.getReviewList(myCreateOn.join(','), params, this.$axios).then(res => {
+        this.tableLoading = false;
         console.log('评价接口', res)
         this.entityList = res.data.items
         this.currentItemCount = res.data.currentItemCount
       }).catch(err => {
+        this.tableLoading = false;
         console.error(err)
       })
     },

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

@@ -34,7 +34,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <el-table id="rebateSetTable" highlight-current-row stripe size="mini" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
+      <el-table id="rebateSetTable" highlight-current-row stripe size="mini" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby" v-loading="tableLoading">
         <el-table-column label="操作" width="160" align="center" fixed>
           <template slot-scope="scope">
             <!-- scope.row.Id  -->
@@ -165,6 +165,7 @@
     name: 'oilcontract',
     data() {
       return {
+        tableLoading: false,
         orgOptions:[],
         dialogVisible: false,
         //列表数据
@@ -222,6 +223,7 @@
         })
       },
       initDatas() {
+        this.tableLoading = true;
         //分页及列表条件
         let params = {
           _currentPage: this.currentPage,
@@ -242,9 +244,11 @@
         Object.assign(params, this.searchForm)
         //访问接口
         api.workList(myCreateOn.join(','), params, this.$axios).then(res => {
+          this.tableLoading = false;
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
+          this.tableLoading = false;
           console.error(err)
         })
       },

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

@@ -4,7 +4,7 @@
       <span style="float: right;">
           <el-button type="primary" size="mini" style="margin: 0px 0px 10px;" @click="addListButton">添加</el-button>
       </span>
-      <el-table highlight-current-row stripe :data="entityListData.entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
+      <el-table highlight-current-row stripe :data="entityListData.entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby" v-loading="tableLoading">
         <el-table-column
           property="SequenceNo"
           label="序号"
@@ -223,6 +223,7 @@
         callback();
       };
       return {
+        tableLoading: false,
         rulesEve:{
           NormalScore: [
             { required: true, message: '请输入标准分值', trigger: 'blur' }
@@ -347,12 +348,14 @@
 
       //初始数据
       initDatas() {
+        this.tableLoading = true;
         // 普通的传1，条件评价穿2
         var data = {
           Category:1,
         }
         this.standardNum = 0
         api.evaluationItemsOnelist(data,this.ContractClass,this.$axios).then(res => {
+          this.tableLoading = false;
           console.log('上级节点内容',res)
           var data = res.data.items
           var list = []
@@ -374,12 +377,15 @@
           this.entityListData.entityList = list
           console.log('处理完的数据',list)
         }).catch(err => {
+          this.tableLoading = false;
           console.error(err)
         })
       },
       //编辑初始数据
       editDatas() {
+        this.tableLoading = true;
         apiItems.evaluationItemsOnelist(this.ContractClass,1, this.$axios).then(res => {
+          this.tableLoading = false;
           console.log('编辑后的内容',res)
           var data = res.data.items
           var list = []
@@ -399,6 +405,7 @@
           this.entityListData.entityList = list
           console.log('处理完的数据',list)
         }).catch(err => {
+          this.tableLoading = false;
           console.error(err)
         })
       },

src/dashoo.cn/frontend_web/src/utils/util.js

@@ -1,3 +1,6 @@
+import api from '@/api/oilcontract/contract'
+import contractSumScoreApi from '@/api/oilcontract/contractSumScore'
+
 //时间戳转时间
 function formatDate(type,now) {
    var now = new Date(now);
@@ -33,7 +36,34 @@ function formatDate(type,now) {
    // return year+"-"+month+"-"+date+" "+hour+":"+minute+":"+second;
 }
 
+//获取日常评价合同数据
+function contractDetail(id,axios){
+  id = id || ''
+  return new Promise(function(resolve, reject){
+     api.getEntity(id, axios).then(res => {
+       resolve(res)
+     }).catch(err => {
+       reject(res)
+     });
+
+  })
+}
+
+//获取年度评价数据
+function contractSumScoreDetail(id,axios){
+  id = id || ''
+  return new Promise(function(resolve, reject){
+     contractSumScoreApi.getEntity(id, axios).then(res => {
+       resolve(res)
+     }).catch(err => {
+       reject(res)
+     });
+
+  })
+}
 
 export default {
-  formatDate:formatDate
+  formatDate:formatDate,
+  contractDetail:contractDetail,
+  contractSumScoreDetail:contractSumScoreDetail,
 }