合同评价原型-页面展示1

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods-year/_opera/evaluationlist.vue → src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis-year-single/_opera/baselist.vue

@@ -1,38 +1,29 @@
 <template>
   <div>
-    <el-table size="mini" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-      <el-table-column label="操作" min-width="100" align="center" fixed>
-        <template slot-scope="scope">
-          <router-link :to="'/oilsupplier/oilcontractevaluationitems/' + scope.row.Id + '/operation'">
-            <el-button type="text" title="编辑" size="small" icon="el-icon-edit"></el-button>
-          </router-link>
-
-          <el-popover placement="top" title="提示" v-model="scope.row.deleteConfirmFlag">
-            <el-alert
-              title=""
-              description="确认要删除吗？"
-              type="warning"
-              :closable="false">
-            </el-alert>
-            <br/>
-            <div style="text-align: right; margin: 0">
-              <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
-            </div>
-            <el-button slot="reference" type="text" title="删除" style="margin-left:3px" size="small" @click="scope.row.deleteConfirmFlag = true">
-              <i class="el-icon-delete"></i>
-            </el-button>
-          </el-popover>
-        </template>
+    <el-table highlight-current-row :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
+      <el-table-column
+        property="SequenceNo"
+        label="序号"
+        header-align="center"
+        align="center"
+        width="80">
       </el-table-column>
-
-      <el-table-column v-for="column in tableColumns" :key="column.Id"
-                       v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable min-width="100" :label="column.label" align="center" show-overflow-tooltip></el-table-column>
-
-      <!--<el-table-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
+      <el-table-column
+        property="Content"
+        header-align="center"
+        label="评价项目">
+      </el-table-column>
+      <el-table-column
+        property="Result"
+        label="是否满足"
+        header-align="center"
+        align="center"
+        width="100">
         <template slot-scope="scope">
-          {{ jstimehandle(scope.row.CreateOn+'') }}
+          <el-button size="mini" type="success" v-if="scope.row.Result==1">是</el-button>
+          <el-button size="mini" type="danger" v-else>否</el-button>
         </template>
-      </el-table-column>-->
+      </el-table-column>
     </el-table>
     <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
                    :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
@@ -83,80 +74,57 @@
           ModifiedUserId: '',
           ModifiedBy: '',
 
-        },
-        tableColumns: [
-
-          {
-            prop: "Id",
-            label: 'ID',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ContractId",
-            label: '合同表ID',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ParentId",
-            label: '上级节点ID',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SequenceNo",
-            label: '序号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Content",
-            label: '评价内容',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "NormalScore",
-            label: '标准分值',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Score",
-            label: '实得分数',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "LevelCode",
-            label: '级别',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Remark",
-            label: '备注',
-            width: 100,
-            sort: true
-          }
-        ]
+        }
       }
     },
     created() {
       //查询条件初始值备份
       Object.assign(this.searchFormReset, this.searchForm);
       //查询列表
-      this.initDatas();
+      //this.initDatas();
       //this.getDictOptions()
+
+      this.entityList = [
+        {
+          SequenceNo: '1',
+          Content: '法人资格和相应的资质证明文件应满足要求且持续有效',
+          Result: 1,
+        },
+        {
+          SequenceNo: '2',
+          Content: '国家有关部门、行业颁发的生产经营、安全生产许可证应满足要求且持续有效',
+          Result: 1,
+        },
+        {
+          SequenceNo: '3',
+          Content: '质量、职业健康与安全、环境管理体系应通过认证且持续有效',
+          Result: 1,
+        },
+        {
+          SequenceNo: '4',
+            Content: '近一年内未发生较大及以上质量、生产安全事故和严重环境污染事件',
+          Result: 1,
+        },
+        {
+          SequenceNo: '5',
+            Content: '应继续保持具有与其资质等级相适应的生产经营能力、良好业绩及社会信',
+          Result: 1,
+        },
+        {
+          SequenceNo: '6',
+            Content: '未发生违规分包和违法转包，允许其他企业挂靠、出借资质证明文件及有关资格证书的情况',
+          Result: 1,
+        },
+        {
+          SequenceNo: '7',
+            Content: '未发生严重扰乱集团公司工程建设市场秩序、提供虚假材料和信息的行为',
+          Result: 1,
+        },
+        {
+          SequenceNo: '8',
+            Content: '承包商能在规定时间内向评价单位提交基本条件评价所需相关证明文件，办理评价相关手续',
+          Result: 1,
+        }]
     },
     methods: {
       initDatas() {

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis-year/_opera/evaluationlist.vue → src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis-year-single/_opera/evaluationlist.vue

@@ -1,38 +1,42 @@
 <template>
   <div>
-    <el-table size="mini" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-      <el-table-column label="操作" min-width="100" align="center" fixed>
+    <el-table highlight-current-row :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
+      <el-table-column
+        property="SequenceNo"
+        label="序号"
+        header-align="center"
+        width="80">
         <template slot-scope="scope">
-          <router-link :to="'/oilsupplier/oilcontractevaluationitems/' + scope.row.Id + '/operation'">
-            <el-button type="text" title="编辑" size="small" icon="el-icon-edit"></el-button>
-          </router-link>
-
-          <el-popover placement="top" title="提示" v-model="scope.row.deleteConfirmFlag">
-            <el-alert
-              title=""
-              description="确认要删除吗？"
-              type="warning"
-              :closable="false">
-            </el-alert>
-            <br/>
-            <div style="text-align: right; margin: 0">
-              <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
-            </div>
-            <el-button slot="reference" type="text" title="删除" style="margin-left:3px" size="small" @click="scope.row.deleteConfirmFlag = true">
-              <i class="el-icon-delete"></i>
-            </el-button>
-          </el-popover>
+          <span v-if="scope.row.type=='SUM'" style="font-weight: bold">{{scope.row.SequenceNo}}</span>
+          <span v-else>{{scope.row.SequenceNo}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        property="Content"
+        header-align="center"
+        label="评价项目及标准分值">
+        <template slot-scope="scope">
+          <span v-if="scope.row.type=='SUM'" style="font-weight: bold">{{scope.row.Content}}</span>
+          <span v-else>{{scope.row.Content}}</span>
         </template>
       </el-table-column>
 
-      <el-table-column v-for="column in tableColumns" :key="column.Id"
-                       v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable min-width="100" :label="column.label" align="center" show-overflow-tooltip></el-table-column>
-
-      <!--<el-table-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
+      <el-table-column
+        property="Score"
+        label="评价得分"
+        header-align="center"
+        width="120">
         <template slot-scope="scope">
-          {{ jstimehandle(scope.row.CreateOn+'') }}
+          <span v-if="scope.row.type=='SUM'" style="font-weight: bold">{{scope.row.Score}}</span>
+          <el-input v-else size="mini" placeholder="实得分数" v-model="scope.row.Score"></el-input>
         </template>
-      </el-table-column>-->
+      </el-table-column>
+
+      <el-table-column
+        property="Reason"
+        label="备  注"
+        header-align="center">
+      </el-table-column>
     </el-table>
     <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
                    :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
@@ -83,80 +87,80 @@
           ModifiedUserId: '',
           ModifiedBy: '',
 
-        },
-        tableColumns: [
-
-          {
-            prop: "Id",
-            label: 'ID',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ContractId",
-            label: '合同表ID',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ParentId",
-            label: '上级节点ID',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SequenceNo",
-            label: '序号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Content",
-            label: '评价内容',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "NormalScore",
-            label: '标准分值',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Score",
-            label: '实得分数',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "LevelCode",
-            label: '级别',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Remark",
-            label: '备注',
-            width: 100,
-            sort: true
-          }
-        ]
+        }
       }
     },
     created() {
       //查询条件初始值备份
       Object.assign(this.searchFormReset, this.searchForm);
       //查询列表
-      this.initDatas();
+      //this.initDatas();
       //this.getDictOptions()
+
+      this.entityList = [
+        {
+          SequenceNo: '1',
+          type: 'ITEM',
+          Content: '项目组织实施(10分)',
+          NormalScore: 10,
+          Score: 0
+        },
+        {
+          SequenceNo: '2',
+          type: 'ITEM',
+          Content: '质量管理(20分)',
+          NormalScore: 20,
+          Score: 0
+        },
+        {
+          SequenceNo: '3',
+          type: 'ITEM',
+          Content: '职业健康安全与环境管理(20分)',
+          NormalScore: 20,
+          Score: 0
+        },
+        {
+          SequenceNo: '4',
+          type: 'ITEM',
+          Content: '成本管理(5分)',
+          NormalScore: 5,
+          Score: 0
+        },
+        {
+          SequenceNo: '5',
+          type: 'ITEM',
+          Content: '进度管理(10分)',
+          NormalScore: 10,
+          Score: 0
+        },
+        {
+          SequenceNo: '6',
+          type: 'ITEM',
+          Content: '分包管理(15分)',
+          NormalScore: 15,
+          Score: 0
+        },
+        {
+          SequenceNo: '7',
+          type: 'ITEM',
+          Content: '信息资料管理(10分)',
+          NormalScore: 10,
+          Score: 0
+        },
+        {
+          SequenceNo: '8',
+          type: 'ITEM',
+          Content: '诚信履约(10分)',
+          NormalScore: 10,
+          Score: 0
+        },
+        {
+          SequenceNo: '9',
+          type: 'SUM',
+          Content: '总分',
+          NormalScore: 100,
+          Score: 0
+        }]
     },
     methods: {
       initDatas() {

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

@@ -0,0 +1,427 @@
+
+
+<template>
+  <div>
+    <el-breadcrumb class="heading">
+      <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilsupplier/oilcontract' }">合同表</el-breadcrumb-item>
+      <el-breadcrumb-item>编辑</el-breadcrumb-item>
+    </el-breadcrumb>
+
+    <el-card class="box-card" style="mini-height: calc(100vh - 113px);">
+      <div slot="header">
+        <span>
+          <i class="icon icon-table2"></i> 编辑
+        </span>
+      </div>
+      <el-tabs v-model="activeName" style="margin-top: -10px">
+        <el-tab-pane label="合同内容" name="1">
+          <el-card class="box-card" style="mini-height: calc(100vh - 113px);">
+            <div slot="header">
+              <span>合同信息</span>
+              <span style="float: right;">
+                <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
+                <router-link :to="'/oilcontract/contract'">
+                  <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
+                </router-link>
+              </span>
+            </div>
+            <el-form label-width="110px" ref="EntityForm" :model="formData">
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label="企业名称">
+                    <el-select ref="SupplierSelect" v-model="formData.SupplierId" placeholder="请选择" style="width: 100%" @change="supplierChangeHandler">
+                      <el-option key="1" label="天津油气公司" value="1"></el-option>
+                      <el-option key="2" label="北京管道公司" value="2"></el-option>
+                      <el-option key="3" label="上海监控公司" value="3"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="合同分类">
+                    <el-select  v-model="formData.ContractType" placeholder="请选择" style="width: 100%">
+                      <el-option key="1" label="服务商" value="1"></el-option>
+                      <el-option key="2" label="承包商" value="2"></el-option>
+                      <el-option key="3" label="供应商" value="3"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="项目名称">
+                    <el-input v-model="formData.ProjectName" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="合同编号">
+                    <el-input required v-model="formData.ContractNo" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="工程地点">
+                    <el-input v-model="formData.ProjectPlace" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="项目负责人">
+                    <el-input v-model="formData.ProjectOwner" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="联系人电话">
+                    <el-input v-model="formData.Telephone" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="项目类别">
+                    <el-select v-model="formData.ProjectType" placeholder="请选择" style="width: 100%">
+                      <el-option key="1" label="咨询" value="1"></el-option>
+                      <el-option key="2" label="勘探" value="2"></el-option>
+                      <el-option key="3" label="设计" value="3"></el-option>
+                      <el-option key="4" label="施工" value="4"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="合同模式">
+                    <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="是否分包">
+                    <el-select placeholder="请选择" v-model="formData.SubPackage" style="width: 100%">
+                      <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="8">
+                  <el-form-item label="合同总金额">
+                    <el-input v-model="formData.Amount" placeholder="请输入"  style="width: 100%">
+                      <template slot="append">(万元)</template>
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="合同总工期">
+                    <el-input v-model="formData.ContractPeriod" placeholder="请输入"  style="width: 100%">
+                      <template slot="append">(天)</template>
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label="开工日期">
+                    <el-input v-model="formData.OpenDate" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="计划竣工时间">
+                    <el-input v-model="formData.PlanFinishDate" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label="建设单位">
+                    <el-input v-model="formData.ConstructionUnit" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="建设负责人">
+                    <el-input v-model="formData.ConstructionOwner" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="手机号">
+                    <el-input v-model="formData.ConstructionTelphone" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="施工单位">
+                    <el-input v-model="formData.BuildUnit" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="施工负责人">
+                    <el-input v-model="formData.BuildOwner" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="手机号">
+                    <el-input v-model="formData.BuildTelphone" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="监理单位">
+                    <el-input v-model="formData.SuperviseUnit" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="监理负责人">
+                    <el-input v-model="formData.SuperviseOwner" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="手机号">
+                    <el-input v-model="formData.SuperviseTelphone" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="质量监督单位">
+                    <el-input v-model="formData.QualityUnit" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="质量监督负责人">
+                    <el-input v-model="formData.QualityOwner" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="手机号">
+                    <el-input v-model="formData.QualityTelphone" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="24">
+                  <el-form-item label="备注">
+                    <el-input type="textarea" v-model="formData.Remark" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </el-card>
+        </el-tab-pane>
+        <el-tab-pane label="基本条件评价" name="2">
+          <base-list></base-list>
+        </el-tab-pane>
+        <el-tab-pane label="业绩评价" name="3">
+          <evaluation-list></evaluation-list>
+        </el-tab-pane>
+      </el-tabs>
+    </el-card>
+
+  </div>
+</template>
+
+<script>
+  import {
+    mapGetters
+  } from 'vuex'
+  import api from '@/api/oilcontract/contract'
+  import evaluationList from './evaluationlist'
+  import baseList from './baselist'
+  export default {
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
+    },
+    name: 'oilcontractEdit',
+    components: {
+      evaluationList,
+      baseList
+    },
+
+    data() {
+      return {
+        activeName: '1',
+        serviceId: '',
+        formData: {
+          Id: '',
+          SupplierId: '1',
+          SupplierName: '',
+          ProjectName: '',
+          ContractNo: '',
+          ProjectPlace: '',
+          ProjectOwner: '',
+          Telephone: '',
+          ProjectType: '1',
+          ContractMode: '',
+          Amount: '',
+          ContractPeriod: '',
+          OpenDate: '',
+          PlanFinishDate: '',
+          ConstructionUnit: '',
+          ConstructionOwner: '',
+          ConstructionTelphone: '',
+          BuildUnit: '',
+          BuildOwner: '',
+          BuildTelphone: '',
+          SuperviseUnit: '',
+          SuperviseOwner: '',
+          SuperviseTelphone: '',
+          QualityUnit: '',
+          QualityOwner: '',
+          QualityTelphone: '',
+          Remark: '',
+          IsDelete: '',
+          CreateOn: '',
+          CreateUserId: '',
+          CreateBy: '',
+          ModifiedOn: '',
+          ModifiedUserId: '',
+          ModifiedBy: '',
+          //缺少
+          SubPackage: '',
+          ContractType: ''
+
+        },
+
+        //下拉选择项
+        //wellNoOptions: [],
+        //supervisersOptions: [],
+
+      }
+    },
+    created() {
+      this.serviceId = this.$route.params.opera;
+      this.getDictOptions();
+      console.log(this.serviceId);
+      if(this.serviceId != 'add' && this.serviceId>0) {
+        this.formData.Id = this.serviceId;
+        this.initDatas();
+      } else {
+        this.formData.Id = 0;
+      }
+    },
+    methods: {
+      initDatas() {
+        if(this.formData.Id) {
+          api.getEntity(this.formData.Id, this.$axios).then(res => {
+            this.formData = res.data;
+          }).catch(err => {
+            console.error(err)
+          });
+        }
+      },
+
+      getDictOptions() {
+        api.getDictList(this.$axios).then(res => {
+          //this.wellNoOptions = res.data.items['WellNo']
+          //this.supervisersOptions = res.data.items['Supervisers']
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      //保存信息
+      saveEntity() {
+        this.$refs['EntityForm'].validate((valid) => {
+          if (valid) {
+            //this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + '';
+
+            if (!this.formData.Id) {
+              this.addEntity();
+            } else {
+              this.updateEntity();
+            }
+
+          } else {
+            return false
+          }
+        })
+      },
+
+      addEntity() {
+        api.addEntity(this.formData, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            //保存成功后，初始化数据，变成修改
+            this.formData.Id = res.data.item;
+            this.initDatas();
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            });
+
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            });
+          }
+        }).catch(err => {
+          console.error(err)
+        });
+      },
+
+      updateEntity() {
+        api.updateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            //保存成功后，初始化数据，变成修改
+            this.initDatas();
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            });
+
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            });
+          }
+        }).catch(err => {
+          console.error(err)
+        });
+      },
+
+      supplierChangeHandler() {
+        this.formData.SupplierName = this.$refs['SupplierSelect'].selectedLabel
+      },
+
+      jstimehandle(val) {
+        if (val === '') {
+          return '----'
+        } else if (val === '0001-01-01T08:00:00+08:00') {
+          return '----'
+        } else if (val === '5000-01-01T23:59:59+08:00') {
+          return '永久'
+        } else {
+          val = val.replace('T', ' ')
+          return val.substring(0, 10)
+        }
+      },
+
+      formatDateTime(date) {
+        var y = date.getFullYear();
+        var m = date.getMonth() + 1;
+        m = m < 10 ? ('0' + m) : m;
+        var d = date.getDate();
+        d = d < 10 ? ('0' + d) : d;
+        var h = date.getHours();
+        var minute = date.getMinutes();
+        minute = minute < 10 ? ('0' + minute) : minute;
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
+      }
+    }
+  }
+
+</script>
+
+<style lang="scss">
+
+</style>

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

@@ -0,0 +1,698 @@
+
+
+<template>
+  <div>
+    <el-breadcrumb class="heading">
+      <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilsupplier/oilcontract' }">合同表</el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-card class="box-card" style="height: calc(100vh - 115px);">
+      <div slot="header">
+        <span>
+          <i class="icon icon-table2"></i> 合同表
+        </span>
+        <span style="float: right;">
+          <router-link :to="'/oilcontract/contract-basis-year-single/add/operation'">
+            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">添加</el-button>
+          </router-link>
+          <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 label="上报时间">
+            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
+                            start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+          </el-form-item>
+
+          <el-form-item>
+            <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
+              查询
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="search">高级查询</el-dropdown-item>
+                <el-dropdown-item command="clear">查询重置</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-table size="mini" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
+        <el-table-column label="操作" min-width="100" align="center" fixed>
+          <template slot-scope="scope">
+            <router-link :to="'/oilsupplier/oilcontract/' + scope.row.Id + '/operation'">
+              <el-button type="text" title="编辑" size="small" icon="el-icon-edit"></el-button>
+            </router-link>
+
+            <el-popover placement="top" title="提示" v-model="scope.row.deleteConfirmFlag">
+              <el-alert
+                title=""
+                description="确认要删除吗？"
+                type="warning"
+                :closable="false">
+              </el-alert>
+              <br/>
+              <div style="text-align: right; margin: 0">
+                <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
+              </div>
+              <el-button slot="reference" type="text" title="删除" style="margin-left:3px" size="small" @click="scope.row.deleteConfirmFlag = true">
+                <i class="el-icon-delete"></i>
+              </el-button>
+            </el-popover>
+          </template>
+        </el-table-column>
+
+        <el-table-column v-for="column in tableColumns" :key="column.Id"
+                         v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable min-width="100" :label="column.label" align="center" show-overflow-tooltip></el-table-column>
+
+        <!--<el-table-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ jstimehandle(scope.row.CreateOn+'') }}
+          </template>
+        </el-table-column>-->
+      </el-table>
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+      </el-pagination>
+    </el-card>
+
+    <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
+      <el-form ref="advancedsearchForm" label-width="110px">
+        <el-row>
+
+          <el-col :span="12">
+            <el-form-item label="生成时间">
+              <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
+                              start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.Id" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="供应商ID">
+              <el-input size="mini" v-model="searchForm.SupplierId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="企业名称">
+              <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="项目名称">
+              <el-input size="mini" v-model="searchForm.ProjectName" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="合同编号">
+              <el-input size="mini" v-model="searchForm.ContractNo" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="工程地点">
+              <el-input size="mini" v-model="searchForm.ProjectPlace" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="项目负责人">
+              <el-input size="mini" v-model="searchForm.ProjectOwner" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="联系人电话">
+              <el-input size="mini" v-model="searchForm.Telephone" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="项目类别">
+              <el-input size="mini" v-model="searchForm.ProjectType" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="合同模式">
+              <el-input size="mini" v-model="searchForm.ContractMode" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="合同总金额(万元)">
+              <el-input size="mini" v-model="searchForm.Amount" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="合同总工期(天)">
+              <el-input size="mini" v-model="searchForm.ContractPeriod" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="开工日期">
+              <el-input size="mini" v-model="searchForm.OpenDate" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="计划竣工时间">
+              <el-input size="mini" v-model="searchForm.PlanFinishDate" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="建设单位">
+              <el-input size="mini" v-model="searchForm.ConstructionUnit" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="建设负责人">
+              <el-input size="mini" v-model="searchForm.ConstructionOwner" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="手机号">
+              <el-input size="mini" v-model="searchForm.ConstructionTelphone" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="施工单位">
+              <el-input size="mini" v-model="searchForm.BuildUnit" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="施工负责人">
+              <el-input size="mini" v-model="searchForm.BuildOwner" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="手机号">
+              <el-input size="mini" v-model="searchForm.BuildTelphone" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="监理单位">
+              <el-input size="mini" v-model="searchForm.SuperviseUnit" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="监理负责人">
+              <el-input size="mini" v-model="searchForm.SuperviseOwner" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="手机号">
+              <el-input size="mini" v-model="searchForm.SuperviseTelphone" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="质量监督单位">
+              <el-input size="mini" v-model="searchForm.QualityUnit" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="质量监督负责人">
+              <el-input size="mini" v-model="searchForm.QualityOwner" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="手机号">
+              <el-input size="mini" v-model="searchForm.QualityTelphone" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="备注">
+              <el-input size="mini" v-model="searchForm.Remark" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="删除状态，0正常，1已删除">
+              <el-input size="mini" v-model="searchForm.IsDelete" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.CreateOn" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.CreateUserId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.CreateBy" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.ModifiedOn" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.ModifiedUserId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.ModifiedBy" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
+      </span>
+    </el-dialog>
+
+  </div>
+</template>
+<script>
+  import { mapGetters } from 'vuex';
+  import api from '@/api/oilcontract/contract';
+
+  export default {
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
+    },
+    name: 'oilcontract',
+
+    data() {
+      return {
+        dialogVisible: false,
+        //列表数据
+        entityList: [],
+        //分页参数
+        size: 10,
+        currentPage: 1,
+        currentItemCount: 0,
+        //列表排序
+        Column: {
+          Order: '',
+          Prop: ''
+        },
+        //查询时间
+        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        //查询项
+        searchFormReset: {},
+        searchForm: {
+          Id: '',
+          SupplierId: '',
+          SupplierName: '',
+          ProjectName: '',
+          ContractNo: '',
+          ProjectPlace: '',
+          ProjectOwner: '',
+          Telephone: '',
+          ProjectType: '',
+          ContractMode: '',
+          Amount: '',
+          ContractPeriod: '',
+          OpenDate: '',
+          PlanFinishDate: '',
+          ConstructionUnit: '',
+          ConstructionOwner: '',
+          ConstructionTelphone: '',
+          BuildUnit: '',
+          BuildOwner: '',
+          BuildTelphone: '',
+          SuperviseUnit: '',
+          SuperviseOwner: '',
+          SuperviseTelphone: '',
+          QualityUnit: '',
+          QualityOwner: '',
+          QualityTelphone: '',
+          Remark: '',
+          IsDelete: '',
+          CreateOn: '',
+          CreateUserId: '',
+          CreateBy: '',
+          ModifiedOn: '',
+          ModifiedUserId: '',
+          ModifiedBy: '',
+
+        },
+        tableColumns: [
+
+          {
+            prop: "Id",
+            label: '',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "SupplierId",
+            label: '供应商ID',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "SupplierName",
+            label: '企业名称',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "ProjectName",
+            label: '项目名称',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "ContractNo",
+            label: '合同编号',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "ProjectPlace",
+            label: '工程地点',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "ProjectOwner",
+            label: '项目负责人',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "Telephone",
+            label: '联系人电话',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "ProjectType",
+            label: '项目类别',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "ContractMode",
+            label: '合同模式',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "Amount",
+            label: '合同总金额(万元)',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "ContractPeriod",
+            label: '合同总工期(天)',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "OpenDate",
+            label: '开工日期',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "PlanFinishDate",
+            label: '计划竣工时间',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "ConstructionUnit",
+            label: '建设单位',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "ConstructionOwner",
+            label: '建设负责人',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "ConstructionTelphone",
+            label: '手机号',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "BuildUnit",
+            label: '施工单位',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "BuildOwner",
+            label: '施工负责人',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "BuildTelphone",
+            label: '手机号',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "SuperviseUnit",
+            label: '监理单位',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "SuperviseOwner",
+            label: '监理负责人',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "SuperviseTelphone",
+            label: '手机号',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "QualityUnit",
+            label: '质量监督单位',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "QualityOwner",
+            label: '质量监督负责人',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "QualityTelphone",
+            label: '手机号',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "Remark",
+            label: '备注',
+            width: 100,
+            sort: true
+          }]
+      }
+    },
+    created() {
+      //查询条件初始值备份
+      Object.assign(this.searchFormReset, this.searchForm);
+      //查询列表
+      this.initDatas();
+      //this.getDictOptions()
+    },
+    methods: {
+      initDatas() {
+        //分页及列表条件
+        let params = {
+          _currentPage: this.currentPage,
+          _size: this.size,
+          Order: this.Column.Order,
+          Prop: this.Column.Prop,
+        }
+        let myCreateOn = []
+        // 解析时间
+        if (this.CreateOn.length == 2) {
+          this.CreateOn[1].setHours(23)
+          this.CreateOn[1].setMinutes(59)
+          this.CreateOn[1].setSeconds(59)
+          myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
+          myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
+        }
+        //查询条件
+        Object.assign(params, this.searchForm)
+        //访问接口
+        api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
+          this.entityList = res.data.items
+          this.currentItemCount = res.data.currentItemCount
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      getDictOptions() {
+        api.getDictList(this.$axios).then(res => {
+          //this.dictOptions.customerList = res.data.items['customerList']
+          //this.dictOptions.projectList = res.data.items['projectList']
+
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      searchCommand(command) {
+        if (command == 'search') {
+          this.dialogVisible = true
+        } else if (command == 'clear') {
+          this.clearSearch()
+        }
+      },
+      //列表排序功能
+      orderby(column) {
+        if (column.order == 'ascending') {
+          this.Column.Order = 'asc'
+        } else if (column.order == 'descending') {
+          this.Column.Order = 'desc'
+        }
+        this.Column.Prop = column.prop
+        this.initDatas()
+      },
+      clearSearch() {
+        Object.assign(this.searchForm, this.searchFormReset);
+        //this.searchForm = this.searchFormReset;
+        this.CreateOn = ''
+        this.initDatas()
+      },
+      handleSearch() {
+        this.currentPage = 1;
+        this.dialogVisible = false;
+        this.initDatas();
+      },
+      handleCurrentChange(value) {
+        this.currentPage = value
+        this.initDatas()
+      },
+      handleSizeChange(value) {
+        this.size = value
+        this.currentPage = 1
+        this.initDatas()
+      },
+      deleteEntity(row) {
+        row.deleteConfirmFlag = false;
+        api.deleteEntity(row.Id, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            this.initDatas();
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            });
+
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            });
+          }
+        }).catch(err => {
+          console.error(err)
+        });
+      },
+
+      jstimehandle(val) {
+        if (val === '') {
+          return '----'
+        } else if (val === '0001-01-01T08:00:00+08:00') {
+          return '----'
+        } else if (val === '5000-01-01T23:59:59+08:00') {
+          return '永久'
+        } else {
+          val = val.replace('T', ' ')
+          return val.substring(0, 10)
+        }
+      },
+
+      formatDateTime(date) {
+        var y = date.getFullYear();
+        var m = date.getMonth() + 1;
+        m = m < 10 ? ('0' + m) : m;
+        var d = date.getDate();
+        d = d < 10 ? ('0' + d) : d;
+        var h = date.getHours();
+        var minute = date.getMinutes();
+        minute = minute < 10 ? ('0' + minute) : minute;
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
+      }
+    }
+  }
+
+</script>
+
+<style lang="scss">
+  .el-pagination {
+    margin: 1rem 0 2rem;
+    text-align: right;
+  }
+</style>

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

@@ -13,215 +13,102 @@
         <span>
           <i class="icon icon-table2"></i> 编辑
         </span>
+        <span style="float: right;">
+          <router-link :to="'/oilcontract/contract-basis-year'">
+            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
+          </router-link>
+        </span>
       </div>
-      <el-tabs v-model="activeName" style="margin-top: -10px">
-        <el-tab-pane label="合同内容" name="1">
-          <el-card class="box-card" style="mini-height: calc(100vh - 113px);">
-            <div slot="header">
-              <span>合同信息</span>
-              <span style="float: right;">
-                <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
-                <router-link :to="'/oilcontract/contract'">
-                  <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
-                </router-link>
-              </span>
-            </div>
-            <el-form label-width="110px" ref="EntityForm" :model="formData">
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="企业名称">
-                    <el-select ref="SupplierSelect" v-model="formData.SupplierId" placeholder="请选择" style="width: 100%" @change="supplierChangeHandler">
-                      <el-option key="1" label="天津油气公司" value="1"></el-option>
-                      <el-option key="2" label="北京管道公司" value="2"></el-option>
-                      <el-option key="3" label="上海监控公司" value="3"></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="合同分类">
-                    <el-select  v-model="formData.ContractType" placeholder="请选择" style="width: 100%">
-                      <el-option key="1" label="服务商" value="1"></el-option>
-                      <el-option key="2" label="承包商" value="2"></el-option>
-                      <el-option key="3" label="供应商" value="3"></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="项目名称">
-                    <el-input v-model="formData.ProjectName" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="合同编号">
-                    <el-input v-model="formData.ContractNo" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="工程地点">
-                    <el-input v-model="formData.ProjectPlace" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="项目负责人">
-                    <el-input v-model="formData.ProjectOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="联系人电话">
-                    <el-input v-model="formData.Telephone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="项目类别">
-                    <el-select v-model="formData.ProjectType" placeholder="请选择" style="width: 100%">
-                      <el-option key="1" label="咨询" value="1"></el-option>
-                      <el-option key="2" label="勘探" value="2"></el-option>
-                      <el-option key="3" label="设计" value="3"></el-option>
-                      <el-option key="4" label="施工" value="4"></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="合同模式">
-                    <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="是否分包">
-                    <el-select placeholder="请选择" v-model="formData.SubPackage" style="width: 100%">
-                      <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="8">
-                  <el-form-item label="合同总金额">
-                    <el-input v-model="formData.Amount" placeholder="请输入"  style="width: 100%">
-                      <template slot="append">(万元)</template>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="合同总工期">
-                    <el-input v-model="formData.ContractPeriod" placeholder="请输入"  style="width: 100%">
-                      <template slot="append">(天)</template>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="开工日期">
-                    <el-input v-model="formData.OpenDate" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="计划竣工时间">
-                    <el-input v-model="formData.PlanFinishDate" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="建设单位">
-                    <el-input v-model="formData.ConstructionUnit" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="建设负责人">
-                    <el-input v-model="formData.ConstructionOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="手机号">
-                    <el-input v-model="formData.ConstructionTelphone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="施工单位">
-                    <el-input v-model="formData.BuildUnit" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="施工负责人">
-                    <el-input v-model="formData.BuildOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="手机号">
-                    <el-input v-model="formData.BuildTelphone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="监理单位">
-                    <el-input v-model="formData.SuperviseUnit" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="监理负责人">
-                    <el-input v-model="formData.SuperviseOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="手机号">
-                    <el-input v-model="formData.SuperviseTelphone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="质量监督单位">
-                    <el-input v-model="formData.QualityUnit" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="质量监督负责人">
-                    <el-input v-model="formData.QualityOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="手机号">
-                    <el-input v-model="formData.QualityTelphone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="24">
-                  <el-form-item label="备注">
-                    <el-input type="textarea" v-model="formData.Remark" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-          </el-card>
-        </el-tab-pane>
-        <el-tab-pane label="评分项目" name="2">
-          <evaluation-list></evaluation-list>
-        </el-tab-pane>
-      </el-tabs>
+      <el-form label-width="110px" ref="EntityForm" :model="formData" label-position="top">
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="评价单位">
+              <el-select ref="SupplierSelect" v-model="formData.SupplierId" placeholder="请选择" style="width: 100%" @change="supplierChangeHandler">
+                <el-option key="1" label="采油一厂" value="1"></el-option>
+                <el-option key="2" label="科技信息处" value="2"></el-option>
+                <el-option key="3" label="信息中心" value="3"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="评价年度">
+              <el-input v-model="formData.ProjectName" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="承包商名称">
+              <el-select ref="SupplierSelect" v-model="formData.SupplierId" placeholder="请选择" style="width: 100%" @change="supplierChangeHandler">
+                <el-option key="1" label="天津油气公司" value="1"></el-option>
+                <el-option key="2" label="北京管道公司" value="2"></el-option>
+                <el-option key="3" label="上海监控公司" value="3"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="评价项目数量">
+              <el-input v-model="formData.ContractNo" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="评价项目当年完成合同总额（万元）">
+              <el-input v-model="formData.Amount" placeholder="请输入"  style="width: 100%">
+                <template slot="append">(万元)</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="承包商联系人">
+              <el-input v-model="formData.ProjectOwner" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="联系电话">
+              <el-input v-model="formData.Telephone" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="基本条件评价结果">
+              <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="业绩评价结果">
+              <el-input v-model="formData.SubPackage" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="重要事件描述（适用于年度评价结论为观察使用及不合格情况）">
+              <el-input type="textarea" v-model="formData.OpenDate" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="年度评价结论：(是推优吗？)">
+              <span>□优秀    □合格      □观察使用    □不合格</span>
+              <el-input type="textarea" v-model="formData.OpenDate" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="评价单位及负责人（章）：[流程]">
+              <span>年  月  日</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </el-card>
 
-
   </div>
 </template>
 
@@ -230,7 +117,6 @@
     mapGetters
   } from 'vuex'
   import api from '@/api/oilcontract/contract'
-  import evaluationList from './evaluationlist'
   export default {
     computed: {
       ...mapGetters({
@@ -238,10 +124,6 @@
       })
     },
     name: 'oilcontractEdit',
-    components: {
-      evaluationList,
-    },
-
     data() {
       return {
         activeName: '1',

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

@@ -4,7 +4,7 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/oilsupplier/oilcontract' }">合同表</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilcontract/contract-basis-year-single/add/operation' }">合同表</el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card" style="height: calc(100vh - 115px);">
       <div slot="header">
@@ -109,7 +109,7 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="合同编号">
+            <el-form-item label="合同编号" required>
               <el-input size="mini" v-model="searchForm.ContractNo" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
@@ -366,192 +366,65 @@
 
         },
         tableColumns: [
-
-          {
-            prop: "Id",
-            label: '',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SupplierId",
-            label: '供应商ID',
-            width: 100,
-            sort: true
-          },
-
           {
             prop: "SupplierName",
-            label: '企业名称',
+            label: '承包商名称',
             width: 100,
             sort: true
           },
 
           {
             prop: "ProjectName",
-            label: '项目名称',
+            label: '评价单位',
             width: 100,
             sort: true
           },
 
           {
             prop: "ContractNo",
-            label: '合同编号',
+            label: '评价年度',
             width: 100,
             sort: true
           },
 
           {
             prop: "ProjectPlace",
-            label: '工程地点',
+            label: '评价项目数量',
             width: 100,
             sort: true
           },
 
           {
             prop: "ProjectOwner",
-            label: '项目负责人',
+            label: '评价项目当年完成合同总额（万元）',
             width: 100,
             sort: true
           },
 
           {
             prop: "Telephone",
-            label: '联系人电话',
+            label: '承包商联系人',
             width: 100,
             sort: true
           },
 
           {
             prop: "ProjectType",
-            label: '项目类别',
+            label: '联系电话',
             width: 100,
             sort: true
           },
 
           {
             prop: "ContractMode",
-            label: '合同模式',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Amount",
-            label: '合同总金额(万元)',
+            label: '基本条件评价结果',
             width: 100,
             sort: true
           },
 
           {
             prop: "ContractPeriod",
-            label: '合同总工期(天)',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "OpenDate",
-            label: '开工日期',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "PlanFinishDate",
-            label: '计划竣工时间',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ConstructionUnit",
-            label: '建设单位',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ConstructionOwner",
-            label: '建设负责人',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ConstructionTelphone",
-            label: '手机号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "BuildUnit",
-            label: '施工单位',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "BuildOwner",
-            label: '施工负责人',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "BuildTelphone",
-            label: '手机号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SuperviseUnit",
-            label: '监理单位',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SuperviseOwner",
-            label: '监理负责人',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SuperviseTelphone",
-            label: '手机号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "QualityUnit",
-            label: '质量监督单位',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "QualityOwner",
-            label: '质量监督负责人',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "QualityTelphone",
-            label: '手机号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Remark",
-            label: '备注',
+            label: '业绩评价结果',
             width: 100,
             sort: true
           }]

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

@@ -1,38 +1,56 @@
 <template>
   <div>
-    <el-table size="mini" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-      <el-table-column label="操作" min-width="100" align="center" fixed>
+    <el-table highlight-current-row :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
+      <el-table-column
+        property="SequenceNo"
+        label="序号"
+        header-align="center"
+        width="80">
         <template slot-scope="scope">
-          <router-link :to="'/oilsupplier/oilcontractevaluationitems/' + scope.row.Id + '/operation'">
-            <el-button type="text" title="编辑" size="small" icon="el-icon-edit"></el-button>
-          </router-link>
-
-          <el-popover placement="top" title="提示" v-model="scope.row.deleteConfirmFlag">
-            <el-alert
-              title=""
-              description="确认要删除吗？"
-              type="warning"
-              :closable="false">
-            </el-alert>
-            <br/>
-            <div style="text-align: right; margin: 0">
-              <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
-            </div>
-            <el-button slot="reference" type="text" title="删除" style="margin-left:3px" size="small" @click="scope.row.deleteConfirmFlag = true">
-              <i class="el-icon-delete"></i>
-            </el-button>
-          </el-popover>
+          <span v-if="scope.row.type=='SUM'" style="font-weight: bold">{{scope.row.SequenceNo}}</span>
+          <span v-else>{{scope.row.SequenceNo}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        property="Content"
+        header-align="center"
+        label="评价内容">
+        <template slot-scope="scope">
+          <span v-if="scope.row.type=='SUM'" style="font-weight: bold">{{scope.row.Content}}</span>
+          <span v-else>{{scope.row.Content}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        property="NormalScore"
+        label="标准分值"
+        header-align="center"
+        width="120">
+        <template slot-scope="scope">
+          <span v-if="scope.row.type=='SUM'" style="font-weight: bold">{{scope.row.NormalScore}}</span>
+          <span v-else-if="scope.row.NormalScore==0" style="font-weight: bold"></span>
+          <span v-else>{{scope.row.NormalScore}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        property="Score"
+        label="实得分数"
+        header-align="center"
+        width="120">
+        <template slot-scope="scope">
+          <span v-if="scope.row.type=='SUM'" style="font-weight: bold">{{scope.row.Score}}</span>
+          <el-input v-else size="mini" placeholder="实得分数" v-model="scope.row.Score"></el-input>
         </template>
       </el-table-column>
 
-      <el-table-column v-for="column in tableColumns" :key="column.Id"
-                       v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable min-width="100" :label="column.label" align="center" show-overflow-tooltip></el-table-column>
-
-      <!--<el-table-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
+      <el-table-column
+        property="Reason"
+        label="不合格原因"
+        header-align="center"
+        width="120">
         <template slot-scope="scope">
-          {{ jstimehandle(scope.row.CreateOn+'') }}
+          <span style="font-weight: bold"><el-tag size="mini">不合格原因</el-tag></span>
         </template>
-      </el-table-column>-->
+      </el-table-column>
     </el-table>
     <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
                    :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
@@ -83,80 +101,374 @@
           ModifiedUserId: '',
           ModifiedBy: '',
 
-        },
-        tableColumns: [
-
-          {
-            prop: "Id",
-            label: 'ID',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ContractId",
-            label: '合同表ID',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ParentId",
-            label: '上级节点ID',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SequenceNo",
-            label: '序号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Content",
-            label: '评价内容',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "NormalScore",
-            label: '标准分值',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Score",
-            label: '实得分数',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "LevelCode",
-            label: '级别',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Remark",
-            label: '备注',
-            width: 100,
-            sort: true
-          }
-        ]
+        }
       }
     },
     created() {
       //查询条件初始值备份
       Object.assign(this.searchFormReset, this.searchForm);
       //查询列表
-      this.initDatas();
+      //this.initDatas();
       //this.getDictOptions()
+
+      this.entityList = [
+        {
+          SequenceNo: '1.',
+          type: 'SUM',
+          Content: '项目组织实施',
+          NormalScore: 10,
+          Score: 10
+        },
+        {
+          SequenceNo: '1.1',
+          type: 'ITEM',
+          Content: '是否建立并实现了项目的总体目标',
+          NormalScore: 2,
+          Score: 2
+        },
+        {
+          SequenceNo: '1.2',
+          type: 'ITEM',
+          Content: '项目组织机构是否健全，管理职责是否明确',
+          NormalScore: 2,
+          Score: 2
+        },
+        {
+          SequenceNo: '1.3',
+          type: 'ITEM',
+          Content: '是否制定了科学、合理的项目实施方案并能有效实施',
+          NormalScore: 2,
+          Score: 2
+        },
+        {
+          SequenceNo: '1.4',
+          type: 'ITEM',
+          Content: '是否建立完善的工程变更管理程序并有效实施',
+          NormalScore: 2,
+          Score: 2
+        },
+        {
+          SequenceNo: '1.5',
+          type: 'ITEM',
+          Content: '项目资源配置是否符合合同约定并满足项目实施需要',
+          NormalScore: 2,
+          Score: 2
+        },
+        {
+          SequenceNo: '2.',
+          type: 'SUM',
+          Content: '项目质量管理',
+          NormalScore: 20,
+          Score: 20
+        },
+        {
+          SequenceNo: '2.1',
+          type: 'ITEM',
+          Content: '是否针对项目实际建立了质量管理体系并有效运行，项目质量计划是否得到有效实施',
+          NormalScore: 4,
+          Score: 4
+        },
+        {
+          SequenceNo: '2.2',
+          type: 'ITEM',
+          Content: '主要质量特性指标是否能够满足相关标准规范的要求，项目已完工部分是否存在质量缺陷或隐患',
+          NormalScore: 4,
+          Score: 4
+        },
+        {
+          SequenceNo: '2.3',
+          type: 'ITEM',
+          Content: '是否确定质量控制点，制定并实施质量控制措施',
+          NormalScore: 3,
+          Score: 3
+        },
+        {
+          SequenceNo: '2.4',
+          type: 'ITEM',
+          Content: '质量相关证明文件、记录、资料是否真实、完整',
+          NormalScore: 3,
+          Score: 3
+        },
+        {
+          SequenceNo: '2.5',
+          type: 'ITEM',
+          Content: '是否存在违反有关法律法规及强制性标准等行为',
+          NormalScore: 3,
+          Score: 3
+        },
+        {
+          SequenceNo: '2.6',
+          type: 'ITEM',
+          Content: '是否存在被质量监督机构处理或记录在案的不良行为',
+          NormalScore: 3,
+          Score: 3
+        },
+        {
+          SequenceNo: '2.7',
+          type: 'ITEM',
+          Content: '是否发生一般质量事故或严重质量问题（扣除1-10分)',
+          NormalScore:  0,
+          Score: 0
+        },
+        {
+          SequenceNo: '3.',
+          type: 'SUM',
+          Content: '项目职业健康安全与环境管理',
+          NormalScore: 20,
+          Score: 20
+        },
+        {
+          SequenceNo: '3.1',
+          type: 'ITEM',
+          Content: '是否针对项目实际建立了职业健康安全与环境管理体系并有效运行，管理计划是否得到有效实施，职业健康安全与环境管理目标及指标是否完成',
+          NormalScore: 4,
+          Score: 4
+        },
+        {
+          SequenceNo: '3.2',
+          type: 'ITEM',
+          Content: '职业健康安全与环境管理投入是否满足有关规定及项目实施需要',
+          NormalScore: 3,
+          Score: 3
+        },
+        {
+          SequenceNo: '3.3',
+          type: 'ITEM',
+          Content: '施工现场是否做到各种标志齐全、防护设施完备、物料摆放规范、管理有序、文明施工',
+          NormalScore: 3,
+          Score: 3
+        },
+        {
+          SequenceNo: '3.4',
+          type: 'ITEM',
+          Content: '是否及时进行安全风险识别，制定并实施风险削减措施',
+          NormalScore: 3,
+          Score: 3
+        },
+        {
+          SequenceNo: '3.5',
+          type: 'ITEM',
+          Content: '是否结合项目实际制定了相应的应急预案并配备了相应的应急物资，组织进行应急培训和演练',
+          NormalScore: 3,
+          Score: 3
+        },
+        {
+          SequenceNo: '3.6',
+          type: 'ITEM',
+          Content: '是否存在违反建设工程安全管理条例、安全操作规程及集团公司安全管理禁令等情况',
+          NormalScore: 2,
+          Score: 2
+        },
+        {
+          SequenceNo: '3.7',
+          type: 'ITEM',
+          Content: '是否受到过安全、环保监督机构、相关部门的处理及相关方举报或投诉',
+          NormalScore: 2,
+          Score: 2
+        },
+        {
+          SequenceNo: '3.8',
+          type: 'ITEM',
+          Content: '是否发生了一般生产安全事故或环境污染事件（酌情扣除1-10分）',
+          NormalScore:  0,
+          Score: 0
+        },
+        {
+          SequenceNo: '4.',
+          type: 'SUM',
+          Content: '项目成本管理',
+          NormalScore: 5,
+          Score: 5
+        },{
+          SequenceNo: '4.1',
+          type: 'ITEM',
+          Content: '工程报价是否合理',
+          NormalScore: 1,
+          Score: 1
+        },
+        {
+          SequenceNo: '4.2',
+          type: 'ITEM',
+          Content: '项目经营风险识别是否切合实际',
+          NormalScore: 1,
+          Score: 1
+        },
+        {
+          SequenceNo: '4.3',
+          type: 'ITEM',
+          Content: '是否制定了项目成本控制措施并有效落实',
+          NormalScore: 1,
+          Score: 1
+        },
+        {
+          SequenceNo: '4.4',
+          type: 'ITEM',
+          Content: '项目成本核销是否符合财务相关规定',
+          NormalScore: 1,
+          Score: 1
+        },
+        {
+          SequenceNo: '4.5',
+          type: 'ITEM',
+          Content: '项目成本控制目标是否实现',
+          NormalScore: 1,
+          Score: 1
+        },
+        {
+          SequenceNo: '5.',
+          type: 'SUM',
+          Content: '项目进度管理',
+          NormalScore: 10,
+          Score: 10
+        },
+        {
+          SequenceNo: '5.5',
+          type: 'ITEM',
+          Content: '是否编制切合实际的项目进度计划及相应的控制措施',
+          NormalScore: 3,
+          Score: 3
+        },
+        {
+          SequenceNo: '5.2',
+          type: 'ITEM',
+          Content: '是否能够认真实施项目进度计划，组织措施、技术措施、合同措施、经济措施和信息管理等控制措施是否有效实施，偏差得以及时纠正',
+          NormalScore: 3,
+          Score: 3
+        },
+        {
+          SequenceNo: '5.3',
+          type: 'ITEM',
+          Content: '工期是否满足合同约定',
+          NormalScore: 4,
+          Score: 4
+        },
+        {
+          SequenceNo: '6.',
+          type: 'SUM',
+          Content: '项目分包管理',
+          NormalScore: 15,
+          Score: 15
+        },
+        {
+          SequenceNo: '6.1',
+          type: 'ITEM',
+          Content: '是否建立了分包管理制度及程序',
+          NormalScore: 3,
+          Score: 3
+        },
+        {
+          SequenceNo: '6.2',
+          type: 'ITEM',
+          Content: '分包行为是否符合有关法律法规及集团公司相关规定，分包方案事先经业主同意',
+          NormalScore: 2,
+          Score: 2
+        },
+        {
+          SequenceNo: '6.3',
+          type: 'ITEM',
+          Content: '分包招标活动是否符合有关法律法规及相关程序',
+          NormalScore: 2,
+          Score: 2
+        },
+        {
+          SequenceNo: '6.4',
+          type: 'ITEM',
+          Content: '所选用的分包商是否取得集团公司工程建设承包商准入资格证书或已经按照有关规定履行了审批备案手续',
+          NormalScore: 2,
+          Score: 2
+        },
+        {
+          SequenceNo: '6.5',
+          type: 'ITEM',
+          Content: '是否存在拖欠分包商工程款项行为',
+          NormalScore: 2,
+          Score: 2
+        },
+        {
+          SequenceNo: '6.6',
+          type: 'ITEM',
+          Content: '是否对分包商实施了有效的管理，完全履行了分包合同中规定的权利、义务和责任',
+          NormalScore: 2,
+          Score: 2
+        },
+        {
+          SequenceNo: '6.7',
+          type: 'ITEM',
+          Content: '分包工程质量是否符合有关验收标准、规范要求',
+          NormalScore: 2,
+          Score: 2
+        },
+        {
+          SequenceNo: '7.',
+          type: 'SUM',
+          Content: '信息资料管理',
+          NormalScore: 10,
+          Score: 10
+        },
+        {
+          SequenceNo: '7.1',
+          type: 'ITEM',
+          Content: '是否建立了信息资料的管理程序及保密制度并能严格执行',
+          NormalScore: 2,
+          Score: 2
+        },
+        {
+          SequenceNo: '7.2',
+          type: 'ITEM',
+          Content: '是否积极采用先进的信息管理技术或管理系统',
+          NormalScore: 1,
+          Score: 1
+        },
+        {
+          SequenceNo: '7.3',
+          type: 'ITEM',
+          Content: '是否及时建立、收集、整理并妥善保管项目实施过程中形成的各类记录、证明、资料等',
+          NormalScore: 2,
+          Score: 2
+        },
+        {
+          SequenceNo: '7.4',
+          type: 'ITEM',
+          Content: '信息和资料内容是否真实、完整、准确、可追溯',
+          NormalScore: 2,
+          Score: 2
+        },
+        {
+          SequenceNo: '7.5',
+          type: 'ITEM',
+          Content: '能否及时提交符合规定要求的项目完/竣工资料',
+          NormalScore: 3,
+          Score: 3
+        },
+        {
+          SequenceNo: '8.',
+          type: 'SUM',
+          Content: '诚信履约',
+          NormalScore: 10,
+          Score: 10
+        },
+        {
+          SequenceNo: '8.1',
+          type: 'ITEM',
+          Content: '是否遵守了诚实信用原则，对合同约定的责任、权利和义务是否得到全面履行',
+          NormalScore: 3,
+          Score: 3
+        },
+        {
+          SequenceNo: '8.2',
+          type: 'ITEM',
+          Content: '对合同执行中存在的问题、纠纷，能采用正确的方式妥善解决，是否发生过严重违约行为',
+          NormalScore: 3,
+          Score: 3
+        },
+        {
+          SequenceNo: '8.3',
+          type: 'ITEM',
+          Content: '是否全面实现了合同约定目标',
+          NormalScore: 4,
+          Score: 4
+        }
+      ]
     },
     methods: {
       initDatas() {

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

@@ -4,32 +4,34 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/oilsupplier/oilcontract' }">合同表</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilcontract/contract-basis' }">承包商合同表</el-breadcrumb-item>
       <el-breadcrumb-item>编辑</el-breadcrumb-item>
     </el-breadcrumb>
 
     <el-card class="box-card" style="mini-height: calc(100vh - 113px);">
       <div slot="header">
         <span>
-          <i class="icon icon-table2"></i> 编辑
+          <i class="icon icon-table2"></i> 编辑 - 承包商合同
+        </span>
+        <span style="float: right;">
+          <router-link :to="'/oilcontract/contract-basis'">
+            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
+          </router-link>
         </span>
       </div>
       <el-tabs v-model="activeName" style="margin-top: -10px">
         <el-tab-pane label="合同内容" name="1">
-          <el-card class="box-card" style="mini-height: calc(100vh - 113px);">
+          <el-card class="box-card">
             <div slot="header">
               <span>合同信息</span>
               <span style="float: right;">
                 <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
-                <router-link :to="'/oilcontract/contract'">
-                  <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
-                </router-link>
               </span>
             </div>
             <el-form label-width="110px" ref="EntityForm" :model="formData">
               <el-row>
                 <el-col :span="8">
-                  <el-form-item label="企业名称">
+                  <el-form-item label="承包商名称">
                     <el-select ref="SupplierSelect" v-model="formData.SupplierId" placeholder="请选择" style="width: 100%" @change="supplierChangeHandler">
                       <el-option key="1" label="天津油气公司" value="1"></el-option>
                       <el-option key="2" label="北京管道公司" value="2"></el-option>
@@ -38,7 +40,7 @@
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="8">
+               <!-- <el-col :span="8">
                   <el-form-item label="合同分类">
                     <el-select  v-model="formData.ContractType" placeholder="请选择" style="width: 100%">
                       <el-option key="1" label="服务商" value="1"></el-option>
@@ -46,38 +48,33 @@
                       <el-option key="3" label="供应商" value="3"></el-option>
                     </el-select>
                   </el-form-item>
-                </el-col>
+                </el-col>-->
 
                 <el-col :span="8">
-                  <el-form-item label="项目名称">
-                    <el-input v-model="formData.ProjectName" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="合同编号">
-                    <el-input v-model="formData.ContractNo" placeholder="请输入"  style="width: 100%"></el-input>
+                  <el-form-item label="评价单位名称">
+                    <el-input v-model="formData.ProjectPlace" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="工程地点">
+                  <el-form-item label="评价年度">
                     <el-input v-model="formData.ProjectPlace" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="项目负责人">
-                    <el-input v-model="formData.ProjectOwner" placeholder="请输入"  style="width: 100%"></el-input>
+                  <el-form-item label="承建项目名称">
+                    <el-input v-model="formData.ProjectName" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="联系人电话">
-                    <el-input v-model="formData.Telephone" placeholder="请输入"  style="width: 100%"></el-input>
+                  <el-form-item label="合同编号">
+                    <el-input v-model="formData.ContractNo" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
+
                 <el-col :span="8">
                   <el-form-item label="项目类别">
                     <el-select v-model="formData.ProjectType" placeholder="请选择" style="width: 100%">
@@ -89,11 +86,11 @@
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="8">
+               <!-- <el-col :span="8">
                   <el-form-item label="合同模式">
                     <el-input v-model="formData.ContractMode" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
-                </el-col>
+                </el-col>-->
 
                 <el-col :span="8">
                   <el-form-item label="是否分包">
@@ -103,119 +100,11 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="合同总金额">
-                    <el-input v-model="formData.Amount" placeholder="请输入"  style="width: 100%">
-                      <template slot="append">(万元)</template>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="合同总工期">
-                    <el-input v-model="formData.ContractPeriod" placeholder="请输入"  style="width: 100%">
-                      <template slot="append">(天)</template>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="开工日期">
-                    <el-input v-model="formData.OpenDate" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="计划竣工时间">
-                    <el-input v-model="formData.PlanFinishDate" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="建设单位">
-                    <el-input v-model="formData.ConstructionUnit" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="建设负责人">
-                    <el-input v-model="formData.ConstructionOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="手机号">
-                    <el-input v-model="formData.ConstructionTelphone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="施工单位">
-                    <el-input v-model="formData.BuildUnit" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="施工负责人">
-                    <el-input v-model="formData.BuildOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="手机号">
-                    <el-input v-model="formData.BuildTelphone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="监理单位">
-                    <el-input v-model="formData.SuperviseUnit" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="监理负责人">
-                    <el-input v-model="formData.SuperviseOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="手机号">
-                    <el-input v-model="formData.SuperviseTelphone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="质量监督单位">
-                    <el-input v-model="formData.QualityUnit" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="质量监督负责人">
-                    <el-input v-model="formData.QualityOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="手机号">
-                    <el-input v-model="formData.QualityTelphone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="24">
-                  <el-form-item label="备注">
-                    <el-input type="textarea" v-model="formData.Remark" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
               </el-row>
             </el-form>
           </el-card>
         </el-tab-pane>
-        <el-tab-pane label="评分项目" name="2">
+        <el-tab-pane label="业绩评价" name="2">
           <evaluation-list></evaluation-list>
         </el-tab-pane>
       </el-tabs>

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

@@ -376,7 +376,7 @@
 
           {
             prop: "SupplierId",
-            label: '供应商ID',
+            label: '评价单位',
             width: 100,
             sort: true
           },

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

@@ -4,221 +4,87 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/oilsupplier/oilcontract' }">合同表</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilcontract/contract-goods-year' }">合同表</el-breadcrumb-item>
       <el-breadcrumb-item>编辑</el-breadcrumb-item>
     </el-breadcrumb>
 
     <el-card class="box-card" style="mini-height: calc(100vh - 113px);">
       <div slot="header">
         <span>
-          <i class="icon icon-table2"></i> 编辑
+          <i class="icon icon-table2"></i> 编辑-供应商年度评价信息
         </span>
-      </div>
-      <el-tabs v-model="activeName" style="margin-top: -10px">
-        <el-tab-pane label="合同内容" name="1">
-          <el-card class="box-card" style="mini-height: calc(100vh - 113px);">
-            <div slot="header">
-              <span>合同信息</span>
-              <span style="float: right;">
+        <span style="float: right;">
                 <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
-                <router-link :to="'/oilcontract/contract'">
+                <router-link :to="'/oilcontract/contract-goods-year'">
                   <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
                 </router-link>
               </span>
-            </div>
-            <el-form label-width="110px" ref="EntityForm" :model="formData">
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="企业名称">
-                    <el-select ref="SupplierSelect" v-model="formData.SupplierId" placeholder="请选择" style="width: 100%" @change="supplierChangeHandler">
-                      <el-option key="1" label="天津油气公司" value="1"></el-option>
-                      <el-option key="2" label="北京管道公司" value="2"></el-option>
-                      <el-option key="3" label="上海监控公司" value="3"></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="合同分类">
-                    <el-select  v-model="formData.ContractType" placeholder="请选择" style="width: 100%">
-                      <el-option key="1" label="服务商" value="1"></el-option>
-                      <el-option key="2" label="承包商" value="2"></el-option>
-                      <el-option key="3" label="供应商" value="3"></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="项目名称">
-                    <el-input v-model="formData.ProjectName" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="合同编号">
-                    <el-input v-model="formData.ContractNo" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="工程地点">
-                    <el-input v-model="formData.ProjectPlace" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="项目负责人">
-                    <el-input v-model="formData.ProjectOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="联系人电话">
-                    <el-input v-model="formData.Telephone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="项目类别">
-                    <el-select v-model="formData.ProjectType" placeholder="请选择" style="width: 100%">
-                      <el-option key="1" label="咨询" value="1"></el-option>
-                      <el-option key="2" label="勘探" value="2"></el-option>
-                      <el-option key="3" label="设计" value="3"></el-option>
-                      <el-option key="4" label="施工" value="4"></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="合同模式">
-                    <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="是否分包">
-                    <el-select placeholder="请选择" v-model="formData.SubPackage" style="width: 100%">
-                      <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="8">
-                  <el-form-item label="合同总金额">
-                    <el-input v-model="formData.Amount" placeholder="请输入"  style="width: 100%">
-                      <template slot="append">(万元)</template>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="合同总工期">
-                    <el-input v-model="formData.ContractPeriod" placeholder="请输入"  style="width: 100%">
-                      <template slot="append">(天)</template>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="开工日期">
-                    <el-input v-model="formData.OpenDate" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="计划竣工时间">
-                    <el-input v-model="formData.PlanFinishDate" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="建设单位">
-                    <el-input v-model="formData.ConstructionUnit" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="建设负责人">
-                    <el-input v-model="formData.ConstructionOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="手机号">
-                    <el-input v-model="formData.ConstructionTelphone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="施工单位">
-                    <el-input v-model="formData.BuildUnit" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="施工负责人">
-                    <el-input v-model="formData.BuildOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="手机号">
-                    <el-input v-model="formData.BuildTelphone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="监理单位">
-                    <el-input v-model="formData.SuperviseUnit" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="监理负责人">
-                    <el-input v-model="formData.SuperviseOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="手机号">
-                    <el-input v-model="formData.SuperviseTelphone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="质量监督单位">
-                    <el-input v-model="formData.QualityUnit" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="质量监督负责人">
-                    <el-input v-model="formData.QualityOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="手机号">
-                    <el-input v-model="formData.QualityTelphone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="24">
-                  <el-form-item label="备注">
-                    <el-input type="textarea" v-model="formData.Remark" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-          </el-card>
-        </el-tab-pane>
-        <el-tab-pane label="评分项目" name="2">
-          <evaluation-list></evaluation-list>
-        </el-tab-pane>
-      </el-tabs>
+      </div>
+      <el-form label-width="110px" ref="EntityForm" :model="formData">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="供应商名称">
+              <el-select ref="SupplierSelect" v-model="formData.SupplierId" placeholder="请选择" style="width: 100%" @change="supplierChangeHandler">
+                <el-option key="1" label="天津油气公司" value="1"></el-option>
+                <el-option key="2" label="北京管道公司" value="2"></el-option>
+                <el-option key="3" label="上海监控公司" value="3"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="评价得分">
+              <el-input v-model="formData.ProjectName" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="产品质量(30分)">
+              <el-input v-model="formData.ContractNo" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="合同履约(20分)">
+              <el-input v-model="formData.ProjectPlace" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="售后服务(15分)">
+              <el-input v-model="formData.ProjectOwner" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="诚信经营(15分)">
+              <el-input v-model="formData.Telephone" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="协同响应(20分)">
+              <el-input v-model="formData.Telephone" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="评价结果">
+              <el-select v-model="formData.ProjectType" placeholder="请选择" style="width: 100%">
+                <el-option key="1" label="优秀" value="1"></el-option>
+                <el-option key="2" label="合格" value="2"></el-option>
+                <el-option key="3" label="不合格" value="3"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="备注">
+              <el-input type="textarea" v-model="formData.Remark" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </el-card>
 
 
@@ -230,7 +96,6 @@
     mapGetters
   } from 'vuex'
   import api from '@/api/oilcontract/contract'
-  import evaluationList from './evaluationlist'
   export default {
     computed: {
       ...mapGetters({
@@ -238,9 +103,6 @@
       })
     },
     name: 'oilcontractEdit',
-    components: {
-      evaluationList,
-    },
 
     data() {
       return {

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

@@ -35,7 +35,7 @@
         </el-form>
       </div>
       <el-table size="mini" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-        <el-table-column label="操作" min-width="100" align="center" fixed>
+        <el-table-column label="操作" header-align="center" width="100" align="center" fixed>
           <template slot-scope="scope">
             <router-link :to="'/oilsupplier/oilcontract/' + scope.row.Id + '/operation'">
               <el-button type="text" title="编辑" size="small" icon="el-icon-edit"></el-button>
@@ -59,14 +59,20 @@
           </template>
         </el-table-column>
 
-        <el-table-column v-for="column in tableColumns" :key="column.Id"
-                         v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable min-width="100" :label="column.label" align="center" show-overflow-tooltip></el-table-column>
-
-        <!--<el-table-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ jstimehandle(scope.row.CreateOn+'') }}
-          </template>
-        </el-table-column>-->
+        <el-table-column prop="SupplierName" header-align="center" label="供应商名称"></el-table-column>
+        <el-table-column prop="ContractNo" header-align="center" label="评价得分(100分)" width="120"></el-table-column>
+        <el-table-column label="评价内容及得分" header-align="center">
+          <el-table-column prop="ProjectPlace" header-align="center" label="产品质量(30分)" width="120"></el-table-column>
+          <el-table-column prop="ProjectOwner" header-align="center" label="合同履约(20分)" width="120"></el-table-column>
+          <el-table-column prop="Telephone" header-align="center" label="售后服务(15分)" width="120"></el-table-column>
+          <el-table-column prop="ProjectType" header-align="center" label="诚信经营(15分)" width="120"></el-table-column>
+          <el-table-column prop="ProjectType" header-align="center" label="协同响应(20分)" width="120"></el-table-column>
+        </el-table-column>
+        <el-table-column label="评价结果" header-align="center">
+          <el-table-column prop="ProjectPlace" header-align="center" label="优秀" width="80"></el-table-column>
+          <el-table-column prop="ProjectOwner" header-align="center" label="合格" width="80"></el-table-column>
+          <el-table-column prop="Telephone" header-align="center" label="不合格" width="80"></el-table-column>
+        </el-table-column>
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
                      :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
@@ -367,191 +373,51 @@
         },
         tableColumns: [
 
-          {
-            prop: "Id",
-            label: '',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SupplierId",
-            label: '供应商ID',
-            width: 100,
-            sort: true
-          },
-
           {
             prop: "SupplierName",
-            label: '企业名称',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ProjectName",
-            label: '项目名称',
+            label: '服务商名称',
             width: 100,
             sort: true
           },
 
           {
             prop: "ContractNo",
-            label: '合同编号',
+            label: '评价得分',
             width: 100,
             sort: true
           },
 
           {
             prop: "ProjectPlace",
-            label: '工程地点',
+            label: '项目管理(40分)',
             width: 100,
             sort: true
           },
 
           {
             prop: "ProjectOwner",
-            label: '项目负责人',
+            label: 'HSE管理(30分)',
             width: 100,
             sort: true
           },
 
           {
             prop: "Telephone",
-            label: '联系人电话',
+            label: '合同履行(15分)',
             width: 100,
             sort: true
           },
 
           {
             prop: "ProjectType",
-            label: '项目类别',
+            label: '企业诚信(15分)',
             width: 100,
             sort: true
           },
 
           {
             prop: "ContractMode",
-            label: '合同模式',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Amount",
-            label: '合同总金额(万元)',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ContractPeriod",
-            label: '合同总工期(天)',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "OpenDate",
-            label: '开工日期',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "PlanFinishDate",
-            label: '计划竣工时间',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ConstructionUnit",
-            label: '建设单位',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ConstructionOwner",
-            label: '建设负责人',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ConstructionTelphone",
-            label: '手机号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "BuildUnit",
-            label: '施工单位',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "BuildOwner",
-            label: '施工负责人',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "BuildTelphone",
-            label: '手机号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SuperviseUnit",
-            label: '监理单位',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SuperviseOwner",
-            label: '监理负责人',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SuperviseTelphone",
-            label: '手机号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "QualityUnit",
-            label: '质量监督单位',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "QualityOwner",
-            label: '质量监督负责人',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "QualityTelphone",
-            label: '手机号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Remark",
-            label: '备注',
+            label: '评价结果',
             width: 100,
             sort: true
           }]

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

@@ -1,38 +1,55 @@
 <template>
   <div>
-    <el-table size="mini" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-      <el-table-column label="操作" min-width="100" align="center" fixed>
+    <el-table highlight-current-row :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
+      <el-table-column
+        property="SequenceNo"
+        label="序号"
+        header-align="center"
+        width="80">
         <template slot-scope="scope">
-          <router-link :to="'/oilsupplier/oilcontractevaluationitems/' + scope.row.Id + '/operation'">
-            <el-button type="text" title="编辑" size="small" icon="el-icon-edit"></el-button>
-          </router-link>
-
-          <el-popover placement="top" title="提示" v-model="scope.row.deleteConfirmFlag">
-            <el-alert
-              title=""
-              description="确认要删除吗？"
-              type="warning"
-              :closable="false">
-            </el-alert>
-            <br/>
-            <div style="text-align: right; margin: 0">
-              <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
-            </div>
-            <el-button slot="reference" type="text" title="删除" style="margin-left:3px" size="small" @click="scope.row.deleteConfirmFlag = true">
-              <i class="el-icon-delete"></i>
-            </el-button>
-          </el-popover>
+          <span v-if="scope.row.type=='SUM'" style="font-weight: bold">{{scope.row.SequenceNo}}</span>
+          <span v-else>{{scope.row.SequenceNo}}</span>
         </template>
       </el-table-column>
-
-      <el-table-column v-for="column in tableColumns" :key="column.Id"
-                       v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable min-width="100" :label="column.label" align="center" show-overflow-tooltip></el-table-column>
-
-      <!--<el-table-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
+      <el-table-column
+        property="Content"
+        header-align="center"
+        label="评价内容">
+        <template slot-scope="scope">
+          <span v-if="scope.row.type=='SUM'" style="font-weight: bold">{{scope.row.Content}}</span>
+          <span v-else>{{scope.row.Content}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        property="NormalScore"
+        label="标准分值"
+        header-align="center"
+        width="120">
+        <template slot-scope="scope">
+          <span v-if="scope.row.type=='SUM'" style="font-weight: bold">{{scope.row.NormalScore}}</span>
+          <span v-else-if="scope.row.NormalScore==0" style="font-weight: bold"></span>
+          <span v-else>{{scope.row.NormalScore}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        property="Score"
+        label="实得分数"
+        header-align="center"
+        width="120">
+        <template slot-scope="scope">
+          <span v-if="scope.row.type=='SUM'" style="font-weight: bold">{{scope.row.Score}}</span>
+          <el-input v-else size="mini" placeholder="实得分数" v-model="scope.row.Score"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column
+        property="Reason"
+        label="不合格原因"
+        header-align="center"
+        width="120">
         <template slot-scope="scope">
-          {{ jstimehandle(scope.row.CreateOn+'') }}
+          <span style="font-weight: bold"><el-tag size="mini">不合格原因</el-tag></span>
         </template>
-      </el-table-column>-->
+      </el-table-column>
     </el-table>
     <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
                    :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
@@ -83,80 +100,165 @@
           ModifiedUserId: '',
           ModifiedBy: '',
 
-        },
-        tableColumns: [
-
-          {
-            prop: "Id",
-            label: 'ID',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ContractId",
-            label: '合同表ID',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ParentId",
-            label: '上级节点ID',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SequenceNo",
-            label: '序号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Content",
-            label: '评价内容',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "NormalScore",
-            label: '标准分值',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Score",
-            label: '实得分数',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "LevelCode",
-            label: '级别',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Remark",
-            label: '备注',
-            width: 100,
-            sort: true
-          }
-        ]
+        }
       }
     },
     created() {
       //查询条件初始值备份
       Object.assign(this.searchFormReset, this.searchForm);
       //查询列表
-      this.initDatas();
+      //this.initDatas();
       //this.getDictOptions()
+
+      this.entityList = [
+        {
+          SequenceNo: '1.',
+          type: 'SUM',
+          Content: '产品质量',
+          NormalScore: 30,
+          Score: 30
+        },
+        {
+          SequenceNo: '1.1',
+          type: 'ITEM',
+          Content: '验收质量',
+          NormalScore: 10,
+          Score: 10
+        },
+        {
+          SequenceNo: '1.2',
+          type: 'ITEM',
+          Content: '使用过程故障率',
+          NormalScore: 10,
+          Score: 10
+        },
+        {
+          SequenceNo: '1.3',
+          type: 'ITEM',
+          Content: 'HSE运行',
+          NormalScore: 10,
+          Score: 10
+        },
+        {
+          SequenceNo: '2.',
+          type: 'SUM',
+          Content: '合同履约',
+          NormalScore: 20,
+          Score: 20
+        },
+        {
+          SequenceNo: '2.1',
+          type: 'ITEM',
+          Content: '到货及时率',
+          NormalScore: 5,
+          Score: 5
+        },
+        {
+          SequenceNo: '2.2',
+          type: 'ITEM',
+          Content: '交货准确率',
+          NormalScore: 10,
+          Score: 10
+        },
+        {
+          SequenceNo: '2.3',
+          type: 'ITEM',
+          Content: '验收资料是否齐全',
+          NormalScore: 5,
+          Score: 5
+        },
+        {
+          SequenceNo: '3.',
+          type: 'SUM',
+          Content: '售后服务',
+          NormalScore: 15,
+          Score: 15
+        },
+        {
+          SequenceNo: '3.1',
+          type: 'ITEM',
+          Content: '售后服务能力',
+          NormalScore: 7,
+          Score: 7
+        },
+        {
+          SequenceNo: '3.2',
+          type: 'ITEM',
+          Content: '投诉响应',
+          NormalScore: 4,
+          Score: 4
+        },
+        {
+          SequenceNo: '3.3',
+          type: 'ITEM',
+          Content: '处理情况',
+          NormalScore: 4,
+          Score: 4
+        },
+        {
+          SequenceNo: '4.',
+          type: 'SUM',
+          Content: '诚信经营',
+          NormalScore: 15,
+          Score: 15
+        },
+        {
+          SequenceNo: '4.1',
+          type: 'ITEM',
+          Content: '是否对合同约定的责任、权利和义务是否得到全面履行',
+          NormalScore: 7,
+          Score: 7
+        },
+        {
+          SequenceNo: '4.2',
+          type: 'ITEM',
+          Content: '是否对合同执行中存在的问题、纠纷妥善解决',
+          NormalScore: 4,
+          Score: 4
+        },
+        {
+          SequenceNo: '4.3',
+          type: 'ITEM',
+          Content: '是否实现了合同约定目标？是否发生过严重违约行为？',
+          NormalScore: 4,
+          Score: 4
+        },
+        {
+          SequenceNo: '5.',
+          type: 'SUM',
+          Content: '协同响应',
+          NormalScore: 20,
+          Score: 20
+        },
+        {
+          SequenceNo: '5.1',
+          type: 'ITEM',
+          Content: '招标响应',
+          NormalScore: 5,
+          Score: 5
+        },
+        {
+          SequenceNo: '5.2',
+          type: 'ITEM',
+          Content: '合同签订响应',
+          NormalScore: 5,
+          Score: 5
+        },
+        {
+          SequenceNo: '5.3',
+          type: 'ITEM',
+          Content: '现场考察响应',
+          NormalScore: 5,
+          Score: 5
+        },
+        {
+          SequenceNo: '5.4',
+          type: 'ITEM',
+          Content: '退货响应',
+          NormalScore: 5,
+          Score: 5
+        },
+      ]
     },
     methods: {
       initDatas() {

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

@@ -4,218 +4,91 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/oilsupplier/oilcontract' }">合同表</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilcontract/contract-goods' }">供应商合同表</el-breadcrumb-item>
       <el-breadcrumb-item>编辑</el-breadcrumb-item>
     </el-breadcrumb>
 
     <el-card class="box-card" style="mini-height: calc(100vh - 113px);">
       <div slot="header">
         <span>
-          <i class="icon icon-table2"></i> 编辑
+          <i class="icon icon-table2"></i> 编辑 - 供应商合同
+        </span>
+        <span style="float: right;">
+          <router-link :to="'/oilcontract/contract-goods'">
+            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
+          </router-link>
         </span>
       </div>
       <el-tabs v-model="activeName" style="margin-top: -10px">
         <el-tab-pane label="合同内容" name="1">
-          <el-card class="box-card" style="mini-height: calc(100vh - 113px);">
+          <el-card class="box-card">
             <div slot="header">
               <span>合同信息</span>
               <span style="float: right;">
                 <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
-                <router-link :to="'/oilcontract/contract'">
-                  <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
-                </router-link>
               </span>
             </div>
             <el-form label-width="110px" ref="EntityForm" :model="formData">
               <el-row>
                 <el-col :span="8">
-                  <el-form-item label="企业名称">
+                  <el-form-item label="评价单位">
                     <el-select ref="SupplierSelect" v-model="formData.SupplierId" placeholder="请选择" style="width: 100%" @change="supplierChangeHandler">
-                      <el-option key="1" label="天津油气公司" value="1"></el-option>
-                      <el-option key="2" label="北京管道公司" value="2"></el-option>
-                      <el-option key="3" label="上海监控公司" value="3"></el-option>
+                      <el-option key="1" label="采油一厂" value="1"></el-option>
+                      <el-option key="2" label="企业法规处" value="2"></el-option>
+                      <el-option key="3" label="采油二厂" value="3"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
-
                 <el-col :span="8">
-                  <el-form-item label="合同分类">
-                    <el-select  v-model="formData.ContractType" placeholder="请选择" style="width: 100%">
-                      <el-option key="1" label="服务商" value="1"></el-option>
-                      <el-option key="2" label="承包商" value="2"></el-option>
-                      <el-option key="3" label="供应商" value="3"></el-option>
+                  <el-form-item label="服务商名称">
+                    <el-select ref="SupplierSelect" v-model="formData.SupplierId" placeholder="请选择" style="width: 100%" @change="supplierChangeHandler">
+                      <el-option key="1" label="天津油气公司" value="1"></el-option>
+                      <el-option key="2" label="北京管道公司" value="2"></el-option>
+                      <el-option key="3" label="上海监控公司" value="3"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="项目名称">
-                    <el-input v-model="formData.ProjectName" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="合同编号">
-                    <el-input v-model="formData.ContractNo" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="工程地点">
-                    <el-input v-model="formData.ProjectPlace" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="项目负责人">
-                    <el-input v-model="formData.ProjectOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="联系人电话">
-                    <el-input v-model="formData.Telephone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="项目类别">
+                  <el-form-item label="供应商类别">
                     <el-select v-model="formData.ProjectType" placeholder="请选择" style="width: 100%">
-                      <el-option key="1" label="咨询" value="1"></el-option>
-                      <el-option key="2" label="勘探" value="2"></el-option>
-                      <el-option key="3" label="设计" value="3"></el-option>
-                      <el-option key="4" label="施工" value="4"></el-option>
+                      <el-option key="1" label="一级供应商" value="1"></el-option>
+                      <el-option key="2" label="二级制造商" value="2"></el-option>
+                      <el-option key="3" label="二级贸易商" value="3"></el-option>
+                      <el-option key="4" label="代理商" value="4"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="合同模式">
-                    <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="是否分包">
-                    <el-select placeholder="请选择" v-model="formData.SubPackage" style="width: 100%">
-                      <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="8">
-                  <el-form-item label="合同总金额">
-                    <el-input v-model="formData.Amount" placeholder="请输入"  style="width: 100%">
-                      <template slot="append">(万元)</template>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="合同总工期">
-                    <el-input v-model="formData.ContractPeriod" placeholder="请输入"  style="width: 100%">
-                      <template slot="append">(天)</template>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="开工日期">
-                    <el-input v-model="formData.OpenDate" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="计划竣工时间">
-                    <el-input v-model="formData.PlanFinishDate" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="建设单位">
-                    <el-input v-model="formData.ConstructionUnit" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="建设负责人">
-                    <el-input v-model="formData.ConstructionOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="手机号">
-                    <el-input v-model="formData.ConstructionTelphone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="施工单位">
-                    <el-input v-model="formData.BuildUnit" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="施工负责人">
-                    <el-input v-model="formData.BuildOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="手机号">
-                    <el-input v-model="formData.BuildTelphone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="监理单位">
-                    <el-input v-model="formData.SuperviseUnit" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="监理负责人">
-                    <el-input v-model="formData.SuperviseOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="手机号">
-                    <el-input v-model="formData.SuperviseTelphone" placeholder="请输入"  style="width: 100%"></el-input>
+                  <el-form-item label="评价单位名称">
+                    <el-input v-model="formData.ProjectPlace" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="质量监督单位">
-                    <el-input v-model="formData.QualityUnit" placeholder="请输入"  style="width: 100%"></el-input>
+                  <el-form-item label="评价年度">
+                    <el-input v-model="formData.ProjectPlace" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="质量监督负责人">
-                    <el-input v-model="formData.QualityOwner" placeholder="请输入"  style="width: 100%"></el-input>
+                  <el-form-item label="承建项目名称">
+                    <el-input v-model="formData.ProjectName" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="手机号">
-                    <el-input v-model="formData.QualityTelphone" placeholder="请输入"  style="width: 100%"></el-input>
+                  <el-form-item label="合同编号">
+                    <el-input v-model="formData.ContractNo" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="24">
-                  <el-form-item label="备注">
-                    <el-input type="textarea" v-model="formData.Remark" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
               </el-row>
             </el-form>
           </el-card>
         </el-tab-pane>
-        <el-tab-pane label="评分项目" name="2">
+        <el-tab-pane label="业绩评价" name="2">
           <evaluation-list></evaluation-list>
         </el-tab-pane>
       </el-tabs>

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

@@ -376,7 +376,7 @@
 
           {
             prop: "SupplierId",
-            label: '供应商ID',
+            label: '评价单位',
             width: 100,
             sort: true
           },

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

@@ -13,212 +13,200 @@
         <span>
           <i class="icon icon-table2"></i> 编辑
         </span>
+        <span style="float: right;">
+          <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
+          <router-link :to="'/oilcontract/contract-import'">
+            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
+          </router-link>
+        </span>
       </div>
-      <el-tabs v-model="activeName" style="margin-top: -10px">
-        <el-tab-pane label="合同内容" name="1">
-          <el-card class="box-card" style="mini-height: calc(100vh - 113px);">
-            <div slot="header">
-              <span>合同信息</span>
-              <span style="float: right;">
-                <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
-                <router-link :to="'/oilcontract/contract'">
-                  <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
-                </router-link>
-              </span>
-            </div>
-            <el-form label-width="110px" ref="EntityForm" :model="formData">
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="企业名称">
-                    <el-select ref="SupplierSelect" v-model="formData.SupplierId" placeholder="请选择" style="width: 100%" @change="supplierChangeHandler">
-                      <el-option key="1" label="天津油气公司" value="1"></el-option>
-                      <el-option key="2" label="北京管道公司" value="2"></el-option>
-                      <el-option key="3" label="上海监控公司" value="3"></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="合同分类">
-                    <el-select  v-model="formData.ContractType" placeholder="请选择" style="width: 100%">
-                      <el-option key="1" label="服务商" value="1"></el-option>
-                      <el-option key="2" label="承包商" value="2"></el-option>
-                      <el-option key="3" label="供应商" value="3"></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="项目名称">
-                    <el-input v-model="formData.ProjectName" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="合同编号">
-                    <el-input v-model="formData.ContractNo" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="工程地点">
-                    <el-input v-model="formData.ProjectPlace" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="项目负责人">
-                    <el-input v-model="formData.ProjectOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="联系人电话">
-                    <el-input v-model="formData.Telephone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="项目类别">
-                    <el-select v-model="formData.ProjectType" placeholder="请选择" style="width: 100%">
-                      <el-option key="1" label="咨询" value="1"></el-option>
-                      <el-option key="2" label="勘探" value="2"></el-option>
-                      <el-option key="3" label="设计" value="3"></el-option>
-                      <el-option key="4" label="施工" value="4"></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="合同模式">
-                    <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="是否分包">
-                    <el-select placeholder="请选择" v-model="formData.SubPackage" style="width: 100%">
-                      <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="8">
-                  <el-form-item label="合同总金额">
-                    <el-input v-model="formData.Amount" placeholder="请输入"  style="width: 100%">
-                      <template slot="append">(万元)</template>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="合同总工期">
-                    <el-input v-model="formData.ContractPeriod" placeholder="请输入"  style="width: 100%">
-                      <template slot="append">(天)</template>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="开工日期">
-                    <el-input v-model="formData.OpenDate" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="计划竣工时间">
-                    <el-input v-model="formData.PlanFinishDate" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="建设单位">
-                    <el-input v-model="formData.ConstructionUnit" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="建设负责人">
-                    <el-input v-model="formData.ConstructionOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="手机号">
-                    <el-input v-model="formData.ConstructionTelphone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="施工单位">
-                    <el-input v-model="formData.BuildUnit" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="施工负责人">
-                    <el-input v-model="formData.BuildOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="手机号">
-                    <el-input v-model="formData.BuildTelphone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="监理单位">
-                    <el-input v-model="formData.SuperviseUnit" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="监理负责人">
-                    <el-input v-model="formData.SuperviseOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="手机号">
-                    <el-input v-model="formData.SuperviseTelphone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="质量监督单位">
-                    <el-input v-model="formData.QualityUnit" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="质量监督负责人">
-                    <el-input v-model="formData.QualityOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="手机号">
-                    <el-input v-model="formData.QualityTelphone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="24">
-                  <el-form-item label="备注">
-                    <el-input type="textarea" v-model="formData.Remark" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-          </el-card>
-        </el-tab-pane>
-        <el-tab-pane label="评分项目" name="2">
-          <evaluation-list></evaluation-list>
-        </el-tab-pane>
-      </el-tabs>
+      <el-form label-width="110px" ref="EntityForm" :model="formData">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="企业名称">
+              <el-select ref="SupplierSelect" v-model="formData.SupplierId" placeholder="请选择" style="width: 100%" @change="supplierChangeHandler">
+                <el-option key="1" label="天津油气公司" value="1"></el-option>
+                <el-option key="2" label="北京管道公司" value="2"></el-option>
+                <el-option key="3" label="上海监控公司" value="3"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="合同分类">
+              <el-select  v-model="formData.ContractType" placeholder="请选择" style="width: 100%">
+                <el-option key="1" label="服务商" value="1"></el-option>
+                <el-option key="2" label="承包商" value="2"></el-option>
+                <el-option key="3" label="供应商" value="3"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="项目名称">
+              <el-input v-model="formData.ProjectName" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="合同编号">
+              <el-input v-model="formData.ContractNo" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="工程地点">
+              <el-input v-model="formData.ProjectPlace" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="项目负责人">
+              <el-input v-model="formData.ProjectOwner" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="联系人电话">
+              <el-input v-model="formData.Telephone" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="项目类别">
+              <el-select v-model="formData.ProjectType" placeholder="请选择" style="width: 100%">
+                <el-option key="1" label="咨询" value="1"></el-option>
+                <el-option key="2" label="勘探" value="2"></el-option>
+                <el-option key="3" label="设计" value="3"></el-option>
+                <el-option key="4" label="施工" value="4"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="合同模式">
+              <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="是否分包">
+              <el-select placeholder="请选择" v-model="formData.SubPackage" style="width: 100%">
+                <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="8">
+            <el-form-item label="合同总金额">
+              <el-input v-model="formData.Amount" placeholder="请输入"  style="width: 100%">
+                <template slot="append">(万元)</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="合同总工期">
+              <el-input v-model="formData.ContractPeriod" placeholder="请输入"  style="width: 100%">
+                <template slot="append">(天)</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="开工日期">
+              <el-input v-model="formData.OpenDate" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="计划竣工时间">
+              <el-input v-model="formData.PlanFinishDate" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="建设单位">
+              <el-input v-model="formData.ConstructionUnit" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="建设负责人">
+              <el-input v-model="formData.ConstructionOwner" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="手机号">
+              <el-input v-model="formData.ConstructionTelphone" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="施工单位">
+              <el-input v-model="formData.BuildUnit" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="施工负责人">
+              <el-input v-model="formData.BuildOwner" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="手机号">
+              <el-input v-model="formData.BuildTelphone" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="监理单位">
+              <el-input v-model="formData.SuperviseUnit" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="监理负责人">
+              <el-input v-model="formData.SuperviseOwner" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="手机号">
+              <el-input v-model="formData.SuperviseTelphone" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="质量监督单位">
+              <el-input v-model="formData.QualityUnit" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="质量监督负责人">
+              <el-input v-model="formData.QualityOwner" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="手机号">
+              <el-input v-model="formData.QualityTelphone" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="备注">
+              <el-input type="textarea" v-model="formData.Remark" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </el-card>
 
 

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

@@ -16,6 +16,7 @@
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">添加</el-button>
           </router-link>
           <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">导入</el-button>
+          <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 label="上报时间">

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

@@ -1,292 +0,0 @@
-<template>
-  <div>
-    <el-table size="mini" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-      <el-table-column label="操作" min-width="100" align="center" fixed>
-        <template slot-scope="scope">
-          <router-link :to="'/oilsupplier/oilcontractevaluationitems/' + scope.row.Id + '/operation'">
-            <el-button type="text" title="编辑" size="small" icon="el-icon-edit"></el-button>
-          </router-link>
-
-          <el-popover placement="top" title="提示" v-model="scope.row.deleteConfirmFlag">
-            <el-alert
-              title=""
-              description="确认要删除吗？"
-              type="warning"
-              :closable="false">
-            </el-alert>
-            <br/>
-            <div style="text-align: right; margin: 0">
-              <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
-            </div>
-            <el-button slot="reference" type="text" title="删除" style="margin-left:3px" size="small" @click="scope.row.deleteConfirmFlag = true">
-              <i class="el-icon-delete"></i>
-            </el-button>
-          </el-popover>
-        </template>
-      </el-table-column>
-
-      <el-table-column v-for="column in tableColumns" :key="column.Id"
-                       v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable min-width="100" :label="column.label" align="center" show-overflow-tooltip></el-table-column>
-
-      <!--<el-table-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          {{ jstimehandle(scope.row.CreateOn+'') }}
-        </template>
-      </el-table-column>-->
-    </el-table>
-    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                   :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
-    </el-pagination>
-  </div>
-</template>
-<script>
-  import { mapGetters } from 'vuex';
-  import api from '@/api/oilcontract/contractEvaluationItems';
-
-  export default {
-    computed: {
-      ...mapGetters({
-        authUser: 'authUser'
-      })
-    },
-    name: 'oilcontractevaluationitems',
-
-    data() {
-      return {
-        dialogVisible: false,
-        //列表数据
-        entityList: [],
-        //分页参数
-        size: 10,
-        currentPage: 1,
-        currentItemCount: 0,
-        //列表排序
-        Column: {
-          Order: '',
-          Prop: ''
-        },
-        //查询时间
-        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
-        //查询项
-        searchFormReset: {},
-        searchForm: {
-          Id: '',
-          ContractId: '',
-          ParentId: '',
-          SequenceNo: '',
-          Content: '',
-          NormalScore: '',
-          Score: '',
-          LevelCode: '',
-          Remark: '',
-          ModifiedOn: '',
-          ModifiedUserId: '',
-          ModifiedBy: '',
-
-        },
-        tableColumns: [
-
-          {
-            prop: "Id",
-            label: 'ID',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ContractId",
-            label: '合同表ID',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ParentId",
-            label: '上级节点ID',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SequenceNo",
-            label: '序号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Content",
-            label: '评价内容',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "NormalScore",
-            label: '标准分值',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Score",
-            label: '实得分数',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "LevelCode",
-            label: '级别',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Remark",
-            label: '备注',
-            width: 100,
-            sort: true
-          }
-        ]
-      }
-    },
-    created() {
-      //查询条件初始值备份
-      Object.assign(this.searchFormReset, this.searchForm);
-      //查询列表
-      this.initDatas();
-      //this.getDictOptions()
-    },
-    methods: {
-      initDatas() {
-        //分页及列表条件
-        let params = {
-          _currentPage: this.currentPage,
-          _size: this.size,
-          Order: this.Column.Order,
-          Prop: this.Column.Prop,
-        }
-        let myCreateOn = []
-        // 解析时间
-        if (this.CreateOn.length == 2) {
-          this.CreateOn[1].setHours(23)
-          this.CreateOn[1].setMinutes(59)
-          this.CreateOn[1].setSeconds(59)
-          myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
-          myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
-        }
-        //查询条件
-        Object.assign(params, this.searchForm)
-        //访问接口
-        api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
-          this.entityList = res.data.items
-          this.currentItemCount = res.data.currentItemCount
-        }).catch(err => {
-          console.error(err)
-        })
-      },
-
-      getDictOptions() {
-        api.getDictList(this.$axios).then(res => {
-          //this.dictOptions.customerList = res.data.items['customerList']
-          //this.dictOptions.projectList = res.data.items['projectList']
-
-        }).catch(err => {
-          console.error(err)
-        })
-      },
-
-      searchCommand(command) {
-        if (command == 'search') {
-          this.dialogVisible = true
-        } else if (command == 'clear') {
-          this.clearSearch()
-        }
-      },
-      //列表排序功能
-      orderby(column) {
-        if (column.order == 'ascending') {
-          this.Column.Order = 'asc'
-        } else if (column.order == 'descending') {
-          this.Column.Order = 'desc'
-        }
-        this.Column.Prop = column.prop
-        this.initDatas()
-      },
-      clearSearch() {
-        Object.assign(this.searchForm, this.searchFormReset);
-        //this.searchForm = this.searchFormReset;
-        this.CreateOn = ''
-        this.initDatas()
-      },
-      handleSearch() {
-        this.currentPage = 1;
-        this.dialogVisible = false;
-        this.initDatas();
-      },
-      handleCurrentChange(value) {
-        this.currentPage = value
-        this.initDatas()
-      },
-      handleSizeChange(value) {
-        this.size = value
-        this.currentPage = 1
-        this.initDatas()
-      },
-      deleteEntity(row) {
-        row.deleteConfirmFlag = false;
-        api.deleteEntity(row.Id, this.$axios).then(res => {
-          if (res.data.code === 0) {
-            this.initDatas();
-            this.$message({
-              type: 'success',
-              message: res.data.message
-            });
-
-          } else {
-            this.$message({
-              type: 'warning',
-              message: res.data.message
-            });
-          }
-        }).catch(err => {
-          console.error(err)
-        });
-      },
-
-      jstimehandle(val) {
-        if (val === '') {
-          return '----'
-        } else if (val === '0001-01-01T08:00:00+08:00') {
-          return '----'
-        } else if (val === '5000-01-01T23:59:59+08:00') {
-          return '永久'
-        } else {
-          val = val.replace('T', ' ')
-          return val.substring(0, 10)
-        }
-      },
-
-      formatDateTime(date) {
-        var y = date.getFullYear();
-        var m = date.getMonth() + 1;
-        m = m < 10 ? ('0' + m) : m;
-        var d = date.getDate();
-        d = d < 10 ? ('0' + d) : d;
-        var h = date.getHours();
-        var minute = date.getMinutes();
-        minute = minute < 10 ? ('0' + minute) : minute;
-        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
-      }
-    }
-  }
-
-</script>
-
-<style lang="scss">
-  .el-pagination {
-    margin: 1rem 0 2rem;
-    text-align: right;
-  }
-</style>

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

@@ -11,214 +11,74 @@
     <el-card class="box-card" style="mini-height: calc(100vh - 113px);">
       <div slot="header">
         <span>
-          <i class="icon icon-table2"></i> 编辑
+          <i class="icon icon-table2"></i> 编辑-服务商年度评价信息
         </span>
-      </div>
-      <el-tabs v-model="activeName" style="margin-top: -10px">
-        <el-tab-pane label="合同内容" name="1">
-          <el-card class="box-card" style="mini-height: calc(100vh - 113px);">
-            <div slot="header">
-              <span>合同信息</span>
-              <span style="float: right;">
+        <span style="float: right;">
                 <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
                 <router-link :to="'/oilcontract/contract-service-year'">
                   <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
                 </router-link>
               </span>
-            </div>
-            <el-form label-width="110px" ref="EntityForm" :model="formData">
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="企业名称">
-                    <el-select ref="SupplierSelect" v-model="formData.SupplierId" placeholder="请选择" style="width: 100%" @change="supplierChangeHandler">
-                      <el-option key="1" label="天津油气公司" value="1"></el-option>
-                      <el-option key="2" label="北京管道公司" value="2"></el-option>
-                      <el-option key="3" label="上海监控公司" value="3"></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="合同分类">
-                    <el-select  v-model="formData.ContractType" placeholder="请选择" style="width: 100%">
-                      <el-option key="1" label="服务商" value="1"></el-option>
-                      <el-option key="2" label="承包商" value="2"></el-option>
-                      <el-option key="3" label="供应商" value="3"></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="项目名称">
-                    <el-input v-model="formData.ProjectName" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="合同编号">
-                    <el-input v-model="formData.ContractNo" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="工程地点">
-                    <el-input v-model="formData.ProjectPlace" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="项目负责人">
-                    <el-input v-model="formData.ProjectOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="联系人电话">
-                    <el-input v-model="formData.Telephone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="项目类别">
-                    <el-select v-model="formData.ProjectType" placeholder="请选择" style="width: 100%">
-                      <el-option key="1" label="咨询" value="1"></el-option>
-                      <el-option key="2" label="勘探" value="2"></el-option>
-                      <el-option key="3" label="设计" value="3"></el-option>
-                      <el-option key="4" label="施工" value="4"></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="合同模式">
-                    <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="是否分包">
-                    <el-select placeholder="请选择" v-model="formData.SubPackage" style="width: 100%">
-                      <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="8">
-                  <el-form-item label="合同总金额">
-                    <el-input v-model="formData.Amount" placeholder="请输入"  style="width: 100%">
-                      <template slot="append">(万元)</template>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="合同总工期">
-                    <el-input v-model="formData.ContractPeriod" placeholder="请输入"  style="width: 100%">
-                      <template slot="append">(天)</template>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="开工日期">
-                    <el-input v-model="formData.OpenDate" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="计划竣工时间">
-                    <el-input v-model="formData.PlanFinishDate" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="建设单位">
-                    <el-input v-model="formData.ConstructionUnit" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="建设负责人">
-                    <el-input v-model="formData.ConstructionOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="手机号">
-                    <el-input v-model="formData.ConstructionTelphone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="施工单位">
-                    <el-input v-model="formData.BuildUnit" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="施工负责人">
-                    <el-input v-model="formData.BuildOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="手机号">
-                    <el-input v-model="formData.BuildTelphone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="监理单位">
-                    <el-input v-model="formData.SuperviseUnit" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="监理负责人">
-                    <el-input v-model="formData.SuperviseOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="手机号">
-                    <el-input v-model="formData.SuperviseTelphone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="质量监督单位">
-                    <el-input v-model="formData.QualityUnit" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="质量监督负责人">
-                    <el-input v-model="formData.QualityOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="手机号">
-                    <el-input v-model="formData.QualityTelphone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="24">
-                  <el-form-item label="备注">
-                    <el-input type="textarea" v-model="formData.Remark" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-          </el-card>
-        </el-tab-pane>
-        <el-tab-pane label="评分项目" name="2">
-          <evaluation-list></evaluation-list>
-        </el-tab-pane>
-      </el-tabs>
+      </div>
+      <el-form label-width="110px" ref="EntityForm" :model="formData">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="服务商名称">
+              <el-select ref="SupplierSelect" v-model="formData.SupplierId" placeholder="请选择" style="width: 100%" @change="supplierChangeHandler">
+                <el-option key="1" label="天津油气公司" value="1"></el-option>
+                <el-option key="2" label="北京管道公司" value="2"></el-option>
+                <el-option key="3" label="上海监控公司" value="3"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="评价得分">
+              <el-input v-model="formData.ProjectName" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="项目管理(40分)">
+              <el-input v-model="formData.ContractNo" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="HSE管理(30分)">
+              <el-input v-model="formData.ProjectPlace" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="合同履行(15分)">
+              <el-input v-model="formData.ProjectOwner" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="企业诚信(15分)">
+              <el-input v-model="formData.Telephone" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="评价结果">
+              <el-select v-model="formData.ProjectType" placeholder="请选择" style="width: 100%">
+                <el-option key="1" label="优秀" value="1"></el-option>
+                <el-option key="2" label="合格" value="2"></el-option>
+                <el-option key="3" label="不合格" value="3"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="备注">
+              <el-input type="textarea" v-model="formData.Remark" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </el-card>
 
 
@@ -230,7 +90,6 @@
     mapGetters
   } from 'vuex'
   import api from '@/api/oilcontract/contract'
-  import evaluationList from './evaluationlist'
   export default {
     computed: {
       ...mapGetters({
@@ -238,9 +97,6 @@
       })
     },
     name: 'oilcontractEdit',
-    components: {
-      evaluationList,
-    },
 
     data() {
       return {

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

@@ -35,7 +35,7 @@
         </el-form>
       </div>
       <el-table size="mini" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-        <el-table-column label="操作" min-width="100" align="center" fixed>
+        <el-table-column label="操作" header-align="center" width="100" align="center" fixed>
           <template slot-scope="scope">
             <router-link :to="'/oilsupplier/oilcontract/' + scope.row.Id + '/operation'">
               <el-button type="text" title="编辑" size="small" icon="el-icon-edit"></el-button>
@@ -59,14 +59,19 @@
           </template>
         </el-table-column>
 
-        <el-table-column v-for="column in tableColumns" :key="column.Id"
-                         v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable min-width="100" :label="column.label" align="center" show-overflow-tooltip></el-table-column>
-
-        <!--<el-table-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ jstimehandle(scope.row.CreateOn+'') }}
-          </template>
-        </el-table-column>-->
+        <el-table-column prop="SupplierName" header-align="center" label="服务商名称"></el-table-column>
+        <el-table-column prop="ContractNo" header-align="center" label="评价得分" width="120"></el-table-column>
+        <el-table-column label="评价内容及得分" header-align="center">
+          <el-table-column prop="ProjectPlace" header-align="center" label="项目管理(40分)" width="120"></el-table-column>
+          <el-table-column prop="ProjectOwner" header-align="center" label="HSE管理(30分)" width="120"></el-table-column>
+          <el-table-column prop="Telephone" header-align="center" label="合同履行(15分)" width="120"></el-table-column>
+          <el-table-column prop="ProjectType" header-align="center" label="企业诚信(15分)" width="120"></el-table-column>
+        </el-table-column>
+        <el-table-column label="评价结果" header-align="center">
+          <el-table-column prop="ProjectPlace" header-align="center" label="优秀" width="80"></el-table-column>
+          <el-table-column prop="ProjectOwner" header-align="center" label="合格" width="80"></el-table-column>
+          <el-table-column prop="Telephone" header-align="center" label="不合格" width="80"></el-table-column>
+        </el-table-column>
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
                      :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
@@ -367,191 +372,51 @@
         },
         tableColumns: [
 
-          {
-            prop: "Id",
-            label: '',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SupplierId",
-            label: '供应商ID',
-            width: 100,
-            sort: true
-          },
-
           {
             prop: "SupplierName",
-            label: '企业名称',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ProjectName",
-            label: '项目名称',
+            label: '服务商名称',
             width: 100,
             sort: true
           },
 
           {
             prop: "ContractNo",
-            label: '合同编号',
+            label: '评价得分',
             width: 100,
             sort: true
           },
 
           {
             prop: "ProjectPlace",
-            label: '工程地点',
+            label: '项目管理(40分)',
             width: 100,
             sort: true
           },
 
           {
             prop: "ProjectOwner",
-            label: '项目负责人',
+            label: 'HSE管理(30分)',
             width: 100,
             sort: true
           },
 
           {
             prop: "Telephone",
-            label: '联系人电话',
+            label: '合同履行(15分)',
             width: 100,
             sort: true
           },
 
           {
             prop: "ProjectType",
-            label: '项目类别',
+            label: '企业诚信(15分)',
             width: 100,
             sort: true
           },
 
           {
             prop: "ContractMode",
-            label: '合同模式',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Amount",
-            label: '合同总金额(万元)',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ContractPeriod",
-            label: '合同总工期(天)',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "OpenDate",
-            label: '开工日期',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "PlanFinishDate",
-            label: '计划竣工时间',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ConstructionUnit",
-            label: '建设单位',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ConstructionOwner",
-            label: '建设负责人',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ConstructionTelphone",
-            label: '手机号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "BuildUnit",
-            label: '施工单位',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "BuildOwner",
-            label: '施工负责人',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "BuildTelphone",
-            label: '手机号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SuperviseUnit",
-            label: '监理单位',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SuperviseOwner",
-            label: '监理负责人',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SuperviseTelphone",
-            label: '手机号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "QualityUnit",
-            label: '质量监督单位',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "QualityOwner",
-            label: '质量监督负责人',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "QualityTelphone",
-            label: '手机号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Remark",
-            label: '备注',
+            label: '评价结果',
             width: 100,
             sort: true
           }]

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

@@ -1,38 +1,55 @@
 <template>
   <div>
-    <el-table size="mini" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-      <el-table-column label="操作" min-width="100" align="center" fixed>
+    <el-table highlight-current-row :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
+      <el-table-column
+        property="SequenceNo"
+        label="序号"
+        header-align="center"
+        width="80">
         <template slot-scope="scope">
-          <router-link :to="'/oilsupplier/oilcontractevaluationitems/' + scope.row.Id + '/operation'">
-            <el-button type="text" title="编辑" size="small" icon="el-icon-edit"></el-button>
-          </router-link>
-
-          <el-popover placement="top" title="提示" v-model="scope.row.deleteConfirmFlag">
-            <el-alert
-              title=""
-              description="确认要删除吗？"
-              type="warning"
-              :closable="false">
-            </el-alert>
-            <br/>
-            <div style="text-align: right; margin: 0">
-              <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
-            </div>
-            <el-button slot="reference" type="text" title="删除" style="margin-left:3px" size="small" @click="scope.row.deleteConfirmFlag = true">
-              <i class="el-icon-delete"></i>
-            </el-button>
-          </el-popover>
+          <span v-if="scope.row.type=='SUM'" style="font-weight: bold">{{scope.row.SequenceNo}}</span>
+          <span v-else>{{scope.row.SequenceNo}}</span>
         </template>
       </el-table-column>
-
-      <el-table-column v-for="column in tableColumns" :key="column.Id"
-                       v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable min-width="100" :label="column.label" align="center" show-overflow-tooltip></el-table-column>
-
-      <!--<el-table-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
+      <el-table-column
+        property="Content"
+        header-align="center"
+        label="评价内容">
+        <template slot-scope="scope">
+          <span v-if="scope.row.type=='SUM'" style="font-weight: bold">{{scope.row.Content}}</span>
+          <span v-else>{{scope.row.Content}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        property="NormalScore"
+        label="标准分值"
+        header-align="center"
+        width="120">
         <template slot-scope="scope">
-          {{ jstimehandle(scope.row.CreateOn+'') }}
+          <span v-if="scope.row.type=='SUM'" style="font-weight: bold">{{scope.row.NormalScore}}</span>
+          <span v-else-if="scope.row.NormalScore==0" style="font-weight: bold"></span>
+          <span v-else>{{scope.row.NormalScore}}</span>
         </template>
-      </el-table-column>-->
+      </el-table-column>
+      <el-table-column
+        property="Score"
+        label="实得分数"
+        header-align="center"
+        width="120">
+        <template slot-scope="scope">
+          <span v-if="scope.row.type=='SUM'" style="font-weight: bold">{{scope.row.Score}}</span>
+          <el-input v-else size="mini" placeholder="实得分数" v-model="scope.row.Score"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column
+        property="Reason"
+        label="不合格原因"
+        header-align="center"
+        width="120">
+        <template slot-scope="scope">
+          <span style="font-weight: bold"><el-tag size="mini">不合格原因</el-tag></span>
+        </template>
+      </el-table-column>
     </el-table>
     <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
                    :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
@@ -83,80 +100,123 @@
           ModifiedUserId: '',
           ModifiedBy: '',
 
-        },
-        tableColumns: [
-
-          {
-            prop: "Id",
-            label: 'ID',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ContractId",
-            label: '合同表ID',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ParentId",
-            label: '上级节点ID',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SequenceNo",
-            label: '序号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Content",
-            label: '评价内容',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "NormalScore",
-            label: '标准分值',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Score",
-            label: '实得分数',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "LevelCode",
-            label: '级别',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Remark",
-            label: '备注',
-            width: 100,
-            sort: true
-          }
-        ]
+        }
       }
     },
     created() {
       //查询条件初始值备份
       Object.assign(this.searchFormReset, this.searchForm);
       //查询列表
-      this.initDatas();
+      //this.initDatas();
       //this.getDictOptions()
+
+      this.entityList = [
+        {
+          SequenceNo: '1.',
+          type: 'SUM',
+          Content: '项目管理',
+          NormalScore: 40,
+          Score: 40
+        },
+        {
+          SequenceNo: '1.1',
+          type: 'ITEM',
+          Content: '施工管理',
+          NormalScore: 15,
+          Score: 15
+        },
+        {
+          SequenceNo: '1.2',
+          type: 'ITEM',
+          Content: '质量管理',
+          NormalScore: 15,
+          Score: 15
+        },
+        {
+          SequenceNo: '1.3',
+          type: 'ITEM',
+          Content: '质量验收',
+          NormalScore: 10,
+          Score: 10
+        },
+        {
+          SequenceNo: '2.',
+          type: 'SUM',
+          Content: 'HSE管理',
+          NormalScore: 30,
+          Score: 30
+        },
+        {
+          SequenceNo: '2.1',
+          type: 'ITEM',
+          Content: 'HSE检查及整改',
+          NormalScore: 10,
+          Score: 10
+        },
+        {
+          SequenceNo: '2.2',
+          type: 'ITEM',
+          Content: '安全管理',
+          NormalScore: 10,
+          Score: 10
+        },
+        {
+          SequenceNo: '2.3',
+          type: 'ITEM',
+          Content: '环境保护',
+          NormalScore: 5,
+          Score: 5
+        },
+        {
+          SequenceNo: '2.4',
+          type: 'ITEM',
+          Content: 'HSE评价',
+          NormalScore: 5,
+          Score: 5
+        },
+        {
+          SequenceNo: '3.',
+          type: 'SUM',
+          Content: '合同履行',
+          NormalScore: 15,
+          Score: 15
+        },
+        {
+          SequenceNo: '3.1',
+          type: 'ITEM',
+          Content: '合同签订及履行',
+          NormalScore: 10,
+          Score: 10
+        },
+        {
+          SequenceNo: '3.2',
+          type: 'ITEM',
+          Content: '分包转包',
+          NormalScore: 5,
+          Score: 5
+        },
+        {
+          SequenceNo: '4.',
+          type: 'SUM',
+          Content: '企业诚信',
+          NormalScore: 15,
+          Score: 15
+        },
+        {
+          SequenceNo: '4.1',
+          type: 'ITEM',
+          Content: '质量业绩',
+          NormalScore: 5,
+          Score: 5
+        },
+        {
+          SequenceNo: '4.2',
+          type: 'ITEM',
+          Content: '规范经营',
+          NormalScore: 10,
+          Score: 10
+        }
+      ]
     },
     methods: {
       initDatas() {

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

@@ -4,32 +4,34 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/oilsupplier/oilcontract' }">合同表</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilcontract/contract-service' }">服务商合同表</el-breadcrumb-item>
       <el-breadcrumb-item>编辑</el-breadcrumb-item>
     </el-breadcrumb>
 
     <el-card class="box-card" style="mini-height: calc(100vh - 113px);">
       <div slot="header">
         <span>
-          <i class="icon icon-table2"></i> 编辑
+          <i class="icon icon-table2"></i> 编辑 - 服务商合同
+        </span>
+        <span style="float: right;">
+          <router-link :to="'/oilcontract/contract-service'">
+            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
+          </router-link>
         </span>
       </div>
       <el-tabs v-model="activeName" style="margin-top: -10px">
         <el-tab-pane label="合同内容" name="1">
-          <el-card class="box-card" style="mini-height: calc(100vh - 113px);">
+          <el-card class="box-card">
             <div slot="header">
               <span>合同信息</span>
               <span style="float: right;">
                 <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
-                <router-link :to="'/oilcontract/contract'">
-                  <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
-                </router-link>
               </span>
             </div>
             <el-form label-width="110px" ref="EntityForm" :model="formData">
               <el-row>
                 <el-col :span="8">
-                  <el-form-item label="企业名称">
+                  <el-form-item label="服务商名称">
                     <el-select ref="SupplierSelect" v-model="formData.SupplierId" placeholder="请选择" style="width: 100%" @change="supplierChangeHandler">
                       <el-option key="1" label="天津油气公司" value="1"></el-option>
                       <el-option key="2" label="北京管道公司" value="2"></el-option>
@@ -38,46 +40,41 @@
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="8">
-                  <el-form-item label="合同分类">
-                    <el-select  v-model="formData.ContractType" placeholder="请选择" style="width: 100%">
-                      <el-option key="1" label="服务商" value="1"></el-option>
-                      <el-option key="2" label="承包商" value="2"></el-option>
-                      <el-option key="3" label="供应商" value="3"></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="项目名称">
-                    <el-input v-model="formData.ProjectName" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
+                <!-- <el-col :span="8">
+                   <el-form-item label="合同分类">
+                     <el-select  v-model="formData.ContractType" placeholder="请选择" style="width: 100%">
+                       <el-option key="1" label="服务商" value="1"></el-option>
+                       <el-option key="2" label="承包商" value="2"></el-option>
+                       <el-option key="3" label="供应商" value="3"></el-option>
+                     </el-select>
+                   </el-form-item>
+                 </el-col>-->
 
                 <el-col :span="8">
-                  <el-form-item label="合同编号">
-                    <el-input v-model="formData.ContractNo" placeholder="请输入"  style="width: 100%"></el-input>
+                  <el-form-item label="评价单位名称">
+                    <el-input v-model="formData.ProjectPlace" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="工程地点">
+                  <el-form-item label="评价年度">
                     <el-input v-model="formData.ProjectPlace" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="项目负责人">
-                    <el-input v-model="formData.ProjectOwner" placeholder="请输入"  style="width: 100%"></el-input>
+                  <el-form-item label="承建项目名称">
+                    <el-input v-model="formData.ProjectName" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="联系人电话">
-                    <el-input v-model="formData.Telephone" placeholder="请输入"  style="width: 100%"></el-input>
+                  <el-form-item label="合同编号">
+                    <el-input v-model="formData.ContractNo" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
+
                 <el-col :span="8">
                   <el-form-item label="项目类别">
                     <el-select v-model="formData.ProjectType" placeholder="请选择" style="width: 100%">
@@ -89,11 +86,11 @@
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="8">
-                  <el-form-item label="合同模式">
-                    <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="合同模式">
+                     <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="是否分包">
@@ -103,119 +100,11 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="合同总金额">
-                    <el-input v-model="formData.Amount" placeholder="请输入"  style="width: 100%">
-                      <template slot="append">(万元)</template>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="合同总工期">
-                    <el-input v-model="formData.ContractPeriod" placeholder="请输入"  style="width: 100%">
-                      <template slot="append">(天)</template>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="开工日期">
-                    <el-input v-model="formData.OpenDate" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="计划竣工时间">
-                    <el-input v-model="formData.PlanFinishDate" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="建设单位">
-                    <el-input v-model="formData.ConstructionUnit" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="建设负责人">
-                    <el-input v-model="formData.ConstructionOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="手机号">
-                    <el-input v-model="formData.ConstructionTelphone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="施工单位">
-                    <el-input v-model="formData.BuildUnit" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="施工负责人">
-                    <el-input v-model="formData.BuildOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="手机号">
-                    <el-input v-model="formData.BuildTelphone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="监理单位">
-                    <el-input v-model="formData.SuperviseUnit" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="监理负责人">
-                    <el-input v-model="formData.SuperviseOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="手机号">
-                    <el-input v-model="formData.SuperviseTelphone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="质量监督单位">
-                    <el-input v-model="formData.QualityUnit" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="质量监督负责人">
-                    <el-input v-model="formData.QualityOwner" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="手机号">
-                    <el-input v-model="formData.QualityTelphone" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="24">
-                  <el-form-item label="备注">
-                    <el-input type="textarea" v-model="formData.Remark" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
               </el-row>
             </el-form>
           </el-card>
         </el-tab-pane>
-        <el-tab-pane label="评分项目" name="2">
+        <el-tab-pane label="业绩评价" name="2">
           <evaluation-list></evaluation-list>
         </el-tab-pane>
       </el-tabs>

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

@@ -376,7 +376,7 @@
 
           {
             prop: "SupplierId",
-            label: '供应商ID',
+            label: '评价单位',
             width: 100,
             sort: true
           },