修改合同

src/dashoo.cn/frontend_web/nuxt.config.js

@@ -172,9 +172,9 @@ module.exports = {
 
   axios: {
     // baseURL: '//192.168.1.44:10091/api/' // 本机开发使用
-     baseURL: '//localhost:10091/api/' // 本机开发使用
+     // baseURL: '//localhost:10091/api/' // 本机开发使用
     // baseURL: '//192.168.1.41:10091/api/' // 本机开发使用
-    // baseURL: '//192.168.124.13:10091/api/' // 本机开发使用
+    baseURL: '//192.168.124.13:10091/api/' // 本机开发使用
 
     /* --------Nuxt Start发版用 START-------------- */
     // baseURL: '/api/'

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

@@ -74,7 +74,7 @@
           <el-table-column sortable show-overflow-tooltip prop="SumScore8" header-align="center" label="诚信履约(10分)" min-width="155"></el-table-column>
         </el-table-column>
 
-        <el-table-column sortable show-overflow-tooltip label="法人资格和相应的资质证明文件应满足要求且持续有效" header-align="center"  :min-width="tableWidth">
+        <!-- <el-table-column sortable show-overflow-tooltip label="法人资格和相应的资质证明文件应满足要求且持续有效" header-align="center"  :min-width="tableWidth">
           <template slot-scope="scope">
             {{evaluateBooleanFun(scope.row.B1)}}
           </template>
@@ -118,7 +118,7 @@
           <template slot-scope="scope">
             {{evaluateBooleanFun(scope.row.B1)}}
           </template>
-        </el-table-column>
+        </el-table-column> -->
 
         <el-table-column sortable show-overflow-tooltip prop="Evaluate" label="评价结果" header-align="center" >
           <template slot-scope="scope">

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

@@ -97,6 +97,16 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
+                <el-col :span="8" >
+                  <el-form-item label="业绩评价结果" prop="Result1">
+                    <el-input  :disabled="!auditBtnBoolean" v-model="evaluateData.Note" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8" >
+                  <el-form-item label="基本条件评价结果" prop="Result1">
+                    <el-input  :disabled="!auditBtnBoolean" v-model="evaluateData.Note" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
                 <el-col :span="24">
                   <el-form-item label="备注">
                     <el-input type="textarea" :disabled="!auditBtnBoolean" v-model="evaluateData.Note" placeholder="请输入"  style="width: 100%"></el-input>
@@ -112,7 +122,7 @@
         </el-tab-pane>
 
         <!-- 专业处室 -->
-        <el-tab-pane label="专业处室评价信息" name="3" v-if="departmentBoolean">
+        <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-row>
@@ -175,6 +185,16 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
+                <el-col :span="8" >
+                  <el-form-item label="业绩评价结果" prop="Result1">
+                    <el-input  :disabled="!auditBtnBooleanZhuan" v-model="evaluateData.Note" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8" >
+                  <el-form-item label="基本条件评价结果" prop="Result1">
+                    <el-input  :disabled="!auditBtnBooleanZhuan" v-model="evaluateData.Note" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
                 <el-col :span="24">
                   <el-form-item label="备注">
                     <el-input type="textarea" :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Note" placeholder="请输入"  style="width: 100%"></el-input>
@@ -313,7 +333,7 @@
         evaluation_list:[],
         auditBtn:false,
         auditBtnBoolean:true,
-        auditBtnBooleanZhuan:true,
+        auditBtnBooleanZhuan:false,
         auditstepcode:'',
         //下拉选择项
         //wellNoOptions: [],
@@ -481,7 +501,7 @@
           // this.evaluation_list = this.evaluation_list.concat(this.$refs.evaluation_listType_one.entityListData.entityList)
           // 获取第一列评价格式
           // var fractionBoolean_1 = this.$refs.evaluation_list_one.fractionBoolean
-          
+
           // 先隐藏条件评价
           // this.typeList = this.$refs.evaluateDataRef.typeList
           this.$refs['EntityForm'].validate((valid) => {
@@ -504,7 +524,7 @@
           // this.evaluation_list = this.evaluation_list.concat(this.$refs.evaluation_listType_two.entityListData.entityList)
           // // 获取第一列评价格式
           // var fractionBoolean_1 = this.$refs.evaluation_list_two.fractionBoolean
-          this.typeList = this.$refs.evaluateDataZhuanRef.typeList
+          // this.typeList = this.$refs.evaluateDataZhuanRef.typeList
           this.$refs['EntityForm'].validate((valid) => {
             if (valid) {
                 this.majorEvaluate()
@@ -610,12 +630,13 @@
         }
         apiCert.isAccess(params, this.$axios).then(res => {
           this.auditBtn = res.data
+          console.log(this.formData.Status=='4',res.data)
           if(this.formData.Status=='4'&&res.data){
             this.auditBtnBooleanZhuan = true
           }else{
             this.auditBtnBooleanZhuan = false
           }
-          if(this.formData.Status=='0'){
+          if(Number(this.formData.Status)<=0){
             this.auditBtnBoolean = true
           }else{
             this.auditBtnBoolean = false

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

@@ -41,7 +41,7 @@
         <el-table-column sortable show-overflow-tooltip prop="SupplierName" header-align="center" width="130" label="服务商名称"></el-table-column>
         <el-table-column sortable show-overflow-tooltip prop="Score" header-align="center" label="评价得分" width="120"></el-table-column>
 
-        <el-table-column sortable show-overflow-tooltip label="法人资格和相应的资质证明文件应满足要求且持续有效" header-align="center"  :min-width="tableWidth">
+        <!-- <el-table-column sortable show-overflow-tooltip label="法人资格和相应的资质证明文件应满足要求且持续有效" header-align="center"  :min-width="tableWidth">
           <template slot-scope="scope">
             {{evaluateBooleanFun(scope.row.B1)}}
           </template>
@@ -85,7 +85,7 @@
           <template slot-scope="scope">
             {{evaluateBooleanFun(scope.row.B1)}}
           </template>
-        </el-table-column>
+        </el-table-column> -->
 
         <el-table-column sortable show-overflow-tooltip prop="Conclusion" label="评价结果" header-align="center" min-width="120">
           <template slot-scope="scope">

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

@@ -97,7 +97,7 @@
         </el-tab-pane>
 
         <!-- 专业处室 -->
-        <el-tab-pane label="专业处室评价信息" name="3" v-if="departmentBoolean">
+        <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-row>
@@ -298,7 +298,7 @@
         evaluation_list:[],
         auditBtn:false,
         auditBtnBoolean:true,
-        auditBtnBooleanZhuan:true,
+        auditBtnBooleanZhuan:false,
         auditstepcode:'',
         //下拉选择项
         //wellNoOptions: [],
@@ -607,7 +607,7 @@
           }else{
             this.auditBtnBooleanZhuan = false
           }
-          if(this.formData.Status=='0'){
+          if(Number(this.formData.Status)<=0){
             this.auditBtnBoolean = true
           }else{
             this.auditBtnBoolean = false

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

@@ -92,7 +92,7 @@
         </el-tab-pane>
 
         <!-- 专业处室 -->
-        <el-tab-pane label="专业处室评价信息" name="3" v-if="departmentBoolean">
+        <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-row>
@@ -293,7 +293,7 @@
         evaluation_list:[],
         auditBtn:false,
         auditBtnBoolean:true,
-        auditBtnBooleanZhuan:true,
+        auditBtnBooleanZhuan:false,
         auditstepcode:'',
         //下拉选择项
         //wellNoOptions: [],
@@ -600,7 +600,7 @@
           }else{
             this.auditBtnBooleanZhuan = false
           }
-          if(this.formData.Status=='0'){
+          if(Number(this.formData.Status)<=0){
             this.auditBtnBoolean = true
           }else{
             this.auditBtnBoolean = false