Merge remote-tracking branch 'origin/main'

product
bawei 2 years ago
commit 9fd16b25e3

@ -9,6 +9,7 @@ target/
log/ log/
logback-test.xml logback-test.xml
application-dev.yml
# Compiled class file # Compiled class file

@ -577,6 +577,24 @@ public class PoundlistController {
} }
/**
*
*
* @param id
* @return
*/
@PostMapping("/handleReturn/{id}")
@Transactional
public ActionResult handleReturn(@PathVariable("id") String id){
PoundlistEntity entity= poundlistService.getInfo(id);
if(entity!=null){
entity.setIsExamine("0");
poundlistService.updateById(entity);
return ActionResult.success("驳回成功");
}
return ActionResult.fail("数据不存在");
}

@ -128,7 +128,7 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
//排序 //排序
if(StringUtil.isEmpty(tradeuploadPagination.getSidx())){ if(StringUtil.isEmpty(tradeuploadPagination.getSidx())){
tradeuploadPagination.setSidx("CREATOR_TIME"); tradeuploadPagination.setSidx("CREATOR_TIME");
tradeuploadPagination.setSort("DESC"); tradeuploadPagination.setSort("ASC");
}else{ }else{
try { try {
String sidx = tradeuploadPagination.getSidx(); String sidx = tradeuploadPagination.getSidx();

@ -52,10 +52,12 @@ creator_time = DATE_SUB(NOW(),interval 15 day)
<if test="tradeuploadPagination.salesName != null and tradeuploadPagination.salesName != ''"> <if test="tradeuploadPagination.salesName != null and tradeuploadPagination.salesName != ''">
AND f.contract_name LIKE CONCAT('%',#{tradeuploadPagination.salesName},'%') AND f.contract_name LIKE CONCAT('%',#{tradeuploadPagination.salesName},'%')
</if> </if>
<if test="tradeuploadPagination.customerName != null and tradeuploadPagination.customerName != ''"> <if test="tradeuploadPagination.customerName != null and tradeuploadPagination.customerName != ''">
AND d.supplier_nm LIKE CONCAT('%',#{tradeuploadPagination.customerName},'%') AND d.supplier_nm LIKE CONCAT('%',#{tradeuploadPagination.customerName},'%')
</if> </if>
<if test="tradeuploadPagination.businessName != null and tradeuploadPagination.businessName != ''">
AND h.F_RealName LIKE CONCAT('%',#{tradeuploadPagination.businessName},'%')
</if>
<if test="tradeuploadPagination.sidx != null and tradeuploadPagination.sidx != ''"> <if test="tradeuploadPagination.sidx != null and tradeuploadPagination.sidx != ''">
ORDER BY ${tradeuploadPagination.sidx} ${tradeuploadPagination.sort} ORDER BY ${tradeuploadPagination.sidx} ${tradeuploadPagination.sort}
</if> </if>

@ -2,12 +2,12 @@
<div> <div>
<el-row :gutter="15"> <el-row :gutter="15">
<el-form ref="elForm" :model="dataForm" :rules="dataRule" size="small" label-width="100px" <el-form ref="elForm" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
label-position="right" :disabled="setting.readonly"> label-position="right" aria-disabled="true">
<template v-if="!loading && formOperates"> <template v-if="!loading && formOperates">
<el-col :span="6" v-if="judgeShow('documentNo')"> <el-col :span="6" v-if="judgeShow('documentNo')">
<el-form-item label="单据编号" prop="documentNo"> <el-form-item label="单据编号" prop="documentNo">
<el-input :disabled="judgeWrite('documentNo')" v-model="dataForm.documentNo" <el-input :disabled="judgeWrite('documentNo')" v-model="dataForm.documentNo"
placeholder="系统自动生成" readonly> placeholder="系统自动生成" disabled >
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -29,7 +29,7 @@
<el-select :disabled="judgeWrite('paymentType')" v-model="dataForm.paymentType" <el-select :disabled="judgeWrite('paymentType')" v-model="dataForm.paymentType"
placeholder="请选择" clearable :style='{"width":"100%"}'> placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in paymentTypeOptions" :key="index" <el-option v-for="(item, index) in paymentTypeOptions" :key="index"
:label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option> :label="item.fullName" :value="item.id" :disabled="item.disabled" disabled></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -104,7 +104,7 @@
<el-col :span="6" v-if="judgeShow('collectionAccount')"> <el-col :span="6" v-if="judgeShow('collectionAccount')">
<el-form-item label="收款账户" prop="collectionAccount"> <el-form-item label="收款账户" prop="collectionAccount">
<el-input :disabled="judgeWrite('collectionAccount')" v-model="dataForm.collectionAccount" <el-input :disabled="judgeWrite('collectionAccount')" v-model="dataForm.collectionAccount"
placeholder="请输入" clearable :style='{"width":"100%"}'> placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -113,7 +113,7 @@
<el-col :span="6" v-if="judgeShow('colectionBank')"> <el-col :span="6" v-if="judgeShow('colectionBank')">
<el-form-item label="收款银行" prop="colectionBank"> <el-form-item label="收款银行" prop="colectionBank">
<el-input :disabled="judgeWrite('colectionBank')" v-model="dataForm.colectionBank" <el-input :disabled="judgeWrite('colectionBank')" v-model="dataForm.colectionBank"
placeholder="请输入" clearable :style='{"width":"100%"}'> placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -192,7 +192,7 @@
<el-input v-model="scope.row.amount" <el-input v-model="scope.row.amount"
:disabled="judgeWrite('paymentdocitem0List') || judgeWrite('paymentdocitem0List-amount')" :disabled="judgeWrite('paymentdocitem0List') || judgeWrite('paymentdocitem0List-amount')"
placeholder="请输入" clearable :style='{"width":"100%"}' placeholder="请输入" clearable :style='{"width":"100%"}'
@change="amountChange(scope.row)"> @change="amountChange(scope.row)" readonly>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
@ -201,7 +201,7 @@
订单金额 订单金额
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.allAmount" placeholder="请输入" clearable <el-input class="rt-input" v-model="scope.row.allAmount" placeholder="请输入" clearable
:style='{"width":"100%"}' readonly> :style='{"width":"100%"}' readonly>
</el-input> </el-input>
</template> </template>
@ -362,7 +362,7 @@
width="250"> width="250">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.purchaseorderNo" placeholder="请输入" <el-input v-model="scope.row.purchaseorderNo" placeholder="请输入"
clearable :style='{"width":"100%"}' :disabled="true"> clearable :style='{"width":"100%"}' readonly>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
@ -370,7 +370,7 @@
:disabled="true"> :disabled="true">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.isPay" placeholder="请选择" clearable <el-select v-model="scope.row.isPay" placeholder="请选择" clearable
:style='{"width":"100%"}' :disabled="true"> :style='{"width":"100%"}' disabled>
<el-option v-for="(item, index) in advanceOptions" :key="index" <el-option v-for="(item, index) in advanceOptions" :key="index"
:label="item.fullName" :value="item.id" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option> :disabled="item.disabled"></el-option>
@ -380,14 +380,14 @@
<el-table-column prop="vehicleName" label="车辆" align="center" width="130"> <el-table-column prop="vehicleName" label="车辆" align="center" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.vehicleName" placeholder="请输入" <el-input v-model="scope.row.vehicleName" placeholder="请输入"
clearable :style='{"width":"100%"}' :disabled="true"> clearable :style='{"width":"100%"}' readonly>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="materialName" label="物料" align="center" width="180"> <el-table-column prop="materialName" label="物料" align="center" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.materialName" placeholder="请输入" <el-input v-model="scope.row.materialName" placeholder="请输入"
clearable :style='{"width":"100%"}' :disabled="true"> clearable :style='{"width":"100%"}' readonly>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
@ -404,24 +404,24 @@
<el-table-column prop="poundType" label="磅单类型" align="center" width="130"> <el-table-column prop="poundType" label="磅单类型" align="center" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.poundType" placeholder="请选择" clearable <el-select v-model="scope.row.poundType" placeholder="请选择" clearable
:style='{"width":"100%"}' :disabled="true"> :style='{"width":"100%"}' readonly>
<el-option v-for="(item, index) in poundTypeOptions" <el-option v-for="(item, index) in poundTypeOptions"
:key="index" :label="item.fullName" :value="item.id" :key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option> :disabled="item.disabled" disabled></el-option>
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="netWeight" label="净重" align="center" width="130"> <el-table-column prop="netWeight" label="净重" align="center" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.netWeight" placeholder="请输入" clearable <el-input v-model="scope.row.netWeight" placeholder="请输入" clearable
:style='{"width":"100%"}' :disabled="true"> :style='{"width":"100%"}' readonly>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="unit" label="单位" align="center" width="130"> <el-table-column prop="unit" label="单位" align="center" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.unit" placeholder="请选择" clearable <el-select v-model="scope.row.unit" placeholder="请选择" clearable
:style='{"width":"100%"}' :disabled="true"> :style='{"width":"100%"}' readonly>
<el-option v-for="(item, index) in unitOptions" :key="index" <el-option v-for="(item, index) in unitOptions" :key="index"
:label="item.fullName" :value="item.id" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option> :disabled="item.disabled"></el-option>
@ -432,7 +432,7 @@
:disabled="true"> :disabled="true">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.advance" placeholder="请选择" clearable <el-select v-model="scope.row.advance" placeholder="请选择" clearable
:style='{"width":"100%"}' :disabled="true"> :style='{"width":"100%"}' readonly>
<el-option v-for="(item, index) in advanceOptions" :key="index" <el-option v-for="(item, index) in advanceOptions" :key="index"
:label="item.fullName" :value="item.id" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option> :disabled="item.disabled"></el-option>
@ -442,45 +442,45 @@
<el-table-column prop="purchasePrice" label="单价" align="center" width="130"> <el-table-column prop="purchasePrice" label="单价" align="center" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.purchasePrice" placeholder="请输入" clearable <el-input v-model="scope.row.purchasePrice" placeholder="请输入" clearable
:style='{"width":"100%"}' :disabled="true"> :style='{"width":"100%"}' readonly>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="settlement" label="结算重量 " align="center" width="130"> <el-table-column prop="settlement" label="结算重量 " align="center" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.settlement" placeholder="请输入" clearable <el-input v-model="scope.row.settlement" placeholder="请输入" clearable
:style='{"width":"100%"}' :disabled="true"> :style='{"width":"100%"}' readonly>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="rate" label="税率 " align="center" width="130"> <el-table-column prop="rate" label="税率 " align="center" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.rate" placeholder="请选择" clearable <el-select v-model="scope.row.rate" placeholder="请选择" clearable
:style='{"width":"100%"}' :disabled="true"> :style='{"width":"100%"}' readonly>
<el-option v-for="(item, index) in rateOptions" :key="index" <el-option v-for="(item, index) in rateOptions" :key="index"
:label="item.fullName" :value="item.id" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option> :disabled="item.disabled" disabled></el-option>
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="amount" label="金额" align="center" width="130"> <el-table-column prop="amount" label="金额" align="center" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.amount" placeholder="请输入" clearable <el-input v-model="scope.row.amount" placeholder="请输入" clearable
:style='{"width":"100%"}' :disabled="true"> :style='{"width":"100%"}' readonly>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="notAmount" label="不含税金额" align="center" width="130"> <el-table-column prop="notAmount" label="不含税金额" align="center" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.notAmount" placeholder="请输入" clearable <el-input v-model="scope.row.notAmount" placeholder="请输入" clearable
:style='{"width":"100%"}' :disabled="true"> :style='{"width":"100%"}' readonly>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="remark" label="备注" align="center" width="130"> <el-table-column prop="remark" label="备注" align="center" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.remark" placeholder="请输入" clearable <el-input v-model="scope.row.remark" placeholder="请输入" clearable
:style='{"width":"100%"}' :disabled="true"> :style='{"width":"100%"}' readonly>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
@ -547,7 +547,7 @@
width="250"> width="250">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.documentno" placeholder="请输入" <el-input v-model="scope.row.documentno" placeholder="请输入"
clearable :style='{"width":"100%"}' :disabled="true"> clearable :style='{"width":"100%"}' readonly>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
@ -569,7 +569,7 @@
width="150"> width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.paymentamount" placeholder="请输入" <el-input v-model="scope.row.paymentamount" placeholder="请输入"
clearable :style='{"width":"100%"}' :disabled="true"> clearable :style='{"width":"100%"}' readonly>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
@ -577,24 +577,24 @@
width="130"> width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.settlementtype" placeholder="请选择" clearable <el-select v-model="scope.row.settlementtype" placeholder="请选择" clearable
:style='{"width":"100%"}' :disabled="true"> :style='{"width":"100%"}' readonly>
<el-option v-for="(item, index) in settlementTypeOptions" <el-option v-for="(item, index) in settlementTypeOptions"
:key="index" :label="item.fullName" :value="item.id" :key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option> :disabled="item.disabled" disabled></el-option>
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="remark" label="备注" align="center"> <el-table-column prop="remark" label="备注" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.remark" placeholder="请输入" clearable <el-input v-model="scope.row.remark" placeholder="请输入" clearable
:style='{"width":"100%"}' :disabled="true"> :style='{"width":"100%"}' readonly>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="creatorUserName" label="付款人" align="center" width="130"> <el-table-column prop="creatorUserName" label="付款人" align="center" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.creatorUserName" placeholder="请输入" clearable <el-input v-model="scope.row.creatorUserName" placeholder="请输入" clearable
:style='{"width":"100%"}' :disabled="true"> :style='{"width":"100%"}' readonly>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
@ -620,8 +620,9 @@
import { import {
getDictionaryDataSelector getDictionaryDataSelector
} from '@/api/systemData/dictionary' } from '@/api/systemData/dictionary'
import StyleScript from '@/components/Generator/index/StyleScript'
export default { export default {
components: {}, components: { StyleScript },
props: [], props: [],
data() { data() {
return { return {
@ -1211,3 +1212,9 @@
}, },
} }
</script> </script>
<style lang="scss" scoped>
.rt-input.el-input__inner {
color: red !important;
cursor: pointer;
}
</style>

@ -233,7 +233,9 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="150" align="center"> <el-table-column label="操作" fixed="right" width="150" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'"> <!-- <el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">
</el-button>-->
<el-button type="text" @click="handleReturn(scope.row)" v-has="'btn_remove'">
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row)" v-has="'btn_remove'"> <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row)" v-has="'btn_remove'">
</el-button> </el-button>
@ -572,6 +574,32 @@
this.listLoading = false this.listLoading = false
}) })
}, },
handleReturn(row){
/* if(row.purchaseStatus != '99' || row.salesStatus != '99'){
this.$message({
type: 'error',
message: '该磅单已生成采购或销售无法删除',
duration: 2500,
})
return
}*/
this.$confirm('是否确认驳回?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/poundlist/Poundlist/handleReturn/${row.id}`,
method: 'post'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
}).catch(() => {});
},
handleDel(row) { handleDel(row) {
if(row.purchaseStatus != '99' || row.salesStatus != '99'){ if(row.purchaseStatus != '99' || row.salesStatus != '99'){
this.$message({ this.$message({

@ -103,6 +103,16 @@
{{ scope.row.currency | dynamicText(currencyOptions) }} {{ scope.row.currency | dynamicText(currencyOptions) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否付款" sortable width="100" prop="isPayment" align="center" >
<template slot-scope="scope">
{{ scope.row.isPayment | dynamicText(isPaymentOptions) }}
</template>
</el-table-column>
<el-table-column label="是否转销售" sortable width="110" prop="isTransfer" align="center" >
<template slot-scope="scope">
{{ scope.row.isTransfer | dynamicText(isTransferOptions) }}
</template>
</el-table-column>
<el-table-column prop="payPrice" label="已付款金额" sortable width="150" align="center" /> <el-table-column prop="payPrice" label="已付款金额" sortable width="150" align="center" />
<el-table-column prop="invoiceNum" label="发票数量" sortable width="150" align="center" /> <el-table-column prop="invoiceNum" label="发票数量" sortable width="150" align="center" />
<el-table-column prop="invoiceAmount" label="发票金额" sortable width="150" align="center" /> <el-table-column prop="invoiceAmount" label="发票金额" sortable width="150" align="center" />
@ -258,6 +268,10 @@
prop: 'notAmount', prop: 'notAmount',
label: '不含税金额' label: '不含税金额'
}, },
{
prop: 'isPayment',
label: '是否付款'
},
{ {
prop: 'payPrice', prop: 'payPrice',
label: '已付款金额' label: '已付款金额'
@ -285,6 +299,20 @@
"fullName": "英镑", "fullName": "英镑",
"id": "2" "id": "2"
}], }],
isPaymentOptions: [{
"fullName": "否",
"id": "0"
}, {
"fullName": "是",
"id": "1"
}],
isTransferOptions: [{
"fullName": "否",
"id": "0"
}, {
"fullName": "是",
"id": "1"
}],
currencyProps: { currencyProps: {
"label": "fullName", "label": "fullName",
"value": "id" "value": "id"

@ -331,7 +331,18 @@
receiptin_item0List: [], receiptin_item0List: [],
}, },
activevpzhms: '0', activevpzhms: '0',
rules: {}, rules: {
reservoirareaName: [{
required: true,
message: '请选择',
trigger: 'change'
}],
warehouseName: [{
required: true,
message: '请选择',
trigger: 'change'
}],
},
typeOptions: [{ typeOptions: [{
"fullName": "采购入库", "fullName": "采购入库",
"id": "0" "id": "0"

@ -151,14 +151,14 @@
</popupSelect> </popupSelect>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="reservoirareaId" width="200" label="库区"> <el-table-column prop="reservoirareaName" required width="200" label="库区">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.reservoirareaName" placeholder="选择库区" <el-input v-model="scope.row.reservoirareaName" placeholder="选择库区"
readonly @click.native="choiceReservoirareaId(scope.$index)"> readonly @click.native="choiceReservoirareaId(scope.$index)">
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="warehouseId" width="200" label="仓库"> <el-table-column prop="warehouseName" required width="200" label="仓库">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.warehouseName" placeholder="选择库区" <el-input v-model="scope.row.warehouseName" placeholder="选择库区"
readonly> readonly>
@ -292,7 +292,18 @@
receiptin_item0List: [], receiptin_item0List: [],
}, },
activevpzhms: '0', activevpzhms: '0',
rules: {}, rules: {
reservoirareaName: [{
required: true,
message: '请选择',
trigger: 'change'
}],
warehouseName: [{
required: true,
message: '请选择',
trigger: 'change'
}],
},
typeOptions: [{ typeOptions: [{
"fullName": "采购入库", "fullName": "采购入库",
"id": "0" "id": "0"
@ -458,19 +469,19 @@
mounted() {}, mounted() {},
methods: { methods: {
initData(reservoirarea) { initData(reservoirarea) {
for (let i = 0; i < this.dataForm.receiptout_item0List.length; i++) { for (let i = 0; i < this.dataForm.receiptin_item0List.length; i++) {
if (this.comIndex == 0) { if (this.comIndex == 0) {
this.dataForm.receiptout_item0List.forEach((column, index) => { this.dataForm.receiptin_item0List.forEach((column, index) => {
column.reservoirareaId = reservoirarea.id; column.reservoirareaId = reservoirarea.id;
column.warehouseId = reservoirarea.houseId; column.warehouseId = reservoirarea.houseId;
column.reservoirareaName = reservoirarea.areaname; column.reservoirareaName = reservoirarea.areaname;
column.warehouseName = reservoirarea.houseName; column.warehouseName = reservoirarea.houseName;
}); });
} else { } else {
this.dataForm.receiptout_item0List[this.comIndex].reservoirareaId = reservoirarea.id; this.dataForm.receiptin_item0List[this.comIndex].reservoirareaId = reservoirarea.id;
this.dataForm.receiptout_item0List[this.comIndex].warehouseId = reservoirarea.houseId; this.dataForm.receiptin_item0List[this.comIndex].warehouseId = reservoirarea.houseId;
this.dataForm.receiptout_item0List[this.comIndex].reservoirareaName = reservoirarea.areaname; this.dataForm.receiptin_item0List[this.comIndex].reservoirareaName = reservoirarea.areaname;
this.dataForm.receiptout_item0List[this.comIndex].warehouseName = reservoirarea.houseName; this.dataForm.receiptin_item0List[this.comIndex].warehouseName = reservoirarea.houseName;
} }
} }
}, },

@ -324,19 +324,19 @@
mounted() {}, mounted() {},
methods: { methods: {
initData(reservoirarea) { initData(reservoirarea) {
for (let i = 0; i < this.dataForm.receiptin_item0List.length; i++) { for (let i = 0; i < this.dataForm.receiptout_item0List.length; i++) {
if (this.comIndex == 0) { if (this.comIndex == 0) {
this.dataForm.receiptin_item0List.forEach((column, index) => { this.dataForm.receiptout_item0List.forEach((column, index) => {
column.reservoirareaId = reservoirarea.id; column.reservoirareaId = reservoirarea.id;
column.warehouseId = reservoirarea.houseId; column.warehouseId = reservoirarea.houseId;
column.reservoirareaName = reservoirarea.areaname; column.reservoirareaName = reservoirarea.areaname;
column.warehouseName = reservoirarea.houseName; column.warehouseName = reservoirarea.houseName;
}); });
} else { } else {
this.dataForm.receiptin_item0List[this.comIndex].reservoirareaId = reservoirarea.id; this.dataForm.receiptout_item0List[this.comIndex].reservoirareaId = reservoirarea.id;
this.dataForm.receiptin_item0List[this.comIndex].warehouseId = reservoirarea.houseId; this.dataForm.receiptout_item0List[this.comIndex].warehouseId = reservoirarea.houseId;
this.dataForm.receiptin_item0List[this.comIndex].reservoirareaName = reservoirarea.areaname; this.dataForm.receiptout_item0List[this.comIndex].reservoirareaName = reservoirarea.areaname;
this.dataForm.receiptin_item0List[this.comIndex].warehouseName = reservoirarea.houseName; this.dataForm.receiptout_item0List[this.comIndex].warehouseName = reservoirarea.houseName;
} }
} }
}, },

@ -0,0 +1,156 @@
<template>
<el-dialog title="选择库区" :close-on-click-modal="false" :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center"
lock-scroll append-to-body width="1000px">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="8">
<el-form-item label="库区编码">
<el-input v-model="areacode" placeholder="请输入库区编码查询" clearable @keyup.enter.native="init()" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="库区名称">
<el-input v-model="areaname" placeholder="请输入库区名称查询" clearable @keyup.enter.native="init()" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="init()">{{$t('common.search')}}
</el-button>
<el-button icon="el-icon-refresh-right" @click="refresh()">{{$t('common.reset')}}
</el-button>
</el-form-item>
</el-col>
</el-form>
<div class="JNPF-common-search-box-right">
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="init()" />
</el-tooltip>
</div>
</el-row>
<JNPF-table v-loading="listLoading" :data="list" @row-click="rowClick" @row-dblclick="rowdbClick" :border="false" :hasNO="false">
<el-table-column width="35">
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="checkedRow.id">&nbsp;</el-radio>
</template>
</el-table-column>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="areacode" label="库区编码" />
<el-table-column prop="areaname" label="库区名称" />
<el-table-column prop="maximum" label="最高库存" />
<el-table-column prop="safety" label="安全库存" />
<el-table-column prop="minimum" label="最低库存" />
<el-table-column prop="warehouseId" label="仓库名称" />
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="refresh" />
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">{{$t('common.cancelButton')}}</el-button>
<el-button type="primary" @click="select()">{{$t('common.confirmButton')}}</el-button>
</span>
</el-dialog>
</template>
<script>
import request from '@/utils/request'
import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
import {
getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import {
GoodsList
} from '@/api/extend/order'
export default {
data() {
return {
visible: false,
listLoading: true,
areacode: '',
areaname: '',
list: [],
total: 0,
checkedRow: {},
listQuery: {
currentPage: 1,
pageSize: 20,
sort: "desc",
sidx: "creatorTime",
areacode: '',
areaname: '',
},
total: 0,
checked: '',
}
},
computed: {
menuId() {
return this.$route.meta.modelId || ''
}
},
methods: {
rowdbClick(row){
this.checked = row.id
this.checkedRow = row
this.select();
},
rowClick(row) {
this.checked = row.id
this.checkedRow = row
},
init() {
this.visible = true
this.listLoading = true
this.listQuery.areacode = this.areacode
this.listQuery.areaname = this.areaname
this.listQuery.menuId = this.menuId
let listQuery = this.listQuery
request({
url: `/api/example/Reservoirarea/getList`,
method: 'post',
data: listQuery
}).then(res => {
this.list = res.data.list
this.total = res.data.pagination.total
this.listLoading = false
})
/* GoodsList(query).then(res => {
this.list = res.data.list
this.total = res.data.pagination.total
this.listLoading = false
}) */
},
refresh() {
this.areacode = ''
this.areaname = ''
this.init()
},
select() {
if (this.checked == '') return
this.$emit('refreshDataList', this.checkedRow)
this.visible = false
},
handleSelectionChange(val) {
this.checked = val
}
}
}
</script>
<style lang="scss" scoped>
>>>.el-dialog__body {
height: 70vh;
padding: 0 0 10px !important;
display: flex;
flex-direction: column;
overflow: hidden;
.JNPF-common-search-box {
margin-bottom: 0;
.JNPF-common-search-box-right {
padding: 10px 10px 0 0;
}
}
}
</style>

@ -157,9 +157,9 @@
<el-button type="text" <el-button type="text"
@click="addOrUpdateHandle2(scope.row.id)" v-has="'btn_addOrUpdateHandle2'">审核 @click="addOrUpdateHandle2(scope.row.id)" v-has="'btn_addOrUpdateHandle2'">审核
</el-button> </el-button>
<!-- <el-button type="text" <el-button type="text"
@click="addOrUpdateHandle(scope.row.id)">编辑 @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button> --> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)" v-has="'btn_remove'"> <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)" v-has="'btn_remove'">
</el-button> </el-button>
<el-button type="text" <el-button type="text"

Loading…
Cancel
Save