|
@@ -67,20 +67,30 @@
|
|
|
prop="productName"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
+ min-width="120"
|
|
|
+ :show-tooltip-when-overflow="true"
|
|
|
label="产品名称">
|
|
|
</el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="productSpecifications"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ min-width="120"
|
|
|
+ :show-tooltip-when-overflow="true"
|
|
|
+ label="规格">
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
prop="cnt"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- label="数量"
|
|
|
- width="170">
|
|
|
+ min-width="160"
|
|
|
+ label="数量">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="price"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- min-width="160"
|
|
|
+ min-width="100"
|
|
|
label="含税单价">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
@@ -97,6 +107,7 @@
|
|
|
prop="rate"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
+ min-width="120"
|
|
|
label="税率">
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{scope.row.rate}}</span> %
|
|
@@ -134,7 +145,8 @@
|
|
|
<el-button @click="onChose">取消</el-button>
|
|
|
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
|
|
|
</span>
|
|
|
- <add-or-update-product v-if="productUpdateVisible" ref="productDialog" @changeItem="changeItem"/>
|
|
|
+ <add-or-update v-if="productUpdateVisible" ref="productDialog" @addItem="changeItem" />
|
|
|
+<!-- <add-or-update-product v-if="productUpdateVisible" ref="productDialog" @changeItem="changeItem"/>-->
|
|
|
<template-chose v-if="inboundVisible" ref="inbound" @addItems="addItems" />
|
|
|
</div>
|
|
|
</template>
|
|
@@ -142,7 +154,8 @@
|
|
|
<script>
|
|
|
import UploadComponent from '../common/upload-component'
|
|
|
import TemplateChose from '../product/template-chose'
|
|
|
- import AddOrUpdateProduct from './contract-record-product-add-or-update'
|
|
|
+ // import AddOrUpdateProduct from './contract-record-product-add-or-update'
|
|
|
+ import AddOrUpdate from '../product/template-add-or-update'
|
|
|
import { getReviewCodeList, geContractBookDetail, getCommunicationList } from '@/api/cus'
|
|
|
|
|
|
export default {
|
|
@@ -150,7 +163,7 @@ export default {
|
|
|
components: {
|
|
|
UploadComponent,
|
|
|
TemplateChose,
|
|
|
- AddOrUpdateProduct
|
|
|
+ AddOrUpdate
|
|
|
},
|
|
|
computed: {
|
|
|
orgId: {
|
|
@@ -277,14 +290,14 @@ export default {
|
|
|
updateProductHandle (row) {
|
|
|
this.productUpdateVisible = true
|
|
|
this.$nextTick(() => {
|
|
|
- this.$refs.productDialog.init(row)
|
|
|
+ this.$refs.productDialog.init(1, row)
|
|
|
})
|
|
|
},
|
|
|
// 添加产品
|
|
|
addProductHandle () {
|
|
|
this.inboundVisible = true
|
|
|
this.$nextTick(() => {
|
|
|
- this.$refs.inbound.init()
|
|
|
+ this.$refs.inbound.init(1)
|
|
|
})
|
|
|
},
|
|
|
changeItem (item) {
|