Sfoglia il codice sorgente

细节修改提交3

王宇昕 5 anni fa
parent
commit
26b8137ab3

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

@@ -122,7 +122,7 @@
         </el-tab-pane>
 
         <!-- 专业处室 -->
-        <el-tab-pane label="专业处室评价信息" name="3" v-if="auditBtnBooleanZhuan||Number(formData.Status)>4">
+        <el-tab-pane label="专业处室评价信息" name="3" v-if="auditBtnBooleanZhuan||Number(formData.Status)>4||Number(formData.Status)<0">
           <el-card class="box-card" style="mini-height: calc(100vh - 113px);">
             <el-form label-width="160px" ref="EntityForm2" :model="evaluateDataZhuan" :rules="rules">
               <el-row>

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

@@ -101,14 +101,13 @@
           <evaluation-list ref="evaluation_list_one"   :evaluateId="formData.Id" category="0" :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBoolean"></evaluation-list>
         </el-tab-pane>
         <!-- v-if="formData.Status=='4'||Number(formData.Status)>4" -->
-        <el-tab-pane  label="专业处室业绩评价" name="3" v-if="departmentBoolean">
-          <evaluation-list ref="evaluation_list_two" :evaluateId="formData.Id"  category="1" :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBooleanZhuan"></evaluation-list>
-        </el-tab-pane>
-
         <el-tab-pane label="基本条件评价" name="4" v-if="contractData.ContractClass=='02'">
           <base-list ref="evaluation_listType_one" :evaluateId="formData.Id"  category="0" :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBoolean"></base-list>
         </el-tab-pane>
-        <el-tab-pane  v-if="departmentBoolean&&contractData.ContractClass=='02'" label="专业处室基本条件评价" name="5">
+        <el-tab-pane  label="专业处室业绩评价" name="3"  v-if="departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<0">
+          <evaluation-list ref="evaluation_list_two" :evaluateId="formData.Id"  category="1" :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBooleanZhuan"></evaluation-list>
+        </el-tab-pane>
+        <el-tab-pane  v-if="(departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<0)&&contractData.ContractClass=='02'" label="专业处室基本条件评价" name="5">
           <base-list ref="evaluation_listType_two" :evaluateId="formData.Id"  category="1" :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBooleanZhuan"></base-list>
         </el-tab-pane>
 

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

@@ -107,7 +107,7 @@
         </el-tab-pane>
 
         <!-- 专业处室 -->
-        <el-tab-pane label="专业处室评价信息" name="3" v-if="auditBtnBooleanZhuan||Number(formData.Status)>4">
+        <el-tab-pane label="专业处室评价信息" name="3" v-if="auditBtnBooleanZhuan||Number(formData.Status)>4||Number(formData.Status)<0">
           <el-card class="box-card" style="mini-height: calc(100vh - 113px);">
             <el-form label-width="160px" ref="EntityForm2" :model="evaluateDataZhuan" :rules="rules">
               <el-row>

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

@@ -100,15 +100,14 @@
         <el-tab-pane label="业绩评价" name="2"   >
           <evaluation-list ref="evaluation_list_one"   :evaluateId="formData.Id" category="0" :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBoolean"></evaluation-list>
         </el-tab-pane>
-        <!-- v-if="formData.Status=='4'||Number(formData.Status)>4" -->
-        <el-tab-pane  label="专业处室业绩评价" name="3" v-if="departmentBoolean">
-          <evaluation-list ref="evaluation_list_two" :evaluateId="formData.Id"  category="1" :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBooleanZhuan"></evaluation-list>
-        </el-tab-pane>
-
         <el-tab-pane label="基本条件评价" name="4" v-if="contractData.ContractClass=='02'">
           <base-list ref="evaluation_listType_one" :evaluateId="formData.Id"  category="0" :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBoolean"></base-list>
         </el-tab-pane>
-        <el-tab-pane  v-if="departmentBoolean&&contractData.ContractClass=='02'" label="专业处室基本条件评价" name="5">
+        <!-- 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)<0">
+          <evaluation-list ref="evaluation_list_two" :evaluateId="formData.Id"  category="1" :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBooleanZhuan"></evaluation-list>
+        </el-tab-pane>
+        <el-tab-pane  v-if="(departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<0)&&contractData.ContractClass=='02'" label="专业处室基本条件评价" name="5">
           <base-list ref="evaluation_listType_two" :evaluateId="formData.Id"  category="1" :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBooleanZhuan"></base-list>
         </el-tab-pane>
 

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

@@ -102,7 +102,7 @@
         </el-tab-pane>
 
         <!-- 专业处室 -->
-        <el-tab-pane label="专业处室评价信息" name="3" v-if="auditBtnBooleanZhuan||Number(formData.Status)>4">
+        <el-tab-pane label="专业处室评价信息" name="3" v-if="auditBtnBooleanZhuan||Number(formData.Status)>4||Number(formData.Status)<0">
           <el-card class="box-card" style="mini-height: calc(100vh - 113px);">
             <el-form label-width="160px" ref="EntityForm2" :model="evaluateDataZhuan" :rules="rules">
               <el-row>

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

@@ -100,15 +100,14 @@
         <el-tab-pane label="业绩评价" name="2"   >
           <evaluation-list ref="evaluation_list_one"   :evaluateId="formData.Id" category="0" :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBoolean"></evaluation-list>
         </el-tab-pane>
-        <!-- v-if="formData.Status=='4'||Number(formData.Status)>4" -->
-        <el-tab-pane  label="专业处室业绩评价" name="3" v-if="departmentBoolean">
-          <evaluation-list ref="evaluation_list_two" :evaluateId="formData.Id"  category="1" :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBooleanZhuan"></evaluation-list>
-        </el-tab-pane>
-
         <el-tab-pane label="基本条件评价" name="4" v-if="contractData.ContractClass=='02'">
           <base-list ref="evaluation_listType_one" :evaluateId="formData.Id"  category="0" :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBoolean"></base-list>
         </el-tab-pane>
-        <el-tab-pane  v-if="departmentBoolean&&contractData.ContractClass=='02'" label="专业处室基本条件评价" name="5">
+        <!-- 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)<0">
+          <evaluation-list ref="evaluation_list_two" :evaluateId="formData.Id"  category="1" :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBooleanZhuan"></evaluation-list>
+        </el-tab-pane>
+        <el-tab-pane  v-if="(departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<0)&&contractData.ContractClass=='02'" label="专业处室基本条件评价" name="5">
           <base-list ref="evaluation_listType_two" :evaluateId="formData.Id"  category="1" :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBooleanZhuan"></base-list>
         </el-tab-pane>