yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
ligaode 5 months ago
parent
16c3627b10 1e96f9fdfc
commit
c9f9bca51b
8 changed files with 19 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      yxt-as-ui/src/api/operation/salesInvoice.js
  2. 8
      yxt-as-ui/src/views/operation/salesInvoice/relation/selectSalesOrder.vue
  3. 2
      yxt-as-ui/src/views/operation/salesInvoice/salesInvoiceAdd.vue
  4. 2
      yxt-as-ui/src/views/operation/salesInvoice/salesInvoiceInfo.vue
  5. 8
      yxt-as-ui/src/views/workFlow/salesInvoiceFlow/relation/selectSalesOrder.vue
  6. 2
      yxt-as-ui/src/views/workFlow/salesInvoiceFlow/salesInvoiceDaiBan.vue
  7. 2
      yxt-as-ui/src/views/workFlow/salesInvoiceFlow/salesInvoiceEdit.vue
  8. 2
      yxt-as-ui/src/views/workFlow/salesInvoiceFlow/salesInvoiceYiBan.vue

12
yxt-as-ui/src/api/operation/salesInvoice.js
View File

@ -4,7 +4,7 @@ export default {
// 查询分页列表
listPage: function(params) {
return request({
baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
// baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
url: '/as/v1/salesInvoice/listPage',
method: 'post',
data: params,
@ -15,7 +15,7 @@ export default {
},
saveOrUpdate: function(data) {
return request({
baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
// baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
url: '/as/v1/salesInvoice/saveOrUpdate',
method: 'post',
data: data,
@ -26,14 +26,14 @@ export default {
},
fetchBySid: function(data) {
return request({
baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
// baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
url: '/as/v1/salesInvoice/fetchDetailsBySid/' + data,
method: 'get'
})
},
deleteBySids: function(data) {
return request({
baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
// baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
url: '/as/v1/salesInvoice/delBySids',
method: 'DELETE',
data: data,
@ -44,7 +44,7 @@ export default {
},
submit: function(data) {
return request({
baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
// baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
url: '/as/v1/salesInvoice/submit',
method: 'post',
data: data,
@ -56,7 +56,7 @@ export default {
salesOrderListPage: function(params) {
return request({
baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
// baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
url: '/as/v1/salesInvoice/salesOrderListPage',
method: 'post',
data: params,

8
yxt-as-ui/src/views/operation/salesInvoice/relation/selectSalesOrder.vue
View File

@ -20,7 +20,7 @@
<el-input v-model="listQuery.params.salePerson" placeholder="" clearable />
</el-form-item>
<el-form-item label="客户名称" class="searchlist">
<el-input v-model="listQuery.params.cusmoterName" placeholder="" clearable />
<el-input v-model="listQuery.params.customerName" placeholder="" clearable />
</el-form-item>
<el-form-item label="车牌号" class="searchlist">
<el-input v-model="listQuery.params.vehMark" placeholder="" clearable />
@ -56,7 +56,7 @@
<el-table-column width="80" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column prop="saleOrderNo" label="单据编号" align="center" width="170" />
<el-table-column prop="salePerson" label="配件销售人" align="center" width="120" />
<el-table-column prop="cusmoterName" label="客户名称" align="center" min-width="120" />
<el-table-column prop="customerName" label="客户名称" align="center" min-width="120" />
<el-table-column prop="vehMark" label="车牌号" align="center" width="130" />
<el-table-column prop="vinNo" label="车架号" align="center" width="130" />
<el-table-column prop="goodsAmount" label="材料费" align="center" width="120" />
@ -104,7 +104,7 @@
"deptSid": "",
"billNo": "",
"salePerson": "",
"cusmoterName": "",
"customerName": "",
"vehMark": "",
"settleDateStart": "",
"settleDateEnd": "",
@ -156,7 +156,7 @@
this.listQuery.total = 0
this.listQuery.params.billNo = ''
this.listQuery.params.salePerson = ''
this.listQuery.params.cusmoterName = ''
this.listQuery.params.customerName = ''
this.listQuery.params.vehMark = ''
this.listQuery.params.settleDateStart = ''
this.listQuery.params.settleDateEnd = ''

2
yxt-as-ui/src/views/operation/salesInvoice/salesInvoiceAdd.vue
View File

@ -89,7 +89,7 @@
</el-table-column>
<el-table-column label="销售单号" prop="saleOrderNo" align="center" />
<el-table-column label="配件销售人" prop="salePerson" align="center" />
<el-table-column label="客户名称" prop="cusmoterName" align="center" />
<el-table-column label="客户名称" prop="customerName" align="center" />
<el-table-column label="车牌号" prop="vehMark" align="center" />
<el-table-column label="车架号" prop="vinNo" align="center" />
<el-table-column label="材料费" prop="goodsAmount" align="center" />

2
yxt-as-ui/src/views/operation/salesInvoice/salesInvoiceInfo.vue
View File

@ -64,7 +64,7 @@
<el-table-column fixed width="60" label="序号" type="index" :index="index+1" align="center" />
<el-table-column label="销售单号" prop="saleOrderNo" align="center" />
<el-table-column label="配件销售人" prop="salePerson" align="center" />
<el-table-column label="客户名称" prop="cusmoterName" align="center" />
<el-table-column label="客户名称" prop="customerName" align="center" />
<el-table-column label="车牌号" prop="vehMark" align="center" />
<el-table-column label="车架号" prop="vinNo" align="center" />
<el-table-column label="材料费" prop="goodsAmount" align="center" />

8
yxt-as-ui/src/views/workFlow/salesInvoiceFlow/relation/selectSalesOrder.vue
View File

@ -20,7 +20,7 @@
<el-input v-model="listQuery.params.salePerson" placeholder="" clearable />
</el-form-item>
<el-form-item label="客户名称" class="searchlist">
<el-input v-model="listQuery.params.cusmoterName" placeholder="" clearable />
<el-input v-model="listQuery.params.customerName" placeholder="" clearable />
</el-form-item>
<el-form-item label="车牌号" class="searchlist">
<el-input v-model="listQuery.params.vehMark" placeholder="" clearable />
@ -56,7 +56,7 @@
<el-table-column width="80" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column prop="saleOrderNo" label="单据编号" align="center" width="170" />
<el-table-column prop="salePerson" label="配件销售人" align="center" width="120" />
<el-table-column prop="cusmoterName" label="客户名称" align="center" min-width="120" />
<el-table-column prop="customerName" label="客户名称" align="center" min-width="120" />
<el-table-column prop="vehMark" label="车牌号" align="center" width="130" />
<el-table-column prop="vinNo" label="车架号" align="center" width="130" />
<el-table-column prop="goodsAmount" label="材料费" align="center" width="120" />
@ -104,7 +104,7 @@
"deptSid": "",
"billNo": "",
"salePerson": "",
"cusmoterName": "",
"customerName": "",
"vehMark": "",
"settleDateStart": "",
"settleDateEnd": "",
@ -156,7 +156,7 @@
this.listQuery.total = 0
this.listQuery.params.billNo = ''
this.listQuery.params.salePerson = ''
this.listQuery.params.cusmoterName = ''
this.listQuery.params.customerName = ''
this.listQuery.params.vehMark = ''
this.listQuery.params.settleDateStart = ''
this.listQuery.params.settleDateEnd = ''

2
yxt-as-ui/src/views/workFlow/salesInvoiceFlow/salesInvoiceDaiBan.vue
View File

@ -67,7 +67,7 @@
<el-table-column fixed width="60" label="序号" type="index" :index="index+1" align="center" />
<el-table-column label="销售单号" prop="saleOrderNo" align="center" />
<el-table-column label="配件销售人" prop="salePerson" align="center" />
<el-table-column label="客户名称" prop="cusmoterName" align="center" />
<el-table-column label="客户名称" prop="customerName" align="center" />
<el-table-column label="车牌号" prop="vehMark" align="center" />
<el-table-column label="车架号" prop="vinNo" align="center" />
<el-table-column label="材料费" prop="goodsAmount" align="center" />

2
yxt-as-ui/src/views/workFlow/salesInvoiceFlow/salesInvoiceEdit.vue
View File

@ -88,7 +88,7 @@
</el-table-column>
<el-table-column label="销售单号" prop="saleOrderNo" align="center" />
<el-table-column label="配件销售人" prop="salePerson" align="center" />
<el-table-column label="客户名称" prop="cusmoterName" align="center" />
<el-table-column label="客户名称" prop="customerName" align="center" />
<el-table-column label="车牌号" prop="vehMark" align="center" />
<el-table-column label="车架号" prop="vinNo" align="center" />
<el-table-column label="材料费" prop="goodsAmount" align="center" />

2
yxt-as-ui/src/views/workFlow/salesInvoiceFlow/salesInvoiceYiBan.vue
View File

@ -64,7 +64,7 @@
<el-table-column fixed width="60" label="序号" type="index" :index="index+1" align="center" />
<el-table-column label="销售单号" prop="saleOrderNo" align="center" />
<el-table-column label="配件销售人" prop="salePerson" align="center" />
<el-table-column label="客户名称" prop="cusmoterName" align="center" />
<el-table-column label="客户名称" prop="customerName" align="center" />
<el-table-column label="车牌号" prop="vehMark" align="center" />
<el-table-column label="车架号" prop="vinNo" align="center" />
<el-table-column label="材料费" prop="goodsAmount" align="center" />

Write Preview
Loading…
Cancel
Save