修改bug完成 11.10

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

@@ -68,31 +68,31 @@
         </el-table-column>
         <el-table-column sortable show-overflow-tooltip prop="SupplierName" header-align="center" width="130"
                          label="服务商名称"></el-table-column>
-        <el-table-column sortable show-overflow-tooltip prop="Status" header-align="center" width="140" label="状态">
+        <el-table-column sortable show-overflow-tooltip prop="Status" header-align="center" width="140" label="状态" align="center">
           <template slot-scope="scope">
             <div>{{ columnFun(scope.row.Status) }}</div>
           </template>
         </el-table-column>
-        <el-table-column sortable show-overflow-tooltip prop="Year" header-align="center" width="130"
+        <el-table-column sortable show-overflow-tooltip prop="Year" header-align="center" width="100" align="center"
                          label="年度"></el-table-column>
-        <el-table-column sortable show-overflow-tooltip prop="SumScore" header-align="center" label="评价得分"
+        <el-table-column sortable show-overflow-tooltip prop="SumScore" header-align="center" label="评价得分" align="center"
                          width="120"></el-table-column>
         <el-table-column sortable show-overflow-tooltip label="评价内容及得分" header-align="center">
-          <el-table-column sortable show-overflow-tooltip prop="SumScore1" header-align="center" label="项目组织实施(10分)"
+          <el-table-column sortable show-overflow-tooltip prop="SumScore1" header-align="center" label="项目组织实施(10分)" align="center"
                            min-width="155"></el-table-column>
-          <el-table-column sortable show-overflow-tooltip prop="SumScore2" header-align="center" label="项目质量管理(20分)"
+          <el-table-column sortable show-overflow-tooltip prop="SumScore2" header-align="center" label="项目质量管理(20分)" align="center"
                            min-width="155"></el-table-column>
-          <el-table-column sortable show-overflow-tooltip prop="SumScore3" header-align="center"
+          <el-table-column sortable show-overflow-tooltip prop="SumScore3" header-align="center" align="center"
                            label="项目职业健康安全与环境管理(20分)" min-width="255"></el-table-column>
-          <el-table-column sortable show-overflow-tooltip prop="SumScore4" header-align="center" label="项目成本管理(5分)"
+          <el-table-column sortable show-overflow-tooltip prop="SumScore4" header-align="center" label="项目成本管理(5分)" align="center"
                            min-width="155"></el-table-column>
-          <el-table-column sortable show-overflow-tooltip prop="SumScore5" header-align="center" label="项目进度管理(10分)"
+          <el-table-column sortable show-overflow-tooltip prop="SumScore5" header-align="center" label="项目进度管理(10分)" align="center"
                            min-width="155"></el-table-column>
-          <el-table-column sortable show-overflow-tooltip prop="SumScore6" header-align="center" label="项目分包管理(15分)"
+          <el-table-column sortable show-overflow-tooltip prop="SumScore6" header-align="center" label="项目分包管理(15分)" align="center"
                            min-width="155"></el-table-column>
-          <el-table-column sortable show-overflow-tooltip prop="SumScore7" header-align="center" label="信息资料管理(10分)"
+          <el-table-column sortable show-overflow-tooltip prop="SumScore7" header-align="center" label="信息资料管理(10分)" align="center"
                            min-width="155"></el-table-column>
-          <el-table-column sortable show-overflow-tooltip prop="SumScore8" header-align="center" label="诚信履约(10分)"
+          <el-table-column sortable show-overflow-tooltip prop="SumScore8" header-align="center" label="诚信履约(10分)" align="center"
                            min-width="155"></el-table-column>
         </el-table-column>
 
@@ -142,18 +142,18 @@
           </template>
         </el-table-column> -->
 
-        <el-table-column sortable show-overflow-tooltip prop="Conclusion" label="评价结果" header-align="center"
+        <el-table-column sortable show-overflow-tooltip prop="Conclusion" label="评价结果" header-align="center" align="center"
                          width="110">
           <template slot-scope="scope">
             {{ evaluateFun(scope.row.Conclusion) }}
           </template>
         </el-table-column>
-        <el-table-column sortable show-overflow-tooltip prop="Result1" label="业绩评价结果" header-align="center" width="150">
+        <el-table-column sortable show-overflow-tooltip prop="Result1" label="业绩评价结果" header-align="center" width="150" align="center">
           <template slot-scope="scope">
             {{ scope.row.Result1 }}
           </template>
         </el-table-column>
-        <el-table-column sortable show-overflow-tooltip prop="Result2" label="基本条件评价结果" header-align="center"
+        <el-table-column sortable show-overflow-tooltip prop="Result2" label="基本条件评价结果" header-align="center" align="center"
                          width="160">
           <template slot-scope="scope">
             {{ scope.row.Result2 }}

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

@@ -39,7 +39,7 @@
           </template>
         </el-table-column>
         <el-table-column sortable show-overflow-tooltip prop="SupplierName" header-align="center" width="130" label="承包商名称"></el-table-column>
-        <el-table-column sortable show-overflow-tooltip prop="Score" header-align="center" label="评价得分" width="120"></el-table-column>
+        <el-table-column sortable show-overflow-tooltip prop="Score" header-align="center" label="评价得分" width="120" align="center"></el-table-column>
 
         <!-- <el-table-column sortable show-overflow-tooltip label="法人资格和相应的资质证明文件应满足要求且持续有效" header-align="center"  :min-width="tableWidth">
           <template slot-scope="scope">
@@ -87,21 +87,21 @@
           </template>
         </el-table-column> -->
 
-        <el-table-column sortable show-overflow-tooltip prop="Evaluate" label="评价结果" header-align="center" min-width="120">
+        <el-table-column sortable show-overflow-tooltip prop="Evaluate" label="评价结果" header-align="center" min-width="120" align="center">
           <template slot-scope="scope">
             {{evaluateFun(scope.row.Evaluate)}}
           </template>
         </el-table-column>
 
-        <el-table-column sortable show-overflow-tooltip label="评价内容及得分" header-align="center">
-          <el-table-column sortable show-overflow-tooltip prop="Score1" header-align="center" label="项目组织实施(10分)" min-width="155"></el-table-column>
-          <el-table-column sortable show-overflow-tooltip prop="Score2" header-align="center" label="项目质量管理(20分)" min-width="155"></el-table-column>
-          <el-table-column sortable show-overflow-tooltip prop="Score3" header-align="center" label="项目职业健康安全与环境管理(20分)" min-width="255"></el-table-column>
-          <el-table-column sortable show-overflow-tooltip prop="Score4" header-align="center" label="项目成本管理(5分)" min-width="155"></el-table-column>
-          <el-table-column sortable show-overflow-tooltip prop="Score5" header-align="center" label="项目进度管理(10分)" min-width="155"></el-table-column>
-          <el-table-column sortable show-overflow-tooltip prop="Score6" header-align="center" label="项目分包管理(15分)" min-width="155"></el-table-column>
-          <el-table-column sortable show-overflow-tooltip prop="Score7" header-align="center" label="信息资料管理(10分)" min-width="155"></el-table-column>
-          <el-table-column sortable show-overflow-tooltip prop="Score8" header-align="center" label="诚信履约(10分)" min-width="155"></el-table-column>
+        <el-table-column sortable show-overflow-tooltip label="评价内容及得分" header-align="center" >
+          <el-table-column sortable show-overflow-tooltip prop="Score1" header-align="center" label="项目组织实施(10分)" min-width="155" align="center"></el-table-column>
+          <el-table-column sortable show-overflow-tooltip prop="Score2" header-align="center" label="项目质量管理(20分)" min-width="155" align="center"></el-table-column>
+          <el-table-column sortable show-overflow-tooltip prop="Score3" header-align="center" label="项目职业健康安全与环境管理(20分)" min-width="255" align="center"></el-table-column>
+          <el-table-column sortable show-overflow-tooltip prop="Score4" header-align="center" label="项目成本管理(5分)" min-width="155" align="center"></el-table-column>
+          <el-table-column sortable show-overflow-tooltip prop="Score5" header-align="center" label="项目进度管理(10分)" min-width="155" align="center"></el-table-column>
+          <el-table-column sortable show-overflow-tooltip prop="Score6" header-align="center" label="项目分包管理(15分)" min-width="155" align="center"></el-table-column>
+          <el-table-column sortable show-overflow-tooltip prop="Score7" header-align="center" label="信息资料管理(10分)" min-width="155" align="center"></el-table-column>
+          <el-table-column sortable show-overflow-tooltip prop="Score8" header-align="center" label="诚信履约(10分)" min-width="155" align="center"></el-table-column>
         </el-table-column>
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"

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

@@ -84,33 +84,33 @@
             {{ columnFun(scope.row.Status) }}
           </template>
         </el-table-column>
-        <el-table-column sortable show-overflow-tooltip prop="Year" header-align="center" width="130"
+        <el-table-column sortable show-overflow-tooltip prop="Year" header-align="center" width="100" align="center"
                          label="年度"></el-table-column>
-        <el-table-column sortable show-overflow-tooltip prop="SumScore" header-align="center" label="评价得分(100分)"
-                         width="120"></el-table-column>
+        <el-table-column sortable show-overflow-tooltip prop="SumScore" header-align="center" label="评价得分(100分)" align="center"
+                         width="140"></el-table-column>
         <el-table-column sortable show-overflow-tooltip label="评价内容及得分" header-align="center">
-          <el-table-column sortable show-overflow-tooltip prop="SumScore1" header-align="center" label="产品质量(30分)"
+          <el-table-column sortable show-overflow-tooltip prop="SumScore1" header-align="center" label="产品质量(30分)" align="center"
                            width="140"></el-table-column>
-          <el-table-column sortable show-overflow-tooltip prop="SumScore2" header-align="center" label="合同履约(20分)"
+          <el-table-column sortable show-overflow-tooltip prop="SumScore2" header-align="center" label="合同履约(20分)" align="center"
                            width="140"></el-table-column>
-          <el-table-column sortable show-overflow-tooltip prop="SumScore3" header-align="center" label="售后服务(15分)"
+          <el-table-column sortable show-overflow-tooltip prop="SumScore3" header-align="center" label="售后服务(15分)" align="center"
                            width="140"></el-table-column>
-          <el-table-column sortable show-overflow-tooltip prop="SumScore4" header-align="center" label="诚信经营(15分)"
+          <el-table-column sortable show-overflow-tooltip prop="SumScore4" header-align="center" label="诚信经营(15分)" align="center"
                            width="140"></el-table-column>
-          <el-table-column sortable show-overflow-tooltip prop="SumScore5" header-align="center" label="协同响应(20分)"
+          <el-table-column sortable show-overflow-tooltip prop="SumScore5" header-align="center" label="协同响应(20分)" align="center"
                            width="140"></el-table-column>
         </el-table-column>
-        <el-table-column sortable show-overflow-tooltip prop="Conclusion" label="评价结果" header-align="center" width="110">
+        <el-table-column sortable show-overflow-tooltip prop="Conclusion" label="评价结果" header-align="center" width="110" align="center">
           <template slot-scope="scope">
             {{ evaluateFun(scope.row.Conclusion) }}
           </template>
         </el-table-column>
-        <el-table-column sortable show-overflow-tooltip prop="Result1" label="业绩评价结果" header-align="center" width="150">
+        <el-table-column sortable show-overflow-tooltip prop="Result1" label="业绩评价结果" header-align="center" width="150" align="center">
           <template slot-scope="scope">
             {{ scope.row.Result1 }}
           </template>
         </el-table-column>
-        <el-table-column sortable show-overflow-tooltip prop="Result2" label="基本条件评价结果" header-align="center"
+        <el-table-column sortable show-overflow-tooltip prop="Result2" label="基本条件评价结果" header-align="center" align="center"
                          width="160">
           <template slot-scope="scope">
             {{ scope.row.Result2 }}

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

@@ -40,15 +40,15 @@
         </el-table-column>
 
         <el-table-column sortable show-overflow-tooltip prop="SupplierName" header-align="center" width="130" label="供应商名称"></el-table-column>
-        <el-table-column sortable show-overflow-tooltip prop="Score" header-align="center" label="评价得分(100分)" width="140"></el-table-column>
+        <el-table-column sortable show-overflow-tooltip prop="Score" header-align="center" label="评价得分(100分)" align="center" width="140"></el-table-column>
         <el-table-column sortable show-overflow-tooltip label="评价内容及得分" header-align="center">
-          <el-table-column sortable show-overflow-tooltip prop="Score1" header-align="center" label="产品质量(30分)" width="140"></el-table-column>
-          <el-table-column sortable show-overflow-tooltip prop="Score2" header-align="center" label="合同履约(20分)" width="140"></el-table-column>
-          <el-table-column sortable show-overflow-tooltip prop="Score3" header-align="center" label="售后服务(15分)" width="140"></el-table-column>
-          <el-table-column sortable show-overflow-tooltip prop="Score4" header-align="center" label="诚信经营(15分)" width="140"></el-table-column>
-          <el-table-column sortable show-overflow-tooltip prop="Score5" header-align="center" label="协同响应(20分)" width="140"></el-table-column>
+          <el-table-column sortable show-overflow-tooltip prop="Score1" align="center" header-align="center" label="产品质量(30分)" width="140"></el-table-column>
+          <el-table-column sortable show-overflow-tooltip prop="Score2" align="center" header-align="center" label="合同履约(20分)" width="140"></el-table-column>
+          <el-table-column sortable show-overflow-tooltip prop="Score3" align="center" header-align="center" label="售后服务(15分)" width="140"></el-table-column>
+          <el-table-column sortable show-overflow-tooltip prop="Score4" align="center" header-align="center" label="诚信经营(15分)" width="140"></el-table-column>
+          <el-table-column sortable show-overflow-tooltip prop="Score5" align="center" header-align="center" label="协同响应(20分)" width="140"></el-table-column>
         </el-table-column>
-        <el-table-column sortable show-overflow-tooltip prop="Evaluate" label="评价结果" header-align="center" >
+        <el-table-column sortable show-overflow-tooltip prop="Evaluate" label="评价结果" header-align="center" width="100" align="center">
           <template slot-scope="scope">
             {{evaluateFun(scope.row.Evaluate)}}
           </template>

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

@@ -897,7 +897,6 @@
         // <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>
-
         var index = String(item.ContractClass)
         var name = ''
         switch(index){

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

@@ -87,14 +87,14 @@
            </el-table-column> -->
         <el-table-column sortable show-overflow-tooltip prop="SupplierName" header-align="center" width="140"
                          label="服务商名称"></el-table-column>
-        <el-table-column sortable show-overflow-tooltip prop="Status" header-align="center" width="130" label="状态">
+        <el-table-column sortable show-overflow-tooltip prop="Status" header-align="center" width="130" label="状态" align="center">
           <template slot-scope="scope">
             <div>{{ columnFun(scope.row.Status) }}</div>
           </template>
         </el-table-column>
-        <el-table-column sortable show-overflow-tooltip prop="Year" header-align="center" width="130"
+        <el-table-column sortable show-overflow-tooltip prop="Year" header-align="center" width="100" align="center"
                          label="年度"></el-table-column>
-        <el-table-column sortable show-overflow-tooltip prop="SumScore" header-align="center" label="评价得分"
+        <el-table-column sortable show-overflow-tooltip prop="SumScore" header-align="center" label="评价得分" align="center"
                          width="120"></el-table-column>
 
         <el-table-column sortable show-overflow-tooltip label="评价内容及得分" align="center">
@@ -112,12 +112,12 @@
             {{ evaluateFun(scope.row.Conclusion) }}
           </template>
         </el-table-column>
-        <el-table-column sortable show-overflow-tooltip prop="Result1" label="业绩评价结果" header-align="center" width="150">
+        <el-table-column sortable show-overflow-tooltip prop="Result1" label="业绩评价结果" header-align="center" width="150" align="center">
           <template slot-scope="scope">
             {{ scope.row.Result1 }}
           </template>
         </el-table-column>
-        <el-table-column sortable show-overflow-tooltip prop="Result2" label="基本条件评价结果" header-align="center"
+        <el-table-column sortable show-overflow-tooltip prop="Result2" label="基本条件评价结果" header-align="center" align="center"
                          width="160">
           <template slot-scope="scope">
             {{ scope.row.Result2 }}

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

@@ -39,14 +39,14 @@
           </template>
         </el-table-column>
         <el-table-column sortable show-overflow-tooltip prop="SupplierName" header-align="center" width="130" label="服务商名称"></el-table-column>
-        <el-table-column sortable show-overflow-tooltip prop="Score" header-align="center" label="评价得分" width="120"></el-table-column>
+        <el-table-column sortable show-overflow-tooltip prop="Score" header-align="center" label="评价得分" width="120" align="center"></el-table-column>
         <el-table-column sortable show-overflow-tooltip label="评价内容及得分" header-align="center">
-          <el-table-column sortable show-overflow-tooltip prop="Score1" header-align="center" label="项目管理(40分)" width="140"></el-table-column>
-          <el-table-column sortable show-overflow-tooltip prop="Score2" header-align="center" label="HSE管理(30分)" width="140"></el-table-column>
-          <el-table-column sortable show-overflow-tooltip prop="Score3" header-align="center" label="合同履行(15分)" width="140"></el-table-column>
-          <el-table-column sortable show-overflow-tooltip prop="Score4" header-align="center" label="企业诚信(15分)" width="140"></el-table-column>
+          <el-table-column sortable show-overflow-tooltip prop="Score1" align="center" header-align="center" label="项目管理(40分)" width="140"></el-table-column>
+          <el-table-column sortable show-overflow-tooltip prop="Score2" align="center" header-align="center" label="HSE管理(30分)" width="140"></el-table-column>
+          <el-table-column sortable show-overflow-tooltip prop="Score3" align="center" header-align="center" label="合同履行(15分)" width="140"></el-table-column>
+          <el-table-column sortable show-overflow-tooltip prop="Score4" align="center" header-align="center" label="企业诚信(15分)" width="140"></el-table-column>
         </el-table-column>
-        <el-table-column sortable show-overflow-tooltip prop="Evaluate" label="评价结果" header-align="center" >
+        <el-table-column sortable show-overflow-tooltip prop="Evaluate" align="center" label="评价结果" header-align="center" width="100" >
           <template slot-scope="scope">
             {{evaluateFun(scope.row.Evaluate)}}
           </template>

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

@@ -14,6 +14,7 @@
           <i class="icon icon-table2"></i> 详情
         </span>
         <span style="float: right;">
+          <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="getEvaluate">新增评价</el-button>
           <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="this.workData.IsConfirm==0" @click="issueVisible=true">确认</el-button>
           <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="onBack">返回</el-button>
         </span>
@@ -331,7 +332,7 @@
         formData: {
           Id: '',
         },
-        workData:{},
+        workData:'',
         SupplierSelectList:[],//企业名称列表
 
         //下拉选择项
@@ -342,11 +343,39 @@
     },
     created() {
         this.serviceId = this.$route.params.opera;
-        this.workData = this.$route.query.item
+        this.workData = JSON.parse(this.$route.query.item);
         this.initDatas();
-        this.getEveList()
+        this.getEveList();
+        console.log('传过来的数据',this.workData)
     },
     methods: {
+      //新增评价
+      getEvaluate(){
+        let item = Object.assign({},this.formData);
+        let index = String(item.ContractClass);
+        let name = '';
+        switch(index){
+          case "01":
+            name = 'contract-goods';
+          break;
+          case "02":
+            name = 'contract-basis';
+          break;
+          case "03":
+            name = 'contract-service';
+          break;
+          default:
+            this.$message({type: 'error',message: '没有找到此合同'});
+            return;
+          break;
+        }
+        this.$router.push({
+          path:'/oilcontract/' + name + '/add/evaluate',
+          query:{
+            item:item,
+          }
+        })
+      },
       //下发单位
       getEveList() {
         let _this = this
@@ -386,7 +415,7 @@
             var data = {
               ReviewId:this.issueFrom.region
             }
-            api.contractOrderUpdate(data,this.workData.ContractId, this.$axios).then(res => {
+            api.contractOrderUpdate(data,this.workData.Id, this.$axios).then(res => {
               console.log('工单确认',res)
               if(res.data.code==0){
                 this.$message({

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

@@ -155,7 +155,6 @@
       dateFun: function () {
         return function (item) {
           // var myDate = new Date(item);
-          console.log(item, '33333')
           if (item === '0001-01-01T00:00:00Z') {
             return '--'
           }
@@ -218,7 +217,7 @@
         this.$router.push({
           path:'/oilcontract/contract-work-order/' + item.Id + '/operation',
           query:{
-            item:item
+            item:JSON.stringify(item),
           }
         })
       },