雷海东 / factory-web · 提交

转到一个项目

作者 Win10-2023FDZSZ\Administrator
提交 077aa797c8a577dd72340f6affbf29462e352dbd 1 个父辈 b978d98b

询价页面字段调整

内嵌 并排对比
正在显示 6 个修改的文件 包含 399 行增加 和 378 行删除
1 <template> 1 <template>
2 <div> 2 <div>
3 -  
4 - 3 +
5 <!-- table区域-begin --> 4 <!-- table区域-begin -->
6 <div> 5 <div>
7 <a-table 6 <a-table
@@ -21,7 +20,13 @@ @@ -21,7 +20,13 @@
21 </template> 20 </template>
22 <template slot="imgSlot" slot-scope="text,record"> 21 <template slot="imgSlot" slot-scope="text,record">
23 <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span> 22 <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
24 - <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/> 23 + <img
  24 + v-else
  25 + :src="getImgView(text)"
  26 + :preview="record.id"
  27 + height="25px"
  28 + alt=""
  29 + style="max-width:80px;font-size: 12px;font-style: italic;"/>
25 </template> 30 </template>
26 <template slot="fileSlot" slot-scope="text"> 31 <template slot="fileSlot" slot-scope="text">
27 <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span> 32 <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
@@ -40,8 +45,8 @@ @@ -40,8 +45,8 @@
40 <a @click="handleEdit(record)">编辑</a> 45 <a @click="handleEdit(record)">编辑</a>
41 <a-divider type="vertical" /> 46 <a-divider type="vertical" />
42 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> 47 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
43 - <a>删除</a>  
44 - </a-popconfirm> 48 + <a>删除</a>
  49 + </a-popconfirm>
45 <!-- <a-divider type="vertical" /> 50 <!-- <a-divider type="vertical" />
46 <a-dropdown> 51 <a-dropdown>
47 <a class="ant-dropdown-link">更多 <a-icon type="down" /></a> 52 <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
@@ -66,7 +71,7 @@ @@ -66,7 +71,7 @@
66 </template> 71 </template>
67 72
68 <script> 73 <script>
69 - import { getAction,deleteAction } from '@api/manage' 74 + import { getAction, deleteAction } from '@api/manage'
70 import '@/assets/less/TableExpand.less' 75 import '@/assets/less/TableExpand.less'
71 import { mixinDevice } from '@/utils/mixin' 76 import { mixinDevice } from '@/utils/mixin'
72 import { JeecgListMixin } from '@/mixins/JeecgListMixin' 77 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
@@ -74,14 +79,14 @@ @@ -74,14 +79,14 @@
74 79
75 export default { 80 export default {
76 name: 'TblTradeInquiryInfoList', 81 name: 'TblTradeInquiryInfoList',
77 - mixins:[JeecgListMixin, mixinDevice], 82 + mixins: [JeecgListMixin, mixinDevice],
78 components: { 83 components: {
79 TblTradeInquiryInfoModal 84 TblTradeInquiryInfoModal
80 }, 85 },
81 props: { 86 props: {
82 record: { 87 record: {
83 type: Object, 88 type: Object,
84 - default: null, 89 + default: null
85 } 90 }
86 }, 91 },
87 data () { 92 data () {
@@ -93,108 +98,103 @@ @@ -93,108 +98,103 @@
93 { 98 {
94 title: '#', 99 title: '#',
95 dataIndex: '', 100 dataIndex: '',
96 - key:'rowIndex',  
97 - width:60,  
98 - align:"center",  
99 - customRender:function (t,r,index) {  
100 - return parseInt(index)+1; 101 + key: 'rowIndex',
  102 + width: 60,
  103 + align: 'center',
  104 + customRender: function (t, r, index) {
  105 + return parseInt(index) + 1
101 } 106 }
102 }, 107 },
103 { 108 {
104 - title:'供货商名称',  
105 - align:"center", 109 + title: '供货商名称',
  110 + align: 'center',
106 dataIndex: 'ghsmc' 111 dataIndex: 'ghsmc'
107 }, 112 },
  113 + // {
  114 + // title:'电话',
  115 + // align:"center",
  116 + // dataIndex: 'tel'
  117 + // },
  118 + // {
  119 + // title:'网络链接地址',
  120 + // align:"center",
  121 + // dataIndex: 'wldz'
  122 + // },
  123 + // {
  124 + // title:'微信号',
  125 + // align:"center",
  126 + // dataIndex: 'wxh'
  127 + // },
108 { 128 {
109 - title:'电话',  
110 - align:"center",  
111 - dataIndex: 'tel'  
112 - },  
113 - {  
114 - title:'网络链接地址',  
115 - align:"center",  
116 - dataIndex: 'wldz' 129 + title: '专票单价',
  130 + align: 'center',
  131 + dataIndex: 'zpdj'
117 }, 132 },
118 { 133 {
119 - title:'微信号',  
120 - align:"center",  
121 - dataIndex: 'wxh' 134 + title: '专票税率（%）',
  135 + align: 'center',
  136 + dataIndex: 'zpsl'
122 }, 137 },
123 { 138 {
124 - title:'单价(元)',  
125 - align:"center",  
126 - dataIndex: 'dj' 139 + title: '普票单价',
  140 + align: 'center',
  141 + dataIndex: 'ppdj'
127 }, 142 },
128 { 143 {
129 - title:'总价（元）',  
130 - align:"center",  
131 - dataIndex: 'zj' 144 + title: '普票税率（%）',
  145 + align: 'center',
  146 + dataIndex: 'ppsl'
132 }, 147 },
133 { 148 {
134 - title:'票据',  
135 - align:"center",  
136 - dataIndex: 'piaoju' 149 + title: '无票单价',
  150 + align: 'center',
  151 + dataIndex: 'wpdj'
137 }, 152 },
138 { 153 {
139 - title:'票据税额比例',  
140 - align:"center",  
141 - dataIndex: 'pjsebl' 154 + title: '是否含运费',
  155 + align: 'center',
  156 + dataIndex: 'sfhyf'
142 }, 157 },
143 { 158 {
144 - title:'最小出货量',  
145 - align:"center",  
146 - dataIndex: 'zxchl' 159 + title: '运费',
  160 + align: 'center',
  161 + dataIndex: 'yf'
147 }, 162 },
148 { 163 {
149 - title:'L/T（交货周期天）',  
150 - align:"center",  
151 - dataIndex: 'jhzqt'  
152 - },  
153 - {  
154 - title:'发货地址',  
155 - align:"center", 164 + title: '发货地址',
  165 + align: 'center',
156 dataIndex: 'fhdz' 166 dataIndex: 'fhdz'
157 }, 167 },
158 { 168 {
159 - title:'单价是否含运费',  
160 - align:"center",  
161 - dataIndex: 'djsfhyf' 169 + title: '最小出货量',
  170 + align: 'center',
  171 + dataIndex: 'zxchl'
162 }, 172 },
163 { 173 {
164 - title:'含运费单价',  
165 - align:"center",  
166 - dataIndex: 'hyfdj' 174 + title: 'L/T（交货周期天）',
  175 + align: 'center',
  176 + dataIndex: 'jhzqt'
167 }, 177 },
168 { 178 {
169 - title:'价格评价',  
170 - align:"center", 179 + title: '价格评价',
  180 + align: 'center',
171 dataIndex: 'jgpj' 181 dataIndex: 'jgpj'
172 }, 182 },
173 { 183 {
174 - title:'含税价格（元）',  
175 - align:"center",  
176 - dataIndex: 'hsjg'  
177 - },  
178 - {  
179 - title:'不含税价格（元）',  
180 - align:"center",  
181 - dataIndex: 'bhsjg'  
182 - },  
183 - {  
184 - title:'是否需要重新询价',  
185 - align:"center", 184 + title: '是否需要重新询价',
  185 + align: 'center',
186 dataIndex: 'sfxycxxj', 186 dataIndex: 'sfxycxxj',
187 - customRender: (text,record)=>{  
188 - if(text == 'Y'){ 187 + customRender: (text, record) => {
  188 + if (text == 'Y') {
189 return '是' 189 return '是'
190 - }else if(text == 'N'){ 190 + } else if (text == 'N') {
191 return '否' 191 return '否'
192 } 192 }
193 - }, 193 + }
194 }, 194 },
195 { 195 {
196 - title:'原因/备注',  
197 - align:"center", 196 + title: '原因/备注',
  197 + align: 'center',
198 dataIndex: 'bz' 198 dataIndex: 'bz'
199 }, 199 },
200 // { 200 // {
@@ -205,34 +205,34 @@ @@ -205,34 +205,34 @@
205 { 205 {
206 title: '操作', 206 title: '操作',
207 dataIndex: 'action', 207 dataIndex: 'action',
208 - align:"center",  
209 - fixed:"right",  
210 - width:147, 208 + align: 'center',
  209 + fixed: 'right',
  210 + width: 147,
211 scopedSlots: { customRender: 'action' } 211 scopedSlots: { customRender: 'action' }
212 } 212 }
213 ], 213 ],
214 url: { 214 url: {
215 - list: "/trade/tblTradeInquiryInfo/list",  
216 - delete: "/trade/tblTradeInquiryInfo/delete",  
217 - deleteBatch: "/trade/tblTradeInquiryInfo/deleteBatch",  
218 - exportXlsUrl: "/trade/tblTradeInquiryInfo/exportXls",  
219 - importExcelUrl: "trade/tblTradeInquiryInfo/importExcel",  
220 - 215 + list: '/trade/tblTradeInquiryInfo/list',
  216 + delete: '/trade/tblTradeInquiryInfo/delete',
  217 + deleteBatch: '/trade/tblTradeInquiryInfo/deleteBatch',
  218 + exportXlsUrl: '/trade/tblTradeInquiryInfo/exportXls',
  219 + importExcelUrl: 'trade/tblTradeInquiryInfo/importExcel'
  220 +
221 }, 221 },
222 - dictOptions:{},  
223 - superFieldList:[], 222 + dictOptions: {},
  223 + superFieldList: []
224 } 224 }
225 }, 225 },
226 created() { 226 created() {
227 - this.getSuperFieldList(); 227 + this.getSuperFieldList()
228 }, 228 },
229 computed: { 229 computed: {
230 - importExcelUrl: function(){  
231 - return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;  
232 - }, 230 + importExcelUrl: function() {
  231 + return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
  232 + }
233 }, 233 },
234 methods: { 234 methods: {
235 - modalFormOk(){ 235 + modalFormOk() {
236 this.loadData(this.record) 236 this.loadData(this.record)
237 }, 237 },
238 // handleDelete(id){ 238 // handleDelete(id){
@@ -240,42 +240,42 @@ @@ -240,42 +240,42 @@
240 // }, 240 // },
241 handleDelete: function (id) { 241 handleDelete: function (id) {
242 if (!this.url.delete) { 242 if (!this.url.delete) {
243 - this.$message.error("请设置url.delete属性!") 243 + this.$message.error('请设置url.delete属性!')
244 return 244 return
245 } 245 }
246 - var that = this; 246 + var that = this
247 deleteAction(that.url.delete, { id: id }).then((res) => { 247 deleteAction(that.url.delete, { id: id }).then((res) => {
248 if (res.success) { 248 if (res.success) {
249 - that.$message.success(res.message); 249 + that.$message.success(res.message)
250 that.loadData(that.record) 250 that.loadData(that.record)
251 } else { 251 } else {
252 - that.$message.warning(res.message); 252 + that.$message.warning(res.message)
253 } 253 }
254 - }); 254 + })
255 }, 255 },
256 - initDictConfig(){ 256 + initDictConfig() {
257 }, 257 },
258 - getSuperFieldList(){  
259 - let fieldList=[];  
260 - fieldList.push({type:'string',value:'ghsmc',text:'供货商名称',dictCode:''})  
261 - fieldList.push({type:'string',value:'tel',text:'电话',dictCode:''})  
262 - fieldList.push({type:'string',value:'wldz',text:'网络链接地址',dictCode:''})  
263 - fieldList.push({type:'string',value:'wxh',text:'微信号',dictCode:''})  
264 - fieldList.push({type:'string',value:'dj',text:'单价(元)',dictCode:''})  
265 - fieldList.push({type:'string',value:'zj',text:'总价（元）',dictCode:''})  
266 - fieldList.push({type:'string',value:'piaoju',text:'票据',dictCode:''})  
267 - fieldList.push({type:'string',value:'pjsebl',text:'票据税额比例',dictCode:''})  
268 - fieldList.push({type:'string',value:'zxchl',text:'最小出货量',dictCode:''})  
269 - fieldList.push({type:'string',value:'lt',text:'L/T（交货周期天）',dictCode:''})  
270 - fieldList.push({type:'string',value:'fhdz',text:'发货地址',dictCode:''})  
271 - fieldList.push({type:'string',value:'djsfhyf',text:'单价是否含运费',dictCode:''})  
272 - fieldList.push({type:'string',value:'hyfdj',text:'含运费单价',dictCode:''})  
273 - fieldList.push({type:'string',value:'jgpj',text:'价格评价',dictCode:''})  
274 - fieldList.push({type:'string',value:'hsjg',text:'含税价格（元）',dictCode:''})  
275 - fieldList.push({type:'string',value:'bhsjg',text:'不含税价格（元）',dictCode:''})  
276 - fieldList.push({type:'string',value:'sfxycxxj',text:'是否需要重新询价',dictCode:''})  
277 - fieldList.push({type:'string',value:'bz',text:'原因/备注',dictCode:''})  
278 - fieldList.push({type:'string',value:'tradeId',text:'关联招标id',dictCode:''}) 258 + getSuperFieldList() {
  259 + let fieldList = []
  260 + fieldList.push({ type: 'string', value: 'ghsmc', text: '供货商名称', dictCode: '' })
  261 + fieldList.push({ type: 'string', value: 'tel', text: '电话', dictCode: '' })
  262 + fieldList.push({ type: 'string', value: 'wldz', text: '网络链接地址', dictCode: '' })
  263 + fieldList.push({ type: 'string', value: 'wxh', text: '微信号', dictCode: '' })
  264 + fieldList.push({ type: 'string', value: 'dj', text: '单价(元)', dictCode: '' })
  265 + fieldList.push({ type: 'string', value: 'zj', text: '总价（元）', dictCode: '' })
  266 + fieldList.push({ type: 'string', value: 'piaoju', text: '票据', dictCode: '' })
  267 + fieldList.push({ type: 'string', value: 'pjsebl', text: '票据税额比例', dictCode: '' })
  268 + fieldList.push({ type: 'string', value: 'zxchl', text: '最小出货量', dictCode: '' })
  269 + fieldList.push({ type: 'string', value: 'lt', text: 'L/T（交货周期天）', dictCode: '' })
  270 + fieldList.push({ type: 'string', value: 'fhdz', text: '发货地址', dictCode: '' })
  271 + fieldList.push({ type: 'string', value: 'djsfhyf', text: '单价是否含运费', dictCode: '' })
  272 + fieldList.push({ type: 'string', value: 'hyfdj', text: '含运费单价', dictCode: '' })
  273 + fieldList.push({ type: 'string', value: 'jgpj', text: '价格评价', dictCode: '' })
  274 + fieldList.push({ type: 'string', value: 'hsjg', text: '含税价格（元）', dictCode: '' })
  275 + fieldList.push({ type: 'string', value: 'bhsjg', text: '不含税价格（元）', dictCode: '' })
  276 + fieldList.push({ type: 'string', value: 'sfxycxxj', text: '是否需要重新询价', dictCode: '' })
  277 + fieldList.push({ type: 'string', value: 'bz', text: '原因/备注', dictCode: '' })
  278 + fieldList.push({ type: 'string', value: 'tradeId', text: '关联招标id', dictCode: '' })
279 this.superFieldList = fieldList 279 this.superFieldList = fieldList
280 }, 280 },
281 loadData(record) { 281 loadData(record) {
@@ -290,7 +290,7 @@ @@ -290,7 +290,7 @@
290 }).finally(() => { 290 }).finally(() => {
291 this.loading = false 291 this.loading = false
292 }) 292 })
293 - }, 293 + }
294 }, 294 },
295 watch: { 295 watch: {
296 record: { 296 record: {
@@ -301,9 +301,9 @@ @@ -301,9 +301,9 @@
301 } 301 }
302 } 302 }
303 } 303 }
304 - }, 304 + }
305 } 305 }
306 </script> 306 </script>
307 <style scoped> 307 <style scoped>
308 @import '~@assets/less/common.less'; 308 @import '~@assets/less/common.less';
309 -</style>  
  309 +</style>
@@ -31,7 +31,6 @@ @@ -31,7 +31,6 @@
31 </div> 31 </div>
32 <!-- 查询区域 end --> 32 <!-- 查询区域 end -->
33 33
34 -  
35 <!-- table区域 begin --> 34 <!-- table区域 begin -->
36 <div> 35 <div>
37 36
@@ -77,7 +76,6 @@ @@ -77,7 +76,6 @@
77 </div> 76 </div>
78 </template> 77 </template>
79 78
80 -  
81 <template slot="fileSlot" slot-scope="text"> 79 <template slot="fileSlot" slot-scope="text">
82 <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span> 80 <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
83 <a-button 81 <a-button
@@ -129,11 +127,11 @@ @@ -129,11 +127,11 @@
129 127
130 export default { 128 export default {
131 name: 'TblTradePriceInquiryList', 129 name: 'TblTradePriceInquiryList',
132 - mixins: [JeecgListMixin,mixinDevice], 130 + mixins: [JeecgListMixin, mixinDevice],
133 components: { 131 components: {
134 TblTradePriceInquiryModal, 132 TblTradePriceInquiryModal,
135 TblTradeTenderInfoSubTable, 133 TblTradeTenderInfoSubTable,
136 - TblTradeInquiryInfoList, 134 + TblTradeInquiryInfoList
137 }, 135 },
138 data() { 136 data() {
139 return { 137 return {
@@ -148,60 +146,66 @@ @@ -148,60 +146,66 @@
148 customRender: (t, r, index) => parseInt(index) + 1 146 customRender: (t, r, index) => parseInt(index) + 1
149 }, 147 },
150 { 148 {
151 - title: '优先等级',  
152 - align: 'center',  
153 - dataIndex: 'yxdj',  
154 - },  
155 - {  
156 title: '询价标书文件号', 149 title: '询价标书文件号',
157 align: 'center', 150 align: 'center',
158 - dataIndex: 'xjbswjh', 151 + dataIndex: 'xjbswjh'
159 }, 152 },
160 { 153 {
161 title: '单号', 154 title: '单号',
162 align: 'center', 155 align: 'center',
163 - dataIndex: 'danhao', 156 + dataIndex: 'danhao'
164 }, 157 },
165 { 158 {
166 - title: '询价完成日期', 159 + title: '项目类型',
167 align: 'center', 160 align: 'center',
168 - dataIndex: 'xjwcrq', 161 + dataIndex: 'xmlx'
169 }, 162 },
170 { 163 {
171 - title: '责任人', 164 + title: '送货地址',
172 align: 'center', 165 align: 'center',
173 - dataIndex: 'zrr', 166 + dataIndex: 'shdz'
174 }, 167 },
175 { 168 {
176 - title: '计划完成日期', 169 + title: '优先等级',
177 align: 'center', 170 align: 'center',
178 - dataIndex: 'jhwcrq', 171 + dataIndex: 'yxdj'
179 }, 172 },
180 { 173 {
181 - title: '实际完成日期', 174 + title: '询价完成日期',
182 align: 'center', 175 align: 'center',
183 - dataIndex: 'sjwcrq', 176 + dataIndex: 'xjwcrq'
184 }, 177 },
  178 +
  179 + // {
  180 + // title: '计划完成日期',
  181 + // align: 'center',
  182 + // dataIndex: 'jhwcrq',
  183 + // },
185 { 184 {
186 - title: '项目类型', 185 + title: '实际完成日期',
187 align: 'center', 186 align: 'center',
188 - dataIndex: 'xmlx', 187 + dataIndex: 'sjwcrq'
189 }, 188 },
190 { 189 {
191 - title: '送货地址', 190 + title: '标的类型',
192 align: 'center', 191 align: 'center',
193 - dataIndex: 'shdz', 192 + dataIndex: 'bdlx'
194 }, 193 },
195 { 194 {
196 - title: '询单状态', 195 + title: '责任人',
197 align: 'center', 196 align: 'center',
198 - dataIndex: 'xdzt', 197 + dataIndex: 'zrr'
199 }, 198 },
200 { 199 {
201 - title: '负责人', 200 + title: '询单状态',
202 align: 'center', 201 align: 'center',
203 - dataIndex: 'fzr',  
204 - }, 202 + dataIndex: 'xdzt'
  203 + }
  204 + // {
  205 + // title: '负责人',
  206 + // align: 'center',
  207 + // dataIndex: 'fzr'
  208 + // }
205 // { 209 // {
206 // title: '操作', 210 // title: '操作',
207 // dataIndex: 'action', 211 // dataIndex: 'action',
@@ -219,13 +223,13 @@ @@ -219,13 +223,13 @@
219 delete: '/trade/tblTradePriceInquiry/delete', 223 delete: '/trade/tblTradePriceInquiry/delete',
220 deleteBatch: '/trade/tblTradePriceInquiry/deleteBatch', 224 deleteBatch: '/trade/tblTradePriceInquiry/deleteBatch',
221 exportXlsUrl: '/trade/tblTradePriceInquiry/exportXls', 225 exportXlsUrl: '/trade/tblTradePriceInquiry/exportXls',
222 - importExcelUrl: '/trade/tblTradePriceInquiry/importExcel', 226 + importExcelUrl: '/trade/tblTradePriceInquiry/importExcel'
223 }, 227 },
224 - superFieldList:[], 228 + superFieldList: []
225 } 229 }
226 }, 230 },
227 created() { 231 created() {
228 - this.getSuperFieldList(); 232 + this.getSuperFieldList()
229 }, 233 },
230 computed: { 234 computed: {
231 importExcelUrl() { 235 importExcelUrl() {
@@ -242,19 +246,19 @@ @@ -242,19 +246,19 @@
242 this.expandedRowKeys.push(record.id) 246 this.expandedRowKeys.push(record.id)
243 } 247 }
244 }, 248 },
245 - getSuperFieldList(){  
246 - let fieldList=[];  
247 - fieldList.push({type:'string',value:'yxdj',text:'优先等级',dictCode:''})  
248 - fieldList.push({type:'string',value:'xjbswjh',text:'询价标书文件号',dictCode:''})  
249 - fieldList.push({type:'string',value:'danhao',text:'单号',dictCode:''})  
250 - fieldList.push({type:'date',value:'xjwcrq',text:'询价完成日期'})  
251 - fieldList.push({type:'string',value:'zrr',text:'责任人',dictCode:''})  
252 - fieldList.push({type:'date',value:'jhwcrq',text:'计划完成日期'})  
253 - fieldList.push({type:'date',value:'sjwcrq',text:'实际完成日期'})  
254 - fieldList.push({type:'string',value:'xmlx',text:'项目类型',dictCode:''})  
255 - fieldList.push({type:'string',value:'shdz',text:'送货地址',dictCode:''})  
256 - fieldList.push({type:'string',value:'xdzt',text:'询单状态',dictCode:''})  
257 - fieldList.push({type:'string',value:'fzr',text:'负责人',dictCode:''}) 249 + getSuperFieldList() {
  250 + let fieldList = []
  251 + fieldList.push({ type: 'string', value: 'yxdj', text: '优先等级', dictCode: '' })
  252 + fieldList.push({ type: 'string', value: 'xjbswjh', text: '询价标书文件号', dictCode: '' })
  253 + fieldList.push({ type: 'string', value: 'danhao', text: '单号', dictCode: '' })
  254 + fieldList.push({ type: 'date', value: 'xjwcrq', text: '询价完成日期' })
  255 + fieldList.push({ type: 'string', value: 'zrr', text: '责任人', dictCode: '' })
  256 + fieldList.push({ type: 'date', value: 'jhwcrq', text: '计划完成日期' })
  257 + fieldList.push({ type: 'date', value: 'sjwcrq', text: '实际完成日期' })
  258 + fieldList.push({ type: 'string', value: 'xmlx', text: '项目类型', dictCode: '' })
  259 + fieldList.push({ type: 'string', value: 'shdz', text: '送货地址', dictCode: '' })
  260 + fieldList.push({ type: 'string', value: 'xdzt', text: '询单状态', dictCode: '' })
  261 + fieldList.push({ type: 'string', value: 'fzr', text: '负责人', dictCode: '' })
258 this.superFieldList = fieldList 262 this.superFieldList = fieldList
259 } 263 }
260 } 264 }
@@ -262,4 +266,4 @@ @@ -262,4 +266,4 @@
262 </script> 266 </script>
263 <style lang="less" scoped> 267 <style lang="less" scoped>
264 @import '~@assets/less/common.less'; 268 @import '~@assets/less/common.less';
265 -</style>  
  269 +</style>
@@ -16,44 +16,44 @@ @@ -16,44 +16,44 @@
16 </a-col> 16 </a-col>
17 <a-col :span="6" > 17 <a-col :span="6" >
18 <a-form-model-item label="物料编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wlbm"> 18 <a-form-model-item label="物料编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wlbm">
19 - <a-input v-model="model.wlbm" disabled></a-input> 19 + <a-input v-model="model.wlbm" disabled></a-input>
20 </a-form-model-item> 20 </a-form-model-item>
21 - </a-col> 21 + </a-col>
22 <a-col :span="6" > 22 <a-col :span="6" >
23 <a-form-model-item label="物料长描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wlbm"> 23 <a-form-model-item label="物料长描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wlbm">
24 - <a-input v-model="model.tenderInfo.miaoshu" disabled></a-input> 24 + <a-input v-model="model.tenderInfo.miaoshu" disabled></a-input>
25 </a-form-model-item> 25 </a-form-model-item>
26 - </a-col> 26 + </a-col>
27 <a-col :span="6" > 27 <a-col :span="6" >
28 <a-form-model-item label="品牌" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wlbm"> 28 <a-form-model-item label="品牌" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wlbm">
29 - <a-input v-model="model.tenderInfo.pinpai" disabled></a-input> 29 + <a-input v-model="model.tenderInfo.pinpai" disabled></a-input>
30 </a-form-model-item> 30 </a-form-model-item>
31 - </a-col> 31 + </a-col>
32 <a-col :span="6" > 32 <a-col :span="6" >
33 <a-form-model-item label="标的类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wlbm"> 33 <a-form-model-item label="标的类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wlbm">
34 - <a-input v-model="model.tenderInfo.bdlx" disabled></a-input> 34 + <a-input v-model="model.tenderInfo.bdlx" disabled></a-input>
35 </a-form-model-item> 35 </a-form-model-item>
36 - </a-col> 36 + </a-col>
37 <a-col :span="6" > 37 <a-col :span="6" >
38 <a-form-model-item label="优先等级" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wlbm"> 38 <a-form-model-item label="优先等级" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wlbm">
39 - <a-input v-model="model.tenderInfo.yxdj" disabled></a-input> 39 + <a-input v-model="model.tenderInfo.yxdj" disabled></a-input>
40 </a-form-model-item> 40 </a-form-model-item>
41 - </a-col> 41 + </a-col>
42 <a-col :span="6" > 42 <a-col :span="6" >
43 <a-form-model-item label="送货地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wlbm"> 43 <a-form-model-item label="送货地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wlbm">
44 - <a-input v-model="model.tenderInfo.shdz" disabled></a-input> 44 + <a-input v-model="model.tenderInfo.shdz" disabled></a-input>
45 </a-form-model-item> 45 </a-form-model-item>
46 - </a-col> 46 + </a-col>
47 <a-col :span="6" > 47 <a-col :span="6" >
48 <a-form-model-item label="询价计划完成日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wlbm"> 48 <a-form-model-item label="询价计划完成日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wlbm">
49 - <a-input v-model="model.tenderInfo.xjjhwcsj" disabled></a-input> 49 + <a-input v-model="model.tenderInfo.xjjhwcsj" disabled></a-input>
50 </a-form-model-item> 50 </a-form-model-item>
51 - </a-col> 51 + </a-col>
52 <a-col :span="6" > 52 <a-col :span="6" >
53 <a-form-model-item label="需求数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wlbm"> 53 <a-form-model-item label="需求数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wlbm">
54 - <a-input v-model="model.tenderInfo.xqsl" disabled></a-input> 54 + <a-input v-model="model.tenderInfo.xqsl" disabled></a-input>
55 </a-form-model-item> 55 </a-form-model-item>
56 - </a-col> 56 + </a-col>
57 <a-col :span="6" > 57 <a-col :span="6" >
58 <a-form-model-item label="库存数据" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="kcsj"> 58 <a-form-model-item label="库存数据" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="kcsj">
59 <a-input v-model="model.kcsj" placeholder="请输入库存数据" ></a-input> 59 <a-input v-model="model.kcsj" placeholder="请输入库存数据" ></a-input>
@@ -127,7 +127,7 @@ @@ -127,7 +127,7 @@
127 </a-row> 127 </a-row>
128 </a-form-model> 128 </a-form-model>
129 </j-form-container> 129 </j-form-container>
130 - <!-- 子表单区域 --> 130 + <!-- 子表单区域 -->
131 <!-- <a-tabs v-model="activeKey" @change="handleChangeTabs"> 131 <!-- <a-tabs v-model="activeKey" @change="handleChangeTabs">
132 <a-tab-pane tab="询价明细表" :key="refKeys[0]" :forceRender="true"> 132 <a-tab-pane tab="询价明细表" :key="refKeys[0]" :forceRender="true">
133 <j-vxe-table 133 <j-vxe-table
@@ -155,7 +155,7 @@ @@ -155,7 +155,7 @@
155 :rowNumber="true" 155 :rowNumber="true"
156 :rowSelection="false" 156 :rowSelection="false"
157 :toolbar="false" 157 :toolbar="false"
158 - /> 158 + />
159 </a-spin> 159 </a-spin>
160 </template> 160 </template>
161 161
@@ -164,7 +164,7 @@ @@ -164,7 +164,7 @@
164 import { getAction } from '@/api/manage' 164 import { getAction } from '@/api/manage'
165 import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js' 165 import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js'
166 import { JVXETypes } from '@/components/jeecg/JVxeTable' 166 import { JVXETypes } from '@/components/jeecg/JVxeTable'
167 - import { getRefPromise,VALIDATE_FAILED} from '@/components/jeecg/JVxeTable/utils/vxeUtils.js' 167 + import { getRefPromise, VALIDATE_FAILED } from '@/components/jeecg/JVxeTable/utils/vxeUtils.js'
168 import { validateDuplicateValue } from '@/utils/util' 168 import { validateDuplicateValue } from '@/utils/util'
169 import JFormContainer from '@/components/jeecg/JFormContainer' 169 import JFormContainer from '@/components/jeecg/JFormContainer'
170 170
@@ -172,27 +172,27 @@ @@ -172,27 +172,27 @@
172 name: 'TblTradeBidSubForm', 172 name: 'TblTradeBidSubForm',
173 mixins: [JVxeTableModelMixin], 173 mixins: [JVxeTableModelMixin],
174 components: { 174 components: {
175 - JFormContainer, 175 + JFormContainer
176 }, 176 },
177 data() { 177 data() {
178 return { 178 return {
179 labelCol: { 179 labelCol: {
180 xs: { span: 24 }, 180 xs: { span: 24 },
181 - sm: { span: 8 }, 181 + sm: { span: 8 }
182 }, 182 },
183 wrapperCol: { 183 wrapperCol: {
184 xs: { span: 24 }, 184 xs: { span: 24 },
185 - sm: { span: 14 }, 185 + sm: { span: 14 }
186 }, 186 },
187 - model:{  
188 - tenderInfo:{} 187 + model: {
  188 + tenderInfo: {}
189 }, 189 },
190 // 新增时子表默认添加几行空数据 190 // 新增时子表默认添加几行空数据
191 addDefaultRowNum: 1, 191 addDefaultRowNum: 1,
192 validatorRules: { 192 validatorRules: {
193 }, 193 },
194 - refKeys: ['tblTradeInquiryInfo', ],  
195 - tableKeys:['tblTradeInquiryInfo', ], 194 + refKeys: ['tblTradeInquiryInfo' ],
  195 + tableKeys: ['tblTradeInquiryInfo' ],
196 activeKey: 'tblTradeInquiryInfo', 196 activeKey: 'tblTradeInquiryInfo',
197 // 询价明细表 197 // 询价明细表
198 tblTradeInquiryInfoTable: { 198 tblTradeInquiryInfoTable: {
@@ -203,161 +203,161 @@ @@ -203,161 +203,161 @@
203 title: '供货商名称', 203 title: '供货商名称',
204 key: 'ghsmc', 204 key: 'ghsmc',
205 type: JVXETypes.input, 205 type: JVXETypes.input,
206 - disabled:true,  
207 - width:"200px", 206 + disabled: true,
  207 + width: '200px',
208 placeholder: '请输入${title}', 208 placeholder: '请输入${title}',
209 - defaultValue:'', 209 + defaultValue: ''
210 }, 210 },
211 { 211 {
212 title: '电话', 212 title: '电话',
213 key: 'tel', 213 key: 'tel',
214 type: JVXETypes.input, 214 type: JVXETypes.input,
215 - disabled:true,  
216 - width:"200px", 215 + disabled: true,
  216 + width: '200px',
217 placeholder: '请输入${title}', 217 placeholder: '请输入${title}',
218 - defaultValue:'', 218 + defaultValue: ''
219 }, 219 },
220 { 220 {
221 title: '网络链接地址', 221 title: '网络链接地址',
222 key: 'wldz', 222 key: 'wldz',
223 type: JVXETypes.input, 223 type: JVXETypes.input,
224 - disabled:true,  
225 - width:"200px", 224 + disabled: true,
  225 + width: '200px',
226 placeholder: '请输入${title}', 226 placeholder: '请输入${title}',
227 - defaultValue:'', 227 + defaultValue: ''
228 }, 228 },
229 { 229 {
230 title: '微信号', 230 title: '微信号',
231 key: 'wxh', 231 key: 'wxh',
232 type: JVXETypes.input, 232 type: JVXETypes.input,
233 - disabled:true,  
234 - width:"200px", 233 + disabled: true,
  234 + width: '200px',
235 placeholder: '请输入${title}', 235 placeholder: '请输入${title}',
236 - defaultValue:'', 236 + defaultValue: ''
237 }, 237 },
238 { 238 {
239 title: '单价(元)', 239 title: '单价(元)',
240 key: 'dj', 240 key: 'dj',
241 type: JVXETypes.input, 241 type: JVXETypes.input,
242 - disabled:true,  
243 - width:"200px", 242 + disabled: true,
  243 + width: '200px',
244 placeholder: '请输入${title}', 244 placeholder: '请输入${title}',
245 - defaultValue:'', 245 + defaultValue: ''
246 }, 246 },
247 { 247 {
248 title: '总价（元）', 248 title: '总价（元）',
249 key: 'zj', 249 key: 'zj',
250 type: JVXETypes.input, 250 type: JVXETypes.input,
251 - disabled:true,  
252 - width:"200px", 251 + disabled: true,
  252 + width: '200px',
253 placeholder: '请输入${title}', 253 placeholder: '请输入${title}',
254 - defaultValue:'', 254 + defaultValue: ''
255 }, 255 },
256 { 256 {
257 title: '票据', 257 title: '票据',
258 key: 'piaoju', 258 key: 'piaoju',
259 type: JVXETypes.input, 259 type: JVXETypes.input,
260 - disabled:true,  
261 - width:"200px", 260 + disabled: true,
  261 + width: '200px',
262 placeholder: '请输入${title}', 262 placeholder: '请输入${title}',
263 - defaultValue:'', 263 + defaultValue: ''
264 }, 264 },
265 { 265 {
266 title: '票据税额比例', 266 title: '票据税额比例',
267 key: 'pjsebl', 267 key: 'pjsebl',
268 type: JVXETypes.input, 268 type: JVXETypes.input,
269 - disabled:true,  
270 - width:"200px", 269 + disabled: true,
  270 + width: '200px',
271 placeholder: '请输入${title}', 271 placeholder: '请输入${title}',
272 - defaultValue:'', 272 + defaultValue: ''
273 }, 273 },
274 { 274 {
275 title: '最小出货量', 275 title: '最小出货量',
276 key: 'zxchl', 276 key: 'zxchl',
277 type: JVXETypes.input, 277 type: JVXETypes.input,
278 - disabled:true,  
279 - width:"200px", 278 + disabled: true,
  279 + width: '200px',
280 placeholder: '请输入${title}', 280 placeholder: '请输入${title}',
281 - defaultValue:'', 281 + defaultValue: ''
282 }, 282 },
283 { 283 {
284 title: 'L/T（交货周期天）', 284 title: 'L/T（交货周期天）',
285 key: 'jhzqt', 285 key: 'jhzqt',
286 type: JVXETypes.input, 286 type: JVXETypes.input,
287 - disabled:true,  
288 - width:"200px", 287 + disabled: true,
  288 + width: '200px',
289 placeholder: '请输入${title}', 289 placeholder: '请输入${title}',
290 - defaultValue:'', 290 + defaultValue: ''
291 }, 291 },
292 { 292 {
293 title: '发货地址', 293 title: '发货地址',
294 key: 'fhdz', 294 key: 'fhdz',
295 type: JVXETypes.input, 295 type: JVXETypes.input,
296 - disabled:true,  
297 - width:"200px", 296 + disabled: true,
  297 + width: '200px',
298 placeholder: '请输入${title}', 298 placeholder: '请输入${title}',
299 - defaultValue:'', 299 + defaultValue: ''
300 }, 300 },
301 { 301 {
302 title: '单价是否含运费', 302 title: '单价是否含运费',
303 key: 'djsfhyf', 303 key: 'djsfhyf',
304 type: JVXETypes.input, 304 type: JVXETypes.input,
305 - disabled:true,  
306 - width:"200px", 305 + disabled: true,
  306 + width: '200px',
307 placeholder: '请输入${title}', 307 placeholder: '请输入${title}',
308 - defaultValue:'', 308 + defaultValue: ''
309 }, 309 },
310 { 310 {
311 title: '含运费单价', 311 title: '含运费单价',
312 key: 'hyfdj', 312 key: 'hyfdj',
313 type: JVXETypes.input, 313 type: JVXETypes.input,
314 - disabled:true,  
315 - width:"200px", 314 + disabled: true,
  315 + width: '200px',
316 placeholder: '请输入${title}', 316 placeholder: '请输入${title}',
317 - defaultValue:'', 317 + defaultValue: ''
318 }, 318 },
319 { 319 {
320 title: '价格评价', 320 title: '价格评价',
321 key: 'jgpj', 321 key: 'jgpj',
322 type: JVXETypes.input, 322 type: JVXETypes.input,
323 - width:"200px", 323 + width: '200px',
324 placeholder: '请输入${title}', 324 placeholder: '请输入${title}',
325 - defaultValue:'', 325 + defaultValue: ''
326 }, 326 },
327 { 327 {
328 title: '含税价格（元）', 328 title: '含税价格（元）',
329 key: 'hsjg', 329 key: 'hsjg',
330 type: JVXETypes.input, 330 type: JVXETypes.input,
331 - width:"200px", 331 + width: '200px',
332 placeholder: '请输入${title}', 332 placeholder: '请输入${title}',
333 - defaultValue:'', 333 + defaultValue: ''
334 }, 334 },
335 { 335 {
336 title: '不含税价格（元）', 336 title: '不含税价格（元）',
337 key: 'bhsjg', 337 key: 'bhsjg',
338 type: JVXETypes.input, 338 type: JVXETypes.input,
339 - width:"200px", 339 + width: '200px',
340 placeholder: '请输入${title}', 340 placeholder: '请输入${title}',
341 - defaultValue:'', 341 + defaultValue: ''
342 }, 342 },
343 { 343 {
344 title: '是否需要重新询价', 344 title: '是否需要重新询价',
345 key: 'sfxycxxj', 345 key: 'sfxycxxj',
346 type: JVXETypes.select, 346 type: JVXETypes.select,
347 - options:[],  
348 - dictCode:"is_open",  
349 - width:"200px", 347 + options: [],
  348 + dictCode: 'is_open',
  349 + width: '200px',
350 placeholder: '请输入${title}', 350 placeholder: '请输入${title}',
351 - defaultValue:'', 351 + defaultValue: ''
352 }, 352 },
353 { 353 {
354 title: '原因/备注', 354 title: '原因/备注',
355 key: 'bz', 355 key: 'bz',
356 type: JVXETypes.input, 356 type: JVXETypes.input,
357 - width:"200px", 357 + width: '200px',
358 placeholder: '请输入${title}', 358 placeholder: '请输入${title}',
359 - defaultValue:'',  
360 - }, 359 + defaultValue: ''
  360 + }
361 // { 361 // {
362 // title: '关联招标id', 362 // title: '关联招标id',
363 // key: 'tradeId', 363 // key: 'tradeId',
@@ -369,17 +369,17 @@ @@ -369,17 +369,17 @@
369 ] 369 ]
370 }, 370 },
371 url: { 371 url: {
372 - add: "/trade/tblTradeBidSub/add",  
373 - edit: "/trade/tblTradeBidSub/edit",  
374 - queryById: "/trade/tblTradeBidSub/queryById", 372 + add: '/trade/tblTradeBidSub/add',
  373 + edit: '/trade/tblTradeBidSub/edit',
  374 + queryById: '/trade/tblTradeBidSub/queryById',
375 tblTradeInquiryInfo: { 375 tblTradeInquiryInfo: {
376 list: '/trade/tblTradeBidSub/queryTblTradeInquiryInfoByMainId' 376 list: '/trade/tblTradeBidSub/queryTblTradeInquiryInfoByMainId'
377 - }, 377 + }
378 } 378 }
379 } 379 }
380 }, 380 },
381 props: { 381 props: {
382 - //表单禁用 382 + // 表单禁用
383 disabled: { 383 disabled: {
384 type: Boolean, 384 type: Boolean,
385 default: false, 385 default: false,
@@ -387,19 +387,19 @@ @@ -387,19 +387,19 @@
387 } 387 }
388 }, 388 },
389 computed: { 389 computed: {
390 - formDisabled(){ 390 + formDisabled() {
391 return this.disabled 391 return this.disabled
392 - }, 392 + }
393 }, 393 },
394 created () { 394 created () {
395 - 395 +
396 }, 396 },
397 methods: { 397 methods: {
398 // edit(record){ 398 // edit(record){
399 // console.log(record) 399 // console.log(record)
400 // }, 400 // },
401 - addBefore(){  
402 - this.tblTradeInquiryInfoTable.dataSource=[] 401 + addBefore() {
  402 + this.tblTradeInquiryInfoTable.dataSource = []
403 }, 403 },
404 getAllTable() { 404 getAllTable() {
405 let values = this.tableKeys.map(key => getRefPromise(this, key)) 405 let values = this.tableKeys.map(key => getRefPromise(this, key))
@@ -409,16 +409,15 @@ @@ -409,16 +409,15 @@
409 editAfter() { 409 editAfter() {
410 this.$nextTick(() => { 410 this.$nextTick(() => {
411 }) 411 })
412 - console.log(this.model)  
413 // 加载子表数据 412 // 加载子表数据
414 - if (this.model.id) {  
415 - let params = { id: this.model.id } 413 + if (this.model.tradeId) {
  414 + let params = { id: this.model.tradeId }
416 this.requestSubTableData(this.url.tblTradeInquiryInfo.list, params, this.tblTradeInquiryInfoTable) 415 this.requestSubTableData(this.url.tblTradeInquiryInfo.list, params, this.tblTradeInquiryInfoTable)
417 } 416 }
418 }, 417 },
419 - //校验所有一对一子表表单  
420 - validateSubForm(allValues){  
421 - return new Promise((resolve,reject)=>{ 418 + // 校验所有一对一子表表单
  419 + validateSubForm(allValues) {
  420 + return new Promise((resolve, reject) => {
422 Promise.all([ 421 Promise.all([
423 ]).then(() => { 422 ]).then(() => {
424 resolve(allValues) 423 resolve(allValues)
@@ -437,16 +436,16 @@ @@ -437,16 +436,16 @@
437 let main = Object.assign(this.model, allValues.formValue) 436 let main = Object.assign(this.model, allValues.formValue)
438 return { 437 return {
439 ...main, // 展开 438 ...main, // 展开
440 - tblTradeInquiryInfoList: allValues.tablesValue[0].tableData, 439 + tblTradeInquiryInfoList: allValues.tablesValue[0].tableData
441 } 440 }
442 }, 441 },
443 - validateError(msg){ 442 + validateError(msg) {
444 this.$message.error(msg) 443 this.$message.error(msg)
445 - }, 444 + }
446 445
447 } 446 }
448 } 447 }
449 </script> 448 </script>
450 449
451 <style scoped> 450 <style scoped>
452 -</style>  
  451 +</style>
@@ -123,6 +123,10 @@ @@ -123,6 +123,10 @@
123 tradeId:{ 123 tradeId:{
124 type:String, 124 type:String,
125 default:'' 125 default:''
  126 + },
  127 + wlbm:{
  128 + type:String,
  129 + default:''
126 } 130 }
127 }, 131 },
128 data () { 132 data () {
@@ -177,6 +181,7 @@ @@ -177,6 +181,7 @@
177 httpurl+=this.url.add; 181 httpurl+=this.url.add;
178 method = 'post'; 182 method = 'post';
179 this.model.tradeId = this.tradeId; 183 this.model.tradeId = this.tradeId;
  184 + this.model.wlbm = this.wlbm;
180 }else{ 185 }else{
181 httpurl+=this.url.edit; 186 httpurl+=this.url.edit;
182 method = 'put'; 187 method = 'put';
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 :okButtonProps="{ class:{'jee-hidden': disableSubmit} }" 8 :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
9 @cancel="handleCancel" 9 @cancel="handleCancel"
10 cancelText="关闭"> 10 cancelText="关闭">
11 - <tbl-trade-inquiry-info-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" :tradeId="tradeId"></tbl-trade-inquiry-info-form> 11 + <tbl-trade-inquiry-info-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" :tradeId="tradeId" :wlbm="wlbm"></tbl-trade-inquiry-info-form>
12 </j-modal> 12 </j-modal>
13 </template> 13 </template>
14 14
@@ -23,46 +23,47 @@ @@ -23,46 +23,47 @@
23 props: { 23 props: {
24 model: { 24 model: {
25 type: Object, 25 type: Object,
26 - default: null, 26 + default: null
27 } 27 }
28 }, 28 },
29 data () { 29 data () {
30 return { 30 return {
31 - title:'',  
32 - width:896, 31 + title: '',
  32 + width: 896,
33 visible: false, 33 visible: false,
34 disableSubmit: false, 34 disableSubmit: false,
35 - tradeId:'', 35 + tradeId: '',
  36 + wlbm: ''
36 } 37 }
37 }, 38 },
38 methods: { 39 methods: {
39 add () { 40 add () {
40 - this.visible=true  
41 - this.$nextTick(()=>{  
42 - this.$refs.realForm.add(); 41 + this.visible = true
  42 + this.$nextTick(() => {
  43 + this.$refs.realForm.add()
43 }) 44 })
44 console.log(this.tradeId) 45 console.log(this.tradeId)
45 }, 46 },
46 edit (record) { 47 edit (record) {
47 - this.visible=true  
48 - this.$nextTick(()=>{  
49 - this.$refs.realForm.edit(record); 48 + this.visible = true
  49 + this.$nextTick(() => {
  50 + this.$refs.realForm.edit(record)
50 }) 51 })
51 }, 52 },
52 close () { 53 close () {
53 - this.$emit('close');  
54 - this.visible = false; 54 + this.$emit('close')
  55 + this.visible = false
55 }, 56 },
56 handleOk () { 57 handleOk () {
57 - this.$refs.realForm.submitForm(); 58 + this.$refs.realForm.submitForm()
58 }, 59 },
59 - submitCallback(){  
60 - this.$emit('ok');  
61 - this.visible = false; 60 + submitCallback() {
  61 + this.$emit('ok')
  62 + this.visible = false
62 }, 63 },
63 handleCancel () { 64 handleCancel () {
64 this.close() 65 this.close()
65 } 66 }
66 } 67 }
67 } 68 }
68 -</script>  
  69 +</script>
1 <template> 1 <template>
2 <div> 2 <div>
3 - <a-table ref="table1"  
4 - rowKey="id"  
5 - size="middle" 3 + <a-table
  4 + ref="table1"
  5 + rowKey="id"
  6 + size="middle"
6 :scroll="{x:true}" 7 :scroll="{x:true}"
7 - bordered  
8 - :loading="loading"  
9 - :columns="columns" 8 + bordered
  9 + :loading="loading"
  10 + :columns="columns"
10 :dataSource="dataSource" 11 :dataSource="dataSource"
11 :pagination="ipagination" 12 :pagination="ipagination"
12 @change="handleTableChange" 13 @change="handleTableChange"
@@ -31,15 +32,22 @@ @@ -31,15 +32,22 @@
31 32
32 <template slot="fileSlot" slot-scope="text"> 33 <template slot="fileSlot" slot-scope="text">
33 <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span> 34 <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
34 - <a-button v-else ghost type="primary" icon="download" size="small" @click="downloadFile(text)"> 35 + <a-button
  36 + v-else
  37 + ghost
  38 + type="primary"
  39 + icon="download"
  40 + size="small"
  41 + @click="downloadFile(text)">
35 <span>下载</span> 42 <span>下载</span>
36 </a-button> 43 </a-button>
37 </template> 44 </template>
38 - 45 +
39 <span slot="action" slot-scope="text, record"> 46 <span slot="action" slot-scope="text, record">
40 <a @click="handleAdd(record)">新增询价</a> 47 <a @click="handleAdd(record)">新增询价</a>
41 -  
42 - 48 + <a-divider type="vertical" />
  49 + <a @click="handleSubmit(record)">提交</a>
  50 +
43 <!-- <a-divider type="vertical" /> 51 <!-- <a-divider type="vertical" />
44 <a-dropdown> 52 <a-dropdown>
45 <a class="ant-dropdown-link">更多 <a-icon type="down" /></a> 53 <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
@@ -55,27 +63,24 @@ @@ -55,27 +63,24 @@
55 </a-menu> 63 </a-menu>
56 </a-dropdown> --> 64 </a-dropdown> -->
57 </span> 65 </span>
58 -  
59 -  
60 66
61 </a-table> 67 </a-table>
62 - 68 +
63 <tbl-trade-inquiry-info-modal ref="modalForm" @ok="modalFormOk" ></tbl-trade-inquiry-info-modal> 69 <tbl-trade-inquiry-info-modal ref="modalForm" @ok="modalFormOk" ></tbl-trade-inquiry-info-modal>
64 </div> 70 </div>
65 </template> 71 </template>
66 72
67 <script> 73 <script>
68 import { getAction } from '@api/manage' 74 import { getAction } from '@api/manage'
69 - import {JeecgListMixin} from '@/mixins/JeecgListMixin' 75 + import { JeecgListMixin } from '@/mixins/JeecgListMixin'
70 import { mixinDevice } from '@/utils/mixin' 76 import { mixinDevice } from '@/utils/mixin'
71 import TblTradeInquiryInfoList from '../TblTradeInquiryInfoList' 77 import TblTradeInquiryInfoList from '../TblTradeInquiryInfoList'
72 import '@/assets/less/TableExpand.less' 78 import '@/assets/less/TableExpand.less'
73 import TblTradeInquiryInfoModal from '../modules/TblTradeInquiryInfoModal' 79 import TblTradeInquiryInfoModal from '../modules/TblTradeInquiryInfoModal'
74 -  
75 80
76 export default { 81 export default {
77 name: 'TblTradeTenderInfoSubTable', 82 name: 'TblTradeTenderInfoSubTable',
78 - mixins: [JeecgListMixin,mixinDevice], 83 + mixins: [JeecgListMixin, mixinDevice],
79 components: { 84 components: {
80 TblTradeInquiryInfoList, 85 TblTradeInquiryInfoList,
81 TblTradeInquiryInfoModal 86 TblTradeInquiryInfoModal
@@ -83,7 +88,7 @@ @@ -83,7 +88,7 @@
83 props: { 88 props: {
84 record: { 89 record: {
85 type: Object, 90 type: Object,
86 - default: null, 91 + default: null
87 } 92 }
88 }, 93 },
89 data() { 94 data() {
@@ -92,45 +97,56 @@ @@ -92,45 +97,56 @@
92 disableMixinCreated: true, 97 disableMixinCreated: true,
93 loading: false, 98 loading: false,
94 dataSource: [], 99 dataSource: [],
95 - columns: [{  
96 - title: '询价标书文件号', 100 + columns: [
  101 + // {
  102 + // title: '询价标书文件号',
  103 + // align: 'center',
  104 + // dataIndex: 'xjbswjh',
  105 + // },
  106 + {
  107 + title: '物料编码',
97 align: 'center', 108 align: 'center',
98 - dataIndex: 'xjbswjh', 109 + dataIndex: 'code'
99 }, 110 },
100 { 111 {
101 - title: '物料编码', 112 + title: '标段（包）名称',
102 align: 'center', 113 align: 'center',
103 - dataIndex: 'code', 114 + dataIndex: 'tenderName'
104 }, 115 },
105 - // {  
106 - // title: '标段（包）名称',  
107 - // align: 'center',  
108 - // dataIndex: 'tenderName',  
109 - // },  
110 { 116 {
111 title: '物料长描述', 117 title: '物料长描述',
112 align: 'center', 118 align: 'center',
113 - dataIndex: 'miaoshu', 119 + dataIndex: 'miaoshu'
  120 + },
  121 + {
  122 + title: '品牌',
  123 + align: 'center',
  124 + dataIndex: 'pinpai'
  125 + },
  126 + {
  127 + title: '计量单位',
  128 + align: 'center',
  129 + dataIndex: 'jldw'
114 }, 130 },
115 - // {  
116 - // title: '计量单位',  
117 - // align: 'center',  
118 - // dataIndex: 'jldw',  
119 - // },  
120 { 131 {
121 title: '需求数量', 132 title: '需求数量',
122 align: 'center', 133 align: 'center',
123 - dataIndex: 'xqsl', 134 + dataIndex: 'xqsl'
124 }, 135 },
125 { 136 {
126 title: '需求交货期', 137 title: '需求交货期',
127 align: 'center', 138 align: 'center',
128 - dataIndex: 'xqjhq', 139 + dataIndex: 'xqjhq'
129 }, 140 },
130 { 141 {
131 - title: '品牌', 142 + title: '需求单位',
132 align: 'center', 143 align: 'center',
133 - dataIndex: 'pinpai', 144 + dataIndex: 'xqdw'
  145 + },
  146 + {
  147 + title: '备注',
  148 + align: 'center',
  149 + dataIndex: 'bz'
134 }, 150 },
135 // { 151 // {
136 // title: '税率', 152 // title: '税率',
@@ -187,94 +203,90 @@ @@ -187,94 +203,90 @@
187 // align: 'center', 203 // align: 'center',
188 // dataIndex: 'ppfjx', 204 // dataIndex: 'ppfjx',
189 // }, 205 // },
  206 +
190 // { 207 // {
191 - // title: '需求单位', 208 + // title: '询价标书文件号',
192 // align: 'center', 209 // align: 'center',
193 - // dataIndex: 'xqdw', 210 + // dataIndex: 'xjbswjh',
194 // }, 211 // },
195 // { 212 // {
196 - // title: '备注', 213 + // title: '项目类型',
197 // align: 'center', 214 // align: 'center',
198 - // dataIndex: 'bz', 215 + // dataIndex: 'xmlx',
199 // }, 216 // },
200 // { 217 // {
201 - // title: '询价标书文件号', 218 + // title: '送货地址',
202 // align: 'center', 219 // align: 'center',
203 - // dataIndex: 'xjbswjh', 220 + // dataIndex: 'shdz'
204 // }, 221 // },
205 // { 222 // {
206 - // title: '项目类型', 223 + // title: '优先等级',
207 // align: 'center', 224 // align: 'center',
208 - // dataIndex: 'xmlx', 225 + // dataIndex: 'yxdj'
  226 + // },
  227 + // {
  228 + // title: '询价计划完成日期',
  229 + // align: 'center',
  230 + // dataIndex: 'xjjhwcsj'
  231 + // },
  232 + // {
  233 + // title: '标的类型',
  234 + // align: 'center',
  235 + // dataIndex: 'bdlx'
209 // }, 236 // },
210 { 237 {
211 - title: '送货地址',  
212 - align: 'center',  
213 - dataIndex: 'shdz',  
214 - },  
215 - {  
216 - title: '优先等级', 238 + title: '库存数据',
217 align: 'center', 239 align: 'center',
218 - dataIndex: 'yxdj', 240 + dataIndex: 'kcsj'
219 }, 241 },
220 { 242 {
221 - title: '询价计划完成日期', 243 + title: '在途库存',
222 align: 'center', 244 align: 'center',
223 - dataIndex: 'xjjhwcsj', 245 + dataIndex: 'ztkc'
224 }, 246 },
225 { 247 {
226 - title: '标的类型', 248 + title: '最近中标单价',
227 align: 'center', 249 align: 'center',
228 - dataIndex: 'bdlx', 250 + dataIndex: 'zjzbdj'
229 }, 251 },
  252 + // {
  253 + // title: '中标次数',
  254 + // align: 'center',
  255 + // dataIndex: 'zbcs'
  256 + // },
230 { 257 {
231 - title: '库存数据',  
232 - align: 'center',  
233 - dataIndex: 'kcsj',  
234 - }, {  
235 - title: '在途库存',  
236 - align: 'center',  
237 - dataIndex: 'ztkc',  
238 - }, {  
239 - title: '最近中标单价',  
240 - align: 'center',  
241 - dataIndex: 'zjzbdj',  
242 - }, {  
243 - title: '中标次数',  
244 - align: 'center',  
245 - dataIndex: 'zbcs',  
246 - }, {  
247 title: '最后一次中标时间', 258 title: '最后一次中标时间',
248 align: 'center', 259 align: 'center',
249 - dataIndex: 'zhzbsj',  
250 - }, {  
251 - title: '最后一次未中标时间',  
252 - align: 'center',  
253 - dataIndex: 'zhwzbsj', 260 + dataIndex: 'zhzbsj'
254 }, 261 },
  262 + // {
  263 + // title: '最后一次未中标时间',
  264 + // align: 'center',
  265 + // dataIndex: 'zhwzbsj'
  266 + // },
255 { 267 {
256 title: '操作', 268 title: '操作',
257 dataIndex: 'action', 269 dataIndex: 'action',
258 - align:"center",  
259 - width:147, 270 + align: 'center',
  271 + width: 147,
260 scopedSlots: { customRender: 'action' } 272 scopedSlots: { customRender: 'action' }
261 } 273 }
262 ], 274 ],
263 url: { 275 url: {
264 - list: '/trade/tblTradePriceInquiry/queryTblTradeTenderInfoByMainId', 276 + list: '/trade/tblTradePriceInquiry/queryTblTradeTenderInfoByMainId'
265 }, 277 },
266 /* 分页参数 */ 278 /* 分页参数 */
267 ipagination: { 279 ipagination: {
268 current: 1, 280 current: 1,
269 pageSize: 5, 281 pageSize: 5,
270 - pageSizeOptions: ['5', '10', '20','30'], 282 + pageSizeOptions: ['5', '10', '20', '30'],
271 showTotal: (total, range) => { 283 showTotal: (total, range) => {
272 - return range[0] + "-" + range[1] + " 共" + total + "条" 284 + return range[0] + '-' + range[1] + ' 共' + total + '条'
273 }, 285 },
274 showQuickJumper: true, 286 showQuickJumper: true,
275 showSizeChanger: true, 287 showSizeChanger: true,
276 total: 0 288 total: 0
277 - }, 289 + }
278 } 290 }
279 }, 291 },
280 watch: { 292 watch: {
@@ -288,15 +300,15 @@ @@ -288,15 +300,15 @@
288 } 300 }
289 }, 301 },
290 methods: { 302 methods: {
291 - modalFormOk(){ 303 + modalFormOk() {
292 this.loadData(this.record) 304 this.loadData(this.record)
293 - console.log(898989)  
294 }, 305 },
295 - handleAdd(record){  
296 - this.$refs.modalForm.tradeId = record.id;  
297 - this.$refs.modalForm.add();  
298 - this.$refs.modalForm.title = "新增";  
299 - this.$refs.modalForm.disableSubmit = false; 306 + handleAdd(record) {
  307 + this.$refs.modalForm.tradeId = record.id
  308 + this.$refs.modalForm.wlbm = record.code
  309 + this.$refs.modalForm.add()
  310 + this.$refs.modalForm.title = '新增'
  311 + this.$refs.modalForm.disableSubmit = false
300 }, 312 },
301 loadData(record) { 313 loadData(record) {
302 this.loading = true 314 this.loading = true
@@ -312,17 +324,17 @@ @@ -312,17 +324,17 @@
312 }) 324 })
313 }, 325 },
314 handleTableChange(pagination, filters, sorter) { 326 handleTableChange(pagination, filters, sorter) {
315 - //分页、排序、筛选变化时触发  
316 - //TODO 筛选 327 + // 分页、排序、筛选变化时触发
  328 + // TODO 筛选
317 console.log(pagination) 329 console.log(pagination)
318 if (Object.keys(sorter).length > 0) { 330 if (Object.keys(sorter).length > 0) {
319 - this.isorter.column = sorter.field;  
320 - this.isorter.order = "ascend" == sorter.order ? "asc" : "desc" 331 + this.isorter.column = sorter.field
  332 + this.isorter.order = sorter.order == 'ascend' ? 'asc' : 'desc'
321 } 333 }
322 - this.ipagination = pagination; 334 + this.ipagination = pagination
323 // this.loadData(this.record); 335 // this.loadData(this.record);
324 - },  
325 - }, 336 + }
  337 + }
326 } 338 }
327 </script> 339 </script>
328 340