|
|
@@ -23,7 +23,7 @@
|
|
|
</el-col>
|
|
|
<el-col :xs="12" :sm="8" :lg="8" class="item">
|
|
|
<div class="label">项目类别</div>
|
|
|
- <div class="value">{{ details.refProjectName }}</div>
|
|
|
+ <div class="value">{{ details.refProjectCategory }}</div>
|
|
|
</el-col>
|
|
|
<el-col :xs="12" :sm="8" :lg="8" class="item">
|
|
|
<div class="label">工程编号</div>
|
|
|
@@ -96,8 +96,8 @@
|
|
|
<el-form-item prop="installDate">
|
|
|
<el-date-picker
|
|
|
v-model="details.installDate"
|
|
|
- type="datetime"
|
|
|
:disabled="details.examineStatus == 'OK'"
|
|
|
+ type="datetime"
|
|
|
placeholder="安装时间"
|
|
|
default-time="00:00:00"
|
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
@@ -146,27 +146,38 @@
|
|
|
show-summary
|
|
|
:summary-method="$getSummaries"
|
|
|
>
|
|
|
- <template v-if="!isCustomer">
|
|
|
- <el-table-column align="left" label="厂编号" prop="factoryNo" min-width="160" show-overflow-tooltip>
|
|
|
- <template slot-scope="scope">
|
|
|
- <CopyButton :copyText="scope.row.factoryNo" />
|
|
|
- <span>{{ scope.row.factoryNo }}</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- align="left"
|
|
|
- label="物料编码"
|
|
|
- prop="materialNumber"
|
|
|
- min-width="130"
|
|
|
- show-overflow-tooltip
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <CopyButton :copyText="scope.row.materialNumber" />
|
|
|
- <span>{{ scope.row.materialNumber }}</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- </template>
|
|
|
-
|
|
|
+ <el-table-column
|
|
|
+ v-if="!isCustomer"
|
|
|
+ align="left"
|
|
|
+ label="厂编号"
|
|
|
+ prop="factoryNo"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <CopyButton :copyText="scope.row.factoryNo" />
|
|
|
+ <span>{{ scope.row.factoryNo }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ v-if="!isCustomer"
|
|
|
+ align="left"
|
|
|
+ label="特价编号"
|
|
|
+ prop="specialNo"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <CopyButton :copyText="scope.row.specialNo" />
|
|
|
+ <span>{{ scope.row.specialNo }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="130" show-overflow-tooltip>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <CopyButton :copyText="scope.row.materialNumber" />
|
|
|
+ <span>{{ scope.row.materialNumber }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
align="left"
|
|
|
label="产品编码"
|
|
|
@@ -191,6 +202,45 @@
|
|
|
<span>{{ scope.row.specification }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="实装规格型号"
|
|
|
+ prop="realSpecification"
|
|
|
+ min-width="300"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <div :style="scope.row.realSpecification != scope.row.specification ? { color: 'blue' } : ''">
|
|
|
+ {{ scope.row.realSpecification }}
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="实装物料编号"
|
|
|
+ prop="realMaterialNumber"
|
|
|
+ min-width="150"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <div :style="scope.row.realMaterialNumber != scope.row.materialNumber ? { color: 'blue' } : ''">
|
|
|
+ {{ scope.row.realMaterialNumber }}
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ align="left"
|
|
|
+ label="实装厂产品编码"
|
|
|
+ prop="realMaterialOldNumber"
|
|
|
+ min-width="200"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <div :style="scope.row.realMaterialOldNumber != scope.row.materialOldNumber ? { color: 'blue' } : ''">
|
|
|
+ {{ scope.row.realMaterialOldNumber }}
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column align="right" label="单价" prop="price" min-width="160" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.row.price | numToFixed }}
|
|
|
@@ -202,6 +252,7 @@
|
|
|
{{ scope.row.totalAmount | numToFixed }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column align="right" label="押金数量" prop="hasSendQty" min-width="160" show-overflow-tooltip />
|
|
|
<el-table-column
|
|
|
align="right"
|
|
|
label="发货数量"
|
|
|
@@ -209,30 +260,61 @@
|
|
|
min-width="160"
|
|
|
show-overflow-tooltip
|
|
|
/>
|
|
|
+ <!-- <el-table-column
|
|
|
+ align="right"
|
|
|
+ label="押金金额"
|
|
|
+ prop="depositAmount"
|
|
|
+ min-width="160"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.depositAmount | numToFixed }}
|
|
|
+ </template>
|
|
|
+ </el-table-column> -->
|
|
|
+ <el-table-column align="right" label="合同数量" prop="contractQty" min-width="160" show-overflow-tooltip>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.contractQty }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column align="right" label="合同单价" prop="contractPrice" min-width="160" show-overflow-tooltip>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.contractPrice }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column align="right" label="合同金额" prop="contractAmount" min-width="160" show-overflow-tooltip>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.contractAmount }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column align="right" label="押金金额" prop="depositAmount" min-width="160" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.row.depositAmount | numToFixed }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column align="right" label="上交资料" prop="dataQty" min-width="160" show-overflow-tooltip />
|
|
|
- <!-- <el-table-column
|
|
|
+ <el-table-column align="right" label="收差金额" prop="diffAmount" min-width="160" show-overflow-tooltip>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.diffAmount | numToFixed }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
align="right"
|
|
|
- label="收差金额"
|
|
|
- prop="diffAmount"
|
|
|
- min-width="160"
|
|
|
+ label="收差政策价格"
|
|
|
+ prop="diffPolicyPrice"
|
|
|
+ min-width="200"
|
|
|
show-overflow-tooltip
|
|
|
>
|
|
|
- <template slot-scope="scope">
|
|
|
- {{ scope.row.diffAmount | numToFixed}}
|
|
|
- </template>
|
|
|
- </el-table-column> -->
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.diffPolicyPrice | numToFixed }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
</el-table>
|
|
|
</div>
|
|
|
</div>
|
|
|
<h3 class="gdzl">工程资料</h3>
|
|
|
<el-button :disabled="isDis" class="batchDownload" type="primary" size="small" @click="batchDownloadFn"
|
|
|
- >批量下载</el-button
|
|
|
- >
|
|
|
+ >批量下载
|
|
|
+ </el-button>
|
|
|
|
|
|
<el-divider />
|
|
|
|
|
|
@@ -241,7 +323,7 @@
|
|
|
<div class="table">
|
|
|
<el-table
|
|
|
v-loading="listLoading"
|
|
|
- :data="details.dataList"
|
|
|
+ :data="original"
|
|
|
element-loading-text="Loading"
|
|
|
border
|
|
|
fit
|
|
|
@@ -287,8 +369,8 @@
|
|
|
<el-table-column align="center" label="操作" min-width="160" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">
|
|
|
<el-button type="text" class="textColor" @click="downLoadFn(scope.row.fileUrl, scope.row.fileName)"
|
|
|
- >下载</el-button
|
|
|
- >
|
|
|
+ >下载
|
|
|
+ </el-button>
|
|
|
<!-- <el-button-->
|
|
|
<!-- v-if="checkFileType(scope.row.fileUrl) == 'pdf'"-->
|
|
|
<!-- type="text"-->
|
|
|
@@ -355,21 +437,126 @@
|
|
|
<div class="label">验收说明</div>
|
|
|
<div class="value">{{ details.checkNote }}</div>
|
|
|
</el-col>
|
|
|
- <el-col v-if="details.confirmName" :xs="24" :sm="24" :lg="24" class="item">
|
|
|
+ <!-- <el-col v-if="details.confirmName && details.examineStatus == 'SAVE'" :xs="24" :sm="24" :lg="24" class="item">
|
|
|
<div class="label">驳回说明</div>
|
|
|
<div class="value">{{ details.confirmName }}</div>
|
|
|
- </el-col>
|
|
|
+ </el-col> -->
|
|
|
</el-row>
|
|
|
</div>
|
|
|
+ <div>
|
|
|
+ <div>
|
|
|
+ <h3 class="gdzl">补充资料</h3>
|
|
|
+ <el-divider />
|
|
|
+ <!-- 列表 -->
|
|
|
+ <div class="mymain-container">
|
|
|
+ <div class="table">
|
|
|
+ <el-table v-loading="listLoading" :data="amendData" element-loading-text="Loading" border fit
|
|
|
+ highlight-current-row stripe>
|
|
|
+ <el-table-column align="left" label="资料描述" prop="dataDescribe" min-width="160" show-overflow-tooltip />
|
|
|
+ <el-table-column align="left" label="原文件名" prop="fileName" min-width="160" show-overflow-tooltip />
|
|
|
+ <el-table-column align="left" label="缩略图" prop="fileUrl" min-width="160" show-overflow-tooltip>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-image v-if="checkFileType(scope.row.fileUrl) == 'image'" ref="img"
|
|
|
+ :src="imageURL + scope.row.fileUrl" style="width: 120px; height: 120px" fit="cover"
|
|
|
+ :preview-src-list="[imageURL + scope.row.fileUrl]" />
|
|
|
+ <img v-if="checkFileType(scope.row.fileUrl) == 'word'" class="file" src="@/assets/common/word.png" />
|
|
|
+ <img v-if="checkFileType(scope.row.fileUrl) == 'excel'" class="file"
|
|
|
+ src="@/assets/common/excel.png" />
|
|
|
+ <img v-if="checkFileType(scope.row.fileUrl) == 'ppt'" class="file" src="@/assets/common/ppt.png" />
|
|
|
+ <img v-if="checkFileType(scope.row.fileUrl) == 'pdf'" class="file" src="@/assets/common/pdf.png" />
|
|
|
+ <img v-if="checkFileType(scope.row.fileUrl) == 'file'" class="file aaa"
|
|
|
+ src="@/assets/common/zip.jpeg" />
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column align="left" label="下载文件名称" prop="fileName" min-width="160" show-overflow-tooltip>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ '资料_' + scope.row.fileName }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column align="center" label="操作" min-width="160" show-overflow-tooltip>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-button type="text" class="textColor"
|
|
|
+ @click="downLoadFn(scope.row.fileUrl, scope.row.fileName)">下载</el-button>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ </div>
|
|
|
+ <div class="diy-table-1">
|
|
|
+ <el-row :gutter="0">
|
|
|
+ <el-col :xs="12" :sm="12" :lg="12" class="item">
|
|
|
+ <div class="label">
|
|
|
+ 上传人
|
|
|
+ </div>
|
|
|
+ <div class="value">
|
|
|
+ {{ details.amendBy }}
|
|
|
+ </div>
|
|
|
+ </el-col>
|
|
|
+ <el-col :xs="12" :sm="12" :lg="12" class="item">
|
|
|
+ <div class="label">
|
|
|
+ 上传时间
|
|
|
+ </div>
|
|
|
+ <div class="value">
|
|
|
+ {{ details.amendTime }}
|
|
|
+ </div>
|
|
|
+ </el-col>
|
|
|
+ <el-col :xs="12" :sm="24" :lg="24" class="item">
|
|
|
+ <div class="label">
|
|
|
+ 补充说明
|
|
|
+ </div>
|
|
|
+ <div class="value">
|
|
|
+ {{ details.amendRemark }}
|
|
|
+ </div>
|
|
|
+ </el-col>
|
|
|
+
|
|
|
+ </el-row>
|
|
|
+ </div>
|
|
|
+ <div v-if=" details.examineStatus=='REVIEW'">
|
|
|
+ <h3 class="gdzl">复核</h3>
|
|
|
+ <el-divider />
|
|
|
+ <div class="diy-table-1">
|
|
|
+ <el-row :gutter="0">
|
|
|
+ <el-col :xs="12" :sm="12" :lg="12" class="item">
|
|
|
+ <div class="label">
|
|
|
+ 复核人
|
|
|
+ </div>
|
|
|
+ <div class="value">
|
|
|
+ <el-input v-model="details.reviewBy" placeholder="请输入" />
|
|
|
+ </div>
|
|
|
+ </el-col>
|
|
|
+ <el-col :xs="12" :sm="12" :lg="12" class="item">
|
|
|
+ <div class="label">
|
|
|
+ 复核时间
|
|
|
+ </div>
|
|
|
+ <div class="value">
|
|
|
+ <el-date-picker v-model="details.reviewTime" class="dateStyle" type="datetime" placeholder="选择日期"
|
|
|
+ default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" />
|
|
|
+ </div>
|
|
|
+ </el-col>
|
|
|
+ <el-col :xs="12" :sm="24" :lg="24" class="item">
|
|
|
+ <div class="label">
|
|
|
+ 复核说明
|
|
|
+ </div>
|
|
|
+ <div class="value">
|
|
|
+ <input v-model="details.reviewRemark" type="text" />
|
|
|
+ </div>
|
|
|
+ </el-col>
|
|
|
+
|
|
|
+ </el-row>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+
|
|
|
<div style="margin: 20px 0">
|
|
|
<el-button
|
|
|
v-if="details.examineStatus != 'OK' || (!isCustomer && details.examineStatus == 'OK')"
|
|
|
type="primary"
|
|
|
size="small"
|
|
|
@click="handleSvse"
|
|
|
- >保存</el-button
|
|
|
- >
|
|
|
- <el-button type="primary" size="small" @click="handleReset">重置</el-button>
|
|
|
+ >保存
|
|
|
+ </el-button>
|
|
|
+ <el-button type="primary" size="small" @click="handleReset">重置 </el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div v-show="engineering == '工程订单信息'">
|
|
|
@@ -504,6 +691,7 @@
|
|
|
<span>{{ scope.row.specification }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+
|
|
|
<el-table-column align="rihgt" label="单价" prop="price" min-width="160" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.row.price | numToFixed }}
|
|
|
@@ -577,19 +765,12 @@
|
|
|
align="left"
|
|
|
label="提交人
|
|
|
"
|
|
|
- prop="submitBy"
|
|
|
+ prop="submitName"
|
|
|
min-width="160"
|
|
|
show-overflow-tooltip
|
|
|
>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- align="left"
|
|
|
- label="提交时间
|
|
|
-"
|
|
|
- prop="submitTime"
|
|
|
- min-width="160"
|
|
|
- show-overflow-tooltip
|
|
|
- >
|
|
|
+ <el-table-column align="left" label="提交时间" prop="submitTime" min-width="160" show-overflow-tooltip>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
</div>
|
|
|
@@ -632,7 +813,9 @@ export default {
|
|
|
HOME: '家用',
|
|
|
RETAIL: '零售单',
|
|
|
RETAIL_POLICY: '销售政策单'
|
|
|
- }
|
|
|
+ },
|
|
|
+ amendData: [],
|
|
|
+ original: []
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
@@ -658,10 +841,12 @@ export default {
|
|
|
arr.push(item)
|
|
|
}
|
|
|
// item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
|
|
|
- item.sums1 = ['orderHasSendQty', 'dataQty', 'qty', 'hasSendQty']
|
|
|
- item.sums2 = ['totalAmount', 'diffAmount', 'price', 'depositAmount']
|
|
|
+ item.sums1 = ['orderHasSendQty', 'dataQty', 'qty', 'hasSendQty', 'contractQty']
|
|
|
+ item.sums2 = ['totalAmount', 'diffAmount', 'price', 'depositAmount', 'contractPrice', 'contractAmount']
|
|
|
})
|
|
|
res.data.items = arr
|
|
|
+ this.amendData = res.data.dataList.filter(k => k.dataPosition == 'AMEND')
|
|
|
+ this.original = res.data.dataList.filter(k => k.dataPosition != 'AMEND')
|
|
|
this.details = res.data
|
|
|
})
|
|
|
} else if (this.engineering == '工程订单信息') {
|
|
|
@@ -754,29 +939,35 @@ export default {
|
|
|
height: 64px;
|
|
|
width: 64px;
|
|
|
}
|
|
|
+
|
|
|
.gdzl {
|
|
|
display: inline-block;
|
|
|
}
|
|
|
+
|
|
|
.batchDownload {
|
|
|
float: right;
|
|
|
margin-top: 9px;
|
|
|
}
|
|
|
+
|
|
|
::v-deep .el-input__prefix {
|
|
|
display: none;
|
|
|
left: 65px !important;
|
|
|
-webkit-transition: all 0.3s;
|
|
|
transition: all 0.3s;
|
|
|
}
|
|
|
+
|
|
|
::v-deep .el-date-editor.el-input {
|
|
|
width: 100%;
|
|
|
box-sizing: border-box;
|
|
|
padding-left: 10px;
|
|
|
}
|
|
|
+
|
|
|
.diy-table-1 {
|
|
|
::v-deep .el-form-item {
|
|
|
margin: 0;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.zd {
|
|
|
::v-deep .el-input__suffix {
|
|
|
right: 0;
|
|
|
@@ -784,6 +975,7 @@ export default {
|
|
|
transition: all 0.3s;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
::v-deep .el-input__suffix {
|
|
|
right: -15px;
|
|
|
-webkit-transition: all 0.3s;
|
zhouhao