前后:合同评价查询页面

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

@@ -1561,6 +1561,8 @@ func (this *OilContractController) UpdateEntity() {
 
 		"SupplierName",
 
+		"ContractClass",
+
 		"Status",
 
 		"SettleStatus",

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

@@ -1,232 +0,0 @@
-<template>
-  <div>
-    <el-table highlight-current-row :data="entityListData.entityList" border height="calc(100vh - 243px)"
-              style="width: 100%" v-loading="tableLoading">
-      <el-table-column
-        property="SequenceNo"
-        label="序号"
-        header-align="center"
-        align="center"
-        width="80">
-      </el-table-column>
-      <el-table-column
-        property="Content"
-        header-align="center"
-        label="评价项目">
-      </el-table-column>
-      <el-table-column
-        property="Value"
-        label="是否满足"
-        header-align="center"
-        align="center"
-        width="100">
-        <template slot-scope="scope">
-          <el-button size="mini" :disabled="!disabledForm" type="success" v-if="Number(scope.row.Value)>0"
-                     @click="entityListData.entityList[scope.$index].Value=0">是
-          </el-button>
-          <el-button size="mini" :disabled="!disabledForm" type="danger" v-else
-                     @click="entityListData.entityList[scope.$index].Value=1">否
-          </el-button>
-        </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';
-import api from '@/api/oilcontract/contract'
-
-export default {
-  computed: {
-    ...mapGetters({
-      authUser: 'authUser'
-    })
-  },
-  name: 'oilcontractevaluationitems',
-  props: {
-    // 评价id
-    evaluateId: {
-      type: null,
-      default: ''
-    },
-    // 类型 0 二级部门创建 1 专业处创建
-    category: {
-      type: null,
-      default: ''
-    },
-    // 项目类型
-    ContractClass: {
-      type: null,
-      default: ''
-    },
-    // 是否禁用
-    disabledForm: {
-      type: null,
-      default: false
-    },
-    // 二级单位提交还是业务处室提交
-    isBusiness: {
-      type: null,
-      default: 0
-    }
-  },
-  data () {
-    return {
-      tableLoading: false,
-      dialogVisible: false,
-      // 列表数据
-      entityListData: {
-        entityList: []
-      },
-      // 分页参数
-      size: 10,
-      currentPage: 1,
-      currentItemCount: 0,
-      // 列表排序
-      Column: {
-        Order: '',
-        Prop: ''
-      },
-      // 查询时间new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()
-      CreateOn: [],
-      // 查询项
-      searchFormReset: {}
-
-    }
-  },
-  created () {
-    // 查询条件初始值备份
-    Object.assign(this.searchFormReset, this.searchForm)
-    // 查询列表
-    // this.initDatas();
-    // this.getDictOptions()
-
-    // 判断是编辑状态还是新增状态
-    if (this.evaluateId == 0) {
-      this.initDatas()
-    } else {
-      this.editDatas()
-    }
-  },
-  methods: {
-    // aa(){
-    //   if (this.evaluateId == 0) {
-    //     this.initDatas();
-    //   } else {
-    //     this.editDatas();
-    //   }
-    // },
-    initDatas () {
-      this.tableLoading = true
-      var data = {
-        Category: 2 // 1分值; 2布尔
-        // ContractClass 对应的是表中Type
-      }
-      console.log('初始化了没有？？？')
-      api.evaluationItemsOnelist(data, this.ContractClass, this.$axios).then(res => {
-        this.tableLoading = false
-        console.log('上级节点内容', res)
-        var data = res.data.items
-        var list = []
-        for (var index = 0; index < data.length; index++) {
-          data[index].typeStatus = index
-          data[index].Value = 1
-          data[index].Score = '0'
-          data[index].Category = 2
-          // this.$set(data[index],'NormalScore','0')
-          list.push(data[index])
-
-          if (data[index].Son != null && data[index].Son != undefined) {
-            for (var k = 0; k < data[index].Son.length; k++) {
-              data[index].Son[k].Category = 2
-              data[index].Son[k].typeStatus = index
-              data[index].Son[k].Value = 1
-              data[index].Son[k].Score = '0'
-              // data[index].Son[k].NormalScore = '0'
-              list.push(data[index].Son[k])
-            }
-          }
-        }
-        this.entityListData.entityList = list
-        console.log('处理完的数据', list)
-      }).catch(err => {
-        this.tableLoading = false
-        console.error(err)
-      })
-    },
-    // 初始数据
-    editDatas () {
-      this.tableLoading = true
-      console.log('处室初始的分类是什么 ', this.category)
-      var data = {
-        ContentReviewId: this.evaluateId,
-        Category: this.isBusiness == 1 ? 2 : this.category,
-        Type: 2
-      }
-      api.contractEvaluationTree(data, this.$axios).then(res => {
-        this.tableLoading = false
-        let data = res.data.items
-        let list = []
-        if (data) {
-          for (let index = 0; index < data.length; index++) {
-            data[index].typeStatus = index
-            data[index].Value = data[index].Value === undefined || data[index].Value === '' ? '0' : data[index].Value
-            data[index].Category = 2
-            list.push(data[index])
-
-            if (data[index].Son != null && data[index].Son != undefined) {
-              for (var k = 0; k < data[index].Son.length; k++) {
-                data[index].Son[k].Category = 2
-                // data[index].Son[k].typeStatus = index
-                // data[index].Son[k].Value = data[index].Son[k].Value==undefined||data[index].Son[k].Value==''?'0':data[index].Value
-                // list.push(data[index].Son[k])
-              }
-            }
-          }
-        }
-        this.entityListData.entityList = list
-        console.log('处理完的数据', list)
-      }).catch(err => {
-        this.tableLoading = false
-        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/components/oilcontract/contractSelect.vue

@@ -143,27 +143,155 @@
             </el-card>
           </el-tab-pane>
           <el-tab-pane label="业绩评价" name="2">
-            <evaluation-list ref="evaluation_list_one" :evaluateId="formData.Id" category="0" v-if="contractData.ContractClass"
-                             :ContractClass="contractData.ContractClass"
-                             :isBusiness="isBusiness"
-                             :disabledForm="auditBtnBoolean"></evaluation-list>
-          </el-tab-pane>
-          <el-tab-pane label="基本条件评价" name="4" v-if="contractData.ContractClass=='02'">
-            <base-list ref="evaluation_listType_one" :evaluateId="formData.Id" category="0"
-                       :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBoolean"></base-list>
+            <el-form ref="formEvaluation" :model="entityListData" label-width="0px">
+              <el-table highlight-current-row :data="entityListData.entityList" border height="calc(100vh - 243px)"
+                        style="width: 100%"  v-loading="tableLoading">
+                <el-table-column
+                  property="SequenceNo"
+                  label="序号"
+                  header-align="center"
+                  width="80">
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.LevelCode==1" 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.LevelCode==1" 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.LevelCode==1" 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">
+                    <el-form-item style="margin-bottom: 0px;" :prop="'entityList.' + scope.$index + '.Score'"
+                                   >
+              <span v-if="scope.row.LevelCode==1"
+                    style="font-weight: bold">{{ scoreFun(scope.row.typeStatus, scope.$index) }}</span>
+                      <el-input v-else size="mini" :min="0" :max="scope.row.NormalScore" type="number" placeholder="实得分数"
+                                disabled v-model="scope.row.Score"
+                                ></el-input>
+                    </el-form-item>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  property="Reason"
+                  label="扣分原因"
+                  header-align="center"
+                  width="120"
+                  align="center">
+                  <template slot-scope="scope">
+                    <el-popover
+                      placement="top-start"
+                      title="原因"
+                      width="200"
+                      trigger="hover"
+                      :content="scope.row.Remark==''||scope.row.Remark==null?'空':scope.row.Remark" v-if="scope.row.LevelCode!=1">
+                      <el-button slot="reference"  type="primary" icon="el-icon-edit" size="mini">编辑
+                      </el-button>
+                    </el-popover>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <div class="" style="display: flex;align-items: center;justify-content: flex-end;margin: 18px 0;">
+                <div>标准总分：{{ standardNum }}分</div>
+                <div style="margin-left: 18px;margin-right: 140px;">实得总分：{{ getNumFun() }}分</div>
+              </div>
+            </el-form>
           </el-tab-pane>
-          <!-- v-if="formData.Status=='4'||Number(formData.Status)>4" -->
           <el-tab-pane label="专业处室业绩评价" name="3"
-                       v-if="(departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<=-4) && (formData.IsBusiness != 1 && byBus != 1)">
-            <evaluation-list ref="evaluation_list_two" :evaluateId="formData.Id" category="1" v-if="contractData.ContractClass"
-                             :ContractClass="contractData.ContractClass"
-                             :disabledForm="auditBtnBooleanZhuan"></evaluation-list>
-          </el-tab-pane>
-          <el-tab-pane
-            v-if="(departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<=-4)&&contractData.ContractClass=='02' && (formData.IsBusiness != 1 && byBus != 1)"
-            label="专业处室基本条件评价" name="5">
-            <base-list ref="evaluation_listType_two" :evaluateId="formData.Id" category="1"
-                       :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBooleanZhuan"></base-list>
+                       v-if="(Number(formData.Status)>=3||Number(formData.Status)<=-4) && (formData.IsBusiness != 1)">
+            <el-form ref="formEvaluation" :model="entityListData1" label-width="0px">
+              <el-table highlight-current-row :data="entityListData1.entityList" border height="calc(100vh - 243px)"
+                        style="width: 100%"  v-loading="tableLoading">
+                <el-table-column
+                  property="SequenceNo"
+                  label="序号"
+                  header-align="center"
+                  width="80">
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.LevelCode==1" 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.LevelCode==1" 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.LevelCode==1" 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">
+                    <el-form-item style="margin-bottom: 0px;" :prop="'entityList.' + scope.$index + '.Score'"
+                                   >
+              <span v-if="scope.row.LevelCode==1"
+                    style="font-weight: bold">{{ scoreFun1(scope.row.typeStatus, scope.$index) }}</span>
+                      <el-input v-else size="mini" :min="0" :max="scope.row.NormalScore" type="number" placeholder="实得分数"
+                                disabled v-model="scope.row.Score"
+                                ></el-input>
+                    </el-form-item>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  property="Reason"
+                  label="扣分原因"
+                  header-align="center"
+                  width="120"
+                  align="center">
+                  <template slot-scope="scope">
+                    <el-popover
+                      placement="top-start"
+                      title="原因"
+                      width="200"
+                      trigger="hover"
+                      :content="scope.row.Remark==''||scope.row.Remark==null?'空':scope.row.Remark" v-if="scope.row.LevelCode!=1">
+                      <el-button slot="reference"  type="primary" icon="el-icon-edit" size="mini">编辑
+                      </el-button>
+                    </el-popover>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <div class="" style="display: flex;align-items: center;justify-content: flex-end;margin: 18px 0;">
+                <div>标准总分：{{ standardNum }}分</div>
+                <div style="margin-left: 18px;margin-right: 140px;">实得总分：{{ getNumFun1() }}分</div>
+              </div>
+            </el-form>
           </el-tab-pane>
 
           <el-tab-pane label="审批流程" name="6" :disabled="formData.Status==0">
@@ -326,27 +454,222 @@
             </el-card>
           </el-tab-pane>
           <el-tab-pane label="业绩评价" name="2">
-            <evaluation-list ref="evaluation_list_one" :evaluateId="formData.Id" category="0" v-if="contractData.ContractClass"
-                             :ContractClass="contractData.ContractClass"
-                             :isBusiness="isBusiness"
-                             :disabledForm="auditBtnBoolean"></evaluation-list>
+            <el-form ref="formEvaluation" :model="entityListData" label-width="0px">
+              <el-table highlight-current-row :data="entityListData.entityList" border height="calc(100vh - 243px)"
+                        style="width: 100%"  v-loading="tableLoading">
+                <el-table-column
+                  property="SequenceNo"
+                  label="序号"
+                  header-align="center"
+                  width="80">
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.LevelCode==1" 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.LevelCode==1" 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.LevelCode==1" 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">
+                    <el-form-item style="margin-bottom: 0px;" :prop="'entityList.' + scope.$index + '.Score'"
+                    >
+              <span v-if="scope.row.LevelCode==1"
+                    style="font-weight: bold">{{ scoreFun(scope.row.typeStatus, scope.$index) }}</span>
+                      <el-input v-else size="mini" :min="0" :max="scope.row.NormalScore" type="number" placeholder="实得分数"
+                                disabled v-model="scope.row.Score"
+                      ></el-input>
+                    </el-form-item>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  property="Reason"
+                  label="扣分原因"
+                  header-align="center"
+                  width="120"
+                  align="center">
+                  <template slot-scope="scope">
+                    <el-popover
+                      placement="top-start"
+                      title="原因"
+                      width="200"
+                      trigger="hover"
+                      :content="scope.row.Remark==''||scope.row.Remark==null?'空':scope.row.Remark" v-if="scope.row.LevelCode!=1">
+                      <el-button slot="reference"  type="primary" icon="el-icon-edit" size="mini">编辑
+                      </el-button>
+                    </el-popover>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <div class="" style="display: flex;align-items: center;justify-content: flex-end;margin: 18px 0;">
+                <div>标准总分：{{ standardNum }}分</div>
+                <div style="margin-left: 18px;margin-right: 140px;">实得总分：{{ getNumFun() }}分</div>
+              </div>
+            </el-form>
           </el-tab-pane>
-          <!-- v-if="formData.Status=='4'||Number(formData.Status)>4" -->
-          <el-tab-pane label="基本条件评价" name="4" v-if="contractData.ContractClass=='02'">
-            <base-list ref="evaluation_listType_one" :evaluateId="formData.Id" category="0"
-                       :ContractClass="contractData.ContractClass" :isBusiness="isBusiness" :disabledForm="auditBtnBoolean"></base-list>
+          <el-tab-pane label="基本条件评价" name="4">
+            <el-table highlight-current-row :data="entityListData3.entityList" border height="calc(100vh - 243px)"
+                      style="width: 100%" v-loading="tableLoading3">
+              <el-table-column
+                property="SequenceNo"
+                label="序号"
+                header-align="center"
+                align="center"
+                width="80">
+              </el-table-column>
+              <el-table-column
+                property="Content"
+                header-align="center"
+                label="评价项目">
+              </el-table-column>
+              <el-table-column
+                property="Value"
+                label="是否满足"
+                header-align="center"
+                align="center"
+                width="100">
+                <template slot-scope="scope">
+                  <el-button size="mini" disabled type="success" v-if="Number(scope.row.Value)>0"
+                             @click="entityListData.entityList[scope.$index].Value=0">是
+                  </el-button>
+                  <el-button size="mini" disabled type="danger" v-else
+                             @click="entityListData.entityList[scope.$index].Value=1">否
+                  </el-button>
+                </template>
+              </el-table-column>
+            </el-table>
           </el-tab-pane>
           <el-tab-pane label="专业处室业绩评价" name="3"
-                       v-if="(departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<=-4) && (formData.IsBusiness != 1 && byBus !=1)">
-            <evaluation-list ref="evaluation_list_two" :evaluateId="formData.Id" category="1" v-if="contractData.ContractClass"
-                             :ContractClass="contractData.ContractClass"
-                             :disabledForm="auditBtnBooleanZhuan"></evaluation-list>
+                       v-if="(Number(formData.Status)>=3||Number(formData.Status)<=-4) && (formData.IsBusiness != 1)">
+            <el-form ref="formEvaluation" :model="entityListData1" label-width="0px">
+              <el-table highlight-current-row :data="entityListData1.entityList" border height="calc(100vh - 243px)"
+                        style="width: 100%"  v-loading="tableLoading">
+                <el-table-column
+                  property="SequenceNo"
+                  label="序号"
+                  header-align="center"
+                  width="80">
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.LevelCode==1" 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.LevelCode==1" 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.LevelCode==1" 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">
+                    <el-form-item style="margin-bottom: 0px;" :prop="'entityList.' + scope.$index + '.Score'"
+                    >
+              <span v-if="scope.row.LevelCode==1"
+                    style="font-weight: bold">{{ scoreFun1(scope.row.typeStatus, scope.$index) }}</span>
+                      <el-input v-else size="mini" :min="0" :max="scope.row.NormalScore" type="number" placeholder="实得分数"
+                                disabled v-model="scope.row.Score"
+                      ></el-input>
+                    </el-form-item>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  property="Reason"
+                  label="扣分原因"
+                  header-align="center"
+                  width="120"
+                  align="center">
+                  <template slot-scope="scope">
+                    <el-popover
+                      placement="top-start"
+                      title="原因"
+                      width="200"
+                      trigger="hover"
+                      :content="scope.row.Remark==''||scope.row.Remark==null?'空':scope.row.Remark" v-if="scope.row.LevelCode!=1">
+                      <el-button slot="reference"  type="primary" icon="el-icon-edit" size="mini">编辑
+                      </el-button>
+                    </el-popover>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <div class="" style="display: flex;align-items: center;justify-content: flex-end;margin: 18px 0;">
+                <div>标准总分：{{ standardNum }}分</div>
+                <div style="margin-left: 18px;margin-right: 140px;">实得总分：{{ getNumFun1() }}分</div>
+              </div>
+            </el-form>
           </el-tab-pane>
           <el-tab-pane
-            v-if="(departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<=-4)&&contractData.ContractClass=='02' && (formData.IsBusiness != 1 && byBus != 1)"
+            v-if="(Number(formData.Status)>=3||Number(formData.Status)<=-4) && (formData.IsBusiness != 1)"
             label="专业处室基本条件评价" name="5">
-            <base-list ref="evaluation_listType_two" :evaluateId="formData.Id" category="1"
-                       :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBooleanZhuan"></base-list>
+            <el-table highlight-current-row :data="entityListData4.entityList" border height="calc(100vh - 243px)"
+                      style="width: 100%" v-loading="tableLoading4">
+              <el-table-column
+                property="SequenceNo"
+                label="序号"
+                header-align="center"
+                align="center"
+                width="80">
+              </el-table-column>
+              <el-table-column
+                property="Content"
+                header-align="center"
+                label="评价项目">
+              </el-table-column>
+              <el-table-column
+                property="Value"
+                label="是否满足"
+                header-align="center"
+                align="center"
+                width="100">
+                <template slot-scope="scope">
+                  <el-button size="mini" disabled type="success" v-if="Number(scope.row.Value)>0"
+                             @click="entityListData.entityList[scope.$index].Value=0">是
+                  </el-button>
+                  <el-button size="mini" disabled type="danger" v-else
+                             @click="entityListData.entityList[scope.$index].Value=1">否
+                  </el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+
           </el-tab-pane>
 
           <el-tab-pane label="审批流程" name="6" :disabled="formData.Status==0">
@@ -509,29 +832,156 @@
             </el-card>
           </el-tab-pane>
           <el-tab-pane label="业绩评价" name="2">
-            <evaluation-list ref="evaluation_list_one" :evaluateId="formData.Id" category="0" v-if="contractData.ContractClass"
-                             :ContractClass="contractData.ContractClass"
-                             :isBusiness="isBusiness"
-                             :disabledForm="auditBtnBoolean"></evaluation-list>
-          </el-tab-pane>
-          <el-tab-pane label="基本条件评价" name="4" v-if="contractData.ContractClass=='02'">
-            <base-list ref="evaluation_listType_one" :evaluateId="formData.Id" category="0"
-                       :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBoolean"></base-list>
+            <el-form ref="formEvaluation" :model="entityListData" label-width="0px">
+              <el-table highlight-current-row :data="entityListData.entityList" border height="calc(100vh - 243px)"
+                        style="width: 100%"  v-loading="tableLoading">
+                <el-table-column
+                  property="SequenceNo"
+                  label="序号"
+                  header-align="center"
+                  width="80">
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.LevelCode==1" 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.LevelCode==1" 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.LevelCode==1" 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">
+                    <el-form-item style="margin-bottom: 0px;" :prop="'entityList.' + scope.$index + '.Score'"
+                                   >
+              <span v-if="scope.row.LevelCode==1"
+                    style="font-weight: bold">{{ scoreFun(scope.row.typeStatus, scope.$index) }}</span>
+                      <el-input v-else size="mini" :min="0" :max="scope.row.NormalScore" type="number" placeholder="实得分数"
+                                disabled v-model="scope.row.Score"
+                                ></el-input>
+                    </el-form-item>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  property="Reason"
+                  label="扣分原因"
+                  header-align="center"
+                  width="120"
+                  align="center">
+                  <template slot-scope="scope">
+                    <el-popover
+                      placement="top-start"
+                      title="原因"
+                      width="200"
+                      trigger="hover"
+                      :content="scope.row.Remark==''||scope.row.Remark==null?'空':scope.row.Remark" v-if="scope.row.LevelCode!=1">
+                      <el-button slot="reference"  type="primary" icon="el-icon-edit" size="mini">编辑
+                      </el-button>
+                    </el-popover>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <div class="" style="display: flex;align-items: center;justify-content: flex-end;margin: 18px 0;">
+                <div>标准总分：{{ standardNum }}分</div>
+                <div style="margin-left: 18px;margin-right: 140px;">实得总分：{{ getNumFun() }}分</div>
+              </div>
+            </el-form>
           </el-tab-pane>
-          <!-- v-if="formData.Status=='4'||Number(formData.Status)>4" -->
           <el-tab-pane label="专业处室业绩评价" name="3"
-                       v-if="(departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<=-4) && (formData.IsBusiness != 1 && byBus !=1)">
-            <evaluation-list ref="evaluation_list_two" :evaluateId="formData.Id" category="1" v-if="contractData.ContractClass"
-                             :ContractClass="contractData.ContractClass"
-                             :disabledForm="auditBtnBooleanZhuan"></evaluation-list>
-          </el-tab-pane>
-          <el-tab-pane
-            v-if="((departmentBoolean||Number(formData.Status)>4||Number(formData.Status)<=-4)&&contractData.ContractClass=='02') && (formData.IsBusiness != 1 && byBus != 1)"
-            label="专业处室基本条件评价" name="5">
-            <base-list ref="evaluation_listType_two" :evaluateId="formData.Id" category="1"
-                       :ContractClass="contractData.ContractClass" :disabledForm="auditBtnBooleanZhuan"></base-list>
+                       v-if="(Number(formData.Status)>=3||Number(formData.Status)<=-4) && (formData.IsBusiness != 1)">
+            <el-form ref="formEvaluation" :model="entityListData1" label-width="0px">
+              <el-table highlight-current-row :data="entityListData1.entityList" border height="calc(100vh - 243px)"
+                        style="width: 100%"  v-loading="tableLoading">
+                <el-table-column
+                  property="SequenceNo"
+                  label="序号"
+                  header-align="center"
+                  width="80">
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.LevelCode==1" 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.LevelCode==1" 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.LevelCode==1" 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">
+                    <el-form-item style="margin-bottom: 0px;" :prop="'entityList.' + scope.$index + '.Score'"
+                                   >
+              <span v-if="scope.row.LevelCode==1"
+                    style="font-weight: bold">{{ scoreFun1(scope.row.typeStatus, scope.$index) }}</span>
+                      <el-input v-else size="mini" :min="0" :max="scope.row.NormalScore" type="number" placeholder="实得分数"
+                                disabled v-model="scope.row.Score"
+                                ></el-input>
+                    </el-form-item>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  property="Reason"
+                  label="扣分原因"
+                  header-align="center"
+                  width="120"
+                  align="center">
+                  <template slot-scope="scope">
+                    <el-popover
+                      placement="top-start"
+                      title="原因"
+                      width="200"
+                      trigger="hover"
+                      :content="scope.row.Remark==''||scope.row.Remark==null?'空':scope.row.Remark" v-if="scope.row.LevelCode!=1">
+                      <el-button slot="reference"  type="primary" icon="el-icon-edit" size="mini">编辑
+                      </el-button>
+                    </el-popover>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <div class="" style="display: flex;align-items: center;justify-content: flex-end;margin: 18px 0;">
+                <div>标准总分：{{ standardNum }}分</div>
+                <div style="margin-left: 18px;margin-right: 140px;">实得总分：{{ getNumFun1() }}分</div>
+              </div>
+            </el-form>
           </el-tab-pane>
-
           <el-tab-pane label="审批流程" name="6" :disabled="formData.Status==0">
             <el-card class="box-card mycard">
               <div slot="header"
@@ -559,20 +1009,76 @@ import WfHistory from '@/components/workflow/wfhistory.vue'
 import apiCert from '@/api/oilsupplier/suppliercert'
 import permissionApi from '@/api/oilcontract/permission'
 import submitPopup from '@/components/oilcontract/submitPopup.vue'
-import evaluationList from '@/components/oilcontract/evaluationlist.vue'
-import baseList from '@/components/oilcontract/baselist.vue'
 
 export default {
   computed: {
     ...mapGetters({
       authUser: 'authUser'
-    })
+    }),
+    scoreFun: function () {
+      return function (type, k) {
+        var num = 0
+        var list = this.entityListData.entityList
+        for (var index = 0; index < list.length; index++) {
+          var code = Number(list[index].LevelCode)
+          if (type == list[index].typeStatus && code == 2) {
+            num = num + Number(list[index].Score)
+          }
+        }
+        if (this.entityListData.entityList[k].Score != String(num)) {
+          // this.getNum = this.getNum + Number(num)
+          this.entityListData.entityList[k].Score = String(num)
+        }
+        return num
+      }
+    },
+    scoreFun1: function () {
+      return function (type, k) {
+        var num = 0
+        var list = this.entityListData1.entityList
+        for (var index = 0; index < list.length; index++) {
+          var code = Number(list[index].LevelCode)
+          if (type == list[index].typeStatus && code == 2) {
+            num = num + Number(list[index].Score)
+          }
+        }
+        if (this.entityListData1.entityList[k].Score != String(num)) {
+          // this.getNum = this.getNum + Number(num)
+          this.entityListData1.entityList[k].Score = String(num)
+        }
+        return num
+      }
+    },
+    getNumFun: function () {
+      return function () {
+        var num = 0
+        var list = this.entityListData.entityList
+        for (var index = 0; index < list.length; index++) {
+          // var code = Number(list[index].LevelCode)
+          if (list[index].LevelCode == 1) {
+            num = num + Number(list[index].Score)
+          }
+        }
+        return num
+      }
+    },
+    getNumFun1: function () {
+      return function () {
+        var num = 0
+        var list = this.entityListData1.entityList
+        for (var index = 0; index < list.length; index++) {
+          // var code = Number(list[index].LevelCode)
+          if (list[index].LevelCode == 1) {
+            num = num + Number(list[index].Score)
+          }
+        }
+        return num
+      }
+    }
   },
   name: 'contractSelect',
   components: {
-    evaluationList,
     WfHistory,
-    baseList,
     submitPopup
   },
   props: {
@@ -603,6 +1109,18 @@ export default {
       dialogVisible1: false,
       ContractId: 0,
       ReviewId: 0,
+      entityListData: {
+        entityList: []
+      },
+      entityListData1: {
+        entityList: []
+      },
+      entityListData3: {
+        entityList: []
+      },
+      entityListData4: {
+        entityList: []
+      },
       disabled: true, // 禁用
       // 业绩评价
       performance: {
@@ -639,8 +1157,14 @@ export default {
       auditBtnBooleanZhuan: true,
 
       departmentBoolean: false,
+      tableLoading: false,
+      tableLoading1: false,
+      tableLoading3: false,
+      tableLoading4: false,
       checkBUtton: false,
       saveButton: false,
+      standardNum: 0, // 标准分数
+      getNum: 0,// 实得总分
       saveButtonForBusiness: false,
       saveButtonForBusinessAudit: false
     }
@@ -654,6 +1178,140 @@ export default {
       this.initDatas()
       this.showIdDatas(this.ReviewId)
     },
+    initReviewItems () {
+      this.tableLoading = true
+      let data = {
+        ContentReviewId: this.ReviewId,
+        Category: this.formData.IsBusiness == 1 ? 2 : 0,
+        Type: 1
+      }
+      this.standardNum = 0
+      api.contractEvaluationTree(data, this.$axios).then(res => {
+        this.tableLoading = false
+        let data = res.data.items
+        let list = []
+        if (data) {
+          for (let index = 0; index < data.length; index++) {
+            data[index].typeStatus = index
+            data[index].Score = data[index].Score === undefined || data[index].Score === '' ? '0' : data[index].Score
+            data[index].Category = 1
+            list.push(data[index])
+            this.standardNum = this.standardNum + parseInt(data[index].NormalScore)
+            if (data[index].Son != null && data[index].Son !== undefined) {
+              for (let k = 0; k < data[index].Son.length; k++) {
+                data[index].Son[k].Category = 1
+                data[index].Son[k].typeStatus = index
+                data[index].Son[k].Score = data[index].Son[k].Score === undefined || data[index].Son[k].Score === '' ? '0' : data[index].Son[k].Score
+                list.push(data[index].Son[k])
+              }
+            }
+          }
+          this.entityListData.entityList = list
+        }
+      }).catch(err => {
+        this.tableLoading = false
+        console.error(err)
+      })
+    },
+    initReviewItems1 () {
+      this.tableLoading1 = true
+      let data = {
+        ContentReviewId: this.ReviewId,
+        Category: this.formData.IsBusiness == 1 ? 2 : 1,
+        Type: 1
+      }
+      api.contractEvaluationTree(data, this.$axios).then(res => {
+        this.tableLoading1 = false
+        let data = res.data.items
+        let list = []
+        if (data) {
+          for (let index = 0; index < data.length; index++) {
+            data[index].typeStatus = index
+            data[index].Score = data[index].Score === undefined || data[index].Score === '' ? '0' : data[index].Score
+            data[index].Category = 1
+            list.push(data[index])
+            if (data[index].Son != null && data[index].Son !== undefined) {
+              for (let k = 0; k < data[index].Son.length; k++) {
+                data[index].Son[k].Category = 1
+                data[index].Son[k].typeStatus = index
+                data[index].Son[k].Score = data[index].Son[k].Score === undefined || data[index].Son[k].Score === '' ? '0' : data[index].Son[k].Score
+                list.push(data[index].Son[k])
+              }
+            }
+          }
+          this.entityListData1.entityList = list
+        }
+      }).catch(err => {
+        this.tableLoading1 = false
+        console.error(err)
+      })
+    },
+    initReviewItems3 () {
+      this.tableLoading3 = true
+      let data = {
+        ContentReviewId: this.ReviewId,
+        Category: this.formData.IsBusiness == 1 ? 2 : 0,
+        Type: 2
+      }
+      api.contractEvaluationTree(data, this.$axios).then(res => {
+        this.tableLoading3 = false
+        let data = res.data.items
+        let list = []
+        if (data) {
+          for (let index = 0; index < data.length; index++) {
+            data[index].typeStatus = index
+            data[index].Score = data[index].Score === undefined || data[index].Score === '' ? '0' : data[index].Score
+            data[index].Category = 1
+            list.push(data[index])
+            if (data[index].Son != null && data[index].Son !== undefined) {
+              for (let k = 0; k < data[index].Son.length; k++) {
+                data[index].Son[k].Category = 1
+                data[index].Son[k].typeStatus = index
+                data[index].Son[k].Score = data[index].Son[k].Score === undefined || data[index].Son[k].Score === '' ? '0' : data[index].Son[k].Score
+                list.push(data[index].Son[k])
+              }
+            }
+          }
+          this.entityListData3.entityList = list
+        }
+      }).catch(err => {
+        this.tableLoading3 = false
+        console.error(err)
+      })
+    },
+    initReviewItems4 () {
+      this.tableLoading4 = true
+      let data = {
+        ContentReviewId: this.ReviewId,
+        Category: this.formData.IsBusiness == 1 ? 2 : 1,
+        Type: 2
+      }
+      api.contractEvaluationTree(data, this.$axios).then(res => {
+        this.tableLoading4 = false
+        let data = res.data.items
+        let list = []
+        if (data) {
+          for (let index = 0; index < data.length; index++) {
+            data[index].typeStatus = index
+            data[index].Score = data[index].Score === undefined || data[index].Score === '' ? '0' : data[index].Score
+            data[index].Category = 1
+            list.push(data[index])
+            if (data[index].Son != null && data[index].Son !== undefined) {
+              for (let k = 0; k < data[index].Son.length; k++) {
+                data[index].Son[k].Category = 1
+                data[index].Son[k].typeStatus = index
+                data[index].Son[k].Score = data[index].Son[k].Score === undefined || data[index].Son[k].Score === '' ? '0' : data[index].Son[k].Score
+                list.push(data[index].Son[k])
+              }
+            }
+          }
+          this.entityListData4.entityList = list
+        }
+      }).catch(err => {
+        this.tableLoading4 = false
+        console.error(err)
+      })
+    },
     exportExcel () {
       api.docexportEle(this.formData.Id, this.$axios)
         .then(res => {
@@ -757,13 +1415,18 @@ export default {
     // 拿id查审核流程
     showIdDatas (id) {
       api.getEntityAndCert(id, this.$axios).then(res => {
-        console.log('拿id查编辑数据', res)
         this.entrydetail.business = ''
         var data = res.data
         this.formData = res.data
         this.entrydetail.business = id
         this.entrydetail.instance = data.WorkflowId
         this.entrydetail.process = data.ProcessKey
+        this.initReviewItems()
+        this.initReviewItems1()
+        if (this.dialogVisible2) {
+          this.initReviewItems3()
+          this.initReviewItems4()
+        }
         if (data.Status != 0) {
           this.approvalProcess.disabled = false
         } else {

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

@@ -1,468 +0,0 @@
-<template>
-  <div>
-    <el-form ref="formEvaluation" :model="entityListData" label-width="0px" :rules="rules">
-
-      <el-table highlight-current-row :data="entityListData.entityList" border height="calc(100vh - 243px)"
-                style="width: 100%" @sort-change="orderby" v-loading="tableLoading">
-        <el-table-column
-          property="SequenceNo"
-          label="序号"
-          header-align="center"
-          width="80">
-          <template slot-scope="scope">
-            <span v-if="scope.row.LevelCode==1" 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.LevelCode==1" 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.LevelCode==1" 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">
-            <el-form-item style="margin-bottom: 0px;" :prop="'entityList.' + scope.$index + '.Score'"
-                          :rules="rules.relation">
-              <span v-if="scope.row.LevelCode==1"
-                    style="font-weight: bold">{{ scoreFun(scope.row.typeStatus, scope.$index) }}</span>
-              <el-input v-else size="mini" :min="0" :max="scope.row.NormalScore" type="number" placeholder="实得分数"
-                        :disabled="!disabledForm" v-model="scope.row.Score"
-                        @input="onInputFen(scope.$index,scope.row.NormalScore)"></el-input>
-            </el-form-item>
-          </template>
-        </el-table-column>
-        <el-table-column
-          property="Reason"
-          label="扣分原因"
-          header-align="center"
-          width="120"
-          align="center">
-          <template slot-scope="scope">
-            <el-popover
-              placement="top-start"
-              title="原因"
-              width="200"
-              trigger="hover"
-              :content="scope.row.Remark==''||scope.row.Remark==null?'空':scope.row.Remark" v-if="scope.row.LevelCode!=1">
-              <el-button slot="reference"  type="primary" icon="el-icon-edit" size="mini">编辑
-              </el-button>
-            </el-popover>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="" style="display: flex;align-items: center;justify-content: flex-end;margin: 18px 0;">
-        <div>标准总分：{{ standardNum }}分</div>
-        <div style="margin-left: 18px;margin-right: 140px;">实得总分：{{ getNumFun() }}分</div>
-      </div>
-
-
-    </el-form>
-
-    <!-- <div style="display: flex;justify-content: flex-end; margin: 20px 0;">
-       <el-button type="primary" size="mini"   @click="activeName = '1'">上一步<i class="el-icon-arrow-right el-icon--right"></i></el-button>
-       <el-button type="primary" size="mini"   @click="activeName = '3'">下一步<i class="el-icon-arrow-right el-icon--right"></i></el-button>
-     </div> -->
-
-    <!-- <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/contract'
-// import api from '@/api/oilcontract/contractEvaluationItems';
-
-export default {
-  name: 'oilcontractevaluationitems',
-  props: {
-    // 评价id
-    evaluateId: {
-      type: null,
-      default: ''
-    },
-    // 类型 0 二级部门创建 1 专业处创建
-    category: {
-      type: null,
-      default: ''
-    },
-    // 项目类型
-    ContractClass: {
-      type: null,
-      default: ''
-    },
-    // 是否禁用
-    disabledForm: {
-      type: null,
-      default: false
-    },
-    // 二级单位提交还是业务处室提交
-    isBusiness: {
-      type: null,
-      default: 0
-    }
-  },
-  computed: {
-    ...mapGetters({
-      authUser: 'authUser'
-    }),
-    scoreFun: function () {
-      return function (type, k) {
-        var num = 0
-        var list = this.entityListData.entityList
-        for (var index = 0; index < list.length; index++) {
-          var code = Number(list[index].LevelCode)
-          if (type == list[index].typeStatus && code == 2) {
-            num = num + Number(list[index].Score)
-          }
-        }
-        if (this.entityListData.entityList[k].Score != String(num)) {
-          // this.getNum = this.getNum + Number(num)
-          this.entityListData.entityList[k].Score = String(num)
-        }
-        return num
-      }
-    },
-    getNumFun: function () {
-      return function () {
-        var num = 0
-        var list = this.entityListData.entityList
-        for (var index = 0; index < list.length; index++) {
-          // var code = Number(list[index].LevelCode)
-          if (list[index].LevelCode == 1) {
-            num = num + Number(list[index].Score)
-          }
-        }
-        return num
-      }
-    }
-  },
-  data () {
-    var validatePass = (rule, value, callback) => {
-      var num = Number(value)
-      if (num == '' && num != 0) {
-        this.fractionBoolean = false
-        callback(new Error('请输入分值'))
-        return
-      }
-      // if (num > Number(this.branchNum)) {
-      //   this.fractionBoolean = false
-      //   callback(new Error('不能大于规定的分值'));
-      //   return
-      // }
-      if (num < 0) {
-        this.fractionBoolean = false
-        callback(new Error('不能为负数'))
-        return
-      }
-      this.fractionBoolean = true
-      callback()
-    }
-    return {
-      tableLoading: false,
-      fractionBoolean: true,
-      dialogVisibleCom: false,
-      loading: false,
-      UnitOrgOptions: [],
-      textareaValue: '', // 扣分原因
-      dialogBoolean: false,
-      rules: {
-        relation: [
-          {validator: validatePass, trigger: 'blur'}
-        ]
-      },
-      dialogVisible: false,
-      // 列表数据
-      entityListData: {
-        entityList: []
-      },
-
-      // 分页参数
-      size: 10,
-      currentPage: 1,
-      currentItemCount: 0,
-      // 列表排序
-      Column: {
-        Order: '',
-        Prop: ''
-      },
-      // 查询时间new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()
-      CreateOn: [],
-      // 查询项
-      searchFormReset: {},
-      searchForm: {
-        Id: '',
-        ContractId: '',
-        ParentId: '',
-        SequenceNo: '',
-        Content: '',
-        NormalScore: '',
-        Score: '',
-        LevelCode: '',
-        Remark: '',
-        ModifiedOn: '',
-        ModifiedUserId: '',
-        ModifiedBy: ''
-
-      },
-      auditform: {
-        FirstAuditName: '',
-        SecondAudit: '',
-        ThirdAudit: '',
-        CertId: '',
-        AuditRemark: '',
-        TypeCode: '03'
-      },
-      entityListItemIndex: '',
-      standardNum: 0, // 标准分数
-      getNum: 0// 实得总分
-
-    }
-  },
-  created () {
-    // 数据列表
-    // 判断是编辑状态还是新增状态
-    console.log(this.evaluateId, '2323232')
-    if (this.evaluateId == 0) {
-      this.initDatas()
-    } else {
-      this.editDatas()
-    }
-    // this.getDictOptions()
-  },
-  methods: {
-    // 初始数据
-    initDatas () {
-      this.tableLoading = true
-      // 普通的传1，条件评价穿2
-      var data = {
-        // Category: 1
-        Category: this.isBusiness == 1 ? 2 : 1 // 0二级单位发起的评价，1专业处室的评价，2条件评价 3专业处室发起的评价， 4专业处室发起的条件评价
-      }
-      this.standardNum = 0
-      api.evaluationItemsOnelist(data, this.ContractClass, this.$axios).then(res => {
-        this.tableLoading = false
-        console.log('上级节点内容', res)
-        let data = res.data.items
-        let list = []
-        console.log('普通的传1，条件评价穿2', data)
-        for (let index = 0; index < data.length; index++) {
-          data[index].typeStatus = index
-          data[index].Score = '0'
-          data[index].Category = 1
-          list.push(data[index])
-
-          this.standardNum = this.standardNum + parseInt(data[index].NormalScore)
-          if (data[index].Son != null && data[index].Son != undefined) {
-            console.log('普通的传1，条件评价穿2', data[index].Son)
-            for (let k = 0; k < data[index].Son.length; k++) {
-              data[index].Son[k].Category = 1
-              data[index].Son[k].typeStatus = index
-              data[index].Son[k].Score = data[index].Son[k].NormalScore
-              list.push(data[index].Son[k])
-              // parseInt(data[index].Son[k].NormalScore)
-            }
-          }
-        }
-        this.entityListData.entityList = list
-        console.log('处理完的数据(业绩评价)', list)
-      }).catch(err => {
-        this.tableLoading = false
-        console.error(err)
-      })
-    },
-    // 编辑初始数据
-    editDatas () {
-      this.tableLoading = true
-      console.log('是专业交的吗', this.isBusiness)
-      let data = {
-        ContentReviewId: this.evaluateId,
-        Category: this.isBusiness == 1 ? 2 : this.category,
-        Type: 1
-      }
-      this.standardNum = 0
-      api.contractEvaluationTree(data, this.$axios).then(res => {
-        this.tableLoading = false
-        console.log('编辑后的内容', this.category, res)
-        let data = res.data.items
-        let list = []
-        if (data) {
-          console.log('evaluation111文件', data)
-          for (let index = 0; index < data.length; index++) {
-            data[index].typeStatus = index
-            data[index].Score = data[index].Score === undefined || data[index].Score === '' ? '0' : data[index].Score
-            data[index].Category = 1
-            list.push(data[index])
-            this.standardNum = this.standardNum + parseInt(data[index].NormalScore)
-            console.log('evaluation文件', data[index].Son)
-            if (data[index].Son != null && data[index].Son !== undefined) {
-              for (let k = 0; k < data[index].Son.length; k++) {
-                data[index].Son[k].Category = 1
-                data[index].Son[k].typeStatus = index
-                data[index].Son[k].Score = data[index].Son[k].Score === undefined || data[index].Son[k].Score === '' ? '0' : data[index].Son[k].Score
-                list.push(data[index].Son[k])
-              }
-            }
-          }
-          this.entityListData.entityList = list
-          console.log('处理完的数据(业绩评价)', list)
-        }
-      }).catch(err => {
-        this.tableLoading = false
-        console.error(err)
-      })
-    },
-
-    // 确认编辑内容
-    onTrueDialog () {
-      this.entityListData.entityList[this.entityListItemIndex].Remark = this.textareaValue
-      this.dialogBoolean = false
-    },
-    // 分数校验
-    onInputFen (index, fen) {
-      this.branchNum = fen
-      // this.entityListData.entityList[index].Score = fen
-    },
-
-    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
-    },
-    orgunitChange (val) {
-      let deptid = val
-      let auditstepcode = 'SUB_OFFICE_JF'
-      api.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
-        this.orgauditOptions = res.data.item
-      }).catch(err => {
-        console.error(err)
-      })
-    },
-    getDictOptions () {
-      let params = {
-        status: this.formData.Status,
-        majorAduit: this.formData.ThirdAudit
-      }
-      api.getDictListByStatus(params, this.$axios).then(res => {
-        this.dictData = res.data.items
-        this.organizeOption = res.data.items['Organizes']
-        this.orgtreelist = window.toolfun_gettreejson(res.data.items['ProOrgList'], 'id', 'pId', 'id,name')
-        this.UnitOrgOptions = res.data.items['UnitOrgList']
-        this.UnitOrg = res.data.items['Register'].CheckUnitId
-        this.allorgunitOptions = res.data.items['Allunitorglist']
-        this.orgunitChange(this.UnitOrg)
-        /* this.UnitRelationOptions = res.data.items['UnitRelation']
-        this.getCityList(res.data.items['GaodeMapChinaAreas'])
-        this.CompanyTypeOptions = res.data.items['CompanyType'] */
-      }).catch(err => {
-        console.error(err)
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-.el-pagination {
-  margin: 1rem 0 2rem;
-  text-align: right;
-}
-</style>

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

@@ -247,7 +247,7 @@ export default {
               return '待复审'
               break
             case 3:
-              return '专业科室接收'
+              return '待专业处室分办'
               break
             case 4:
               return '待专业处室审核'

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

@@ -247,7 +247,7 @@ export default {
               return '待复审'
               break
             case 3:
-              return '专业科室接收'
+              return '待专业处室分办'
               break
             case 4:
               return '待专业处室审核'

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

@@ -219,7 +219,7 @@ export default {
               return '待复审'
               break
             case 3:
-              return '专业科室接收'
+              return '待专业处室分办'
               break
             case 4:
               return '待专业处室审核'
@@ -557,11 +557,10 @@ export default {
     },
     // 弹框
     onNavigateEvaluate (item) {
-      console.log(this.$refs, 'this.$refs')
       this.$refs.contractSelect.ContractId = item.ContractId
       this.$refs.contractSelect.ReviewId = item.Id
       this.$refs.contractSelect.activeName = '1'
-      console.log(item.Id,this.$refs.contractSelect.ReviewId, 'this.$refs.contractSelect1')
+      console.log(item.ContractClass, 'this.$refs.contractSelect1')
       if (item.ContractClass === '01') {
         this.$refs.contractSelect.dialogVisible1 = true
       } else if (item.ContractClass === '02') {

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

@@ -247,7 +247,7 @@ export default {
               return '待复审'
               break
             case 3:
-              return '专业科室接收'
+              return '待专业处室分办'
               break
             case 4:
               return '待专业处室审核'