前后:合同bug

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

@@ -487,12 +487,6 @@ func (this *OilContractReviewController) UpdateEntity() {
 
 		"IsFinal",
 
-		"CreateOn",
-
-		"CreateUserId",
-
-		"CreateBy",
-
 		"ModifiedOn",
 
 		"ModifiedUserId",

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

@@ -52,7 +52,7 @@
                        @click="onNavigateEvaluate(scope.row)">查看
             </el-button>
             <el-popover placement="top" title="提示" :ref="'popover-' + `${scope.$index}`"
-                        v-if="deleteBoolean&&scope.row.Status<=0">
+                         :disabled="!deleteBoolean || scope.row.Status > 0">
               <el-alert
                 title=""
                 description="确认要删除吗？"
@@ -61,9 +61,9 @@
               </el-alert>
               <br/>
               <div style="text-align: right; margin: 0">
-                <el-button type="primary" size="mini" @click="deleteEntity(scope.row,scope.$index)">删除</el-button>
+                <el-button type="primary" size="mini" :disabled="!deleteBoolean || scope.row.Status > 0" @click="deleteEntity(scope.row,scope.$index)">删除</el-button>
               </div>
-              <el-button slot="reference" type="text" style="margin-left:3px" icon="el-icon-delete" size="small">删除
+              <el-button slot="reference" type="text" :disabled="!deleteBoolean || scope.row.Status > 0" style="margin-left:3px" icon="el-icon-delete" size="small">删除
               </el-button>
             </el-popover>
           </template>