前端： 日常评价专业处室分办环节可退回

src/dashoo.cn/frontend_web/src/components/oilcontract/submitPopup.vue

@@ -95,7 +95,13 @@
     <!-- 专业科室接收 -->
     <el-dialog title="分配" :close-on-click-modal="false" :visible.sync="dialogBusinessOfficeSeparateAuditVisible">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
-        <el-form-item label="审批人">
+        <el-form-item label="审批状态">
+          <el-radio-group v-model="shenheForm.SuccessStatus">
+            <el-radio :label="1">通过</el-radio>
+            <el-radio :label="0">退回</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="审批人" v-if="shenheForm.SuccessStatus === 1">
           <el-select ref="selectAuditer" v-model="ProfessionalAudit" placeholder="请选择" style="width: 100%" filterable
                      default-first-option>
             <el-option v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
@@ -139,7 +145,13 @@
     <!-- 专业科室接收 批量审批 -->
     <el-dialog title="分配" :close-on-click-modal="false" :visible.sync="dialogBusinessOfficeSeparateBatchAuditVisible">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
-        <el-form-item label="审批人">
+        <el-form-item label="审批状态">
+          <el-radio-group v-model="shenheForm.SuccessStatus">
+            <el-radio :label="1">通过</el-radio>
+            <el-radio :label="0">退回</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="审批人" v-if="shenheForm.SuccessStatus === 1">
           <el-select ref="selectAuditer" v-model="ProfessionalAudit" placeholder="请选择" style="width: 100%" filterable
                      default-first-option>
             <el-option v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
@@ -297,7 +309,7 @@ export default {
     },
     // 业务处室分办 单条(待办入口)
     businessOfficeSeparateAuditMakeSure () {
-      if (this.ProfessionalAudit === '') {
+      if (this.shenheForm.SuccessStatus == 1 && this.ProfessionalAudit === '') {
         this.$message({
           type: 'warning',
           message: '请选择审批人！'
@@ -305,6 +317,7 @@ export default {
         return
       }
       let params = {
+        Result: this.shenheForm.SuccessStatus,
         ProfessionalAudit: this.ProfessionalAudit,
         AuditRemark: this.shenheForm.AuditorRemark
       }
@@ -375,7 +388,7 @@ export default {
     },
     // 日常评价业务处室分办 批量审批
     businessOfficeSeparateBatchAuditMakeSure () {
-      if (this.ProfessionalAudit === '') {
+      if (this.shenheForm.SuccessStatus == 1 && this.ProfessionalAudit === '') {
         this.$message({
           type: 'warning',
           message: '请选择审批人！'
@@ -383,6 +396,7 @@ export default {
         return
       }
       let params = {
+        Result: this.shenheForm.SuccessStatus,
         ProfessionalAudit: this.ProfessionalAudit,
         AuditRemark: this.shenheForm.AuditorRemark
       }

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

@@ -42,10 +42,10 @@
 
           <el-button type="primary" size="mini"
                      v-if="((Number(formData.Status) <= 0 && saveButton) || (formData.Status == '4' && auditBtn)  || (formData.Status == '7' && auditBtn)) && formData.IsBusiness != 1"
-                     @click="onSeaveBigAdd(1)">保存</el-button>
+                     @click="onSeaveBigAdd(1)"><span v-if="formData.Status == '0' && serviceId == 'add'">创建日常评价</span><span v-else>保存</span></el-button>
           <el-button type="primary" size="mini"
-                     v-if="(Number(formData.Status) <=0 && saveButtonForBusiness) || (formData.Status == '7' && saveButtonForBusiness) && formData.IsBusiness == 1"
-                     @click="onSaveEvaByBusiness(1)">保存</el-button> <!-- 处室保存 -->
+                     v-if="((Number(formData.Status) <=0 && saveButtonForBusiness) || (formData.Status == '7' && saveButtonForBusiness)) && (formData.IsBusiness == 1 || byBus == 1)"
+                     @click="onSaveEvaByBusiness(1)"><span v-if="formData.Status == '0' && serviceId == 'add'">创建日常评价</span><span v-else>保存</span></el-button> <!-- 处室保存 -->
           <el-button @click="onBack" type="primary" size="mini" style="margin-left: 8px">返回</el-button>
         </span>
       </div>
@@ -198,6 +198,7 @@ export default {
 
   data () {
     return {
+      byBus: 0,
       isBusiness: 0,
       IsFinal: 0,
       checkBtnForBus: false, // 业务处室分办提交审核权限
@@ -254,7 +255,7 @@ export default {
     // console.log('跳转数据', this.routeData)
     this.serviceId = this.$route.params.opera // 评价的ID
     //  this.getDictOptions()
-
+    this.byBus = this.$route.query.byBus == 1 ? 1 : 0
     this.IsFinal = this.$route.query.IsFinal
 
     if (this.IsFinal == undefined || this.IsFinal == '') this.IsFinal = 0

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

@@ -42,10 +42,10 @@
 
           <el-button type="primary" size="mini"
                      v-if="((Number(formData.Status) <= 0 && saveButton) || (formData.Status == '4' && auditBtn)  || (formData.Status == '7' && auditBtn)) && formData.IsBusiness != 1"
-                     @click="onSeaveBigAdd(1)">保存</el-button>
+                     @click="onSeaveBigAdd(1)"><span v-if="formData.Status == '0' && serviceId == 'add'">创建日常评价</span><span v-else>保存</span></el-button>
           <el-button type="primary" size="mini"
-                     v-if="((Number(formData.Status) <=0 && saveButtonForBusiness) || (formData.Status == '7' && saveButtonForBusiness)) && formData.IsBusiness == 1"
-                     @click="onSaveEvaByBusiness(1)">保存</el-button> <!-- 处室保存 -->
+                     v-if="((Number(formData.Status) <=0 && saveButtonForBusiness) || (formData.Status == '7' && saveButtonForBusiness)) && (formData.IsBusiness == 1 || byBus == 1)"
+                     @click="onSaveEvaByBusiness(1)"><span v-if="formData.Status == '0' && serviceId == 'add'">创建日常评价1</span><span v-else>保存1</span></el-button> <!-- 处室保存 -->
           <el-button @click="onBack" type="primary" size="mini" style="margin-left: 8px">返回</el-button>
         </span>
       </div>
@@ -198,6 +198,7 @@ export default {
   data () {
     return {
       isBusiness: 0,
+      byBus: 0,
       IsFinal: 0,
       checkBtnForBus: false, // 业务处室分办提交审核权限
       routeData: {}, // 上一页面传过来的值
@@ -249,6 +250,7 @@ export default {
     // this.routeData = this.$route.query.item
     this.routeDataType = this.$route.query.type
     this.isBusiness = this.$route.query.isBusiness == 1 ? 1 : 0
+    this.byBus = this.$route.query.byBus == 1 ? 1 : 0
     // console.log('跳转数据', this.routeData)
     this.serviceId = this.$route.params.opera
     // this.getDictOptions();

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

@@ -608,6 +608,8 @@
     name: 'oilcontract',
     data () {
       return {
+        checkBtnForBus: false, // 专业处室分办权限按钮
+        checkBtnForSec: false, // 二级单位提交权限按钮
         importAuditProf: false, // 合同导入入口权限，仅限企管法规处
         tableLoading: false, // 表格loading
         dialogLoading: false,
@@ -1192,6 +1194,31 @@
         }).catch(err => {
           console.error(err)
         })
+        let data1 = {
+          percode: 'oil_contract.Review.Check'
+        }
+        permissionApi.permissionIsauth(data1, this.$axios).then(res => {
+          console.log('权限', res.data)
+          if (res.data.code == 0) {
+            if (res.data.message == '有权限') {
+              this.checkBtnForSec = true
+            }
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+        let dataBusReview = {
+          percode: 'oil_contract.Review.Business.Check'
+        }
+        permissionApi.permissionIsauth(dataBusReview, this.$axios).then(res => {
+          if (res.data.code == 0) {
+            if (res.data.message == '有权限') {
+              this.checkBtnForBus = true
+            }
+          }
+        }).catch(err => {
+          console.error(err)
+        })
       },
       // 二级单位列表
       GetSecondUnitOptions () {
@@ -1229,8 +1256,9 @@
         this.$router.push({
           path: '/oilcontract/' + name + '/add/evaluate',
           query: {
-            ContractId: item.Id
+            ContractId: item.Id,
             // type:1,
+            byBus: !this.checkBtnForSec && this.checkBtnForBus ? 1 : 0
           }
         })
       },

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

@@ -42,10 +42,10 @@
 
           <el-button type="primary" size="mini"
                      v-if="((Number(formData.Status) <=0 && saveButton) || (formData.Status == '4' && auditBtn) || (formData.Status == '7' && auditBtn)) && formData.IsBusiness != 1"
-                     @click="onSeaveBigAdd(1)">保存</el-button>
+                     @click="onSeaveBigAdd(1)"><span v-if="formData.Status == '0' && serviceId == 'add'">创建日常评价</span><span v-else>保存</span></el-button>
           <el-button type="primary" size="mini"
-                     v-if="(Number(formData.Status) <=0 && saveButtonForBusiness) || (formData.Status == '7' && saveButtonForBusiness)"
-                     @click="onSaveEvaByBusiness(1)">保存</el-button> <!-- 处室保存 -->
+                     v-if="((Number(formData.Status) <=0 && saveButtonForBusiness) || (formData.Status == '7' && saveButtonForBusiness)) && (formData.IsBusiness == 1 || byBus == 1)"
+                     @click="onSaveEvaByBusiness(1)"><span v-if="formData.Status == '0' && serviceId == 'add'">创建日常评价</span><span v-else>保存</span></el-button> <!-- 处室保存 -->
           <el-button @click="onBack" type="primary" size="mini" style="margin-left: 8px">返回</el-button>
         </span>
       </div>
@@ -198,6 +198,7 @@ export default {
 
   data () {
     return {
+      byBus: 0,
       isBusiness: 0,
       IsFinal: 0,
       checkBtnForBus: false, // 业务处室分办提交审核权限
@@ -253,7 +254,7 @@ export default {
     console.log('跳转数据', this.routeData)
     this.serviceId = this.$route.params.opera // 评价的ID
     // this.getDictOptions();
-
+    this.byBus = this.$route.query.byBus == 1 ? 1 : 0
     this.IsFinal = this.$route.query.IsFinal
 
     if (this.IsFinal == undefined || this.IsFinal == '') this.IsFinal = 0