配置项修改

src/dashoo.cn/frontend_web/src/assets/styles/common.css

@@ -10,6 +10,10 @@
   height: 28px;
   font-size: 12px;
 }
+.advancedsearchFormClass /deep/ .el-input__inner{
+  height: 28px;
+  font-size: 12px;
+}
 .advancedsearchFormClass /deep/ .el-select{
   width: 100%;
 }

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

@@ -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" type="text" icon="el-icon-delete" style="margin-left:3px" size="small" >
+                <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>
               </el-popover>
@@ -273,20 +273,29 @@
               case 4:
                 return '待专业科室审核'
               break;
-              case 5:
-                return '待集中评审'
-              break;
-              case 6:
-                return '待交费'
-              break;
               case 7:
                 return '待企管法规处审批'
               break;
               case 8:
                 return '已完成'
               break;
+              case -1:
+                return '初审未通过'
+              break;
+              case -2:
+                return '复审未通过'
+              break;
+              case -3:
+                return '专业处室未通过'
+              break;
+              case -4:
+                return '专业处室审核未通过'
+              break;
+              case -7:
+                return '企管法规处审批未通过'
+              break;
               default:
-                return '审核未通过'
+                return '--'
               break;
             }
         }

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

@@ -50,7 +50,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" type="text" style="margin-left:3px" icon="el-icon-delete" size="small" >删除</el-button>
+              <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-popover>
             
           </template>
@@ -216,20 +216,29 @@
               case 4:
                 return '待专业科室审核'
               break;
-              case 5:
-                return '待集中评审'
-              break;
-              case 6:
-                return '待交费'
-              break;
               case 7:
                 return '待企管法规处审批'
               break;
               case 8:
                 return '已完成'
               break;
+              case -1:
+                return '初审未通过'
+              break;
+              case -2:
+                return '复审未通过'
+              break;
+              case -3:
+                return '专业处室未通过'
+              break;
+              case -4:
+                return '专业处室审核未通过'
+              break;
+              case -7:
+                return '企管法规处审批未通过'
+              break;
               default:
-                return '审核未通过'
+                return '--'
               break;
             }
           }else{

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

@@ -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" type="text" icon="el-icon-delete" style="margin-left:3px" size="small" >
+              <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>
             </el-popover>
@@ -227,13 +227,13 @@
             var index = Number(item)
             switch(index){
               case 0:
-                return '初始'
+                return '已保存'
               break;
               case 1:
-                return '待二级初审'
+                return '待初审'
               break;
               case 2:
-                return '待二级复审'
+                return '待复审'
               break;
               case 3:
                 return '专业科室接收'
@@ -241,20 +241,29 @@
               case 4:
                 return '待专业科室审核'
               break;
-              case 5:
-                return '待集中评审'
-              break;
-              case 6:
-                return '待交费'
-              break;
               case 7:
                 return '待企管法规处审批'
               break;
               case 8:
                 return '已完成'
               break;
+              case -1:
+                return '初审未通过'
+              break;
+              case -2:
+                return '复审未通过'
+              break;
+              case -3:
+                return '专业处室未通过'
+              break;
+              case -4:
+                return '专业处室审核未通过'
+              break;
+              case -7:
+                return '企管法规处审批未通过'
+              break;
               default:
-                return '审核未通过'
+                return '--'
               break;
             }
         }

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

@@ -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" type="text" style="margin-left:3px" icon="el-icon-delete" size="small" >删除</el-button>
+              <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-popover>
           </template>
         </el-table-column>
@@ -198,13 +198,13 @@
             var index = Number(item)
             switch(index){
               case 0:
-                return '初始'
+                return '已保存'
               break;
               case 1:
-                return '待二级初审'
+                return '待初审'
               break;
               case 2:
-                return '待二级复审'
+                return '待复审'
               break;
               case 3:
                 return '专业科室接收'
@@ -212,20 +212,29 @@
               case 4:
                 return '待专业科室审核'
               break;
-              case 5:
-                return '待集中评审'
-              break;
-              case 6:
-                return '待交费'
-              break;
               case 7:
                 return '待企管法规处审批'
               break;
               case 8:
                 return '已完成'
               break;
+              case -1:
+                return '初审未通过'
+              break;
+              case -2:
+                return '复审未通过'
+              break;
+              case -3:
+                return '专业处室未通过'
+              break;
+              case -4:
+                return '专业处室审核未通过'
+              break;
+              case -7:
+                return '企管法规处审批未通过'
+              break;
               default:
-                return '审核未通过'
+                return '--'
               break;
             }
           }else{

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

@@ -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" type="text" icon="el-icon-delete" style="margin-left:3px" size="small" >
+              <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>
             </el-popover>
@@ -249,20 +249,29 @@
               case 4:
                 return '待专业科室审核'
               break;
-              case 5:
-                return '待集中评审'
-              break;
-              case 6:
-                return '待交费'
-              break;
               case 7:
                 return '待企管法规处审批'
               break;
               case 8:
                 return '已完成'
               break;
+              case -1:
+                return '初审未通过'
+              break;
+              case -2:
+                return '复审未通过'
+              break;
+              case -3:
+                return '专业处室未通过'
+              break;
+              case -4:
+                return '专业处室审核未通过'
+              break;
+              case -7:
+                return '企管法规处审批未通过'
+              break;
               default:
-                return '审核未通过'
+                return '--'
               break;
             }
         }
@@ -331,7 +340,7 @@
         }).catch(err => {
           console.error(err)
         })
-      
+
         var data = {
           percode:'oil_contract.SumStore.Edit',
         }

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

@@ -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" type="text" style="margin-left:3px" icon="el-icon-delete" size="small" >删除</el-button>
+              <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-popover>
           </template>
         </el-table-column>
@@ -199,13 +199,13 @@
             var index = Number(item)
             switch(index){
               case 0:
-                return '初始'
+                return '已保存'
               break;
               case 1:
-                return '待二级初审'
+                return '待初审'
               break;
               case 2:
-                return '待二级复审'
+                return '待复审'
               break;
               case 3:
                 return '专业科室接收'
@@ -213,20 +213,29 @@
               case 4:
                 return '待专业科室审核'
               break;
-              case 5:
-                return '待集中评审'
-              break;
-              case 6:
-                return '待交费'
-              break;
               case 7:
                 return '待企管法规处审批'
               break;
               case 8:
                 return '已完成'
               break;
+              case -1:
+                return '初审未通过'
+              break;
+              case -2:
+                return '复审未通过'
+              break;
+              case -3:
+                return '专业处室未通过'
+              break;
+              case -4:
+                return '专业处室审核未通过'
+              break;
+              case -7:
+                return '企管法规处审批未通过'
+              break;
               default:
-                return '审核未通过'
+                return '--'
               break;
             }
           }else{

src/dashoo.cn/frontend_web/src/pages/oilcontract/evaluation-items/evaluationlist.vue

@@ -35,7 +35,7 @@
         </el-table-column>
         <el-table-column
           property="Reason"
-          label="不合格原因"
+          label="操作"
           header-align="center"
           width="160"
           align="center">
@@ -57,10 +57,10 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="" style="display: flex;align-items: center;justify-content: flex-end;margin: 18px 0;">
+      <!-- <div class="" style="display: flex;align-items: center;justify-content: flex-end;margin: 18px 0;">
         <div>标准总分：{{standardNum}}分</div>
         <div style="margin-left: 18px;margin-right: 140px;">实得总分：{{getNumFun()}}分</div>
-      </div>
+      </div> -->
 
 
     </el-form>
@@ -79,19 +79,29 @@
       :visible.sync="dialogBoolean"
       width="60%"
       >
-      <el-form ref="advancedsearchForm" label-width="110px" class="advancedsearchFormClass">
+      <el-form ref="advancedsearchForm" :model="formData" :rules="rulesEve" label-width="110px" class="advancedsearchFormClass">
         <el-row>
+
           <el-col :span="12">
-            <el-form-item label="评价内容">
-              <el-input   type="textarea" placeholder="请输入" v-model="textareaValue" ></el-input>
+            <el-form-item label="级别" >
+              <el-select v-model="formData.LevelCode" placeholder="请选择"  >
+                <el-option :key="1" label="一级" :value="1"></el-option>
+                <el-option :key="2" label="二级" :value="2"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="标准分值">  
-              <el-input   type="textarea" placeholder="请输入" v-model="textareaValue" ></el-input>
+            <el-form-item label="标准分值" prop="NormalScore">
+              <el-input    placeholder="请输入" type="number" min="0" v-model="formData.NormalScore" ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="评价内容" prop="Content">
+              <el-input   type="textarea" placeholder="请输入" v-model="formData.Content" ></el-input>
             </el-form-item>
           </el-col>
 
+
         </el-row>
       </el-form>
 
@@ -198,6 +208,14 @@
         callback();
       };
       return {
+        rulesEve:{
+          NormalScore: [
+            { required: true, message: '请输入标准分值', trigger: 'blur' }
+          ],
+          Content: [
+            { required: true, message: '请输入评价内容', trigger: 'blur' }
+          ],
+        },
         fractionBoolean:true,
         dialogVisibleCom: false,
         loading: false,
@@ -255,20 +273,21 @@
         standardNum:0,//标准分数
         getNum:0,//实得总分
 
+        formData:{
+          LevelCode:'',
+          NormalScore:'',
+          Content:'',
+        },
+
       }
     },
     created() {
       //数据列表
       // 判断是编辑状态还是新增状态
-      if(this.evaluateId==0){
-        this.initDatas();
-      }else{
+      // if(this.evaluateId==0){
+      //   this.initDatas();
+      // }else{
         this.editDatas();
-      }
-
-
-      //this.getDictOptions()
-
     },
     methods: {
       //初始数据
@@ -337,14 +356,32 @@
       // 弹窗
       onDialogVisible(item,index){
         console.log(item)
-        this.entityListItemIndex = index
-        this.textareaValue = item.Remark
+        // this.entityListItemIndex = index
+        // this.textareaValue = item.Remark
         this.dialogBoolean = true
+        this.formData = item
       },
       //确认编辑内容
       onTrueDialog(){
-        this.entityListData.entityList[this.entityListItemIndex].Remark = this.textareaValue
-        this.dialogBoolean = false
+        // this.formData
+        console.log(this.formData)
+        api.updateContractEvaluate(this.formData.Id,this.formData,this.$axios).then(res => {
+          if(res.data.code==0){
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            });
+            this.editDatas()
+          }else{
+            this.$message({
+              type: 'error',
+              message: res.data.message
+            });
+          }
+          this.dialogBoolean = false
+        }).catch(err => {
+          console.error(err)
+        })
       },
       // 分数校验
       onInputFen(index,fen){

src/dashoo.cn/frontend_web/src/pages/oilcontract/evaluation-items/index.vue

@@ -35,18 +35,17 @@
       <el-tabs v-model="activeName" style="margin-top: -10px">
 
         <el-tab-pane label="承包商评价" name="1" >
-          <evaluation-list ref="evaluation_list_one"   :evaluateId="0" category="0" ContractClass="01" ></evaluation-list>
+          <evaluation-list ref="evaluation_list_one"   :evaluateId="0" category="0" ContractClass="02" ></evaluation-list>
         </el-tab-pane>
-        <el-tab-pane label="承包商评价" name="2" >
+        <el-tab-pane label="供应商评价评价" name="2" >
           <evaluation-list ref="evaluation_list_one"   :evaluateId="0" category="0" ContractClass="01" ></evaluation-list>
         </el-tab-pane>
-        <el-tab-pane label="承包商评价" name="3" >
-          <evaluation-list ref="evaluation_list_one"   :evaluateId="0" category="0" ContractClass="01" ></evaluation-list>
+        <el-tab-pane label="服务商评价" name="3" >
+          <evaluation-list ref="evaluation_list_one"   :evaluateId="0" category="0" ContractClass="03" ></evaluation-list>
         </el-tab-pane>
 
-
         <el-tab-pane label="基本条件评价" name="4" >
-          <base-list ref="evaluation_listType_one" :evaluateId="0" category="0" ContractClass="01"></base-list>
+          <base-list ref="evaluation_listType_one" :evaluateId="0" category="0" ContractClass="02"></base-list>
         </el-tab-pane>
 
       </el-tabs>