提交 评价

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

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

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

@@ -7,16 +7,39 @@ export default {
       method: 'GET',
     });
   },
-  // 编辑后的评价内容
-  contractEvaluationTree(formData,myAxios) {
+  //初审
+  contractCommonAudit(entityId,params, myAxios) {
     return myAxios({
-      url: '/contract-evaluation/tree',
+      url: '/contract-review/common-audit/'+entityId,
       method: 'post',
-      data: formData
+      params: params
+    });
+  },
+  //专业处室接收
+  businessSeparateAudit(entityId,params, myAxios) {
+    return myAxios({
+      url: '/contract-review/business-separate-audit/'+entityId,
+      method: 'post',
+      params: params
     });
   },
 
+  //合同下发
+  // addContractEvaluate(formData, myAxios) {
+  //   return myAxios({
+  //     url: '/contract-order/add',
+  //     method: 'post',
+  //     data: formData
+  //   });
+  // },
 
+  // 编辑后的评价内容
+  contractEvaluationTree(entityId, myAxios) {
+    return myAxios({
+      url: '/contract-evaluation/tree/'+entityId,
+      method: 'GET',
+    });
+  },
 
   //评价新增
   addContractEvaluate(formData, myAxios) {
@@ -35,6 +58,24 @@ export default {
     });
   },
 
+  //评价查询审评流程参数
+  getEntityAndCert(entityId, myAxios) {
+    return myAxios({
+      url: '/contract-review/get/'+entityId,
+      method: 'GET',
+    })
+  },
+
+
+  //审核确定
+  contractUnitAudit(entityId,params, myAxios) {
+    return myAxios({
+      url: '/contract-review/unit-audit/'+entityId,
+      method: 'post',
+      params: params
+    });
+  },
+
 
   //评价列表
   getReviewList(CreateOn, params, myAxios) {
@@ -44,6 +85,8 @@ export default {
       params: params
     });
   },
+
+
   addEntity(formData, myAxios) {
     return myAxios({
       url: '/contract/add',

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

@@ -1,5 +1,58 @@
 export default {
-    
-   
+
+    // 编辑后的评价内容
+    contractEvaluationTree(formData,myAxios) {
+      return myAxios({
+        url: '/contract-evaluation/tree',
+        method: 'post',
+        data: formData
+      });
+    },
+
+    //评价新增
+    addContractEvaluate(formData, myAxios) {
+      return myAxios({
+        url: '/contract-review/add',
+        method: 'post',
+        data: formData
+      });
+    },
+    //评价编辑
+    updateContractEvaluate(entityId,formData, myAxios) {
+      return myAxios({
+        url: '/contract-review/update/'+entityId,
+        method: 'post',
+        data: formData
+      });
+    },
+
+    //评价查询审评流程参数
+    getEntityAndCert(entityId, myAxios) {
+      return myAxios({
+        url: '/contract-review/get/'+entityId,
+        method: 'GET',
+      })
+    },
+
+
+    //审核确定
+    contractUnitAudit(entityId,params, myAxios) {
+      return myAxios({
+        url: '/contract-review/unit-audit/'+entityId,
+        method: 'post',
+        params: params
+      });
+    },
+
+
+    //评价列表
+    getReviewList(CreateOn, params, myAxios) {
+      return myAxios({
+        url: '/contract-review/list?CreateOn='+ CreateOn,
+        method: 'GET',
+        params: params
+      });
+    },
+
+
 }
-  

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

@@ -7,6 +7,7 @@ export default {
       params: params
     });
   },
+  
   // 合同配置上级节点
   evaluationItemsOnelist(myAxios) {
     return myAxios({

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

@@ -2,7 +2,7 @@
 
 <template>
   <div>
-    <el-dialog title="提交"
+    <!-- <el-dialog title="提交"
                :visible.sync="dialogVisibleCom"
                width="520px">
       <el-form ref="searchForm"
@@ -43,9 +43,83 @@
                    type="primary"
                    @click="companySubmitToSecUnitSeparateMakeSure" :loading="loading">确定</el-button>
       </span>
-    </el-dialog>
+    </el-dialog> -->
 
 
+    <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 ref="selectAuditer"
+                         v-model="auditer"
+                         placeholder="请选择初审人"
+                         style="width: 100%"
+                         filterable
+                         default-first-option
+                         @change="auditOrgChang()">
+                <el-option v-for="item in firOptions"
+                           :key="item.Id"
+                           :label="item.Realname"
+                           :value="item.Id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="复审人员">
+              <el-select ref="selectAuditer"
+                         v-model="fushenauditer"
+                         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-select v-model="selectDept"
+                         filterable
+                         placeholder="请选择"
+                         style="width: 100%"
+                         @change="changeOrgUnit">
+                <el-option v-for="item in allorgunitOptions"
+                           :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="dialogVisible = false">取 消</el-button>
+        <el-button size="mini"
+                   type="primary"
+                   @click="secondaryUnitSubmitApply" :loading="loading">确定</el-button>
+      </span>
+    </el-dialog>
+
+    <choose-auditor-fen ref="chooseAuditorFen"
+                        @close="setAuditerFen"
+                        @hideChooseAuditer="chooseAuditorVisibleFen=false"
+                        :visible="chooseAuditorVisibleFen"></choose-auditor-fen>
 
 
   </div>
@@ -53,7 +127,12 @@
 
 <script>
   import {mapGetters} from 'vuex'
+  import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
   import api from '@/api/oilsupplier/supplier'
+  import apiCert from '@/api/oilsupplier/suppliercert'
+  import apiOilcontract from '@/api/oilcontract/contract'
+
+
   export default {
     computed: {
       ...mapGetters({
@@ -62,23 +141,52 @@
     },
     name: 'submitPopup',
     components: {
-
+      ChooseAuditorFen
+    },
+    props: {
+      // 从合同进来还是从编辑进来 1合同2编辑
+      eveId: {
+        type: null,
+        default: 0,
+      },
     },
 
+
     data() {
       return {
-        dialogVisibleCom:false,
-        loading: false,
-        UnitOrgOptions: [],
-        UnitOrg: '',
-
+        chooseAuditorVisibleFen:false,
+        auditer: '',
+        auditerName: '',
+        firOptions: [],
+        fushenauditer: '', // 复审人员
+        secauditerOptions: [],
+        selectDept: 100000151,
+        allorgunitOptions: [],
         auditform: {
           FirstAuditName: '',
           SecondAudit: '',
           ThirdAudit: '',
           CertId: '',
-          AuditRemark: ''
+          AuditRemark: '',
+          TypeCode: '02'
         },
+        majorDept: [100000000, 100000128, 100000151],
+
+
+
+
+        dialogVisibleCom:false,
+        loading: false,
+        UnitOrgOptions: [],
+        UnitOrg: '',
+
+        // auditform: {
+        //   FirstAuditName: '',
+        //   SecondAudit: '',
+        //   ThirdAudit: '',
+        //   CertId: '',
+        //   AuditRemark: ''
+        // },
         formData: {
           Id: '',
           SupplierName: '',
@@ -160,9 +268,156 @@
       }
     },
     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: {
+      setAuditerFen (val, name) {
+        this.auditer = val
+        this.auditerName = name
+        this.chooseAuditorVisibleFen = false
+        this.auditOrgChang(this.auditer)
+      },
+      orgtreeChange (val) {
+        this.userOptions = []
+        let deptid = val[val.length - 1]
+        let auditstepcode = 'PROF_RECE'
+        api.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+          console.log('专业处室人111',res)
+          this.userOptions = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      getFirAuditerByDept () {
+        let deptId = this.authUser.Profile.DepartmentId
+        this.userOptions = []
+        let auditStepCode = 'FIRST_TRIAL' // 初审人
+        api.getFirAuditerByDept(deptId, auditStepCode, this.$axios).then(res => {
+          this.firOptions = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      secondaryUnitSubmitApply (val) {
+        if (!this.auditer) {
+          this.$message({
+            type: 'warning',
+            message: '请选择审批人！'
+          })
+          return false
+        }
+        if (!this.fushenauditer) {
+          this.$message({
+            type: 'warning',
+            message: '请选择复审人！'
+          })
+          return false
+        }
+        if (!this.selectDept) {
+          this.$message({
+            type: 'warning',
+            message: '请选择专业处室！'
+          })
+          return false
+        }
+        if (!this.userOptions || this.userOptions.length === 0) {
+          this.$message({
+            type: 'warning',
+            message: '该专业科室未配置接收人！'
+          })
+          return false
+        }
+        this.loading = true
+        // this.applyLoading = true
+        let params = {
+          'FirstAudit': String(this.auditer),
+          'SecondAudit': String(this.fushenauditer),
+          'ThirdAudit': String(this.selectDept), // this.majorDept[this.majorDept.length - 1] 专业处室部门id
+          'AuditRemark': this.auditform.AuditRemark
+        }
+        apiOilcontract.contractUnitAudit(this.eveId, params, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            // 保存成功后，初始化数据，变成修改
+            // this.initDatas()
+            // if (this.$refs['WfHistory']) {
+            //   this.$refs['WfHistory'].getHistoryTask()
+            // }
+            this.$parent.showIdDatas(this.eveId);
+            this.dialogVisibleCom = false
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+          // this.applyLoading = false
+          this.loading = false
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      auditOrgChang () {
+        let auditstepcode = 'SECOND_TRIAL'
+        api
+          .getAuditerByFirst(this.auditer, auditstepcode, this.$axios)
+          .then(res => {
+            this.secauditerOptions = res.data.item
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+      changeOrgUnit (val) {
+        let auditstepcode = 'PROF_RECE'
+        api.getAuditerByDept(val, auditstepcode, this.$axios).then(res => {
+          console.log('专业处室人222',res)
+          this.userOptions = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+
+
       getDictOptions () {
         let params = {
           status: this.formData.Status,

src/dashoo.cn/frontend_web/src/pages/index.vue

@@ -61,6 +61,7 @@
               <!-- <span v-if="scope.row.Type=='7'" style="color:#E6A23C">准入-{{scope.row.TaskName}}</span> -->
               <span v-if="scope.row.Type=='8'" style="color:#E6A23C">发票</span>
               <span v-if="scope.row.Type=='9'" style="color:#E6A23C">目录申请-{{scope.row.TaskName}}</span>
+              <span v-if="scope.row.Type=='10'" style="color:#E6A23C">合同日常评审-</span>
             </template>
           </el-table-column>
 
@@ -70,16 +71,26 @@
             <!--&lt;!&ndash;</template>&ndash;&gt;-->
           <!--</el-table-column>-->
           <el-table-column label="类别" prop="SupplierTypeCode" align="center">
-            <template slot-scope="scope">
-              <span v-if="scope.row.SupplierTypeCode=='01'">物资类</span>
-              <span v-if="scope.row.SupplierTypeCode=='02'">基建类</span>
-              <span v-if="scope.row.SupplierTypeCode=='03'">服务类</span>
+            <!-- <template slot-scope="scope" v-if="scope.row.Type=='10'">
+              <span v-if="scope.row.SupplierTypeCode=='01'">供应商</span>
+              <span v-if="scope.row.SupplierTypeCode=='02'">承包商</span>
+              <span v-if="scope.row.SupplierTypeCode=='03'">服务商</span>
+            </template> -->
+            <template slot-scope="scope" >
+              <span v-if="scope.row.SupplierTypeCode=='01' && scope.row.Type!='10'">物资类</span>
+              <span v-if="scope.row.SupplierTypeCode=='02' && scope.row.Type!='10'">基建类</span>
+              <span v-if="scope.row.SupplierTypeCode=='03' && scope.row.Type!='10'">服务类</span>
               <span v-if="scope.row.SupplierTypeCode=='4'">信息变更</span>
               <span v-if="scope.row.SupplierTypeCode=='5'">企业注册</span>
               <span v-if="scope.row.SupplierTypeCode=='8'">待开发票</span>
               <span v-if="scope.row.SupplierTypeCode=='9-6'">外部市场</span>
               <span v-if="scope.row.SupplierTypeCode=='9-7'">收入业务</span>
+              <span v-if="scope.row.SupplierTypeCode=='01' && scope.row.Type=='10'">供应商</span>
+              <span v-if="scope.row.SupplierTypeCode=='02' && scope.row.Type=='10'">承包商</span>
+              <span v-if="scope.row.SupplierTypeCode=='03' && scope.row.Type=='10'">服务商</span>
             </template>
+
+
           </el-table-column>
 
           <el-table-column label="公司名称" prop="SupplierName" align="center"></el-table-column>
@@ -585,7 +596,7 @@
         }
       },
       rowClick (val) {
-        console.log('待办-分流路由')
+        console.log('待办-分流路由',val)
         let SupplierType = ''
 
         if (val.Type == '1') { //准入
@@ -663,7 +674,18 @@
 
         } else if (val.Type == '9') { //目录申请
           this.$router.push('/oilsupplier/oilcatalogsub/' + val.Id + '/incomeedit')
+        } else if (val.Type == '10') { //日常评价
+          this.$router.push({
+            path:'/oilcontract/contract-basis/' + val.Id + '/evaluate',
+            query:{
+              // item:item,
+              type:2,
+            }
+          })
+
         }
+
+
       },
       rowFinishedClick (val) {
         console.log('已办-分流路由')

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

@@ -14,7 +14,12 @@
           <i class="icon icon-table2"></i> 编辑 - 承包商合同
         </span>
         <span style="float: right;">
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="onSubmitBigAdd">提交审核</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick">企管法规处</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick">专业处室审核</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick2">专业科室接收</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick">复审</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick">初审</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="routeDataType==2" @click="onSubmitBigAdd">提交审核</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>
@@ -49,7 +54,6 @@
                     </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>
@@ -110,14 +114,13 @@
           </el-card>
         </el-tab-pane>
         <el-tab-pane label="业绩评价" name="2" :disabled="performance.disabled" >
-          <evaluation-list ref="evaluation_list_one"  :type="routeData.type" :evaluateId="routeData.item.Id" :category="routeData.item.Id" ></evaluation-list>
+          <evaluation-list ref="evaluation_list_one"  :type="routeDataType" :evaluateId="serviceId" :category="serviceId" ></evaluation-list>
         </el-tab-pane>
 
-
-
         <el-tab-pane label="专业处室业绩评价" name="3" :disabled="departmentPerformance.disabled">
           <evaluation-list></evaluation-list>
         </el-tab-pane>
+
         <el-tab-pane label="审批流程" name="4" :disabled="approvalProcess.disabled">
           <el-card class="box-card mycard">
             <div slot="header"
@@ -134,7 +137,10 @@
       </el-tabs>
     </el-card>
 
-    <submitPopup ref="submitpopup"></submitPopup>
+    <submitPopup ref="submitpopup" :eveId="formData.Id"></submitPopup>
+
+
+
 
   </div>
 </template>
@@ -143,9 +149,10 @@
   import {
     mapGetters
   } from 'vuex'
-  import api from '@/api/oilcontract/contract'
+   import api from '@/api/oilcontract/contract'
   import evaluationList from './evaluationlist'
   import WfHistory from '@/components/workflow/wfhistory.vue'
+  import apiSupplier from '@/api/oilsupplier/supplier'
   export default {
     computed: {
       ...mapGetters({
@@ -160,7 +167,8 @@
 
     data() {
       return {
-        routeData:'',//上一页面传过来的值
+        routeData:{},//上一页面传过来的值
+        routeDataType:'',//上一页面传过来的type
 
         dialogVisibleCom:false,
 
@@ -175,7 +183,7 @@
         },
         // 审批流程
         approvalProcess:{
-          disabled:false,//禁用
+          disabled:true,//禁用
         },
 
         entrydetail: {
@@ -197,10 +205,22 @@
       }
     },
     created() {
-      this.routeData = this.$route.query
+      // 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();
+
       // console.log(this.serviceId);
       // if(this.serviceId != 'add' && this.serviceId>0) {
       //   this.formData.Id = this.serviceId;
@@ -208,8 +228,65 @@
       // } else {
       //   this.formData.Id = 0;
       // }
+      this.showIdDatas(this.serviceId)
+
     },
     methods: {
+      //拿id查审核流程
+      showIdDatas(id){
+        console.log('审批流程222',id)
+          api.getEntityAndCert(id, this.$axios).then(res => {
+            console.log('审批流程',res)
+            var data = res.data
+            this.entrydetail.business = id
+            this.entrydetail.instance = data.WorkflowId
+            this.entrydetail.process = data.ProcessKey
+
+            })
+            .catch(err => {
+              console.error(err)
+            })
+      },
+      // 初审
+      commonAuditClick(){
+        var data = {
+          result:1,
+          AuditRemark:'6666'
+        }
+        api.contractCommonAudit(this.serviceId,data, this.$axios).then(res => {
+          console.log('初审',res)
+
+          }).catch(err => {
+            console.error(err)
+          })
+      },
+      commonAuditClick2(){
+        var data = {
+          ProfessionalAudit:15878,
+          AuditRemark:'6666'
+        }
+        api.businessSeparateAudit(this.serviceId,data, this.$axios).then(res => {
+          console.log('初审',res)
+
+          }).catch(err => {
+            console.error(err)
+          })
+
+      },
+
+      // // 复审
+      // commonAuditClick(){
+      //   var data = {
+      //     result:1,
+      //     AuditRemark:'6666'
+      //   }
+      //   api.contractCommonAudit(this.serviceId,data, this.$axios).then(res => {
+      //     console.log('初审',res)
+
+      //     }).catch(err => {
+      //       console.error(err)
+      //     })
+      // },
       //提交评价
       onSubmitBigAdd(){
         this.$refs.submitpopup.dialogVisibleCom = true
@@ -221,7 +298,7 @@
         var fractionBoolean_1 = this.$refs.evaluation_list_one.fractionBoolean
 
         if(fractionBoolean_1){
-          if(this.formData.Id == 0){
+          if(this.formData.Id == 0||this.formData.Id == undefined||this.formData.Id == null){
             this.addEvaluate()
           }else{
             this.updateEvaluate()
@@ -229,17 +306,18 @@
         }else{
           this.$message.error('填写的分数有误');
         }
-
       },
       //新增评价
       addEvaluate(){
         var formData = {
-          ContractId:this.routeData.Id,
+          ContractId:this.serviceId,
           Items:this.evaluation_list,
+          IsFinal:0,
         }
         api.addContractEvaluate(formData, this.$axios).then(res => {
           console.log('新增',res)
           this.formData.Id = res.data.item
+          this.routeDataType = 2
         }).catch(err => {
           console.error(err)
         });
@@ -247,7 +325,7 @@
       //编辑评价
       updateEvaluate(){
         var formData = {
-          ContractId:this.routeData.Id,
+          ContractId:this.serviceId,
           Items:this.evaluation_list,
         }
         api.updateContractEvaluate(this.formData.Id,formData, this.$axios).then(res => {
@@ -261,7 +339,6 @@
         this.activeName = '2'
       },
 
-
       initDatas() {
         if(this.formData.Id) {
           api.getEntity(this.formData.Id, this.$axios).then(res => {

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

@@ -255,12 +255,12 @@
       },
       //初始数据
       editDatas() {
-        var data = {
-          ContentReviewId:this.evaluateId,
-          Category:this.category,
-        }
-        api.contractEvaluationTree(data,this.$axios).then(res => {
-          console.log('上级节点内容',res)
+        // var data = {
+        //   ContentReviewId:this.evaluateId,
+        //   Category:this.category,
+        // }
+        api.contractEvaluationTree(this.evaluateId,this.$axios).then(res => {
+          console.log('编辑后的内容',res)
           var data = res.data.items
           var list = []
           for(var index = 0 ; index < data.length ; index++){

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

@@ -15,7 +15,7 @@
           <!-- <router-link :to="'/oilcontract/contract-basis/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,7 +34,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" 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>
@@ -56,7 +56,11 @@
         </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>
+                         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>{{columnFun(scope.row[column.prop],column.prop) }}</div>
+                         </template>
+        </el-table-column>
 
         <!--<el-table-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -242,42 +246,6 @@
             </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">
@@ -291,6 +259,8 @@
 <script>
   import { mapGetters } from 'vuex';
   import api from '@/api/oilcontract/contract';
+  import FileSaver from 'file-saver'
+  import XLSX from 'xlsx'
 
   export default {
     computed: {
@@ -298,6 +268,53 @@
         authUser: 'authUser'
       })
     },
+    computed:{
+      columnFun:function(){
+        return function(item,index){
+          if(index == 'Status'){
+            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;
+            }
+          }else{
+            return item;
+          }
+
+        }
+      }
+    },
     name: 'oilcontract',
 
     data() {
@@ -358,18 +375,18 @@
         tableColumns: [
 
           {
-            prop: "Id",
-            label: '',
+            prop: "Status",
+            label: '状态',
             width: 100,
             sort: true
           },
 
-          {
-            prop: "SupplierId",
-            label: '评价单位',
-            width: 100,
-            sort: true
-          },
+          // {
+          //   prop: "SupplierId",
+          //   label: '评价单位',
+          //   width: 100,
+          //   sort: true
+          // },
 
           {
             prop: "SupplierName",
@@ -420,12 +437,12 @@
             sort: true
           },
 
-          {
-            prop: "ContractMode",
-            label: '合同模式',
-            width: 100,
-            sort: true
-          },
+          // {
+          //   prop: "ContractMode",
+          //   label: '合同模式',
+          //   width: 100,
+          //   sort: true
+          // },
 
           {
             prop: "Amount",
@@ -455,96 +472,97 @@
             sort: true
           },
 
-          {
-            prop: "ConstructionUnit",
-            label: '建设单位',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ConstructionOwner",
-            label: '建设负责人',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ConstructionTelphone",
-            label: '手机号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "BuildUnit",
-            label: '施工单位',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "BuildOwner",
-            label: '施工负责人',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "BuildTelphone",
-            label: '手机号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SuperviseUnit",
-            label: '监理单位',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SuperviseOwner",
-            label: '监理负责人',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SuperviseTelphone",
-            label: '手机号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "QualityUnit",
-            label: '质量监督单位',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "QualityOwner",
-            label: '质量监督负责人',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "QualityTelphone",
-            label: '手机号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Remark",
-            label: '备注',
-            width: 100,
-            sort: true
-          }]
+          // {
+          //   prop: "ConstructionUnit",
+          //   label: '建设单位',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "ConstructionOwner",
+          //   label: '建设负责人',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "ConstructionTelphone",
+          //   label: '手机号',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "BuildUnit",
+          //   label: '施工单位',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "BuildOwner",
+          //   label: '施工负责人',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "BuildTelphone",
+          //   label: '手机号',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "SuperviseUnit",
+          //   label: '监理单位',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "SuperviseOwner",
+          //   label: '监理负责人',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "SuperviseTelphone",
+          //   label: '手机号',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "QualityUnit",
+          //   label: '质量监督单位',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "QualityOwner",
+          //   label: '质量监督负责人',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "QualityTelphone",
+          //   label: '手机号',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "Remark",
+          //   label: '备注',
+          //   width: 100,
+          //   sort: true
+          // }
+          ]
       }
     },
     created() {
@@ -555,6 +573,7 @@
       //this.getDictOptions()
     },
     methods: {
+
       //跳转评价
       onNavigateEvaluate(item){
         console.log('跳转',item)
@@ -578,7 +597,7 @@
         // <el-option label="物资类" value="01" key="01"></el-option>
         // <el-option label="基建类" value="02" key="02"></el-option>
         // <el-option label="技术服务" value="03" key="03"></el-option>
-        
+
         let myCreateOn = []
         // 解析时间
         if (this.CreateOn.length == 2) {
@@ -680,7 +699,29 @@
           return val.substring(0, 10)
         }
       },
-
+      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

@@ -219,8 +219,7 @@
     <el-dialog
       title="下发工单"
       :visible.sync="issueVisible"
-      width="50%"
-      >
+      width="50%">
         <div style="width: 100%;display: flex;justify-content: center;">
           <el-form :inline="true" ref="issueFrom" :model="issueFrom" class="demo-form-inline" :rules="issueRules">
 
@@ -436,6 +435,10 @@
       onIssueFromSubmit(){
         this.$refs['issueFrom'].validate((valid) => {
           if (valid) {
+            issueFrom.region
+            
+            
+            
             this.issueVisible = false