UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

领用管理提交

Browse Source
20231126-yw
yuanwei 2 years ago
parent e89765c167
commit e0ec2f32a1
5 changed files with 1582 additions and 505 deletions
Show Stats Download Patch File Download Diff File

27
src/api/system/invSubWarehouse.js
Unescape Escape View File

@ -1,4 +1,14 @@
import axios from "@/utils/request"; import axios from "@/utils/request";
import {filterCompanyOptimize} from "@/api/basic/product/udiInfo";
export function filterSubAllOptimize(query) {
return axios({
url: "/spms/sub/inv/warehouse/filterOptimize",
method: "get",
params: query
});
}
export function filterSubAll(query) { export function filterSubAll(query) {
@ -19,6 +29,15 @@ export function findInvByUser(query) {
}); });
} }
//获取用户所有关联仓库
export function findInvByUserOptimize(query) {
return axios({
url: "/spms/inv/warehouse/findByUserOptimize",
method: "get",
params: query
});
}
export function filterGroupBySpuse(params) { export function filterGroupBySpuse(params) {
return axios({ return axios({
@ -30,6 +49,14 @@ export function filterGroupBySpuse(params) {
//获取除了自己所有其他仓库 //获取除了自己所有其他仓库
export function findByFromOptimize(query) {
return axios({
url: "/spms/inv/warehouse/findByFromOptimize",
method: "get",
params: query
});
}
export function findByFrom(query) { export function findByFrom(query) {
return axios({ return axios({
url: "/spms/inv/warehouse/findByFrom", url: "/spms/inv/warehouse/findByFrom",

513
src/views/inout/receive/receiveAdd.vue
Unescape Escape View File

@ -1,65 +1,105 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="filterQuery" label-width="100px" v-show="showSearch"> <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" label-width="100px" v-show="showSearch">
<el-row> <!-- <el-row>-->
<el-col :span="8"> <!-- <el-col :span="8">-->
<el-form-item label="领用单号:"> <!-- <el-form-item label="领用单号:">-->
<el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input> <!-- <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="领用仓库:">-->
<!-- <el-select v-model="filterQuery.invCode" placeholder="请选择领用仓库" style="width: 100%;">-->
<!-- <el-option-->
<!-- v-for="item in invList"-->
<!-- :key="item.code"-->
<!-- :label="item.name"-->
<!-- :value="item.code">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="往来信息:">-->
<!-- <el-select v-model="filterQuery.corpName" placeholder="请输入往来信息"-->
<!-- filterable-->
<!-- remote-->
<!-- reserve-keyword-->
<!-- :remote-method="finCorpList"-->
<!-- :loading="loading"-->
<!-- style="width: 100%;">-->
<!-- <el-option-->
<!-- v-for="item in corpList"-->
<!-- :key="item.code"-->
<!-- :label="item.name"-->
<!-- :value="item.name">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="创建时间:">-->
<!-- <el-date-picker-->
<!-- style="width: 90%"-->
<!-- :picker-options="pickerOptions"-->
<!-- v-model="actDateRange"-->
<!-- type="daterange"-->
<!-- format="yyyy 年 MM 月 dd 日"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- range-separator="至"-->
<!-- start-placeholder="开始日期"-->
<!-- end-placeholder="结束日期"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList" >
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
<el-input
v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable
></el-input>
</el-form-item> </el-form-item>
</el-col> <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-col :span="8"> <el-select v-model="filterQuery[item.columnName]"
<el-form-item label="领用仓库:"> :placeholder="item.columnDesc"
<el-select v-model="filterQuery.invCode" placeholder="请选择领用仓库" style="width: 100%;"> :disabled="executeEval(null,item.disabledFuc,false)"
clearable>
<el-option <el-option
v-for="item in invList" v-for="dict in item.lableRuleObj"
:key="item.code" :key="dict.value"
:label="item.name" :label="dict.label"
:value="item.code"> :value="dict.value"
</el-option> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-col :span="8"> <el-select
<el-form-item label="往来信息:"> v-model="filterQuery[item.columnName]"
<el-select v-model="filterQuery.corpName" placeholder="请输入往来信息" :placeholder="item.columnDesc"
filterable :disabled="executeEval(null,item.disabledFuc,false)"
remote filterable
reserve-keyword remote
:remote-method="finCorpList" :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
:loading="loading" clearable>
style="width: 100%;">
<el-option <el-option
v-for="item in corpList" v-for="item in options[item.clickFuc]"
:key="item.code" :key="item.code"
:label="item.name" :label="item.label"
:value="item.name"> :value="item.code"
</el-option> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<!-- <el-col :span="6">-->
<!-- <el-form-item label="领用类型:">-->
<!-- <el-select v-model="filterQuery.billType" style="width: 90%" placeholder="请选择领用类型" clearable="true">-->
<!-- <el-option-->
<!-- v-for="item in originTypes"-->
<!-- :key="item.originAction"-->
<!-- :label="item.originName"-->
<!-- :value="item.originAction">-->
<!-- <span style="float: left;font-size: 13px">{{ item.originName }}</span>-->
<!-- <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{-->
<!-- item.thirdSysName-->
<!-- }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="创建时间:">
<el-date-picker <el-date-picker
style="width: 90%"
:picker-options="pickerOptions" :picker-options="pickerOptions"
v-model="actDateRange" v-model="actDateRange"
type="daterange" type="daterange"
@ -68,10 +108,19 @@
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
> ></el-date-picker>
</el-date-picker> </el-form-item>
<el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-date-picker
v-model="filterQuery[item.columnName]"
:style="`width:${item.width+'px'}`"
value-format="yyyy-MM-dd"
:disabled="executeEval(null,item.disabledFuc,false)"
type="date"
:placeholder="item.columnDesc"
></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </template>
</el-row> </el-row>
</el-form> </el-form>
@ -89,35 +138,123 @@
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true" border <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true" border
@current-change="handleDetail" @current-change="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)"
:default-sort="defaultSort" @sort-change="handleSortChange"> :default-sort="defaultSort" @sort-change="handleSortChange">
<el-table-column label="序号" type="index" width="60"></el-table-column> <!-- <el-table-column label="序号" type="index" width="60"></el-table-column>-->
<el-table-column label="领用单号" prop="billNo" width="140"></el-table-column> <!-- <el-table-column label="领用单号" prop="billNo" width="140"></el-table-column>-->
<el-table-column label="领用部门" prop="deptName" width="100"></el-table-column> <!-- <el-table-column label="领用部门" prop="deptName" width="100"></el-table-column>-->
<el-table-column label="领用仓库" prop="invName" width="100"></el-table-column> <!-- <el-table-column label="领用仓库" prop="invName" width="100"></el-table-column>-->
<el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true" width="180"></el-table-column> <!-- <el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true" width="180"></el-table-column>-->
<el-table-column label="单据状态" prop="status" width="120"> <!-- <el-table-column label="单据状态" prop="status" width="120">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-tag :type="(scope.row.status)"> <!-- <el-tag :type="(scope.row.status)">-->
{{ statusMap[scope.row.status] }} <!-- {{ statusMap[scope.row.status] }}-->
</el-tag> <!-- </el-tag>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="备注" prop="remark" show-overflow-tooltip="true" width="160"></el-table-column> <!-- <el-table-column label="备注" prop="remark" show-overflow-tooltip="true" width="160"></el-table-column>-->
<el-table-column label="创建时间" prop="createTime" <!-- <el-table-column label="创建时间" prop="createTime"-->
sortable="custom" :sort-orders="['ascending', 'descending']" width="160"></el-table-column> <!-- sortable="custom" :sort-orders="['ascending', 'descending']" width="160"></el-table-column>-->
<!-- <el-table-column label="领用类型" prop="billType"></el-table-column>--> <!-- &lt;!&ndash; <el-table-column label="领用类型" prop="billType"></el-table-column>&ndash;&gt;-->
<el-table-column label="操作" width="160" fixed="right"> <!-- <el-table-column label="操作" width="160" fixed="right">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-button type="text" size="small" :disabled="scope.row.status==3 " <!-- <el-button type="text" size="small" :disabled="scope.row.status==3 "-->
@click.native="newDistributionForm(scope.$index, scope.row)">编辑 <!-- @click.native="newDistributionForm(scope.$index, scope.row)">编辑-->
</el-button> <!-- </el-button>-->
<el-button type="text" size="small" @click.native.stop="printOrder(scope.row)" <!-- <el-button type="text" size="small" @click.native.stop="printOrder(scope.row)"-->
>打印 <!-- >打印-->
</el-button> <!-- </el-button>-->
<el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button> <!-- <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<template v-for="(item, index) in tableHeader">
<el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
type="index" :label="item.columnDesc"></el-table-column>
<el-table-column
v-if="item.columnType == 'selection'"
type="selection"
:width="item.width"
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
></el-table-column>
<el-table-column
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
<span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
</el-tag>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:width="item.width"
:key="item.columnName"
fixed="right"
>
<template slot-scope="scope">
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
:type="buttonItem.type"
:size="buttonItem.size"
:style="buttonItem.style"
:key="buttonItem"
v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
:disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
@click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
>{{ buttonItem.name }}
</el-button>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
</template>
</el-table-column>
</template>
</el-table> </el-table>
<pagination <pagination
@ -130,15 +267,102 @@
</el-card> </el-card>
<el-card class="el-card"> <el-card class="el-card">
<el-table v-loading="loading" :data="detailList" style="width: 100%" border> <el-table v-loading="loading" :data="detailList" style="width: 100%" border>
<el-table-column label="序号" type="index" width="60"></el-table-column> <!-- <el-table-column label="序号" type="index" width="60"></el-table-column>-->
<el-table-column label="DI/物资编码" prop="nameCode"></el-table-column> <!-- <el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>-->
<el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column> <!-- <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>-->
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip="true"></el-table-column> <!-- <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip="true"></el-table-column>-->
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column> <!-- <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>-->
<el-table-column label="领用数量" prop="count"></el-table-column> <!-- <el-table-column label="领用数量" prop="count"></el-table-column>-->
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column> <!-- <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>-->
<el-table-column label="生产厂家" prop="manufactory"></el-table-column> <!-- <el-table-column label="生产厂家" prop="manufactory"></el-table-column>-->
<el-table-column label="供应商" prop="supName"></el-table-column> <!-- <el-table-column label="供应商" prop="supName"></el-table-column>-->
<template v-for="(item, index) in tableHeader2">
<el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
type="index" :label="item.columnDesc"></el-table-column>
<el-table-column
v-if="item.columnType == 'selection'"
type="selection"
:width="item.width"
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
></el-table-column>
<el-table-column
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
<span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
</el-tag>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:width="item.width"
:key="item.columnName"
fixed="right"
>
<template slot-scope="scope">
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
:type="buttonItem.type"
:size="buttonItem.size"
:style="buttonItem.style"
:key="buttonItem"
v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
:disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
@click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
>{{ buttonItem.name }}
</el-button>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
</template>
</el-table-column>
</template>
</el-table> </el-table>
</el-card> </el-card>
<el-dialog <el-dialog
@ -169,7 +393,10 @@ import {selectIp} from "@/api/param/systemParamConfig";
import thrOrderNew from "./DialogNewReceive"; import thrOrderNew from "./DialogNewReceive";
import {getOrderDetail, getReceiveOrder, printOrder} from "@/api/inout/receiveOrder"; import {getOrderDetail, getReceiveOrder, printOrder} from "@/api/inout/receiveOrder";
import {getBusChange} from "@/api/basic/busTypeChange"; import {getBusChange} from "@/api/basic/busTypeChange";
import {filterSubAll, findInvByUser} from "@/api/system/invSubWarehouse"; import {filterSubAllOptimize, findInvByUserOptimize} from "@/api/system/invSubWarehouse";
import {
getHead,executeFuc
} from "@/utils/customConfig";
export default { export default {
data() { data() {
@ -203,6 +430,16 @@ export default {
idQuery: {}, idQuery: {},
corpList: [], corpList: [],
total: 0, total: 0,
tableHeader:[],
queryList:[],
fromList:[],
tableHeader2:[],
queryList2:[],
fromList2:[],
options: {
finCurInv:[],
finCorpList:[],
},
thirdSys: [], thirdSys: [],
thirdSysDetail: null, thirdSysDetail: null,
busTypes: [], busTypes: [],
@ -317,22 +554,22 @@ export default {
}); });
}, },
handleDetail(row) { handleDetail(_this,row) {
var query = {}; var query = {};
query.orderIdFk = row.billNo; query.orderIdFk = row.billNo;
getOrderDetail(query) //查找该单号下的所有条码 getOrderDetail(query) //查找该单号下的所有条码
.then((response) => { .then((response) => {
this.detailList = response.data.list || []; _this.detailList = response.data.list || [];
}) })
.catch(() => { .catch(() => {
this.detailList = []; _this.detailList = [];
}); });
}, },
hideSearch() { hideSearch() {
this.showSearch = !this.showSearch; this.showSearch = !this.showSearch;
}, },
deleteDialog(row) { deleteDialog(_this,row) {
this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", { _this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
@ -344,11 +581,11 @@ export default {
delReceive(dQuery) delReceive(dQuery)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
this.$message.success("删除成功"); _this.$message.success("删除成功");
this.getList(); _this.getList();
this.detailList = null; _this.detailList = null;
} else { } else {
this.$message.error(response.message); _this.$message.error(response.message);
} }
}) })
.catch(() => { .catch(() => {
@ -380,34 +617,34 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
newDistributionForm(index, row) { newDistributionForm(_this, row) {
this.idQuery.id = ''; _this.idQuery.id = '';
if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) { if (_this.$isNotBlank(row) && _this.$isNotBlank(row.id)) {
this.idQuery.id = row.id; _this.idQuery.id = row.id;
this.idQuery.formData = row; _this.idQuery.formData = row;
this.formName = "update"; _this.formName = "update";
} else } else
this.formName = "add"; _this.formName = "add";
this.newSpDistributionVisible = true; _this.newSpDistributionVisible = true;
}, },
finCurInv() { finCurInv(_this) {
this.invList = [];
let query = { let query = {
filter: 3 filter: 3
}; };
findInvByUser(query) findInvByUserOptimize(query)
.then((response) => { .then((response) => {
this.invList = response.data || []; _this.options.finCurInv = response.data || [];
if (this.invList.length > 0) { if (_this.options.finCurInv.length > 0) {
this.filterQuery.invCode = this.invList[0].code _this.filterQuery.invCode = this.options.finCurInv[0].code
this.invCodebe = this.filterQuery.invCode _this.invCodebe = this.filterQuery.invCode
} }
this.getList(); _this.getList();
}) })
.catch(() => { .catch(() => {
this.options.finCurInv = [];
}); });
}, },
printOrder(row) { printOrder(_this,row) {
printOrder(row) printOrder(row)
.then((response) => { .then((response) => {
const binaryData = []; const binaryData = [];
@ -416,30 +653,38 @@ export default {
let url = window.URL.createObjectURL( let url = window.URL.createObjectURL(
new Blob(binaryData, {type: "application/pdf"}) new Blob(binaryData, {type: "application/pdf"})
); );
this.loading = false; _this.loading = false;
window.open(url);//打开新标签页，预览pdf。 window.open(url);//打开新标签页，预览pdf。
this.getList(); _this.getList();
}) })
.catch(() => { .catch(() => {
}); });
}, },
finCorpList(val) { finCorpList(_this,val) {
let query = { let query = {
name: val, name: val,
page: 1, page: 1,
limit: 10, limit: 10,
} }
filterSubAll(query) filterSubAllOptimize(query)
.then((response) => { .then((response) => {
this.loading = false; _this.loading = false;
this.corpList = response.data || []; _this.options.finCorpList = response.data || [];
}) })
.catch(() => { .catch(() => {
this.loading = false; _this.loading = false;
this.corpList = []; _this.options.finCorpList = [];
}); });
}, },
executeFuc(row,type,clickFuc,value){
return executeFuc(this,row,type,clickFuc,value);
},
executeEval(row,expression,defaultRet){
if(expression){
return eval(expression);
}
return defaultRet;
}
}, },
components: { components: {
thrOrderNew, thrOrderNew,
@ -447,9 +692,23 @@ export default {
mounted() { mounted() {
}, },
created() { created() {
this.finCurInv(); this.finCurInv(this);
this.getBusType(); this.getBusType();
// this.finCorpList(); // this.finCorpList();
getHead("receiveAdd-1","1").then((re) => {
// 处理返回的数据
this.tableObj = re.data;
this.tableHeader = re.data.tableList;
this.queryList = re.data.queryList;
this.fromList = re.data.fromList;
});
getHead("receiveAdd-2","1").then((re) => {
// 处理返回的数据
this.tableObj2 = re.data;
this.tableHeader2 = re.data.tableList;
this.queryList2 = re.data.queryList;
this.fromList2 = re.data.fromList;
});
}, },
}; };
</script> </script>

488
src/views/inout/receive/receiveAudit.vue
Unescape Escape View File

@ -1,35 +1,92 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch"> <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
<el-row> <!-- <el-row>-->
<el-col :span="8"> <!-- <el-col :span="8">-->
<el-form-item label="领用单号:"> <!-- <el-form-item label="领用单号:">-->
<el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input> <!-- <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="领用仓库:">-->
<!-- <el-select v-model="filterQuery.invCode" placeholder="请选择领用仓库"-->
<!-- filterable-->
<!-- clearable-->
<!-- remote-->
<!-- reserve-keyword-->
<!-- :remote-method="finCurInv"-->
<!-- style="width: 100%;">-->
<!-- <el-option-->
<!-- v-for="item in invList"-->
<!-- :key="item.code"-->
<!-- :label="item.name"-->
<!-- :value="item.code">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="创建时间:">-->
<!-- <el-date-picker-->
<!-- style="width: 90%"-->
<!-- :picker-options="pickerOptions"-->
<!-- v-model="actDateRange"-->
<!-- type="daterange"-->
<!-- format="yyyy 年 MM 月 dd 日"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- range-separator="至"-->
<!-- start-placeholder="开始日期"-->
<!-- end-placeholder="结束日期"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList" >
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
<el-input
v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable
></el-input>
</el-form-item>
<el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-select v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)"
clearable>
<el-option
v-for="dict in item.lableRuleObj"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item> </el-form-item>
</el-col> <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-col :span="8"> <el-select
<el-form-item label="领用仓库:"> v-model="filterQuery[item.columnName]"
<el-select v-model="filterQuery.invCode" placeholder="请选择领用仓库" :placeholder="item.columnDesc"
filterable :disabled="executeEval(null,item.disabledFuc,false)"
clearable filterable
remote remote
reserve-keyword :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
:remote-method="finCurInv" clearable>
style="width: 100%;">
<el-option <el-option
v-for="item in invList" v-for="item in options[item.clickFuc]"
:key="item.code" :key="item.code"
:label="item.name" :label="item.label"
:value="item.code"> :value="item.code"
</el-option> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-col :span="8">
<el-form-item label="创建时间:">
<el-date-picker <el-date-picker
style="width: 90%"
:picker-options="pickerOptions" :picker-options="pickerOptions"
v-model="actDateRange" v-model="actDateRange"
type="daterange" type="daterange"
@ -38,46 +95,20 @@
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
> ></el-date-picker>
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<!--<el-col :span="8">--> <el-date-picker
<!-- <el-form-item label="往来信息:">--> v-model="filterQuery[item.columnName]"
<!-- <el-select v-model="filterQuery.corpName" placeholder="请输入往来信息"--> :style="`width:${item.width+'px'}`"
<!-- filterable--> value-format="yyyy-MM-dd"
<!-- remote--> :disabled="executeEval(null,item.disabledFuc,false)"
<!-- reserve-keyword--> type="date"
<!-- :remote-method="finCorpList"--> :placeholder="item.columnDesc"
<!-- :loading="loading"--> ></el-date-picker>
<!-- style="width: 100%;">--> </el-form-item>
<!-- <el-option--> </template>
<!-- v-for="item in corpList"-->
<!-- :key="item.code"-->
<!-- :label="item.name"-->
<!-- :value="item.name">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--</el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="领用类型:">-->
<!-- <el-select v-model="filterQuery.billType" style="width: 90%" placeholder="请选择领用类型" clearable="true">-->
<!-- <el-option-->
<!-- v-for="item in originTypes"-->
<!-- :key="item.originAction"-->
<!-- :label="item.originName"-->
<!-- :value="item.originAction">-->
<!-- <span style="float: left;font-size: 13px">{{ item.originName }}</span>-->
<!-- <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{-->
<!-- item.thirdSysName-->
<!-- }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
@ -91,33 +122,120 @@
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row="true" <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row="true"
@current-change="handleDetail" :default-sort="defaultSort" @sort-change="handleSortChange"> @current-change="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)" :default-sort="defaultSort" @sort-change="handleSortChange">
<el-table-column label="序号" type="index" width="60"></el-table-column> <!-- <el-table-column label="序号" type="index" width="60"></el-table-column>-->
<el-table-column label="领用单号" prop="billNo"></el-table-column> <!-- <el-table-column label="领用单号" prop="billNo"></el-table-column>-->
<el-table-column label="领用部门" prop="deptName"></el-table-column> <!-- <el-table-column label="领用部门" prop="deptName"></el-table-column>-->
<el-table-column label="领用仓库" prop="invName"></el-table-column> <!-- <el-table-column label="领用仓库" prop="invName"></el-table-column>-->
<el-table-column label="备注" prop="remark"></el-table-column> <!-- <el-table-column label="备注" prop="remark"></el-table-column>-->
<!--<el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"></el-table-column>--> <!-- &lt;!&ndash;<el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"></el-table-column>&ndash;&gt;-->
<el-table-column label="单据状态" prop="status"> <!-- <el-table-column label="单据状态" prop="status">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-tag :type="(scope.row.status)"> <!-- <el-tag :type="(scope.row.status)">-->
{{ statusMap[scope.row.status] }} <!-- {{ statusMap[scope.row.status] }}-->
</el-tag> <!-- </el-tag>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="创建时间" prop="createTime" <!-- <el-table-column label="创建时间" prop="createTime"-->
sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column> <!-- sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column>-->
<el-table-column label="操作"> <!-- <el-table-column label="操作">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-button type="text" size="small" :disabled="scope.row.status!=2" <!-- <el-button type="text" size="small" :disabled="scope.row.status!=2"-->
@click.native.stop="auditDialog(scope.row)" <!-- @click.native.stop="auditDialog(scope.row)"-->
>审核 <!-- >审核-->
</el-button> <!-- </el-button>-->
<el-button type="text" size="small" @click.native.stop="printOrder(scope.row)" <!-- <el-button type="text" size="small" @click.native.stop="printOrder(scope.row)"-->
>打印 <!-- >打印-->
</el-button> <!-- </el-button>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<template v-for="(item, index) in tableHeader">
<el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
type="index" :label="item.columnDesc"></el-table-column>
<el-table-column
v-if="item.columnType == 'selection'"
type="selection"
:width="item.width"
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
></el-table-column>
<el-table-column
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
<span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
</el-tag>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:width="item.width"
:key="item.columnName"
fixed="right"
>
<template slot-scope="scope">
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
:type="buttonItem.type"
:size="buttonItem.size"
:style="buttonItem.style"
:key="buttonItem"
v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
:disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
@click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
>{{ buttonItem.name }}
</el-button>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
</template>
</el-table-column>
</template>
</el-table> </el-table>
<pagination <pagination
@ -131,15 +249,102 @@
</el-card> </el-card>
<el-card class="el-card"> <el-card class="el-card">
<el-table v-loading="loading" :data="detailList" style="width: 100%" border> <el-table v-loading="loading" :data="detailList" style="width: 100%" border>
<el-table-column label="序号" type="index" width="60"></el-table-column> <!-- <el-table-column label="序号" type="index" width="60"></el-table-column>-->
<el-table-column label="DI/物资编码" prop="nameCode"></el-table-column> <!-- <el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>-->
<el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column> <!-- <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>-->
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip="true"></el-table-column> <!-- <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip="true"></el-table-column>-->
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column> <!-- <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>-->
<el-table-column label="领用数量" prop="count"></el-table-column> <!-- <el-table-column label="领用数量" prop="count"></el-table-column>-->
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column> <!-- <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>-->
<el-table-column label="生产厂家" prop="manufactory"></el-table-column> <!-- <el-table-column label="生产厂家" prop="manufactory"></el-table-column>-->
<el-table-column label="供应商" prop="supName"></el-table-column> <!-- <el-table-column label="供应商" prop="supName"></el-table-column>-->
<template v-for="(item, index) in tableHeader2">
<el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
type="index" :label="item.columnDesc"></el-table-column>
<el-table-column
v-if="item.columnType == 'selection'"
type="selection"
:width="item.width"
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
></el-table-column>
<el-table-column
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
<span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
</el-tag>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:width="item.width"
:key="item.columnName"
fixed="right"
>
<template slot-scope="scope">
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
:type="buttonItem.type"
:size="buttonItem.size"
:style="buttonItem.style"
:key="buttonItem"
v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
:disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
@click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
>{{ buttonItem.name }}
</el-button>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
</template>
</el-table-column>
</template>
</el-table> </el-table>
</el-card> </el-card>
<el-dialog <el-dialog
@ -161,7 +366,15 @@
import {getOrderDetail, getReceiveOrder, printOrder} from "@/api/inout/receiveOrder"; import {getOrderDetail, getReceiveOrder, printOrder} from "@/api/inout/receiveOrder";
import auditDetail from "@/views/inout/receive/receiveAuditDetail" import auditDetail from "@/views/inout/receive/receiveAuditDetail"
import {filterSub, filterSubAll, findByFrom, findInvByUser} from "@/api/system/invSubWarehouse"; import {
filterSub,
filterSubAllOptimize,
findInvByUserOptimize,
findByFromOptimize
} from "@/api/system/invSubWarehouse";
import {
getHead,executeFuc
} from "@/utils/customConfig";
export default { export default {
data() { data() {
@ -189,6 +402,16 @@ export default {
idQuery: null, idQuery: null,
newSpDistributionVisible: false, newSpDistributionVisible: false,
total: 0, total: 0,
tableHeader:[],
queryList:[],
fromList:[],
tableHeader2:[],
queryList2:[],
fromList2:[],
options: {
finCurInv:[],
finCorpList:[],
},
thirdSys: [], thirdSys: [],
invList: [], invList: [],
corpList: [], corpList: [],
@ -282,7 +505,7 @@ export default {
this.filterQuery.orderBy = column.prop; this.filterQuery.orderBy = column.prop;
this.getList(); this.getList();
}, },
printOrder(row) { printOrder(_this,row) {
printOrder(row) printOrder(row)
.then((response) => { .then((response) => {
const binaryData = []; const binaryData = [];
@ -291,9 +514,9 @@ export default {
let url = window.URL.createObjectURL( let url = window.URL.createObjectURL(
new Blob(binaryData, {type: "application/pdf"}) new Blob(binaryData, {type: "application/pdf"})
); );
this.loading = false; _this.loading = false;
window.open(url);//打开新标签页，预览pdf。 window.open(url);//打开新标签页，预览pdf。
this.getList(); _this.getList();
}) })
.catch(() => { .catch(() => {
}); });
@ -326,44 +549,44 @@ export default {
this.total = 0; this.total = 0;
}); });
}, },
handleDetail(row) { handleDetail(_this,row) {
var query = {}; var query = {};
query.orderIdFk = row.billNo; query.orderIdFk = row.billNo;
getOrderDetail(query) //查找该单号下的所有条码 getOrderDetail(query) //查找该单号下的所有条码
.then((response) => { .then((response) => {
this.detailList = response.data.list || []; _this.detailList = response.data.list || [];
}) })
.catch(() => { .catch(() => {
this.detailList = []; _this.detailList = [];
}); });
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.filterQuery.page = val.page; this.filterQuery.page = val.page;
this.getList(); this.getList();
}, },
auditDialog(row) { auditDialog(_this,row) {
this.idQuery = row; _this.idQuery = row;
this.newSpDistributionVisible = true; _this.newSpDistributionVisible = true;
}, },
finCorpList(val) { finCorpList(_this,val) {
let query = { let query = {
name: val, name: val,
page: 1, page: 1,
limit: 10, limit: 10,
} }
filterSubAll(query) filterSubAllOptimize(query)
.then((response) => { .then((response) => {
this.loading = false; _this.loading = false;
this.corpList = response.data || []; _this.options.finCorpList = response.data || [];
}) })
.catch(() => { .catch(() => {
this.loading = false; _this.loading = false;
this.corpList = []; _this.options.finCorpList = [];
}); });
}, },
finCurInv(keyWord) { finCurInv(_this,keyWord) {
this.filterQuery = { _this.filterQuery = {
billNo: "", billNo: "",
thirdSysFk: "", thirdSysFk: "",
billFlag: null, billFlag: null,
@ -378,15 +601,15 @@ export default {
editStatus: 2, editStatus: 2,
}; };
this.invList = []; _this.invList = [];
let query = { let query = {
filter: 3, filter: 3,
name: keyWord, name: keyWord,
locInvCode: this.$store.getters.locInvCode locInvCode: this.$store.getters.locInvCode
}; };
findByFrom(query) findByFromOptimize(query)
.then((response) => { .then((response) => {
this.invList = response.data || []; _this.options.finCurInv = response.data || [];
// if (this.invList.length > 0) { // if (this.invList.length > 0) {
// this.filterQuery.targetInvCode = this.invList[0].code // this.filterQuery.targetInvCode = this.invList[0].code
// this.invCodebe = this.filterQuery.targetInvCode // this.invCodebe = this.filterQuery.targetInvCode
@ -394,8 +617,18 @@ export default {
// this.getList(); // this.getList();
}) })
.catch(() => { .catch(() => {
this.options.finCurInv = [];
}); });
}, },
executeFuc(row,type,clickFuc,value){
return executeFuc(this,row,type,clickFuc,value);
},
executeEval(row,expression,defaultRet){
if(expression){
return eval(expression);
}
return defaultRet;
}
}, },
components: { components: {
auditDetail auditDetail
@ -403,9 +636,22 @@ export default {
mounted() { mounted() {
}, },
created() { created() {
this.finCurInv(); this.finCurInv(this);
this.getList(); getHead("receiveAudit-1","1").then((re) => {
// 处理返回的数据
this.tableObj = re.data;
this.tableHeader = re.data.tableList;
this.queryList = re.data.queryList;
this.fromList = re.data.fromList;
this.getList();
});
getHead("receiveAudit-2","1").then((re) => {
// 处理返回的数据
this.tableObj2 = re.data;
this.tableHeader2 = re.data.tableList;
this.queryList2 = re.data.queryList;
this.fromList2 = re.data.fromList;
});
}, },
}; };
</script> </script>

523
src/views/inout/receive/receiveMySearch.vue
Unescape Escape View File

@ -1,65 +1,122 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch"> <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
<el-row> <!-- <el-row>-->
<el-col :span="8"> <!-- <el-col :span="8">-->
<el-form-item label="领用单号:"> <!-- <el-form-item label="领用单号:">-->
<el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input> <!-- <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="领用仓库:">-->
<!-- <el-select v-model="filterQuery.invCode" placeholder="请选择领用仓库" style="width: 90%;">-->
<!-- <el-option-->
<!-- v-for="item in invList"-->
<!-- :key="item.code"-->
<!-- :label="item.name"-->
<!-- :value="item.code">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="往来信息:">-->
<!-- <el-select v-model="filterQuery.corpName" placeholder="请输入往来信息"-->
<!-- filterable-->
<!-- remote-->
<!-- reserve-keyword-->
<!-- :remote-method="finCorpList"-->
<!-- :loading="loading"-->
<!-- style="width: 100%;">-->
<!-- <el-option-->
<!-- v-for="item in corpList"-->
<!-- :key="item.code"-->
<!-- :label="item.name"-->
<!-- :value="item.name">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="创建时间:">-->
<!-- <el-date-picker-->
<!-- style="width: 90%"-->
<!-- :picker-options="pickerOptions"-->
<!-- v-model="actDateRange"-->
<!-- type="daterange"-->
<!-- format="yyyy 年 MM 月 dd 日"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- range-separator="至"-->
<!-- start-placeholder="开始日期"-->
<!-- end-placeholder="结束日期"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="审核时间:">-->
<!-- <el-date-picker-->
<!-- style="width: 90%"-->
<!-- :picker-options="pickerAuditOptions"-->
<!-- v-model="actAuditDateRange"-->
<!-- type="daterange"-->
<!-- format="yyyy 年 MM 月 dd 日"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- range-separator="至"-->
<!-- start-placeholder="开始日期"-->
<!-- end-placeholder="结束日期"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList" >
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
<el-input
v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable
></el-input>
</el-form-item> </el-form-item>
</el-col> <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-col :span="8"> <el-select v-model="filterQuery[item.columnName]"
<el-form-item label="领用仓库:"> :placeholder="item.columnDesc"
<el-select v-model="filterQuery.invCode" placeholder="请选择领用仓库" style="width: 90%;"> :disabled="executeEval(null,item.disabledFuc,false)"
clearable>
<el-option <el-option
v-for="item in invList" v-for="dict in item.lableRuleObj"
:key="item.code" :key="dict.value"
:label="item.name" :label="dict.label"
:value="item.code"> :value="dict.value"
</el-option> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-col :span="8"> <el-select
<el-form-item label="往来信息:"> v-model="filterQuery[item.columnName]"
<el-select v-model="filterQuery.corpName" placeholder="请输入往来信息" :placeholder="item.columnDesc"
filterable :disabled="executeEval(null,item.disabledFuc,false)"
remote filterable
reserve-keyword remote
:remote-method="finCorpList" :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
:loading="loading" clearable>
style="width: 100%;">
<el-option <el-option
v-for="item in corpList" v-for="item in options[item.clickFuc]"
:key="item.code" :key="item.code"
:label="item.name" :label="item.label"
:value="item.name"> :value="item.code"
</el-option> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> <el-form-item v-if="item.columnType == 'datePicker' && item.columnName == 'actDateRange' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<!-- <el-col :span="6">-->
<!-- <el-form-item label="领用类型:">-->
<!-- <el-select v-model="filterQuery.billType" style="width: 90%" placeholder="请选择领用类型" clearable="true">-->
<!-- <el-option-->
<!-- v-for="item in originTypes"-->
<!-- :key="item.originAction"-->
<!-- :label="item.originName"-->
<!-- :value="item.originAction">-->
<!-- <span style="float: left;font-size: 13px">{{ item.originName }}</span>-->
<!-- <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{-->
<!-- item.thirdSysName-->
<!-- }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="创建时间:">
<el-date-picker <el-date-picker
style="width: 90%"
:picker-options="pickerOptions" :picker-options="pickerOptions"
v-model="actDateRange" v-model="actDateRange"
type="daterange" type="daterange"
@ -68,16 +125,11 @@
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
> ></el-date-picker>
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> <el-form-item v-if="item.columnType == 'datePicker' && item.columnName == 'actAuditDateRange' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-col :span="8">
<el-form-item label="审核时间:">
<el-date-picker <el-date-picker
style="width: 90%" :picker-options="pickerOptions"
:picker-options="pickerAuditOptions"
v-model="actAuditDateRange" v-model="actAuditDateRange"
type="daterange" type="daterange"
format="yyyy 年 MM 月 dd 日" format="yyyy 年 MM 月 dd 日"
@ -85,10 +137,19 @@
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
> ></el-date-picker>
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-date-picker
v-model="filterQuery[item.columnName]"
:style="`width:${item.width+'px'}`"
value-format="yyyy-MM-dd"
:disabled="executeEval(null,item.disabledFuc,false)"
type="date"
:placeholder="item.columnDesc"
></el-date-picker>
</el-form-item>
</template>
</el-row> </el-row>
</el-form> </el-form>
@ -103,36 +164,122 @@
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row="true" <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row="true"
@current-change="handleDetail" @current-change="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)"
:default-sort="defaultSort" @sort-change="handleSortChange"> :default-sort="defaultSort" @sort-change="handleSortChange">
<el-table-column label="序号" type="index" width="60"></el-table-column> <!-- <el-table-column label="序号" type="index" width="60"></el-table-column>-->
<el-table-column label="领用单号" prop="billNo"></el-table-column> <!-- <el-table-column label="领用单号" prop="billNo"></el-table-column>-->
<el-table-column label="领用部门" prop="deptName"></el-table-column> <!-- <el-table-column label="领用部门" prop="deptName"></el-table-column>-->
<el-table-column label="领用仓库" prop="invName"></el-table-column> <!-- <el-table-column label="领用仓库" prop="invName"></el-table-column>-->
<el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"></el-table-column> <!-- <el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"></el-table-column>-->
<el-table-column label="领用备注" prop="remark"></el-table-column> <!-- <el-table-column label="领用备注" prop="remark"></el-table-column>-->
<el-table-column label="审核说明" prop="auditRemark"></el-table-column> <!-- <el-table-column label="审核说明" prop="auditRemark"></el-table-column>-->
<el-table-column label="单据状态" prop="status"> <!-- <el-table-column label="单据状态" prop="status">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-tag :type="(scope.row.status)"> <!-- <el-tag :type="(scope.row.status)">-->
{{ statusMap[scope.row.status] }} <!-- {{ statusMap[scope.row.status] }}-->
</el-tag> <!-- </el-tag>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="创建时间" prop="createTime" <!-- <el-table-column label="创建时间" prop="createTime"-->
sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column> <!-- sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column>-->
<el-table-column label="审核时间" prop="auditTime" <!-- <el-table-column label="审核时间" prop="auditTime"-->
sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column> <!-- sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column>-->
<el-table-column label="操作"> <!-- <el-table-column label="操作">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-button type="text" size="small" @click.native.stop="printOrder(scope.row)" <!-- <el-button type="text" size="small" @click.native.stop="printOrder(scope.row)"-->
>打印 <!-- >打印-->
</el-button> <!-- </el-button>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<template v-for="(item, index) in tableHeader">
<el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
type="index" :label="item.columnDesc"></el-table-column>
<el-table-column
v-if="item.columnType == 'selection'"
type="selection"
:width="item.width"
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
></el-table-column>
<el-table-column
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
<span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
</el-tag>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:width="item.width"
:key="item.columnName"
fixed="right"
>
<template slot-scope="scope">
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
:type="buttonItem.type"
:size="buttonItem.size"
:style="buttonItem.style"
:key="buttonItem"
v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
:disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
@click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
>{{ buttonItem.name }}
</el-button>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
</template>
</el-table-column>
</template>
</el-table> </el-table>
<pagination <pagination
@ -146,15 +293,102 @@
</el-card> </el-card>
<el-card class="el-card"> <el-card class="el-card">
<el-table v-loading="loading" :data="detailList" style="width: 100%" border> <el-table v-loading="loading" :data="detailList" style="width: 100%" border>
<el-table-column label="序号" type="index" width="60"></el-table-column> <!-- <el-table-column label="序号" type="index" width="60"></el-table-column>-->
<el-table-column label="DI/物资编码" prop="nameCode"></el-table-column> <!-- <el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>-->
<el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column> <!-- <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>-->
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip="true"></el-table-column> <!-- <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip="true"></el-table-column>-->
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column> <!-- <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>-->
<el-table-column label="领用数量" prop="count"></el-table-column> <!-- <el-table-column label="领用数量" prop="count"></el-table-column>-->
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column> <!-- <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>-->
<el-table-column label="生产厂家" prop="manufactory"></el-table-column> <!-- <el-table-column label="生产厂家" prop="manufactory"></el-table-column>-->
<el-table-column label="供应商" prop="supName"></el-table-column> <!-- <el-table-column label="供应商" prop="supName"></el-table-column>-->
<template v-for="(item, index) in tableHeader2">
<el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
type="index" :label="item.columnDesc"></el-table-column>
<el-table-column
v-if="item.columnType == 'selection'"
type="selection"
:width="item.width"
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
></el-table-column>
<el-table-column
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
<span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
</el-tag>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:width="item.width"
:key="item.columnName"
fixed="right"
>
<template slot-scope="scope">
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
:type="buttonItem.type"
:size="buttonItem.size"
:style="buttonItem.style"
:key="buttonItem"
v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
:disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
@click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
>{{ buttonItem.name }}
</el-button>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
</template>
</el-table-column>
</template>
</el-table> </el-table>
</el-card> </el-card>
<el-dialog <el-dialog
@ -176,7 +410,12 @@
import {getOrderDetail, getReceiveOrder, printOrder} from "@/api/inout/receiveOrder"; import {getOrderDetail, getReceiveOrder, printOrder} from "@/api/inout/receiveOrder";
import auditDetail from "@/views/inout/receive/receiveAuditDetail" import auditDetail from "@/views/inout/receive/receiveAuditDetail"
import {delReceive} from "@/api/thrsys/thrOrderReceive"; import {delReceive} from "@/api/thrsys/thrOrderReceive";
import {filterSubAll, findInvByUser} from "@/api/system/invSubWarehouse"; import {
filterSub,
filterSubAllOptimize,
findInvByUserOptimize,
findByFromOptimize} from "@/api/system/invSubWarehouse";
import {executeFuc, getHead} from "@/utils/customConfig";
export default { export default {
data() { data() {
@ -206,6 +445,16 @@ export default {
invCodebe: null, invCodebe: null,
newSpDistributionVisible: false, newSpDistributionVisible: false,
total: 0, total: 0,
tableHeader:[],
queryList:[],
fromList:[],
tableHeader2:[],
queryList2:[],
fromList2:[],
options: {
finCurInv:[],
finCorpList:[],
},
thirdSys: [], thirdSys: [],
thirdSysDetail: null, thirdSysDetail: null,
busTypes: [], busTypes: [],
@ -318,8 +567,8 @@ export default {
hideSearch() { hideSearch() {
this.showSearch = !this.showSearch; this.showSearch = !this.showSearch;
}, },
deleteDialog(row) { deleteDialog(_this,row) {
this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", { _this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
@ -331,11 +580,11 @@ export default {
delReceive(dQuery) delReceive(dQuery)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
this.$message.success("删除成功"); _this.$message.success("删除成功");
this.getList(); _this.getList();
this.detailList = null; _this.detailList = null;
} else { } else {
this.$message.error(response.message); _this.$message.error(response.message);
} }
}) })
.catch(() => { .catch(() => {
@ -390,58 +639,58 @@ export default {
this.total = 0; this.total = 0;
}); });
}, },
handleDetail(row) { handleDetail(_this,row) {
var query = {}; var query = {};
query.orderIdFk = row.billNo; query.orderIdFk = row.billNo;
getOrderDetail(query) //查找该单号下的所有条码 getOrderDetail(query) //查找该单号下的所有条码
.then((response) => { .then((response) => {
this.detailList = response.data.list || []; _this.detailList = response.data.list || [];
}) })
.catch(() => { .catch(() => {
this.detailList = []; _this.detailList = [];
}); });
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.filterQuery.page = val.page; this.filterQuery.page = val.page;
this.getList(); this.getList();
}, },
finCorpList(val) { finCorpList(_this,val) {
let query = { let query = {
name: val, name: val,
page: 1, page: 1,
limit: 10, limit: 10,
} }
filterSubAll(query) filterSubAllOptimize(query)
.then((response) => { .then((response) => {
this.loading = false; _this.loading = false;
this.corpList = response.data || []; _this.options.finCorpList = response.data || [];
}) })
.catch(() => { .catch(() => {
this.loading = false; _this.loading = false;
this.corpList = []; _this.options.finCorpList = [];
}); });
}, },
finCurInv() { finCurInv(_this) {
this.invList = [];
let query = { let query = {
filter: 3 filter: 3
}; };
findInvByUser(query) findInvByUserOptimize(query)
.then((response) => { .then((response) => {
this.invList = response.data || []; _this.options.finCurInv = response.data || [];
if (this.invList.length > 0) { if (_this.options.finCurInv.length > 0) {
this.filterQuery.invCode = this.invList[0].code _this.filterQuery.invCode = this.options.finCurInv[0].code
this.invCodebe = this.filterQuery.invCode _this.invCodebe = this.filterQuery.invCode
} }
this.getList(); _this.getList();
}) })
.catch(() => { .catch(() => {
this.options.finCurInv = [];
}); });
}, },
printOrder(row) { printOrder(_this,row) {
printOrder(row) printOrder(row)
.then((response) => { .then((response) => {
const binaryData = []; const binaryData = [];
@ -450,9 +699,9 @@ export default {
let url = window.URL.createObjectURL( let url = window.URL.createObjectURL(
new Blob(binaryData, {type: "application/pdf"}) new Blob(binaryData, {type: "application/pdf"})
); );
this.loading = false; _this.loading = false;
window.open(url);//打开新标签页，预览pdf。 window.open(url);//打开新标签页，预览pdf。
this.getList(); _this.getList();
}) })
.catch(() => { .catch(() => {
}); });
@ -461,7 +710,15 @@ export default {
closeDialog() { closeDialog() {
this.newSpDistributionVisible = false; this.newSpDistributionVisible = false;
}, },
executeFuc(row,type,clickFuc,value){
return executeFuc(this,row,type,clickFuc,value);
},
executeEval(row,expression,defaultRet){
if(expression){
return eval(expression);
}
return defaultRet;
}
}, },
components: { components: {
@ -470,8 +727,22 @@ export default {
mounted() { mounted() {
}, },
created() { created() {
this.finCurInv(); this.finCurInv(this);
this.getList(); getHead("receiveMySearch-1","1").then((re) => {
// 处理返回的数据
this.tableObj = re.data;
this.tableHeader = re.data.tableList;
this.queryList = re.data.queryList;
this.fromList = re.data.fromList;
this.getList();
});
getHead("receiveMySearch-2","1").then((re) => {
// 处理返回的数据
this.tableObj2 = re.data;
this.tableHeader2 = re.data.tableList;
this.queryList2 = re.data.queryList;
this.fromList2 = re.data.fromList;
});
}, },
}; };
</script> </script>

536
src/views/inout/receive/receiveSearch.vue
Unescape Escape View File

@ -1,71 +1,129 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch"> <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
<el-row> <!-- <el-row>-->
<el-col :span="8"> <!-- <el-col :span="8">-->
<el-form-item label="领用单号:"> <!-- <el-form-item label="领用单号:">-->
<el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input> <!-- <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="领用仓库:">-->
<!-- <el-select v-model="filterQuery.invCode"-->
<!-- filterable-->
<!-- clearable-->
<!-- remote-->
<!-- reserve-keyword-->
<!-- :remote-method="finCurInv"-->
<!-- placeholder="请选择领用仓库" style="width: 90%;">-->
<!-- <el-option-->
<!-- v-for="item in invList"-->
<!-- :key="item.code"-->
<!-- :label="item.name"-->
<!-- :value="item.code">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="往来信息:">-->
<!-- <el-select v-model="filterQuery.corpName" placeholder="请输入往来信息"-->
<!-- filterable-->
<!-- remote-->
<!-- reserve-keyword-->
<!-- :remote-method="finCorpList"-->
<!-- :loading="loading"-->
<!-- style="width: 100%;">-->
<!-- <el-option-->
<!-- v-for="item in corpList"-->
<!-- :key="item.code"-->
<!-- :label="item.name"-->
<!-- :value="item.name">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="创建时间:">-->
<!-- <el-date-picker-->
<!-- style="width: 90%"-->
<!-- :picker-options="pickerOptions"-->
<!-- v-model="actDateRange"-->
<!-- type="daterange"-->
<!-- format="yyyy 年 MM 月 dd 日"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- range-separator="至"-->
<!-- start-placeholder="开始日期"-->
<!-- end-placeholder="结束日期"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="审核时间:">-->
<!-- <el-date-picker-->
<!-- style="width: 90%"-->
<!-- :picker-options="pickerAuditOptions"-->
<!-- v-model="actAuditDateRange"-->
<!-- type="daterange"-->
<!-- format="yyyy 年 MM 月 dd 日"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- range-separator="至"-->
<!-- start-placeholder="开始日期"-->
<!-- end-placeholder="结束日期"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList" >
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
<el-input
v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable
></el-input>
</el-form-item> </el-form-item>
</el-col> <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-col :span="8"> <el-select v-model="filterQuery[item.columnName]"
<el-form-item label="领用仓库:"> :placeholder="item.columnDesc"
<el-select v-model="filterQuery.invCode" :disabled="executeEval(null,item.disabledFuc,false)"
filterable clearable>
clearable
remote
reserve-keyword
:remote-method="finCurInv"
placeholder="请选择领用仓库" style="width: 90%;">
<el-option <el-option
v-for="item in invList" v-for="dict in item.lableRuleObj"
:key="item.code" :key="dict.value"
:label="item.name" :label="dict.label"
:value="item.code"> :value="dict.value"
</el-option> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-col :span="8"> <el-select
<el-form-item label="往来信息:"> v-model="filterQuery[item.columnName]"
<el-select v-model="filterQuery.corpName" placeholder="请输入往来信息" :placeholder="item.columnDesc"
filterable :disabled="executeEval(null,item.disabledFuc,false)"
remote filterable
reserve-keyword remote
:remote-method="finCorpList" :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
:loading="loading" clearable>
style="width: 100%;">
<el-option <el-option
v-for="item in corpList" v-for="item in options[item.clickFuc]"
:key="item.code" :key="item.code"
:label="item.name" :label="item.label"
:value="item.name"> :value="item.code"
</el-option> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> <el-form-item v-if="item.columnType == 'datePicker' && item.columnName == 'actDateRange' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<!-- <el-col :span="6">-->
<!-- <el-form-item label="领用类型:">-->
<!-- <el-select v-model="filterQuery.billType" style="width: 90%" placeholder="请选择领用类型" clearable="true">-->
<!-- <el-option-->
<!-- v-for="item in originTypes"-->
<!-- :key="item.originAction"-->
<!-- :label="item.originName"-->
<!-- :value="item.originAction">-->
<!-- <span style="float: left;font-size: 13px">{{ item.originName }}</span>-->
<!-- <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{-->
<!-- item.thirdSysName-->
<!-- }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="创建时间:">
<el-date-picker <el-date-picker
style="width: 90%"
:picker-options="pickerOptions" :picker-options="pickerOptions"
v-model="actDateRange" v-model="actDateRange"
type="daterange" type="daterange"
@ -74,16 +132,11 @@
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
> ></el-date-picker>
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> <el-form-item v-if="item.columnType == 'datePicker' && item.columnName == 'actAuditDateRange' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-col :span="8">
<el-form-item label="审核时间:">
<el-date-picker <el-date-picker
style="width: 90%" :picker-options="pickerOptions"
:picker-options="pickerAuditOptions"
v-model="actAuditDateRange" v-model="actAuditDateRange"
type="daterange" type="daterange"
format="yyyy 年 MM 月 dd 日" format="yyyy 年 MM 月 dd 日"
@ -91,10 +144,19 @@
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
> ></el-date-picker>
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-date-picker
v-model="filterQuery[item.columnName]"
:style="`width:${item.width+'px'}`"
value-format="yyyy-MM-dd"
:disabled="executeEval(null,item.disabledFuc,false)"
type="date"
:placeholder="item.columnDesc"
></el-date-picker>
</el-form-item>
</template>
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
@ -108,36 +170,123 @@
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row="true" <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row="true"
@current-change="handleDetail" @current-change="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)"
:default-sort="defaultSort" @sort-change="handleSortChange"> :default-sort="defaultSort" @sort-change="handleSortChange">
<el-table-column label="序号" type="index" width="60"></el-table-column> <!-- <el-table-column label="序号" type="index" width="60"></el-table-column>-->
<el-table-column label="领用单号" prop="billNo"></el-table-column> <!-- <el-table-column label="领用单号" prop="billNo"></el-table-column>-->
<el-table-column label="领用部门" prop="deptName"></el-table-column> <!-- <el-table-column label="领用部门" prop="deptName"></el-table-column>-->
<el-table-column label="领用仓库" prop="invName"></el-table-column> <!-- <el-table-column label="领用仓库" prop="invName"></el-table-column>-->
<el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"></el-table-column> <!-- <el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"></el-table-column>-->
<el-table-column label="单据状态" prop="status"> <!-- <el-table-column label="单据状态" prop="status">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-tag :type="(scope.row.status)"> <!-- <el-tag :type="(scope.row.status)">-->
{{ statusMap[scope.row.status] }} <!-- {{ statusMap[scope.row.status] }}-->
</el-tag> <!-- </el-tag>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="领用备注" prop="remark"></el-table-column> <!-- <el-table-column label="领用备注" prop="remark"></el-table-column>-->
<el-table-column label="审核说明" prop="auditRemark"></el-table-column> <!-- <el-table-column label="审核说明" prop="auditRemark"></el-table-column>-->
<el-table-column label="创建时间" prop="createTime" <!-- <el-table-column label="创建时间" prop="createTime"-->
sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column> <!-- sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column>-->
<el-table-column label="审核时间" prop="auditTime" <!-- <el-table-column label="审核时间" prop="auditTime"-->
sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column> <!-- sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column>-->
<el-table-column label="操作"> <!-- <el-table-column label="操作">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-button type="text" size="small" @click.native.stop="printOrder(scope.row)" <!-- <el-button type="text" size="small" @click.native.stop="printOrder(scope.row)"-->
>打印 <!-- >打印-->
</el-button> <!-- </el-button>-->
<el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)" <!-- <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"-->
>删除 <!-- >删除-->
</el-button> <!-- </el-button>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<template v-for="(item, index) in tableHeader">
<el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
type="index" :label="item.columnDesc"></el-table-column>
<el-table-column
v-if="item.columnType == 'selection'"
type="selection"
:width="item.width"
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
></el-table-column>
<el-table-column
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
<span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
</el-tag>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:width="item.width"
:key="item.columnName"
fixed="right"
>
<template slot-scope="scope">
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
:type="buttonItem.type"
:size="buttonItem.size"
:style="buttonItem.style"
:key="buttonItem"
v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
:disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
@click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
>{{ buttonItem.name }}
</el-button>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
</template>
</el-table-column>
</template>
</el-table> </el-table>
<pagination <pagination
@ -151,15 +300,102 @@
</el-card> </el-card>
<el-card class="el-card"> <el-card class="el-card">
<el-table v-loading="loading" :data="detailList" style="width: 100%" border> <el-table v-loading="loading" :data="detailList" style="width: 100%" border>
<el-table-column label="序号" type="index" width="60"></el-table-column> <!-- <el-table-column label="序号" type="index" width="60"></el-table-column>-->
<el-table-column label="DI/物资编码" prop="nameCode"></el-table-column> <!-- <el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>-->
<el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column> <!-- <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>-->
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip="true"></el-table-column> <!-- <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip="true"></el-table-column>-->
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column> <!-- <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>-->
<el-table-column label="领用数量" prop="count"></el-table-column> <!-- <el-table-column label="领用数量" prop="count"></el-table-column>-->
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column> <!-- <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>-->
<el-table-column label="生产厂家" prop="manufactory"></el-table-column> <!-- <el-table-column label="生产厂家" prop="manufactory"></el-table-column>-->
<el-table-column label="供应商" prop="supName"></el-table-column> <!-- <el-table-column label="供应商" prop="supName"></el-table-column>-->
<template v-for="(item, index) in tableHeader2">
<el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
type="index" :label="item.columnDesc"></el-table-column>
<el-table-column
v-if="item.columnType == 'selection'"
type="selection"
:width="item.width"
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
></el-table-column>
<el-table-column
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
<span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
</el-tag>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:width="item.width"
:key="item.columnName"
fixed="right"
>
<template slot-scope="scope">
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
:type="buttonItem.type"
:size="buttonItem.size"
:style="buttonItem.style"
:key="buttonItem"
v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
:disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
@click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
>{{ buttonItem.name }}
</el-button>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
</template>
</el-table-column>
</template>
</el-table> </el-table>
</el-card> </el-card>
<el-dialog <el-dialog
@ -181,7 +417,12 @@
import {getOrderDetail, getReceiveOrder, printOrder} from "@/api/inout/receiveOrder"; import {getOrderDetail, getReceiveOrder, printOrder} from "@/api/inout/receiveOrder";
import auditDetail from "@/views/inout/receive/receiveAuditDetail" import auditDetail from "@/views/inout/receive/receiveAuditDetail"
import {delReceive} from "@/api/thrsys/thrOrderReceive"; import {delReceive} from "@/api/thrsys/thrOrderReceive";
import {filterSub, filterSubAll, findByFrom, findInvByUser} from "@/api/system/invSubWarehouse"; import {
filterSub,
filterSubAllOptimize,
findInvByUserOptimize,
findByFromOptimize} from "@/api/system/invSubWarehouse";
import {executeFuc, getHead} from "@/utils/customConfig";
export default { export default {
data() { data() {
@ -210,6 +451,16 @@ export default {
invCodebe: null, invCodebe: null,
newSpDistributionVisible: false, newSpDistributionVisible: false,
total: 0, total: 0,
tableHeader:[],
queryList:[],
fromList:[],
tableHeader2:[],
queryList2:[],
fromList2:[],
options: {
finCurInv:[],
finCorpList:[],
},
thirdSys: [], thirdSys: [],
thirdSysDetail: null, thirdSysDetail: null,
busTypes: [], busTypes: [],
@ -321,8 +572,8 @@ export default {
hideSearch() { hideSearch() {
this.showSearch = !this.showSearch; this.showSearch = !this.showSearch;
}, },
deleteDialog(row) { deleteDialog(_this,row) {
this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", { _this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
@ -334,11 +585,11 @@ export default {
delReceive(dQuery) delReceive(dQuery)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
this.$message.success("删除成功"); _this.$message.success("删除成功");
this.getList(); _this.getList();
this.detailList = null; _this.detailList = null;
} else { } else {
this.$message.error(response.message); _this.$message.error(response.message);
} }
}) })
.catch(() => { .catch(() => {
@ -392,48 +643,48 @@ export default {
this.total = 0; this.total = 0;
}); });
}, },
handleDetail(row) { handleDetail(_this,row) {
var query = {}; var query = {};
query.orderIdFk = row.billNo; query.orderIdFk = row.billNo;
getOrderDetail(query) //查找该单号下的所有条码 getOrderDetail(query) //查找该单号下的所有条码
.then((response) => { .then((response) => {
this.detailList = response.data.list || []; _this.detailList = response.data.list || [];
}) })
.catch(() => { .catch(() => {
this.detailList = []; _this.detailList = [];
}); });
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.filterQuery.page = val.page; this.filterQuery.page = val.page;
this.getList(); this.getList();
}, },
finCorpList(val) { finCorpList(_this,val) {
let query = { let query = {
name: val, name: val,
page: 1, page: 1,
limit: 10, limit: 10,
} }
filterSubAll(query) filterSubAllOptimize(query)
.then((response) => { .then((response) => {
this.loading = false; _this.loading = false;
this.corpList = response.data || []; _this.options.finCorpList = response.data || [];
}) })
.catch(() => { .catch(() => {
this.loading = false; _this.loading = false;
this.corpList = []; _this.options.finCorpList = [];
}); });
}, },
finCurInv(keyWord) { finCurInv(_this,keyWord) {
this.invList = []; _this.invList = [];
let query = { let query = {
name: keyWord, name: keyWord,
locInvCode: this.$store.getters.locInvCode, locInvCode: this.$store.getters.locInvCode,
filter: 3 filter: 3
}; };
findByFrom(query) findByFromOptimize(query)
.then((response) => { .then((response) => {
this.invList = response.data || []; _this.options.finCurInv = response.data || [];
// if (this.invList.length > 0) { // if (this.invList.length > 0) {
// this.filterQuery.targetInvCode = this.invList[0].code // this.filterQuery.targetInvCode = this.invList[0].code
// this.invCodebe = this.filterQuery.targetInvCode // this.invCodebe = this.filterQuery.targetInvCode
@ -441,11 +692,12 @@ export default {
// this.getList(); // this.getList();
}) })
.catch(() => { .catch(() => {
_this.options.finCurInv = [];
}); });
}, },
printOrder(row) { printOrder(_this,row) {
printOrder(row) printOrder(row)
.then((response) => { .then((response) => {
const binaryData = []; const binaryData = [];
@ -454,9 +706,9 @@ export default {
let url = window.URL.createObjectURL( let url = window.URL.createObjectURL(
new Blob(binaryData, {type: "application/pdf"}) new Blob(binaryData, {type: "application/pdf"})
); );
this.loading = false; _this.loading = false;
window.open(url);//打开新标签页，预览pdf。 window.open(url);//打开新标签页，预览pdf。
this.getList(); _this.getList();
}) })
.catch(() => { .catch(() => {
}); });
@ -464,7 +716,15 @@ export default {
closeDialog() { closeDialog() {
this.newSpDistributionVisible = false; this.newSpDistributionVisible = false;
}, },
executeFuc(row,type,clickFuc,value){
return executeFuc(this,row,type,clickFuc,value);
},
executeEval(row,expression,defaultRet){
if(expression){
return eval(expression);
}
return defaultRet;
}
}, },
components: { components: {
auditDetail auditDetail
@ -472,8 +732,22 @@ export default {
mounted() { mounted() {
}, },
created() { created() {
this.finCurInv(); this.finCurInv(this);
this.getList(); getHead("receiveSearch-1","1").then((re) => {
// 处理返回的数据
this.tableObj = re.data;
this.tableHeader = re.data.tableList;
this.queryList = re.data.queryList;
this.fromList = re.data.fromList;
this.getList();
});
getHead("receiveSearch-2","1").then((re) => {
// 处理返回的数据
this.tableObj2 = re.data;
this.tableHeader2 = re.data.tableList;
this.queryList2 = re.data.queryList;
this.fromList2 = re.data.fromList;
});
}, },
}; };
</script> </script>

Write Preview
Loading…
Cancel
Save