前端: 日常评价企管法规处评价可编辑保存

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

@@ -9,6 +9,15 @@ export default {
     })
   },
 
+  // 企管法规处更新二级单位评价
+  profUpdateSecEvaEntity (entityId, formData, myAxios) {
+    return myAxios({
+      url: '/contract-review/prof-update/' + entityId,
+      method: 'post',
+      data: formData
+    })
+  },
+
   // 最初始的上级节点
   evaluationItemsOnelist (params, entityId, myAxios) {
     return myAxios({

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

@@ -36,7 +36,7 @@
   </div>
 </template>
 <script>
-import {mapGetters} from 'vuex';
+import {mapGetters} from 'vuex'
 // import api from '@/api/oilcontract/contractEvaluationItems';
 import api from '@/api/oilcontract/contract'
 
@@ -51,61 +51,61 @@ export default {
     // 评价id
     evaluateId: {
       type: null,
-      default: '',
+      default: ''
     },
     // 类型 0 二级部门创建 1 专业处创建
     category: {
       type: null,
-      default: '',
+      default: ''
     },
-    //项目类型
+    // 项目类型
     ContractClass: {
       type: null,
-      default: '',
+      default: ''
     },
-    //是否禁用
+    // 是否禁用
     disabledForm: {
       type: null,
-      default: false,
-    },
+      default: false
+    }
 
   },
-  data() {
+  data () {
     return {
       tableLoading: false,
       dialogVisible: false,
-      //列表数据
+      // 列表数据
       entityListData: {
-        entityList: [],
+        entityList: []
       },
-      //分页参数
+      // 分页参数
       size: 10,
       currentPage: 1,
       currentItemCount: 0,
-      //列表排序
+      // 列表排序
       Column: {
         Order: '',
         Prop: ''
       },
-      //查询时间new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()
+      // 查询时间new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()
       CreateOn: [],
-      //查询项
-      searchFormReset: {},
+      // 查询项
+      searchFormReset: {}
 
     }
   },
-  created() {
-    //查询条件初始值备份
-    Object.assign(this.searchFormReset, this.searchForm);
-    //查询列表
-    //this.initDatas();
-    //this.getDictOptions()
+  created () {
+    // 查询条件初始值备份
+    Object.assign(this.searchFormReset, this.searchForm)
+    // 查询列表
+    // this.initDatas();
+    // this.getDictOptions()
 
     // 判断是编辑状态还是新增状态
     if (this.evaluateId == 0) {
-      this.initDatas();
+      this.initDatas()
     } else {
-      this.editDatas();
+      this.editDatas()
     }
   },
   methods: {
@@ -116,13 +116,13 @@ export default {
     //     this.editDatas();
     //   }
     // },
-    initDatas() {
-      this.tableLoading = true;
+    initDatas () {
+      this.tableLoading = true
       var data = {
-        Category: 2,
+        Category: 2
       }
       api.evaluationItemsOnelist(data, this.ContractClass, this.$axios).then(res => {
-        this.tableLoading = false;
+        this.tableLoading = false
         console.log('上级节点内容', res)
         var data = res.data.items
         var list = []
@@ -148,21 +148,20 @@ export default {
         this.entityListData.entityList = list
         console.log('处理完的数据', list)
       }).catch(err => {
-        this.tableLoading = false;
+        this.tableLoading = false
         console.error(err)
       })
-
     },
-    //初始数据
-    editDatas() {
-      this.tableLoading = true;
+    // 初始数据
+    editDatas () {
+      this.tableLoading = true
       var data = {
         ContentReviewId: this.evaluateId,
         Category: this.category,
-        Type: 2,
+        Type: 2
       }
       api.contractEvaluationTree(data, this.$axios).then(res => {
-        this.tableLoading = false;
+        this.tableLoading = false
         let data = res.data.items
         let list = []
         if (data) {
@@ -171,9 +170,9 @@ export default {
             data[index].Value = data[index].Value === undefined || data[index].Value === '' ? '0' : data[index].Value
             data[index].Category = 2
             list.push(data[index])
-            
-            if(data[index].Son!=null&&data[index].Son!=undefined){
-              for(var k = 0 ; k < data[index].Son.length ; k++){
+
+            if (data[index].Son != null && data[index].Son != undefined) {
+              for (var k = 0; k < data[index].Son.length; k++) {
                 data[index].Son[k].Category = 2
                 // data[index].Son[k].typeStatus = index
                 // data[index].Son[k].Value = data[index].Son[k].Value==undefined||data[index].Son[k].Value==''?'0':data[index].Value
@@ -185,13 +184,12 @@ export default {
         this.entityListData.entityList = list
         console.log('处理完的数据', list)
       }).catch(err => {
-        this.tableLoading = false;
+        this.tableLoading = false
         console.error(err)
       })
     },
 
-
-    jstimehandle(val) {
+    jstimehandle (val) {
       if (val === '') {
         return '----'
       } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -204,20 +202,19 @@ export default {
       }
     },
 
-    formatDateTime(date) {
-      var y = date.getFullYear();
-      var m = date.getMonth() + 1;
-      m = m < 10 ? ('0' + m) : m;
-      var d = date.getDate();
-      d = d < 10 ? ('0' + d) : d;
-      var h = date.getHours();
-      var minute = date.getMinutes();
-      minute = minute < 10 ? ('0' + minute) : minute;
-      return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
+    formatDateTime (date) {
+      var y = date.getFullYear()
+      var m = date.getMonth() + 1
+      m = m < 10 ? ('0' + m) : m
+      var d = date.getDate()
+      d = d < 10 ? ('0' + d) : d
+      var h = date.getHours()
+      var minute = date.getMinutes()
+      minute = minute < 10 ? ('0' + minute) : minute
+      return y + '-' + m + '-' + d + ' ' + h + ':' + minute
     }
   }
 }
-
 </script>
 
 <style lang="scss">

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

@@ -28,7 +28,7 @@
           <el-form-item label="状态">
             <el-select size="mini" v-model="searchForm.Status" placeholder="请选择" style="width: 100%" clearable>
               <el-option label="全部" value="" key="01"></el-option>
-              <el-option label="待评价" value="0" key="02"></el-option>
+              <el-option label="已保存" value="0" key="02"></el-option>
               <el-option label="评价中" value="1" key="03"></el-option>
               <el-option label="已完成" value="8" key="04"></el-option>
             </el-select>

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

@@ -28,7 +28,7 @@
           <el-form-item label="状态">
             <el-select size="mini" v-model="searchForm.Status" placeholder="请选择" style="width: 100%" clearable>
               <el-option label="全部" value="" key="01"></el-option>
-              <el-option label="待评价" value="0" key="02"></el-option>
+              <el-option label="已保存" value="0" key="02"></el-option>
               <el-option label="评价中" value="1" key="03"></el-option>
               <el-option label="已完成" value="8" key="04"></el-option>
             </el-select>

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

@@ -35,7 +35,7 @@
               <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick(1)">提交审核</el-button> -->
 
           <el-button type="primary" size="mini"
-                     v-if="(Number(formData.Status)<=0&&saveButton)||(formData.Status=='4'&&auditBtn)"
+                     v-if="(Number(formData.Status) <=0 && saveButton) || (formData.Status == '4' && auditBtn) || (formData.Status == '7' && auditBtn)"
                      @click="onSeaveBigAdd(1)">保存</el-button>
           <el-button @click="onBack" type="primary" size="mini" style="margin-left: 8px">返回</el-button>
         </span>
@@ -190,22 +190,22 @@ export default {
     return {
       IsFinal: 0,
 
-      routeData: {},//上一页面传过来的值
-      routeDataType: '',//上一页面传过来的type
+      routeData: {}, // 上一页面传过来的值
+      routeDataType: '', // 上一页面传过来的type
 
       dialogVisibleCom: false,
-      disabled: true,//禁用
+      disabled: true, // 禁用
       // 业绩评价
       performance: {
-        disabled: false,//禁用
+        disabled: false// 禁用
       },
       // 专业处室业绩评价
       departmentPerformance: {
-        disabled: false,//禁用
+        disabled: false// 禁用
       },
       // 审批流程
       approvalProcess: {
-        disabled: true,//禁用
+        disabled: true// 禁用
       },
 
       entrydetail: {
@@ -216,13 +216,13 @@ export default {
       activeName: '1',
       serviceId: '',
       formData: {
-        Id: '',
+        Id: ''
       },
       auditstepcode: '',
-      contractData: {},//合同信息
-      //下拉选择项
-      //wellNoOptions: [],
-      //supervisersOptions: [],
+      contractData: {}, // 合同信息
+      // 下拉选择项
+      // wellNoOptions: [],
+      // supervisersOptions: [],
       evaluation_list: [],
       evaluation_list_department: [],
       auditBtn: false,
@@ -231,7 +231,7 @@ export default {
 
       departmentBoolean: false,
       checkBUtton: false,
-      saveButton: false,
+      saveButton: false
 
     }
   },
@@ -240,29 +240,29 @@ export default {
     this.routeDataType = this.$route.query.type
 
     console.log('跳转数据', this.routeData)
-    this.serviceId = this.$route.params.opera;
+    this.serviceId = this.$route.params.opera
     // this.getDictOptions();
 
-    this.IsFinal = this.$route.query.IsFinal;
+    this.IsFinal = this.$route.query.IsFinal
 
-    if (this.IsFinal == undefined || this.IsFinal == "") this.IsFinal = 0;
+    if (this.IsFinal == undefined || this.IsFinal == '') this.IsFinal = 0
 
     if (this.serviceId != 'add' && this.serviceId > 0) {
-      this.formData.Id = this.serviceId;
+      this.formData.Id = this.serviceId
       // this.initDatas();
       this.refreshPage()
     } else {
-      this.formData.Id = 0;
+      this.formData.Id = 0
       this.formData.Status = 0
       this.approvalProcess.disabled = true
-      util.contractDetail(this.$route.query.ContractId,this.$axios).then(res => {
+      util.contractDetail(this.$route.query.ContractId, this.$axios).then(res => {
         this.contractData = res.data
       })
     }
     this.statusFun()
   },
   methods: {
-    exportExcel() {
+    exportExcel () {
       api.docexportEle(this.formData.Id, this.$axios)
         .then(res => {
           // response
@@ -281,8 +281,8 @@ export default {
             }
           }
         }).catch(err => {
-        console.error(err)
-      })
+          console.error(err)
+        })
     },
     // 状态判断
     statusFun () {
@@ -326,14 +326,13 @@ export default {
         console.error(err)
       })
     },
-    //刷新数据接口
-    refreshPage() {
-      //拿id查审核流程
+    // 刷新数据接口
+    refreshPage () {
+      // 拿id查审核流程
       this.showIdDatas(this.formData.Id)
-
     },
-    //拿id查审核流程
-    showIdDatas(id) {
+    // 拿id查审核流程
+    showIdDatas (id) {
       api.getEntityAndCert(id, this.$axios).then(res => {
         console.log('拿id查编辑数据', res)
         this.entrydetail.business = ''
@@ -349,7 +348,7 @@ export default {
           this.isAccess()
         }).catch(err => {
           console.error(err)
-        });
+        })
         if (data.Status != 0) {
           this.approvalProcess.disabled = false
         } else {
@@ -361,46 +360,47 @@ export default {
         })
     },
     // 审核
-    commonAuditClick(index) {
+    commonAuditClick (index) {
       var index = Number(index)
       switch (index) {
         // 提交审核
         case 0:
-          this.onSeaveBigAdd();
+          this.onSeaveBigAdd()
           this.$refs.submitpopup.dialogVisibleCom = true
-          break;
+          break
         // 初审
         case 1:
           this.$refs.submitpopup.dialogCommonAuditMakeSureVisible = true
-          break;
+          break
         // 复审
         case 2:
           this.$refs.submitpopup.dialogCommonAuditMakeSureVisible = true
-          break;
+          break
         // 专业科室接收
         case 3:
           this.$refs.submitpopup.auditOrgChange()
           this.$refs.submitpopup.dialogBusinessOfficeSeparateAuditVisible = true
-          break;
+          break
         // 专业处室审核
         case 4:
-          this.onSeaveBigAdd();
+          this.onSeaveBigAdd()
           this.$refs.submitpopup.dialogCommonAuditMakeSureVisible = true
-          break;
+          break
         // 企管法规处
         case 7:
+          this.onSeaveBigAdd()
           this.$refs.submitpopup.dialogCommonAuditMakeSureVisible = true
-          break;
+          break
       }
     },
 
-    //提交评价
-    onSubmitBigAdd() {
+    // 提交评价
+    onSubmitBigAdd () {
       this.$refs.submitpopup.dialogVisibleCom = true
     },
-    //保存评价
-    onSeaveBigAdd(val) {
-      if (this.formData.Status != '4') {//普通二级用户评价evaluation_listType_one
+    // 保存评价
+    onSeaveBigAdd (val) {
+      if (this.formData.Status <= 0) { // 普通二级用户评价evaluation_listType_one
         this.evaluation_list = this.$refs.evaluation_list_one.entityListData.entityList
         if (this.contractData.ContractClass == '02') {
           this.evaluation_list = this.evaluation_list.concat(this.$refs.evaluation_listType_one.entityListData.entityList)
@@ -410,7 +410,7 @@ export default {
         var list = this.evaluation_list
         for (var i = 0; i < list.length; i++) {
           if (Number(list[i].Score) > Number(list[i].NormalScore)) {
-            this.$message.error('业绩评价填写的分数不能大于标准分值');
+            this.$message.error('业绩评价填写的分数不能大于标准分值')
             return
           }
         }
@@ -422,15 +422,15 @@ export default {
               this.updateEvaluate(val)
             }
           } else {
-            this.$message.error('业绩评价填写的分数有误');
+            this.$message.error('业绩评价填写的分数有误')
           }
         })
-      } else {//专业处室评价
+      } else if (this.formData.Status == 4) { // 专业处室评价
         this.evaluation_list = this.$refs.evaluation_list_two.entityListData.entityList
-        var list = this.evaluation_list
-        for (var i = 0; i < list.length; i++) {
+        let list = this.evaluation_list
+        for (let i = 0; i < list.length; i++) {
           if (Number(list[i].Score) > Number(list[i].NormalScore)) {
-            this.$message.error('业绩评价填写的分数不能大于标准分值');
+            this.$message.error('业绩评价填写的分数不能大于标准分值')
             return
           }
         }
@@ -438,17 +438,87 @@ export default {
           this.evaluation_list = this.evaluation_list.concat(this.$refs.evaluation_listType_two.entityListData.entityList)
         }
         // 获取第一列评价格式c
-        this.$refs.evaluation_list_one.$refs.formEvaluation.validate((valid) => {
+        this.$refs.evaluation_list_two.$refs.formEvaluation.validate((valid) => {
           if (valid) {
             this.majorEvaluate(val)
           } else {
-            this.$message.error('业绩评价填写的分数有误');
+            this.$message.error('业绩评价填写的分数有误')
+          }
+        })
+      } else if (this.formData.Status == 7) {
+        let secValid = false
+        let proValid = false
+        // 企管法规处审批时保存
+        // 预处理二级单位的保存
+        let secEvaList = this.$refs.evaluation_list_one.entityListData.entityList
+        if (this.contractData.ContractClass == '02') {
+          secEvaList = secEvaList.concat(this.$refs.evaluation_listType_one.entityListData.entityList)
+        }
+        for (let i = 0; i < secEvaList.length; i++) {
+          if (Number(secEvaList[i].Score) > Number(secEvaList[i].NormalScore)) {
+            this.$message.error('业绩评价填写的分数不能大于标准分值')
+            return
+          }
+        }
+        this.$refs.evaluation_list_one.$refs.formEvaluation.validate((valid) => {
+          if (valid) {
+            secValid = true
+          } else {
+            this.$message.error('业绩评价填写的分数有误')
+          }
+        })
+        // 预处理专业处室的保存
+        let businessEvaList = this.$refs.evaluation_list_two.entityListData.entityList
+        for (let i = 0; i < businessEvaList.length; i++) {
+          if (Number(businessEvaList[i].Score) > Number(businessEvaList[i].NormalScore)) {
+            this.$message.error('业绩评价填写的分数不能大于标准分值')
+            return
+          }
+        }
+        if (this.contractData.ContractClass == '02') {
+          businessEvaList = businessEvaList.concat(this.$refs.evaluation_listType_two.entityListData.entityList)
+        }
+        this.$refs.evaluation_list_two.$refs.formEvaluation.validate((valid) => {
+          if (valid) {
+            proValid = true
+            // this.majorEvaluate()
+          } else {
+            this.$message.error('业绩评价填写的分数有误')
           }
         })
+        // 开始保存
+        if (secValid && proValid) {
+          // 二级单位
+          let secData = {
+            ContractId: this.contractData.Id,
+            Items: secEvaList
+          }
+          api.profUpdateSecEvaEntity(this.formData.Id, secData, this.$axios).then(secRes => {
+            if (secRes.data.code == 0) {
+              // 保存业务处室
+              let proData = {
+                Items: businessEvaList
+              }
+              api.saveSecEvaluation(this.formData.Id, proData, this.$axios).then(proRes => {
+                if (proRes.data.code == 0) {
+                  this.$message({
+                    type: 'success',
+                    message: proRes.data.message
+                  })
+                  this.refreshPage()
+                }
+              }).catch(err => {
+                console.error(err)
+              })
+            }
+          }).catch(err => {
+            console.error(err)
+          })
+        }
       }
     },
-    //专业处室评价
-    majorEvaluate(val) {
+    // 专业处室评价
+    majorEvaluate (val) {
       let data = {
         Items: this.evaluation_list
       }
@@ -465,15 +535,14 @@ export default {
         }
       }).catch(err => {
         console.error(err)
-      });
-
+      })
     },
-    //新增评价
-    addEvaluate() {
+    // 新增评价
+    addEvaluate () {
       var formData = {
         ContractId: this.contractData.Id,
         Items: this.evaluation_list,
-        IsFinal: Number(this.IsFinal),           //是否履行，最终
+        IsFinal: Number(this.IsFinal) // 是否履行，最终
       }
       api.addContractEvaluate(formData, this.$axios).then(res => {
         console.log('新增', res)
@@ -482,15 +551,15 @@ export default {
           this.$message({
             type: 'success',
             message: res.data.message
-          });
-          this.refreshPage();
+          })
+          this.refreshPage()
         }
       }).catch(err => {
         console.error(err)
-      });
+      })
     },
-    //编辑评价
-    updateEvaluate(val) {
+    // 编辑评价
+    updateEvaluate (val) {
       var formData = {
         ContractId: this.contractData.Id,
         Items: this.evaluation_list
@@ -509,11 +578,10 @@ export default {
         }
       }).catch(err => {
         console.error(err)
-      });
+      })
     },
 
-
-    getAuditStepCodeByStatus() {
+    getAuditStepCodeByStatus () {
       if (this.formData.Status === '1') {
         this.auditstepcode = 'FIRST_TRIAL'
       } else if (this.formData.Status === '2') {
@@ -532,7 +600,7 @@ export default {
         this.auditstepcode = 'SUB_OFFICE_WZ'
       }
     },
-    isAccess() {
+    isAccess () {
       this.getAuditStepCodeByStatus()
       let params = {
         id: this.formData.Id,
@@ -541,12 +609,12 @@ export default {
       }
       apiCert.isAccess(params, this.$axios).then(res => {
         this.auditBtn = res.data
-        if (this.formData.Status == '4' && res.data) {
+        if ((this.formData.Status == '4' || this.formData.Status == '7') && res.data) {
           this.auditBtnBooleanZhuan = true
         } else {
           this.auditBtnBooleanZhuan = false
         }
-        if (Number(this.formData.Status) <= 0) {
+        if (Number(this.formData.Status) <= 0 || (this.formData.Status == '7' && res.data)) {
           this.auditBtnBoolean = true
         } else {
           this.auditBtnBoolean = false
@@ -556,19 +624,18 @@ export default {
       })
     },
 
-
-    //点击下一步
-    onSubmit_contract() {
+    // 点击下一步
+    onSubmit_contract () {
       this.activeName = '2'
     },
 
-    initDatas() {
+    initDatas () {
       if (this.formData.Id) {
         api.getEntity(this.formData.Id, this.$axios).then(res => {
-          this.formData = res.data;
+          this.formData = res.data
         }).catch(err => {
           console.error(err)
-        });
+        })
       }
     },
 
@@ -581,67 +648,65 @@ export default {
     //   })
     // },
 
-    //保存信息
-    saveEntity() {
+    // 保存信息
+    saveEntity () {
       this.$refs['EntityForm'].validate((valid) => {
         if (valid) {
-          //this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + '';
+          // this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + '';
 
           if (!this.formData.Id) {
-            this.addEntity();
+            this.addEntity()
           } else {
-            this.updateEntity();
+            this.updateEntity()
           }
-
         } else {
           return false
         }
       })
     },
 
-    addEntity() {
+    addEntity () {
       api.addEntity(this.formData, this.$axios).then(res => {
         if (res.data.code === 0) {
-          //保存成功后，初始化数据，变成修改
-          this.formData.Id = res.data.item;
-          this.initDatas();
+          // 保存成功后，初始化数据，变成修改
+          this.formData.Id = res.data.item
+          this.initDatas()
           this.$message({
             type: 'success',
             message: res.data.message
-          });
-
+          })
         } else {
           this.$message({
             type: 'warning',
             message: res.data.message
-          });
+          })
         }
       }).catch(err => {
         console.error(err)
-      });
+      })
     },
 
-    updateEntity() {
+    updateEntity () {
       api.updateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
         if (res.data.code === 0) {
-          //保存成功后，初始化数据，变成修改
-          this.initDatas();
+          // 保存成功后，初始化数据，变成修改
+          this.initDatas()
           this.$message({
             type: 'success',
             message: res.data.message
-          });
+          })
         } else {
           this.$message({
             type: 'warning',
             message: res.data.message
-          });
+          })
         }
       }).catch(err => {
         console.error(err)
-      });
+      })
     },
 
-    jstimehandle(val) {
+    jstimehandle (val) {
       if (val === '') {
         return '----'
       } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -654,18 +719,18 @@ export default {
       }
     },
 
-    formatDateTime(date) {
-      var y = date.getFullYear();
-      var m = date.getMonth() + 1;
-      m = m < 10 ? ('0' + m) : m;
-      var d = date.getDate();
-      d = d < 10 ? ('0' + d) : d;
-      var h = date.getHours();
-      var minute = date.getMinutes();
-      minute = minute < 10 ? ('0' + minute) : minute;
-      return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
+    formatDateTime (date) {
+      var y = date.getFullYear()
+      var m = date.getMonth() + 1
+      m = m < 10 ? ('0' + m) : m
+      var d = date.getDate()
+      d = d < 10 ? ('0' + d) : d
+      var h = date.getHours()
+      var minute = date.getMinutes()
+      minute = minute < 10 ? ('0' + minute) : minute
+      return y + '-' + m + '-' + d + ' ' + h + ':' + minute
     },
-    onBack() {
+    onBack () {
       this.$router.go(-1)
     }
   }

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

@@ -28,7 +28,7 @@
           <el-form-item label="状态">
             <el-select size="mini" v-model="searchForm.Status" placeholder="请选择" style="width: 100%" clearable>
               <el-option label="全部" value="" key="01"></el-option>
-              <el-option label="待评价" value="0" key="02"></el-option>
+              <el-option label="已保存" value="0" key="02"></el-option>
               <el-option label="评价中" value="1" key="03"></el-option>
               <el-option label="已完成" value="8" key="04"></el-option>
             </el-select>