年审

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

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

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

@@ -25,19 +25,20 @@ export default {
   },
 
   //合同下发
-  // addContractEvaluate(formData, myAxios) {
-  //   return myAxios({
-  //     url: '/contract-order/add',
-  //     method: 'post',
-  //     data: formData
-  //   });
-  // },
+  contractOrderAdd(formData, myAxios) {
+    return myAxios({
+      url: '/contract-order/add',
+      method: 'post',
+      data: formData
+    });
+  },
 
   // 编辑后的评价内容
-  contractEvaluationTree(entityId, myAxios) {
+  contractEvaluationTree(params, myAxios) {
     return myAxios({
-      url: '/contract-evaluation-items/tree/'+entityId,
+      url: '/contract-evaluation-items/tree/',
       method: 'GET',
+      params: params
     });
   },
 

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

@@ -1,4 +1,6 @@
 export default {
+  
+  
   getList(CreateOn, params, myAxios) {
     return myAxios({
       url: '/oilcontractevaluationitems/list?CreateOn='+ CreateOn,

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

@@ -7,17 +7,22 @@ export default {
       params: params
     });
   },
-  
+
   // 合同配置上级节点
-  evaluationItemsOnelist(myAxios) {
+  // evaluationItemsOnelist( myAxios) {
+  //   return myAxios({
+  //     url: '/evaluation-items/onelist',
+  //     method: 'GET',
+  //   });
+  // },
+  evaluationItemsOnelist(entityId, myAxios) {
     return myAxios({
-      url: '/evaluation-items/onelist',
+      url: '/evaluation-items/onelist/'+entityId,
       method: 'GET',
     });
   },
 
 
-
   getList(CreateOn, params, myAxios) {
     return myAxios({
       url: '/oilevaluationitems/list?CreateOn='+ CreateOn,

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

@@ -2,49 +2,6 @@
 
 <template>
   <div>
-    <!-- <el-dialog title="提交"
-               :visible.sync="dialogVisibleCom"
-               width="520px">
-      <el-form ref="searchForm"
-               label-width="100px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="分办单位">
-              <el-select filterable
-                         v-model="UnitOrg"
-                         maxlength="255"
-                         clearable
-                         placeholder="请选择分办单位"
-                         style="width: 100%"
-                         @change="orgunitChange">
-                <el-option v-for="item in UnitOrgOptions"
-                           :key="item.Id"
-                           :label="item.Fullname"
-                           :value="item.Id">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="备注">
-              <el-input v-model="auditform.AuditRemark"
-                        type="textarea"
-                        placeholder="请输入备注内容">
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <span slot="footer"
-            class="dialog-footer">
-        <el-button size="mini"
-                   @click="dialogVisibleCom = false">取 消</el-button>
-        <el-button size="mini"
-                   type="primary"
-                   @click="companySubmitToSecUnitSeparateMakeSure" :loading="loading">确定</el-button>
-      </span>
-    </el-dialog> -->
-
 
     <el-dialog title="提交初审"
                :visible.sync="dialogVisibleCom"
@@ -116,6 +73,50 @@
       </span>
     </el-dialog>
 
+    <!-- 复审 -->
+    <el-dialog title="审核" :visible.sync="dialogCommonAuditMakeSureVisible">
+      <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
+        <el-form-item label="审核状态">
+          <template>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1"  @change="radioChange">通过</el-radio>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="0"  @change="radioChange">退回</el-radio>
+          </template>
+        </el-form-item>
+        <el-form-item label="意见" :rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' }]">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" :placeholder="textplaceholder">
+          </el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer" style="margin-top: -25px">
+        <el-button size="small" @click="dialogCommonAuditMakeSureVisible = false">取 消</el-button>
+        <el-button type="primary" size="small" @click="commonAuditMakeSure()" :loading="btnloading">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 专业科室接收 -->
+    <el-dialog title="分配" :visible.sync="dialogBusinessOfficeSeparateAuditVisible">
+      <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
+        <el-form-item label="审批人">
+          <el-select ref="selectAuditer" v-model="ProfessionalAudit" placeholder="请选择" style="width: 100%" filterable
+            default-first-option>
+            <el-option v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="意见">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核意见"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer" style="margin-top: -25px">
+        <el-button size="small" @click="dialogBusinessOfficeSeparateAuditVisible = false">取 消</el-button>
+        <el-button type="primary" size="small" @click="businessOfficeSeparateAuditMakeSure()" :loading="btnloading">确 定</el-button>
+      </div>
+    </el-dialog>
+
+
+
+
+
     <choose-auditor-fen ref="chooseAuditorFen"
                         @close="setAuditerFen"
                         @hideChooseAuditer="chooseAuditorVisibleFen=false"
@@ -149,11 +150,20 @@
         type: null,
         default: 0,
       },
+      formData: {
+        type: null,
+        default: '',
+      },
     },
 
 
     data() {
       return {
+        dialogVisibleCom:false,//初审
+        dialogCommonAuditMakeSureVisible:false,//复审
+        dialogBusinessOfficeSeparateAuditVisible:false,//专业科室接收
+
+
         chooseAuditorVisibleFen:false,
         auditer: '',
         auditerName: '',
@@ -173,138 +183,222 @@
         majorDept: [100000000, 100000128, 100000151],
 
 
+        //复审的变量
+        shenheForm: {
+          SuccessStatus: 1,
+          AuditorRemark: '',
+          AppendId: 0,
+          Auditer: '',
+          MajorDept: ''
+        },
+        btnloading:false,
+        textplaceholder: '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）',
+
+        //专业科室接收
+        ProfessionalAudit: '',
+        secauditerOptions: [],
+
 
 
-        dialogVisibleCom:false,
         loading: false,
         UnitOrgOptions: [],
         UnitOrg: '',
 
-        // auditform: {
-        //   FirstAuditName: '',
-        //   SecondAudit: '',
-        //   ThirdAudit: '',
-        //   CertId: '',
-        //   AuditRemark: ''
-        // },
-        formData: {
-          Id: '',
-          SupplierName: '',
-          OilCertificateNo: '',
-          Grade: '',
-          MgrUnit: '',
-          OperType: '',
-          Country: '',
-          MaunAgent: '',
-          ConstructTeam: '',
-          CommercialNo: '',
-          OrganCode: '',
-          CountryTaxNo: '',
-          ProcessKey: '',
-          LocalTaxNo: '',
-          Address: '',
-          Province: '',
-          City: '',
-          Street: '',
-          HouseNo: '',
-          ZipCode: '',
-          QualitySystemCert: '',
-          ProductQualityCert: '',
-          MaunLicense: '',
-          QualifCert: '',
-          QualifCertLevel: '',
-          SafetyLicense: '',
-          TechServiceLic: '',
-          TJInNotify: '',
-          SpecIndustryCert: '',
-          LegalPerson: '',
-          CategoryCode: '',
-          CategoryName: '',
-          RegCapital: '',
-          Currency: '',
-          ContactName: '',
-          CompanyType: '',
-          SetupTime: '',
-          DepositBank: '',
-          BankAccount: '',
-          EMail: '',
-          BankCreditRating: '',
-          Mobile: '',
-          Telphone: '',
-          Fax: '',
-          CompanyTel: '',
-          QQ: '',
-          CompanyUrl: '',
-          SpecSupplier: '',
-          SpecTypeCode: '',
-          SpecTypeName: '',
-          WorkerTotal: 0,
-          ContractNum: 0,
-          UniversityNum: 0,
-          TechnicalNum: 0,
-          AboveProfNum: 0,
-          MiddleProfNum: 0,
-          NationalRegNum: 0,
-          NationalCertTotal: 0,
-          DesignerTotal: 0,
-          SkillerTotal: 0,
-          ThirdAudit: 0,
-          Remark: '',
-          IsDelete: '',
-          CreateOn: '',
-          CreateUserId: '',
-          CreateBy: '',
-          ModifiedOn: '',
-          ModifiedUserId: '',
-          ModifiedBy: '',
-          CertId: 0,
-          SupplierTypeCode: '02',
-          SupplierTypeName: '基建类',
-          Step: 0,
-          BusinessKey: '',
-          AuditIndex: 0
-        },
+
 
       }
     },
     created() {
-      // this.getDictOptions()
-      // this.serviceId = this.$route.params.opera + ''
-      // if (this.$route.query.rtn) {
-      //   this.showReturn = 0
-      // }
-      // if (this.$route.query.certid) {
-      //   this.certId = this.$route.query.certid + ''
-      // }
-      // if (this.serviceId !== 'add' && this.serviceId > 0) {
-      //   this.formData.Id = this.serviceId
-      // } else {
-      //   this.formData.Id = 0
-      // }
-      // this.IsCompanyUser = this.authUser.Profile.IsCompanyUser
-
-      // // this.getorgtreelist()
-      // if (this.IsCompanyUser && this.serviceId === 'add') {
-      //   // apiCert.getEntityByCreatorAndType('02', this.$axios).then(res => {
-      //   //   this.certId = res.data.Id
-      //   //   this.serviceId = res.data.SupplierId
-      //   //   this.formData.Id = res.data.SupplierId
-      //   //   this.initDatas()
-      //   // }).catch(err => {
-      //   //   console.error(err)
-      //   // })
-      //   this.inputCompany(this.authUser.Profile.Realname)
-      // } else {
-      //   this.initDatas()
-      // }
+
       this.getFirAuditerByDept()
       this.getDictOptions()
       this.orgtreeChange(this.majorDept)
 
-
-
     },
     methods: {
+      //专业科室接收。。。。。。。。。。。。。。
+      // 数据
+      auditOrgChange () {
+        let auditstepcode = ''
+        if (this.formData.Status === '1') {
+          auditstepcode = 'SECOND_TRIAL'
+        } else if (this.formData.Status === '3') {
+          auditstepcode = 'PROF_AUDIT'
+        } else if (this.formData.Status === '10') {
+          auditstepcode = 'SECOND_TRIAL'
+        } else {
+          return
+        }
+        api.getAuditerByDept(this.authUser.Profile.DepartmentId, auditstepcode, this.$axios).then(res => {
+          this.secauditerOptions = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      businessOfficeSeparateAuditMakeSure () {
+        if (this.ProfessionalAudit === '') {
+          this.$message({
+            type: 'warning',
+            message: '请选择审批人！'
+          })
+          return
+        }
+        let params = {
+          ProfessionalAudit: this.ProfessionalAudit,
+          AuditRemark: this.shenheForm.AuditorRemark
+        }
+        this.btnloading = true
+        console.log('业务处室专业审批, 提交参数: ', params)
+        let _this = this
+        apiOilcontract.businessSeparateAudit(this.formData.Id, params, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            console.log('审批提交，成功返回')
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+            this.$emit('refreshPage', {})
+            // _this.$refs['WfHistory'].getHistoryTask()
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+          _this.dialogBusinessOfficeSeparateAuditVisible = false
+          _this.btnloading = false
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      //复审的方法。。。。。。。。。。。。。。。
+      //选择审批选项
+      radioChange () {
+        if (this.shenheForm.SuccessStatus === 1) {
+          // this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
+          if (this.formData.Status === '5') {
+            this.textplaceholder = '请填写审批意见'
+          } else {
+            this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
+          }
+        } else {
+          if (this.formData.Status == '5') {
+            this.textplaceholder = ''
+          } else {
+            this.textplaceholder = '退回意见不能少于5个字'
+          }
+          this.shenheForm.AuditorRemark = ''
+        }
+      },
+      // 确定提交
+      commonAuditMakeSure () {
+        let checkRes = this.commonAuditParamsCheck()
+        console.log('审批结果公共提交，参数检查结果', checkRes)
+        if (!checkRes) {
+          return false
+        }
+        this.btnloading = true
+        let params = {
+          result: this.shenheForm.SuccessStatus,
+          AuditRemark: this.shenheForm.AuditorRemark
+        }
+        console.log('审批结果提交参数：', params)
+        let _this = this
+        apiOilcontract.contractCommonAudit(this.eveId, params, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            console.log('审批提交，成功返回')
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+            this.$emit('refreshPage', {})
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+          _this.dialogCommonAuditMakeSureVisible = false
+          _this.btnloading = false
+        }).catch(err => {
+          console.error(err)
+          _this.btnloading = false
+        })
+      },
+      commonAuditParamsCheck () {
+        if (this.shenheForm.SuccessStatus === 1) {
+          if ((!this.auditer || this.auditer === 0) && (this.formData.Status == '0' || this.formData.Status == '10' || this.formData.Status == '3')) {
+            this.$message({
+              type: 'warning',
+              message: '请选择审核人！'
+            })
+            return
+          }
+          if (this.formData.Status == '10') {
+            if (!this.fushenauditer || this.fushenauditer === 0) {
+              this.$message({
+                type: 'warning',
+                message: '请选择复审人！'
+              })
+              return
+            }
+            if ((this.formData.InStyle != '2' && this.formData.InStyle != '6' && this.formData.InStyle != '4') && (this.formData.inStyle == '3' && this.MgrUnit)) {
+              if (this.selectDept === 0 || this.selectDept == '') {
+                this.$message({
+                  type: 'warning',
+                  message: '请选择专业处室！'
+                })
+                return
+              }
+            }
+            if ((this.formData.InStyle != '2' && this.formData.InStyle != '6' && this.formData.InStyle != '4') && (this.formData.inStyle == '3' && this.MgrUnit)) {
+              if (this.userOptions == null || this.userOptions.length === 0) {
+                this.$message({
+                  type: 'warning',
+                  message: '该专业科室未配置接收人！'
+                })
+                return
+              }
+            }
+          }
+          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData
+            .Status !== '5' && this.formData.Status !== '10') {
+            this.$message({
+              type: 'warning',
+              message: '审批意见不能低于20个字符！'
+            })
+            return false
+          }
+          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+            this.$message({
+              type: 'warning',
+              message: '请填写审批意见！'
+            })
+            return false
+          }
+        } else {
+          if (this.formData.Status === '10') {
+            this.shenheForm.AuditorRemark = this.backRemark
+          }
+          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData
+            .Status !== '5') {
+            this.$message({
+              type: 'warning',
+              message: '退回意见不能低于5个字符！'
+            })
+            return
+          }
+          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+            this.$message({
+              type: 'warning',
+              message: '请填写退回意见！'
+            })
+            return false
+          }
+        }
+        return true
+      },
+      // 。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。。
       setAuditerFen (val, name) {
         this.auditer = val
         this.auditerName = name

src/dashoo.cn/frontend_web/src/components/workflow/wfhistory.vue

@@ -95,7 +95,7 @@
           params
         })
           .then(res => {
-            console.log('历史任务', res.data)
+            // console.log('历史任务', res.data)
             this.tmp_historyTask = res.data.items
             let useridstr = ''
             for (let i = 0; i < this.tmp_historyTask.length; i++) {

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

@@ -15,7 +15,7 @@
           <!-- <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;" @click="onChangeSelect">一键处理</el-button>
+          <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="onChangeSelect">{{selectBoolean?'取消':'一键处理'}}</el-button>
           <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="selectBoolean" @click="onChangeSelectSubmit">处理</el-button>
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
@@ -254,48 +254,6 @@
             </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">
@@ -333,8 +291,8 @@
           Order: '',
           Prop: ''
         },
-        //查询时间
-        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        //查询时间new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()
+        CreateOn: [],
         //查询项
         searchFormReset: {},
         searchForm: {
@@ -580,7 +538,7 @@
       },
       // 一键处理
       onChangeSelectSubmit(){
-        
+
       },
       initDatas() {
         //分页及列表条件

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

@@ -14,12 +14,19 @@
           <i class="icon icon-table2"></i> 编辑 - 承包商合同
         </span>
         <span style="float: right;">
-          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="editFrom.Status==7" @click="commonAuditClick">企管法规处</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="editFrom.Status==4" @click="commonAuditClick">专业处室审核</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="editFrom.Status==3" @click="commonAuditClick2">专业科室接收</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="editFrom.Status==2" @click="commonAuditClick">复审</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="editFrom.Status==1" @click="commonAuditClick">初审</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="editFrom.Status==0" @click="onSubmitBigAdd">提交审核</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status==7" @click="commonAuditClick(7)">企管法规处</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status==4" @click="commonAuditClick(4)">专业处室审核</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status==3" @click="commonAuditClick(3)">专业科室接收</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status==2" @click="commonAuditClick(2)">复审</el-button>
+          <!-- <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status==1" @click="commonAuditClick()">初审</el-button> -->
+          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status==1" @click="commonAuditClick(1)">提交审核</el-button>
+
+      <!--    <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick(7)">企管法规处</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick(4)">专业处室审核</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick(3)">专业科室接收</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick(2)">复审</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick(1)">提交审核</el-button> -->
+
           <el-button type="primary" size="mini" v-if="activeName!=1" style="margin-left: 8px" @click="onSeaveBigAdd">保存</el-button>
           <el-button @click="onBack" type="primary" size="mini" style="margin-left: 8px">返回</el-button>
         </span>
@@ -37,51 +44,38 @@
               <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-select ref="SupplierSelect" v-model="contractData.SupplierName" :disabled="true" placeholder="请选择" style="width: 100%" ></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 :disabled="disabled" v-model="formData.ProjectPlace" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input :disabled="disabled" v-model="contractData.ProjectPlace" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="评价年度">
-                    <el-input :disabled="disabled" v-model="formData.ProjectPlace" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input :disabled="disabled" v-model="contractData.ProjectPlace" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="承建项目名称">
-                    <el-input :disabled="disabled" v-model="formData.ProjectName" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input :disabled="disabled" v-model="contractData.ProjectName" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="合同编号">
-                    <el-input :disabled="disabled" v-model="formData.ContractNo" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input :disabled="disabled" v-model="contractData.ContractNo" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
 
                 <el-col :span="8">
                   <el-form-item  label="项目类别">
-                    <el-select :disabled="disabled" v-model="formData.ProjectType" placeholder="请选择" style="width: 100%">
+                    <el-select :disabled="disabled" v-model="contractData.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>
@@ -98,7 +92,8 @@
 
                 <el-col :span="8">
                   <el-form-item  label="是否分包">
-                    <el-select :disabled="disabled" placeholder="请选择" v-model="formData.SubPackage" style="width: 100%">
+                    <!-- SubPackage -->
+                    <el-select :disabled="disabled" placeholder="请选择" v-model="contractData.ProjectType" style="width: 100%">
                       <el-option key="1" label="是" value="1"></el-option>
                       <el-option key="2" label="否" value="2"></el-option>
                     </el-select>
@@ -107,18 +102,18 @@
               </el-row>
             </el-form>
 
-            <div style="display: flex;justify-content: flex-end;">
+            <!-- <div style="display: flex;justify-content: flex-end;">
               <el-button type="primary" size="mini"   @click="onSubmit_contract">下一步<i class="el-icon-arrow-right el-icon--right"></i></el-button>
-            </div>
+            </div> -->
 
           </el-card>
         </el-tab-pane>
         <el-tab-pane label="业绩评价" name="2" :disabled="performance.disabled" >
-          <evaluation-list ref="evaluation_list_one"  :type="routeDataType" :evaluateId="serviceId" :category="serviceId" ></evaluation-list>
+          <evaluation-list ref="evaluation_list_one"   :evaluateId="formData.Id" category="0" ></evaluation-list>
         </el-tab-pane>
 
-        <el-tab-pane label="专业处室业绩评价" name="3" :disabled="departmentPerformance.disabled">
-          <evaluation-list></evaluation-list>
+        <el-tab-pane v-if="formData.Id!=0" label="专业处室业绩评价" name="3" :disabled="departmentPerformance.disabled">
+          <evaluation-list :evaluateId="formData.Id" category="1"></evaluation-list>
         </el-tab-pane>
 
         <el-tab-pane label="审批流程" name="4" :disabled="approvalProcess.disabled">
@@ -137,7 +132,7 @@
       </el-tabs>
     </el-card>
 
-    <submitPopup ref="submitpopup" :eveId="formData.Id"></submitPopup>
+    <submitPopup ref="submitpopup" :eveId="formData.Id" :formData="formData" @refreshPage="refreshPage"></submitPopup>
 
 
 
@@ -169,10 +164,8 @@
       return {
         routeData:{},//上一页面传过来的值
         routeDataType:'',//上一页面传过来的type
-        editFrom:{},
 
         dialogVisibleCom:false,
-
         disabled:true,//禁用
         // 业绩评价
         performance: {
@@ -197,6 +190,7 @@
         formData: {
           Id: '',
         },
+        contractData:{},//合同信息
         //下拉选择项
         //wellNoOptions: [],
         //supervisersOptions: [],
@@ -208,61 +202,83 @@
     created() {
       // this.routeData = this.$route.query.item
       this.routeDataType = this.$route.query.type
-      if(this.routeDataType==1){
-        this.approvalProcess.disabled = true
-      }else{
-        if(this.routeData.Status!=0){
-          this.approvalProcess.disabled = false
-        }else{
-          this.approvalProcess.disabled = true
-        }
-      }
 
       console.log('跳转数据',this.routeData)
       this.serviceId = this.$route.params.opera;
-      this.getDictOptions();
+      // this.getDictOptions();
 
       if(this.serviceId != 'add' && this.serviceId>0) {
         this.formData.Id = this.serviceId;
         // this.initDatas();
-        this.showIdDatas(this.serviceId)
+        this.showIdDatas(this.formData.Id)
       } else {
         this.formData.Id = 0;
-        this.editFrom.Status = 0
-
+        this.formData.Status = 0
+        this.approvalProcess.disabled = true
+        this.contractData = this.$route.query.item
       }
 
 
     },
     methods: {
+      //刷新数据接口
+      refreshPage(){
+        //拿id查审核流程
+        this.showIdDatas(this.formData.Id)
+
+      },
       //拿id查审核流程
       showIdDatas(id){
-        console.log('审批流程222',id)
           api.getEntityAndCert(id, this.$axios).then(res => {
-            console.log('审批流程',res)
+            console.log('拿id查编辑数据',res)
             var data = res.data
-            this.editFrom = res.data
+            this.formData = res.data
             this.entrydetail.business = id
             this.entrydetail.instance = data.WorkflowId
             this.entrydetail.process = data.ProcessKey
-
+            api.getEntity(data.ContractId, this.$axios).then(res => {
+              console.log('拿id查编辑数据合同数据',res)
+              this.contractData = res.data
+              // this.onSelectType(this.formData.ContractClass)
+            }).catch(err => {
+              console.error(err)
+            });
+            if(data.Status!=0){
+              this.approvalProcess.disabled = false
+            }else{
+              this.approvalProcess.disabled = true
+            }
             })
             .catch(err => {
               console.error(err)
             })
       },
-      // 初审
-      commonAuditClick(){
-        var data = {
-          result:1,
-          AuditRemark:'6666'
+      // 审核
+      commonAuditClick(index){
+        var index = Number(index)
+        switch(index){
+          // 初审
+          case 1:
+            this.$refs.submitpopup.dialogVisibleCom = true
+          break;
+          // 复审
+          case 2:
+            this.$refs.submitpopup.dialogCommonAuditMakeSureVisible = true
+          break;
+          // 专业科室接收
+          case 3:
+            this.$refs.submitpopup.auditOrgChange()
+            this.$refs.submitpopup.dialogBusinessOfficeSeparateAuditVisible = true
+          break;
+          // 专业处室审核
+          case 4:
+            this.$refs.submitpopup.dialogCommonAuditMakeSureVisible = true
+          break;
+          // 企管法规处
+          case 7:
+            this.$refs.submitpopup.dialogCommonAuditMakeSureVisible = true
+          break;
         }
-        api.contractCommonAudit(this.serviceId,data, this.$axios).then(res => {
-          console.log('初审',res)
-
-          }).catch(err => {
-            console.error(err)
-          })
       },
       commonAuditClick2(){
         var data = {
@@ -353,14 +369,14 @@
         }
       },
 
-      getDictOptions() {
-        api.getDictList(this.$axios).then(res => {
-          //this.wellNoOptions = res.data.items['WellNo']
-          //this.supervisersOptions = res.data.items['Supervisers']
-        }).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() {
@@ -423,9 +439,6 @@
         });
       },
 
-      supplierChangeHandler() {
-        this.formData.SupplierName = this.$refs['SupplierSelect'].selectedLabel
-      },
 
       jstimehandle(val) {
         if (val === '') {

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

@@ -66,10 +66,10 @@
 
     </el-form>
 
-    <div style="display: flex;justify-content: flex-end; margin: 20px 0;">
+   <!-- <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>
+    </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">
@@ -219,7 +219,7 @@
     created() {
       //数据列表
       // 判断是编辑状态还是新增状态
-      if(this.type==1){
+      if(this.evaluateId==0){
         this.initDatas();
       }else{
         this.editDatas();
@@ -255,11 +255,11 @@
       },
       //初始数据
       editDatas() {
-        // var data = {
-        //   ContentReviewId:this.evaluateId,
-        //   Category:this.category,
-        // }
-        api.contractEvaluationTree(this.evaluateId,this.$axios).then(res => {
+        var data = {
+          ContentReviewId:this.evaluateId,
+          Category:this.category,
+        }
+        api.contractEvaluationTree(data,this.$axios).then(res => {
           console.log('编辑后的内容',res)
           var data = res.data.items
           var list = []

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

@@ -34,7 +34,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <el-table size="mini" id="rebateSetTable" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
+      <el-table size="mini" stripe id="rebateSetTable" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" min-width="160" align="center" fixed>
           <template slot-scope="scope">
             <el-button type="text" title="编辑" size="small" icon="el-icon-edit" @click="onNavigateEvaluate(scope.row)">编辑</el-button>

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

@@ -12,10 +12,8 @@
           <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>
+          <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="exportExcel">导出</el-button>
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="上报时间">
@@ -34,14 +32,12 @@
           </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>
+      <el-table id="rebateSetTable" size="mini" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
+        <el-table-column label="操作" min-width="160" 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-button type="text"  size="small" icon="el-icon-edit"  @click="onNavigateScore(scope.row)">编辑</el-button>
 
-            <el-popover placement="top" title="提示" v-model="scope.row.deleteConfirmFlag">
+            <el-popover placement="top" title="提示" :ref="'popover-' + `${scope.$index}`">
               <el-alert
                 title=""
                 description="确认要删除吗？"
@@ -50,23 +46,35 @@
               </el-alert>
               <br/>
               <div style="text-align: right; margin: 0">
-                <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
+                <el-button type="primary" size="mini" @click="deleteEntity(scope.row,scope.$index)">删除</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 slot="reference" type="text" icon="el-icon-delete" style="margin-left:3px" size="small" >
+                删除
               </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>
+        <el-table-column sortable show-overflow-tooltip prop="SupplierId" header-align="center" label="供应商名称"></el-table-column>
+        <el-table-column sortable show-overflow-tooltip prop="SupplierName" header-align="center" label="供应商名称"></el-table-column>
+        <el-table-column sortable show-overflow-tooltip prop="SumScore" header-align="center" label="评价得分(100分)" width="120"></el-table-column>
+        <el-table-column sortable show-overflow-tooltip label="评价内容及得分" header-align="center">
+          <el-table-column sortable show-overflow-tooltip prop="SumScore1" header-align="center" label="产品质量(30分)" width="120"></el-table-column>
+          <el-table-column sortable show-overflow-tooltip prop="SumScore2" header-align="center" label="合同履约(20分)" width="120"></el-table-column>
+          <el-table-column sortable show-overflow-tooltip prop="SumScore3" header-align="center" label="售后服务(15分)" width="120"></el-table-column>
+          <el-table-column sortable show-overflow-tooltip prop="SumScore4" header-align="center" label="诚信经营(15分)" width="120"></el-table-column>
+          <el-table-column sortable show-overflow-tooltip prop="SumScore5" header-align="center" label="协同响应(20分)" width="120"></el-table-column>
+        </el-table-column>
+        <el-table-column sortable show-overflow-tooltip prop="Conclusion" label="评价结果" header-align="center" >
+          <template slot-scope="scope">
+            {{evaluateFun(scope.row.Conclusion)}}
+          </template>
+        </el-table-column>
+        <el-table-column sortable show-overflow-tooltip prop="Status" align="center" label="状态" width="120">
           <template slot-scope="scope">
-            {{ jstimehandle(scope.row.CreateOn+'') }}
+            {{columnFun(scope.row.Status)}}
           </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">
@@ -84,18 +92,6 @@
             </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>
@@ -246,47 +242,6 @@
             </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>
@@ -300,7 +255,9 @@
 </template>
 <script>
   import { mapGetters } from 'vuex';
-  import api from '@/api/oilcontract/contract';
+  import api from '@/api/oilcontract/contractSumScore';
+  import FileSaver from 'file-saver'
+  import XLSX from 'xlsx'
 
   export default {
     computed: {
@@ -308,6 +265,66 @@
         authUser: 'authUser'
       })
     },
+    computed:{
+      evaluateFun:function(){
+        return function(item){
+          var index = Number(item)
+          switch(index){
+            case 1:
+              return '优秀'
+            break;
+            case 2:
+              return '合格'
+            break;
+            case 3:
+              return '不合格'
+            break;
+            default:
+              return '--'
+          }
+        }
+      },
+      columnFun:function(){
+        return function(item){
+            var index = Number(item)
+            switch(index){
+              case 0:
+                return '初始'
+              break;
+              case 1:
+                return '待二级初审'
+              break;
+              case 2:
+                return '待二级复审'
+              break;
+              case 3:
+                return '专业科室接收'
+              break;
+              case 4:
+                return '待专业科室审核'
+              break;
+              case 5:
+                return '待集中评审'
+              break;
+              case 6:
+                return '待交费'
+              break;
+              case 7:
+                return '待入库'
+              break;
+              case 8:
+                return '完成'
+              break;
+              case 9:
+                return '审核未通过'
+              break;
+              default:
+                return '--'
+              break;
+            }
+        }
+      }
+    },
     name: 'oilcontract',
 
     data() {
@@ -324,8 +341,8 @@
           Order: '',
           Prop: ''
         },
-        //查询时间
-        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        //查询时间new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()
+        CreateOn: [],
         //查询项
         searchFormReset: {},
         searchForm: {
@@ -367,191 +384,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
           }]
@@ -572,6 +449,7 @@
           _size: this.size,
           Order: this.Column.Order,
           Prop: this.Column.Prop,
+          ContractClass:'01',
         }
         let myCreateOn = []
         // 解析时间
@@ -640,8 +518,8 @@
         this.currentPage = 1
         this.initDatas()
       },
-      deleteEntity(row) {
-        row.deleteConfirmFlag = false;
+      deleteEntity(row,index) {
+        this.$refs['popover-' + `${index}`].doClose()
         api.deleteEntity(row.Id, this.$axios).then(res => {
           if (res.data.code === 0) {
             this.initDatas();
@@ -673,7 +551,39 @@
           return val.substring(0, 10)
         }
       },
-
+      //跳转评价
+      onNavigateScore(item){
+        console.log('跳转',item)
+        this.$router.push({
+          path:'/oilcontract/contract-goods-year/' + item.Id + '/operation',
+          query:{
+            item:item
+          }
+        })
+      },
+      exportExcel () {
+        /* generate workbook object from table */
+        let wb = XLSX.utils.table_to_book(
+          document.querySelector('#rebateSetTable')
+        )
+        /* get binary string as output */
+        let wbout = XLSX.write(wb, {
+          bookType: 'xlsx',
+          bookSST: true,
+          type: 'array'
+        })
+        try {
+          FileSaver.saveAs(
+            new Blob([wbout], {
+              type: 'application/octet-stream'
+            }),
+            'SupplierUsedName.xlsx'
+          )
+        } catch (e) {
+          if (typeof console !== 'undefined') console.log(e, wbout)
+        }
+        return wbout
+      },
       formatDateTime(date) {
         var y = date.getFullYear();
         var m = date.getMonth() + 1;

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

@@ -52,7 +52,7 @@
 
           <el-col :span="8">
             <el-form-item label="合同编号" prop="ContractNo">
-              <el-input v-model="formData.ContractNo" placeholder="请输入"  style="width: 100%"></el-input>
+              <el-input v-model="formData.ContractNo" placeholder="请输入" type="number"  style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
 
@@ -70,7 +70,7 @@
 
           <el-col :span="8">
             <el-form-item label="联系人电话" prop="Telephone">
-              <el-input v-model="formData.Telephone" placeholder="请输入"  style="width: 100%"></el-input>
+              <el-input v-model="formData.Telephone" placeholder="请输入" type="number" maxlength="11" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
 
@@ -225,7 +225,7 @@
 
             <el-form-item label="选择部门"  prop="region" >
               <!-- @change="orgChange" -->
-              <el-select filterable v-model="issueFrom.region" placeholder="请选择审核单位" ref="auditorgselect" style="width: 100%;" >
+              <el-select filterable ref="issueFromSelect" v-model="issueFrom.region" placeholder="请选择审核单位"  style="width: 100%;" >
                 <el-option v-for="item in orgOptions" :key="item.Id" :label="item.Fullname" :value="item.Id" style="width: 100%"></el-option>
               </el-select>
             </el-form-item>
@@ -435,10 +435,26 @@
       onIssueFromSubmit(){
         this.$refs['issueFrom'].validate((valid) => {
           if (valid) {
-            issueFrom.region
-            
-            
-            
+            console.log(this.$refs['issueFromSelect'].selectedLabel)
+            var data = {
+              ContractId:this.formData.Id,
+              AuditId:this.issueFrom.region,
+              AuditBy:this.$refs['issueFromSelect'].selectedLabel,
+            }
+            api.contractOrderAdd(data, this.$axios).then(res => {
+              console.log('下发成功',res)
+              this.$message({message: res.data.message,type: 'success'});
+              // this.formData.SupplierId = ''
+              // this.ContractClassDisabled = false
+              // this.SupplierSelectList = res.data.items
+            }).catch(err => {
+              console.error(err)
+            })
+
+
+
+
+
             this.issueVisible = false
 
 
@@ -451,11 +467,13 @@
       },
 
       //选择合同分类
-      onSelectType(e){
+      onSelectType(e,index){
         console.log(e)
         oilsupplierApi.getSupList(e, this.$axios).then(res => {
           console.log('数据',res)
-          this.formData.SupplierId = ''
+          if(index!=1){
+            this.formData.SupplierId = ''
+          }
           this.ContractClassDisabled = false
           this.SupplierSelectList = res.data.items
         }).catch(err => {
@@ -469,7 +487,8 @@
           api.getEntity(this.formData.Id, this.$axios).then(res => {
             console.log('返给我的数据',res.data)
             this.formData = res.data;
-            this.onSelectType(this.formData.ContractClass)
+            
+            this.onSelectType(this.formData.ContractClass,1)
           }).catch(err => {
             console.error(err)
           });

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

@@ -35,7 +35,7 @@
           </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 size="mini" stripe :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" min-width="205" align="center" fixed >
           <template slot-scope="scope">
             <!-- <router-link :to="'/oilsupplier/oilcontract/' + scope.row.Id + '/operation'"> -->
@@ -537,10 +537,10 @@
         }
         console.log('跳转',item)
         this.$router.push({
-          path:'/oilcontract/contract-basis/' + item.Id + '/evaluate',
+          path:'/oilcontract/' + name + '/add/evaluate',
           query:{
             item:item,
-            type:1,
+            // type:1,
           }
         })
       },

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

@@ -35,13 +35,11 @@
         </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="操作" min-width="160" 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-button type="text"  size="small" icon="el-icon-edit"  @click="onNavigateScore(scope.row)">编辑</el-button>
 
-            <el-popover placement="top" title="提示" v-model="scope.row.deleteConfirmFlag">
+            <el-popover placement="top" title="提示" :ref="'popover-' + `${scope.$index}`">
               <el-alert
                 title=""
                 description="确认要删除吗？"
@@ -50,17 +48,41 @@
               </el-alert>
               <br/>
               <div style="text-align: right; margin: 0">
-                <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
+                <el-button type="primary" size="mini" @click="deleteEntity(scope.row,scope.$index)">删除</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 slot="reference" type="text" icon="el-icon-delete" style="margin-left:3px" size="small" >
+                删除
               </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 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>
+              <template slot-scope="scope">
+                <div>{{tableFun(column.prop,scope.row[column.prop])}}</div>
+              </template>
+        </el-table-column> -->
+        <el-table-column sortable show-overflow-tooltip prop="SupplierId" align="center" label="服务商ID"></el-table-column>
+        <el-table-column sortable show-overflow-tooltip prop="SupplierName" align="center" label="服务商名称"></el-table-column>
+        <el-table-column sortable show-overflow-tooltip prop="SumScore" align="center" label="评价得分" width="120"></el-table-column>
+        <el-table-column sortable show-overflow-tooltip label="评价内容及得分" align="center">
+          <el-table-column sortable show-overflow-tooltip prop="SumScore1" align="center" label="项目管理(40分)" width="120"></el-table-column>
+          <el-table-column sortable show-overflow-tooltip prop="SumScore2" align="center" label="HSE管理(30分)" width="120"></el-table-column>
+          <el-table-column sortable show-overflow-tooltip prop="SumScore3" align="center" label="合同履行(15分)" width="120"></el-table-column>
+          <el-table-column sortable show-overflow-tooltip prop="SumScore4" align="center" label="企业诚信(15分)" width="120"></el-table-column>
+        </el-table-column>
+        <el-table-column sortable show-overflow-tooltip prop="Conclusion" label="评价结果" align="center" >
+          <template slot-scope="scope">
+            {{evaluateFun(scope.row.Conclusion)}}
+          </template>
+        </el-table-column>
+        <el-table-column sortable show-overflow-tooltip prop="Status" align="center" label="状态" width="120">
+          <template slot-scope="scope">
+            {{columnFun(scope.row.Status)}}
+          </template>
+        </el-table-column>
+
 
         <!--<el-table-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -84,18 +106,6 @@
             </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>
@@ -246,47 +256,6 @@
             </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>
@@ -308,6 +277,66 @@
         authUser: 'authUser'
       })
     },
+    computed:{
+      evaluateFun:function(){
+        return function(item){
+          var index = Number(item)
+          switch(index){
+            case 1:
+              return '优秀'
+            break;
+            case 2:
+              return '合格'
+            break;
+            case 3:
+              return '不合格'
+            break;
+            default:
+              return '--'
+          }
+        }
+      },
+      columnFun:function(){
+        return function(item){
+            var index = Number(item)
+            switch(index){
+              case 0:
+                return '初始'
+              break;
+              case 1:
+                return '待二级初审'
+              break;
+              case 2:
+                return '待二级复审'
+              break;
+              case 3:
+                return '专业科室接收'
+              break;
+              case 4:
+                return '待专业科室审核'
+              break;
+              case 5:
+                return '待集中评审'
+              break;
+              case 6:
+                return '待交费'
+              break;
+              case 7:
+                return '待入库'
+              break;
+              case 8:
+                return '完成'
+              break;
+              case 9:
+                return '审核未通过'
+              break;
+              default:
+                return '--'
+              break;
+            }
+        }
+      }
+    },
     name: 'oilcontract',
 
     data() {
@@ -324,8 +353,8 @@
           Order: '',
           Prop: ''
         },
-        //查询时间
-        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        //查询时间new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()
+        CreateOn: [],
         //查询项
         searchFormReset: {},
         searchForm: {
@@ -365,67 +394,7 @@
           ModifiedBy: '',
 
         },
-        tableColumns: [
-          {
-            prop: "SupplierId",
-            label: '服务商ID',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SupplierName",
-            label: '服务商名称',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SumScore",
-            label: '评价得分',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SumScore1",
-            label: '项目管理(40分)',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SumScore2",
-            label: 'HSE管理(30分)',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SumScore3",
-            label: '合同履行(15分)',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SumScore4",
-            label: '企业诚信(15分)',
-            width: 100,
-            sort: true
-          },
-          {
-            prop: "Conclusion",
-            label: '评价结果',
-            width: 100,
-            sort: true
-          },
-           {
-            prop: "Status",
-            label: '状态',
-            width: 100,
-            sort: true
-          }]
+
       }
     },
     created() {
@@ -436,6 +405,16 @@
       //this.getDictOptions()
     },
     methods: {
+      //跳转评价
+      onNavigateScore(item){
+        console.log('跳转',item)
+        this.$router.push({
+          path:'/oilcontract/contract-service-year/' + item.Id + '/operation',
+          query:{
+            item:item
+          }
+        })
+      },
       initDatas() {
         //分页及列表条件
         let params = {
@@ -443,6 +422,7 @@
           _size: this.size,
           Order: this.Column.Order,
           Prop: this.Column.Prop,
+          ContractClass:'03',
         }
         let myCreateOn = []
         // 解析时间
@@ -511,8 +491,8 @@
         this.currentPage = 1
         this.initDatas()
       },
-      deleteEntity(row) {
-        row.deleteConfirmFlag = false;
+      deleteEntity(row,index) {
+        this.$refs['popover-' + `${index}`].doClose()
         api.deleteEntity(row.Id, this.$axios).then(res => {
           if (res.data.code === 0) {
             this.initDatas();

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

@@ -14,6 +14,20 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
+           <!-- <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status==7" @click="commonAuditClick(7)">企管法规处</el-button>
+           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status==4" @click="commonAuditClick(4)">专业处室审核</el-button>
+           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status==3" @click="commonAuditClick(3)">专业科室接收</el-button>
+           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status==2" @click="commonAuditClick(2)">复审</el-button>
+           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status==1" @click="commonAuditClick()">初审</el-button>
+           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status==1" @click="commonAuditClick(1)">提交审核</el-button> -->
+
+           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick(7)">企管法规处</el-button>
+           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick(4)">专业处室审核</el-button>
+           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick(3)">专业科室接收</el-button>
+           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick(2)">复审</el-button>
+           <!-- <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status==1" @click="commonAuditClick()">初审</el-button> -->
+           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick(1)">提交审核</el-button>
+
           <el-button type="primary" size="mini"  @click="saveEntity">保存</el-button>
         </span>
       </div>
@@ -101,6 +115,8 @@
         </el-tab-pane>
       </el-tabs>
     </el-card>
+    
+    <submitPopup ref="submitpopup" :eveId="formData.Id" :formData="formData" @refreshPage="refreshPage"></submitPopup>
 
   </div>
 </template>
@@ -139,7 +155,7 @@
         activeName: '1',
         serviceId: '',
         formData: {
-          Id: '',
+          Id: 0,
           SupplierId:'',
           SupplierName:'',
           SumScore :0,
@@ -158,14 +174,15 @@
       }
     },
     created() {
-      console.log('接受操作',this.$route.params)
-      this.operate  = this.$route.params.opera;
-      if(this.operate == 'add'){  // 新增进入
-        this.initPage(this.$route.query.item)
+      console.log('接受操作',this.$route.query.item)
+      this.serviceId  = this.$route.params.opera;
+      if(this.serviceId != 'add' && this.serviceId>0){  // 新增进入
+         this.formData.Id = this.serviceId
       }else{ // 编辑进入
-
+         this.formData.Id = 0
+         this.initPage(this.$route.query.item)
       }
-      
+
       // this.getDictOptions();
       // console.log(this.serviceId);
       // if(this.serviceId != 'add' && this.serviceId>0) {
@@ -176,6 +193,40 @@
       // }
     },
     methods: {
+      //刷新数据接口
+      refreshPage(){
+        //拿id查审核流程
+        // this.showIdDatas(this.formData.Id)
+      
+      
+      },
+      // 审核
+      commonAuditClick(index){
+        var index = Number(index)
+        switch(index){
+          // 初审
+          case 1:
+            this.$refs.submitpopup.dialogVisibleCom = true
+          break;
+          // 复审
+          case 2:
+            this.$refs.submitpopup.dialogCommonAuditMakeSureVisible = true
+          break;
+          // 专业科室接收
+          case 3:
+            this.$refs.submitpopup.auditOrgChange()
+            this.$refs.submitpopup.dialogBusinessOfficeSeparateAuditVisible = true
+          break;
+          // 专业处室审核
+          case 4:
+            this.$refs.submitpopup.dialogCommonAuditMakeSureVisible = true
+          break;
+          // 企管法规处
+          case 7:
+            this.$refs.submitpopup.dialogCommonAuditMakeSureVisible = true
+          break;
+        }
+      },
       initPage(item){
         this.formData.SupplierId   = parseInt(item.SupplierId)
         this.formData.SupplierName = item.SupplierName
@@ -221,7 +272,7 @@
       },
 
       addEntity() {
-        this.formData.Conclusion   = parseInt( this.formData.Conclusion ) 
+        this.formData.Conclusion   = parseInt( this.formData.Conclusion )
         api.addEntity(this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改

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

@@ -32,7 +32,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <el-table id="rebateSetTable" size="mini" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
+      <el-table id="rebateSetTable" stripe size="mini" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" header-align="center" width="100" align="center" fixed>
           <template slot-scope="scope">
               <el-button type="text" title="生成" size="small" icon="el-icon-edit" @click="onNavigateScore(scope.row)">生成</el-button>

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

@@ -22,17 +22,17 @@
           <el-col :span="8">
             <el-form-item label="上级节点" prop="ParentId">
               <el-select v-model="formData.ParentId" placeholder="请选择" :disabled="superiorDisabled" >
-                <el-option :label="item.content" :value="item.Id" v-for="(item,index) of oneList" :key="item.Id" ></el-option>
+                <el-option :label="item.Content" :value="item.Id" v-for="(item,index) of oneList" :key="item.Id" ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="分类：" prop="Type">
+            <el-form-item label="分类" prop="Type">
               <el-select v-model="formData.Type" placeholder="请选择" >
-                <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="03" label="服务商" value="03"></el-option>
+                <el-option key="01" label="供应商" value="01"></el-option>
+                <el-option key="02" label="承包商" value="02"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -52,8 +52,8 @@
           <el-col :span="8">
             <el-form-item label="级别" prop="LevelCode">
               <el-select v-model="formData.LevelCode" placeholder="请选择" @change="onLevelChange" >
-                <el-option key="1" label="一级" value="1"></el-option>
-                <el-option key="2" label="二级" value="2"></el-option>
+                <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>
@@ -175,7 +175,7 @@
     methods: {
       // 获取一级节点
       evaluationItemsOnelist() {
-        api.evaluationItemsOnelist(this.$axios).then(res => {
+        api.evaluationItemsOnelist(0,this.$axios).then(res => {
           console.log('一级节点',res)
           this.oneList = res.data.items
         }).catch(err => {
@@ -199,10 +199,10 @@
             console.error(err)
           });
         }
-        api.evaluationItemsOnelist(this.$axios).then(res => {
-        }).catch(err => {
-          console.error(err)
-        });
+        // api.evaluationItemsOnelist(this.$axios).then(res => {
+        // }).catch(err => {
+        //   console.error(err)
+        // });
       },
 
       getDictOptions() {
@@ -213,7 +213,7 @@
           console.error(err)
         })
 
-        api.evaluationItemsOnelist(this.$axios).then(res => {
+        api.evaluationItemsOnelist(0,this.$axios).then(res => {
           console.log('一级节点',res)
           this.oneList = res.data.items
         }).catch(err => {
@@ -230,7 +230,7 @@
             this.formData.LevelCode = Number(this.formData.LevelCode)
             this.formData.SequenceNo = Number(this.formData.SequenceNo)
             this.formData.NormalScore = Number(this.formData.NormalScore)
-            this.formData.Type = Number(this.formData.Type)
+            // this.formData.Type = Number(this.formData.Type)
 
             if (!this.formData.Id) {
               this.addEntity();

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

@@ -31,7 +31,7 @@
           </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 stripe size="mini" :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" min-width="130" align="center" fixed>
           <template slot-scope="scope">
             <router-link :to="'/oilcontract/evaluation-items/' + scope.row.Id + '/operation'">
@@ -48,7 +48,6 @@
               <br/>
               <div style="text-align: right; margin: 0">
                 <el-button type="primary" size="mini" @click="deleteEntity(scope.row,scope.$index)">删除</el-button>
-                <el-button type="primary" size="mini" @click="scope._self.$refs['popover-' + `${scope.$index}`].doClose()">删除22</el-button>
               </div>
               <el-button slot="reference" type="text" style="margin-left:6px" size="small" icon="el-icon-delete" >删除</el-button>
             </el-popover>
@@ -91,7 +90,7 @@
           <el-col :span="12">
             <el-form-item label="上级节点" prop="ParentId">
               <el-select v-model="searchForm.ParentId" placeholder="请选择" :disabled="superiorDisabled" >
-                <el-option :label="item.content" :value="item.Id" v-for="(item,index) of oneList" :key="item.Id" ></el-option>
+                <el-option :label="item.Content" :value="item.Id" v-for="(item,index) of oneList" :key="item.Id" ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -118,7 +117,6 @@
           </el-col>
 
 
-
           <el-col :span="12">
             <el-form-item label="标准分值">
               <el-input size="mini" v-model="searchForm.NormalScore" type="number" style="width:100%" placeholder="请输入"></el-input>
@@ -344,7 +342,7 @@
       },
       // 获取一级节点
       evaluationItemsOnelist() {
-        api.evaluationItemsOnelist(this.$axios).then(res => {
+        api.evaluationItemsOnelist(0,this.$axios).then(res => {
           console.log('一级节点',res)
           this.oneList = res.data.items
         }).catch(err => {
@@ -389,12 +387,9 @@
         this.initDatas()
       },
       deleteEntity(row,index) {
-        // console.log(22,this.$refs.popover)
         this.$refs['popover-' + `${index}`].doClose()
 
-        console.log(111,this.$refs.popover)
-        var elementId = this.$refs.popover.$refs.popper.id
-        // console.log(666,document.getElementById(elementId).style.display)
+        // var elementId = this.$refs.popover.$refs.popper.id
         api.deleteEntity(row.Id, this.$axios).then(res => {
           if (res.data.code === 0) {
             this.initDatas();

src/dashoo.cn/frontend_web/src/pages/select/processselect/wfmultihistory.vue

@@ -100,7 +100,7 @@
           params
         })
           .then(res => {
-            console.log('历史任务', res.data)
+            // console.log('历史任务', res.data)
             this.tmp_historyTask = res.data.items
             let useridstr = ''
             for (let i = 0; i < this.tmp_historyTask.length; i++) {