前:合同bug

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

@@ -60,7 +60,8 @@
                                      placeholder="请输入" style="width: 100%"/>
                   </el-form-item>
                 </el-col>
-
+              </el-row>
+              <el-row>
                 <el-col :span="8">
                   <el-form-item label="项目质量管理(20分)" prop="SumScore2">
                     <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore2" :max="20" :min="0"
@@ -81,7 +82,8 @@
                                      placeholder="请输入" style="width: 100%"/>
                   </el-form-item>
                 </el-col>
-
+              </el-row>
+              <el-row>
                 <el-col :span="8">
                   <el-form-item label="项目进度管理(10分)" prop="SumScore5">
                     <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore5" :max="10" :min="0"
@@ -100,6 +102,8 @@
                                      placeholder="请输入" style="width: 100%"/>
                   </el-form-item>
                 </el-col>
+              </el-row>
+              <el-row>
                 <el-col :span="8">
                   <el-form-item label="诚信履约(10分)" prop="SumScore8">
                     <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore8" :max="10" :min="0"
@@ -122,13 +126,15 @@
                                      placeholder="请输入" style="width: 100%"/>
                   </el-form-item>
                 </el-col>
+              </el-row>
+              <el-row>
                 <el-col :span="8">
                   <el-form-item label="基本条件评价结果" prop="Result2">
                     <el-input :disabled="!auditBtnBoolean" v-model="evaluateData.Result2" placeholder="请输入"
                               style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="24">
+                <el-col :span="16">
                   <el-form-item label="备注">
                     <el-input type="textarea" :disabled="!auditBtnBoolean" v-model="evaluateData.Note" placeholder="请输入"
                               style="width: 100%"></el-input>
@@ -258,8 +264,8 @@
       </el-tabs>
     </el-card>
 
-    <submitPopup ref="submitpopup" :examineType="1" :eveId="formData.Id" :formData="formData"
-                 @refreshPage="refreshPage"></submitPopup>
+    <submit-popup ref="submitpopup" :examineType="1" :selectDeptBoolean2="true" :eveId="formData.Id" :formData="formData"
+                 @refreshPage="refreshPage"></submit-popup>
 
   </div>
 </template>
@@ -269,10 +275,10 @@ import {
   mapGetters
 } from 'vuex'
 import api from '@/api/oilcontract/contractSumScore'
-import contractApi from '@/api/oilcontract/contract'
 import evaluationList from './evaluationlist'
 import baseList from './baselist'
 import WfHistory from '@/components/workflow/wfhistory.vue'
+import submitpopup from '@/components/oilcontract/submitPopup.vue'
 import apiCert from '@/api/oilsupplier/suppliercert'
 import permissionApi from '@/api/oilcontract/permission';
 
@@ -286,7 +292,8 @@ export default {
   components: {
     evaluationList,
     baseList,
-    WfHistory
+    WfHistory,
+    submitpopup
   },
 
   data() {
@@ -395,18 +402,20 @@ export default {
   created() {
     console.log('接受操作', this.$route.query.item)
     this.serviceId = this.$route.params.opera;
-    if (this.$route.query.item.SupplierId > 0) {
-      api.GetResultEntity(this.$route.query.item.SupplierId, this.$axios).then(res => {
-        console.log('结果', res)
-        this.evaluateData.Result1 = res.data.Result1
-        if (res.data.Result2 && res.data.Result2 == "0") {
-          this.evaluateData.Result2 = "否"
-        } else {
-          this.evaluateData.Result2 = "是"
-        }
-      }).catch(err => {
-        console.error(err)
-      });
+    if (this.$route.query.item) {
+      if (this.$route.query.item.SupplierId > 0) {
+        api.GetResultEntity(this.$route.query.item.SupplierId, this.$axios).then(res => {
+          console.log('结果', res)
+          this.evaluateData.Result1 = res.data.Result1
+          if (res.data.Result2 && res.data.Result2 == "0") {
+            this.evaluateData.Result2 = "否"
+          } else {
+            this.evaluateData.Result2 = "是"
+          }
+        }).catch(err => {
+          console.error(err)
+        });
+      }
     }
     if (this.serviceId != 'add' && this.serviceId > 0) {  //编辑进入
       this.formData.Id = this.serviceId

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

@@ -215,7 +215,8 @@ export default {
       activeName: '1',
       serviceId: '',
       formData: {
-        Id: 0
+        Id: 0,
+        Status: '0'
       },
       auditstepcode: '',
       contractData: {}, // 合同信息
@@ -252,7 +253,7 @@ export default {
       this.refreshPage()
     } else {
       this.formData.Id = 0
-      this.formData.Status = 0
+      this.formData.Status = '0'
       this.approvalProcess.disabled = true
       this.contractData = this.$route.query.item
     }
@@ -276,6 +277,7 @@ export default {
             } else {
               location.href = 'http:// ' + docurl
             }
+            console.log(location.href, 'href')
           }
         }).catch(err => {
           console.error(err)
@@ -289,13 +291,13 @@ export default {
       permissionApi.permissionIsauth(data1, this.$axios).then(res => {
         if (res.data.code == 0) {
           if (res.data.message == '有权限') {
-            console.log('有吗')
             this.departmentBoolean = true
           }
         }
       }).catch(err => {
         console.error(err)
       })
+      console.log(this.departmentBoolean, '专业处室评价tab1')
       let data2 = {percode: 'oil_contract.Review.Check'}
       permissionApi.permissionIsauth(data2, this.$axios).then(res => {
         if (res.data.code == 0) {
@@ -330,6 +332,7 @@ export default {
         this.entrydetail.business = ''
         let data = res.data
         this.formData = res.data
+        console.log(this.formData.Status, '专业处室评价tab')
         this.entrydetail.business = id
         this.entrydetail.instance = data.WorkflowId
         this.entrydetail.process = data.ProcessKey

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

@@ -271,7 +271,7 @@ export default {
   data () {
     return {
       userSelectBoolean: false,
-      eveIdList: '',
+      eveIdList: 0,
       selectAllButtonBoolean: false,
 
       editeBoolean: false,
@@ -456,7 +456,7 @@ export default {
       e.map((item, index) => {
         list.push(item.Id)
       })
-      this.eveIdList = String(list)
+      this.eveIdList = list
     },
     //筛选
     selectableFun(row, index) {
@@ -472,7 +472,7 @@ export default {
     },
     //一键处理确定
     onSelectAllButtonTrue() {
-      if (this.eveIdList != '' && this.eveIdList != undefined) {
+      if (this.eveIdList != 0 && this.eveIdList != undefined) {
         this.$refs.submitpopup.dialogCommonAuditMakeSureVisible = true
       } else {
         this.$message({
@@ -481,11 +481,11 @@ export default {
         });
       }
     },
-    //一键处理取消
-    onSelectAllButtonDelete() {
+    // 一键处理取消
+    onSelectAllButtonDelete () {
       this.selectAllButtonBoolean = false
     },
-    //状态判断
+    // 状态判断
     statusFun () {
       // 一键处理权限
       let data = {

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

@@ -1,5 +1,3 @@
-
-
 <template>
   <div>
     <el-breadcrumb class="heading">
@@ -14,87 +12,110 @@
           <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'&&auditBtn" @click="commonAuditClick(7)">企管法规处审批</el-button>
-           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='4'&&auditBtn" @click="commonAuditClick(4)">专业处室审核</el-button>
-           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='3'&&auditBtn" @click="commonAuditClick(3)">专业处室分办</el-button>
-           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='2'&&auditBtn" @click="commonAuditClick(2)">复审</el-button>
-           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='1'&&auditBtn" @click="commonAuditClick(1)">初审</el-button>
-           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="Number(formData.Status)<=0&&formData.Id!=0&&checkBoolean" @click="commonAuditClick(0)">提交审核</el-button>
-
-
-          <el-button type="primary" size="mini" v-if="(Number(formData.Status)<=0&&saveButton)||(formData.Status=='4'&&auditBtn)" @click="saveEntity">保存</el-button>
+           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='7'&&auditBtn"
+                      @click="commonAuditClick(7)">企管法规处审批</el-button>
+           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='4'&&auditBtn"
+                      @click="commonAuditClick(4)">专业处室审核</el-button>
+           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='3'&&auditBtn"
+                      @click="commonAuditClick(3)">专业处室分办</el-button>
+           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='2'&&auditBtn"
+                      @click="commonAuditClick(2)">复审</el-button>
+           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Status=='1'&&auditBtn"
+                      @click="commonAuditClick(1)">初审</el-button>
+           <el-button type="primary" size="mini" style="margin-left: 8px"
+                      v-if="Number(formData.Status)<=0&&formData.Id!=0&&checkBoolean"
+                      @click="commonAuditClick(0)">提交审核</el-button>
+
+
+          <el-button type="primary" size="mini"
+                     v-if="(Number(formData.Status)<=0&&saveButton)||(formData.Status=='4'&&auditBtn)"
+                     @click="saveEntity">保存</el-button>
           <el-button @click="onBack" type="primary" size="mini" style="margin-left: 8px">返回</el-button>
         </span>
       </div>
       <el-tabs v-model="activeName" style="margin-top: -10px">
         <!-- 普通 -->
-        <el-tab-pane label="评价信息" name="1" >
+        <el-tab-pane label="评价信息" name="1">
           <el-card class="box-card" style="mini-height: calc(100vh - 113px);">
             <el-form label-width="160px" ref="EntityForm" :model="evaluateData" :rules="rules">
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="供应商名称">
-                    <el-input disabled="disabled" v-model="evaluateData.SupplierName"  style="width: 100%"></el-input>
+                    <el-input disabled="disabled" v-model="evaluateData.SupplierName" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
                   <el-form-item label="评价得分" prop="SumScore">
-                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore" ::max="100" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore" ::max="100" :min="0"
+                                     placeholder="请输入" style="width: 100%"/>
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="8" >
+                <el-col :span="8">
                   <el-form-item label="产品质量(30分)" prop="SumScore1">
-                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore1" :max="30" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore1" :max="30" :min="0"
+                                     placeholder="请输入" style="width: 100%"/>
                   </el-form-item>
                 </el-col>
-
-                <el-col :span="8" >
+              </el-row>
+              <el-row>
+                <el-col :span="8">
                   <el-form-item label="合同履行(20分)" prop="SumScore2">
-                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore2" :max="20" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore2" :max="20" :min="0"
+                                     placeholder="请输入" style="width: 100%"/>
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="8" >
+                <el-col :span="8">
                   <el-form-item label="售后服务(15分)" prop="SumScore3">
-                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore3" :max="15" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore3" :max="15" :min="0"
+                                     placeholder="请输入" style="width: 100%"/>
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="8" >
+                <el-col :span="8">
                   <el-form-item label="诚信经营(15分)" prop="SumScore4">
-                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore4" :max="15" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore4" :max="15" :min="0"
+                                     placeholder="请输入" style="width: 100%"/>
                   </el-form-item>
                 </el-col>
-
-                <el-col :span="8" >
+              </el-row>
+              <el-row>
+                <el-col :span="8">
                   <el-form-item label="协同响应(20分)" prop="SumScore5">
-                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore5" :max="20" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.SumScore5" :max="20" :min="0"
+                                     placeholder="请输入" style="width: 100%"/>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8" >
+                <el-col :span="8">
                   <el-form-item label="评价结果" prop="Conclusion">
-                    <el-select :disabled="!auditBtnBoolean" v-model="evaluateData.Conclusion" placeholder="请选择" style="width: 100%">
+                    <el-select :disabled="!auditBtnBoolean" v-model="evaluateData.Conclusion" 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-col :span="8">
                   <el-form-item label="业绩评价结果" prop="Result1">
-                    <el-input  :disabled="!auditBtnBoolean" v-model="evaluateData.Result1" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input-number :disabled="!auditBtnBoolean" v-model="evaluateData.Result1" :max="100" :min="0" placeholder="请输入"
+                              style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8" >
+              </el-row>
+              <el-row>
+                <el-col :span="8">
                   <el-form-item label="基本条件评价结果" prop="Result2">
-                    <el-input  :disabled="!auditBtnBoolean" v-model="evaluateData.Result2" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input :disabled="!auditBtnBoolean" v-model="evaluateData.Result2" placeholder="请输入"
+                              style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="24">
+                <el-col :span="16">
                   <el-form-item label="备注">
-                    <el-input type="textarea" :disabled="!auditBtnBoolean" v-model="evaluateData.Note" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input type="textarea" :disabled="!auditBtnBoolean" v-model="evaluateData.Note" placeholder="请输入"
+                              style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -103,76 +124,89 @@
         </el-tab-pane>
         <!-- 普通 -->
         <el-tab-pane label="条件评价" name="2" v-if="formData.ContractClass=='02'">
-          <baseList ref="evaluateDataRef" :baseData="evaluateData" :evaluateId="formData.Id" :category="0" :ContractClass="formData.ContractClass" :disabledForm="auditBtnBoolean"></baseList>
+          <baseList ref="evaluateDataRef" :baseData="evaluateData" :evaluateId="formData.Id" :category="0"
+                    :ContractClass="formData.ContractClass" :disabledForm="auditBtnBoolean"></baseList>
         </el-tab-pane>
 
         <!-- 专业处室 -->
-        <el-tab-pane label="专业处室评价信息" name="3" v-if="auditBtnBooleanZhuan||Number(formData.Status)>4||Number(formData.Status)<0">
+        <el-tab-pane label="专业处室评价信息" name="3"
+                     v-if="auditBtnBooleanZhuan||Number(formData.Status)>4||Number(formData.Status)<0">
           <el-card class="box-card" style="mini-height: calc(100vh - 113px);">
             <el-form label-width="160px" ref="EntityForm2" :model="evaluateDataZhuan" :rules="rules">
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="服务商名称">
-                    <el-input disabled="disabled" v-model="evaluateDataZhuan.SupplierName"  style="width: 100%"></el-input>
+                    <el-input disabled="disabled" v-model="evaluateDataZhuan.SupplierName"
+                              style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="评价得分" prop="SumScore">
-                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore" :max="100" placeholder="请输入"  style="width: 100%" />
+                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore" :max="100"
+                                     placeholder="请输入" style="width: 100%"/>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8" >
+                <el-col :span="8">
                   <el-form-item label="产品质量(30分)" prop="SumScore1">
-                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore1" :max="30" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore1" :max="30"
+                                     :min="0" placeholder="请输入" style="width: 100%"/>
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="8" >
+                <el-col :span="8">
                   <el-form-item label="合同履行(20分)" prop="SumScore2">
-                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore2" :max="20" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore2" :max="20"
+                                     :min="0" placeholder="请输入" style="width: 100%"/>
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="8" >
+                <el-col :span="8">
                   <el-form-item label="售后服务(15分)" prop="SumScore3">
-                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore3" :max="15" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore3" :max="15"
+                                     :min="0" placeholder="请输入" style="width: 100%"/>
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="8" >
+                <el-col :span="8">
                   <el-form-item label="诚信经营(15分)" prop="SumScore4">
-                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore4" :max="15" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore4" :max="15"
+                                     :min="0" placeholder="请输入" style="width: 100%"/>
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="8" >
+                <el-col :span="8">
                   <el-form-item label="协同响应(20分)" prop="SumScore5">
-                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore5" :max="20" :min="0" placeholder="请输入"  style="width: 100%" />
+                    <el-input-number :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.SumScore5" :max="20"
+                                     :min="0" placeholder="请输入" style="width: 100%"/>
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="8" >
+                <el-col :span="8">
                   <el-form-item label="评价结果" prop="Conclusion">
-                    <el-select :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Conclusion" placeholder="请选择" style="width: 100%">
+                    <el-select :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Conclusion"
+                               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-col :span="8">
                   <el-form-item label="业绩评价结果" prop="Result1">
-                    <el-input  :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Result1" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Result1" placeholder="请输入"
+                              style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8" >
+                <el-col :span="8">
                   <el-form-item label="基本条件评价结果" prop="Result2">
-                    <el-input  :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Result2" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Result2" placeholder="请输入"
+                              style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
                   <el-form-item label="备注">
-                    <el-input type="textarea" :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Note" placeholder="请输入"  style="width: 100%"></el-input>
+                    <el-input type="textarea" :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Note"
+                              placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -181,158 +215,162 @@
         </el-tab-pane>
         <!-- 专业处室 -->
         <el-tab-pane label="专业处室条件评价" name="4" v-if="departmentBoolean&&formData.ContractClass=='02'">
-          <baseList ref="evaluateDataZhuanRef" :baseData="evaluateDataZhuan" :evaluateId="formData.Id" :category="1" :ContractClass="formData.ContractClass" :disabledForm="auditBtnBooleanZhuan"></baseList>
+          <baseList ref="evaluateDataZhuanRef" :baseData="evaluateDataZhuan" :evaluateId="formData.Id" :category="1"
+                    :ContractClass="formData.ContractClass" :disabledForm="auditBtnBooleanZhuan"></baseList>
         </el-tab-pane>
 
-         <!-- :disabled="formData.Status==0" -->
+        <!-- :disabled="formData.Status==0" -->
         <el-tab-pane label="审批流程" name="6" v-if="formData.Id!=0&&formData.Status!=0">
           <el-card class="box-card mycard">
             <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
           </el-card>
         </el-tab-pane>
 
-        </el-tabs>
-      </el-card>
+      </el-tabs>
+    </el-card>
 
-    <submitPopup ref="submitpopup" :examineType="1" :eveId="formData.Id" :formData="formData" @refreshPage="refreshPage"></submitPopup>
+    <submit-popup ref="submitpopup" :examineType="1" :eveId="formData.Id" :formData="formData"
+                  @refreshPage="refreshPage"></submit-popup>
 
   </div>
 </template>
 
 <script>
-  import {
-    mapGetters
-  } from 'vuex'
-  import api from '@/api/oilcontract/contractSumScore'
-  import contractApi from '@/api/oilcontract/contract'
-  import evaluationList from './evaluationlist'
-  import baseList from './baselist'
-  import WfHistory from '@/components/workflow/wfhistory.vue'
-  import apiCert from '@/api/oilsupplier/suppliercert'
-  import permissionApi from '@/api/oilcontract/permission';
-  export default {
-    computed: {
-      ...mapGetters({
-        authUser: 'authUser'
-      })
-    },
-    name: 'oilcontractEdit',
-    components: {
-      evaluationList,
-      baseList,
-      WfHistory
-    },
-
-    data() {
-      var validateFen = (rule, value, callback) => {
-        console.log(rule, value, callback)
-        // if (value === '') {
-        //   callback(new Error('请再次输入密码'));
-        // } else if (value !== this.ruleForm.pass) {
-        //   callback(new Error('两次输入密码不一致!'));
-        // } else {
-          callback();
-        // }
-      };
-      return {
-        entityList:[],
-        // 当前操作
-        // operate:'add',   // add 新增 edit 编辑
-        // 工作流
-        rules:{
-          SumScore: [
-                { required: true, message: '请填写', trigger: 'change' },
-                {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/,  message: '填写格式不正确', trigger: 'change'},
-                // { validator: validateFen, trigger: 'change' }
-              ],
-          SumScore1: [
-                { required: true, message: '请填写', trigger: 'change' },
-                {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/,  message: '填写格式不正确', trigger: 'change'},
-              ],
-          SumScore2: [
-                { required: true, message: '请填写', trigger: 'change' },
-                {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/,  message: '填写格式不正确', trigger: 'change'},
-              ],
-          SumScore3: [
-                { required: true, message: '请填写', trigger: 'change' },
-                {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/,  message: '填写格式不正确', trigger: 'change'},
-              ],
-          SumScore4: [
-                { required: true, message: '请填写', trigger: 'change' },
-                {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/,  message: '填写格式不正确', trigger: 'change'},
-              ],
-          SumScore5: [
-                { required: true, message: '请填写', trigger: 'change' },
-                {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/,  message: '填写格式不正确', trigger: 'change'},
-              ],
-          SumScore6: [
-                { required: true, message: '请填写', trigger: 'change' },
-                {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/,  message: '填写格式不正确', trigger: 'change'},
-              ],
-          SumScore7: [
-                { required: true, message: '请填写', trigger: 'change' },
-                {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/,  message: '填写格式不正确', trigger: 'change'},
-              ],
-          SumScore8: [
-                { required: true, message: '请填写', trigger: 'change' },
-                {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/,  message: '填写格式不正确', trigger: 'change'},
-              ],
-          Result1: [
-                { required: true, message: '请填写', trigger: 'blur' },
-              ],
-          Result2: [
-                { required: true, message: '请填写', trigger: 'blur' },
-              ],
-          Conclusion: [
-                { required: true, message: '请填写', trigger: 'change' },
-              ],
-        },
-        entrydetail: {
-          process: '',
-          business: '',
-          instance: ''
-        },
-        activeName: '1',
-        serviceId: '',
-        // 评价信息
-        evaluateData: {
-          Id: 0,
-        },
-        // 评价信息（专业处室）
-        evaluateDataZhuan: {
-          Id: 0,
-        },
-        typeList:[],
-        // 接口反的信息
-        formData:{
-          Id: 0,
-          Status:0,
-        },
-        nowItem:{},
-
-        editData:{},
-        evaluation_list:[],
-        auditBtn:false,
-        auditBtnBoolean:true,
-        auditBtnBooleanZhuan:false,
-        auditstepcode:'',
-        //下拉选择项
-        //wellNoOptions: [],
-        //supervisersOptions: [],
-
-        departmentBoolean:false,
-        checkBoolean:false,
-        saveButton:false,
-      }
-    },
-    watch:{
-    },
-    created() {
-      console.log('接受操作',this.$route.query.item)
-      this.serviceId  = this.$route.params.opera;
+import {
+  mapGetters
+} from 'vuex'
+import api from '@/api/oilcontract/contractSumScore'
+import evaluationList from './evaluationlist'
+import baseList from './baselist'
+import WfHistory from '@/components/workflow/wfhistory.vue'
+import submitPopup from '@/components/oilcontract/submitPopup.vue'
+import apiCert from '@/api/oilsupplier/suppliercert'
+import permissionApi from '@/api/oilcontract/permission'
+
+export default {
+  computed: {
+    ...mapGetters({
+      authUser: 'authUser'
+    })
+  },
+  name: 'oilcontractEdit',
+  components: {
+    evaluationList,
+    baseList,
+    WfHistory,
+    submitPopup
+  },
+
+  data() {
+    var validateFen = (rule, value, callback) => {
+      console.log(rule, value, callback)
+      // if (value === '') {
+      //   callback(new Error('请再次输入密码'));
+      // } else if (value !== this.ruleForm.pass) {
+      //   callback(new Error('两次输入密码不一致!'));
+      // } else {
+      callback();
+      // }
+    };
+    return {
+      entityList: [],
+      // 当前操作
+      // operate:'add',   // add 新增 edit 编辑
+      // 工作流
+      rules: {
+        SumScore: [
+          {required: true, message: '请填写', trigger: 'change'},
+          {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/, message: '填写格式不正确', trigger: 'change'},
+          // { validator: validateFen, trigger: 'change' }
+        ],
+        SumScore1: [
+          {required: true, message: '请填写', trigger: 'change'},
+          {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/, message: '填写格式不正确', trigger: 'change'},
+        ],
+        SumScore2: [
+          {required: true, message: '请填写', trigger: 'change'},
+          {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/, message: '填写格式不正确', trigger: 'change'},
+        ],
+        SumScore3: [
+          {required: true, message: '请填写', trigger: 'change'},
+          {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/, message: '填写格式不正确', trigger: 'change'},
+        ],
+        SumScore4: [
+          {required: true, message: '请填写', trigger: 'change'},
+          {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/, message: '填写格式不正确', trigger: 'change'},
+        ],
+        SumScore5: [
+          {required: true, message: '请填写', trigger: 'change'},
+          {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/, message: '填写格式不正确', trigger: 'change'},
+        ],
+        SumScore6: [
+          {required: true, message: '请填写', trigger: 'change'},
+          {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/, message: '填写格式不正确', trigger: 'change'},
+        ],
+        SumScore7: [
+          {required: true, message: '请填写', trigger: 'change'},
+          {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/, message: '填写格式不正确', trigger: 'change'},
+        ],
+        SumScore8: [
+          {required: true, message: '请填写', trigger: 'change'},
+          {pattern: /^\+?((0|([1-9]+\d*))|((0\.\d+)|([1-9]+\d*\.\d+)))$/, message: '填写格式不正确', trigger: 'change'},
+        ],
+        Result1: [
+          {required: true, message: '请填写', trigger: 'blur'},
+        ],
+        Result2: [
+          {required: true, message: '请填写', trigger: 'blur'},
+        ],
+        Conclusion: [
+          {required: true, message: '请填写', trigger: 'change'},
+        ],
+      },
+      entrydetail: {
+        process: '',
+        business: '',
+        instance: ''
+      },
+      activeName: '1',
+      serviceId: '',
+      // 评价信息
+      evaluateData: {
+        Id: 0,
+      },
+      // 评价信息（专业处室）
+      evaluateDataZhuan: {
+        Id: 0,
+      },
+      typeList: [],
+      // 接口反的信息
+      formData: {
+        Id: 0,
+        Status: 0,
+      },
+      nowItem: {},
+
+      editData: {},
+      evaluation_list: [],
+      auditBtn: false,
+      auditBtnBoolean: true,
+      auditBtnBooleanZhuan: false,
+      auditstepcode: '',
+      //下拉选择项
+      //wellNoOptions: [],
+      //supervisersOptions: [],
+
+      departmentBoolean: false,
+      checkBoolean: false,
+      saveButton: false,
+    }
+  },
+  watch: {},
+  created() {
+    console.log('接受操作', this.$route.query.item)
+    this.serviceId = this.$route.params.opera;
+    if (this.$route.query.item) {
       if (this.$route.query.item.SupplierId > 0) {
         api.GetResultEntity(this.$route.query.item.SupplierId, this.$axios).then(res => {
-          console.log('结果',res)
+          console.log('结果', res)
           this.evaluateData.Result1 = res.data.Result1
           if (res.data.Result2 && res.data.Result2 == "0") {
             this.evaluateData.Result2 = "否"
@@ -343,388 +381,390 @@
           console.error(err)
         });
       }
-      if(this.serviceId != 'add' && this.serviceId>0){  //编辑进入
-         this.formData.Id = this.serviceId
-         this.refreshPage()
-      }else{ // 新增进入
-         this.formData = this.$route.query.item
-         this.formData.Id = 0;
-         this.formData.Status = 0
-         this.nowItem = this.$route.query.item
-         this.initPage(this.$route.query.item)
+    }
+    if (this.serviceId != 'add' && this.serviceId > 0) {  //编辑进入
+      this.formData.Id = this.serviceId
+      this.refreshPage()
+    } else { // 新增进入
+      this.formData = this.$route.query.item
+      this.formData.Id = 0;
+      this.formData.Status = 0
+      this.nowItem = this.$route.query.item
+      this.initPage(this.$route.query.item)
+    }
+    this.statusFun()
+  },
+  methods: {
+    //状态判断
+    statusFun() {
+      let data = {
+        percode: 'oil_contract.SumStore.Department'
       }
-      this.statusFun()
-    },
-    methods: {
-      //状态判断
-      statusFun(){
-        let data = {
-          percode: 'oil_contract.SumStore.Department'
-        }
-        permissionApi.permissionIsauth(data, this.$axios).then(res => {
-          console.log('权限',res.data)
-          if(res.data.code==0){
-            if(res.data.message=='有权限'){
-              this.departmentBoolean = true
-            }
+      permissionApi.permissionIsauth(data, this.$axios).then(res => {
+        console.log('权限', res.data)
+        if (res.data.code == 0) {
+          if (res.data.message == '有权限') {
+            this.departmentBoolean = true
           }
-        }).catch(err => {
-          console.error(err)
-        })
-        let data1 = {
-          percode: 'oil_contract.SumStore.Check'
         }
-        permissionApi.permissionIsauth(data1, this.$axios).then(res => {
-          console.log('权限', res.data)
-          if(res.data.code==0){
-            if(res.data.message=='有权限'){
-              this.checkBoolean = true
-            }
+      }).catch(err => {
+        console.error(err)
+      })
+      let data1 = {
+        percode: 'oil_contract.SumStore.Check'
+      }
+      permissionApi.permissionIsauth(data1, this.$axios).then(res => {
+        console.log('权限', res.data)
+        if (res.data.code == 0) {
+          if (res.data.message == '有权限') {
+            this.checkBoolean = true
           }
-        }).catch(err => {
-          console.error(err)
-        })
-        let data2 = {
-          percode: 'oil_contract.SumStore.Save'
         }
-        permissionApi.permissionIsauth(data2, this.$axios).then(res => {
-          console.log('权限', res.data)
-          if(res.data.code==0){
-            if(res.data.message=='有权限'){
-              this.saveButton = true
-            }
+      }).catch(err => {
+        console.error(err)
+      })
+      let data2 = {
+        percode: 'oil_contract.SumStore.Save'
+      }
+      permissionApi.permissionIsauth(data2, this.$axios).then(res => {
+        console.log('权限', res.data)
+        if (res.data.code == 0) {
+          if (res.data.message == '有权限') {
+            this.saveButton = true
           }
-        }).catch(err => {
-          console.error(err)
-        })
+        }
+      }).catch(err => {
+        console.error(err)
+      })
 
-      },
-      //刷新数据接口
-      refreshPage(){
-        //拿id查审核流程
-        this.showIdDatas()
-        this.showIdDatass()
+    },
+    //刷新数据接口
+    refreshPage() {
+      //拿id查审核流程
+      this.showIdDatas()
+      this.showIdDatass()
 
-      },
-      // 审核
-      commonAuditClick(index){
-        var index = Number(index)
-        switch(index){
-          // 提交审核
-          case 0:
-            this.$refs.submitpopup.dialogVisibleCom = true
+    },
+    // 审核
+    commonAuditClick(index) {
+      var index = Number(index)
+      switch (index) {
+        // 提交审核
+        case 0:
+          this.$refs.submitpopup.dialogVisibleCom = true
           break;
-          // 初审
-          case 1:
-            this.$refs.submitpopup.dialogCommonAuditMakeSureVisible = true
+        // 初审
+        case 1:
+          this.$refs.submitpopup.dialogCommonAuditMakeSureVisible = true
           break;
-          // 复审
-          case 2:
-            this.$refs.submitpopup.dialogCommonAuditMakeSureVisible = true
+        // 复审
+        case 2:
+          this.$refs.submitpopup.dialogCommonAuditMakeSureVisible = true
           break;
-          // 专业科室接收
-          case 3:
-            this.$refs.submitpopup.auditOrgChange()
-            this.$refs.submitpopup.dialogBusinessOfficeSeparateAuditVisible = true
+        // 专业科室接收
+        case 3:
+          this.$refs.submitpopup.auditOrgChange()
+          this.$refs.submitpopup.dialogBusinessOfficeSeparateAuditVisible = true
           break;
-          // 专业处室审核
-          case 4:
-            this.$refs.submitpopup.dialogCommonAuditMakeSureVisible = true
+        // 专业处室审核
+        case 4:
+          this.$refs.submitpopup.dialogCommonAuditMakeSureVisible = true
           break;
-          // 企管法规处
-          case 7:
-            this.$refs.submitpopup.dialogCommonAuditMakeSureVisible = true
+        // 企管法规处
+        case 7:
+          this.$refs.submitpopup.dialogCommonAuditMakeSureVisible = true
           break;
-        }
-      },
-      initPage(item){
-        this.evaluateData = item
-
-        this.$set(this.evaluateData,'SupplierId', Number(item.SupplierId))
-        this.$set(this.evaluateData,'SumScore', Number(item.Score))
-        this.$set(this.evaluateData,'SumScore1', Number(item.Score1))
-        this.$set(this.evaluateData,'SumScore2', Number(item.Score2))
-        this.$set(this.evaluateData,'SumScore3', Number(item.Score3))
-        this.$set(this.evaluateData,'SumScore4', Number(item.Score4))
-        this.$set(this.evaluateData,'SumScore5', Number(item.Score5))
-        this.$set(this.evaluateData,'Conclusion', Number(item.Evaluate))
-        this.$set(this.evaluateData,'Result1', '')
-        this.$set(this.evaluateData,'Result2', '')
-        // this.getList()
-      },
-      // 获取编辑信息
-      showIdDatas() {
-        if(this.formData.Id) {
-          api.getEntity(0,this.formData.Id, this.$axios).then(res => {
-            console.log('用id去查详情信息',res)
-            this.entrydetail.business      = ''
-            var item = res.data
-            this.formData                  = res.data;
-            this.evaluateData              = res.data;
-            this.evaluateData.Conclusion   = Number(item.Conclusion)
-            this.entrydetail.business      = item.Id
-            this.entrydetail.instance      = item.WorkflowId
-            this.entrydetail.process       = item.ProcessKey
-
-            this.isAccess()
-            // this.getList()
-          }).catch(err => {
-            console.error(err)
-          });
-        }
-      },
-      // 获取编辑信息(专业处室)
-      showIdDatass() {
-        if(this.formData.Id) {
-          api.getEntity(1,this.formData.Id, this.$axios).then(res => {
-            console.log('用id去查详情信息',res)
-            var item = res.data
-            this.evaluateDataZhuan         = res.data;
-            this.evaluateDataZhuan.Conclusion   = Number(item.Conclusion)
-          }).catch(err => {
-            console.error(err)
-          });
-        }
-      },
-
-
-      //保存信息
-      saveEntity() {
-        if(this.formData.Status!='4'){//普通二级用户评价evaluation_listType_one
-          // this.evaluation_list = this.$refs.evaluation_list_one.entityListData.entityList
-          // this.evaluation_list = this.evaluation_list.concat(this.$refs.evaluation_listType_one.entityListData.entityList)
-          // 获取第一列评价格式
-          // var fractionBoolean_1 = this.$refs.evaluation_list_one.fractionBoolean
-
-          if(this.formData.ContractClass=='02'){
-            this.typeList = this.$refs.evaluateDataRef.typeList
-          }
-          this.$refs['EntityForm'].validate((valid) => {
-            if (valid) {
-              // if(fractionBoolean_1){
-                if(this.formData.Id == 0||this.formData.Id == undefined||this.formData.Id == null){
-                  this.addEntity()
-                }else{
-                  this.updateEntity()
-                }
-              // }else{
-              //   this.$message.error('业绩评价填写的分数有误');
-              // }
-            } else {
-              this.$message.error('评价信息填写的有误');
-            }
-          })
-        }else{//专业处室评价
-          // this.evaluation_list = this.$refs.evaluation_list_two.entityListData.entityList
-          // this.evaluation_list = this.evaluation_list.concat(this.$refs.evaluation_listType_two.entityListData.entityList)
-          // // 获取第一列评价格式
-          // var fractionBoolean_1 = this.$refs.evaluation_list_two.fractionBoolean
-          if(this.formData.ContractClass=='02'){
-            this.typeList = this.$refs.evaluateDataZhuanRef.typeList
-          }
-          this.$refs['EntityForm2'].validate((valid) => {
-            if (valid) {
-                this.majorEvaluate()
-            } else {
-              this.$message.error('评价信息填写的有误');
-            }
-          })
-        }
-      },
-      //专业处室评价
-      majorEvaluate(){
-        if(this.formData.ContractClass=='02'){
-          for(var i = 1 ; i <= 8 ; i++){
-            this.evaluateDataZhuan['B'+i] = parseInt(this.typeList[i-1].value)
-          }
-        }
-        var formData = this.evaluateDataZhuan
-        api.saveSecEvaluation(this.formData.Id,formData, this.$axios).then(res => {
-          console.log('新增',res)
-          if(res.data.code==0){
-            this.$message({
-              type: 'success',
-              message: res.data.message
-            });
-            this.refreshPage();
-          }
+      }
+    },
+    initPage(item) {
+      this.evaluateData = item
+
+      this.$set(this.evaluateData, 'SupplierId', Number(item.SupplierId))
+      this.$set(this.evaluateData, 'SumScore', Number(item.Score))
+      this.$set(this.evaluateData, 'SumScore1', Number(item.Score1))
+      this.$set(this.evaluateData, 'SumScore2', Number(item.Score2))
+      this.$set(this.evaluateData, 'SumScore3', Number(item.Score3))
+      this.$set(this.evaluateData, 'SumScore4', Number(item.Score4))
+      this.$set(this.evaluateData, 'SumScore5', Number(item.Score5))
+      this.$set(this.evaluateData, 'Conclusion', Number(item.Evaluate))
+      this.$set(this.evaluateData, 'Result1', '')
+      this.$set(this.evaluateData, 'Result2', '')
+      // this.getList()
+    },
+    // 获取编辑信息
+    showIdDatas() {
+      if (this.formData.Id) {
+        api.getEntity(0, this.formData.Id, this.$axios).then(res => {
+          console.log('用id去查详情信息', res)
+          this.entrydetail.business = ''
+          var item = res.data
+          this.formData = res.data;
+          this.evaluateData = res.data;
+          this.evaluateData.Conclusion = Number(item.Conclusion)
+          this.entrydetail.business = item.Id
+          this.entrydetail.instance = item.WorkflowId
+          this.entrydetail.process = item.ProcessKey
+
+          this.isAccess()
+          // this.getList()
         }).catch(err => {
           console.error(err)
         });
-      },
-      //新增评价
-      addEntity() {
-        this.evaluateData.Conclusion  = parseInt( this.evaluateData.Conclusion )
-        if(this.formData.ContractClass=='02'){
-          for(var i = 1 ; i <= 8 ; i++){
-            this.evaluateData['B'+i] = parseInt(this.typeList[i-1].value)
-          }
-        }
-        api.addEntity(this.evaluateData, this.$axios).then(res => {
-          if (res.data.code === 0) {
-            this.formData.Id = res.data.item;
-            this.$message({
-              type: 'success',
-              message: res.data.message
-            });
-            this.refreshPage();
-          } else {
-            this.$message({
-              type: 'warning',
-              message: res.data.message
-            });
-          }
+      }
+    },
+    // 获取编辑信息(专业处室)
+    showIdDatass() {
+      if (this.formData.Id) {
+        api.getEntity(1, this.formData.Id, this.$axios).then(res => {
+          console.log('用id去查详情信息', res)
+          var item = res.data
+          this.evaluateDataZhuan = res.data;
+          this.evaluateDataZhuan.Conclusion = Number(item.Conclusion)
         }).catch(err => {
           console.error(err)
         });
-      },
+      }
+    },
 
-      updateEntity() {
-        if(this.formData.ContractClass=='02'){
-          for(var i = 1 ; i <= 8 ; i++){
-            this.evaluateData['B'+i] = parseInt(this.typeList[i-1].value)
-          }
+
+    //保存信息
+    saveEntity() {
+      if (this.formData.Status != '4') {//普通二级用户评价evaluation_listType_one
+        // this.evaluation_list = this.$refs.evaluation_list_one.entityListData.entityList
+        // this.evaluation_list = this.evaluation_list.concat(this.$refs.evaluation_listType_one.entityListData.entityList)
+        // 获取第一列评价格式
+        // var fractionBoolean_1 = this.$refs.evaluation_list_one.fractionBoolean
+
+        if (this.formData.ContractClass == '02') {
+          this.typeList = this.$refs.evaluateDataRef.typeList
         }
-        api.updateEntity(this.formData.Id, this.evaluateData, this.$axios).then(res => {
-          if (res.data.code === 0) {
-            this.refreshPage();
-            this.$message({
-              type: 'success',
-              message: res.data.message
-            });
+        this.$refs['EntityForm'].validate((valid) => {
+          if (valid) {
+            // if(fractionBoolean_1){
+            if (this.formData.Id == 0 || this.formData.Id == undefined || this.formData.Id == null) {
+              this.addEntity()
+            } else {
+              this.updateEntity()
+            }
+            // }else{
+            //   this.$message.error('业绩评价填写的分数有误');
+            // }
           } else {
-            this.$message({
-              type: 'warning',
-              message: res.data.message
-            });
+            this.$message.error('评价信息填写的有误');
           }
-        }).catch(err => {
-          console.error(err)
-        });
-      },
-      getAuditStepCodeByStatus () {
-        if (this.formData.Status === '1') {
-          this.auditstepcode = 'FIRST_TRIAL'
-        } else if (this.formData.Status === '2') {
-          this.auditstepcode = 'SECOND_TRIAL'
-        } else if (this.formData.Status === '3') {
-          this.auditstepcode = 'PROF_RECE'
-        } else if (this.formData.Status === '4') {
-          this.auditstepcode = 'PROF_AUDIT'
-        } else if (this.formData.Status === '5') {
-          this.auditstepcode = 'PROF_REGULATION'
-        } else if (this.formData.Status === '6') {
-          this.auditstepcode = 'PAYING_FEE'
-        } else if (this.formData.Status === '7') {
-          this.auditstepcode = 'PROF_REGULATION_STORAGE'
-        } else if (this.formData.Status === '10') {
-          this.auditstepcode = 'SUB_OFFICE_WZ'
-        }
-      },
-      isAccess () {
-        this.getAuditStepCodeByStatus()
-        let params = {
-          id: this.formData.Id,
-          auditstepcode: this.auditstepcode,
-          processkey: this.formData.ProcessKey
+        })
+      } else {//专业处室评价
+        // this.evaluation_list = this.$refs.evaluation_list_two.entityListData.entityList
+        // this.evaluation_list = this.evaluation_list.concat(this.$refs.evaluation_listType_two.entityListData.entityList)
+        // // 获取第一列评价格式
+        // var fractionBoolean_1 = this.$refs.evaluation_list_two.fractionBoolean
+        if (this.formData.ContractClass == '02') {
+          this.typeList = this.$refs.evaluateDataZhuanRef.typeList
         }
-        apiCert.isAccess(params, this.$axios).then(res => {
-          this.auditBtn = res.data
-          if(this.formData.Status=='4'&&res.data){
-            this.auditBtnBooleanZhuan = true
-          }else{
-            this.auditBtnBooleanZhuan = false
-          }
-          if(Number(this.formData.Status)<=0){
-            this.auditBtnBoolean = true
-          }else{
-            this.auditBtnBoolean = false
+        this.$refs['EntityForm2'].validate((valid) => {
+          if (valid) {
+            this.majorEvaluate()
+          } else {
+            this.$message.error('评价信息填写的有误');
           }
-          // alert(this.auditBtn)
-          // this.auditBtnBoolean = res.data
-        }).catch(err => {
-          console.log(err)
         })
-      },
-
-      supplierChangeHandler() {
-        this.evaluateData.SupplierName = this.$refs['SupplierSelect'].selectedLabel
-      },
-      // 获取条件数组
-      getList(){
-        var item = this.formData
-        console.log(2222,item)
-        var list = []
-        for(var index in item){
-          var data = {
-            value : item[index],
-            name : index
-          }
-          if(index=='B1'){
-            data.key = '法人资格和相应的资质证明文件应满足要求且持续有效'
-            list[0] = data
-          }
-          if(index=='B2'){
-            data.key = '国家有关部门、行业颁发的生产经营、安全生产许可证应满足要求且持续有效'
-            list[1] = data
-          }
-          if(index=='B3'){
-            data.key = '质量、职业健康与安全、环境管理体系应通过认证且持续有效'
-            list[2] = data
-          }
-          if(index=='B4'){
-            data.key = '近一年内未发生较大及以上质量、生产安全事故和严重环境污染事件'
-            list[3] = data
-          }
-          if(index=='B5'){
-            data.key = '应继续保持具有与其资质等级相适应的生产经营能力、良好业绩及社会信誉'
-            list[4] = data
-          }
-          if(index=='B6'){
-            data.key = '未发生违规分包和违法转包，允许其他企业挂靠、出借资质证明文件及有关资格证书的情况'
-            list[5] = data
-          }
-          if(index=='B7'){
-            data.key = '未发生严重扰乱集团公司工程建设市场秩序、提供虚假材料和信息的行为'
-            list[6] = data
-          }
-          if(index=='B7'){
-            data.key = '承包商能在规定时间内向评价单位提交基本条件评价所需相关证明文件，办理评价相关手续'
-            list[7] = data
-          }
+      }
+    },
+    //专业处室评价
+    majorEvaluate() {
+      if (this.formData.ContractClass == '02') {
+        for (var i = 1; i <= 8; i++) {
+          this.evaluateDataZhuan['B' + i] = parseInt(this.typeList[i - 1].value)
         }
-        console.log(99999,list)
-        this.typeList = list
-      },
+      }
+      var formData = this.evaluateDataZhuan
+      api.saveSecEvaluation(this.formData.Id, formData, this.$axios).then(res => {
+        console.log('新增', res)
+        if (res.data.code == 0) {
+          this.$message({
+            type: 'success',
+            message: res.data.message
+          });
+          this.refreshPage();
+        }
+      }).catch(err => {
+        console.error(err)
+      });
+    },
+    //新增评价
+    addEntity() {
+      this.evaluateData.Conclusion = parseInt(this.evaluateData.Conclusion)
+      if (this.formData.ContractClass == '02') {
+        for (var i = 1; i <= 8; i++) {
+          this.evaluateData['B' + i] = parseInt(this.typeList[i - 1].value)
+        }
+      }
+      console.log(this.evaluateData, 'evaluateData')
+      api.addEntity(this.evaluateData, this.$axios).then(res => {
+        if (res.data.code === 0) {
+          this.formData.Id = res.data.item;
+          this.$message({
+            type: 'success',
+            message: res.data.message
+          });
+          this.refreshPage();
+        } 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 '永久'
+    updateEntity() {
+      if (this.formData.ContractClass == '02') {
+        for (var i = 1; i <= 8; i++) {
+          this.evaluateData['B' + i] = parseInt(this.typeList[i - 1].value)
+        }
+      }
+      api.updateEntity(this.formData.Id, this.evaluateData, this.$axios).then(res => {
+        if (res.data.code === 0) {
+          this.refreshPage();
+          this.$message({
+            type: 'success',
+            message: res.data.message
+          });
         } else {
-          val = val.replace('T', ' ')
-          return val.substring(0, 10)
+          this.$message({
+            type: 'warning',
+            message: res.data.message
+          });
+        }
+      }).catch(err => {
+        console.error(err)
+      });
+    },
+    getAuditStepCodeByStatus() {
+      if (this.formData.Status === '1') {
+        this.auditstepcode = 'FIRST_TRIAL'
+      } else if (this.formData.Status === '2') {
+        this.auditstepcode = 'SECOND_TRIAL'
+      } else if (this.formData.Status === '3') {
+        this.auditstepcode = 'PROF_RECE'
+      } else if (this.formData.Status === '4') {
+        this.auditstepcode = 'PROF_AUDIT'
+      } else if (this.formData.Status === '5') {
+        this.auditstepcode = 'PROF_REGULATION'
+      } else if (this.formData.Status === '6') {
+        this.auditstepcode = 'PAYING_FEE'
+      } else if (this.formData.Status === '7') {
+        this.auditstepcode = 'PROF_REGULATION_STORAGE'
+      } else if (this.formData.Status === '10') {
+        this.auditstepcode = 'SUB_OFFICE_WZ'
+      }
+    },
+    isAccess() {
+      this.getAuditStepCodeByStatus()
+      let params = {
+        id: this.formData.Id,
+        auditstepcode: this.auditstepcode,
+        processkey: this.formData.ProcessKey
+      }
+      apiCert.isAccess(params, this.$axios).then(res => {
+        this.auditBtn = res.data
+        if (this.formData.Status == '4' && res.data) {
+          this.auditBtnBooleanZhuan = true
+        } else {
+          this.auditBtnBooleanZhuan = false
+        }
+        if (Number(this.formData.Status) <= 0) {
+          this.auditBtnBoolean = true
+        } else {
+          this.auditBtnBoolean = false
+        }
+        // alert(this.auditBtn)
+        // this.auditBtnBoolean = res.data
+      }).catch(err => {
+        console.log(err)
+      })
+    },
+
+    supplierChangeHandler() {
+      this.evaluateData.SupplierName = this.$refs['SupplierSelect'].selectedLabel
+    },
+    // 获取条件数组
+    getList() {
+      var item = this.formData
+      console.log(2222, item)
+      var list = []
+      for (var index in item) {
+        var data = {
+          value: item[index],
+          name: index
+        }
+        if (index == 'B1') {
+          data.key = '法人资格和相应的资质证明文件应满足要求且持续有效'
+          list[0] = data
+        }
+        if (index == 'B2') {
+          data.key = '国家有关部门、行业颁发的生产经营、安全生产许可证应满足要求且持续有效'
+          list[1] = data
+        }
+        if (index == 'B3') {
+          data.key = '质量、职业健康与安全、环境管理体系应通过认证且持续有效'
+          list[2] = data
+        }
+        if (index == 'B4') {
+          data.key = '近一年内未发生较大及以上质量、生产安全事故和严重环境污染事件'
+          list[3] = data
+        }
+        if (index == 'B5') {
+          data.key = '应继续保持具有与其资质等级相适应的生产经营能力、良好业绩及社会信誉'
+          list[4] = data
+        }
+        if (index == 'B6') {
+          data.key = '未发生违规分包和违法转包，允许其他企业挂靠、出借资质证明文件及有关资格证书的情况'
+          list[5] = data
+        }
+        if (index == 'B7') {
+          data.key = '未发生严重扰乱集团公司工程建设市场秩序、提供虚假材料和信息的行为'
+          list[6] = data
+        }
+        if (index == 'B7') {
+          data.key = '承包商能在规定时间内向评价单位提交基本条件评价所需相关证明文件，办理评价相关手续'
+          list[7] = data
         }
-      },
-      onBack(){
-        this.$router.go(-1)
-      },
-      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;
       }
+      console.log(99999, list)
+      this.typeList = list
+    },
+
+    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)
+      }
+    },
+    onBack() {
+      this.$router.go(-1)
+    },
+    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>
 

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

@@ -273,7 +273,7 @@ export default {
   data() {
     return {
       userSelectBoolean: false,
-      eveIdList: '',
+      eveIdList: 0,
       selectAllButtonBoolean: false,
 
       editeBoolean: false,
@@ -451,7 +451,7 @@ export default {
       e.map((item, index) => {
         list.push(item.Id)
       })
-      this.eveIdList = String(list)
+      this.eveIdList = list
     },
     //筛选
     selectableFun(row, index) {
@@ -467,7 +467,7 @@ export default {
     },
     //一键处理确定
     onSelectAllButtonTrue() {
-      if (this.eveIdList != '' && this.eveIdList != undefined) {
+      if (this.eveIdList != 0 && this.eveIdList != undefined) {
         this.$refs.submitpopup.dialogCommonAuditMakeSureVisible = true
       } else {
         this.$message({

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

@@ -212,8 +212,8 @@
       </el-tabs>
     </el-card>
 
-    <submitPopup ref="submitpopup" :examineType="1" :selectDeptBoolean="false" :eveId="formData.Id" :formData="formData"
-                 @refreshPage="refreshPage"></submitPopup>
+    <submit-popup ref="submitpopup" :examineType="1" :selectDeptBoolean="false" :eveId="formData.Id" :formData="formData"
+                 @refreshPage="refreshPage"></submit-popup>
 
   </div>
 </template>
@@ -223,10 +223,10 @@ import {
   mapGetters
 } from 'vuex'
 import api from '@/api/oilcontract/contractSumScore'
-import contractApi from '@/api/oilcontract/contract'
 import evaluationList from './evaluationlist'
 import baseList from './baselist'
 import WfHistory from '@/components/workflow/wfhistory.vue'
+import submitpopup from '@/components/oilcontract/submitPopup.vue'
 import apiCert from '@/api/oilsupplier/suppliercert'
 import permissionApi from '@/api/oilcontract/permission';
 
@@ -240,7 +240,8 @@ export default {
   components: {
     evaluationList,
     baseList,
-    WfHistory
+    WfHistory,
+    submitpopup
   },
 
   data() {
@@ -348,18 +349,20 @@ export default {
   watch: {},
   created() {
     console.log('接受操作', this.$route.query.item)
-    if (this.$route.query.item.SupplierId > 0) {
-      api.GetResultEntity(this.$route.query.item.SupplierId, this.$axios).then(res => {
-        console.log('结果', res)
-        this.evaluateData.Result1 = res.data.Result1
-        if (res.data.Result2 && res.data.Result2 == "0") {
-          this.evaluateData.Result2 = "否"
-        } else {
-          this.evaluateData.Result2 = "是"
-        }
-      }).catch(err => {
-        console.error(err)
-      });
+    if (this.$route.query.item) {
+      if (this.$route.query.item.SupplierId > 0) {
+        api.GetResultEntity(this.$route.query.item.SupplierId, this.$axios).then(res => {
+          console.log('结果', res)
+          this.evaluateData.Result1 = res.data.Result1
+          if (res.data.Result2 && res.data.Result2 == "0") {
+            this.evaluateData.Result2 = "否"
+          } else {
+            this.evaluateData.Result2 = "是"
+          }
+        }).catch(err => {
+          console.error(err)
+        });
+      }
     }
     this.serviceId = this.$route.params.opera;
     if (this.serviceId != 'add' && this.serviceId > 0) {  //编辑进入

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

@@ -272,7 +272,7 @@ export default {
   data() {
     return {
       userSelectBoolean: false,
-      eveIdList: '',
+      eveIdList: 0,
       selectAllButtonBoolean: false,
 
       editeBoolean: false,
@@ -449,7 +449,7 @@ export default {
       e.map((item, index) => {
         list.push(item.Id)
       })
-      this.eveIdList = String(list)
+      this.eveIdList = list
     },
     //筛选
     selectableFun(row, index) {
@@ -465,7 +465,7 @@ export default {
     },
     //一键处理确定
     onSelectAllButtonTrue() {
-      if (this.eveIdList != '' && this.eveIdList != undefined) {
+      if (this.eveIdList != 0 && this.eveIdList != undefined) {
         this.$refs.submitpopup.dialogCommonAuditMakeSureVisible = true
       } else {
         this.$message({