修改细节提交

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  :disabled="!auditBtnBoolean" v-model="evaluateData.Result1" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.Result1" :max="1000" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" >
                   <el-form-item label="基本条件评价结果" prop="Result2">
-                    <el-input  :disabled="!auditBtnBoolean" v-model="evaluateData.Result2" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.Result2" :max="1000" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
@@ -124,7 +124,7 @@
         <!-- 专业处室 -->
         <el-tab-pane label="专业处室评价信息" name="3" v-if="auditBtnBooleanZhuan||Number(formData.Status)>4">
           <el-card class="box-card" style="mini-height: calc(100vh - 113px);">
-            <el-form label-width="160px" ref="EntityForm" :model="evaluateDataZhuan" :rules="rules">
+            <el-form label-width="160px" ref="EntityForm2" :model="evaluateDataZhuan" :rules="rules">
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="服务商名称">
@@ -187,12 +187,12 @@
                 </el-col>
                 <el-col :span="8" >
                   <el-form-item label="业绩评价结果" prop="Result1">
-                    <el-input  :disabled="!auditBtnBooleanZhuan" v-model="evaluateData.Result1" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Result1" :max="1000" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" >
                   <el-form-item label="基本条件评价结果" prop="Result2">
-                    <el-input  :disabled="!auditBtnBooleanZhuan" v-model="evaluateData.Result2" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Result2" :max="1000" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
@@ -302,6 +302,14 @@
                 { required: true, message: '请填写', trigger: 'change' },
                 {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'},
+              ],
+          Result2: [
+                { required: true, message: '请填写', trigger: 'change' },
+                {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/,  message: '填写格式不正确', trigger: 'change'},
+              ],
           Conclusion: [
                 { required: true, message: '请填写', trigger: 'change' },
               ],
@@ -528,7 +536,7 @@
           // // 获取第一列评价格式
           // var fractionBoolean_1 = this.$refs.evaluation_list_two.fractionBoolean
           // this.typeList = this.$refs.evaluateDataZhuanRef.typeList
-          this.$refs['EntityForm'].validate((valid) => {
+          this.$refs['EntityForm2'].validate((valid) => {
             if (valid) {
                 this.majorEvaluate()
             } else {

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

@@ -88,7 +88,7 @@
                     <!-- SubPackage -->
                     <el-select :disabled="disabled" placeholder="请选择" v-model="contractData.SubPackage" style="width: 100%">
                       <el-option :key="1" label="是" :value="1"></el-option>
-                      <el-option :key="2" label="否" :value="2"></el-option>
+                      <el-option :key="0" label="否" :value="0"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>

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

@@ -46,7 +46,7 @@
 
                 <el-col :span="8" >
                   <el-form-item label="产品质量(30分)" prop="SumScore1">
-                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore1" :max="10" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore1" :max="30" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
 
@@ -58,19 +58,19 @@
 
                 <el-col :span="8" >
                   <el-form-item label="售后服务(15分)" prop="SumScore3">
-                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore3" :max="20" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.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="!auditBtnBoolean" v-model="evaluateData.SumScore4" :max="5" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore4" :max="15" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8" >
                   <el-form-item label="协同响应(20分)" prop="SumScore5">
-                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore5" :max="10" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore5" :max="20" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" >
@@ -84,12 +84,12 @@
                 </el-col>
                 <el-col :span="8" >
                   <el-form-item label="业绩评价结果" prop="Result1">
-                    <el-input  :disabled="!auditBtnBoolean" v-model="evaluateData.Result1" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.Result1" :max="1000" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" >
                   <el-form-item label="基本条件评价结果" prop="Result2">
-                    <el-input  :disabled="!auditBtnBoolean" v-model="evaluateData.Result2" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.Result2" :max="1000" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
@@ -109,7 +109,7 @@
         <!-- 专业处室 -->
         <el-tab-pane label="专业处室评价信息" name="3" v-if="auditBtnBooleanZhuan||Number(formData.Status)>4">
           <el-card class="box-card" style="mini-height: calc(100vh - 113px);">
-            <el-form label-width="160px" ref="EntityForm" :model="evaluateDataZhuan" :rules="rules">
+            <el-form label-width="160px" ref="EntityForm2" :model="evaluateDataZhuan" :rules="rules">
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="服务商名称">
@@ -122,45 +122,35 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" >
-                  <el-form-item label="项目组织实施(10分)" prop="SumScore1">
-                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore1" :max="10" placeholder="请输入"  style="width: 100%" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8" >
-                  <el-form-item label="项目质量管理(20分)" prop="SumScore2">
-                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore2" :max="20" placeholder="请输入"  style="width: 100%" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8" >
-                  <el-form-item label="项目职业健康安全与环境管理(20分)" prop="SumScore3">
-                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore3" :max="20" placeholder="请输入"  style="width: 100%" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8" >
-                  <el-form-item label="项目成本管理(5分)" prop="SumScore4">
-                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateData.SumScore4" :max="5" placeholder="请输入"  style="width: 100%" />
+                  <el-form-item label="产品质量(30分)" prop="SumScore1">
+                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore1" :max="30" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
+
                 <el-col :span="8" >
-                  <el-form-item label="项目进度管理(10分)" prop="SumScore5">
-                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore5" :max="10" placeholder="请输入"  style="width: 100%" />
+                  <el-form-item label="合同履行(20分)" prop="SumScore2">
+                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore2" :max="20" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
+
                 <el-col :span="8" >
-                  <el-form-item label="项目分包管理(15分)" prop="SumScore6">
-                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore6" :max="15" placeholder="请输入"  style="width: 100%" />
+                  <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="信息资料管理(10分)" prop="SumScore7">
-                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore7" :max="10" placeholder="请输入"  style="width: 100%" />
+                  <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="诚信履约(10分)" prop="SumScore8">
-                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore8" :max="10" placeholder="请输入"  style="width: 100%" />
+                  <el-form-item label="协同响应(20分)" prop="SumScore5">
+                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore5" :max="20" :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%">
@@ -172,12 +162,12 @@
                 </el-col>
                 <el-col :span="8" >
                   <el-form-item label="业绩评价结果" prop="Result1">
-                    <el-input  :disabled="!auditBtnBooleanZhuan" v-model="evaluateData.Result1" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Result1" :max="1000" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" >
                   <el-form-item label="基本条件评价结果" prop="Result2">
-                    <el-input  :disabled="!auditBtnBooleanZhuan" v-model="evaluateData.Result2" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Result2" :max="1000" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
@@ -287,6 +277,14 @@
                 { required: true, message: '请填写', trigger: 'change' },
                 {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'},
+              ],
+          Result2: [
+                { required: true, message: '请填写', trigger: 'change' },
+                {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/,  message: '填写格式不正确', trigger: 'change'},
+              ],
           Conclusion: [
                 { required: true, message: '请填写', trigger: 'change' },
               ],
@@ -430,7 +428,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))
@@ -513,7 +511,7 @@
           if(this.formData.ContractClass=='02'){
             this.typeList = this.$refs.evaluateDataZhuanRef.typeList
           }
-          this.$refs['EntityForm'].validate((valid) => {
+          this.$refs['EntityForm2'].validate((valid) => {
             if (valid) {
                 this.majorEvaluate()
             } else {

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

@@ -88,7 +88,7 @@
                     <!-- SubPackage -->
                     <el-select :disabled="disabled" placeholder="请选择" v-model="contractData.SubPackage" style="width: 100%">
                       <el-option :key="1" label="是" :value="1"></el-option>
-                      <el-option :key="2" label="否" :value="2"></el-option>
+                      <el-option :key="0" label="否" :value="0"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>

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

@@ -253,11 +253,6 @@
               <el-input v-model="formData.DisputeResolution" placeholder="请输入"  style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="资金渠道小类" prop="MoneyChannelSmall">
-              <el-input v-model="formData.MoneyChannelSmall" placeholder="请输入"  style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="8">
             <el-form-item label="提交日期" prop="SubmitDate">
               <el-date-picker

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

@@ -46,25 +46,25 @@
 
                 <el-col :span="8" >
                   <el-form-item label="项目管理(40分)" prop="SumScore1">
-                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore1" :max="10" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.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="!auditBtnBoolean" v-model="evaluateData.SumScore2" :max="20" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.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="!auditBtnBoolean" v-model="evaluateData.SumScore3" :max="20" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.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="!auditBtnBoolean" v-model="evaluateData.SumScore4" :max="5" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore4" :max="15" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
 
@@ -79,12 +79,12 @@
                 </el-col>
                 <el-col :span="8" >
                   <el-form-item label="业绩评价结果" prop="Result1">
-                    <el-input  :disabled="!auditBtnBoolean" v-model="evaluateData.Result1" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.Result1" :max="1000" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" >
                   <el-form-item label="基本条件评价结果" prop="Result2">
-                    <el-input  :disabled="!auditBtnBoolean" v-model="evaluateData.Result2" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.Result2" :max="1000" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
@@ -104,7 +104,7 @@
         <!-- 专业处室 -->
         <el-tab-pane label="专业处室评价信息" name="3" v-if="auditBtnBooleanZhuan||Number(formData.Status)>4">
           <el-card class="box-card" style="mini-height: calc(100vh - 113px);">
-            <el-form label-width="160px" ref="EntityForm" :model="evaluateDataZhuan" :rules="rules">
+            <el-form label-width="160px" ref="EntityForm2" :model="evaluateDataZhuan" :rules="rules">
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="服务商名称">
@@ -117,45 +117,29 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" >
-                  <el-form-item label="项目组织实施(10分)" prop="SumScore1">
-                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore1" :max="10" placeholder="请输入"  style="width: 100%" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8" >
-                  <el-form-item label="项目质量管理(20分)" prop="SumScore2">
-                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore2" :max="20" placeholder="请输入"  style="width: 100%" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8" >
-                  <el-form-item label="项目职业健康安全与环境管理(20分)" prop="SumScore3">
-                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore3" :max="20" placeholder="请输入"  style="width: 100%" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8" >
-                  <el-form-item label="项目成本管理(5分)" prop="SumScore4">
-                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateData.SumScore4" :max="5" placeholder="请输入"  style="width: 100%" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8" >
-                  <el-form-item label="项目进度管理(10分)" prop="SumScore5">
-                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore5" :max="10" placeholder="请输入"  style="width: 100%" />
+                  <el-form-item label="项目管理(40分)" prop="SumScore1">
+                    <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="项目分包管理(15分)" prop="SumScore6">
-                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore6" :max="15" placeholder="请输入"  style="width: 100%" />
+                  <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="信息资料管理(10分)" prop="SumScore7">
-                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore7" :max="10" placeholder="请输入"  style="width: 100%" />
+                  <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="诚信履约(10分)" prop="SumScore8">
-                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore8" :max="10" placeholder="请输入"  style="width: 100%" />
+                  <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%">
@@ -167,12 +151,12 @@
                 </el-col>
                 <el-col :span="8" >
                   <el-form-item label="业绩评价结果" prop="Result1">
-                    <el-input  :disabled="!auditBtnBooleanZhuan" v-model="evaluateData.Result1" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Result1" :max="1000" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" >
                   <el-form-item label="基本条件评价结果" prop="Result2">
-                    <el-input  :disabled="!auditBtnBooleanZhuan" v-model="evaluateData.Result2" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Result2" :max="1000" :min="0" placeholder="请输入"  style="width: 100%" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
@@ -282,6 +266,14 @@
                 { required: true, message: '请填写', trigger: 'change' },
                 {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'},
+              ],
+          Result2: [
+                { required: true, message: '请填写', trigger: 'change' },
+                {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/,  message: '填写格式不正确', trigger: 'change'},
+              ],
           Conclusion: [
                 { required: true, message: '请填写', trigger: 'change' },
               ],
@@ -505,7 +497,7 @@
           if(this.formData.ContractClass=='02'){
             this.typeList = this.$refs.evaluateDataZhuanRef.typeList
           }
-          this.$refs['EntityForm'].validate((valid) => {
+          this.$refs['EntityForm2'].validate((valid) => {
             if (valid) {
                 this.majorEvaluate()
             } else {

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

@@ -88,7 +88,7 @@
                     <!-- SubPackage -->
                     <el-select :disabled="disabled" placeholder="请选择" v-model="contractData.SubPackage" style="width: 100%">
                       <el-option :key="1" label="是" :value="1"></el-option>
-                      <el-option :key="2" label="否" :value="2"></el-option>
+                      <el-option :key="0" label="否" :value="0"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>