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

供应商订单

Browse Source
20231126-yw
yuanwei 2 years ago
parent 0498ab1c86
commit b6a6deb5c7
5 changed files with 413 additions and 49 deletions
Show Stats Download Patch File Download Diff File

17
src/api/auth/authDept.js
Unescape Escape View File

@ -8,6 +8,14 @@ export function filterDepts(query) {
});
}
export function filterDeptsOptimize(query) {
return axios({
url: "/spms/inv/warehouse/filterAllOptimize",
method: "get",
params: query
});
}
export function addDept(data) {
return axios({
url: "/udi/auth/dept/add",
@ -39,3 +47,12 @@ export function getDeptListByUser(params) {
params: params
});
}
export function getDeptListByUserOptimize(params) {
return axios({
url: "/spms/inv/warehouse/filterByUserOptimize",
method: "get",
params: params
});
}

16
src/api/system/invWarehouse.js
Unescape Escape View File

@ -43,6 +43,14 @@ export function filterAllByUser(query) {
});
}
export function findAllInvByUserOptimize(params) {
return axios({
url: "/spms/inv/warehouse/findAllInvByUserOptimize",
method: "get",
params: params
});
}
export function filterUplLocInv(query) {
return axios({
url: "/spms/inv/warehouse/filterUplLocInv",
@ -242,6 +250,14 @@ export function getInvListByUser(params) {
});
}
export function getInvListByUserOptimize(params) {
return axios({
url: "/spms/inv/warehouse/findInvListByUserOptimize",
method: "get",
params: params
});
}
export function selectInvById(params) {
return axios({

359
src/views/purchase/purOrder/purOrderSearch.vue
Unescape Escape View File

@ -2,13 +2,14 @@
<div>
<el-card>
<el-form
v-if="queryList && queryList.length > 0"
:model="filterQuery"
class="query-form"
label-width="100px"
size="mini"
v-show="showSearch"
>
<el-row>
<!-- <el-row>
<el-col :span="8">
<el-form-item label="采购订单号">
<el-input
@ -116,6 +117,72 @@
</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 v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-select
v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)"
filterable
remote
:remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
clearable>
<el-option
v-for="item in options[item.clickFuc]"
:key="item.code"
:label="item.label"
:value="item.code"
/>
</el-select>
</el-form-item>
<el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-date-picker
:picker-options="pickerUpOptions"
v-model="filterQuery[item.columnName]"
type="daterange"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
></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>
</template>
</el-row>
</el-form>
<div class="top-right-btn">
@ -150,11 +217,11 @@
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"
>
<el-table-column label="序号" type="index"></el-table-column>
<!-- <el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="采购订单号"
prop="billNo"
@ -186,7 +253,6 @@
</template>
</el-table-column>
<!-- <el-table-column label="创建时间" prop="createTime" width="180" show-overflow-tooltip></el-table-column>-->
<el-table-column label="紧急程度" prop="emergency" width="120">
<template slot-scope="scope">
{{ emergencyMap[scope.row.emergency] }}
@ -228,7 +294,94 @@
>处理
</el-button>
</template>
</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>
<pagination
v-show="total > 0"
@ -246,7 +399,7 @@
border
highlight-current-row="true"
>
<el-table-column label="序号" type="index" width="50"></el-table-column>
<!-- <el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>
<el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
@ -255,8 +408,95 @@
<el-table-column label="采购数量" prop="count"></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="supName"></el-table-column>
<el-table-column label="供应商" prop="supName"></el-table-column> -->
<!-- <el-table-column label="注册/备案人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></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-card>
@ -286,9 +526,12 @@ import {
delOrderDetailAll,
} from "@/api/purchase/purOrder";
import {selectAuthMenu} from "@/api/system/sysMenuHelp";
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
import {getDeptListByUser} from "@/api/auth/authDept";
import {getInvListByUser} from "@/api/system/invWarehouse";
import {getBasicUnitMaintainsOptimize} from "@/api/basic/basicUnitMaintain";
import {getDeptListByUserOptimize} from "@/api/auth/authDept";
import {filterSubAllOptimize} from "@/api/system/invWarehouse";
import {
getHead,executeFuc
} from "@/utils/customConfig";
export default {
data() {
@ -344,6 +587,17 @@ export default {
idQuery: {},
editType: 1,
total: 0,
tableHeader:[],
queryList:[],
fromList:[],
tableHeader2:[],
queryList2:[],
fromList2:[],
options: {
getInvList:[],
getDeptList:[],
findMethod:[],
},
thirdSys: [],
thirdSysDetail: null,
busTypes: [],
@ -451,15 +705,11 @@ export default {
this.showSearch = !this.showSearch;
},
change(val){
change(_this,val){
let param={
pcode:val
}
getInvListByUser(param).then((res) => {
// console.log("res1", res);
this.invList = res.data || [];
});
_this.getInvList(_this,param)
},
@ -508,18 +758,18 @@ export default {
this.total = 0;
});
},
handleDetail(row) {
handleDetail(_this,row) {
let query = {orderIdFk: row.id};
this.loading = true;
_this.loading = true;
listOrderDetail(query) //查找该单号下的所有条码
.then((response) => {
this.detailList = response.data.list || [];
this.loading = false;
_this.detailList = response.data.list || [];
_this.loading = false;
})
.catch(() => {
this.loading = false;
this.detailList = [];
this.total = 0;
_this.loading = false;
_this.detailList = [];
_this.total = 0;
});
},
deleteDialog(row) {
@ -560,7 +810,7 @@ export default {
});
},
findMethod(key) {
findMethod(_this,key) {
this.corpLoading = true;
this.fromOptions = [];
let params = {
@ -569,13 +819,13 @@ export default {
page: 1,
limit: 20,
};
getBasicUnitMaintains(params)
getBasicUnitMaintainsOptimize(params)
.then((res) => {
this.corpLoading = false;
this.fromOptions = res.data.list || [];
_this.corpLoading = false;
_this.options.findMethod = res.data.list || [];
})
.catch(() => {
this.corpLoading = false;
_this.corpLoading = false;
});
},
@ -584,26 +834,26 @@ export default {
this.getList();
this.detailList = [];
},
getInvList() {
getInvListByUser().then((res) => {
getInvList(_this,param) {
getInvListByUserOptimize(param).then((res) => {
// console.log("res1", res);
this.invList = res.data || [];
_this.options.getInvList = res.data || [];
});
},
getDeptList() {
getDeptListByUser().then((res) => {
getDeptList(_this) {
getDeptListByUserOptimize().then((res) => {
// console.log("res2", res);
this.deptList = res.data || [];
_this.options.getDeptList = res.data || [];
});
},
newDistributionForm(row) {
this.idQuery.id = "";
if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
this.idQuery.id = row.id;
this.idQuery.formData = row;
this.formName = "update";
} else this.formName = "add";
this.newSpDistributionVisible = true;
newDistributionForm(_this,row) {
_this.idQuery.id = "";
if (_this.$isNotBlank(row) && _this.$isNotBlank(row.id)) {
_this.idQuery.id = row.id;
_this.idQuery.formData = row;
_this.formName = "update";
} else _this.formName = "add";
_this.newSpDistributionVisible = true;
},
statusFilterType(status) {
const statusMap = {
@ -613,6 +863,15 @@ export default {
};
return statusMap[status];
},
executeFuc(row,type,clickFuc,value){
return executeFuc(this,row,type,clickFuc,value);
},
executeEval(row,expression,defaultRet){
if(expression){
return eval(expression);
}
return defaultRet;
}
},
components: {
purPlanEdit,
@ -632,9 +891,23 @@ export default {
let start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
this.actDateRange = [start, end];
this.getInvList(this,{});
this.getDeptList(this);
getHead("purOrderSearch-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();
this.getInvList();
this.getDeptList();
});
getHead("purOrderSearch-2","1").then((re) => {
// 处理返回的数据
this.tableObj2 = re.data;
this.tableHeader2 = re.data.tableList;
this.queryList2 = re.data.queryList;
this.fromList2 = re.data.fromList;
});
},
};
</script>

47
src/views/system/customConfig/configFromDetail.vue
Unescape Escape View File

@ -43,6 +43,12 @@
<el-table-column prop="checkRules" show-overflow-tooltip="true" label="验证规则"></el-table-column>
<el-table-column prop="inputType" label="input类型"></el-table-column>
<el-table-column prop="clickFuc" label="内容改变事件"></el-table-column>
<el-table-column prop="dataFuc" label="获取数据接口"></el-table-column>
<el-table-column label="下拉框显示内容" prop="isShowXx">
<template slot-scope="scope">
<span>{{ isShowXxMap[scope.row.isShowXx] }}</span>
</template>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
@ -94,7 +100,7 @@
<el-option label="表单" value="input" />
<el-option label="下拉框" value="select" />
<el-option label="单选框" value="radio" />
<el-option label="下拉框自定义" value="selectCustom" />
<el-option label="远程搜索" value="selectServer" />
<el-option label="树状自定以" value="treeCustom" />
<el-option label="时间选择" value="date" />
</el-select>
@ -150,8 +156,8 @@
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<el-form-item label="input类型" prop="size">
<el-select v-model="subData.size" placeholder="请选择input类型" style="width: 80%">
<el-form-item label="input类型" prop="inputType">
<el-select v-model="subData.inputType" placeholder="请选择input类型" style="width: 80%">
<el-option label="text" value="text" />
<el-option label="number" value="number" />
<el-option label="textarea" value="textarea" />
@ -191,6 +197,16 @@
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<el-form-item label="下拉框显示内容" prop="columnType">
<el-select v-model="subData.isShowXx" placeholder="请选择下拉框显示内容" style="width: 80%">
<el-option label="默认" value="2" />
<el-option label="显示code" value="1" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="20" class="el-col">
<el-form-item label="字典替换规则" class="query-form-item">
@ -208,7 +224,15 @@
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<el-form-item label="获取数据接口" prop="dataFuc" class="query-form-item">
<el-input v-model="subData.dataFuc" style="width: 80%" placeholder="请输入获取数据接口"
auto-complete="off"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click.native="hideForm">取消</el-button>
@ -297,6 +321,10 @@
true: "是",
false: "否",
},
isShowXxMap:{
"1": "带code",
"2": "默认",
},
isShowMap: {
"1": "显示",
"2": "隐藏",
@ -305,7 +333,7 @@
"input": "输入框",
"radio": "单选框",
"select": "下拉框",
"selectCustom": "下拉框自定义",
"selectServer": "远程搜索",
"date":"时间选择",
"treeCustom":"树状自定义",
},
@ -418,6 +446,17 @@
}
},
forSubmit() {
var lableRule = {};
this.conditionForm.lableList.forEach(obj => {
if(obj.name != "" && obj.value != ""){
lableRule[`${obj.value}`] = obj.name;
}
})
this.subData.lableRule = "";
if(JSON.stringify(lableRule) != "{}"){
this.subData.lableRule = JSON.stringify(lableRule);
}
// 新增，编辑---提交
this.$refs["dataForm"].validate((valid) => {
if (valid) {

19
src/views/system/customConfig/configQueryDetail.vue
Unescape Escape View File

@ -36,6 +36,11 @@
<el-table-column prop="disabledFuc" label="禁用eval表达式"></el-table-column>
<el-table-column prop="expression" label="是否展示eval表达式"></el-table-column>
<el-table-column prop="checkRules" label="change事件"></el-table-column>
<el-table-column label="下拉框显示内容" prop="isShowXx">
<template slot-scope="scope">
<span>{{ isShowXxMap[scope.row.isShowXx] }}</span>
</template>
</el-table-column>sss
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
@ -164,6 +169,16 @@
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<el-form-item label="下拉框显示内容" prop="columnType">
<el-select v-model="subData.isShowXx" placeholder="请选择下拉框显示内容" style="width: 80%">
<el-option label="默认" value="2" />
<el-option label="显示code" value="1" />
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click.native="hideForm">取消</el-button>
@ -252,6 +267,10 @@
true: "是",
false: "否",
},
isShowXxMap:{
"1": "带code",
"2": "默认",
},
isShowMap: {
"1": "显示",
"2": "隐藏",

Write Preview
Loading…
Cancel
Save