yunxi
/
jigangSCM2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

凭证采购额和销售额类型修改

Browse Source
jg-waiwang-pro
vayne 4 months ago
parent 45549c8533
commit b922bafe8d
7 changed files with 211 additions and 69 deletions
Show Stats Download Patch File Download Diff File

2
jnpf-app/components/jnpf/jnpf-upload-pound/index.vue
Unescape View File

@ -125,7 +125,7 @@
url: data.data.url url: data.data.url
}) })
this.$emit('input', this.fileList) this.$emit('input', this.fileList)
this.$emit('change', this.fileList) this.$emit('change', this.fileList, data)
} else { } else {
lists.splice(index, 1) lists.splice(index, 1)
this.$u.toast(data.msg) this.$u.toast(data.msg)

181
jnpf-app/pages/scm/form/purchaseReceiptVoucher/index.vue
Unescape View File

@ -88,7 +88,7 @@
</view> </view>
<view class="u-p-l-20 u-p-r-20 form-item-box"> <view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item required label="凭证图片" prop="voucherPictures"> <u-form-item required label="凭证图片" prop="voucherPictures">
<jnpf-upload-pound v-model="dataForm.voucherPictures" @change="changeData('voucherPictures',-1)" <jnpf-upload-pound v-model="dataForm.voucherPictures" @change="poundlistUploadSuccess"
sizeUnit="MB" :fileSize="10" :limit="1" pathType="defaultPath" :isAccount="0" sizeUnit="MB" :fileSize="10" :limit="1" pathType="defaultPath" :isAccount="0"
:value="dataForm.voucherPictures"> :value="dataForm.voucherPictures">
</jnpf-upload-pound> </jnpf-upload-pound>
@ -103,8 +103,8 @@
</view> </view>
<view class="u-p-l-20 u-p-r-20 form-item-box"> <view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item required label="车牌号" prop="vehicleName"> <u-form-item required label="车牌号" prop="vehicleName">
<u-input v-model="dataForm.vehicleName" @change="vehicleChange(dataForm.vehicleName)" <u-input v-model="dataForm.vehicleName" @change="changeData('vehicleName',-1)"
input-align='right' clearable placeholder="请输入" :style='{"width":"100%"}'> input-align='right' clearable placeholder="请输入" :style='{"width":"100%"}' @input="vehicleChange(dataForm.vehicleName)">
</u-input> </u-input>
</u-form-item> </u-form-item>
</view> </view>
@ -129,28 +129,34 @@
</jnpf-popup-select> </jnpf-popup-select>
</u-form-item> </u-form-item>
</view> </view>
<view class="u-p-l-20 u-p-r-20 ">
<u-form-item>
<jnpf-group value="商品信息" content="商品信息" contentPosition="left">
</jnpf-group>
</u-form-item>
</view>
<view class="jnpf-table"> <view class="jnpf-table">
<view class="jnpf-table-item" v-for="(item,i) in dataForm.voucherproductList" :key="i"> <view class="jnpf-table-item" v-for="(item,i) in dataForm.voucherProductList" :key="i">
<view class="jnpf-table-item-title u-flex u-row-between"> <!-- <view class="jnpf-table-item-title u-flex u-row-between">
<text class="jnpf-table-item-title-num">({{i+1}})</text> <text class="jnpf-table-item-title-num">({{i+1}})</text>
<view class="jnpf-table-item-title-action" v-if="dataForm.voucherproductList.length>0" <view class="jnpf-table-item-title-action" v-if="dataForm.voucherProductList.length>0"
@click="delvoucherproductList(i)">删除</view> @click="delvoucherproductList(i)">删除</view>
</view> </view> -->
<view class="u-p-l-20 u-p-r-20 form-item-box"> <view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item required label="商品名称"> <u-form-item required label="商品名称">
<jnpf-popup-select v-model="dataForm.voucherproductList[i].productId" <jnpf-popup-select v-model="dataForm.voucherProductList[i].productId"
@change="changeData('voucherproduct-productId',i)" :rowIndex="i" :formData="dataForm" @change="productChangeData" :rowIndex="i" :formData="dataForm"
:templateJson="interfaceRes.voucherproductproductId" clearable propsValue="id" :templateJson="interfaceRes.voucherproductproductId" clearable propsValue="id"
popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name' popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
:vModel="'productId'+i" :columnOptions="voucherproductproductIdColumnOptions" :vModel="'productId'+i" :columnOptions="voucherproductproductIdColumnOptions"
interfaceId="529919666429100229" :pageSize="20" placeholder="请选择" type="popup" interfaceId="545146513462930117" :pageSize="20" placeholder="请选择" type="popup"
:style='{"width":"100%"}'> :style='{"width":"100%"}'>{ "fieldName": "", "field": "subjectId", "defaultValue": "", "jnpfKey": "popupSelect", "dataType": "varchar", "id": "spNokw1", "relationField": "supplierId", "required": "0" }
</jnpf-popup-select> </jnpf-popup-select>
</u-form-item> </u-form-item>
</view> </view>
<view class="u-p-l-20 u-p-r-20 form-item-box"> <view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item label="规格"> <u-form-item label="规格">
<u-input v-model="dataForm.voucherproductList[i].spec" <u-input v-model="dataForm.voucherProductList[i].spec"
@change="changeData('voucherproduct-spec',i)" input-align='right' clearable @change="changeData('voucherproduct-spec',i)" input-align='right' clearable
placeholder="请输入" :style='{"width":"100%"}'> placeholder="请输入" :style='{"width":"100%"}'>
</u-input> </u-input>
@ -158,7 +164,7 @@
</view> </view>
<view class="u-p-l-20 u-p-r-20 form-item-box"> <view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item required label="单位"> <u-form-item required label="单位">
<u-input v-model="dataForm.voucherproductList[i].unit" <u-input v-model="dataForm.voucherProductList[i].unit"
@change="changeData('voucherproduct-unit',i)" input-align='right' clearable @change="changeData('voucherproduct-unit',i)" input-align='right' clearable
placeholder="请输入" :style='{"width":"100%"}'> placeholder="请输入" :style='{"width":"100%"}'>
</u-input> </u-input>
@ -166,31 +172,31 @@
</view> </view>
<view class="u-p-l-20 u-p-r-20 form-item-box"> <view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item required label="毛重"> <u-form-item required label="毛重">
<jnpf-number-box v-model="dataForm.voucherproductList[i].grossWeight" <jnpf-number-box v-model="dataForm.voucherProductList[i].grossWeight"
@change="changeData('voucherproduct-grossWeight',i)" :precision="4" :controls="true" @change="changeData('voucherproduct-grossWeight',i)" :precision="4" :controls="true"
placeholder="数字文本" :step="1" @input="UpdateWeight(dataForm.voucherproductList[i])"> placeholder="数字文本" :step="1" @input="UpdateWeight(dataForm.voucherProductList[i])">
</jnpf-number-box> </jnpf-number-box>
</u-form-item> </u-form-item>
</view> </view>
<view class="u-p-l-20 u-p-r-20 form-item-box"> <view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item required label="皮重"> <u-form-item required label="皮重">
<jnpf-number-box v-model="dataForm.voucherproductList[i].tareWeight" <jnpf-number-box v-model="dataForm.voucherProductList[i].tareWeight"
@change="changeData('voucherproduct-tareWeight',i)" :precision="4" :controls="true" @change="changeData('voucherproduct-tareWeight',i)" :precision="4" :controls="true"
placeholder="数字文本" :step="1" @input="UpdateWeight(dataForm.voucherproductList[i])"> placeholder="数字文本" :step="1" @input="UpdateWeight(dataForm.voucherProductList[i])">
</jnpf-number-box> </jnpf-number-box>
</u-form-item> </u-form-item>
</view> </view>
<view class="u-p-l-20 u-p-r-20 form-item-box"> <view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item required label="扣重"> <u-form-item required label="扣重">
<jnpf-number-box v-model="dataForm.voucherproductList[i].buckleWeight" <jnpf-number-box v-model="dataForm.voucherProductList[i].buckleWeight"
@change="changeData('voucherproduct-buckleWeight',i)" :precision="4" :controls="true" @change="changeData('voucherproduct-buckleWeight',i)" :precision="4" :controls="true"
placeholder="数字文本" :step="1" @input="UpdateWeight(dataForm.voucherproductList[i])"> placeholder="数字文本" :step="1" @input="UpdateWeight(dataForm.voucherProductList[i])">
</jnpf-number-box> </jnpf-number-box>
</u-form-item> </u-form-item>
</view> </view>
<view class="u-p-l-20 u-p-r-20 form-item-box"> <view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item required label="结算量"> <u-form-item required label="结算量">
<jnpf-number-box v-model="dataForm.voucherproductList[i].netWeight" <jnpf-number-box v-model="dataForm.voucherProductList[i].netWeight"
@change="changeData('voucherproduct-netWeight',i)" :precision="4" :controls="true" @change="changeData('voucherproduct-netWeight',i)" :precision="4" :controls="true"
placeholder="数字文本" :step="1"> placeholder="数字文本" :step="1">
</jnpf-number-box> </jnpf-number-box>
@ -198,7 +204,7 @@
</view> </view>
<view class="u-p-l-20 u-p-r-20 form-item-box"> <view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item required label="净重"> <u-form-item required label="净重">
<jnpf-number-box v-model="dataForm.voucherproductList[i].clearWeight" <jnpf-number-box v-model="dataForm.voucherProductList[i].clearWeight"
@change="changeData('voucherproduct-clearWeight',i)" :precision="4" :controls="true" @change="changeData('voucherproduct-clearWeight',i)" :precision="4" :controls="true"
placeholder="数字文本" :step="1"> placeholder="数字文本" :step="1">
</jnpf-number-box> </jnpf-number-box>
@ -206,17 +212,17 @@
</view> </view>
<view class="u-p-l-20 u-p-r-20 form-item-box"> <view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item label="备注"> <u-form-item label="备注">
<u-input v-model="dataForm.voucherproductList[i].remark" <u-input v-model="dataForm.voucherProductList[i].remark"
@change="changeData('voucherproduct-remark',i)" input-align='right' clearable @change="changeData('voucherproduct-remark',i)" input-align='right' clearable
placeholder="请输入" :style='{"width":"100%"}'> placeholder="请输入" :style='{"width":"100%"}'>
</u-input> </u-input>
</u-form-item> </u-form-item>
</view> </view>
</view> </view>
<view class="jnpf-table-addBtn" @click="addvoucherproductList"> <!-- <view class="jnpf-table-addBtn" @click="voucherProductList">
<u-icon name="plus" color="#2979ff"></u-icon> <u-icon name="plus" color="#2979ff"></u-icon>
<span>{{dataForm.voucherproductList.length==0?"添加":"添加"}}</span> <span>{{dataForm.voucherProductList.length==0?"添加":"添加"}}</span>
</view> </view> -->
</view> </view>
<view class="u-p-l-20 u-p-r-20 "> <view class="u-p-l-20 u-p-r-20 ">
<u-form-item> <u-form-item>
@ -276,20 +282,26 @@
</jnpf-upload> </jnpf-upload>
</u-form-item> </u-form-item>
</view> </view>
<view class="u-p-l-20 u-p-r-20 ">
<u-form-item>
<jnpf-group value="车辆信息" content="车辆信息" contentPosition="left">
</jnpf-group>
</u-form-item>
</view>
<view class="jnpf-table"> <view class="jnpf-table">
<view class="jnpf-table-item" v-for="(item,i) in dataForm.vouchervehicleList" :key="i"> <view class="jnpf-table-item" v-for="(item,i) in dataForm.voucherVehicleList" :key="i">
<view class="jnpf-table-item-title u-flex u-row-between"> <!-- <view class="jnpf-table-item-title u-flex u-row-between">
<text class="jnpf-table-item-title-num">({{i+1}})</text> <text class="jnpf-table-item-title-num">({{i+1}})</text>
<view class="jnpf-table-item-title-action" v-if="dataForm.vouchervehicleList.length>0" <view class="jnpf-table-item-title-action" v-if="dataForm.voucherVehicleList.length>0"
@click="delvouchervehicleList(i)">删除</view> @click="delvouchervehicleList(i)">删除</view>
</view> </view> -->
<view class="u-p-l-20 u-p-r-20 form-item-box"> <view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item required label="车牌号"> <u-form-item required label="车牌号">
<!-- <jnpf-popup-select v-model="dataForm.vouchervehicleList[i].vehicleId" <!-- <jnpf-popup-select v-model="dataForm.voucherVehicleList[i].vehicleId"
@change="changeData('vouchervehicle-vehicleId',i)" @change="changeData('vouchervehicle-vehicleId',i)"
:rowIndex="i" :formData="dataForm" :templateJson="interfaceRes.vouchervehiclevehicleId" clearable propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='vehicle_number' :vModel="'vehicleId'+i" :columnOptions="vouchervehiclevehicleIdColumnOptions" interfaceId="529920852288864453" :pageSize="20" placeholder="请选择" type="popup" :style='{"width":"100%"}'> :rowIndex="i" :formData="dataForm" :templateJson="interfaceRes.vouchervehiclevehicleId" clearable propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='vehicle_number' :vModel="'vehicleId'+i" :columnOptions="vouchervehiclevehicleIdColumnOptions" interfaceId="529920852288864453" :pageSize="20" placeholder="请选择" type="popup" :style='{"width":"100%"}'>
</jnpf-popup-select> --> </jnpf-popup-select> -->
<u-input v-model="dataForm.vouchervehicleList[i].vehicleNumber" <u-input v-model="dataForm.voucherVehicleList[i].vehicleNumber"
@change="changeData('vouchervehicle-driverName',i)" input-align='right' clearable @change="changeData('vouchervehicle-driverName',i)" input-align='right' clearable
placeholder="请输入" :style='{"width":"100%"}'> placeholder="请输入" :style='{"width":"100%"}'>
</u-input> </u-input>
@ -297,7 +309,7 @@
</view> </view>
<view class="u-p-l-20 u-p-r-20 form-item-box"> <view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item label="驾驶员名称"> <u-form-item label="驾驶员名称">
<u-input v-model="dataForm.vouchervehicleList[i].driverName" <u-input v-model="dataForm.voucherVehicleList[i].driverName"
@change="changeData('vouchervehicle-driverName',i)" input-align='right' clearable @change="changeData('vouchervehicle-driverName',i)" input-align='right' clearable
placeholder="请输入" :style='{"width":"100%"}'> placeholder="请输入" :style='{"width":"100%"}'>
</u-input> </u-input>
@ -305,7 +317,7 @@
</view> </view>
<view class="u-p-l-20 u-p-r-20 form-item-box"> <view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item label="联系电话"> <u-form-item label="联系电话">
<u-input v-model="dataForm.vouchervehicleList[i].telephone" <u-input v-model="dataForm.voucherVehicleList[i].telephone"
@change="changeData('vouchervehicle-telephone',i)" input-align='right' clearable @change="changeData('vouchervehicle-telephone',i)" input-align='right' clearable
placeholder="请输入" :style='{"width":"100%"}'> placeholder="请输入" :style='{"width":"100%"}'>
</u-input> </u-input>
@ -313,17 +325,17 @@
</view> </view>
<view class="u-p-l-20 u-p-r-20 form-item-box"> <view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item label="承运商"> <u-form-item label="承运商">
<u-input v-model="dataForm.vouchervehicleList[i].carrier" <u-input v-model="dataForm.voucherVehicleList[i].carrier"
@change="changeData('vouchervehicle-carrier',i)" input-align='right' clearable @change="changeData('vouchervehicle-carrier',i)" input-align='right' clearable
placeholder="请输入" :style='{"width":"100%"}'> placeholder="请输入" :style='{"width":"100%"}'>
</u-input> </u-input>
</u-form-item> </u-form-item>
</view> </view>
</view> </view>
<view class="jnpf-table-addBtn" @click="addvouchervehicleList"> <!-- <view class="jnpf-table-addBtn" @click="addvouchervehicleList">
<u-icon name="plus" color="#2979ff"></u-icon> <u-icon name="plus" color="#2979ff"></u-icon>
<span>{{dataForm.vouchervehicleList.length==0?"添加":"添加"}}</span> <span>{{dataForm.voucherVehicleList.length==0?"添加":"添加"}}</span>
</view> </view> -->
</view> </view>
</u-form> </u-form>
<view class="buttom-actions" v-if="jurisdictionType != 'btn_detail'"> <view class="buttom-actions" v-if="jurisdictionType != 'btn_detail'">
@ -374,7 +386,7 @@
dataForm: { dataForm: {
id: "", id: "",
voucherCode: '', voucherCode: '',
voucherType: "", voucherType: "1",
preparationTime: "", preparationTime: "",
associateThirdSuppliers: "", associateThirdSuppliers: "",
deliveryType: "", deliveryType: "",
@ -396,8 +408,9 @@
vehiclePictures: [], vehiclePictures: [],
voucherStatus: "4", voucherStatus: "4",
documentType: "1", documentType: "1",
voucherproductList: [], voucherProductList: [],
vouchervehicleList: [], voucherVehicleList: [],
businessType: "1",
}, },
rules: { rules: {
voucherType: [{ voucherType: [{
@ -631,11 +644,11 @@
menuId: '', menuId: '',
jurisdictionType: '', jurisdictionType: '',
ruleList: { ruleList: {
voucherproductList: { voucherProductList: {
'productId': '商品名称不能为空', 'productId': '商品名称不能为空',
'unit': '单位不能为空', 'unit': '单位不能为空',
}, },
vouchervehicleList: { voucherVehicleList: {
'vehicleNumber': '车牌号不能为空', 'vehicleNumber': '车牌号不能为空',
}, },
}, },
@ -663,7 +676,7 @@
vehiclePictures: [], vehiclePictures: [],
voucherStatus: [], voucherStatus: [],
documentType: [], documentType: [],
voucherproductproductId: [], voucherproductproductId: [{ "fieldName": "", "field": "subjectId", "defaultValue": "", "jnpfKey": "popupSelect", "dataType": "varchar", "id": "spNokw1", "relationField": "supplierId", "required": "0" }],
voucherproductspec: [], voucherproductspec: [],
voucherproductunit: [], voucherproductunit: [],
voucherproductgrossWeight: [], voucherproductgrossWeight: [],
@ -678,7 +691,7 @@
vouchervehiclecarrier: [], vouchervehiclecarrier: [],
}, },
regList: { regList: {
voucherproductList: { voucherProductList: {
productId: [], productId: [],
spec: [], spec: [],
unit: [], unit: [],
@ -689,7 +702,7 @@
clearWeight: [], clearWeight: [],
remark: [], remark: [],
}, },
vouchervehicleList: { voucherVehicleList: {
vehicleId: [], vehicleId: [],
driverName: [], driverName: [],
telephone: [], telephone: [],
@ -800,13 +813,61 @@
} }
}, },
methods: { methods: {
//凭证识别
poundlistUploadSuccess(val, res) {
if (res && res.data) {
this.dataForm.poundCode = res.data.deliveryNumber
this.dataForm.vehicleId = '1'
this.dataForm.supplierId = res.data.supplierId
this.dataForm.customerId = res.data.customerId
if (res.data.vehicleId) {
this.dataForm.voucherVehicleList.push(res.data)
}
let item = {
productId: '',
spec: undefined,
unit: undefined,
grossWeight: res.data.crossWeight == '' ? 0 : res.data.crossWeight,
tareWeight: res.data.tareWeight == '' ? 0 : res.data.tareWeight,
buckleWeight: undefined,
netWeight: res.data.netWeight == '' ? 0 : res.data.netWeight,
remark: undefined,
printTime: undefined,
}
item.buckleWeight = this.jnpf.floatSub(this.jnpf.floatSub(item.grossWeight, item.tareWeight), item.netWeight);
this.dataForm.voucherProductList.push(item)
} else {
this.dataForm.poundCode = '';
this.dataForm.vehicleId = '';
this.dataForm.supplierId = '';
this.dataForm.customerId = '';
this.dataForm.voucherVehicleList = [];
this.dataForm.voucherProductList = [];
}
},
//选择商品带出信息
productChangeData(a, b) {
this.dataForm.voucherProductList[0].spec = b.spec
if (b.orderMainUnitIds) {
var unitName = JSON.parse(b.orderMainUnitIds);
var optArray = [];
for (let i = 0; i < unitName.length; i++) {
this.dataForm.voucherProductList[0].unit = unitName[0];
var opt = {};
opt.fullName = unitName[i];
opt.id = unitName[i];
optArray.push(opt);
}
this.dataForm.voucherProductList[0].deliveryproductrelationdeliveryUnitOptions = optArray;
}
},
//子表车牌号赋值 //子表车牌号赋值
vehicleChange(val) { vehicleChange(val) {
this.dataForm.vouchervehicleList = [] this.dataForm.voucherVehicleList = []
let item = { let item = {
vehicleName: val vehicleNumber: val
} }
this.dataForm.vouchervehicleList.push(item) this.dataForm.voucherVehicleList.push(item)
}, },
//编辑其他重量，更新净重 //编辑其他重量，更新净重
UpdateWeight(row) { UpdateWeight(row) {
@ -990,7 +1051,7 @@
return timeDataValue; return timeDataValue;
}, },
voucherproduct() { voucherproduct() {
let table = this.dataForm.voucherproductList let table = this.dataForm.voucherProductList
let summaryField = [] let summaryField = []
let summaryFieldName = {} let summaryFieldName = {}
let data = {} let data = {}
@ -1015,7 +1076,7 @@
return data; return data;
}, },
vouchervehicle() { vouchervehicle() {
let table = this.dataForm.vouchervehicleList let table = this.dataForm.voucherVehicleList
let summaryField = [] let summaryField = []
let summaryFieldName = {} let summaryFieldName = {}
let data = {} let data = {}
@ -1128,7 +1189,7 @@
}, },
addvoucherproductList() { addvoucherproductList() {
let value = {} let value = {}
this.tableKey = 'voucherproductList'; this.tableKey = 'voucherProductList';
this.getvoucherproductList(value) this.getvoucherproductList(value)
this.childIndex = -1 this.childIndex = -1
this.collapse() this.collapse()
@ -1140,7 +1201,7 @@
content: '确认删除该条信息吗？', content: '确认删除该条信息吗？',
success: function(res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
that.dataForm.voucherproductList.splice(index, 1); that.dataForm.voucherProductList.splice(index, 1);
that.collapse() that.collapse()
} }
} }
@ -1162,14 +1223,14 @@
...item, ...item,
...value ...value
} }
this.dataForm.voucherproductList.push(result) this.dataForm.voucherProductList.push(result)
this.childIndex = this.dataForm.voucherproductList.length - 1 this.childIndex = this.dataForm.voucherProductList.length - 1
this.isEdit = true this.isEdit = true
this.isEdit = false this.isEdit = false
}, },
addvouchervehicleList() { addvouchervehicleList() {
let value = {} let value = {}
this.tableKey = 'vouchervehicleList'; this.tableKey = 'voucherVehicleList';
this.getvouchervehicleList(value) this.getvouchervehicleList(value)
this.childIndex = -1 this.childIndex = -1
this.collapse() this.collapse()
@ -1181,7 +1242,7 @@
content: '确认删除该条信息吗？', content: '确认删除该条信息吗？',
success: function(res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
that.dataForm.vouchervehicleList.splice(index, 1); that.dataForm.voucherVehicleList.splice(index, 1);
that.collapse() that.collapse()
} }
} }
@ -1198,8 +1259,8 @@
...item, ...item,
...value ...value
} }
this.dataForm.vouchervehicleList.push(result) this.dataForm.voucherVehicleList.push(result)
this.childIndex = this.dataForm.vouchervehicleList.length - 1 this.childIndex = this.dataForm.voucherVehicleList.length - 1
this.isEdit = true this.isEdit = true
this.isEdit = false this.isEdit = false
}, },
@ -1212,10 +1273,10 @@
this.dataForm = _dataAll this.dataForm = _dataAll
this.isEdit = true this.isEdit = true
this.dataAll() this.dataAll()
for (let i = 0; i < _dataAll.voucherproductList.length; i++) { for (let i = 0; i < _dataAll.voucherProductList.length; i++) {
this.childIndex = i this.childIndex = i
} }
for (let i = 0; i < _dataAll.vouchervehicleList.length; i++) { for (let i = 0; i < _dataAll.voucherVehicleList.length; i++) {
this.childIndex = i this.childIndex = i
} }
this.childIndex = -1 this.childIndex = -1

81
jnpf-app/utils/jnpf.js
Unescape View File

@ -4,6 +4,87 @@ const jnpf = {
goBack() { goBack() {
uni.navigateBack() uni.navigateBack()
}, },
/**
* 解决两个数相加精度丢失问题
* @param a
* @param b
* @returns {Number}
*/
floatAdd(a, b) {
var c, d, e;
if(undefined==a||null==a||""==a||isNaN(a)){a=0;}
if(undefined==b||null==b||""==b||isNaN(b)){b=0;}
try {
c = a.toString().split(".")[1].length;
} catch (f) {
c = 0;
}
try {
d = b.toString().split(".")[1].length;
} catch (f) {
d = 0;
}
e = Math.pow(10, Math.max(c, d));
return (this.floatMul(a, e) + this.floatMul(b, e)) / e;
},
/**
* 解决两个数相减精度丢失问题
* @param a
* @param b
* @returns {Number}
*/
floatSub(a, b) {
var c, d, e;
if(undefined==a||null==a||""==a||isNaN(a)){a=0;}
if(undefined==b||null==b||""==b||isNaN(b)){b=0;}
try {
c = a.toString().split(".")[1].length;
} catch (f) {
c = 0;
}
try {
d = b.toString().split(".")[1].length;
} catch (f) {
d = 0;
}
e = Math.pow(10, Math.max(c, d));
return (this.floatMul(a, e) - this.floatMul(b, e)) / e;
},
/**
* 解决两个数相乘精度丢失问题
* @param a
* @param b
* @returns {Number}
*/
floatMul(a, b) {
var c = 0,
d = a.toString(),
e = b.toString();
try {
c += d.split(".")[1].length;
} catch (f) {}
try {
c += e.split(".")[1].length;
} catch (f) {}
return Number(d.replace(".", "")) * Number(e.replace(".", "")) / Math.pow(10, c);
},
/**
* 解决两个数相除精度丢失问题
* @param a
* @param b
* @returns
*/
floatDiv(a, b) {
var c, d, e = 0,
f = 0;
try {
e = a.toString().split(".")[1].length;
} catch (g) {}
try {
f = b.toString().split(".")[1].length;
} catch (g) {}
return c = Number(a.toString().replace(".", "")), d = Number(b.toString().replace(".", "")), this.floatMul(c / d, Math.pow(10, f - e));
},
handelFormat(format) { handelFormat(format) {
let formatObj = { let formatObj = {
'yyyy': 'yyyy', 'yyyy': 'yyyy',

4
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java
Unescape View File

@ -1030,8 +1030,8 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
voucherEntity.setAssociateThirdSuppliers("");//关联三级供应商 voucherEntity.setAssociateThirdSuppliers("");//关联三级供应商
voucherEntity.setPurchaseContractNo(model.getContractNo());//采购合同编号 voucherEntity.setPurchaseContractNo(model.getContractNo());//采购合同编号
voucherEntity.setSaleContractNo(model.getSaleContractNo());//销售合同编号 voucherEntity.setSaleContractNo(model.getSaleContractNo());//销售合同编号
voucherEntity.setPurchaseAmount(model.getPurchaseAmount());//采购额 voucherEntity.setPurchaseAmount(new BigDecimal(model.getPurchaseAmount()));//采购额
voucherEntity.setSaleAmount(model.getSaleAmount());//销售额 voucherEntity.setSaleAmount(new BigDecimal(model.getSaleAmount()));//销售额
//根据合同编号取查合同 //根据合同编号取查合同
QueryWrapper<ContractLEntity> contractLQueryWrapper=new QueryWrapper<>(); QueryWrapper<ContractLEntity> contractLQueryWrapper=new QueryWrapper<>();
contractLQueryWrapper.lambda().eq(ContractLEntity::getContractNumber, voucherEntity.getPurchaseContractNo()); contractLQueryWrapper.lambda().eq(ContractLEntity::getContractNumber, voucherEntity.getPurchaseContractNo());

4
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherEntity.java
Unescape View File

@ -151,9 +151,9 @@ public class VoucherEntity {
@TableField("SALE_CONTRACT_NO") @TableField("SALE_CONTRACT_NO")
private String saleContractNo; private String saleContractNo;
@TableField("PURCHASE_AMOUNT") @TableField("PURCHASE_AMOUNT")
private String purchaseAmount; private BigDecimal purchaseAmount;
@TableField("SALE_AMOUNT") @TableField("SALE_AMOUNT")
private String saleAmount; private BigDecimal saleAmount;
@TableField("VOUCHER_RELATION") @TableField("VOUCHER_RELATION")
private String voucherRelation; private String voucherRelation;

4
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherProductEntity.java
Unescape View File

@ -150,11 +150,11 @@ public class VoucherProductEntity {
private String saleContractNo; private String saleContractNo;
/** 销售额 **/ /** 销售额 **/
@TableField(exist = false) @TableField(exist = false)
private String saleAmount; private BigDecimal saleAmount;
/** 采购合同 **/ /** 采购合同 **/
@TableField(exist = false) @TableField(exist = false)
private String purchaseContractNo; private String purchaseContractNo;
/** 采购额 **/ /** 采购额 **/
@TableField(exist = false) @TableField(exist = false)
private String purchaseAmount; private BigDecimal purchaseAmount;
} }

4
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherForm.java
Unescape View File

@ -148,8 +148,8 @@ public class VoucherForm {
private String saleContractNo; private String saleContractNo;
/** 采购额 **/ /** 采购额 **/
@JsonProperty("purchaseAmount") @JsonProperty("purchaseAmount")
private String purchaseAmount; private BigDecimal purchaseAmount;
/** 销售额 **/ /** 销售额 **/
@JsonProperty("saleAmount") @JsonProperty("saleAmount")
private String saleAmount; private BigDecimal saleAmount;
} }

Write Preview
Loading…
Cancel
Save