前端：专业处室分办环节可以评价

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

@@ -41,10 +41,10 @@
               <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)  || (formData.Status == '7' && auditBtn)) && (formData.IsBusiness != 1 && byBus != 1)"
+                     v-if="((Number(formData.Status) <= 0 && saveButton) || ((formData.Status == '3' || formData.Status == '4' || formData.Status == '7') && auditBtn)) && (formData.IsBusiness != 1 && byBus != 1)"
                      @click="onSeaveBigAdd(1)">保存</el-button>
           <el-button type="primary" size="mini"
-                     v-if="((Number(formData.Status) <=0 && saveButtonForBusiness) || (formData.Status == '7' && saveButtonForBusiness)) && (formData.IsBusiness == 1 || byBus == 1)"
+                     v-if="((Number(formData.Status) <=0 && saveButtonForBusiness) || (formData.Status == '4' && saveButtonForBusinessAudit) || (formData.Status == '7' && saveButtonForBusiness)) && (formData.IsBusiness == 1 || byBus == 1)"
                      @click="onSaveEvaByBusiness(1)">保存</el-button> <!-- 处室保存 -->
           <el-button @click="onBack" type="primary" size="mini" style="margin-left: 8px">返回</el-button>
         </span>
@@ -302,7 +302,8 @@ export default {
       departmentBoolean: false,
       checkBUtton: false, // 提交审核按钮
       saveButton: false,
-      saveButtonForBusiness: false
+      saveButtonForBusiness: false,
+      saveButtonForBusinessAudit: false
     }
   },
   created () {
@@ -406,6 +407,18 @@ export default {
       }).catch(err => {
         console.error(err)
       })
+      let dataBusAuditSave = {
+        percode: 'oil_contract.Review.BusinessAudit.Save'
+      }
+      permissionApi.permissionIsauth(dataBusAuditSave, this.$axios).then(res => {
+        if (res.data.code == 0) {
+          if (res.data.message == '有权限') {
+            this.saveButtonForBusinessAudit = true
+          }
+        }
+      }).catch(err => {
+        console.error(err)
+      })
       let dataBusReview = {
         percode: 'oil_contract.Review.Business.Check'
       }
@@ -530,7 +543,7 @@ export default {
             this.$message.error('业绩评价填写的分数有误')
           }
         })
-      } else if (this.formData.Status == 4) { // 专业处室评价
+      } else if (this.formData.Status == 3 || this.formData.Status == 4) { // 专业处室评价
         this.evaluation_list = this.$refs.evaluation_list_two.entityListData.entityList
         let list = this.evaluation_list
         for (let i = 0; i < list.length; i++) {
@@ -624,7 +637,7 @@ export default {
     },
     // 业务处室保存评价
     onSaveEvaByBusiness (val) {
-      if (this.formData.Status <= 0 || this.formData.Status == '7') { // 业务处室保存评价
+      if (this.formData.Status <= 0 || this.formData.Status == '4' || this.formData.Status == '7') { // 业务处室保存评价
         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)
@@ -741,7 +754,7 @@ export default {
       console.log('params', params)
       apiCert.isAccess(params, this.$axios).then(res => {
         this.auditBtn = res.data
-        if ((this.formData.Status == '4' || this.formData.Status == '7') && res.data) {
+        if ((this.formData.Status == '3' || this.formData.Status == '4' || this.formData.Status == '7') && res.data) {
         // if (this.formData.Status == '4' && res.data) {
           this.auditBtnBooleanZhuan = true
         } else {
@@ -753,6 +766,10 @@ export default {
         } else {
           this.auditBtnBoolean = false
         }
+        if (this.formData.IsBusiness == 1 && this.formData.Status == '4' && this.saveButtonForBusinessAudit) {
+          // 专业处室发起的评价 专业处室审核有权限修改
+          this.auditBtnBoolean = true
+        }
       }).catch(err => {
         console.log(err)
       })

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

@@ -41,10 +41,10 @@
               <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)  || (formData.Status == '7' && auditBtn)) && (formData.IsBusiness != 1 && byBus != 1)"
+                     v-if="((Number(formData.Status) <= 0 && saveButton) || ((formData.Status == '3' || formData.Status == '4' || formData.Status == '7') && auditBtn)) && (formData.IsBusiness != 1 && byBus != 1)"
                      @click="onSeaveBigAdd(1)">保存</el-button>
           <el-button type="primary" size="mini"
-                     v-if="((Number(formData.Status) <=0 && saveButtonForBusiness) || (formData.Status == '7' && saveButtonForBusiness)) && (formData.IsBusiness == 1 || byBus == 1)"
+                     v-if="((Number(formData.Status) <=0 && saveButtonForBusiness) || (formData.Status == '4' && saveButtonForBusinessAudit) || (formData.Status == '7' && saveButtonForBusiness)) && (formData.IsBusiness == 1 || byBus == 1)"
                      @click="onSaveEvaByBusiness(1)">保存</el-button> <!-- 处室保存 -->
           <el-button @click="onBack" type="primary" size="mini" style="margin-left: 8px">返回</el-button>
         </span>
@@ -300,7 +300,8 @@ export default {
       departmentBoolean: false,
       checkBUtton: false,
       saveButton: false,
-      saveButtonForBusiness: false
+      saveButtonForBusiness: false,
+      saveButtonForBusinessAudit: false
     }
   },
   created () {
@@ -404,6 +405,18 @@ export default {
       }).catch(err => {
         console.error(err)
       })
+      let dataBusAuditSave = {
+        percode: 'oil_contract.Review.BusinessAudit.Save'
+      }
+      permissionApi.permissionIsauth(dataBusAuditSave, this.$axios).then(res => {
+        if (res.data.code == 0) {
+          if (res.data.message == '有权限') {
+            this.saveButtonForBusinessAudit = true
+          }
+        }
+      }).catch(err => {
+        console.error(err)
+      })
       let dataBusReview = {
         percode: 'oil_contract.Review.Business.Check'
       }
@@ -505,7 +518,7 @@ export default {
     },
     // 业务处室保存评价
     onSaveEvaByBusiness (val) {
-      if (this.formData.Status <= 0 || this.formData.Status == '7') { // 业务处室保存评价
+      if (this.formData.Status <= 0 || this.formData.Status == '4' || this.formData.Status == '7') { // 业务处室保存评价
         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)
@@ -557,7 +570,7 @@ export default {
             this.$message.error('业绩评价填写的分数有误')
           }
         })
-      } else if (this.formData.Status == 4) { // 专业处室评价
+      } else if (this.formData.Status == 3 || 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++) {
@@ -740,7 +753,7 @@ export default {
       }
       apiCert.isAccess(params, this.$axios).then(res => {
         this.auditBtn = res.data
-        if ((this.formData.Status == '4' || this.formData.Status == '7') && res.data) {
+        if ((this.formData.Status == '3' || this.formData.Status == '4' || this.formData.Status == '7') && res.data) {
           this.auditBtnBooleanZhuan = true
         } else {
           this.auditBtnBooleanZhuan = false
@@ -750,6 +763,10 @@ export default {
         } else {
           this.auditBtnBoolean = false
         }
+        if (this.formData.IsBusiness == 1 && this.formData.Status == '4' && this.saveButtonForBusinessAudit) {
+          // 专业处室发起的评价 专业处室审核有权限修改
+          this.auditBtnBoolean = true
+        }
       }).catch(err => {
         console.log(err)
       })

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

@@ -41,10 +41,10 @@
               <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) || (formData.Status == '7' && auditBtn)) && (formData.IsBusiness != 1 && byBus != 1)"
+                     v-if="((Number(formData.Status) <=0 && saveButton) || ((formData.Status == '3' || formData.Status == '4' || formData.Status == '7') && auditBtn)) && (formData.IsBusiness != 1 && byBus != 1)"
                      @click="onSeaveBigAdd(1)">保存</el-button>
           <el-button type="primary" size="mini"
-                     v-if="((Number(formData.Status) <=0 && saveButtonForBusiness) || (formData.Status == '7' && saveButtonForBusiness)) && (formData.IsBusiness == 1 || byBus == 1)"
+                     v-if="((Number(formData.Status) <=0 && saveButtonForBusiness) || (formData.Status == '4' && saveButtonForBusinessAudit) || (formData.Status == '7' && saveButtonForBusiness)) && (formData.IsBusiness == 1 || byBus == 1)"
                      @click="onSaveEvaByBusiness(1)">保存</el-button> <!-- 处室保存 -->
           <el-button @click="onBack" type="primary" size="mini" style="margin-left: 8px">返回</el-button>
         </span>
@@ -301,7 +301,8 @@ export default {
       departmentBoolean: false,
       checkBUtton: false,
       saveButton: false,
-      saveButtonForBusiness: false
+      saveButtonForBusiness: false,
+      saveButtonForBusinessAudit: false
     }
   },
   created () {
@@ -406,6 +407,18 @@ export default {
       }).catch(err => {
         console.error(err)
       })
+      let dataBusAuditSave = {
+        percode: 'oil_contract.Review.BusinessAudit.Save'
+      }
+      permissionApi.permissionIsauth(dataBusAuditSave, this.$axios).then(res => {
+        if (res.data.code == 0) {
+          if (res.data.message == '有权限') {
+            this.saveButtonForBusinessAudit = true
+          }
+        }
+      }).catch(err => {
+        console.error(err)
+      })
       let dataBusReview = {
         percode: 'oil_contract.Review.Business.Check'
       }
@@ -507,7 +520,7 @@ export default {
     },
     // 业务处室保存评价
     onSaveEvaByBusiness (val) {
-      if (this.formData.Status <= 0 || this.formData.Status == '7') { // 业务处室保存评价
+      if (this.formData.Status <= 0 || this.formData.Status == '4' || this.formData.Status == '7') { // 业务处室保存评价
         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)
@@ -559,7 +572,7 @@ export default {
             this.$message.error('业绩评价填写的分数有误')
           }
         })
-      } else if (this.formData.Status == 4) { // 专业处室评价
+      } else if (this.formData.Status == 3 || this.formData.Status == 4) { // 专业处室评价
         this.evaluation_list = this.$refs.evaluation_list_two.entityListData.entityList
         let list = this.evaluation_list
         for (let i = 0; i < list.length; i++) {
@@ -743,7 +756,7 @@ export default {
       }
       apiCert.isAccess(params, this.$axios).then(res => {
         this.auditBtn = res.data
-        if ((this.formData.Status == '4' || this.formData.Status == '7') && res.data) {
+        if ((this.formData.Status == '3' || this.formData.Status == '4' || this.formData.Status == '7') && res.data) {
           this.auditBtnBooleanZhuan = true
         } else {
           this.auditBtnBooleanZhuan = false
@@ -753,6 +766,10 @@ export default {
         } else {
           this.auditBtnBoolean = false
         }
+        if (this.formData.IsBusiness == 1 && this.formData.Status == '4' && this.saveButtonForBusinessAudit) {
+          // 专业处室发起的评价 专业处室审核有权限修改
+          this.auditBtnBoolean = true
+        }
       }).catch(err => {
         console.log(err)
       })