前后:合同年度退回没获取到创建人;退回后专业处室tab显示问题

src/dashoo.cn/backend/api/controllers/oilcontract/contractSumScore.go

@@ -494,9 +494,9 @@ func (this *OilContractSumScoreController) UpdateEntity() {
 		"ContractClass",
 		"Year",
 		"Status",
-		"CreateOn",
-		"CreateBy",
-		"CreateUserId",
+		"ModifiedOn",
+		"ModifiedBy",
+		"ModifiedUserId",
 	}
 	err := svc.UpdateEntityBytbl(OilContractSumScoreName, id, &model, cols)
 

src/dashoo.cn/frontend_web/nuxt.config.prod.js

@@ -180,7 +180,7 @@ module.exports = {
     appclient:  'gfgl',                            //供方信息管理平台
     upfilehost: '/uploadfile',                     //附件上传
     baseURL:    '/api/',                           //本地工作流图片
-    LOCAL_IP:   '10.76.248.169'                     //定义服务器内网IP,word转PDF时用到
+    LOCAL_IP:   '10.76.248.23'                     //定义服务器内网IP,word转PDF时用到
     // API_URL:    'http://10.76.248.23:10091/api/'   //服务器渲染时调用
 
     /* --------Nuxt Start发版用 END-------------- */

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

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

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

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

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

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

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

@@ -124,13 +124,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)<0">
+                     v-if="departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<=-4">
           <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'"
+          v-if="(departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<=-4)&&contractData.ContractClass=='02'"
           label="专业处室基本条件评价" name="5">
           <base-list ref="evaluation_listType_two" :evaluateId="formData.Id" category="1"
                      :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBooleanZhuan"></base-list>

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

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

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

@@ -124,13 +124,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)<0">
+                     v-if="departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<=-4">
           <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'"
+          v-if="(departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<=-4)&&contractData.ContractClass=='02'"
           label="专业处室基本条件评价" name="5">
           <base-list ref="evaluation_listType_two" :evaluateId="formData.Id" category="1"
                      :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBooleanZhuan"></base-list>