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

采购订单界面相关修改

Browse Source
ywj_dev
anthonywj 2 years ago
parent 98461686c0
commit 573dd9f410
5 changed files with 630 additions and 581 deletions
Show Stats Download Patch File Download Diff File

54
src/views/basic/busType/bussinessTypeModify.vue
Unescape Escape View File

@ -71,12 +71,32 @@
<el-option label="送货单管理" :value="2"></el-option>
<el-option label="到货单管理" :value="3"></el-option>
<el-option label="退货单管理" :value="4"></el-option>
<el-option label="发票登记" :value="5"></el-option>
<!-- <el-option label="发票登记" :value="5"></el-option>-->
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11">
<el-form-item label="往来单位类型" prop="corpType">
<el-select v-model="inputQuery.corpType"
size="small"
style="width: 90%"
placeholder="往来信息"
@change="corpTypeChange"
>
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="内部进出平衡补单" prop="supplementOrderType">
<el-select :disabled="inputQuery.corpType !=3"
@ -126,12 +146,6 @@
<el-row type="flex">
<el-col :span="11">
<el-form-item label="单据前缀" prop="prefix">
<el-input v-model="inputQuery.prefix" size="small" style="width: 90%"></el-input>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="供应商使用" prop="prefix">
<el-select v-model="inputQuery.spUse" style="width: 90%" placeholder="是否允许" clearable>
@ -140,6 +154,12 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="单据前缀" prop="prefix">
<el-input v-model="inputQuery.prefix" size="small" style="width: 90%"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="11" class="el-col">-->
<!-- <el-form-item label="单据详情展示方式" prop="orderVisibleType">-->
<!-- <el-select v-model="inputQuery.orderVisibleType"-->
@ -156,24 +176,7 @@
<el-row type="flex">
<el-col :span="11">
<el-form-item label="往来单位类型" prop="corpType">
<el-select v-model="inputQuery.corpType"
size="small"
style="width: 90%"
placeholder="往来信息"
@change="corpTypeChange"
>
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row type="flex">-->
<!-- <el-col :span="11">-->
@ -1312,6 +1315,7 @@ export default {
transition: border-bottom-color 0.3s;
outline: none;
}
/deep/ .el-collapse-item__content {
padding-bottom: 10px;
font-size: 13px;

19
src/views/inout/DialogEditCode.vue
Unescape Escape View File

@ -72,7 +72,7 @@
import {
findByCode,
saveCode, tabCode
saveCode
} from "@/api/inout/code";
export default {
@ -106,21 +106,6 @@ export default {
methods: {
saveCode() {
if (this.editType == 1) {
this.repeatAddCode(this.editData);
tabCode(this.editData)
.then((response) => {
console.log(response)
if (response.code === 20000) {
this.$message.success("提交成功");
} else {
this.$message.error(response.message);
}
this.loading = false;
});
} else {
saveCode(this.editData)
.then((response) => {
console.log(response)
@ -134,8 +119,6 @@ export default {
this.loading = false;
});
}
}
,
cancelDialog() {
this.closeCodeDialog();

148
src/views/inventory/InvSupPreInSerach.vue
Unescape Escape View File

@ -5,7 +5,7 @@
<el-row>
<el-col :span="18">
<el-form-item class="query-form-item" label="扫码查询:">
<el-input v-model="codeQuery.udiCode"
<el-input v-model="codeQuery.code"
style="width: 97%"
placeholder="请扫描或输入UDI码"
clearable="true"
@ -21,7 +21,15 @@
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="状态:">
<el-select v-model="codeQuery.status" style="width: 90%" placeholder="请选择状态" clearable>
<el-option label="在库" value="1"></el-option>
<el-option label="已使用" value="2"></el-option>
<el-option label="已退回" value="3"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="收货仓库:">
<el-select v-model="codeQuery.invCode" placeholder="请选择收货仓库" clearable="true"
@ -89,21 +97,21 @@
</el-row>
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="注册/备案号:">
<el-input v-model="codeQuery.zczbhhzbapzbh" placeholder="注册/备案号"
<el-form-item class="query-form-item" label="生产企业:">
<el-input v-model="codeQuery.ylqxzcrbarmc" placeholder="生产企业"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="生产企业:">
<el-input v-model="codeQuery.ylqxzcrbarmc" placeholder="生产企业"
<el-form-item class="query-form-item" label="注册/备案号:">
<el-input v-model="codeQuery.zczbhhzbapzbh" placeholder="注册/备案号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
@ -128,46 +136,101 @@
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="UDI码"
prop="code"
width="180"
label="收货时间"
prop="auditTime"
width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="预验收单号"
prop="orderId"
width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="预验收单号"
prop="orderId"
width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column label="状态" prop="status">
<template slot-scope="scope">
<el-tag :type="(scope.row.status)">
{{ statusMap[scope.row.status] }}
</el-tag>
</template>
</el-table-column>
<el-table-column
label="产品名称"
label="收货仓库"
prop="invName"
width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="物资名称"
prop="productName"
width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="规格型号"
prop="ggxh"
width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="批次号"
prop="batchNo" width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="扫码数量"
prop="reCount"
label="入库数量"
prop="originReCount" width="100"
></el-table-column>
<el-table-column
label="实际数量"
prop="reCount"
label="剩余数量"
prop="reCount" width="100"
></el-table-column>
<el-table-column
label="生产日期"
prop="produceDate"
width="120"
width="100"
></el-table-column>
<el-table-column
label="失效日期"
prop="expireDate"
width="120"
width="100"
></el-table-column>
<el-table-column
label="序列号"
prop="serialNo"
width="120"
></el-table-column>
<el-table-column
label="UDI码"
prop="code"
width="180"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="生产企业"
prop="manufactory"
width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="注册/备案号"
prop="zczbhhzbapzbh"
width="160"
show-overflow-tooltip
></el-table-column>
</el-table>
<pagination
v-show="codeTotal>0"
@ -203,14 +266,6 @@ export default {
data() {
return {
showSearch: true,
filterQuery: {
id: "",
billNo: null,
page: 1,
limit: 10,
startTime: null,
endTime: null,
},
invList: [],
list: [],
total: 0,
@ -275,7 +330,16 @@ export default {
],
},
codeQuery: {
code: null,
orderId: null,
status: null,
invCode: null,
nameCode: null,
cpmctymc: null,
ggxh: null,
batchNo: null,
ylqxzcrbarmc: null,
zczbhhzbapzbh: null,
page: 1,
limit: 10
},
@ -283,6 +347,12 @@ export default {
codeDetailLoading: false,
codeDetailList: [],
fromOptions: [],
auditDateRange: [],
statusMap: {
1: "在库",
2: "已使用",
3: "已退回",
}
};
},
components: {},
@ -291,27 +361,19 @@ export default {
this.$router.push({
path: "",
});
this.filterQuery = {
id: "",
billNo: null,
page: 1,
limit: 10,
startTime: null,
endTime: null,
};
this.getList();
},
onSubmit() {
this.loading = true;
if (this.actDateRange !== null) {
this.filterQuery.startTime = this.actDateRange[0];
this.filterQuery.endTime = this.actDateRange[1];
if (this.auditDateRange !== null) {
this.codeQuery.startAduditTime = this.auditDateRange[0];
this.codeQuery.endAduditTime = this.auditDateRange[1];
} else {
this.filterQuery.startTime = null;
this.filterQuery.endTime = null;
this.codeQuery.startAduditTime = null;
this.codeQuery.endAduditTime = null;
}
this.filterQuery.page = 1;
this.codeQuery.page = 1;
this.getList();
},
hideSearch() {
@ -421,12 +483,6 @@ export default {
this.getCodeDetailList();
},
getCodeDetailList() {
if (isBlank(this.currentRow.billNo)) {
this.$message.error("请先选择需要查询的单据！")
return;
}
this.codeQuery.orderId = this.currentRow.billNo;
this.codeDetailLoading = true;
filterDetail(this.codeQuery).then((res) => {
this.codeDetailLoading = false;

46
src/views/purchase/purOrder/purOrderDetailDialog.vue
Unescape Escape View File

@ -4,11 +4,10 @@
<el-form :model="formData" :rules="formRules" ref="dataForm" label-width="120px">
<el-row type="flex" justify="end" v-if="editType == 1">
<el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
<el-button type="primary" @click.native="saveOrder('3')" :loading="loading">审核通过</el-button>
<el-button type="primary" @click.native="saveOrder('4')" :loading="loading">拒绝申请</el-button>
<el-button type="primary" @click.native="saveOrder('3')" :loading="loading">开始配货</el-button>
<el-button type="primary" @click.native="saveOrder('4')" :loading="loading">作废</el-button>
</el-button-group>
</el-row>
<el-card style="margin-top: -5px;">
<el-row>
<el-col :span="11">
@ -46,17 +45,29 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="审核说明:" prop="billNo">
<el-input v-model="formData.auditRemark" style="width: 90%" auto-complete="off" type="textarea" autosize></el-input>
<el-form-item label="处理状态:" prop="dealStatus">
<el-select v-model="formData.dealStatus" style="width: 90%" disabled>
<el-option label="已处理" :value="1"></el-option>
<el-option label="未处理" :value="2"></el-option>
<el-option label="作废" :value="3"></el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="11">-->
<!-- <el-form-item label="审核说明:" prop="billNo">-->
<!-- <el-input v-model="formData.auditRemark" style="width: 90%" auto-complete="off" type="textarea" autosize></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="采购说明:" prop="billNo">
<el-input v-model="formData.remark" style="width: 90%":disabled="true" auto-complete="off" type="textarea" autosize></el-input>
<el-col :span="24">
<el-form-item label="订单说明:" prop="billNo">
<el-input v-model="formData.remark" style="width: 90%" :disabled="true" auto-complete="off"
type="textarea" autosize></el-input>
</el-form-item>
</el-col>
<el-col :span="11">
@ -69,7 +80,8 @@
<el-row v-show="formData.autoPurchase">
<el-col :span="11">
<el-form-item label="入库仓库:" prop="locStorageCode">
<el-select v-model="formData.targetSubInv" placeholder="入库仓库信息" style="width: 90%" @change="targetInvChange" clearable>
<el-select v-model="formData.targetSubInv" placeholder="入库仓库信息" style="width: 90%"
@change="targetInvChange" clearable>
<el-option
v-for="item in tarSubList"
:key="item.name"
@ -99,13 +111,12 @@
</el-card>
<el-card>
<el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border highlight-current-row max-height="300" height="300" ref="multipleTable">
<el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border
highlight-current-row max-height="300" height="300" ref="multipleTable">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="物资名称" prop="productName" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="单据数量">
<el-table-column label="物资名称" prop="productName" show-overflow-tooltip width="150"></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip width="160"></el-table-column>
<el-table-column width="120" label="订单数量">
<template slot-scope="scope">
<el-input size="small" v-model="scope.row.count"
placeholder="请输入数量" style="width: 80%"
@ -115,6 +126,11 @@
oninput="value=value.replace(/[^\d]/g,'')"></el-input>
</template>
</el-table-column>
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip width="100"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip width="160"></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"
width="160"></el-table-column>
</el-table>
</el-card>
</el-form>

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

@ -8,10 +8,9 @@
<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" style="width: 90%" placeholder="请选择所属仓库">
<el-select v-model="filterQuery.invCode" style="width: 90%" placeholder="请选择采购部门">
<el-option
v-for="item in invList"
:key="item.name"
@ -22,8 +21,6 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="收货仓库">
<el-select v-model="filterQuery.deptCode" placeholder="请选择收货仓库" style="width: 90%">
@ -39,27 +36,10 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="创建时间:">
<el-date-picker
:picker-options="pickerOptions"
v-model="createTimes"
type="daterange"
format="yyyy 年 MM 月 dd 日"
style="width: 90%"
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-form-item label="发布时间:">
<el-date-picker
:picker-options="pickerUpOptions"
v-model="auditTimes"
@ -76,8 +56,6 @@
</el-col>
</el-row>
</el-form>
<div class="top-right-btn">
<el-button-group style="display:flex;">
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
@ -92,23 +70,28 @@
@current-change="handleDetail">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="采购订单号" prop="billNo" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="创建时间" prop="createTime" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="采购部门" prop="invName" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="收货仓库" prop="deptName" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="发布时间" prop="auditTime" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="处理状态" prop="emergency" width="120">
<template slot-scope="scope">
{{ dealStatus[scope.row.emergency] }}
</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] }}
</template>
</el-table-column>
<el-table-column label="到货时间" prop="arrivalTime" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="采购说明" prop="remark" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="审核时间" prop="auditTime" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="操作">
<!-- <template slot-scope="scope">-->
<!-- <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- </template>-->
<el-table-column label="订单说明" prop="remark" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="采购部门" prop="deptName" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="收货仓库" prop="invName" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" fixed="right" width="100">
<template slot-scope="scope">
<el-button type="text" size="small" @click.native.stop="newDistributionForm(scope.row)"
>处理
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
@ -123,16 +106,16 @@
<el-card class="el-card">
<el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row="true">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<!-- <el-table-column label="产品编码" prop="productId"></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>
<el-table-column label="申购数量" prop="count"></el-table-column>
<el-table-column label="计划数量" prop="planCount"></el-table-column>
<el-table-column label="计量单位" prop="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="物资名称" prop="productName" show-overflow-tooltip width="150"></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip width="160"></el-table-column>
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip width="100"></el-table-column>
<el-table-column label="计划数量" prop="planCount" width="100"></el-table-column>
<el-table-column label="订单数量" prop="count" width="100"></el-table-column>
<el-table-column label="计量单位" prop="spec" show-overflow-tooltip="true" width="100"></el-table-column>
<!-- <el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>-->
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true" width="160"></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip="true" width="160"></el-table-column>
<el-table-column label="注册/备案人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
<!-- <el-table-column label="注册/备案人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>-->
</el-table>
</el-card>
@ -197,6 +180,13 @@ export default {
2: "紧急",
3: "不紧急",
},
dealStatus: {
1: "已处理",
2: "未处理",
3: "作废",
},
invList: {},
deptList: {},
idQuery: {},
@ -411,7 +401,7 @@ export default {
this.deptList = res.data || [];
});
},
newDistributionForm(index, row) {
newDistributionForm(row) {
this.idQuery.id = '';
if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
this.idQuery.id = row.id;

Write Preview
Loading…
Cancel
Save