前端： 合同 年度评价汇总列表及详情相关不显示【评价结果】字段

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

@@ -111,30 +111,30 @@
                                      placeholder="请输入" style="width: 100%"/>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8">
-                  <el-form-item label="评价结果" prop="Conclusion">
-                    <el-select :disabled="true" v-model="evaluateData.Conclusion" placeholder="请选择"
-                               style="width: 100%">
-                      <el-option :key="1" label="优秀" :value="1"></el-option>
-                      <el-option :key="2" label="合格" :value="2"></el-option>
-                      <el-option :key="3" label="不合格" :value="3"></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
+                <!--<el-col :span="8">-->
+                <!--  <el-form-item label="评价结果" prop="Conclusion">-->
+                <!--    <el-select :disabled="true" v-model="evaluateData.Conclusion" placeholder="请选择"-->
+                <!--               style="width: 100%">-->
+                <!--      <el-option :key="1" label="优秀" :value="1"></el-option>-->
+                <!--      <el-option :key="2" label="合格" :value="2"></el-option>-->
+                <!--      <el-option :key="3" label="不合格" :value="3"></el-option>-->
+                <!--    </el-select>-->
+                <!--  </el-form-item>-->
+                <!--</el-col>-->
                 <el-col :span="8">
                   <el-form-item label="业绩评价结果" prop="Result1">
                     <el-input-number :disabled="true" v-model="evaluateData.Result1" :max="100" :min="0"
                                      placeholder="请输入" style="width: 100%"/>
                   </el-form-item>
                 </el-col>
-              </el-row>
-              <el-row>
                 <el-col :span="8">
                   <el-form-item label="基本条件评价结果" prop="Result2">
                     <el-input :readonly="true" v-model="evaluateData.Result2" placeholder="请输入"
                               style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
+              </el-row>
+              <el-row>
                 <el-col :span="16">
                   <el-form-item label="备注">
                     <el-input type="textarea" :readonly="true" v-model="evaluateData.Note" placeholder="请输入"

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

@@ -19,14 +19,14 @@
           <el-form-item label="企业名称">
             <el-input size="mini" clearable v-model="searchForm.SupplierName" placeholder="请输入企业名称"></el-input>
           </el-form-item>
-          <el-form-item label="评价结果" style="width: 170px">
-            <el-select size="mini" v-model="searchForm.Evaluate" placeholder="请选择" style="width: 90px" clearable>
-              <el-option label="全部" value="" key="01"></el-option>
-              <el-option label="优秀" value="1" key="02"></el-option>
-              <el-option label="合格" value="2" key="03"></el-option>
-              <el-option label="不合格" value="3" key="04"></el-option>
-            </el-select>
-          </el-form-item>
+          <!--<el-form-item label="评价结果" style="width: 170px">-->
+          <!--  <el-select size="mini" v-model="searchForm.Evaluate" placeholder="请选择" style="width: 90px" clearable>-->
+          <!--    <el-option label="全部" value="" key="01"></el-option>-->
+          <!--    <el-option label="优秀" value="1" key="02"></el-option>-->
+          <!--    <el-option label="合格" value="2" key="03"></el-option>-->
+          <!--    <el-option label="不合格" value="3" key="04"></el-option>-->
+          <!--  </el-select>-->
+          <!--</el-form-item>-->
           <el-form-item label="评价得分类型">
             <el-select size="mini" v-model="searchForm.ScoreType" placeholder="请选择" style="width: 120px" clearable>
               <el-option label="汇总得分" value="" key="1"></el-option>
@@ -111,11 +111,11 @@
           </template>
         </el-table-column> -->
 
-        <el-table-column sortable show-overflow-tooltip prop="Evaluate" label="评价结果" header-align="center" min-width="120" align="center">
-          <template slot-scope="scope">
-            {{evaluateFun(scope.row.Evaluate,scope.row.Result)}}
-          </template>
-        </el-table-column>
+        <!--<el-table-column sortable show-overflow-tooltip prop="Evaluate" label="评价结果" header-align="center" min-width="120" align="center">-->
+        <!--  <template slot-scope="scope">-->
+        <!--    {{evaluateFun(scope.row.Evaluate,scope.row.Result)}}-->
+        <!--  </template>-->
+        <!--</el-table-column>-->
 
         <el-table-column sortable show-overflow-tooltip label="评价内容及得分" header-align="center" >
           <el-table-column sortable show-overflow-tooltip prop="Score1" header-align="center" label="项目组织实施(10分)" min-width="155" align="center"></el-table-column>
@@ -149,15 +149,15 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="评价结果">
-              <el-select v-model="searchForm.Evaluate" placeholder="请选择" >
-                <el-option key="1" label="优秀" value="1"></el-option>
-                <el-option key="2" label="合格" value="2"></el-option>
-                <el-option key="3" label="不合格" value="3"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="12">-->
+          <!--  <el-form-item label="评价结果">-->
+          <!--    <el-select v-model="searchForm.Evaluate" placeholder="请选择" >-->
+          <!--      <el-option key="1" label="优秀" value="1"></el-option>-->
+          <!--      <el-option key="2" label="合格" value="2"></el-option>-->
+          <!--      <el-option key="3" label="不合格" value="3"></el-option>-->
+          <!--    </el-select>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
 
           <el-col :span="12">
             <el-form-item label="评价得分">

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

@@ -88,30 +88,30 @@
                                      placeholder="请输入" style="width: 100%"/>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8">
-                  <el-form-item label="评价结果" prop="Conclusion">
-                    <el-select :disabled="true" v-model="evaluateData.Conclusion" placeholder="请选择"
-                               style="width: 100%">
-                      <el-option :key="1" label="优秀" :value="1"></el-option>
-                      <el-option :key="2" label="合格" :value="2"></el-option>
-                      <el-option :key="3" label="不合格" :value="3"></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
+                <!--<el-col :span="8">-->
+                <!--  <el-form-item label="评价结果" prop="Conclusion">-->
+                <!--    <el-select :disabled="true" v-model="evaluateData.Conclusion" placeholder="请选择"-->
+                <!--               style="width: 100%">-->
+                <!--      <el-option :key="1" label="优秀" :value="1"></el-option>-->
+                <!--      <el-option :key="2" label="合格" :value="2"></el-option>-->
+                <!--      <el-option :key="3" label="不合格" :value="3"></el-option>-->
+                <!--    </el-select>-->
+                <!--  </el-form-item>-->
+                <!--</el-col>-->
                 <el-col :span="8">
                   <el-form-item label="业绩评价结果" prop="Result1">
                     <el-input-number :disabled="true" v-model="evaluateData.Result1" :max="100" :min="0" placeholder="请输入"
                               style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
-              </el-row>
-              <el-row>
                 <el-col :span="8">
                   <el-form-item label="基本条件评价结果" prop="Result2">
                     <el-input :readonly="true" v-model="evaluateData.Result2" placeholder="请输入"
                               style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
+              </el-row>
+              <el-row>
                 <el-col :span="16">
                   <el-form-item label="备注">
                     <el-input type="textarea" :readonly="true" v-model="evaluateData.Note" placeholder="请输入"

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

@@ -15,14 +15,14 @@
           <el-form-item label="企业名称">
             <el-input size="mini" clearable v-model="searchForm.SupplierName" placeholder="请输入企业名称"></el-input>
           </el-form-item>
-          <el-form-item label="评价结果" style="width: 170px">
-            <el-select size="mini" v-model="searchForm.Evaluate" placeholder="请选择" style="width: 90px" clearable>
-              <el-option label="全部" value="" key="01"></el-option>
-              <el-option label="优秀" value="1" key="02"></el-option>
-              <el-option label="合格" value="2" key="03"></el-option>
-              <el-option label="不合格" value="3" key="04"></el-option>
-            </el-select>
-          </el-form-item>
+          <!--<el-form-item label="评价结果" style="width: 170px">-->
+          <!--  <el-select size="mini" v-model="searchForm.Evaluate" placeholder="请选择" style="width: 90px" clearable>-->
+          <!--    <el-option label="全部" value="" key="01"></el-option>-->
+          <!--    <el-option label="优秀" value="1" key="02"></el-option>-->
+          <!--    <el-option label="合格" value="2" key="03"></el-option>-->
+          <!--    <el-option label="不合格" value="3" key="04"></el-option>-->
+          <!--  </el-select>-->
+          <!--</el-form-item>-->
           <el-form-item label="评价得分类型">
             <el-select size="mini" v-model="searchForm.ScoreType" placeholder="请选择" style="width: 120px" clearable>
               <el-option label="汇总得分" value="" key="1"></el-option>
@@ -36,10 +36,10 @@
               <el-option v-for="(item, index) in yearList" :key="index" :label="item" :value="item" style="width: 100%"></el-option>
             </el-select>
           </el-form-item>
-<!--          <el-form-item label="上报时间">-->
-<!--            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"-->
-<!--                            start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>-->
-<!--          </el-form-item>-->
+          <!--<el-form-item label="上报时间">-->
+          <!--  <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"-->
+          <!--                  start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>-->
+          <!--</el-form-item>-->
 
           <el-form-item>
             <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
@@ -63,11 +63,11 @@
 
         <el-table-column sortable show-overflow-tooltip prop="SupplierName" header-align="center" min-width="130" align="center" label="供应商名称"></el-table-column>
         <el-table-column sortable show-overflow-tooltip prop="Score" header-align="center" label="评价得分(100分)" align="center" width="140"></el-table-column>
-        <el-table-column sortable show-overflow-tooltip prop="Evaluate" label="评价结果" header-align="center" width="100" align="center">
-          <template slot-scope="scope">
-            {{evaluateFun(scope.row.Evaluate,scope.row.Result)}}
-          </template>
-        </el-table-column>
+        <!--<el-table-column sortable show-overflow-tooltip prop="Evaluate" label="评价结果" header-align="center" width="100" align="center">-->
+        <!--  <template slot-scope="scope">-->
+        <!--    {{evaluateFun(scope.row.Evaluate,scope.row.Result)}}-->
+        <!--  </template>-->
+        <!--</el-table-column>-->
         <el-table-column sortable show-overflow-tooltip label="评价内容及得分" header-align="center">
           <el-table-column sortable show-overflow-tooltip prop="Score1" align="center" header-align="center" label="产品质量(30分)" width="140"></el-table-column>
           <el-table-column sortable show-overflow-tooltip prop="Score2" align="center" header-align="center" label="技术水平(20分)" width="140"></el-table-column>
@@ -85,12 +85,12 @@
       <el-form ref="advancedsearchForm" label-width="110px" class="advancedsearchFormClass">
         <el-row>
 
-<!--          <el-col :span="12">-->
-<!--            <el-form-item label="生成时间">-->
-<!--              <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"-->
-<!--                              start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+          <!--<el-col :span="12">-->
+          <!--  <el-form-item label="生成时间">-->
+          <!--    <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"-->
+          <!--                    start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
 
           <el-col :span="12">
             <el-form-item label="供应商名称">
@@ -98,15 +98,15 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="评价结果">
-              <el-select v-model="searchForm.Evaluate" placeholder="请选择" >
-                <el-option key="1" label="优秀" value="1"></el-option>
-                <el-option key="2" label="合格" value="2"></el-option>
-                <el-option key="3" label="不合格" value="3"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="12">-->
+          <!--  <el-form-item label="评价结果">-->
+          <!--    <el-select v-model="searchForm.Evaluate" placeholder="请选择" >-->
+          <!--      <el-option key="1" label="优秀" value="1"></el-option>-->
+          <!--      <el-option key="2" label="合格" value="2"></el-option>-->
+          <!--      <el-option key="3" label="不合格" value="3"></el-option>-->
+          <!--    </el-select>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
 
           <el-col :span="12">
             <el-form-item label="评价得分">

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

@@ -82,16 +82,16 @@
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="8">
-                  <el-form-item label="评价结果" prop="Conclusion">
-                    <el-select :disabled="true" v-model="evaluateData.Conclusion" placeholder="请选择"
-                               style="width: 100%">
-                      <el-option :key="1" label="优秀" :value="1"></el-option>
-                      <el-option :key="2" label="合格" :value="2"></el-option>
-                      <el-option :key="3" label="不合格" :value="3"></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
+                <!--<el-col :span="8">-->
+                <!--  <el-form-item label="评价结果" prop="Conclusion">-->
+                <!--    <el-select :disabled="true" v-model="evaluateData.Conclusion" placeholder="请选择"-->
+                <!--               style="width: 100%">-->
+                <!--      <el-option :key="1" label="优秀" :value="1"></el-option>-->
+                <!--      <el-option :key="2" label="合格" :value="2"></el-option>-->
+                <!--      <el-option :key="3" label="不合格" :value="3"></el-option>-->
+                <!--    </el-select>-->
+                <!--  </el-form-item>-->
+                <!--</el-col>-->
                 <el-col :span="8">
                   <el-form-item label="业绩评价结果" prop="Result1">
                     <el-input-number :disabled="true" v-model="evaluateData.Result1" :max="100" :min="0"

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

@@ -18,14 +18,14 @@
           <el-form-item label="企业名称">
             <el-input size="mini" clearable v-model="searchForm.SupplierName" placeholder="请输入企业名称"></el-input>
           </el-form-item>
-          <el-form-item label="评价结果" style="width: 170px">
-            <el-select size="mini" v-model="searchForm.Evaluate" placeholder="请选择" style="width: 90px" clearable>
-              <el-option label="全部" value="" key="01"></el-option>
-              <el-option label="优秀" value="1" key="02"></el-option>
-              <el-option label="合格" value="2" key="03"></el-option>
-              <el-option label="不合格" value="3" key="04"></el-option>
-            </el-select>
-          </el-form-item>
+          <!--<el-form-item label="评价结果" style="width: 170px">-->
+          <!--  <el-select size="mini" v-model="searchForm.Evaluate" placeholder="请选择" style="width: 90px" clearable>-->
+          <!--    <el-option label="全部" value="" key="01"></el-option>-->
+          <!--    <el-option label="优秀" value="1" key="02"></el-option>-->
+          <!--    <el-option label="合格" value="2" key="03"></el-option>-->
+          <!--    <el-option label="不合格" value="3" key="04"></el-option>-->
+          <!--  </el-select>-->
+          <!--</el-form-item>-->
           <el-form-item label="评价得分类型">
             <el-select size="mini" v-model="searchForm.ScoreType" placeholder="请选择" style="width: 120px" clearable>
               <el-option label="汇总得分" value="" key="1"></el-option>
@@ -64,11 +64,11 @@
         </el-table-column>
         <el-table-column sortable show-overflow-tooltip prop="SupplierName" header-align="center" min-width="100" align="center" label="服务商名称"></el-table-column>
         <el-table-column sortable show-overflow-tooltip prop="Score" header-align="center" label="评价得分(100分)" width="140" align="center"></el-table-column>
-        <el-table-column sortable show-overflow-tooltip prop="Evaluate" align="center" label="评价结果" header-align="center" width="100" >
-          <template slot-scope="scope">
-            {{evaluateFun(scope.row.Evaluate,scope.row.Result)}}
-          </template>
-        </el-table-column>
+        <!--<el-table-column sortable show-overflow-tooltip prop="Evaluate" align="center" label="评价结果" header-align="center" width="100" >-->
+        <!--  <template slot-scope="scope">-->
+        <!--    {{evaluateFun(scope.row.Evaluate,scope.row.Result)}}-->
+        <!--  </template>-->
+        <!--</el-table-column>-->
         <el-table-column sortable show-overflow-tooltip label="评价内容及得分" header-align="center">
           <el-table-column sortable show-overflow-tooltip prop="Score1" align="center" header-align="center" label="项目管理(40分)" width="140"></el-table-column>
           <el-table-column sortable show-overflow-tooltip prop="Score2" align="center" header-align="center" label="HSE管理(30分)" width="140"></el-table-column>
@@ -97,15 +97,15 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="评价结果">
-              <el-select v-model="searchForm.Evaluate" placeholder="请选择" >
-                <el-option key="1" label="优秀" value="1"></el-option>
-                <el-option key="2" label="合格" value="2"></el-option>
-                <el-option key="3" label="不合格" value="3"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="12">-->
+          <!--  <el-form-item label="评价结果">-->
+          <!--    <el-select v-model="searchForm.Evaluate" placeholder="请选择" >-->
+          <!--      <el-option key="1" label="优秀" value="1"></el-option>-->
+          <!--      <el-option key="2" label="合格" value="2"></el-option>-->
+          <!--      <el-option key="3" label="不合格" value="3"></el-option>-->
+          <!--    </el-select>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
 
           <el-col :span="12">
             <el-form-item label="评价得分">