前端: 业务处室提交相关bug

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

@@ -288,7 +288,7 @@ export default {
     },
     // 业务处室提交审核获取审批人
     auditOrgChangeForBusiness () {
-      let auditStepCode = 'SECOND_TRIAL'
+      let auditStepCode = 'PROF_AUDIT'
       api.getAuditerByDept(this.authUser.Profile.DepartmentId, auditStepCode, this.$axios).then(res => {
         this.secauditerOptions = res.data.item
       }).catch(err => {

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

@@ -566,7 +566,7 @@ export default {
     },
     // 业务处室保存评价
     onSaveEvaByBusiness (val) {
-      if (this.formData.Status <= 0) { // 业务处室保存评价
+      if (this.formData.Status <= 0 || 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)

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

@@ -592,6 +592,8 @@ export default {
     },
     // 一键处理取消
     onSelectAllButtonDelete () {
+      console.log('没进来干掉？？？？？')
+      this.eveIdList = 0
       this.selectAllButtonBoolean = false
     },
     // 状态判断

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

@@ -41,12 +41,12 @@
               <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)"
+                     v-if="((Number(formData.Status) <= 0 && saveButton) || (formData.Status == '4' && auditBtn)  || (formData.Status == '7' && auditBtn)) && formData.IsBusiness != 1"
                      @click="onSeaveBigAdd(1)">保存</el-button>
           <el-button type="primary" size="mini"
-                     v-if="(Number(formData.Status) <=0 && saveButtonForBusiness) || (formData.Status == '7' && saveButtonForBusiness)"
+                     v-if="((Number(formData.Status) <=0 && saveButtonForBusiness) || (formData.Status == '7' && saveButtonForBusiness)) && formData.IsBusiness == 1"
                      @click="onSaveEvaByBusiness(1)">保存</el-button> <!-- 处室保存 -->
-          <el-button @click="onBack" type="primary" size="mini" style="margin-left: 8px">返回-{{formData.IsBusiness}}</el-button>
+          <el-button @click="onBack" type="primary" size="mini" style="margin-left: 8px">返回</el-button>
         </span>
       </div>
       <el-tabs v-model="activeName" style="margin-top: -10px">
@@ -134,13 +134,13 @@
         </el-tab-pane>
         <!-- v-if="formData.Status=='4'||Number(formData.Status)>4" -->
         <el-tab-pane label="专业处室业绩评价" name="3"
-                     v-if="departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<=-4 && formData.IsBusiness == 0">
+                     v-if="(departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<=-4) && formData.IsBusiness != 1">
           <evaluation-list ref="evaluation_list_two" :evaluateId="formData.Id" category="1" v-if="contractData.ContractClass"
                            :ContractClass="contractData.ContractClass"
                            :disabledForm="auditBtnBooleanZhuan"></evaluation-list>
         </el-tab-pane>
         <el-tab-pane
-          v-if="(departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<=-4)&&contractData.ContractClass=='02' && formData.IsBusiness == 0"
+          v-if="((departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<=-4)&&contractData.ContractClass=='02') && formData.IsBusiness != 1"
           label="专业处室基本条件评价" name="5">
           <base-list ref="evaluation_listType_two" :evaluateId="formData.Id" category="1"
                      :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBooleanZhuan"></base-list>
@@ -446,7 +446,7 @@ export default {
     },
     // 业务处室保存评价
     onSaveEvaByBusiness (val) {
-      if (this.formData.Status <= 0) { // 业务处室保存评价
+      if (this.formData.Status <= 0 || 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)

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

@@ -43,7 +43,7 @@
               <el-option label="全部" value="" key="01"></el-option>
               <el-option label="供应商" value="01" key="02"></el-option>
               <el-option label="承包商" value="02" key="03"></el-option>
-              <el-option label="服务商" value="02" key="04"></el-option>
+              <el-option label="服务商" value="03" key="04"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="上报时间">