|
|
@@ -31,19 +31,10 @@
|
|
|
|
|
|
<e-desc-item label="业务员">{{dataForm.salesmanName}}</e-desc-item>
|
|
|
<e-desc-item label="合同交期">{{dataForm.deliveryDate?dataForm.deliveryDate.substring(0,10):''}}</e-desc-item>
|
|
|
- <e-desc-item label="批次号">{{dataForm.batchNumber}}</e-desc-item>
|
|
|
|
|
|
<e-desc-item label="备注说明" span="3">{{dataForm.notes}}</e-desc-item>
|
|
|
</e-desc>
|
|
|
- <e-desc title="合同扫描件">
|
|
|
- <e-desc-item v-if="dataForm.cusContractBookAttachList" label="附件" span="3">
|
|
|
- <div v-for="(item, index) in dataForm.cusContractBookAttachList" style="display: inline">
|
|
|
- <span v-if="index > 0">,</span>
|
|
|
- <a :key="item.fileName + index" type="primary" href="#" @click="previewFile(item.fileName, item.url)">{{ item.fileName }}</a>
|
|
|
- </div>
|
|
|
- </e-desc-item>
|
|
|
- </e-desc>
|
|
|
- <e-desc title="任务单产品明细">
|
|
|
+ <e-desc title="物料清单明细">
|
|
|
<el-table
|
|
|
:data="productDetails"
|
|
|
border
|
|
|
@@ -58,15 +49,15 @@
|
|
|
prop="productName"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- min-width="140"
|
|
|
+ width="160"
|
|
|
:show-tooltip-when-overflow="true"
|
|
|
- label="产品名称">
|
|
|
+ label="物料名称">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="productSpecifications"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- min-width="120"
|
|
|
+ width="120"
|
|
|
:show-tooltip-when-overflow="true"
|
|
|
label="规格">
|
|
|
</el-table-column>
|
|
|
@@ -74,59 +65,171 @@
|
|
|
prop="cnt"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- min-width="100"
|
|
|
+ width="80"
|
|
|
label="数量">
|
|
|
</el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="cnt"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="80"
|
|
|
+ label="单位">
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
prop="productNumber"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- min-width="120"
|
|
|
+ width="120"
|
|
|
+ :show-tooltip-when-overflow="true"
|
|
|
+ label="生产编号">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="batchNumber"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="120"
|
|
|
+ :show-tooltip-when-overflow="true"
|
|
|
+ label="批次号">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="produceRequire"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="160"
|
|
|
:show-tooltip-when-overflow="true"
|
|
|
- label="任务单产品编号">
|
|
|
+ label="生产要求">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="price"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- min-width="100"
|
|
|
+ width="80"
|
|
|
label="含税单价">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="amount"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- min-width="100"
|
|
|
+ width="80"
|
|
|
label="含税总价">
|
|
|
<template slot-scope="scope">
|
|
|
- <span>{{ (scope.row.cnt*scope.row.price).toFixed(2) }}</span>
|
|
|
+ <span>{{ (scope.row.cnt*scope.row.price).toFixed(1) }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="rate"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- min-width="130"
|
|
|
+ width="100"
|
|
|
label="税率">
|
|
|
<template slot-scope="scope">
|
|
|
- <span>{{scope.row.rate}}</span>%
|
|
|
+ {{scope.row.rate}}%
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="notes"
|
|
|
+ prop="relatedProduct"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="120"
|
|
|
+ :show-tooltip-when-overflow="true"
|
|
|
+ label="物料关联">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="appraisal"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="120"
|
|
|
- :show-overflow-tooltip="true"
|
|
|
+ :show-tooltip-when-overflow="true"
|
|
|
+ label="首件鉴定">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span>{{!scope.row.appraisal?'':(Number(scope.row.appraisal) === 2?'是':'否')}}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="notes"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ min-width="120"
|
|
|
+ :show-tooltip-when-overflow="true"
|
|
|
label="备注">
|
|
|
</el-table-column>
|
|
|
+ </el-table>
|
|
|
+ </e-desc>
|
|
|
+ <e-desc title="任务工单派发">
|
|
|
+ <el-table
|
|
|
+ :data="workInfoDetails"
|
|
|
+ border
|
|
|
+ style="width: 100%;">
|
|
|
+ <el-table-column
|
|
|
+ label="序号"
|
|
|
+ type="index"
|
|
|
+ width="50"
|
|
|
+ align="center">
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="relatedProduct"
|
|
|
+ prop="taskType"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ min-width="80"
|
|
|
+ :show-tooltip-when-overflow="true"
|
|
|
+ label="工单类型">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="taskName"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="120"
|
|
|
:show-tooltip-when-overflow="true"
|
|
|
- label="产品关联">
|
|
|
+ label="工单名称">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="ranks"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ min-width="50"
|
|
|
+ label="级别">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="content"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="160"
|
|
|
+ :show-tooltip-when-overflow="true"
|
|
|
+ label="工单内容">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="receiverName"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ min-width="100"
|
|
|
+ label="任务接收人">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="planCompletionTime"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ min-width="80"
|
|
|
+ label="要求完成时间">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="attachList"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ label="工单附件">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <div v-for="(item, index) in scope.row.attachList" style="display: inline">
|
|
|
+ <span v-if="index > 0">,</span>
|
|
|
+ <a :key="item.fileName + index" type="primary" href="#" @click="previewFile(item.fileName, item.url)">{{ item.fileName }}</a>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="notes"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="120"
|
|
|
+ :show-tooltip-when-overflow="true"
|
|
|
+ label="备注">
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
</e-desc>
|
|
|
@@ -164,6 +267,7 @@ export default {
|
|
|
id: 0,
|
|
|
dataForm: {},
|
|
|
productDetails: [],
|
|
|
+ workInfoDetails: [],
|
|
|
stepList: [],
|
|
|
logList: []
|
|
|
}
|
|
|
@@ -189,12 +293,20 @@ export default {
|
|
|
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.workFlowProcessStepList) {
|
|
|
+ dealStepData(data.data.workFlowBusinessExt.workFlowProcessStepList, this.stepList)
|
|
|
+ }
|
|
|
+ if (data.data.workFlowBusinessExt.processLogList) {
|
|
|
+ dealStepLogs(data.data.workFlowBusinessExt.processLogList, this.logList)
|
|
|
+ }
|
|
|
// 任务单产品明细
|
|
|
if (data.data.saleROrderProductList) {
|
|
|
this.productDetails = data.data.saleROrderProductList
|
|
|
}
|
|
|
+ // 任务工单派发
|
|
|
+ if (data.data.workInfoList) {
|
|
|
+ this.workInfoDetails = data.data.workInfoList
|
|
|
+ }
|
|
|
// 初始化审批Form
|
|
|
this.showApproveForm(businessType, this.id)
|
|
|
}
|
chris