年度评价详情查看

src/dashoo.cn/frontend_web/package.json

@@ -41,7 +41,7 @@
     "vue-print-nb": "^1.0.3",
     "vuedraggable": "^2.15.0",
     "vuex-class": "^0.2.0",
-    "wangeditor": ">=3.0.0",
+    "wangeditor": "^4.6.5",
     "xlsx": "^0.14.3"
   },
   "devDependencies": {

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

@@ -6,6 +6,16 @@ export default {
       params: params
     })
   },
+  //年度评价详情
+  computeEntity (entityId,params, myAxios) { //  计算列表
+    return myAxios({
+      url: '/contract-score/compute-entity/' + entityId,
+      method: 'GET',
+      params: params
+    })
+  },
+
+
   addEntity (formData, myAxios) { // 新增年度审核
     return myAxios({
       url: '/contract-score/add',
@@ -72,8 +82,8 @@ export default {
       params: params
     })
   },
-  
-  
-  
+
+
+
 
 }

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

@@ -12,7 +12,7 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Id!=0"
+          <!-- <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Id!=0"
                      @click="exportExcel">导出</el-button>
            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='7'&&auditBtn"
                       @click="commonAuditClick(7)">企管法规处审批</el-button>
@@ -31,7 +31,7 @@
 
           <el-button type="primary" size="mini"
                      v-if="(Number(formData.Status)<=0&&saveButton)||(formData.Status=='4'&&auditBtn)"
-                     @click="saveEntity">保存</el-button>
+                     @click="saveEntity">保存</el-button> -->
           <el-button @click="onBack" type="primary" size="mini" style="margin-left: 8px">返回</el-button>
         </span>
       </div>
@@ -409,31 +409,33 @@ export default {
   created () {
     // console.log('接受操作', this.$route.query.item)
     this.serviceId = this.$route.params.opera
-    if (this.$route.query.item) {
-      if (this.$route.query.item.SupplierId > 0) {
-        api.GetResultEntity(this.$route.query.item.SupplierId, this.$axios).then(res => {
-          console.log('结果', res)
-          this.evaluateData.Result1 = res.data.Result1
-          if (res.data.Result2 && res.data.Result2 == '0') {
-            this.evaluateData.Result2 = '否'
-          } else {
-            this.evaluateData.Result2 = '是'
-          }
-        }).catch(err => {
-          console.error(err)
-        })
-      }
-    }
-    if (this.serviceId != 'add' && this.serviceId > 0) { // 编辑进入
-      this.formData.Id = this.serviceId
-      this.refreshPage()
-    } else { // 新增进入
-      this.formData = this.$route.query.item
-      this.formData.Id = 0
-      this.formData.Status = 0
-      this.initPage(this.$route.query.item)
-    }
-    this.statusFun()
+    this.initPageId(this.serviceId)
+
+    // if (this.$route.query.item) {
+    //   if (this.$route.query.item.SupplierId > 0) {
+    //     api.GetResultEntity(this.$route.query.item.SupplierId, this.$axios).then(res => {
+    //       console.log('结果', res)
+    //       this.evaluateData.Result1 = res.data.Result1
+    //       if (res.data.Result2 && res.data.Result2 == '0') {
+    //         this.evaluateData.Result2 = '否'
+    //       } else {
+    //         this.evaluateData.Result2 = '是'
+    //       }
+    //     }).catch(err => {
+    //       console.error(err)
+    //     })
+    //   }
+    // }
+    // if (this.serviceId != 'add' && this.serviceId > 0) { // 编辑进入
+    //   this.formData.Id = this.serviceId
+    //   this.refreshPage()
+    // } else { // 新增进入
+    //   this.formData = this.$route.query.item
+    //   this.formData.Id = 0
+    //   this.formData.Status = 0
+    //   this.initPage(this.$route.query.item)
+    // }
+    // this.statusFun()
   },
   methods: {
     // 导出
@@ -535,9 +537,21 @@ export default {
           break
       }
     },
-    initPage (item) {
+    initPageId(id){
+      if (id > 0) {
+          var data = {
+            ContractClass:'02'
+          }
+          api.computeEntity(id, data, this.$axios).then(res => {
+            console.log('详情', res)
+            this.initPage(id,res.data)
+          }).catch(err => {
+            console.error(err)
+          })
+      }
+    },
+    initPage (id,item) {
       this.evaluateData = item
-
       this.$set(this.evaluateData, 'SupplierId', Number(item.SupplierId))
       this.$set(this.evaluateData, 'SumScore', Number(item.Score))
       this.$set(this.evaluateData, 'SumScore1', Number(item.Score1))
@@ -549,9 +563,22 @@ export default {
       this.$set(this.evaluateData, 'SumScore7', Number(item.Score7))
       this.$set(this.evaluateData, 'SumScore8', Number(item.Score8))
       this.$set(this.evaluateData, 'Conclusion', Number(item.Evaluate))
-      this.$set(this.evaluateData, 'Result1', '')
-      this.$set(this.evaluateData, 'Result2', '')
+      console.log(this.evaluateData)
+      // this.$set(this.evaluateData, 'Result1', '')
+      // this.$set(this.evaluateData, 'Result2', '')
       // this.getList()
+      // 判断基本条件结果
+      api.GetResultEntity(id, this.$axios).then(res => {
+        console.log('结果', res)
+        this.$set(this.evaluateData, 'Result1', res.data.Result1)
+        if (res.data.Result2 && res.data.Result2 == '0') {
+          this.$set(this.evaluateData, 'Result2', '否')
+        } else {
+          this.$set(this.evaluateData, 'Result2', '是')
+        }
+      }).catch(err => {
+        console.error(err)
+      })
     },
     // 获取编辑信息
     showIdDatas () {

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

@@ -480,9 +480,9 @@
       onNavigateScore (item) {
         console.log('跳转', item)
         this.$router.push({
-          path: '/oilcontract/contract-basis-year/' + 'add' + '/operation',
+          path: '/oilcontract/contract-basis-year/' + item.SupplierId + '/operation',
           query: {
-            item: item
+            // item: item
             // SupplierId:item.SupplierId,
           }
         })

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

@@ -12,7 +12,7 @@
           <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"
+          <!-- <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>
@@ -29,7 +29,7 @@
 
           <el-button type="primary" size="mini"
                      v-if="(Number(formData.Status)<=0&&saveButton)||(formData.Status=='4'&&auditBtn)"
-                     @click="saveEntity">保存</el-button>
+                     @click="saveEntity">保存</el-button> -->
           <el-button @click="onBack" type="primary" size="mini" style="margin-left: 8px">返回</el-button>
         </span>
       </div>
@@ -369,34 +369,35 @@ export default {
   },
   watch: {},
   created() {
-    console.log('接受操作', this.$route.query.item)
-    this.serviceId = this.$route.params.opera;
-    if (this.$route.query.item) {
-      if (this.$route.query.item.SupplierId > 0) {
-        api.GetResultEntity(this.$route.query.item.SupplierId, this.$axios).then(res => {
-          console.log('结果', res)
-          this.evaluateData.Result1 = res.data.Result1
-          if (res.data.Result2 && res.data.Result2 == "0") {
-            this.evaluateData.Result2 = "否"
-          } else {
-            this.evaluateData.Result2 = "是"
-          }
-        }).catch(err => {
-          console.error(err)
-        });
-      }
-    }
-    if (this.serviceId != 'add' && this.serviceId > 0) {  //编辑进入
-      this.formData.Id = this.serviceId
-      this.refreshPage()
-    } else { // 新增进入
-      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()
+    this.serviceId = this.$route.params.opera
+    this.initPageId(this.serviceId)
+    // console.log('接受操作', this.$route.query.item)
+    // if (this.$route.query.item) {
+    //   if (this.$route.query.item.SupplierId > 0) {
+    //     api.GetResultEntity(this.$route.query.item.SupplierId, this.$axios).then(res => {
+    //       console.log('结果', res)
+    //       this.evaluateData.Result1 = res.data.Result1
+    //       if (res.data.Result2 && res.data.Result2 == "0") {
+    //         this.evaluateData.Result2 = "否"
+    //       } else {
+    //         this.evaluateData.Result2 = "是"
+    //       }
+    //     }).catch(err => {
+    //       console.error(err)
+    //     });
+    //   }
+    // }
+    // if (this.serviceId != 'add' && this.serviceId > 0) {  //编辑进入
+    //   this.formData.Id = this.serviceId
+    //   this.refreshPage()
+    // } else { // 新增进入
+    //   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()
   },
   methods: {
     //状态判断
@@ -482,7 +483,20 @@ export default {
           break;
       }
     },
-    initPage(item) {
+    initPageId(id){
+      if (id > 0) {
+          var data = {
+            ContractClass:'02'
+          }
+          api.computeEntity(id, data, this.$axios).then(res => {
+            console.log('详情', res)
+            this.initPage(id,res.data)
+          }).catch(err => {
+            console.error(err)
+          })
+      }
+    },
+    initPage(id,item) {
       this.evaluateData = item
 
       this.$set(this.evaluateData, 'SupplierId', Number(item.SupplierId))
@@ -493,9 +507,21 @@ export default {
       this.$set(this.evaluateData, 'SumScore4', Number(item.Score4))
       this.$set(this.evaluateData, 'SumScore5', Number(item.Score5))
       this.$set(this.evaluateData, 'Conclusion', Number(item.Evaluate))
-      this.$set(this.evaluateData, 'Result1', '')
-      this.$set(this.evaluateData, 'Result2', '')
+      // this.$set(this.evaluateData, 'Result1', '')
+      // this.$set(this.evaluateData, 'Result2', '')
       // this.getList()
+      // 判断基本条件结果
+      api.GetResultEntity(id, this.$axios).then(res => {
+        console.log('结果', res)
+        this.$set(this.evaluateData, 'Result1', res.data.Result1)
+        if (res.data.Result2 && res.data.Result2 == '0') {
+          this.$set(this.evaluateData, 'Result2', '否')
+        } else {
+          this.$set(this.evaluateData, 'Result2', '是')
+        }
+      }).catch(err => {
+        console.error(err)
+      })
     },
     // 获取编辑信息
     showIdDatas() {

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

@@ -412,9 +412,9 @@
       onNavigateScore(item){
         console.log('跳转',item)
         this.$router.push({
-          path:'/oilcontract/contract-goods-year/' + 'add' + '/operation',
+          path:'/oilcontract/contract-goods-year/' + item.SupplierId + '/operation',
           query:{
-            item:item
+            // item:item
           }
         })
       },

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

@@ -12,7 +12,7 @@
           <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"
+          <!-- <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>
@@ -29,7 +29,7 @@
 
           <el-button type="primary" size="mini"
                      v-if="(Number(formData.Status)<=0&&saveButton)||(formData.Status=='4'&&auditBtn)"
-                     @click="saveEntity">保存</el-button>
+                     @click="saveEntity">保存</el-button> -->
           <el-button @click="onBack" type="primary" size="mini" style="margin-left: 8px">返回</el-button>
         </span>
       </div>
@@ -356,34 +356,36 @@ export default {
   },
   watch: {},
   created() {
-    console.log('接受操作', this.$route.query.item)
-    if (this.$route.query.item) {
-      if (this.$route.query.item.SupplierId > 0) {
-        api.GetResultEntity(this.$route.query.item.SupplierId, this.$axios).then(res => {
-          console.log('结果', res)
-          this.evaluateData.Result1 = res.data.Result1
-          if (res.data.Result2 && res.data.Result2 == "0") {
-            this.evaluateData.Result2 = "否"
-          } else {
-            this.evaluateData.Result2 = "是"
-          }
-        }).catch(err => {
-          console.error(err)
-        });
-      }
-    }
-    this.serviceId = this.$route.params.opera;
-    if (this.serviceId != 'add' && this.serviceId > 0) {  //编辑进入
-      this.formData.Id = this.serviceId
-      this.refreshPage()
-    } else { // 新增进入
-      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()
+    // console.log('接受操作', this.$route.query.item)
+    this.serviceId = this.$route.params.opera
+    this.initPageId(this.serviceId)
+    // if (this.$route.query.item) {
+    //   if (this.$route.query.item.SupplierId > 0) {
+    //     api.GetResultEntity(this.$route.query.item.SupplierId, this.$axios).then(res => {
+    //       console.log('结果', res)
+    //       this.evaluateData.Result1 = res.data.Result1
+    //       if (res.data.Result2 && res.data.Result2 == "0") {
+    //         this.evaluateData.Result2 = "否"
+    //       } else {
+    //         this.evaluateData.Result2 = "是"
+    //       }
+    //     }).catch(err => {
+    //       console.error(err)
+    //     });
+    //   }
+    // }
+    // this.serviceId = this.$route.params.opera;
+    // if (this.serviceId != 'add' && this.serviceId > 0) {  //编辑进入
+    //   this.formData.Id = this.serviceId
+    //   this.refreshPage()
+    // } else { // 新增进入
+    //   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()
   },
   methods: {
     // 状态判断
@@ -468,7 +470,20 @@ export default {
           break;
       }
     },
-    initPage(item) {
+    initPageId(id){
+      if (id > 0) {
+          var data = {
+            ContractClass:'03'
+          }
+          api.computeEntity(id, data, this.$axios).then(res => {
+            console.log('详情', res)
+            this.initPage(id,res.data)
+          }).catch(err => {
+            console.error(err)
+          })
+      }
+    },
+    initPage(id,item) {
       this.evaluateData = item
       this.$set(this.evaluateData, 'SupplierId', Number(item.SupplierId))
       this.$set(this.evaluateData, 'SumScore', Number(item.Score))
@@ -477,9 +492,21 @@ export default {
       this.$set(this.evaluateData, 'SumScore3', Number(item.Score3))
       this.$set(this.evaluateData, 'SumScore4', Number(item.Score4))
       this.$set(this.evaluateData, 'Conclusion', Number(item.Evaluate))
-      this.$set(this.evaluateData, 'Result1', '')
-      this.$set(this.evaluateData, 'Result2', '')
+      // this.$set(this.evaluateData, 'Result1', '')
+      // this.$set(this.evaluateData, 'Result2', '')
       // this.getList()
+      // 判断基本条件结果
+      api.GetResultEntity(id, this.$axios).then(res => {
+        console.log('结果', res)
+        this.$set(this.evaluateData, 'Result1', res.data.Result1)
+        if (res.data.Result2 && res.data.Result2 == '0') {
+          this.$set(this.evaluateData, 'Result2', '否')
+        } else {
+          this.$set(this.evaluateData, 'Result2', '是')
+        }
+      }).catch(err => {
+        console.error(err)
+      })
     },
     // 获取编辑信息
     showIdDatas() {

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

@@ -389,9 +389,9 @@
       onNavigateScore(item){
         console.log('跳转',item)
         this.$router.push({
-          path:'/oilcontract/contract-service-year/' + 'add' + '/operation',
+          path:'/oilcontract/contract-service-year/' + item.SupplierId + '/operation',
           query:{
-            item:item
+            // item:item
           }
         })
       },