yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改前端

Browse Source
product
tengxi 2 years ago
parent 2107379337
commit 920b32a232
9 changed files with 412 additions and 311 deletions
Show Stats Download Patch File Download Diff File

3
SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/Saleback_item0Entity.java
Unescape View File

@ -104,4 +104,7 @@ public class Saleback_item0Entity {
@TableField("NOT_AMOUNT")
private BigDecimal notAmount;
@TableField("VEHICLE_ID")
private String vehicleId;
}

3
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderController.java
Unescape View File

@ -435,8 +435,9 @@ public class SaleorderController {
List<Salesorder_item0Entity> jg_salesorder_item0List = saleorderitemService.GetSalesorder_item0List(id);
List<Salesorder_item0Model> jg_salesorder_item0ModelList = JsonUtil.getJsonToList(jg_salesorder_item0List,Salesorder_item0Model.class);
for(Salesorder_item0Model jg_salesorder_item0Model : jg_salesorder_item0ModelList){
// Map<String,Object> licenseNumMap = new HashMap<>();
Map<String,Object> vehicleIdMap = new HashMap<>();
// jg_salesorder_item0Model.setLicenseNum(generaterSwapUtil.getPopupSelectValue("391151974030035653","license_no","license_no",jg_salesorder_item0Model.getLicenseNum(),licenseNumMap));
jg_salesorder_item0Model.setVehicleId(generaterSwapUtil.getPopupSelectValue("391151974030035653","vehicle_id","ticketno",jg_salesorder_item0Model.getVehicleId(),vehicleIdMap));
}
vo.setSalesorder_item0List(jg_salesorder_item0ModelList);
List<ReceiptoutsoitemEntity> jg_receiptoutList = saleorderitemService.GetReceiptoutsoitemList(id);

7
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java
Unescape View File

@ -72,8 +72,8 @@ public class Salesorder_item0Entity {
@TableField("POUNDLIST_ID")
private String poundlistId;
@TableField("LICENSE_NUM")
private String licenseNum;
// @TableField("LICENSE_NUM")
// private String licenseNum;
@TableField("MATERIAL_CODE")
private String materialCode;
@ -123,4 +123,7 @@ public class Salesorder_item0Entity {
@TableField("VEHICLE_PICTURES")
private String vehiclePictures;
@TableField("VEHICLE_ID")
private String vehicleId;
}

4
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/Salesorder_item0Model.java
Unescape View File

@ -70,5 +70,7 @@ public class Salesorder_item0Model {
@JsonProperty("vehiclePictures")
private String vehiclePictures;
/** id **/
@JsonProperty("vehicleId")
private String vehicleId;
}

63
SC-web/src/views/scm/basicInformation/collection/Form.vue
Unescape View File

@ -106,7 +106,7 @@
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.collection_item0List" size='mini' show-summary>
<el-table :data="dataForm.collection_item0List" size='mini' show-summary :summary-method="getSummaries">
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="amount" label="收款金额" align="center" >
<template slot-scope="scope">
@ -114,20 +114,20 @@
</el-input>
</template>
</el-table-column>
<el-table-column prop="creatorUserId" label="订单金额" align="center" >
<el-table-column prop="price" label="订单金额" align="center" >
<template slot-scope="scope">
<el-input v-model="scope.row.price" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="creatorUserName" label="已收款金额" align="center" >
<el-table-column prop="amountCollected" label="已收款金额" align="center" >
<template slot-scope="scope">
<el-input v-model="scope.row.amountCollected" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="deleteTime" label="销售订单编号" align="center" >
<el-table-column prop="coustomerCode" label="销售订单编号" align="center" >
<template slot-scope="scope">
<popupSelect v-model="scope.row.documentNo" placeholder="请选择" clearable
:field="'deleteTime'+scope.$index" interfaceId="393372436705378053"
@ -137,14 +137,14 @@
</popupSelect>
</template>
</el-table-column>
<el-table-column prop="lastModifyUserId" label="合同编号" align="center" >
<el-table-column prop="contractCode" label="合同编号" align="center" >
<template slot-scope="scope">
<el-input v-model="scope.row.contractCode" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="lastModifyUserName" label="数量" align="center" >
<el-table-column prop="num" label="数量" align="center" >
<template slot-scope="scope">
<el-input v-model="scope.row.num" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
@ -158,20 +158,20 @@
<!-- </el-select>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="lastModifyTime" label="垫资金额" align="center" >
<el-table-column prop="advanceAmount" label="垫资金额" align="center" >
<template slot-scope="scope">
<el-input v-model="scope.row.advanceAmount" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="deleteUserId" label="税额" align="center" >
<el-table-column prop="rate" label="税额" align="center" >
<template slot-scope="scope">
<el-input v-model="scope.row.rate" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="deleteUserName" label="不含税金额" align="center" >
<el-table-column prop="notPrice" label="不含税金额" align="center" >
<template slot-scope="scope">
<el-input v-model="scope.row.notPrice" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
@ -219,6 +219,7 @@
export default {
components: {},
props: [],
data() {
return {
visible: false,
@ -365,10 +366,26 @@
}
},
computed: {},
watch: {},
watch: {
dataForm: {
deep: true,
handler: function() {
this.popupnum()
}
}
},
created() {},
mounted() {},
methods: {
popupnum() {
let amount = 0
for (let i = 0; i < this.dataForm.collection_item0List.length; i++) {
amount = amount + parseFloat(this.dataForm.collection_item0List[i].amount);
}
parseFloat(this.dataForm.amountCollected = amount)
},
popupSelect(e, d) {
this.dataForm.customerCode = d.id;
},
@ -387,6 +404,32 @@
}
}
},
getSummaries(param) {
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计';
return;
}
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value)) && (index === 1 || index === 2 || index === 3 || index === 6|| index === 7|| index === 8 || index === 9 )) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
} else {
sums[index] = '';
}
});
return sums;
},
collection_item0Exist() {
let isOk = true;
for (let i = 0; i < this.dataForm.collection_item0List.length; i++) {

2
SC-web/src/views/scm/basicInformation/collection/index.vue
Unescape View File

@ -387,6 +387,7 @@
}
});
})
}
if (this.multipleSelection.length > 1) {
this.$message({
type: 'error',
@ -394,7 +395,6 @@
duration: 1500
})
}
}
},
addOrUpdateHandle(id, isDetail) {
this.formVisible = true

9
SC-web/src/views/scm/basicInformation/payment/Form.vue
Unescape View File

@ -174,26 +174,26 @@
</el-input>
</template>
</el-table-column>
<el-table-column prop="deleteUserId" label="重量" align="center" >
<el-table-column prop="num" label="重量" align="center" >
<template slot-scope="scope">
<el-input v-model="scope.row.num" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="deleteTime" label="垫资金额" align="center" >
<el-table-column prop="advanceAmount" label="垫资金额" align="center" >
<template slot-scope="scope">
<el-input v-model="scope.row.advanceAmount" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="orgnizeId" label="税额" align="center" >
<el-table-column prop="rate" label="税额" align="center" >
<template slot-scope="scope">
<el-input v-model="scope.row.rate" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="departmentId" label="不含税金额" align="center" >
<el-table-column prop="notAmount" label="不含税金额" align="center" >
<template slot-scope="scope">
<el-input v-model="scope.row.notAmount" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
@ -341,7 +341,6 @@
dataForm: {
deep: true,
handler: function() {
this.popupSelect()
}
}

32
SC-web/src/views/scm/basicInformation/saleback/Form.vue
Unescape View File

@ -64,14 +64,24 @@
</div>
<el-table :data="dataForm.saleback_item0List" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="licenseNum" label="车牌号">
<!-- <el-table-column prop="licenseNum" label="车牌号">-->
<!-- <template slot-scope="scope">-->
<!-- <popupSelect v-model="scope.row.licenseNum" placeholder="请选择"-->
<!-- clearable :field="'licenseNum'+scope.$index"-->
<!-- interfaceId="383568082196537541" :bissId="dataForm.salesOrderId" :excludeFields="excludeFields"-->
<!-- :columnOptions="saleback_item0licenseNumcolumnOptions"-->
<!-- propsValue="license_num" relationField="license_num"-->
<!-- popupType="dialog" popupWidth="800px" @change="popupSelectChange2">-->
<!-- </popupSelect>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="vehicleId" label="车辆ID">
<template slot-scope="scope">
<popupSelect v-model="scope.row.licenseNum" placeholder="请选择"
clearable :field="'licenseNum'+scope.$index"
interfaceId="383568082196537541" :bissId="dataForm.salesOrderId" :excludeFields="excludeFields"
:columnOptions="saleback_item0licenseNumcolumnOptions"
propsValue="license_num" relationField="license_num"
popupType="dialog" popupWidth="800px" @change="popupSelectChange2">
<popupSelect v-model="scope.row.vehicleId"
placeholder="请选择" clearable :field="'vehicleId'+scope.$index" interfaceId="383568082196537541"
:columnOptions="salesback_item0vehicleIdcolumnOptions" propsValue="vehicle_id"
relationField="ticketno" popupType="dialog"
popupWidth="800px">
</popupSelect>
</template>
</el-table-column>
@ -249,9 +259,9 @@
"id": "2"
}],
saleback_item0licenseNumcolumnOptions: [{
salesback_item0vehicleIdcolumnOptions: [{
"label": "车牌号",
"value": "license_num"
"value": "ticketno"
}, {
"label": "物料名称",
"value": "material_name"
@ -323,8 +333,8 @@
popupSelectChange2(a, b){
var excludeFields = [];
for (let i = 0; i < this.dataForm.saleback_item0List.length; i++) {
excludeFields.push(this.dataForm.saleback_item0List[i].licenseNo);
if(a == this.dataForm.saleback_item0List[i].licenseNum){
excludeFields.push(this.dataForm.saleback_item0List[i].vehicleId);
if(a == this.dataForm.saleback_item0List[i].vehicleId){
this.dataForm.saleback_item0List[i].materialName = b.material_name;
this.dataForm.saleback_item0List[i].settlement = b.settlement;
this.dataForm.saleback_item0List[i].unit = b.unit;

506
SC-web/src/views/scm/basicInformation/saleorder/Form.vue
Unescape View File

@ -14,7 +14,8 @@
<el-col :span="8">
<el-form-item label="合同名称" prop="contractName">
<popupSelect v-model="dataForm.contractName" placeholder="请选择" clearable field="contractName"
interfaceId="391146878474963333" :columnOptions="contractNamecolumnOptions" propsValue="contract_name"
interfaceId="391146878474963333" :columnOptions="contractNamecolumnOptions"
propsValue="contract_name"
relationField="contract_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
@change="popupSelectChange">
@ -135,17 +136,30 @@
</div>
<el-table :data="dataForm.salesorder_item0List" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center"/>
<el-table-column prop="licenseNum" label="车牌号">
<template slot-scope="scope">
<popupSelect v-model="scope.row.licenseNum" placeholder="请选择" clearable
:field="'licenseNum'+scope.$index" interfaceId="391151974030035653"
:bissId="dataForm.contractCode" :columnOptions="salesorder_item0licenseNumcolumnOptions"
propsValue="license_no" relationField="license_no" popupType="dialog"
@change="popupSelectChange2" popupWidth="800px">
<!-- <el-table-column prop="licenseNum" label="车牌号">-->
<!-- <template slot-scope="scope">-->
<!-- <popupSelect v-model="scope.row.licenseNum" placeholder="请选择" clearable-->
<!-- :field="'licenseNum'+scope.$index" interfaceId="391151974030035653"-->
<!-- :bissId="dataForm.contractCode" :columnOptions="salesorder_item0licenseNumcolumnOptions"-->
<!-- propsValue="license_no" relationField="license_no" popupType="dialog"-->
<!-- @change="popupSelectChange2" popupWidth="800px">-->
<!-- </popupSelect>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="vehicleId" label="车辆ID">
<template slot-scope="scope">
<popupSelect v-model="scope.row.vehicleId"
placeholder="请选择" clearable :field="'vehicleId'+scope.$index"
interfaceId="391151974030035653" :bissId="dataForm.contractCode"
:columnOptions="salesorder_item0vehicleIdcolumnOptions" propsValue="vehicle_id"
relationField="ticketno" popupType="dialog"
popupWidth="800px" @change="popupSelectChange2">
</popupSelect>
</template>
</el-table-column>
<el-table-column prop="materialName" label="物料名称">
<template slot-scope="scope">
<el-input v-model="scope.row.materialName" placeholder="请输入" clearable
@ -237,7 +251,8 @@
<el-table-column label="操作" width="50">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delsalesorder_item0List(scope.$index)">删除</el-button>
@click="delsalesorder_item0List(scope.$index)">删除
</el-button>
</template>
</el-table-column>
</el-table>
@ -265,7 +280,8 @@
<el-table-column prop="issueDate" label="出库日期 ">
<template slot-scope="scope">
<el-date-picker v-model="scope.row.issueDate" placeholder="请选择" clearable
:style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">
:style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
value-format="timestamp">
</el-date-picker>
</template>
</el-table-column>
@ -284,7 +300,8 @@
<el-table-column label="操作" width="50">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delreceiptoutsoitemList(scope.$index)">删除</el-button>
@click="delreceiptoutsoitemList(scope.$index)">删除
</el-button>
</template>
</el-table-column>
</el-table>
@ -327,7 +344,8 @@
<el-table-column label="操作" width="50">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delcollectionsoitemList(scope.$index)">删除</el-button>
@click="delcollectionsoitemList(scope.$index)">删除
</el-button>
</template>
</el-table-column>
</el-table>
@ -412,7 +430,8 @@
<el-table-column prop="invoiceDate" label="开票日期">
<template slot-scope="scope">
<el-date-picker v-model="scope.row.invoiceDate" placeholder="请选择" clearable
:style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">
:style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
value-format="timestamp">
</el-date-picker>
</template>
</el-table-column>
@ -426,7 +445,8 @@
<el-table-column label="操作" width="50">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delarinvoices_item0soitemList(scope.$index)">删除</el-button>
@click="delarinvoices_item0soitemList(scope.$index)">删除
</el-button>
</template>
</el-table-column>
</el-table>
@ -469,14 +489,16 @@
<el-table-column prop="creatorTime" label="退货日期">
<template slot-scope="scope">
<el-date-picker v-model="scope.row.creatorTime" placeholder="请选择" clearable
:style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">
:style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
value-format="timestamp">
</el-date-picker>
</template>
</el-table-column>
<el-table-column label="操作" width="50">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delsalesbacksoitemList(scope.$index)">删除</el-button>
@click="delsalesbacksoitemList(scope.$index)">删除
</el-button>
</template>
</el-table-column>
</el-table>
@ -513,7 +535,8 @@
<el-table-column prop="duedate" label="付款日期">
<template slot-scope="scope">
<el-date-picker v-model="scope.row.duedate" placeholder="请选择" clearable
:style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">
:style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
value-format="timestamp">
</el-date-picker>
</template>
</el-table-column>
@ -533,7 +556,8 @@
<el-table-column label="操作" width="50">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delpaymentsoitemList(scope.$index)">删除</el-button>
@click="delpaymentsoitemList(scope.$index)">删除
</el-button>
</template>
</el-table-column>
</el-table>
@ -564,6 +588,7 @@
import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
export default {
components: {},
props: [],
@ -574,8 +599,8 @@
isDetail: false,
dataForm: {
documentNo: '',
contractName: "",
currency: "0",
contractName: '',
currency: '0',
contractNo: '',
advanceAmount: '',
num: '',
@ -586,15 +611,15 @@
amountCollected: '',
invoiceNum: '',
invoiceAmount: '',
sourceSystem: "0",
status: "0",
creatorUserName: "",
sourceSystem: '0',
status: '0',
creatorUserName: '',
salesorder_item0List: [],
receiptoutsoitemList: [],
collectionsoitemList: [],
arinvoices_item0soitemList: [],
salesbacksoitemList: [],
paymentsoitemList: [],
paymentsoitemList: []
},
activexvlbvm: '0',
rules: {
@ -602,287 +627,301 @@
required: true,
message: '请选择',
trigger: 'change'
}, ],
}]
},
contractNamecolumnOptions: [{
"label": "合同编码",
"value": "contract_code"
'label': '合同编码',
'value': 'contract_code'
}, {
"label": "合同名称",
"value": "contract_name"
'label': '合同名称',
'value': 'contract_name'
}, {
"label": "合同类型",
"value": "contract_type"
'label': '合同类型',
'value': 'contract_type'
}, {
"label": "供应商/客户名称",
"value": "name"
}, ],
'label': '供应商/客户名称',
'value': 'name'
}],
currencyOptions: [{
"fullName": "人民币",
"id": "0"
'fullName': '人民币',
'id': '0'
}, {
"fullName": "美元",
"id": "1"
'fullName': '美元',
'id': '1'
}, {
"fullName": "英镑",
"id": "2"
'fullName': '英镑',
'id': '2'
}],
sourceSystemOptions: [{
"fullName": "人工创建",
"id": "0"
'fullName': '人工创建',
'id': '0'
}, {
"fullName": "商城平台",
"id": "1"
'fullName': '商城平台',
'id': '1'
}],
statusOptions: [{
"fullName": "已保存",
"id": "0"
'fullName': '已保存',
'id': '0'
}, {
"fullName": "开票中",
"id": "1"
'fullName': '开票中',
'id': '1'
}, {
"fullName": "付款申请",
"id": "2"
'fullName': '付款申请',
'id': '2'
}, {
"fullName": "待回款",
"id": "3"
'fullName': '待回款',
'id': '3'
}, {
"fullName": "回款中",
"id": "4"
'fullName': '回款中',
'id': '4'
}, {
"fullName": "归档",
"id": "5"
'fullName': '归档',
'id': '5'
}],
salesorder_item0licenseNumcolumnOptions: [{
"label": "车牌号",
"value": "license_no"
}, {
"label": "物料名称",
"value": "material_name"
}, {
"label": "磅单类型",
"value": "pound_type"
}, {
"label": "净重",
"value": "net_weight"
},
{
"label": "计量单位",
"value": "unit"
}, {
"label": "是否垫资",
"value": "advance"
}, {
"label": "销售单价",
"value": "sales_price"
},
{
"label": "结算重量",
"value": "settlement"
}, {
"label": "税率",
"value": "rate"
}, {
"label": "备注",
"value": "remark"
},
{
"label": "磅单图片",
"value": "pound_pictures"
}, {
"label": "车辆图片",
"value": "vehicle_pictures"
},
],
salesorder_item0vehicleIdcolumnOptions: [{ 'label': '车牌号', 'value': 'ticketno' }, {
'label': '物料名称',
'value': 'materialName'
}, { 'label': '结算重量', 'value': 'settlement' }, { 'label': '计量单位', 'value': 'unit' }, {
'label': '采购单价',
'value': 'sales_price'
}, { 'label': '税率', 'value': 'rate' }, { 'label': '应退金额', 'value': 'price' }, {
'label': '税额',
'value': 'no_price'
}, { 'label': '业务员', 'value': 'pound_user' }, { 'label': '磅单类型', 'value': 'pound_type' }],
// salesorder_item0licenseNumcolumnOptions: [{
// 'label': '车牌号',
// 'value': 'license_no'
// }, {
// 'label': '物料名称',
// 'value': 'material_name'
// }, {
// 'label': '磅单类型',
// 'value': 'pound_type'
// }, {
// 'label': '净重',
// 'value': 'net_weight'
// },
// {
// 'label': '计量单位',
// 'value': 'unit'
// }, {
// 'label': '是否垫资',
// 'value': 'advance'
// }, {
// 'label': '销售单价',
// 'value': 'sales_price'
// },
// {
// 'label': '结算重量',
// 'value': 'settlement'
// }, {
// 'label': '税率',
// 'value': 'rate'
// }, {
// 'label': '备注',
// 'value': 'remark'
// },
// {
// 'label': '磅单图片',
// 'value': 'pound_pictures'
// }, {
// 'label': '车辆图片',
// 'value': 'vehicle_pictures'
// }
// ],
poundTypeOptions: [{
"fullName": "贸易",
"id": "0"
'fullName': '贸易',
'id': '0'
}, {
"fullName": "其他",
"id": "1"
'fullName': '其他',
'id': '1'
}],
unitOptions: [{
"fullName": "吨",
"id": "0"
'fullName': '吨',
'id': '0'
}, {
"fullName": "千克",
"id": "1"
'fullName': '千克',
'id': '1'
}],
advanceOptions: [{
"fullName": "否",
"id": "0"
'fullName': '否',
'id': '0'
}, {
"fullName": "是",
"id": "1"
'fullName': '是',
'id': '1'
}],
rateOptions: [{
"fullName": "13",
"id": "0"
'fullName': '13',
'id': '0'
}, {
"fullName": "9",
"id": "1"
'fullName': '9',
'id': '1'
}, {
"fullName": "6",
"id": "2"
'fullName': '6',
'id': '2'
}, {
"fullName": "5",
"id": "3"
'fullName': '5',
'id': '3'
}, {
"fullName": "3",
"id": "4"
'fullName': '3',
'id': '4'
}, {
"fullName": "0",
"id": "5"
'fullName': '0',
'id': '5'
}],
paymentTypeOptions: [{
"fullName": "贷款",
"id": "0"
'fullName': '贷款',
'id': '0'
}, {
"fullName": "运费",
"id": "1"
'fullName': '运费',
'id': '1'
}, {
"fullName": "仓储",
"id": "2"
'fullName': '仓储',
'id': '2'
}],
taxRateOptions: [{
"fullName": "13",
"id": "0"
'fullName': '13',
'id': '0'
}, {
"fullName": "9",
"id": "1"
'fullName': '9',
'id': '1'
}, {
"fullName": "6",
"id": "2"
'fullName': '6',
'id': '2'
}, {
"fullName": "5",
"id": "3"
'fullName': '5',
'id': '3'
}, {
"fullName": "3",
"id": "4"
'fullName': '3',
'id': '4'
}, {
"fullName": "0",
"id": "5"
'fullName': '0',
'id': '5'
}],
invoiceStatusOptions: [{
"fullName": "正常",
"id": "0"
'fullName': '正常',
'id': '0'
}, {
"fullName": "红冲",
"id": "1"
'fullName': '红冲',
'id': '1'
}, {
"fullName": "作废",
"id": "2"
'fullName': '作废',
'id': '2'
}],
settlementtypeOptions: [{
"fullName": "现金",
"id": "0"
'fullName': '现金',
'id': '0'
}, {
"fullName": "赊购",
"id": "1"
'fullName': '赊购',
'id': '1'
}, {
"fullName": "网银",
"id": "2"
'fullName': '网银',
'id': '2'
}, {
"fullName": "银企直连",
"id": "3"
'fullName': '银企直连',
'id': '3'
}, {
"fullName": "银票",
"id": "4"
'fullName': '银票',
'id': '4'
}, {
"fullName": "商票",
"id": "5"
}],
'fullName': '商票',
'id': '5'
}]
}
},
computed: {},
watch: {},
created() {},
mounted() {},
created() {
},
mounted() {
},
methods: {
popupSelectChange(e, d) {
this.dataForm.costomerName = d.name;
this.dataForm.contractCode = d.contract_code;
this.dataForm.costomerName = d.name
this.dataForm.contractCode = d.contract_code
},
popupSelectChange2(a, b) {
let settlementSum = 0;
var excludeFields = []
let settlementSum = 0
for (let i = 0; i < this.dataForm.salesorder_item0List.length; i++) {
if (a == this.dataForm.salesorder_item0List[i].licenseNum) {
this.dataForm.salesorder_item0List[i].materialName = b.material_name;
this.dataForm.salesorder_item0List[i].settlement = b.settlement;
this.dataForm.salesorder_item0List[i].netWeight = b.net_weight;
this.dataForm.salesorder_item0List[i].unit = b.unit;
this.dataForm.salesorder_item0List[i].advance = b.advance;
this.dataForm.salesorder_item0List[i].rate = b.rate;
this.dataForm.salesorder_item0List[i].remark = b.remark;
this.dataForm.salesorder_item0List[i].poundPictures = b.pound_pictures;
this.dataForm.salesorder_item0List[i].vehiclePictures = b.vehicle_pictures;
this.dataForm.salesorder_item0List[i].poundType = b.pound_type;
this.dataForm.salesorder_item0List[i].unitPrice = b.sales_price;
settlementSum = settlementSum + settlement;
excludeFields.push(this.dataForm.salesorder_item0List[i].vehicleId)
if (a == this.dataForm.salesorder_item0List[i].vehicleId) {
this.dataForm.salesorder_item0List[i].materialName = b.materialName
this.dataForm.salesorder_item0List[i].settlement = b.settlement
this.dataForm.salesorder_item0List[i].netWeight = b.net_weight
this.dataForm.salesorder_item0List[i].unit = b.unit
this.dataForm.salesorder_item0List[i].advance = b.advance
this.dataForm.salesorder_item0List[i].rate = b.rate
this.dataForm.salesorder_item0List[i].remark = b.remark
this.dataForm.salesorder_item0List[i].poundPictures = b.pound_pictures
this.dataForm.salesorder_item0List[i].vehiclePictures = b.vehicle_pictures
this.dataForm.salesorder_item0List[i].poundType = b.pound_type
this.dataForm.salesorder_item0List[i].unitPrice = b.sales_price
settlementSum = settlementSum + settlement
}
}
this.dataForm.num = settlementSum;
this.dataForm.num = settlementSum
this.excludeFields = excludeFields
},
salesorder_item0Exist() {
let isOk = true;
let isOk = true
for (let i = 0; i < this.dataForm.salesorder_item0List.length; i++) {
const e = this.dataForm.salesorder_item0List[i];
const e = this.dataForm.salesorder_item0List[i]
}
return isOk;
return isOk
},
receiptoutsoitemExist() {
let isOk = true;
let isOk = true
for (let i = 0; i < this.dataForm.receiptoutsoitemList.length; i++) {
const e = this.dataForm.receiptoutsoitemList[i];
const e = this.dataForm.receiptoutsoitemList[i]
}
return isOk;
return isOk
},
collectionsoitemExist() {
let isOk = true;
let isOk = true
for (let i = 0; i < this.dataForm.collectionsoitemList.length; i++) {
const e = this.dataForm.collectionsoitemList[i];
const e = this.dataForm.collectionsoitemList[i]
}
return isOk;
return isOk
},
arinvoices_item0soitemExist() {
let isOk = true;
let isOk = true
for (let i = 0; i < this.dataForm.arinvoices_item0soitemList.length; i++) {
const e = this.dataForm.arinvoices_item0soitemList[i];
const e = this.dataForm.arinvoices_item0soitemList[i]
}
return isOk;
return isOk
},
salesbacksoitemExist() {
let isOk = true;
let isOk = true
for (let i = 0; i < this.dataForm.salesbacksoitemList.length; i++) {
const e = this.dataForm.salesbacksoitemList[i];
const e = this.dataForm.salesbacksoitemList[i]
}
return isOk;
return isOk
},
paymentsoitemExist() {
let isOk = true;
let isOk = true
for (let i = 0; i < this.dataForm.paymentsoitemList.length; i++) {
const e = this.dataForm.paymentsoitemList[i];
const e = this.dataForm.paymentsoitemList[i]
}
return isOk;
return isOk
},
clearData(data) {
for (let key in data) {
if (data[key] instanceof Array) {
data[key] = [];
data[key] = []
} else if (data[key] instanceof Object) {
this.clearData(data[key]);
this.clearData(data[key])
} else {
data[key] = "";
data[key] = ''
}
}
},
init(id, isDetail) {
this.dataForm.id = id || 0;
this.visible = true;
this.isDetail = isDetail || false;
this.dataForm.id = id || 0
this.visible = true
this.isDetail = isDetail || false
this.$nextTick(() => {
this.$refs['elForm'].resetFields();
this.$refs['elForm'].resetFields()
if (this.dataForm.id) {
this.loading = true
request({
@ -891,11 +930,11 @@
}).then(res => {
this.dataInfo(res.data)
this.loading = false
});
})
} else {
this.clearData(this.dataForm)
}
});
})
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
},
// 表单提交
@ -950,6 +989,7 @@
},
addsalesorder_item0List() {
let item = {
vehicleId: undefined,
licenseNum: undefined,
materialName: undefined,
poundType: undefined,
@ -962,35 +1002,35 @@
price: undefined,
noPrice: undefined,
poundPictures: undefined,
vehiclePictures: undefined,
vehiclePictures: undefined
}
this.dataForm.salesorder_item0List.push(item)
},
delsalesorder_item0List(index) {
this.dataForm.salesorder_item0List.splice(index, 1);
this.dataForm.salesorder_item0List.splice(index, 1)
},
addreceiptoutsoitemList() {
let item = {
documentNo: undefined,
issueDate: undefined,
num: undefined,
amount: undefined,
amount: undefined
}
this.dataForm.receiptoutsoitemList.push(item)
},
delreceiptoutsoitemList(index) {
this.dataForm.receiptoutsoitemList.splice(index, 1);
this.dataForm.receiptoutsoitemList.splice(index, 1)
},
addcollectionsoitemList() {
let item = {
paymentType: undefined,
amountCollected: undefined,
remark: undefined,
remark: undefined
}
this.dataForm.collectionsoitemList.push(item)
},
delcollectionsoitemList(index) {
this.dataForm.collectionsoitemList.splice(index, 1);
this.dataForm.collectionsoitemList.splice(index, 1)
},
addarinvoices_item0soitemList() {
let item = {
@ -1004,24 +1044,24 @@
invoiceStatus: undefined,
creatorUserName: undefined,
invoiceDate: undefined,
attachMent: undefined,
attachMent: undefined
}
this.dataForm.arinvoices_item0soitemList.push(item)
},
delarinvoices_item0soitemList(index) {
this.dataForm.arinvoices_item0soitemList.splice(index, 1);
this.dataForm.arinvoices_item0soitemList.splice(index, 1)
},
addsalesbacksoitemList() {
let item = {
documentNo: undefined,
refundNum: undefined,
refundAmount: undefined,
creatorTime: undefined,
creatorTime: undefined
}
this.dataForm.salesbacksoitemList.push(item)
},
delsalesbacksoitemList(index) {
this.dataForm.salesbacksoitemList.splice(index, 1);
this.dataForm.salesbacksoitemList.splice(index, 1)
},
addpaymentsoitemList() {
let item = {
@ -1029,59 +1069,59 @@
settlementtype: undefined,
duedate: undefined,
paymentamount: undefined,
remark: undefined,
remark: undefined
}
this.dataForm.paymentsoitemList.push(item)
},
delpaymentsoitemList(index) {
this.dataForm.paymentsoitemList.splice(index, 1);
this.dataForm.paymentsoitemList.splice(index, 1)
},
dataList() {
var _data = JSON.parse(JSON.stringify(this.dataForm));
var _data = JSON.parse(JSON.stringify(this.dataForm))
for (let i = 0; i < _data.salesorder_item0List.length; i++) {
var _list = _data.salesorder_item0List[i];
var _list = _data.salesorder_item0List[i]
}
for (let i = 0; i < _data.receiptoutsoitemList.length; i++) {
var _list = _data.receiptoutsoitemList[i];
var _list = _data.receiptoutsoitemList[i]
}
for (let i = 0; i < _data.collectionsoitemList.length; i++) {
var _list = _data.collectionsoitemList[i];
var _list = _data.collectionsoitemList[i]
}
for (let i = 0; i < _data.arinvoices_item0soitemList.length; i++) {
var _list = _data.arinvoices_item0soitemList[i];
var _list = _data.arinvoices_item0soitemList[i]
_list.attachMent = JSON.stringify(_list.attachMent)
}
for (let i = 0; i < _data.salesbacksoitemList.length; i++) {
var _list = _data.salesbacksoitemList[i];
var _list = _data.salesbacksoitemList[i]
}
for (let i = 0; i < _data.paymentsoitemList.length; i++) {
var _list = _data.paymentsoitemList[i];
var _list = _data.paymentsoitemList[i]
}
return _data;
return _data
},
dataInfo(dataAll) {
let _dataAll = dataAll
for (let i = 0; i < _dataAll.salesorder_item0List.length; i++) {
var _list = _dataAll.salesorder_item0List[i];
var _list = _dataAll.salesorder_item0List[i]
}
for (let i = 0; i < _dataAll.receiptoutsoitemList.length; i++) {
var _list = _dataAll.receiptoutsoitemList[i];
var _list = _dataAll.receiptoutsoitemList[i]
}
for (let i = 0; i < _dataAll.collectionsoitemList.length; i++) {
var _list = _dataAll.collectionsoitemList[i];
var _list = _dataAll.collectionsoitemList[i]
}
for (let i = 0; i < _dataAll.arinvoices_item0soitemList.length; i++) {
var _list = _dataAll.arinvoices_item0soitemList[i];
var _list = _dataAll.arinvoices_item0soitemList[i]
_list.attachMent = JSON.parse(_list.attachMent)
}
for (let i = 0; i < _dataAll.salesbacksoitemList.length; i++) {
var _list = _dataAll.salesbacksoitemList[i];
var _list = _dataAll.salesbacksoitemList[i]
}
for (let i = 0; i < _dataAll.paymentsoitemList.length; i++) {
var _list = _dataAll.paymentsoitemList[i];
var _list = _dataAll.paymentsoitemList[i]
}
this.dataForm = _dataAll
},
},
}
}
}
</script>

Write Preview
Loading…
Cancel
Save