修改细节2

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

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

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

@@ -99,12 +99,12 @@
                 </el-col>
                 <el-col :span="8" >
                   <el-form-item label="业绩评价结果" prop="Result1">
-                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.Result1" :max="1000" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input  :disabled="!auditBtnBoolean" v-model="evaluateData.Result1" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" >
                   <el-form-item label="基本条件评价结果" prop="Result2">
-                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.Result2" :max="1000" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input  :disabled="!auditBtnBoolean" v-model="evaluateData.Result2" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
@@ -187,12 +187,12 @@
                 </el-col>
                 <el-col :span="8" >
                   <el-form-item label="业绩评价结果" prop="Result1">
-                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Result1" :max="1000" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input  :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Result1" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" >
                   <el-form-item label="基本条件评价结果" prop="Result2">
-                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Result2" :max="1000" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input  :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Result2" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
@@ -303,12 +303,10 @@
                 {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/,  message: '填写格式不正确', trigger: 'change'},
               ],
           Result1: [
-                { required: true, message: '请填写', trigger: 'change' },
-                {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/,  message: '填写格式不正确', trigger: 'change'},
+                { required: true, message: '请填写', trigger: 'blur' },
               ],
           Result2: [
-                { required: true, message: '请填写', trigger: 'change' },
-                {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/,  message: '填写格式不正确', trigger: 'change'},
+                { required: true, message: '请填写', trigger: 'blur' },
               ],
           Conclusion: [
                 { required: true, message: '请填写', trigger: 'change' },
@@ -494,7 +492,7 @@
       showIdDatass() {
         if(this.formData.Id) {
           api.getEntity(1,this.formData.Id, this.$axios).then(res => {
-            console.log('用id去查详情信息',res)
+            console.log('用id去查专业处室详情信息',res)
             var item = res.data
             this.evaluateDataZhuan         = res.data;
             this.evaluateDataZhuan.Conclusion   = Number(item.Conclusion)

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

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

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods-year-check/index.vue

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

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

@@ -84,12 +84,12 @@
                 </el-col>
                 <el-col :span="8" >
                   <el-form-item label="业绩评价结果" prop="Result1">
-                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.Result1" :max="1000" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input  :disabled="!auditBtnBoolean" v-model="evaluateData.Result1" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" >
                   <el-form-item label="基本条件评价结果" prop="Result2">
-                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.Result2" :max="1000" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input  :disabled="!auditBtnBoolean" v-model="evaluateData.Result2" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
@@ -162,12 +162,12 @@
                 </el-col>
                 <el-col :span="8" >
                   <el-form-item label="业绩评价结果" prop="Result1">
-                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Result1" :max="1000" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input  :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Result1" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" >
                   <el-form-item label="基本条件评价结果" prop="Result2">
-                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Result2" :max="1000" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input  :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Result2" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
@@ -278,12 +278,10 @@
                 {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/,  message: '填写格式不正确', trigger: 'change'},
               ],
           Result1: [
-                { required: true, message: '请填写', trigger: 'change' },
-                {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/,  message: '填写格式不正确', trigger: 'change'},
+                { required: true, message: '请填写', trigger: 'blur' },
               ],
           Result2: [
-                { required: true, message: '请填写', trigger: 'change' },
-                {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/,  message: '填写格式不正确', trigger: 'change'},
+                { required: true, message: '请填写', trigger: 'blur' },
               ],
           Conclusion: [
                 { required: true, message: '请填写', trigger: 'change' },

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

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

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service-year-check/index.vue

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

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

@@ -79,12 +79,12 @@
                 </el-col>
                 <el-col :span="8" >
                   <el-form-item label="业绩评价结果" prop="Result1">
-                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.Result1" :max="1000" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input  :disabled="!auditBtnBoolean" v-model="evaluateData.Result1" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" >
                   <el-form-item label="基本条件评价结果" prop="Result2">
-                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.Result2" :max="1000" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input  :disabled="!auditBtnBoolean" v-model="evaluateData.Result2" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
@@ -121,25 +121,25 @@
                     <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore1" :max="40" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
-                
+
                 <el-col :span="8" >
                   <el-form-item label="HES管理(30分)" prop="SumScore2">
                     <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore2" :max="30" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
-                
+
                 <el-col :span="8" >
                   <el-form-item label="合同履行(15分)" prop="SumScore3">
                     <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore3" :max="15" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
-                
+
                 <el-col :span="8" >
                   <el-form-item label="企业诚信(15分)" prop="SumScore4">
                     <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore4" :max="15" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
-                
+
                 <el-col :span="8" >
                   <el-form-item label="评价结果" prop="Conclusion">
                     <el-select :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Conclusion" placeholder="请选择" style="width: 100%">
@@ -151,12 +151,12 @@
                 </el-col>
                 <el-col :span="8" >
                   <el-form-item label="业绩评价结果" prop="Result1">
-                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Result1" :max="1000" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input  :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Result1" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" >
                   <el-form-item label="基本条件评价结果" prop="Result2">
-                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Result2" :max="1000" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input  :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Result2" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
@@ -267,12 +267,10 @@
                 {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/,  message: '填写格式不正确', trigger: 'change'},
               ],
           Result1: [
-                { required: true, message: '请填写', trigger: 'change' },
-                {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/,  message: '填写格式不正确', trigger: 'change'},
+                { required: true, message: '请填写', trigger: 'blur' },
               ],
           Result2: [
-                { required: true, message: '请填写', trigger: 'change' },
-                {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/,  message: '填写格式不正确', trigger: 'change'},
+                { required: true, message: '请填写', trigger: 'blur' },
               ],
           Conclusion: [
                 { required: true, message: '请填写', trigger: 'change' },
@@ -416,7 +414,7 @@
       },
       initPage(item){
         this.evaluateData = item
-        
+
         this.$set(this.evaluateData,'SupplierId', Number(item.SupplierId))
         this.$set(this.evaluateData,'SumScore', Number(item.Score))
         this.$set(this.evaluateData,'SumScore1', Number(item.Score1))

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

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