-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -102,49 +96,49 @@
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
-
-
-
-
-
+
-
-
+
-
-
+
-
+
+
+
@@ -181,8 +175,6 @@
printId: '',
dataForm: {
id :'',
- customerId: '',
- contractId: '',
documentNo : '',
customerName : '',
amountCollected : '',
diff --git a/SC-web/src/views/scm/basicInformation/collection/Form.vue b/SC-web/src/views/scm/basicInformation/collection/Form.vue
index d95ea3ad..5b698610 100644
--- a/SC-web/src/views/scm/basicInformation/collection/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/collection/Form.vue
@@ -12,24 +12,14 @@
-
-
+
-
-
-
-
-
-
-
@@ -137,17 +127,13 @@
-<<<<<<< HEAD
-
-=======
->>>>>>> 6b66ea0276198dd5eb24cd6f115f6e164cbd7df3
-
+ :bissId="dataForm.customerCode" @change="popupSelect2">
@@ -239,12 +225,9 @@
loading: false,
isDetail: false,
dataForm: {
- code: '',
customerCode: '',
documentNo: '',
customerName: '',
- customerId: '',
- contractId: '',
amountCollected: '',
collectionCount: '',
collectionBank: '',
@@ -272,13 +255,6 @@
"label": "客户等级",
"value": "customer_level"
}, ],
- contractNamecolumnOptions: [{
- "label": "合同编码",
- "value": "contract_code"
- }, {
- "label": "合同名称",
- "value": "contract_name"
- } ],
jg_collection_item0deleteTimecolumnOptions: [{
"label": "销售订单ID",
"value": "id"
@@ -394,9 +370,7 @@
mounted() {},
methods: {
popupSelect(e, d) {
- debugger
- this.dataForm.code = d.id;
- debugger
+ this.dataForm.customerCode = d.id;
},
popupSelect2(a, b) {
for (let i = 0; i < this.dataForm.collection_item0List.length; i++) {
diff --git a/SC-web/src/views/scm/basicInformation/collection/index.vue b/SC-web/src/views/scm/basicInformation/collection/index.vue
index 8be9c0d9..2a9774b6 100644
--- a/SC-web/src/views/scm/basicInformation/collection/index.vue
+++ b/SC-web/src/views/scm/basicInformation/collection/index.vue
@@ -30,7 +30,7 @@
弃审
- 提交
+ 提交
认款
@@ -46,8 +46,7 @@
@selection-change="handleSelectionChange" border>
{{ scope.row.currency | dynamicText(currencyOptions) }}
@@ -145,13 +144,9 @@
label: '单据编号'
},
{
- prop: 'customerId',
+ prop: 'customerName',
label: '客户名称'
},
- {
- prop: 'contractId',
- label: '合同名称'
- },
{
prop: 'currency',
label: '币别 '
@@ -351,38 +346,6 @@
})
}).catch(() => {})
},
- commit(){
- if (!this.multipleSelection.length) {
- this.$message({
- type: 'error',
- message: '请选择一条数据',
- duration: 1500,
- })
- return
- }
- if (this.multipleSelection.length === 1) {
- let ids = this.multipleSelection.join()
- request({
- url: `/api/collection/Collection/commit/${ids}`,
- method: 'POST',
- }).then(res => {
- this.$message({
- type: 'success',
- message: res.msg,
- onClose: () => {
- this.initData()
- }
- });
- })
- }
- if (this.multipleSelection.length > 1){
- this.$message({
- type: 'error',
- message: '请选择单条数据',
- duration: 1500
- })
- }
- },
confirmprice() {
if (!this.multipleSelection.length) {
this.$message({
@@ -394,9 +357,27 @@
}
let ids = this.multipleSelection.join()
if (this.multipleSelection.length === 1) {
+ let info = {}
+ info = this.list.find(function(info) {
+ return info.id == ids
+ })
+ if (info.status != 2) {
+ this.$message({
+ type: 'error',
+ message: '审核中，请先通过审核',
+ duration: 1500
+ })
+ return
+ }
+ let param = {};
+ param = this.list.find(function(param) {
+ debugger
+ return param.id == id;
+ })
request({
- url: `/api/collection/Collection/confirmprice/${ids}`,
+ url: `/api/collection/Collection/confirmprice`,
method: 'POST',
+ data: param
}).then(res => {
this.$message({
type: 'success',
diff --git a/SC-web/src/views/scm/basicInformation/poundlist/Form.vue b/SC-web/src/views/scm/basicInformation/poundlist/Form.vue
index 081adecd..146ce2c7 100644
--- a/SC-web/src/views/scm/basicInformation/poundlist/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/poundlist/Form.vue
@@ -491,96 +491,6 @@
this.$emit('refresh', true)
}
})
-<<<<<<< HEAD
- },
- request2() {
- var _data = this.dataList()
- if (!this.dataForm.id) {
- request({
- url: '/api/poundlist/Poundlist',
- method: 'post',
- data: _data
- }).then((res) => {
- this.$message({
- message: res.msg,
- type: 'success',
- duration: 1000,
- onClose: () => {
- this.visible = false
- this.$emit('refresh', true)
- }
- })
- })
- } else {
- request({
- url: '/api/poundlist/Poundlist/' + this.dataForm.id,
- method: 'PUT',
- data: _data
- }).then((res) => {
- this.$message({
- message: res.msg,
- type: 'success',
- duration: 1000,
- onClose: () => {
- this.visible = false
- this.$emit('refresh', true)
- }
- })
- })
- }
- },
- request() {
- var _data =this.dataList()
- if (!this.dataForm.id) {
- request({
- url: '/api/poundlist/Poundlist',
- method: 'post',
- data: _data
- }).then((res) => {
- this.$message({
- message: res.msg,
- type: 'success',
- duration: 1000,
- onClose: () => {
- this.visible = false
- this.$emit('refresh', true)
- }
- })
- })
- }else{
- request({
- url: '/api/poundlist/Poundlist/'+this.dataForm.id,
- method: 'PUT',
- data: _data
- }).then((res) => {
- this.$message({
- message: res.msg,
- type: 'success',
- duration: 1000,
- onClose: () => {
- this.visible = false
- this.$emit('refresh', true)
- }
- })
- })
- }
- },
- dataList(){
- var _data = JSON.parse(JSON.stringify(this.dataForm));
- _data.poundPictures = JSON.stringify(_data.poundPictures)
- _data.vehiclePictures = JSON.stringify(_data.vehiclePictures)
- return _data;
- },
- dataInfo(dataAll){
- let _dataAll =dataAll
- _dataAll.poundPictures = JSON.parse( _dataAll.poundPictures)
- _dataAll.vehiclePictures = JSON.parse( _dataAll.vehiclePictures)
- this.dataForm = _dataAll
- },
- },
- }
-
-=======
})
}
},
@@ -598,5 +508,4 @@
},
},
}
->>>>>>> 6b66ea0276198dd5eb24cd6f115f6e164cbd7df3
diff --git a/SC-web/src/views/scm/basicInformation/poundlist/index.vue b/SC-web/src/views/scm/basicInformation/poundlist/index.vue
index fb1c2a0e..090f6019 100644
--- a/SC-web/src/views/scm/basicInformation/poundlist/index.vue
+++ b/SC-web/src/views/scm/basicInformation/poundlist/index.vue
@@ -1,424 +1,6 @@
-
@@ -42,12 +42,12 @@
-
-
-
-
+
+
+
+
@@ -67,31 +67,31 @@
-
+
-
+
-
-
+
-
-
+
-
+
-
+
-
@@ -167,7 +167,7 @@
id :'',
documentNo : '',
type : "0",
- salesId : "XS002",
+ sourceNo : "XS002",
amount : '',
currency : "0",
num : '',
@@ -181,14 +181,14 @@
lastModifyUserName : "",
receiptout_item0List:[],
},
- activezlqlfb:'0',
+ activefqhgdj:'0',
typeOptions:[{"fullName":"销售出库","id":"0"},{"fullName":"购销出库","id":"1"}],
currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"}],
unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
rateOptions:[{"fullName":"13","id":"0"},{"fullName":"9","id":"1"},{"fullName":"6","id":"2"},{"fullName":"5","id":"3"},{"fullName":"3","id":"4"},{"fullName":"0","id":"5"}],
- poundTypeOptions:[{"fullName":"贸易","id":"0"},{"fullName":"自加工","id":"1"},{"fullName":"委外","id":"2"},{"fullName":"倒运","id":"3"}],
+ deleteUserIdOptions:[{"fullName":"贸易","id":"0"},{"fullName":"其它","id":"1"}],
}
},
computed: {},
@@ -213,7 +213,7 @@
if(this.dataForm.id){
this.loading = true
request({
- url: '/api/receipout/Receiptout/detail/'+this.dataForm.id,
+ url: '/api/example/Receiptout/detail/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
diff --git a/SC-web/src/views/scm/basicInformation/receiptout/Form.vue b/SC-web/src/views/scm/basicInformation/receiptout/Form.vue
index 0f18aa9b..a7e4529b 100644
--- a/SC-web/src/views/scm/basicInformation/receiptout/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/receiptout/Form.vue
@@ -1,419 +1,574 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
-
-
+
+
+
+
+
-
+
diff --git a/SC-web/src/views/scm/basicInformation/receiptout/index.vue b/SC-web/src/views/scm/basicInformation/receiptout/index.vue
index 12d262d7..5c14638d 100644
--- a/SC-web/src/views/scm/basicInformation/receiptout/index.vue
+++ b/SC-web/src/views/scm/basicInformation/receiptout/index.vue
@@ -1,303 +1,386 @@
-
+
-
-
+
-
@@ -148,7 +142,7 @@
-
+
-
-
-
+
+
+
+
-
+
+
+
+
@@ -200,64 +203,41 @@
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
-
-
+
-
-
+
-
@@ -282,10 +262,15 @@
-
+
+
+
+
@@ -307,17 +292,17 @@
-
+
-
-
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -383,11 +328,6 @@
-
-
-
@@ -399,9 +339,9 @@
-
+
-
@@ -420,6 +360,11 @@
+
+
+
@@ -430,11 +375,6 @@
-
-
-
@@ -444,6 +384,8 @@
+
+
@@ -471,8 +413,7 @@
dataForm: {
id :'',
documentNo : '',
- contractCode : "",
- costomerCode : "",
+ contractName : "",
currency : "0",
contractNo : '',
advanceAmount : '',
@@ -480,34 +421,32 @@
price : '',
notPrice : '',
remark : '',
+ costomerName : '',
amountCollected : '',
invoiceNum : '',
invoiceAmount : '',
+ sourceSystem : "0",
status : "0",
- erpNo : '',
creatorUserName : "",
- creatorTime : "",
salesorder_item0List:[],
receiptoutsoitemList:[],
- arinvoices_item0soitemList:[],
collectionsoitemList:[],
+ arinvoices_item0soitemList:[],
salesbacksoitemList:[],
paymentsoitemList:[],
},
- activemtmitd:'1',
+ activexvlbvm:'0',
currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
+ sourceSystemOptions:[{"fullName":"人工创建","id":"0"},{"fullName":"商城平台","id":"1"}],
statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"开票中","id":"1"},{"fullName":"付款申请","id":"2"},{"fullName":"待回款","id":"3"},{"fullName":"回款中","id":"4"},{"fullName":"归档","id":"5"}],
poundTypeOptions:[{"fullName":"贸易","id":"0"},{"fullName":"其他","id":"1"}],
unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
advanceOptions:[{"fullName":"否","id":"0"},{"fullName":"是","id":"1"}],
rateOptions:[{"fullName":"13","id":"0"},{"fullName":"9","id":"1"},{"fullName":"6","id":"2"},{"fullName":"5","id":"3"},{"fullName":"3","id":"4"},{"fullName":"0","id":"5"}],
- jnpf_jg_collection_jnpf_collectionCountOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
- deleteUserNameOptions:[{"fullName":"13","id":"0"},{"fullName":"9","id":"1"},{"fullName":"6","id":"2"},{"fullName":"5","id":"3"},{"fullName":"3","id":"4"},{"fullName":"0","id":"5"}],
- customerNameOptions:[{"fullName":"贸易","id":"0"},{"fullName":"自加工","id":"1"},{"fullName":"委外","id":"2"},{"fullName":"倒运","id":"3"}],
+ paymentTypeOptions:[{"fullName":"贷款","id":"0"},{"fullName":"运费","id":"1"},{"fullName":"仓储","id":"2"}],
taxRateOptions:[{"fullName":"13","id":"0"},{"fullName":"9","id":"1"},{"fullName":"6","id":"2"},{"fullName":"5","id":"3"},{"fullName":"3","id":"4"},{"fullName":"0","id":"5"}],
invoiceStatusOptions:[{"fullName":"正常","id":"0"},{"fullName":"红冲","id":"1"},{"fullName":"作废","id":"2"}],
- settlementTypeOptions:[{"fullName":"货款","id":"0"},{"fullName":"运费","id":"1"},{"fullName":"仓储","id":"2"}],
settlementtypeOptions:[{"fullName":"现金","id":"0"},{"fullName":"赊购","id":"1"},{"fullName":"网银","id":"2"},{"fullName":"银企直连","id":"3"},{"fullName":"银票","id":"4"},{"fullName":"商票","id":"5"}],
}
},
@@ -527,15 +466,14 @@
var _list = _dataAll.receiptoutsoitemList[i];
_list.issueDate = _list.issueDate ? jnpf.dateFormat(_list.issueDate) : ''
}
+ for(let i=0;i<_dataAll.collectionsoitemList.length;i++){
+ var _list = _dataAll.collectionsoitemList[i];
+ }
for(let i=0;i<_dataAll.arinvoices_item0soitemList.length;i++){
var _list = _dataAll.arinvoices_item0soitemList[i];
_list.invoiceDate = _list.invoiceDate ? jnpf.dateFormat(_list.invoiceDate) : ''
_list.attachMent = _list.attachMent? JSON.parse(_list.attachMent):[]
}
- for(let i=0;i<_dataAll.collectionsoitemList.length;i++){
- var _list = _dataAll.collectionsoitemList[i];
- _list.businessDate = _list.businessDate ? jnpf.dateFormat(_list.businessDate) : ''
- }
for(let i=0;i<_dataAll.salesbacksoitemList.length;i++){
var _list = _dataAll.salesbacksoitemList[i];
_list.creatorTime = _list.creatorTime ? jnpf.dateFormat(_list.creatorTime) : ''
@@ -554,7 +492,7 @@
if(this.dataForm.id){
this.loading = true
request({
- url: '/api/saleorder/Saleorderitem/detail/'+this.dataForm.id,
+ url: '/api/saleorder/Saleorder/detail/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/Form.vue b/SC-web/src/views/scm/basicInformation/saleorder/Form.vue
index 41a42234..5db0f470 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/Form.vue
@@ -1,40 +1,4 @@
-<<<<<<< HEAD
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-=======
@@ -62,119 +26,77 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 删除
-=======
@@ -748,515 +547,16 @@
->>>>>>> 6b66ea0276198dd5eb24cd6f115f6e164cbd7df3
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/collectionForm.vue b/SC-web/src/views/scm/basicInformation/saleorder/collectionForm.vue
deleted file mode 100644
index 2c3dc9d4..00000000
--- a/SC-web/src/views/scm/basicInformation/saleorder/collectionForm.vue
+++ /dev/null
@@ -1,400 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/index.vue b/SC-web/src/views/scm/basicInformation/saleorder/index.vue
index 2840360d..e6ac4555 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/index.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/index.vue
@@ -1,485 +1,386 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
- 重置
-
-
-
-
-
diff --git a/SC-web/src/views/scm/basicInformation/collection/Detail.vue b/SC-web/src/views/scm/basicInformation/collection/Detail.vue
index b264ff0f..deaef486 100644
--- a/SC-web/src/views/scm/basicInformation/collection/Detail.vue
+++ b/SC-web/src/views/scm/basicInformation/collection/Detail.vue
@@ -7,67 +7,61 @@
-
-
-
- {{ scope.row.currency | dynamicText(currencyOptions) }}
-
-
-
-
- {{ scope.row.status | dynamicText(statusOptions) }}
-
-
-
-
- 编辑
-
- 删除
-
- 详情
-
-
-
-
-
+
-
-
- 新增
-
- 导出
-
- 批量删除
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+ {{ scope.row.currency | dynamicText(currencyOptions) }}
+
+
+
+
+
+ {{ scope.row.status | dynamicText(statusOptions) }}
+
+
+
+
+
+ 编辑
+
+
+
+
+
+
+ 撤回申请
+
+ 审核
+
+ 弃审
+
+ 提交
+
+
+
+
+
+
-
+ 新增
+
+
+
+
+
+ 编辑
+
+ 查看
+
+ 审核
+
+ 弃审
+
+ 提交
+
+
+
+
+
+
+
{{dataForm.documentNo}}
{{dataForm.customerId}}
+{{dataForm.customerName}}
{{dataForm.contractId}}
-{{dataForm.amountCollected}}
{{dataForm.collectionCount}}
{{dataForm.collectionBank}}
{{ dataForm.paymentType | dynamicText(paymentTypeOptions) }}
{{ dataForm.currency | dynamicText(currencyOptions) }}
{{ dataForm.settlementType | dynamicText(settlementTypeOptions) }}
{{dataForm.remark}}
{{ dataForm.status | dynamicText(statusOptions) }}
{{dataForm.creatorUserName}}
{{scope.row.amount}}
{{scope.row.price}}
+{{scope.row.creatorUserId}}
{{scope.row.amountCollected}}
+{{scope.row.creatorUserName}}
{{scope.row.salesorderId}}
+{{scope.row.deleteTime}}
{{scope.row.contractCode}}
+{{scope.row.lastModifyUserId}}
{{scope.row.num}}
+{{scope.row.lastModifyUserName}}
{{scope.row.advanceAmount}}
+{{ scope.row.taxRate | dynamicText(taxRateOptions) }}
{{scope.row.rate}}
+{{scope.row.lastModifyTime}}
{{scope.row.notPrice}}
+{{scope.row.deleteUserId}}
+ +{{scope.row.deleteUserName}}
-<<<<<<< HEAD
-
-
-
-
diff --git a/SC-web/src/views/scm/basicInformation/receiptout/Detail.vue b/SC-web/src/views/scm/basicInformation/receiptout/Detail.vue
index 5b2a28b1..410ead96 100644
--- a/SC-web/src/views/scm/basicInformation/receiptout/Detail.vue
+++ b/SC-web/src/views/scm/basicInformation/receiptout/Detail.vue
@@ -20,8 +20,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
- 重置
-
-
-
-
-
-
-
-
-
- {{ scope.row.advance | dynamicText(advanceOptions) }}
-
-
-
-
- {{ scope.row.unit | dynamicText(unitOptions) }}
-
-
-
-
-
-
- ![]()
- ![]()
-
-
-
-
-
-
-
-
- ![]()
- ![]()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 编辑
-
- 删除
-
- 详情
-
-
-
-
-
-
-
-
- 新增
-
- 导出
-
- 批量删除
-
- 生成销售
-
-
-
-
-
-
- {{dataForm.salesId}}
+ prop="sourceNo" > +{{dataForm.sourceNo}}
{{dataForm.num}}
{{dataForm.customerId}}
-{{dataForm.customerName}}
+
-
-
+
+
+
{{scope.row.vehicleId}}
+{{scope.row.licenseNo}}
{{scope.row.materialId}}
+{{scope.row.materialName}}
{{scope.row.reservoirareaId}}
{{scope.row.warehouseId}}
@@ -131,9 +131,9 @@{{scope.row.batchNo}}
{{ scope.row.poundType | dynamicText(poundTypeOptions) }}
+{{ scope.row.deleteUserId | dynamicText(deleteUserIdOptions) }}
+
+
+
+ 添加
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-=======
->>>>>>> 6b66ea0276198dd5eb24cd6f115f6e164cbd7df3
-
-
-
-
-
-
+
+
+
+
+
+
>>>>>> 6b66ea0276198dd5eb24cd6f115f6e164cbd7df3
saleback_item0licenseNumcolumnOptions: [{
"label": "车牌号",
@@ -359,7 +313,6 @@
"fullName": "其他",
"id": "1"
}],
- jg_salesback_item0businessIdcolumnOptions:[ {"label":"人员名称","value":"F_RealName"}, {"label":"人员职位","value":"F_FullName"},],
}
},
computed: {},
@@ -370,24 +323,6 @@
popupSelectChange2(a, b){
var excludeFields = [];
for (let i = 0; i < this.dataForm.saleback_item0List.length; i++) {
-<<<<<<< HEAD
- excludeFields.push(this.dataForm.saleback_item0List[i].vehicleId);
- if(a == this.dataForm.saleback_item0List[i].vehicleId){
- this.dataForm.saleback_item0List[i].materialId = b.material_id;
- this.dataForm.saleback_item0List[i].settlement = b.settlement;
- this.dataForm.saleback_item0List[i].unit = b.unit;
- this.dataForm.saleback_item0List[i].price = b.sales_price;
- this.dataForm.saleback_item0List[i].rate = b.rate;
- this.dataForm.saleback_item0List[i].amount = b.sales_price * b.settlement;
- this.dataForm.saleback_item0List[i].pountUser = b.business_id;
- this.dataForm.saleback_item0List[i].pountType = b.pound_type;
- this.dataForm.saleback_item0List[i].businessId = b.business_id;
- this.rateOptions.find((item) => {
- if (this.dataForm.saleback_item0List[i].rate == item.id) {
- this.dataForm.saleback_item0List[i].notAmount = this.dataForm.saleback_item0List[i].amount*item.fullName/100
- }
- })
-=======
excludeFields.push(this.dataForm.saleback_item0List[i].licenseNo);
if(a == this.dataForm.saleback_item0List[i].licenseNum){
this.dataForm.saleback_item0List[i].materialName = b.material_name;
@@ -399,10 +334,8 @@
this.dataForm.saleback_item0List[i].notAmount = b.not_amount;
this.dataForm.saleback_item0List[i].pountUser = b.pound_user;
this.dataForm.saleback_item0List[i].pountType = b.pound_type;
->>>>>>> 6b66ea0276198dd5eb24cd6f115f6e164cbd7df3
}
}
- let price =
this.excludeFields = excludeFields;
},
popupSelectChange(e,d){
@@ -440,7 +373,6 @@
url: '/api/saleback/Saleback/' + this.dataForm.id,
method: 'get'
}).then(res => {
- debugger
this.dataInfo(res.data)
this.loading = false
});
@@ -515,8 +447,8 @@
},
dataList() {
var _data = JSON.parse(JSON.stringify(this.dataForm));
- // _data.jg_salesorder.contractName = _data.jnpf_jg_salesorder_jnpf_contractName
- // _data.jg_salesorder.costomerName = _data.jnpf_jg_salesorder_jnpf_costomerName
+ _data.jg_salesorder.contractName = _data.jnpf_jg_salesorder_jnpf_contractName
+ _data.jg_salesorder.costomerName = _data.jnpf_jg_salesorder_jnpf_costomerName
for (let i = 0; i < _data.saleback_item0List.length; i++) {
var _list = _data.saleback_item0List[i];
}
@@ -524,14 +456,12 @@
},
dataInfo(dataAll) {
let _dataAll = dataAll
- debugger
- // _dataAll.jnpf_jg_salesorder_jnpf_contractName = _dataAll.jg_salesorder.contractName
- // _dataAll.jnpf_jg_salesorder_jnpf_costomerName = _dataAll.jg_salesorder.costomerName
+ _dataAll.jnpf_jg_salesorder_jnpf_contractName = _dataAll.jg_salesorder.contractName
+ _dataAll.jnpf_jg_salesorder_jnpf_costomerName = _dataAll.jg_salesorder.costomerName
for (let i = 0; i < _dataAll.saleback_item0List.length; i++) {
var _list = _dataAll.saleback_item0List[i];
}
this.dataForm = _dataAll
- debugger
},
},
}
diff --git a/SC-web/src/views/scm/basicInformation/saleback/index.vue b/SC-web/src/views/scm/basicInformation/saleback/index.vue
index fc5463bb..9c0cebb7 100644
--- a/SC-web/src/views/scm/basicInformation/saleback/index.vue
+++ b/SC-web/src/views/scm/basicInformation/saleback/index.vue
@@ -42,10 +42,10 @@
/>
-
-
-
-
-
@@ -43,7 +37,7 @@
-
@@ -60,12 +54,18 @@
-
+
+
+
+
+
@@ -85,15 +85,15 @@
-
-
+
-
-
+
@@ -102,14 +102,8 @@
-
-
-
-
-
+
@@ -118,14 +112,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
-
+
-
@@ -128,11 +128,11 @@
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
- 重置
-
-
-
-
-
diff --git a/SC-web/src/views/scm/basicInformation/saleback/Detail.vue b/SC-web/src/views/scm/basicInformation/saleback/Detail.vue
index c263ac52..0712b4e6 100644
--- a/SC-web/src/views/scm/basicInformation/saleback/Detail.vue
+++ b/SC-web/src/views/scm/basicInformation/saleback/Detail.vue
@@ -7,80 +7,80 @@
-
-
-
- {{ scope.row.currency | dynamicText(currencyOptions) }}
-
-
-
-
- {{ scope.row.type | dynamicText(typeOptions) }}
-
-
-
-
- {{ scope.row.status | dynamicText(statusOptions) }}
-
-
-
-
- 编辑
-
- 删除
-
- 详情
-
-
-
-
-
+
-
-
- 新增
-
- 导出
-
- 批量删除
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+ {{ scope.row.currency | dynamicText(currencyOptions) }}
+
+
+
+
+ {{ scope.row.type | dynamicText(typeOptions) }}
+
+
+
+
+ {{ scope.row.status | dynamicText(statusOptions) }}
+
+
+
+
+ 编辑
+
+ 删除
+
+ 详情
+
+
+
+
+
+
-
+ 新增
+
+ 导出
+
+ 批量删除
+
+ 审核
+
+ 弃审
+
+
+
+
+
+
{{dataForm.documentNo}}
{{dataForm.salesOrderId}}
{{ dataForm.currency | dynamicText(currencyOptions) }}
{{dataForm.refundAmount}}
{{dataForm.refundNum}}
{{dataForm.remark}}
{{dataForm.jnpf_jg_salesorder_jnpf_contractName}}
+{{dataForm.jnpf_jg_salesorder_jnpf_costomerName}}
+{{dataForm.actualAmount}}
+{{ dataForm.status | dynamicText(statusOptions) }}
+{{dataForm.creatorTime}}
+{{dataForm.creatorUserName}}
+
@@ -88,14 +88,14 @@
{{scope.row.vehicleId}}
+{{scope.row.licenseNum}}
{{scope.row.materialId}}
+{{scope.row.materialName}}
{{scope.row.notAmount}}
{{scope.row.businessId}}
+{{scope.row.pountUser}}
-{{ scope.row.pountType | dynamicText(pountTypeOptions) }}
@@ -178,13 +178,13 @@ creatorTime : "", creatorUserName : "", saleback_item0List:[], - // jg_salesorder: - // { - // contractName:'', - // costomerName:'', - // }, - // jnpf_jg_salesorder_jnpf_contractName:'', - // jnpf_jg_salesorder_jnpf_costomerName:'', + jg_salesorder: + { + contractName:'', + costomerName:'', + }, + jnpf_jg_salesorder_jnpf_contractName:'', + jnpf_jg_salesorder_jnpf_costomerName:'', }, activeqkzogz:'0', currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}], @@ -204,13 +204,12 @@ methods: { dataInfo(dataAll){ let _dataAll =dataAll - // _dataAll.jnpf_jg_salesorder_jnpf_contractName = _dataAll.jg_salesorder.contractName - // _dataAll.jnpf_jg_salesorder_jnpf_costomerName = _dataAll.jg_salesorder.costomerName + _dataAll.jnpf_jg_salesorder_jnpf_contractName = _dataAll.jg_salesorder.contractName + _dataAll.jnpf_jg_salesorder_jnpf_costomerName = _dataAll.jg_salesorder.costomerName for(let i=0;i<_dataAll.saleback_item0List.length;i++){ var _list = _dataAll.saleback_item0List[i]; } this.dataForm = _dataAll - debugger }, init(id) { diff --git a/SC-web/src/views/scm/basicInformation/saleback/Form.vue b/SC-web/src/views/scm/basicInformation/saleback/Form.vue index 3d6d8d62..2bf6e5d9 100644 --- a/SC-web/src/views/scm/basicInformation/saleback/Form.vue +++ b/SC-web/src/views/scm/basicInformation/saleback/Form.vue @@ -64,37 +64,6 @@{{dataForm.contractId}}
-{{dataForm.customerId}}
+ prop="contractName" > +{{dataForm.contractName}}
{{dataForm.num}}
{{dataForm.notPrice}}
{{dataForm.remark}}
{{dataForm.costomerName}}
+{{ dataForm.status | dynamicText(statusOptions) }}
+{{ dataForm.sourceSystem | dynamicText(sourceSystemOptions) }}
{{dataForm.erpNo}}
+{{ dataForm.status | dynamicText(statusOptions) }}
{{dataForm.creatorUserName}}
{{dataForm.creatorTime}}
-{{scope.row.vehicleId}}
+{{scope.row.licenseNum}}
{{scope.row.materialId}}
+{{scope.row.materialName}}
{{ scope.row.advance | dynamicText(advanceOptions) }}
{{scope.row.unitPrice}}
@@ -173,11 +167,20 @@{{scope.row.noPrice}}
{{scope.row.remark}}
+{{scope.row.vehiclePictures}}
+ +{{jnpf.dateFormat(scope.row.issueDate)}}
{{scope.row.vehicleId}}
- -{{scope.row.materialId}}
+{{scope.row.num}}
{{scope.row.reservoirareaId}}
- -{{scope.row.warehouseId}}
- -{{scope.row.deliveryNum}}
- -{{ scope.row.unit | dynamicText(jnpf_jg_collection_jnpf_collectionCountOptions) }}
- -{{scope.row.price}}
- -{{ scope.row.rate | dynamicText(deleteUserNameOptions) }}
- -{{scope.row.amount}}
+
+
+ {{scope.row.rateAmount}}
+{{ scope.row.paymentType | dynamicText(paymentTypeOptions) }}
{{scope.row.batchNo}}
+{{scope.row.amountCollected}}
{{ scope.row.poundType | dynamicText(customerNameOptions) }}
+{{scope.row.remark}}
{{scope.row.invoiceCode}}
{{scope.row.involceAmount}}
+{{scope.row.invoiceQuantity}}
+{{ scope.row.invoiceStatus | dynamicText(invoiceStatusOptions) }}
{{jnpf.dateFormat(scope.row.invoiceDate)}}
+{{scope.row.creatorUserName}}
{{scope.row.creatorUserName}}
+{{jnpf.dateFormat(scope.row.invoiceDate)}}
-
-
- {{scope.row.documentNo}}
- -{{jnpf.dateFormat(scope.row.businessDate)}}
- -{{scope.row.amountCollected}}
- -{{ scope.row.paymentType | dynamicText(settlementTypeOptions) }}
- -{{scope.row.remark}}
- -{{scope.row.creatorUserName}}
- -{{scope.row.documentNo}}
-{{jnpf.dateFormat(scope.row.creatorTime)}}
-{{scope.row.refundAmount}}
{{scope.row.creatorUserName}}
+{{jnpf.dateFormat(scope.row.creatorTime)}}
{{scope.row.documentno}}
+{{ scope.row.settlementtype | dynamicText(settlementtypeOptions) }}
+{{scope.row.paymentamount}}
-{{ scope.row.settlementtype | dynamicText(settlementtypeOptions) }}
-
-
-
-
- 添加
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue b/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue
deleted file mode 100644
index 075c4211..00000000
--- a/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue
+++ /dev/null
@@ -1,562 +0,0 @@
-
-
-
-
-
- 添加
-
-
-
-
-
- 添加
-
-
-
-
-
- 添加
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/salebackForm.vue b/SC-web/src/views/scm/basicInformation/saleorder/salebackForm.vue
deleted file mode 100644
index 178d42d2..00000000
--- a/SC-web/src/views/scm/basicInformation/saleorder/salebackForm.vue
+++ /dev/null
@@ -1,461 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
- 重置
-
-
-
-
-
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue b/SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue
deleted file mode 100644
index f28ff883..00000000
--- a/SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue
+++ /dev/null
@@ -1,429 +0,0 @@
-
-
-
-
-
- {{ scope.row.currency | dynamicText(currencyOptions) }}
-
-
-
-
- {{ scope.row.status | dynamicText(statusOptions) }}
-
-
-
-
- 编辑
-
- 删除
-
- 详情
-
-
-
-
-
+
-
-
- 新增
-
- 导出
-
- 批量删除
-
- 发货
-
- 发票录入
-
- 回款
-
- 归档
-
- 退货
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+ {{ scope.row.currency | dynamicText(currencyOptions) }}
+
+
+
+
+ {{ scope.row.sourceSystem | dynamicText(sourceSystemOptions) }}
+
+
+
+
+ {{ scope.row.status | dynamicText(statusOptions) }}
+
+
+
+
+ 编辑
+
+ 删除
+
+ 详情
+
+
+
+
+
+
-
+ 新增
+
+ 导出
+
+ 批量删除
+
+ 发货
+
+ 发票录入
+
+ 回款
+
+ 归档
+
+ 退货
+
+
+
+
+
+
-
-
-
- 添加
-
-
-
-
-
- 添加
-
-