合同修改2022-02-18

src/dashoo.cn/backend/api/business/oilcontract/contract/contract.go

@@ -79,6 +79,9 @@ type OilContract struct {
 	ClassName            string    `json:"ClassName" xorm:"comment('类别') VARCHAR(255) 'ClassName'"`
 	SecondUnitName       string    `json:"SecondUnitName" xorm:"comment('二级单位名') VARCHAR(255) 'SecondUnitName'"`
 }
+type YearList struct {
+	Year  string       `json:"year"`
+}
 type OilContractMoney struct {
 	Id             int       `json:"Id" xorm:"not null pk autoincr INT(11) 'Id'"`
 	ContractId     int       `json:"ContractId" xorm:"default 0 comment('合同ID') INT(11) 'ContractId'"`

src/dashoo.cn/backend/api/controllers/oilcontract/contract.go

@@ -6,6 +6,7 @@ import (
 	"dashoo.cn/backend/api/business/oilsupplier/supplier"
 	"dashoo.cn/backend/api/business/organize"
 	"dashoo.cn/backend/api/business/workflow"
+	baseparameter "dashoo.cn/business2/parameter"
 	"encoding/json"
 	"fmt"
 	"github.com/tealeg/xlsx"
@@ -23,7 +24,6 @@ import (
 	"dashoo.cn/business2/userRole"
 	"dashoo.cn/utils"
 	. "github.com/linxGnu/goseaweedfs"
-
 )
 
 type OilContractController struct {
@@ -114,18 +114,25 @@ func (this *OilContractController) GetEntityList() {
 	PoNumber := this.GetString("PoNumber")
 	SubPackage := this.GetString("SubPackage")
 	ImportStatus := this.GetString("ImportStatus")
-	ContractClass := this.GetString("ContractClass")
+	//ContractClass := this.GetString("ContractClass")
 	ClassName := this.GetString("ClassName")
 	SecondUnit := this.GetString("SecondUnit")
 	ImportSecondUnit := this.GetString("ImportSecondUnit")
 	IsReview := this.GetString("IsReview")
+	Year := this.GetString("Year")
 
 	if Id != "" {
 		where = where + " and a.Id like '%" + Id + "%'"
 	}
 
+	paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
+	ContractClass := paramSvc.GetBaseparameterMessage("GFGL_CONTRACT", "paramset", "listShowType")
 	if ContractClass != "" {
-		where = where + " and a.ContractClass='" + ContractClass + "' "
+		where = where + "and a.ContractClass in (" + strings.ReplaceAll(strings.ReplaceAll(strings.ReplaceAll(ContractClass, "服务商", "'03'"), "承包商", "'02'"), "供应商", "'01'") + ")"
+	}
+
+	if Year != "" {
+		where = where + " and a.CreateOn like '" + Year + "%'"
 	}
 
 	if SecondUnit != "" {
@@ -1871,6 +1878,19 @@ func (this *OilContractController) YearList() {
 	this.ServeJSON()
 }
 
+// @Title 获取年份下拉
+// @Description
+// @Success 200 {object} ErrorInfo
+// @Failure 403 :id 为空
+// @router /yearListSelect [get]
+func (this *OilContractController) YearListSelect() {
+	var model []contract.YearList
+	sql := `select DATE_FORMAT(CreateOn, '%Y') as year from OilContract group by DATE_FORMAT(CreateOn, '%Y') order by DATE_FORMAT(CreateOn, '%Y') desc`
+	utils.DBE.Sql(sql).Find(&model)
+	this.Data["json"] = &model
+	this.ServeJSON()
+}
+
 // @Title 获取列表
 // @Description get user by token
 // @Success 200 {object} []oilcontract.OilContract

src/dashoo.cn/backend/api/controllers/oilcontract/contractReview.go

@@ -6,6 +6,7 @@ import (
 	"dashoo.cn/backend/api/business/oilcontract/contractEvaluationItems"
 	"dashoo.cn/backend/api/business/oilsupplier/supplier"
 	"dashoo.cn/backend/api/business/organize"
+	baseparameter "dashoo.cn/business2/parameter"
 	"dashoo.cn/business2/permission"
 	"log"
 	"sync"
@@ -275,6 +276,30 @@ func (this *OilContractReviewController) AddEntity() {
 		}
 	}()
 
+	// 参数表,该类型是否可以创建评价
+	var con contract.OilContract
+	conSvc := supplier.GetOilSupplierService(utils.DBE)
+	conSvc.GetEntityById(modeVO.ContractId, &con)
+	if con.Id == 0{
+		panic("找不到合同")
+	}
+
+	paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
+	ContractClass := paramSvc.GetBaseparameterMessage("GFGL_CONTRACT", "paramset", "isStartEva")
+	if ContractClass == "" {
+		panic("此类型合同不允许创建评价")
+	}
+
+	if con.ContractClass == "01" && !strings.Contains(ContractClass, "供应商") {
+		panic("此类型合同不允许创建评价")
+	}
+	if con.ContractClass == "02" && !strings.Contains(ContractClass, "承包商") {
+		panic("此类型合同不允许创建评价")
+	}
+	if con.ContractClass == "03" && !strings.Contains(ContractClass, "服务商") {
+		panic("此类型合同不允许创建评价")
+	}
+
 	svc := contractReview.GetOilContractReviewService(utils.DBE)
 	itemSvc := contractEvaluationItems.GetOilContractEvaluationItemsService(utils.DBE)
 	reviewMode.IsFinal = modeVO.IsFinal

src/dashoo.cn/backend/api/controllers/oilcontract/contractSumScore.go

@@ -3,6 +3,7 @@ package oilcontract
 import (
 	"dashoo.cn/backend/api/business/oilcontract/contract"
 	"dashoo.cn/backend/api/business/oilcontract/contractSumScoreItems"
+	"dashoo.cn/backend/api/business/oilcontract/evaluationItems"
 	"dashoo.cn/backend/api/business/oilsupplier/supplier"
 	baseparameter "dashoo.cn/business/parameter"
 	"dashoo.cn/business2/permission"
@@ -243,6 +244,25 @@ func (this *OilContractSumScoreController) GetComputeEntityList() {
 	this.ServeJSON()
 }
 
+
+// @Title 获取核算列表-表头-根据年份
+// @Description get user by token
+// @Success 200 {object} []contractSumScore.OilContractSumScore
+// @router /compute-list-header [get]
+func (this *OilContractSumScoreController) GetComputeHeaderEntityList() {
+	var model []evaluationItems.OilEvaluationItems
+	Year := this.GetString("Year")
+	ContractClass := this.GetString("ContractClass")
+	sql := `select a.NormalScore, a.Content from OilContractEvaluationItems a
+			left join OilContractReview b on a.ContentReviewId = b.Id
+			left join OilContract c on b.ContractId = c.Id
+			where a.ModifiedOn like '` + Year + `%' and a.ParentId = 0 and c.ContractClass = '` + ContractClass + `'
+			group by a.NormalScore, a.Content`
+	utils.DBE.Sql(sql).Find(&model)
+	this.Data["json"] = &model
+	this.ServeJSON()
+}
+
 // @Title 获取核算实体
 // @Description get user by token
 // @Success 200 {object} []contractSumScore.OilContractSumScore

src/dashoo.cn/backend/api/controllers/setting/paramset.go

@@ -33,7 +33,8 @@ type ParamModel struct {
 	ParameterId string  `json:"parameterId"`
 	YearEvaGood float64 `json:"yearEvaGood"`
 	YearEvaPass float64 `json:"yearEvaPass"`
-	IsStartEva  bool    `json:"isStartEva"`
+	IsStartEva  string    `json:"isStartEva"`
+	ListShowType  string    `json:"listShowType"`
 }
 
 // @Title 保存参数设置
@@ -205,17 +206,15 @@ func (this *ParamSetController) ContractParamSetPost() {
 	paramEntity.Createuserid, _ = utils.StrTo(this.User.Id).Int()
 	paramEntity.Createby = this.User.Realname
 
-	var sisStartEva string
-	if model.IsStartEva {
-		sisStartEva = "true"
-	} else {
-		sisStartEva = "false"
-	}
 	paramEntity.Parametercode = "isStartEva"
-	paramEntity.Parametercontent = sisStartEva
+	paramEntity.Parametercontent = model.IsStartEva
 	paramEntityList = append(paramEntityList, paramEntity)
 	// 每次新增变量参数时在这处理后继续添加即可
 
+	paramEntity.Parametercode = "listShowType"
+	paramEntity.Parametercontent = model.ListShowType
+	paramEntityList = append(paramEntityList, paramEntity)
+
 	paramEntity.Parametercode = "yearEvaGood"
 	paramEntity.Parametercontent = strconv.FormatFloat(model.YearEvaGood, 'f', 2, 64)
 	paramEntityList = append(paramEntityList, paramEntity)

src/dashoo.cn/frontend_web/src/api/oilcontract/contract.js

@@ -234,12 +234,20 @@ export default {
       method: 'get'
     })
   },
+  // 获取跨年记录
   yearList (id, myAxios) {
     return myAxios({
       url: `/contract/yearList/${id}`,
       method: 'get'
     })
   },
+  // 获取年份下拉
+  yearListSelect (myAxios) {
+    return myAxios({
+      url: `/contract/yearListSelect`,
+      method: 'get'
+    })
+  },
   getNeedEvaList (myAxios) {
     return myAxios({
       url: '/contract/need-eva-list',

src/dashoo.cn/frontend_web/src/api/oilcontract/contractSumScore.js

@@ -6,6 +6,14 @@ export default {
       params: params
     })
   },
+  // 按照年份获取表头
+  computeListHeader (params, myAxios) {
+    return myAxios({
+      url: '/contract-score/compute-list-header',
+      method: 'GET',
+      params: params
+    })
+  },
   //年度评价详情
   computeEntity (entityId,params, myAxios) { //  计算列表
     return myAxios({

src/dashoo.cn/frontend_web/src/components/oilcontract/contractSelect.vue

@@ -55,9 +55,9 @@
                   <el-col :span="8">
                     <el-form-item label="合同状态">
                       <el-select :disabled="disabled"  v-model="contractData.Status" placeholder="请选择" style="width: 100%">
-                        <el-option label="未履行" :value="1" key="01"></el-option>
-                        <el-option label="履行中" :value="2" key="02"></el-option>
                         <el-option label="履行完毕" :value="3" key="03"></el-option>
+                        <el-option label="未履行完毕" :value="2" key="02"></el-option>
+                        <el-option label="未履行" :value="1" key="01"></el-option>
                       </el-select>
                     </el-form-item>
                   </el-col>
@@ -76,25 +76,25 @@
                                 style="width: 100%"></el-input>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="报审序号">
-                      <el-input readonly v-model="contractData.Number" placeholder="请输入" style="width: 100%"></el-input>
-                    </el-form-item>
-                  </el-col>
+<!--                  <el-col :span="8">-->
+<!--                    <el-form-item label="报审序号">-->
+<!--                      <el-input readonly v-model="contractData.Number" placeholder="请输入" style="width: 100%"></el-input>-->
+<!--                    </el-form-item>-->
+<!--                  </el-col>-->
                 </el-row>
                 <el-row>
 
-                  <el-col :span="8">
-                    <el-form-item label="签订日期">
-                      <el-date-picker
-                        style="width: 100%"
-                        v-model="contractData.SignedDate"
-                        type="date"
-                        readonly
-                        placeholder="选择日期">
-                      </el-date-picker>
-                    </el-form-item>
-                  </el-col>
+<!--                  <el-col :span="8">-->
+<!--                    <el-form-item label="签订日期">-->
+<!--                      <el-date-picker-->
+<!--                        style="width: 100%"-->
+<!--                        v-model="contractData.SignedDate"-->
+<!--                        type="date"-->
+<!--                        readonly-->
+<!--                        placeholder="选择日期">-->
+<!--                      </el-date-picker>-->
+<!--                    </el-form-item>-->
+<!--                  </el-col>-->
                   <el-col :span="8">
                     <el-form-item label="履行期限(始)">
                       <el-date-picker
@@ -354,9 +354,9 @@
                   <el-col :span="8">
                     <el-form-item label="合同状态">
                       <el-select :disabled="disabled"  v-model="contractData.Status" placeholder="请选择" style="width: 100%">
-                        <el-option label="未履行" :value="1" key="01"></el-option>
-                        <el-option label="履行中" :value="2" key="02"></el-option>
                         <el-option label="履行完毕" :value="3" key="03"></el-option>
+                        <el-option label="未履行完毕" :value="2" key="02"></el-option>
+                        <el-option label="未履行" :value="1" key="01"></el-option>
                       </el-select>
                     </el-form-item>
                   </el-col>
@@ -375,25 +375,25 @@
                                 style="width: 100%"></el-input>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="报审序号">
-                      <el-input readonly v-model="contractData.Number" placeholder="请输入" style="width: 100%"></el-input>
-                    </el-form-item>
-                  </el-col>
+<!--                  <el-col :span="8">-->
+<!--                    <el-form-item label="报审序号">-->
+<!--                      <el-input readonly v-model="contractData.Number" placeholder="请输入" style="width: 100%"></el-input>-->
+<!--                    </el-form-item>-->
+<!--                  </el-col>-->
                 </el-row>
                 <el-row>
 
-                  <el-col :span="8">
-                    <el-form-item label="签订日期">
-                      <el-date-picker
-                        style="width: 100%"
-                        v-model="contractData.SignedDate"
-                        type="date"
-                        readonly
-                        placeholder="选择日期">
-                      </el-date-picker>
-                    </el-form-item>
-                  </el-col>
+<!--                  <el-col :span="8">-->
+<!--                    <el-form-item label="签订日期">-->
+<!--                      <el-date-picker-->
+<!--                        style="width: 100%"-->
+<!--                        v-model="contractData.SignedDate"-->
+<!--                        type="date"-->
+<!--                        readonly-->
+<!--                        placeholder="选择日期">-->
+<!--                      </el-date-picker>-->
+<!--                    </el-form-item>-->
+<!--                  </el-col>-->
                   <el-col :span="8">
                     <el-form-item label="履行期限(始)">
                       <el-date-picker
@@ -721,9 +721,9 @@
                   <el-col :span="8">
                     <el-form-item label="合同状态">
                       <el-select :disabled="disabled"  v-model="contractData.Status" placeholder="请选择" style="width: 100%">
-                        <el-option label="未履行" :value="1" key="01"></el-option>
-                        <el-option label="履行中" :value="2" key="02"></el-option>
                         <el-option label="履行完毕" :value="3" key="03"></el-option>
+                        <el-option label="未履行完毕" :value="2" key="02"></el-option>
+                        <el-option label="未履行" :value="1" key="01"></el-option>
                       </el-select>
                     </el-form-item>
                   </el-col>
@@ -742,25 +742,25 @@
                                 style="width: 100%"></el-input>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="报审序号">
-                      <el-input readonly v-model="contractData.Number" placeholder="请输入" style="width: 100%"></el-input>
-                    </el-form-item>
-                  </el-col>
+<!--                  <el-col :span="8">-->
+<!--                    <el-form-item label="报审序号">-->
+<!--                      <el-input readonly v-model="contractData.Number" placeholder="请输入" style="width: 100%"></el-input>-->
+<!--                    </el-form-item>-->
+<!--                  </el-col>-->
                 </el-row>
                 <el-row>
 
-                  <el-col :span="8">
-                    <el-form-item label="签订日期">
-                      <el-date-picker
-                        style="width: 100%"
-                        v-model="contractData.SignedDate"
-                        type="date"
-                        readonly
-                        placeholder="选择日期">
-                      </el-date-picker>
-                    </el-form-item>
-                  </el-col>
+<!--                  <el-col :span="8">-->
+<!--                    <el-form-item label="签订日期">-->
+<!--                      <el-date-picker-->
+<!--                        style="width: 100%"-->
+<!--                        v-model="contractData.SignedDate"-->
+<!--                        type="date"-->
+<!--                        readonly-->
+<!--                        placeholder="选择日期">-->
+<!--                      </el-date-picker>-->
+<!--                    </el-form-item>-->
+<!--                  </el-col>-->
                   <el-col :span="8">
                     <el-form-item label="履行期限(始)">
                       <el-date-picker

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

@@ -93,9 +93,9 @@
                 <el-col :span="8">
                   <el-form-item label="合同状态">
                     <el-select disabled v-model="contractData.Status" placeholder="请选择" style="width: 100%">
-                      <el-option label="未履行" :value="1" key="01"></el-option>
-                      <el-option label="履行中" :value="2" key="02"></el-option>
                       <el-option label="履行完毕" :value="3" key="03"></el-option>
+                      <el-option label="未履行完毕" :value="2" key="02"></el-option>
+                      <el-option label="未履行" :value="1" key="01"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
@@ -114,24 +114,24 @@
                               style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8">
-                  <el-form-item label="报审序号">
-                    <el-input readonly v-model="contractData.Number" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
+<!--                <el-col :span="8">-->
+<!--                  <el-form-item label="报审序号">-->
+<!--                    <el-input readonly v-model="contractData.Number" placeholder="请输入" style="width: 100%"></el-input>-->
+<!--                  </el-form-item>-->
+<!--                </el-col>-->
               </el-row>
               <el-row>
-                <el-col :span="8">
-                  <el-form-item label="签订日期">
-                    <el-date-picker
-                      style="width: 100%"
-                      v-model="contractData.SignedDate"
-                      type="date"
-                      readonly
-                      placeholder="选择日期">
-                    </el-date-picker>
-                  </el-form-item>
-                </el-col>
+<!--                <el-col :span="8">-->
+<!--                  <el-form-item label="签订日期">-->
+<!--                    <el-date-picker-->
+<!--                      style="width: 100%"-->
+<!--                      v-model="contractData.SignedDate"-->
+<!--                      type="date"-->
+<!--                      readonly-->
+<!--                      placeholder="选择日期">-->
+<!--                    </el-date-picker>-->
+<!--                  </el-form-item>-->
+<!--                </el-col>-->
                 <el-col :span="8">
                   <el-form-item label="履行期限(始)">
                     <el-date-picker

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

@@ -47,8 +47,7 @@
             </el-select>
           </el-form-item>
           <el-form-item>
-            <el-select size="mini" style="width:100px" v-model="searchForm.Year" placeholder="年度">
-              <el-option label="全部年度" value=""></el-option>
+            <el-select size="mini" style="width:100px" v-model="searchForm.Year" placeholder="年度" clearable>
               <el-option v-for="(item, index) in yearList" :key="index" :label="item" :value="item" style="width: 100%"></el-option>
             </el-select>
           </el-form-item>
@@ -174,9 +173,9 @@
             <el-form-item label="履行状态">
               <el-select size="mini" v-model="searchForm.PerformStatus" placeholder="请选择" style="width: 100%" 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-option label="未履行完毕" :value="2" key="03"></el-option>
+                <el-option label="未履行" :value="1" key="02"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -291,7 +290,7 @@ export default {
               return '未履行'
               break
             case 2:
-              return '履行中'
+              return '未履行完毕'
               break
             case 3:
               return '履行完毕'
@@ -411,7 +410,7 @@ export default {
         ModifiedUserId: '',
         ModifiedBy: '',
         Status: '',
-        Year: ''
+        Year: new Date().getFullYear()
       },
       tableColumns: [
 

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

@@ -32,7 +32,6 @@
           </el-form-item>
           <el-form-item label="年度">
             <el-select size="mini" style="width:90px" v-model="searchForm.Year" placeholder="年度">
-              <el-option label="全部" value=""></el-option>
               <el-option v-for="(item, index) in yearList" :key="index" :label="item" :value="item" style="width: 100%"></el-option>
             </el-select>
           </el-form-item>
@@ -73,11 +72,11 @@
         <!--  </template>-->
         <!--</el-table-column>-->
         <el-table-column 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>
-          <el-table-column sortable show-overflow-tooltip prop="Score3" align="center" header-align="center" label="服务能力(20分)" width="140"></el-table-column>
-          <el-table-column sortable show-overflow-tooltip prop="Score4" align="center" header-align="center" label="诚信经营(15分)" width="140"></el-table-column>
-          <el-table-column sortable show-overflow-tooltip prop="Score5" align="center" header-align="center" label="合同履约(15分)" width="140"></el-table-column>
+          <el-table-column sortable show-overflow-tooltip align="center" header-align="center" width="160" v-for="(item, index) of oneList" :label="item.Content + '(' + item.NormalScore + '分)'" :key="index">
+            <template slot-scope="scope">
+              <span>{{ getScore(scope.row, index) }}</span>
+            </template>
+          </el-table-column>
         </el-table-column>
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
@@ -203,6 +202,7 @@
     data() {
       return {
         yearList: [],
+        oneList: [],
         tableLoading: false,
         dialogVisible: false,
         excelLoading: false,
@@ -234,63 +234,14 @@
           Score3: "",
           Score4: "",
           Score5: "",
-          Year: '',
+          Year: new Date().getFullYear(),
           Remark: ''
-        },
-        tableColumns: [
-
-          {
-            prop: "SupplierName",
-            label: '供应商名称',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ContractNo",
-            label: '评价得分',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ProjectPlace",
-            label: '项目管理(40分)',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ProjectOwner",
-            label: 'HSE管理(30分)',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Telephone",
-            label: '合同履行(15分)',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ProjectType",
-            label: '企业诚信(15分)',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ContractMode",
-            label: '评价结果',
-            width: 100,
-            sort: true
-          }],
+        }
 
       }
     },
     created() {
+      this.computeListHeader()
       this.getYearList()
       //查询条件初始值备份
       Object.assign(this.searchFormReset, this.searchForm);
@@ -300,11 +251,61 @@
       this.permissionIsauth()
     },
     methods: {
+      getScore (row, index) {
+        switch(index){
+          case 0:
+            return row.Score1
+            break;
+          case 1:
+            return row.Score2
+            break;
+          case 2:
+            return row.Score3
+            break;
+          case 3:
+            return row.Score4
+            break;
+          case 4:
+            return row.Score5
+            break;
+          case 5:
+            return row.Score6
+            break;
+          case 6:
+            return row.Score7
+            break;
+          case 7:
+            return row.Score8
+            break;
+          case 8:
+            return row.Score9
+            break;
+          default:
+            return '--'
+        }
+      },
       getYearList () {
         let now = new Date()
         let nowYear = now.getFullYear()
         this.yearList = [nowYear, nowYear - 1]
       },
+      // 获取表头
+      computeListHeader () {
+        const params = {
+          Year: this.searchForm.Year,
+          ContractClass: '01'
+        }
+        api.computeListHeader(params, this.$axios).then(res => {
+          console.log('获取表头', res)
+          if (res.data != null) {
+            this.oneList = res.data
+          } else {
+            this.oneList = []
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       // 判断权限
       permissionIsauth(){
         var data = {
@@ -387,6 +388,7 @@
         this.initDatas()
       },
       handleSearch() {
+        this.computeListHeader()
         this.currentPage = 1;
         this.dialogVisible = false;
         this.initDatas();

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

@@ -92,9 +92,9 @@
                 <el-col :span="8">
                   <el-form-item label="合同状态">
                     <el-select disabled v-model="contractData.Status" placeholder="请选择" style="width: 100%">
-                      <el-option label="未履行" :value="1" key="01"></el-option>
-                      <el-option label="履行中" :value="2" key="02"></el-option>
                       <el-option label="履行完毕" :value="3" key="03"></el-option>
+                      <el-option label="未履行完毕" :value="2" key="02"></el-option>
+                      <el-option label="未履行" :value="1" key="01"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
@@ -113,24 +113,24 @@
                               style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8">
-                  <el-form-item label="报审序号">
-                    <el-input readonly v-model="contractData.Number" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
+<!--                <el-col :span="8">-->
+<!--                  <el-form-item label="报审序号">-->
+<!--                    <el-input readonly v-model="contractData.Number" placeholder="请输入" style="width: 100%"></el-input>-->
+<!--                  </el-form-item>-->
+<!--                </el-col>-->
               </el-row>
               <el-row>
-                <el-col :span="8">
-                  <el-form-item label="签订日期">
-                    <el-date-picker
-                      style="width: 100%"
-                      v-model="contractData.SignedDate"
-                      type="date"
-                      readonly
-                      placeholder="选择日期">
-                    </el-date-picker>
-                  </el-form-item>
-                </el-col>
+<!--                <el-col :span="8">-->
+<!--                  <el-form-item label="签订日期">-->
+<!--                    <el-date-picker-->
+<!--                      style="width: 100%"-->
+<!--                      v-model="contractData.SignedDate"-->
+<!--                      type="date"-->
+<!--                      readonly-->
+<!--                      placeholder="选择日期">-->
+<!--                    </el-date-picker>-->
+<!--                  </el-form-item>-->
+<!--                </el-col>-->
                 <el-col :span="8">
                   <el-form-item label="履行期限(始)">
                     <el-date-picker

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

@@ -176,10 +176,10 @@
           <el-col :span="12">
             <el-form-item label="履行状态">
               <el-select size="mini" v-model="searchForm.PerformStatus" placeholder="请选择" style="width: 100%" 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="" key=""></el-option>
                 <el-option label="履行完毕" :value="3" key="04"></el-option>
+                <el-option label="未履行完毕" :value="2" key="03"></el-option>
+                <el-option label="未履行" :value="1" key="02"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -290,7 +290,7 @@ export default {
               return '未履行'
               break
             case 2:
-              return '履行中'
+              return '未履行完毕'
               break
             case 3:
               return '履行完毕'

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

@@ -115,46 +115,6 @@
 <!--              </el-select>-->
 <!--            </el-form-item>-->
 <!--          </el-col>-->
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="合同状态" prop="Status">
-              <el-select v-model="formData.Status" placeholder="请选择" style="width: 100%" @change="statusChange()">
-                <el-option label="未履行" :value="1" key="01"></el-option>
-                <el-option label="履行中" :value="2" key="02"></el-option>
-                <el-option label="履行完毕" :value="3" key="03"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="签订日期" prop="SignedDate">
-              <el-date-picker
-                v-model="formData.SignedDate"
-                type="date"
-                placeholder="选择日期">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="报审序号" prop="Number">
-              <el-input v-model="formData.Number" placeholder="请输入" style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="合同模式" prop="ContractMode">-->
-<!--              <el-input v-model="formData.ContractMode" placeholder="请输入" style="width: 100%"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="是否分包" prop="SubPackage">-->
-<!--              <el-select placeholder="请选择" v-model="formData.SubPackage" style="width: 100%">-->
-<!--                <el-option :key="1" label="是" :value="1"></el-option>-->
-<!--                <el-option :key="0" label="否" :value="0"></el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-
-
         </el-row>
         <el-row>
           <el-col :span="8">
@@ -185,6 +145,46 @@
           </el-col>
         </el-row>
         <el-row>
+          <el-col :span="8">
+            <el-form-item label="合同状态" prop="Status">
+              <el-select v-model="formData.Status" placeholder="请选择" style="width: 100%" @change="statusChange()">
+                <el-option label="履行完毕" :value="3" key="03"></el-option>
+                <el-option label="未履行完毕" :value="2" key="02"></el-option>
+                <el-option label="未履行" :value="1" key="01"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <!--          <el-col :span="8">-->
+          <!--            <el-form-item label="签订日期" prop="SignedDate">-->
+          <!--              <el-date-picker-->
+          <!--                v-model="formData.SignedDate"-->
+          <!--                type="date"-->
+          <!--                placeholder="选择日期">-->
+          <!--              </el-date-picker>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col :span="8">-->
+          <!--            <el-form-item label="报审序号" prop="Number">-->
+          <!--              <el-input v-model="formData.Number" placeholder="请输入" style="width: 100%"></el-input>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col :span="8">-->
+          <!--            <el-form-item label="合同模式" prop="ContractMode">-->
+          <!--              <el-input v-model="formData.ContractMode" placeholder="请输入" style="width: 100%"></el-input>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col :span="8">-->
+          <!--            <el-form-item label="是否分包" prop="SubPackage">-->
+          <!--              <el-select placeholder="请选择" v-model="formData.SubPackage" style="width: 100%">-->
+          <!--                <el-option :key="1" label="是" :value="1"></el-option>-->
+          <!--                <el-option :key="0" label="否" :value="0"></el-option>-->
+          <!--              </el-select>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+
+
+        </el-row>
+        <el-row>
 <!--          <el-col :span="8">-->
 <!--            <el-form-item label="用章名称" prop="SealName">-->
 <!--              <el-input v-model="formData.SealName" placeholder="请输入" style="width: 100%"></el-input>-->
@@ -461,15 +461,6 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="跨年至" prop="YearDate">-->
-<!--              <el-date-picker-->
-<!--                v-model="formData.YearDate"-->
-<!--                type="date"-->
-<!--                placeholder="选择日期">-->
-<!--              </el-date-picker>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
         </el-row>
           <el-table
             :data="yearTable"
@@ -879,7 +870,7 @@ export default {
       this.initDatas()
       this.successBoolean = true
     } else {
-      this.formData.Year = (myDate.getFullYear() - 1) + ''
+      this.$set(this.formData, 'Year', (myDate.getFullYear() - 1) + '')
       this.formData.Id = 0
     }
     this.statusChange()
@@ -893,11 +884,13 @@ export default {
         this.formData.IsYear = 0
       }
       let myDate = new Date()
-      console.log(myDate.getFullYear(), 'myDate.getFullYear()')
+      console.log(myDate.getFullYear(), this.formData.Status, 'myDate.getFullYear()')
       if (this.formData.Status === 2 || this.formData.Status === 3) {
-        this.formData.Year = myDate.getFullYear() + ''
+        this.$set(this.formData, 'Year', myDate.getFullYear() + '')
+        // this.formData.Year = myDate.getFullYear() + ''
       } else {
-        this.formData.Year = (myDate.getFullYear() - 1) + ''
+        this.$set(this.formData, 'Year', (myDate.getFullYear() - 1) + '')
+        // this.formData.Year = (myDate.getFullYear() - 1) + ''
       }
     },
     getAuditPermForProf () {
@@ -1030,7 +1023,6 @@ export default {
           this.formData = res.data
           this.statusChange()
           // let myDate = new Date()
-          // this.formData.Year = (myDate.getFullYear() - 1) + ''
           if (this.formData.SupplierId == 0) {
             this.formData.SupplierId = ''
           }

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

@@ -21,6 +21,11 @@
           <!-- <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">分发给二级单位评价</el-button> -->
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+          <el-form-item>
+            <el-select size="mini" style="width:100px" v-model="searchForm.Year" placeholder="年度" clearable>
+              <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>
             <el-select filterable size="mini" v-model="searchForm.SecondUnit" placeholder="请选择项目建设单位" style="width: 100%" clearable>
               <el-option v-for="item in secondUnitOptions" :key="item.Id" :label="item.Fullname" :value="item.Id"
@@ -40,10 +45,10 @@
           </el-form-item>
           <el-form-item >
             <el-select size="mini" v-model="searchForm.Status" placeholder="请选择履行状态" style="width: 120px" 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-option label="全部履行状态" value="" key=""></el-option>
+              <el-option label="履行完毕" :value="3" key="03"></el-option>
+              <el-option label="未履行完毕" :value="2" key="02"></el-option>
+              <el-option label="未履行" :value="1" key="01"></el-option>
             </el-select>
           </el-form-item>
 <!--          <el-form-item label="结算状态" style="width: 180px">-->
@@ -53,14 +58,14 @@
 <!--              <el-option label="阶段性结算" value="2" key="03"></el-option>-->
 <!--            </el-select>-->
 <!--          </el-form-item>-->
-          <el-form-item>
-            <el-select size="mini" v-model="searchForm.ContractClass" placeholder="请选择企业类别" style="width:120px" clearable>
-              <el-option label="全部企业类别" value="" key="01"></el-option>
-              <el-option label="供应商" value="01" key="02"></el-option>
-              <el-option label="承包商" value="02" key="03"></el-option>
-              <el-option label="服务商" value="03" key="04"></el-option>
-            </el-select>
-          </el-form-item>
+<!--          <el-form-item>-->
+<!--            <el-select size="mini" v-model="searchForm.ContractClass" placeholder="请选择企业类别" style="width:120px" clearable>-->
+<!--              <el-option label="全部企业类别" value="" key="01"></el-option>-->
+<!--              <el-option label="供应商" value="01" key="02"></el-option>-->
+<!--              <el-option label="承包商" value="02" key="03"></el-option>-->
+<!--              <el-option label="服务商" value="03" key="04"></el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
 <!--          <el-form-item label="创建时间">-->
 <!--            <el-date-picker size="mini" style="width: 180px" v-model="CreateOn" type="daterange" range-separator="至"-->
 <!--                            start-placeholder="开始" end-placeholder="结束"></el-date-picker>-->
@@ -151,7 +156,8 @@
               </el-select>
             </el-form-item>
           </el-col>
-
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="合同名称">
               <el-input size="mini" v-model="searchForm.ContractName" style="width:100%" placeholder="请输入" clearable></el-input>
@@ -163,7 +169,8 @@
               <el-input size="mini" v-model="searchForm.ContractNo" style="width:100%" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
-
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="合同类别">
               <el-input size="mini" v-model="searchForm.ClassName" style="width:100%" placeholder="请输入" clearable></el-input>
@@ -173,24 +180,25 @@
           <el-col :span="12">
             <el-form-item label="履行状态">
               <el-select size="mini" v-model="searchForm.Status" placeholder="请选择" style="width: 100%" 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="" key=""></el-option>
                 <el-option label="履行完毕" :value="3" key="04"></el-option>
+                <el-option label="未履行完毕" :value="2" key="03"></el-option>
+                <el-option label="未履行" :value="1" key="02"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="企业类别">
-              <el-select size="mini" v-model="searchForm.ContractClass" placeholder="请选择" style="width: 100%" clearable>
-                <el-option label="全部" value="" key="01"></el-option>
-                <el-option label="供应商" value="01" key="02"></el-option>
-                <el-option label="承包商" value="02" key="03"></el-option>
-                <el-option label="服务商" value="03" key="04"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+        </el-row>
+        <el-row>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="企业类别">-->
+<!--              <el-select size="mini" v-model="searchForm.ContractClass" placeholder="请选择" style="width: 100%" clearable>-->
+<!--                <el-option label="全部" value="" key="01"></el-option>-->
+<!--                <el-option label="供应商" value="01" key="02"></el-option>-->
+<!--                <el-option label="承包商" value="02" key="03"></el-option>-->
+<!--                <el-option label="服务商" value="03" key="04"></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
 <!--          <el-col :span="12">-->
 <!--            <el-form-item label="工程地点">-->
@@ -229,6 +237,8 @@
 <!--              <el-input size="mini" v-model="searchForm.ContractPeriod" style="width:100%" placeholder="请输入" clearable></el-input>-->
 <!--            </el-form-item>-->
 <!--          </el-col>-->
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="履行时间">
               <el-date-picker size="mini" v-model="CreateOn1" type="daterange" style="width:100%" range-separator="至"
@@ -353,9 +363,9 @@
         </el-form-item>
         <el-form-item label="">
                   <el-select size="mini" v-model="searchForm.Status" placeholder="请选择履行状态" style="width: 100%" clearable>
-                    <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-option label="履行完毕" :value="3" key="03"></el-option>
+                    <el-option label="未履行完毕" :value="2" key="02"></el-option>
+                    <el-option label="未履行" :value="1" key="01"></el-option>
                   </el-select>
                 </el-form-item>
         <!--        <el-form-item label="结算状态" style="width: 180px">-->
@@ -451,11 +461,11 @@
           <el-table-column  prop="ProjectOwner"  min-width="110" label="项目负责人" align="center" show-overflow-tooltip></el-table-column>
           <!--           <el-table-column  prop="ContractSonClass"  min-width="110" label="合同子类" align="center" show-overflow-tooltip></el-table-column>-->
           <!--           <el-table-column  prop="SmallClass"  min-width="110" label="相应小类" align="center" show-overflow-tooltip></el-table-column>-->
-          <el-table-column  prop="SignedDate"  min-width="110" label="签订日期" align="center" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ jstimehandle(scope.row.SignedDate+'') }}
-            </template>
-          </el-table-column>
+<!--          <el-table-column  prop="SignedDate"  min-width="110" label="签订日期" align="center" show-overflow-tooltip>-->
+<!--            <template slot-scope="scope">-->
+<!--              {{ jstimehandle(scope.row.SignedDate+'') }}-->
+<!--            </template>-->
+<!--          </el-table-column>-->
           <!--           <el-table-column  prop="People"  min-width="110" label="相对人" align="center" show-overflow-tooltip></el-table-column>-->
           <!--           <el-table-column  prop="ChooseWay"  min-width="110" label="选商方式" align="center" show-overflow-tooltip></el-table-column>-->
           <!--           <el-table-column  prop="BudgetAmount"  min-width="110" label="预算金额" align="center" show-overflow-tooltip></el-table-column>-->
@@ -472,14 +482,14 @@
               {{ jstimehandle(scope.row.EndDate+'') }}
             </template>
           </el-table-column>
-          <el-table-column  prop="Number"  min-width="110" label="报审序号" align="center" show-overflow-tooltip></el-table-column>
+<!--          <el-table-column  prop="Number"  min-width="110" label="报审序号" align="center" show-overflow-tooltip></el-table-column>-->
           <el-table-column  prop="Status"  min-width="120" label="履行状态" align="center" show-overflow-tooltip >
             <template slot-scope="scope">
               <el-form-item  style="margin-bottom: 0px;" :prop="'tableData.' + scope.$index + '.Status'" :rules="rules.Status">
                 <el-select size="mini" v-model="scope.row.Status" placeholder="请选择" style="width: 100%" @change="allUpdate(scope.row.Status,'','Status',scope.row.Id, scope.row.SupplierId)">
-                  <el-option label="未履行" :value="1" key="01"></el-option>
-                  <el-option label="履行中" :value="2" key="02"></el-option>
                   <el-option label="履行完毕" :value="3" key="03"></el-option>
+                  <el-option label="未履行完毕" :value="2" key="02"></el-option>
+                  <el-option label="未履行" :value="1" key="01"></el-option>
                 </el-select>
               </el-form-item>
             </template>
@@ -594,7 +604,7 @@
                 return '未履行'
                 break
               case 2:
-                return '履行中'
+                return '未履行完毕'
                 break
               case 3:
                 return '履行完毕'
@@ -695,6 +705,7 @@
         },
         ContractSelectName: '',
         options: [],
+        yearList: [],
         secondUnitOptions: [],
         SupplierNameData1: [],
         SupplierNameData2: [],
@@ -738,6 +749,7 @@
         searchForm: {
           Id: '',
           SupplierId: '',
+          Year: '',
           IsReview: '2',
           SecondUnit: '',
           ContractClass: '',
@@ -1057,7 +1069,7 @@
       // 查询条件初始值备份
       Object.assign(this.searchFormReset, this.searchForm)
       // 查询列表
-      this.initDatas()
+      this.yearListSelect()
       // this.getDictOptions()
       // 状态判断
       this.statusFun()
@@ -1114,6 +1126,19 @@
           this.initDatas1()
         })
       },
+      yearListSelect () {
+        api.yearListSelect(this.$axios).then(res => {
+          if (res.data.length > 0) {
+            for (const i in res.data) {
+              if (res.data[i].year !== "") {
+                this.yearList.push(res.data[i].year)
+              }
+            }
+            this.searchForm.Year = this.yearList[0]
+          }
+          this.initDatas()
+        })
+      },
       uploadTrueClick () {
         api.saveImportExcel(this.$axios).then(res => {
           if (res.data.code == 0) {
@@ -1297,27 +1322,59 @@
         // <el-option label="承包商" value="02" key="02"></el-option>
         // <el-option label="服务商" value="03" key="03"></el-option>
         var index = String(item.ContractClass)
-        var name = ''
-        switch (index) {
-          case '01':
-            name = 'contract-goods'
-            break
-          case '02':
-            name = 'contract-basis'
-            break
-          case '03':
-            name = 'contract-service'
-            break
+        // 查询接口参数表,看是否允许创建评价
+        const params = {
+          categoryId: 'GFGL_CONTRACT',
+          parameterId: 'paramset'
         }
-        console.log('跳转', item)
-        this.$router.push({
-          path: '/oilcontract/' + name + '/add/evaluate',
-          query: {
-            ContractId: item.Id,
-            // type:1,
-            byBus: !this.checkBtnForSec && this.checkBtnForBus ? 1 : 0
-          }
-        })
+        this.$axios.get('paramset/param-list', { params }).then(res => {
+            if (res.data && res.data.length > 0) {
+              for (var i = 0; i < res.data.length; i++) {
+                if (res.data[i].Parametercode === 'isStartEva') {
+                  if (res.data[i].Parametercontent !== '') {
+                    var name = ''
+                    switch (index) {
+                      case '01':
+                        if (res.data[i].Parametercontent.indexOf("供应商") > -1) {
+                          name = 'contract-goods'
+                        }
+                        break
+                      case '02':
+                        if (res.data[i].Parametercontent.indexOf("承包商") > -1) {
+                          name = 'contract-basis'
+                        }
+                        break
+                      case '03':
+                        if (res.data[i].Parametercontent.indexOf("服务商") > -1) {
+                          name = 'contract-service'
+                        }
+                        break
+                    }
+                    console.log('跳转', item)
+                    if (name !== '') {
+                      this.$router.push({
+                        path: '/oilcontract/' + name + '/add/evaluate',
+                        query: {
+                          ContractId: item.Id,
+                          // type:1,
+                          byBus: !this.checkBtnForSec && this.checkBtnForBus ? 1 : 0
+                        }
+                      })
+                    } else {
+                      this.$message({duration: 10000, type: 'warning', message: '当前合同类别不能创建评价'})
+                    }
+                  } else {
+                    this.$message({
+                      duration: 10000,
+                      type: 'warning',
+                      message: '当前合同类别不能创建评价'
+                    })
+                  }
+                  break
+                }
+              }
+            }
+          })
       },
       initDatas () {
         this.tableLoading = true// 表格loading

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

@@ -144,10 +144,10 @@
           <el-col :span="12">
             <el-form-item label="履行状态">
               <el-select size="mini" v-model="searchForm.PerformStatus" placeholder="请选择" style="width: 100%" 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="" key=""></el-option>
                 <el-option label="履行完毕" :value="3" key="04"></el-option>
+                <el-option label="未履行完毕" :value="2" key="03"></el-option>
+                <el-option label="未履行" :value="1" key="02"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -264,7 +264,7 @@ export default {
               return '未履行'
               break
             case 2:
-              return '履行中'
+              return '未履行完毕'
               break
             case 3:
               return '履行完毕'

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

@@ -92,9 +92,9 @@
                 <el-col :span="8">
                   <el-form-item label="合同状态">
                     <el-select disabled v-model="contractData.Status" placeholder="请选择" style="width: 100%">
-                      <el-option label="未履行" :value="1" key="01"></el-option>
-                      <el-option label="履行中" :value="2" key="02"></el-option>
                       <el-option label="履行完毕" :value="3" key="03"></el-option>
+                      <el-option label="未履行完毕" :value="2" key="02"></el-option>
+                      <el-option label="未履行" :value="1" key="01"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
@@ -113,24 +113,24 @@
                               style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8">
-                  <el-form-item label="报审序号">
-                    <el-input readonly v-model="contractData.Number" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
+<!--                <el-col :span="8">-->
+<!--                  <el-form-item label="报审序号">-->
+<!--                    <el-input readonly v-model="contractData.Number" placeholder="请输入" style="width: 100%"></el-input>-->
+<!--                  </el-form-item>-->
+<!--                </el-col>-->
               </el-row>
               <el-row>
-                <el-col :span="8">
-                  <el-form-item label="签订日期">
-                    <el-date-picker
-                      style="width: 100%"
-                      v-model="contractData.SignedDate"
-                      type="date"
-                      readonly
-                      placeholder="选择日期">
-                    </el-date-picker>
-                  </el-form-item>
-                </el-col>
+<!--                <el-col :span="8">-->
+<!--                  <el-form-item label="签订日期">-->
+<!--                    <el-date-picker-->
+<!--                      style="width: 100%"-->
+<!--                      v-model="contractData.SignedDate"-->
+<!--                      type="date"-->
+<!--                      readonly-->
+<!--                      placeholder="选择日期">-->
+<!--                    </el-date-picker>-->
+<!--                  </el-form-item>-->
+<!--                </el-col>-->
                 <el-col :span="8">
                   <el-form-item label="履行期限(始)">
                     <el-date-picker

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

@@ -176,10 +176,10 @@
           <el-col :span="12">
             <el-form-item label="履行状态">
               <el-select size="mini" v-model="searchForm.PerformStatus" placeholder="请选择" style="width: 100%" 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="" key=""></el-option>
                 <el-option label="履行完毕" :value="3" key="04"></el-option>
+                <el-option label="未履行完毕" :value="2" key="03"></el-option>
+                <el-option label="未履行" :value="1" key="02"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -292,7 +292,7 @@ export default {
               return '未履行'
               break
             case 2:
-              return '履行中'
+              return '未履行完毕'
               break
             case 3:
               return '履行完毕'

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

@@ -58,10 +58,21 @@
             <el-row>
               <el-col :span="4">&nbsp;
               </el-col>
-              <el-col :span="8">
+              <el-col :span="20">
                 <el-form :model="parameterForm" label-width="200px" label-position="left">
-                  <el-form-item label="是否开启评价">
-                    <el-switch on-text="是" off-text="否" on-color="#13ce66" v-model="parameterForm.isStartEva"></el-switch>
+                  <el-form-item label="开启评价">
+                    <el-checkbox-group v-model="isStartEva">
+                      <el-checkbox label="供应商"></el-checkbox>
+                      <el-checkbox label="服务商"></el-checkbox>
+                      <el-checkbox label="承包商"></el-checkbox>
+                    </el-checkbox-group>
+                  </el-form-item>
+                  <el-form-item label="合同列表展示">
+                    <el-checkbox-group v-model="checkList">
+                      <el-checkbox label="供应商"></el-checkbox>
+                      <el-checkbox label="服务商"></el-checkbox>
+                      <el-checkbox label="承包商"></el-checkbox>
+                    </el-checkbox-group>
                   </el-form-item>
                   <el-form-item label="合同年度评价优秀分数线" prop="yearEvaGood">
                     <el-input-number v-model="parameterForm.yearEvaGood" :min="0" :precision="2" :step="0.1" style="width:100%"></el-input-number>
@@ -184,9 +195,12 @@
           categoryId: 'GFGL_CONTRACT',
           parameterId: 'paramset',
           isStartEva: false,
+          listShowType: '',
           yearEvaGood: 80,
           yearEvaPass: 60
         },
+        checkList: [],
+        isStartEva: [],
         activeName: '1',
         oneList: [], // 上级节点
         popover_index: null,
@@ -278,42 +292,6 @@
         ]
       }
     },
-    computed: {
-      tableFun: function () {
-        return function (name, item) {
-          if (name == 'Type') {
-            var items = Number(item)
-            switch (items) {
-              case 1:
-                return '服务商'
-                break
-              case 2:
-                return '供应商'
-                break
-              case 3:
-                return '承包商'
-                break
-              default:
-                return '--'
-            }
-          } else if (name == 'LevelCode') {
-            var items = Number(item)
-            switch (items) {
-              case 1:
-                return '一级'
-                break
-              case 2:
-                return '二级'
-                break
-              default:
-                return '--'
-            }
-          } else {
-            return item
-          }
-        }
-      }
-    },
     created () {
       this.initParams()
       // 查询条件初始值备份
@@ -373,9 +351,14 @@
             if (res.data && res.data.length > 0) {
               for (var i = 0; i < res.data.length; i++) {
                 switch (res.data[i].Parametercode) {
+                  case 'listShowType':
+                    if (res.data[i].Parametercontent !== '') {
+                      _this.checkList = res.data[i].Parametercontent.split(',')
+                    }
+                    break
                   case 'isStartEva':
-                    if (res.data[i].Parametercontent === 'true') {
-                      _this.parameterForm.isStartEva = true
+                    if (res.data[i].Parametercontent !== '') {
+                      _this.isStartEva = res.data[i].Parametercontent.split(',')
                     }
                     break
                   case 'yearEvaGood':
@@ -391,6 +374,13 @@
       },
       saveParams () {
         let _this = this
+        console.log(_this.checkList, '_this.checkList--')
+        if (_this.checkList.length > 0) {
+          _this.parameterForm.listShowType = _this.checkList.toString()
+        }
+        if (_this.isStartEva.length > 0) {
+          _this.parameterForm.isStartEva = _this.isStartEva.toString()
+        }
         _this.$axios.put('paramset/specify-cate-save-params', _this.parameterForm)
           .then(res => {
             if (res.data.code === 0) {