合同优化

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

@@ -114,7 +114,7 @@ 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")
@@ -126,10 +126,6 @@ func (this *OilContractController) GetEntityList() {
 	}
 
 	paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
-	ContractClass := paramSvc.GetBaseparameterMessage("GFGL_CONTRACT", "paramset", "listShowType")
-	if 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 + "%'"
@@ -430,8 +426,28 @@ func (this *OilContractController) GetEntityList() {
 	//wherePAudit := "AuditStepCode='PROF_RECE'"
 	//orgSvc.GetEntity(&settingProf, wherePAudit) // PROF_AUDIT
 	//res2 := orgSvc.UserInRoleById(this.User.Id, strconv.Itoa(settingProf.RoleId))
+	ContractClass1 := paramSvc.GetBaseparameterMessage("GFGL_CONTRACT", "paramset", "isStartEva")
 	if !res1 {
 		where = where + " and a.SecondUnit= " + strconv.Itoa(this.User.UnitId)
+		if ContractClass1 != "" {
+			ContractClassType := strings.ReplaceAll(strings.ReplaceAll(strings.ReplaceAll(ContractClass1, "服务商", "'03'"), "承包商", "'02'"), "供应商", "'01'")
+			if ContractClass != "" {
+				if strings.Contains(ContractClassType, ContractClass) {
+					where = where + " and a.ContractClass='" + ContractClass + "' "
+				} else {
+					where = where + " and a.ContractClass='04' "
+				}
+			} else {
+				where = where + " and a.ContractClass in (" + ContractClassType + ")"
+			}
+		} else {
+			// 不可见
+			where = where + " and a.ContractClass='04' "
+		}
+	} else {
+		if ContractClass != "" {
+			where = where + " and a.ContractClass='" + ContractClass + "' "
+		}
 	}
 
 	svc := contract.GetOilContractService(utils.DBE)

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

@@ -34,7 +34,6 @@ type ParamModel struct {
 	YearEvaGood float64 `json:"yearEvaGood"`
 	YearEvaPass float64 `json:"yearEvaPass"`
 	IsStartEva  string    `json:"isStartEva"`
-	ListShowType  string    `json:"listShowType"`
 }
 
 // @Title 保存参数设置
@@ -211,10 +210,6 @@ func (this *ParamSetController) ContractParamSetPost() {
 	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/pages/oilcontract/contract-goods-year/index.vue

@@ -71,7 +71,7 @@
         <!--    {{evaluateFun(scope.row.Evaluate,scope.row.Result)}}-->
         <!--  </template>-->
         <!--</el-table-column>-->
-        <el-table-column show-overflow-tooltip label="评价内容及得分" header-align="center">
+        <el-table-column show-overflow-tooltip label="评价内容及得分" header-align="center" min-width="160">
           <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>
@@ -166,6 +166,7 @@
 <script>
   import { mapGetters } from 'vuex';
   import api from '@/api/oilcontract/contractSumScore';
+  import contract from '@/api/oilcontract/contract';
   import permissionApi from '@/api/oilcontract/permission';
   import FileSaver from 'file-saver'
   import XLSX from 'xlsx'
@@ -300,12 +301,23 @@
           if (res.data != null) {
             this.oneList = res.data
           } else {
-            this.oneList = []
+            this.computeListHeader2()
           }
         }).catch(err => {
           console.error(err)
         })
       },
+      computeListHeader2 () {
+        const params = {
+          Category:1,
+        }
+        contract.evaluationItemsOnelist(params, '01', this.$axios).then(res => {
+          console.log('获取表头2', res)
+          if (res.data.currentItemCount > 0) {
+            this.oneList = res.data.items
+          }
+        })
+      },
       // 判断权限
       permissionIsauth(){
         var data = {

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

@@ -410,7 +410,7 @@ export default {
         ModifiedUserId: '',
         ModifiedBy: '',
         Status: '',
-        Year: ''
+        Year: new Date().getFullYear()
       },
       tableColumns: [
 

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

@@ -23,6 +23,7 @@
         <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 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>
@@ -58,14 +59,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>-->
@@ -1134,7 +1135,7 @@
                 this.yearList.push(res.data[i].year)
               }
             }
-            this.searchForm.Year = this.yearList[0]
+            // this.searchForm.Year = this.yearList[0]
           }
           this.initDatas()
         })

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

@@ -412,7 +412,7 @@ export default {
         ModifiedUserId: '',
         ModifiedBy: '',
         Status: '',
-        Year: ''
+        Year: new Date().getFullYear()
       },
       tableColumns: [
 

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

@@ -67,13 +67,6 @@
                       <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>
                   </el-form-item>
@@ -199,7 +192,6 @@
           yearEvaGood: 80,
           yearEvaPass: 60
         },
-        checkList: [],
         isStartEva: [],
         activeName: '1',
         oneList: [], // 上级节点
@@ -351,11 +343,6 @@
             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 !== '') {
                       _this.isStartEva = res.data[i].Parametercontent.split(',')
@@ -374,10 +361,6 @@
       },
       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()
         }