jg-waiwang-pro
vayne 4 months ago
commit 58b82c4e2f

@ -164,7 +164,8 @@
IFNULL(j.price_rate,0) contractPrice,
f.unit settlementUnit,
k.name productName,
IFNULL(ROUND(c.sale_amount / f.net_weight, 6),0) settlementPrice
IFNULL(ROUND(c.sale_amount / f.net_weight, 6),0) settlementPrice,
c.business_order_id businessOrderId
from jg_warehousing_storage_poundlist a
LEFT JOIN jg_warehousing_storage b on a.warehousing_storage_id = b.id
LEFT JOIN jg_voucher c on a.voucher_id = c.id
@ -208,7 +209,8 @@
IFNULL(j.price_rate,0) contractPrice,
f.unit settlementUnit,
k.name productName,
IFNULL(ROUND(c.sale_amount / f.net_weight, 6),0) settlementPrice
IFNULL(ROUND(c.sale_amount / f.net_weight, 6),0) settlementPrice,
c.business_order_id businessOrderId
from jg_warehousing_storage_poundlist a
LEFT JOIN jg_warehousing_storage b on a.warehousing_storage_id = b.id
LEFT JOIN jg_voucher c on a.voucher_id = c.id
@ -295,7 +297,8 @@
IFNULL(j.price_rate,0) contractPrice,
f.unit settlementUnit,
k.name productName,
IFNULL(ROUND(c.sale_amount / f.net_weight, 6),0) settlementPrice
IFNULL(ROUND(c.sale_amount / f.net_weight, 6),0) settlementPrice,
c.business_order_id businessOrderId
from jg_warehousing_outbound_poundlist a
LEFT JOIN jg_warehousing_outbound b on a.warehousing_outbound_id = b.id
LEFT JOIN jg_voucher c on a.voucher_id = c.id
@ -382,7 +385,8 @@
IFNULL(j.price_rate,0) contractPrice,
f.unit settlementUnit,
k.name productName,
IFNULL(ROUND(c.sale_amount / f.net_weight, 6),0) settlementPrice
IFNULL(ROUND(c.sale_amount / f.net_weight, 6),0) settlementPrice,
c.business_order_id businessOrderId
from jg_warehousing_outbound_poundlist a
LEFT JOIN jg_warehousing_outbound b on a.warehousing_outbound_id = b.id
LEFT JOIN jg_voucher c on a.voucher_id = c.id

@ -666,7 +666,7 @@
<select id="queryVoucherByBusinessOrder" resultType="java.math.BigDecimal">
select
IFNULL(sum(round(e.business_price * b.net_weight,2)),0) AS netWeight
IFNULL( round( sum( e.business_price * b.net_weight ), 2), 0 ) AS netWeight
from jg_voucher a
left join jg_voucher_product b on a.id = b.voucher_id and b.f_delete_mark is null
left join jg_voucher c on a.voucher_relation = c.id and c.f_delete_mark is null

@ -671,6 +671,18 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
}
if(ObjectUtil.isNotEmpty(businessOrderPagination.getBusinessNum())){
businessOrderNum++;
String value = String.valueOf(businessOrderPagination.getBusinessNum());
businessOrderQueryWrapper.like("e.business_num",value);
}
if(ObjectUtil.isNotEmpty(businessOrderPagination.getRealName())){
businessOrderNum++;
String value = String.valueOf(businessOrderPagination.getRealName());
businessOrderQueryWrapper.like("i.f_real_name",value);
}
if(ObjectUtil.isNotEmpty(businessOrderPagination.getUrgentOrder())){
businessOrderNum++;
@ -1557,7 +1569,12 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
}
}
cell.setCellValue(s1 + "收货明细表");
cell.setCellValue(titleName + "收货明细表");
//execl表标题
OrganizeEntity organizeEntityExecl =organizeService.getInfo(titleName);
if (organizeEntityExecl!=null){
cell.setCellValue(organizeEntityExecl.getFullName() + "收货明细表");
}
// cell.setCellValue(titleName + "收货明细表");
cell.setCellStyle(cellStyle);
//创建第一行
HSSFRow row = sheet.createRow((short) 1);
@ -1987,8 +2004,19 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
ExportPdf exportPdf = new ExportPdf();
Map map = new HashMap();
map.put("title", companyName+"采购订单");
map.put("name", departmentName);
//pdf表标题
OrganizeEntity organizeEntityDdf =organizeService.getInfo(companyName);
if (organizeEntityDdf!=null){
map.put("title", organizeEntityDdf.getFullName()+"采购订单");
}
//pdf部门
OrganizeEntity organizeEntityDdfDept =organizeService.getInfo(departmentName);
if (organizeEntityDdfDept!=null){
map.put("name", organizeEntityDdfDept.getFullName());
}
// map.put("title", companyName+"采购订单");
// map.put("name", departmentName);
map.put("creatorTime", new SimpleDateFormat("yyyy-MM-dd").format(businessOrderEntity.getCreatorTime()));
map.put("contractNo", contractLEntity.getContractNo());
map.put("contractCode", contractLEntity.getContractNumber());

@ -157,7 +157,9 @@ public class BusinessOrderController {
// }
// }
// }
entity.setProfit(saleAmount.subtract(purchaseAmount));//利润
if (saleAmount!=null){
entity.setProfit(saleAmount.subtract(purchaseAmount));//利润
}
Map<String, Object> businessOrderMap=JsonUtil.entityToMap(entity);
businessOrderMap.put("id", businessOrderMap.get("id"));
//副表数据

@ -183,4 +183,7 @@ public class ContractLEntity {
private String settlementType;
@TableField(value = "CONTRACT_NUM" , updateStrategy = FieldStrategy.IGNORED)
private BigDecimal contractNum;
@TableField("ADVANCE")
private String advance;
}

@ -126,4 +126,6 @@ public class CwaccountvoucherEntity {
private String departmentId;
@TableField("ORGANIZE_JSON_ID")
private String organizeJsonId;
@TableField(exist = false)
private String businessOrderId;
}

@ -69,4 +69,12 @@ public class BusinessOrderPagination extends Pagination {
/** 合同号 */
@JsonProperty("contractNo")
private String contractNo;
/** 订单重量 */
@JsonProperty("businessNum")
private String businessNum;
/** 制单人 */
@JsonProperty("realName")
private String realName;
}

@ -1,5 +1,6 @@
package jnpf.model.contractl;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import java.util.List;
import java.math.BigDecimal;
@ -137,4 +138,7 @@ public class ContractLForm {
/** 合同标签 **/
@JsonProperty("contractLabel")
private Object contractLabel;
/** 是否垫资 **/
@TableField("advance")
private Object advance;
}

@ -146,7 +146,7 @@ export default {
url: res.data.url
})
this.$emit('input', this.fileList)
this.$emit('change', this.fileList)
this.$emit('change', this.fileList,res)
dispatch.call(this, 'ElFormItem', 'el.form.change', this.fileList)
} else {
this.$refs.elUpload.uploadFiles.splice(fileList.length - 1, 1)

@ -0,0 +1,177 @@
<template>
<div class="UploadFile-container">
<template v-if="fileList.length">
<transition-group class="el-upload-list el-upload-list--picture-card" tag="ul" name="el-list">
<li class="el-upload-list__item is-success" v-for="(file, index) in fileList" :key="file.fileId">
<el-image :src="define.comUrl + file.url" class="el-upload-list__item-thumbnail"
:preview-src-list="getImgList(fileList)" :z-index="10000" :ref="'image' + index">
</el-image>
<span class="el-upload-list__item-actions">
<span class="el-upload-list__item-preview" @click="handlePictureCardPreview(index)">
<i class="el-icon-zoom-in"></i>
</span>
<span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(index)">
<i class="el-icon-delete"></i>
</span>
</span>
</li>
</transition-group>
</template>
<template v-if="!detailed">
<el-upload :action="define.comUploadPoundUrl + '/' + type" :headers="uploadHeaders" ref="elUpload"
:on-success="handleSuccess" :multiple="limit !== 1" :show-file-list="false" accept="image/*"
:before-upload="beforeUpload" :on-exceed="handleExceed" :disabled="disabled" list-type="picture-card"
:limit="limit" class="upload-btn" drag>
<i class="el-icon-plus"></i>
<div slot="tip" class="el-upload__tip" v-show="showTip">
只能上传不超过{{ fileSize }}{{ sizeUnit }}{{ accept }}图片
</div>
</el-upload>
</template>
</div>
</template>
<script>
const units = {
KB: 1024,
MB: 1024 * 1024,
GB: 1024 * 1024 * 1024
}
export default {
name: 'UploadImgB',
props: {
value: {
type: Array,
default: () => []
},
type: {
type: String,
default: 'annexpic'
},
disabled: {
type: Boolean,
default: false
},
detailed: {
type: Boolean,
default: false
},
showTip: {
type: Boolean,
default: false
},
limit: {
type: Number,
default: 0
},
accept: {
type: String,
default: 'image/*'
},
sizeUnit: {
type: String,
default: 'MB'
},
fileSize: {
default: 5
},
},
data() {
return {
fileList: [],
uploadHeaders: { Authorization: this.$store.getters.token }
}
},
watch: {
value: {
immediate: true,
handler(val) {
this.fileList = val
this.$nextTick(() => {
if (!val.length) {
this.$refs.elUpload && this.$refs.elUpload.uploadFiles.splice(0)
} else {
if (!this.$refs.elUpload) return
this.$refs.elUpload.uploadFiles = val.map(o => ({
...o,
uid: o.fileId
}))
}
})
}
}
},
methods: {
beforeUpload(file) {
const unitNum = units[this.sizeUnit];
if (!this.fileSize) return true
let isRightSize = file.size / unitNum < this.fileSize
if (!isRightSize) {
this.$message.error(`图片大小超过${this.fileSize}${this.sizeUnit}`)
return isRightSize;
}
let isAccept = new RegExp('image/*').test(file.type)
if (!isAccept) {
this.$message.error(`请上传图片`)
return isAccept;
}
return isRightSize && isAccept;
},
handleSuccess(res, file, fileList) {
if (res.code == 200) {
this.fileList.push({
name: file.name,
fileId: res.data.name,
url: res.data.url
})
this.$emit('input', this.fileList)
this.$emit('change', this.fileList, res)
} else {
this.$refs.elUpload.uploadFiles.splice(fileList.length - 1, 1)
fileList.filter(o => o.uid != file.uid)
this.$emit('input', this.fileList)
this.$emit('change', this.fileList)
this.$message({ message: res.msg, type: 'error', duration: 2500 })
}
},
handleExceed(files, fileList) {
this.$message.warning(`当前限制最多可以上传${this.limit}张图片`)
},
handlePictureCardPreview(index) {
this.$refs['image' + index][0].clickHandler()
},
handleRemove(index) {
this.fileList.splice(index, 1)
this.$refs.elUpload.uploadFiles.splice(index, 1)
this.$emit("input", this.fileList)
this.$emit('change', this.fileList)
},
getImgList(list) {
const newList = list.map(o => this.define.comUrl + o.url)
return newList
}
}
}
</script>
<style lang="scss">
.el-upload-list--picture-card .el-upload-list__item {
width: 120px;
height: 120px;
}
.el-upload--picture-card {
width: 120px;
height: 120px;
line-height: 120px;
}
.upload-btn {
display: inline-block;
overflow: hidden;
}
.el-upload--picture-card .el-upload-dragger {
width: 144px;
height: 144px;
}
</style>

@ -30,6 +30,7 @@ import JnpfDatePicker from '@/components/Jnpf/DatePicker'
import JnpfTimePicker from '@/components/Jnpf/TimePicker'
import JnpfUploadFile from '@/components/Jnpf/Upload/UploadFile'
import JnpfUploadImg from '@/components/Jnpf/Upload/UploadImg'
import JnpfUploadImgB from '@/components/Jnpf/Upload/UploadImgB'
import JnpfUploadPoundImg from '@/components/Jnpf/Upload/UploadPoundImg'
import JnpfUploadPoundsImg from '@/components/Jnpf/Upload/UploadPoundsImg'
import JnpfEditor from '@/components/JNPFEditor/quill'
@ -106,6 +107,7 @@ export default {
Vue.component('JnpfTimePicker', JnpfTimePicker)
Vue.component('JnpfUploadFile', JnpfUploadFile)
Vue.component('JnpfUploadImg', JnpfUploadImg)
Vue.component('JnpfUploadImgB', JnpfUploadImgB)
Vue.component('JnpfUploadPoundImg', JnpfUploadPoundImg)
Vue.component('JnpfUploadPoundsImg', JnpfUploadPoundsImg)
Vue.component('JnpfEditor', JnpfEditor)

@ -1483,8 +1483,9 @@
<template slot-scope="scope">
<JnpfInput v-model="scope.row.settlementSubtotalNo"
@change="changeData('cwaccountsummary-settlementSubtotalNo',scope.$index)"
placeholder="请输入" addonBefore="¥" :disabled="true" clearable
:style='{"width":"100%"}'>
placeholder="请输入" addonBefore="¥"
:disabled="judgeWrite('cwaccountsummaryList') || judgeWrite('cwaccountsummaryList-settlementSubtotalNo')"
clearable :style='{"width":"100%"}'>
</JnpfInput>
</template>
</el-table-column>
@ -1525,8 +1526,9 @@
<template slot-scope="scope">
<JnpfInput v-model="scope.row.settlementTotalNo"
@change="changeData('cwaccountsummary-settlementTotalNo',scope.$index)"
placeholder="请输入" addonBefore="¥" :disabled="true" clearable
:style='{"width":"100%"}'>
placeholder="请输入" addonBefore="¥"
:disabled="judgeWrite('cwaccountsummaryList') || judgeWrite('cwaccountsummaryList-settlementTotalNo')"
clearable :style='{"width":"100%"}'>
</JnpfInput>
</template>
</el-table-column>
@ -1799,7 +1801,8 @@ export default {
settlementTotalNoOptions: [],
remark: '',
remarkOptions: [],
enabledmark: undefined
enabledmark: undefined,
businessOrderId: undefined
},
cwaccountsummaryList: {
productId: '',
@ -2954,8 +2957,12 @@ export default {
},
sameReduce(arr) {
let result = arr.reduce((acc, cur) => {
// let found = acc.find((item) => {
// return item.productId === cur.productId
// })
debugger
let found = acc.find((item) => {
return item.productId === cur.productId
return item.businessOrderId === cur.businessOrderId && item.productId === cur.productId
})
if (found) {
found.settlementSum = this.jnpf.floatAdd(Number(found.settlementSum), Number(cur.settlementSum)).toFixed(4);
@ -2969,7 +2976,7 @@ export default {
found.otherExpenses = this.jnpf.floatSub(Number(found.otherExpenses), Number(cur.otherExpenses)).toFixed(2);
}
} else {
acc.push({ productId: cur.productId, productName: cur.productName, spec: cur.spec, rate: cur.rate, settlementSum: cur.settlementSum, settlementTotal: cur.settlementTotal, settlementUnit: cur.unit, settlementPrice: cur.settlementPrice, settlementSubtotal: cur.settlementSubtotal, settlementPriceNo: cur.settlementPriceNo, settlementSubtotalNo: cur.settlementSubtotalNo, otherType: cur.otherType, otherExpenses: cur.otherExpenses, settlementTotal: cur.settlementTotal, settlementTotalNo: cur.settlementTotalNo })
acc.push({ productId: cur.productId, productName: cur.productName, spec: cur.spec, rate: cur.rate, settlementSum: cur.settlementSum, settlementTotal: cur.settlementTotal, settlementUnit: cur.unit, settlementPrice: cur.settlementPrice, settlementSubtotal: cur.settlementSubtotal, settlementPriceNo: cur.settlementPriceNo, settlementSubtotalNo: cur.settlementSubtotalNo, otherType: cur.otherType, otherExpenses: cur.otherExpenses, settlementTotal: cur.settlementTotal, settlementTotalNo: cur.settlementTotalNo, businessOrderId: cur.businessOrderId })
}
return acc
}, [])
@ -2984,32 +2991,32 @@ export default {
})
return
}
debugger
var data = JSON.parse(JSON.stringify(this.dataForm.cwaccountstorageList))
var order = this.dataForm.cwaccountstorageList[0].orderCode
console.log(order);
var dataProduct = JSON.parse(JSON.stringify(this.dataForm.cwaccountvoucherList))
var productid = this.dataForm.cwaccountvoucherList[0].productId
// var data = JSON.parse(JSON.stringify(this.dataForm.cwaccountstorageList))
// var order = this.dataForm.cwaccountstorageList[0].orderCode
// console.log(order);
// var dataProduct = JSON.parse(JSON.stringify(this.dataForm.cwaccountvoucherList))
// var productid = this.dataForm.cwaccountvoucherList[0].productId
// data.forEach(item => {
// dataProduct.forEach(item1 => {
// // const flag = this.dataForm.cwaccountstorageList.find(e => e.orderCode == order)
// // if (item.orderCode == order && item1.productId == productid) {
// if (item.orderCode == order) {
// this.dataForm.cwaccountsummaryList = this.sameReduce(this.dataForm.cwaccountvoucherList);
// } else {
// this.dataForm.cwaccountsummaryList = this.dataForm.cwaccountvoucherList;
// return
// }
// })
// })
data.forEach(item => {
dataProduct.forEach(item1 => {
debugger
// const flag = this.dataForm.cwaccountstorageList.find(e => e.orderCode == order)
if (item.orderCode == order && item1.productId == productid) {
this.dataForm.cwaccountsummaryList = this.sameReduce(this.dataForm.cwaccountvoucherList);
} else {
this.dataForm.cwaccountsummaryList = this.dataForm.cwaccountvoucherList;
return
}
})
this.dataForm.cwaccountsummaryList = this.sameReduce(this.dataForm.cwaccountvoucherList);
this.dataForm.cwaccountsummaryList.forEach(item => {
item.settlementPrice = this.jnpf.floatDiv(item.settlementSubtotal, item.settlementSum);
item.settlementPriceNo = this.jnpf.floatDiv(item.settlementSubtotalNo, item.settlementSum);
console.log(item.settlementPriceNo + "111");
})
// this.dataForm.cwaccountsummaryList = this.sameReduce(this.dataForm.cwaccountvoucherList);
// this.dataForm.cwaccountsummaryList.forEach(item => {
// item.settlementPrice = this.jnpf.floatDiv(item.settlementSubtotal, item.settlementSum);
// item.settlementPriceNo = this.jnpf.floatDiv(item.settlementSubtotalNo, item.settlementSum);
// console.log(item.settlementPriceNo + "111");
// })
// console.log(this.dataForm.cwaccountsummaryList + "111");
/* let item = {
productId: undefined,

@ -3,6 +3,13 @@
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据编号">
<el-input v-model="query.code" placeholder="请输入" clearable> </el-input>
@ -28,13 +35,7 @@
</el-form-item>
</el-col>
</template>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>

@ -3,6 +3,13 @@
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据编号">
<el-input v-model="query.code" placeholder="请输入" clearable> </el-input>
@ -21,13 +28,7 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
@ -86,13 +87,19 @@
</el-table-column>
<el-table-column prop="paymentState" label="付款状态" width="100" align="center">
<template slot-scope="scope">
<el-tag type="warning" v-if="scope.row.paymentState==1 && (scope.row.businessType==1 || scope.row.businessType==4)"></el-tag>
<el-tag type="success" v-if="scope.row.paymentState==2 && (scope.row.businessType==1 || scope.row.businessType==4)"></el-tag>
<el-tag type="danger" v-if="scope.row.paymentState==3 && (scope.row.businessType==1 || scope.row.businessType==4)"></el-tag>
<el-tag type="warning"
v-if="scope.row.paymentState==1 && (scope.row.businessType==1 || scope.row.businessType==4)">未付款</el-tag>
<el-tag type="success"
v-if="scope.row.paymentState==2 && (scope.row.businessType==1 || scope.row.businessType==4)">部分付款</el-tag>
<el-tag type="danger"
v-if="scope.row.paymentState==3 && (scope.row.businessType==1 || scope.row.businessType==4)">已付款</el-tag>
<el-tag type="warning" v-if="scope.row.paymentState==1 && (scope.row.businessType==2 || scope.row.businessType==3)"></el-tag>
<el-tag type="success" v-if="scope.row.paymentState==2 && (scope.row.businessType==2 || scope.row.businessType==3)"></el-tag>
<el-tag type="danger" v-if="scope.row.paymentState==3 && (scope.row.businessType==2 || scope.row.businessType==3)"></el-tag>
<el-tag type="warning"
v-if="scope.row.paymentState==1 && (scope.row.businessType==2 || scope.row.businessType==3)">未收款</el-tag>
<el-tag type="success"
v-if="scope.row.paymentState==2 && (scope.row.businessType==2 || scope.row.businessType==3)">部分收款</el-tag>
<el-tag type="danger"
v-if="scope.row.paymentState==3 && (scope.row.businessType==2 || scope.row.businessType==3)">已收款</el-tag>
</template>
</el-table-column>
<el-table-column prop="settlementSubjectName" label="结算主体名称" align="center" width="250">

File diff suppressed because it is too large Load Diff

@ -3,6 +3,13 @@
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据编号">
<el-input v-model="query.code" placeholder="请输入" clearable> </el-input>
@ -14,13 +21,7 @@
" clearable multiple />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="费用发生时间">
<JnpfDateRangePicker v-model="query.costTime" format="yyyy-MM-dd"

@ -3,6 +3,12 @@
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="订单编号">
<el-input v-model="query.deliveryCode" placeholder="请输入" clearable> </el-input>
@ -15,12 +21,6 @@
</JnpfSelect>
</el-form-item>
</el-col> -->
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>

@ -132,10 +132,14 @@
<el-col :span="8" v-if="judgeShow('voucherPictures')">
<jnpf-form-tip-item label="凭证图片" v-if="judgeShow('voucherPictures')"
prop="voucherPictures">
<JnpfUploadPoundsImg v-model="dataForm.voucherPictures"
<!-- <JnpfUploadPoundsImg v-model="dataForm.voucherPictures"
@change="poundlistUploadSuccess" :disabled="judgeWrite('voucherPictures')"
:fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
</JnpfUploadPoundsImg>
</JnpfUploadPoundsImg> -->
<JnpfUploadImgB v-model="dataForm.voucherPictures"
@change="poundlistUploadSuccess" :disabled="judgeWrite('voucherPictures')"
:fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
</JnpfUploadImgB>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('poundCode')">
@ -420,11 +424,11 @@
prop="vehiclePictures">
<el-row>
<el-col :span="24">
<JnpfUploadImg v-model="dataForm.vehiclePictures"
<JnpfUploadImgB v-model="dataForm.vehiclePictures"
@change="changeData('vehiclePictures', -1)"
:disabled="judgeWrite('vehiclePictures')" :fileSize="10" sizeUnit="MB"
:limit="10" pathType="defaultPath" :isAccount="0">
</JnpfUploadImg>
</JnpfUploadImgB>
</el-col>
</el-row>
</jnpf-form-tip-item>

@ -3,6 +3,13 @@
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="凭证编号">
<el-input v-model="query.voucherCode" placeholder="请输入" clearable> </el-input>
@ -15,13 +22,7 @@
</JnpfSelect>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<template v-if="showAll">
<el-col :span="6">
<el-form-item label="磅单编号">

@ -3,6 +3,14 @@
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.createOrderDate" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据类型">
<JnpfSelect v-model="query.orderType" placeholder="请选择" clearable
@ -15,6 +23,19 @@
<el-input v-model="query.code" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="订单重量">
<el-input v-model="query.businessNum" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单人">
<el-input v-model="query.realName" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="是否紧急">
<JnpfSelect v-model="query.urgentOrder" placeholder="请选择" clearable
@ -23,12 +44,7 @@
</el-form-item>
</el-col>
<template v-if="showAll">
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.createOrderDate" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="配送方式">
<JnpfSelect v-model="query.deliveryType" placeholder="请选择" clearable
@ -411,7 +427,7 @@ export default {
})
},
methods: {
downLoadPDF(code){
downLoadPDF(code) {
window.open(
this.define.APIURl +
"/api/scm/BusinessOrder/exportPdf/" +

@ -3,6 +3,12 @@
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="订单编号">
<el-input v-model="query.receiptCode" placeholder="请输入" clearable> </el-input>
@ -15,12 +21,6 @@
</JnpfSelect>
</el-form-item>
</el-col> -->
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>

@ -132,10 +132,15 @@
<el-col :span="8" v-if="judgeShow('voucherPictures')">
<jnpf-form-tip-item label="凭证图片" v-if="judgeShow('voucherPictures')"
prop="voucherPictures">
<JnpfUploadPoundImg v-model="dataForm.voucherPictures"
<!-- <JnpfUploadPoundImg v-model="dataForm.voucherPictures"
@change="poundlistUploadSuccess" :disabled="judgeWrite('voucherPictures')"
:fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
</JnpfUploadPoundImg>
</JnpfUploadPoundImg> -->
<JnpfUploadImgB v-model="dataForm.voucherPictures"
@change="poundlistUploadSuccess" :disabled="judgeWrite('voucherPictures')"
:fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
</JnpfUploadImgB>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('poundCode')">
@ -433,11 +438,11 @@
prop="vehiclePictures">
<el-row>
<el-col :span="24">
<JnpfUploadImg v-model="dataForm.vehiclePictures"
<JnpfUploadImgB v-model="dataForm.vehiclePictures"
@change="changeData('vehiclePictures', -1)"
:disabled="judgeWrite('vehiclePictures')" :fileSize="10" sizeUnit="MB"
:limit="10" pathType="defaultPath" :isAccount="0">
</JnpfUploadImg>
</JnpfUploadImgB>
</el-col>
</el-row>
</jnpf-form-tip-item>

@ -3,6 +3,13 @@
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="凭证编号">
<el-input v-model="query.voucherCode" placeholder="请输入" clearable> </el-input>
@ -30,13 +37,7 @@
</JnpfSelect>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<template v-if="showAll">
<el-col :span="6">
<el-form-item label="磅单编号">

@ -3,6 +3,12 @@
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="订单编号">
<el-input v-model="query.returnCargoCode" placeholder="请输入" clearable> </el-input>
@ -15,12 +21,6 @@
</JnpfSelect>
</el-form-item>
</el-col> -->
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>

@ -3,6 +3,12 @@
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="订单编号">
<el-input v-model="query.deliveryCode" placeholder="请输入" clearable> </el-input>
@ -15,12 +21,7 @@
</JnpfSelect>
</el-form-item>
</el-col> -->
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>

@ -118,10 +118,16 @@
<el-col :span="8" v-if="judgeShow('voucherPictures')">
<jnpf-form-tip-item label="凭证图片" v-if="judgeShow('voucherPictures')"
prop="voucherPictures">
<JnpfUploadPoundsImg v-model="dataForm.voucherPictures"
<!-- <JnpfUploadPoundsImg v-model="dataForm.voucherPictures"
@change="poundlistUploadSuccess" :disabled="judgeWrite('voucherPictures')"
:fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
</JnpfUploadPoundsImg>
</JnpfUploadPoundsImg> -->
<JnpfUploadImgB v-model="dataForm.voucherPictures"
@change="poundlistUploadSuccess" :disabled="judgeWrite('voucherPictures')"
:fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
</JnpfUploadImgB>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('poundCode')">
@ -419,11 +425,11 @@
prop="vehiclePictures">
<el-row>
<el-col :span="24">
<JnpfUploadImg v-model="dataForm.vehiclePictures"
<JnpfUploadImgB v-model="dataForm.vehiclePictures"
@change="changeData('vehiclePictures', -1)"
:disabled="judgeWrite('vehiclePictures')" :fileSize="10" sizeUnit="MB"
:limit="10" pathType="defaultPath" :isAccount="0">
</JnpfUploadImg>
</JnpfUploadImgB>
</el-col>
</el-row>
</jnpf-form-tip-item>

@ -3,6 +3,13 @@
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="凭证编号">
<el-input v-model="query.voucherCode" placeholder="请输入" clearable> </el-input>
@ -15,13 +22,6 @@
</JnpfSelect>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<template v-if="showAll">
<el-col :span="6">
<el-form-item label="磅单编号">

@ -3,6 +3,12 @@
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="订单编号">
<el-input v-model="query.receiptCode" placeholder="请输入" clearable> </el-input>
@ -15,12 +21,6 @@
</JnpfSelect>
</el-form-item>
</el-col> -->
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>

@ -117,10 +117,14 @@
<el-col :span="8" v-if="judgeShow('voucherPictures')">
<jnpf-form-tip-item label="凭证图片" v-if="judgeShow('voucherPictures')"
prop="voucherPictures">
<JnpfUploadPoundImg v-model="dataForm.voucherPictures"
<!-- <JnpfUploadPoundImg v-model="dataForm.voucherPictures"
@change="poundlistUploadSuccess" :disabled="judgeWrite('voucherPictures')"
:fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
</JnpfUploadPoundImg>
</JnpfUploadPoundImg> -->
<JnpfUploadImgB v-model="dataForm.voucherPictures"
@change="poundlistUploadSuccess" :disabled="judgeWrite('voucherPictures')"
:fileSize="10" sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
</JnpfUploadImgB>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('poundCode')">
@ -403,11 +407,11 @@
prop="vehiclePictures">
<el-row>
<el-col :span="24">
<JnpfUploadImg v-model="dataForm.vehiclePictures"
<JnpfUploadImgB v-model="dataForm.vehiclePictures"
@change="changeData('vehiclePictures', -1)"
:disabled="judgeWrite('vehiclePictures')" :fileSize="10" sizeUnit="MB"
:limit="10" pathType="defaultPath" :isAccount="0">
</JnpfUploadImg>
</JnpfUploadImgB>
</el-col>
</el-row>
</jnpf-form-tip-item>

@ -3,6 +3,13 @@
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="凭证编号">
<el-input v-model="query.voucherCode" placeholder="请输入" clearable> </el-input>
@ -15,13 +22,7 @@
</JnpfSelect>
</el-form-item>
</el-col> -->
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<template v-if="showAll">
<el-col :span="6">
<el-form-item label="磅单编号">

@ -3,11 +3,6 @@
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="补送订单编号">
<el-input v-model="query.redeliveryOrderCode" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
@ -15,6 +10,12 @@
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="补送订单编号">
<el-input v-model="query.redeliveryOrderCode" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>

@ -3,6 +3,12 @@
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="订单编号">
<el-input v-model="query.returnCargoCode" placeholder="请输入" clearable> </el-input>
@ -15,12 +21,7 @@
</JnpfSelect>
</el-form-item>
</el-col> -->
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>

@ -1292,13 +1292,6 @@ export default {
trigger: 'change'
},
],
secondSubjectBasicId: [
{
required: true,
message: '请选择',
trigger: 'change'
},
],
firstSubjectBasicId: [
{
required: true,

@ -3,6 +3,12 @@
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.createOrderDate" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据类型">
<JnpfSelect v-model="query.orderType" placeholder="请选择" clearable
@ -23,12 +29,7 @@
</el-form-item>
</el-col>
<template v-if="showAll">
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.createOrderDate" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="是否紧急">
<JnpfSelect v-model="query.urgentOrder" placeholder="请选择" clearable

@ -3,17 +3,18 @@
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="质检单编号">
<el-input v-model="query.inspectionCode" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.creatorTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="质检单编号">
<el-input v-model="query.inspectionCode" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="质检类型">
<JnpfSelect v-model="query.inspectionType" placeholder="请选择" clearable

@ -3,6 +3,13 @@
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.creatorTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据编号">
<el-input v-model="query.code" placeholder="请输入" clearable> </el-input>
@ -13,21 +20,12 @@
<el-input v-model="query.businessCode" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col> -->
<el-col :span="6">
<el-form-item label="商品名称">
<el-input v-model="query.productName" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.creatorTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据类型">
<JnpfSelect v-model="query.type" placeholder="请选择" clearable :options="typeOptions"

Loading…
Cancel
Save