委外

src/api/sale.js

@@ -115,7 +115,15 @@ export function getOutsourceList (params) {
 // 委外详情
 export function getOutsourceDetail (id) {
   return request({
-    url: request.adornUrl(`/biz-service/purchaseCommission/info/${id}`),
+    url: request.adornUrl(`/biz-service/purCommDetail/info/${id}`),
+    method: 'get'
+  })
+}
+
+// 通过委外申请ID查询数据
+export function getPurCommInfo (id) {
+  return request({
+    url: request.adornUrl(`/biz-service/purCommDetail/PurCommInfo/${id}`),
     method: 'get'
   })
 }

src/views/modules/sale/outsource-detail.vue

@@ -32,9 +32,9 @@
           </el-checkbox-group>
         </e-desc-item>
 
-        <e-desc-item label="委外类别">{{dataForm.purchaseTypeDesc}}</e-desc-item>
-        <e-desc-item label="申请人">{{dataForm.applierName}}</e-desc-item>
-        <e-desc-item label="申请部门">{{dataForm.deptName}}</e-desc-item>
+        <e-desc-item label="委外类别">{{dataForm.commissionType}}</e-desc-item>
+        <e-desc-item label="申请人">{{dataForm.purchaseCommission.applierId}}</e-desc-item>
+        <e-desc-item label="申请部门">{{dataForm.purchaseCommission.orgId}}</e-desc-item>
 
         <e-desc-item label="备注说明" span="3">{{dataForm.notes}}</e-desc-item>
       </e-desc>
@@ -185,7 +185,7 @@
   import EDesc from '../common/e-desc'
   import EDescItem from '../common/e-desc-item'
   import { dealStepData, dealStepLogs } from '@/api/util'
-  import { getOutsourceDetail } from '@/api/sale'
+  import { getOutsourceDetail, getPurCommInfo } from '@/api/sale'
   import ApproveComponent from '../common/approve-component'
   export default {
     name: 'outsource-detail',
@@ -234,8 +234,10 @@
           if (data && data.code === '200') {
             this.dataForm = data.data
             // 流程图展示
-            dealStepData(data.data.workFlowBusinessExt.workFlowProcessStepList, this.stepList)
-            dealStepLogs(data.data.workFlowBusinessExt.processLogList, this.logList)
+            if (data.data.workFlowBusinessExt) {
+              dealStepData(data.data.workFlowBusinessExt.workFlowProcessStepList, this.stepList)
+              dealStepLogs(data.data.workFlowBusinessExt.processLogList, this.logList)
+            }
             // 付款方式
             if (data.data.payType) {
               this.idsPayType.push(data.data.payType)

src/views/modules/sale/outsource.vue

@@ -223,9 +223,9 @@
           width="150"
           label="操作">
           <template slot-scope="scope">
-            <el-button v-if="isAuth('cus:contractBook:info')" type="text" size="small" @click="detailHandle(scope.row.contractId)">查看</el-button>
-            <el-button v-if="isAuth('cus:contractBook:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.contractId, false)">编辑</el-button>
-            <el-button v-if="isAuth('cus:contractBook:changeContract')" type="text" size="small" @click="changeHandle(scope.row.contractId)">变更</el-button>
+            <el-button v-if="isAuth('cus:contractBook:info')" type="text" size="small" @click="detailHandle(scope.row.purComDetailId)">查看</el-button>
+            <el-button v-if="isAuth('cus:contractBook:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.purComDetailId, false)">编辑</el-button>
+            <el-button v-if="isAuth('cus:contractBook:changeContract')" type="text" size="small" @click="changeHandle(scope.row.purComDetailId)">变更</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -251,7 +251,7 @@
 
 <script>
 import AddOrUpdate from '../cus/contract-record-add-or-update'
-import Detail from '../cus/contract-record-detail'
+import Detail from './outsource-detail'
 import { getOutsourceList } from '@/api/sale'
 import AttachDetail from '../common/attach-detail'
 import NoticeChangeSetting from '../cus/contract-record-notice-change-setting'