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

界面调整，bug修改

Browse Source
master
anthonyywj2 3 years ago
parent 8d242ea503
commit ff8b7e2db8
11 changed files with 120 additions and 90 deletions
Show Stats Download Patch File Download Diff File

8
src/api/basic/invWarehouse.js
Unescape Escape View File

@ -19,6 +19,14 @@ export function filterAll(query) {
});
}
export function filterAllByLoc(query) {
return axios({
url: "/spms/inv/warehouse/filterAllLocInv",
method: "get",
params: query
});
}
export function filterAllByUser(query) {
return axios({
url: "/spms/inv/warehouse/filterAllByUser",

4
src/views/business/stockOrder.vue
Unescape Escape View File

@ -366,7 +366,7 @@ import codeDetail from "./errorCode";
import addOrder from "./addOrder";
import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";
import store from "../../store";
import {getLocalJoinBusType} from "../../api/basic/busLocalType";
import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
export default {
@ -745,7 +745,7 @@ export default {
let query = {
enabled: true,
};
getLocalJoinBusType(query)
getLocalJoinByUser(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.filterQuery.billAction = this.busTypes[0].action;

6
src/views/business/stockOrderDelSearch.vue
Unescape Escape View File

@ -163,7 +163,7 @@
</el-table-column>
<el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="产品通用名" width="200" prop="productName"></el-table-column>
<el-table-column label="包装规格" width="200"prop="spec"></el-table-column>
<el-table-column label="包装规格" width="200" prop="spec"></el-table-column>
<el-table-column label="批次号" width="100" prop="batchNo"></el-table-column>
<el-table-column label="销售清单号（第二票）" width="180" prop="secSalesListNo">
<template slot-scope="scope">
@ -433,7 +433,7 @@ import stockQRCodeExport from "./stockQRCodeExport";
import draggable from "vuedraggable";
import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";
import store from "../../store";
import {getLocalJoinBusType} from "../../api/basic/busLocalType";
import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
export default {
@ -866,7 +866,7 @@ export default {
let query = {
enabled: true,
};
getLocalJoinBusType(query)
getLocalJoinByUser(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.filterQuery.billAction = this.busTypes[0].action;

4
src/views/business/stockOrderEditor.vue
Unescape Escape View File

@ -492,7 +492,7 @@ import draggable from "vuedraggable";
import codeDetail from "./errorCode";
import addOrder from "./addOrder";
import store from "../../store";
import {getLocalJoinBusType} from "../../api/basic/busLocalType";
import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
@ -848,7 +848,7 @@ export default {
let query = {
enabled: true,
};
getLocalJoinBusType(query)
getLocalJoinByUser(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.filterQuery.billAction = this.busTypes[0].action;

4
src/views/business/stockOrderNew.vue
Unescape Escape View File

@ -430,7 +430,7 @@ import {BASE_URL} from "../../config/app";
import stockOrderNewDistribution from "./stockOrderNewDistribution";
import store from "../../store";
import draggable from "vuedraggable";
import {getLocalJoinBusType} from "../../api/basic/busLocalType";
import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
import {selectSysParamByKey} from "../../api/param/systemParamConfig";
import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
@ -822,7 +822,7 @@ export default {
let query = {
enabled: true,
};
getLocalJoinBusType(query)
getLocalJoinByUser(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.filterQuery.billAction = this.busTypes[0].action;

4
src/views/business/stockOrderSearch.vue
Unescape Escape View File

@ -476,7 +476,7 @@ import stockQRCodeExport from "./stockQRCodeExport";
import draggable from "vuedraggable";
import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";
import store from "../../store";
import {getLocalJoinBusType} from "../../api/basic/busLocalType";
import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
export default {
@ -914,7 +914,7 @@ export default {
let query = {
enabled: true,
};
getLocalJoinBusType(query)
getLocalJoinByUser(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.filterQuery.billAction = this.busTypes[0].action;

4
src/views/business/stockOrderWaitCheck.vue
Unescape Escape View File

@ -339,7 +339,7 @@ import codeDetail from "./errorCode";
import addOrder from "./addOrder";
import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";
import store from "../../store";
import {getLocalJoinBusType} from "../../api/basic/busLocalType";
import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
export default {
@ -732,7 +732,7 @@ export default {
let query = {
enabled: true,
};
getLocalJoinBusType(query)
getLocalJoinByUser(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.filterQuery.billAction = this.busTypes[0].action;

108
src/views/inout/IOAddOrder.vue
Unescape Escape View File

@ -51,6 +51,56 @@
</el-row>
<el-row :gutter="20">
<el-col :span="2">
<div class="ao-text">
<span>单据类型：</span>
</div>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" prop="billType">
<el-select v-model="formData.action" placeholder="请选择单据类型"
@change="actionChange">
<el-option
v-for="item in busTypes"
:key="item.name"
:label="item.name"
:value="item.action">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="2">
<div class="ao-text">
<span>当前仓库：</span>
</div>
</el-col>
<el-col :span="8">
<el-form-item prop="locStorageCode">
<!--<el-select v-model="formData.billType" style="width: 100%" placeholder="业务类型" :disabled="true">-->
<!--<el-option label="送货单" value="deliveryNote"></el-option>-->
<!--</el-select>-->
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locCHange">
<el-option
v-for="item in storageList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<!-- :disabled="actionEnable"/-->
<el-row :gutter="20">
<el-col :span="2">
<div class="ao-text">
<span>往来信息：</span>
@ -110,51 +160,6 @@
></el-input>
</el-form-item>
</el-col>
<el-col :span="2">
<div class="ao-text">
<span>单据类型：</span>
</div>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" prop="billType">
<el-select v-model="formData.action" placeholder="请选择单据类型"
@change="actionChange">
<el-option
v-for="item in busTypes"
:key="item.name"
:label="item.name"
:value="item.action">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<!-- :disabled="actionEnable"/-->
<el-row :gutter="20">
<el-col :span="2">
<div class="ao-text">
<span>当前仓库：</span>
</div>
</el-col>
<el-col :span="8">
<el-form-item prop="locStorageCode">
<!--<el-select v-model="formData.billType" style="width: 100%" placeholder="业务类型" :disabled="true">-->
<!--<el-option label="送货单" value="deliveryNote"></el-option>-->
<!--</el-select>-->
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息">
<el-option
v-for="item in storageList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
@ -242,7 +247,7 @@ import draggable from "vuedraggable";
import {parseTime} from "../../filtres/index";
import store from "../../store";
import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
import {filterAll, filterAllByLoc, filterAllByUser} from "@/api/basic/invWarehouse";
import {getLocalBusType, getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
export default {
@ -494,14 +499,17 @@ export default {
this.loading = false;
});
},
locCHange() {
this.findStorageMethod();
},
findStorageMethod(query) {
console.log(query);
if (this.formData.locStorageCode == null)
return;
this.fromStorageOptions = [];
let cQuery = {
key: query,
locInvCode: this.formData.locStorageCode ,
};
filterAllByUser(cQuery)
filterAllByLoc(cQuery)
.then((response) => {
this.fromStorageOptions = response.data || [];
})

64
src/views/inout/IOAdditionalOrder.vue
Unescape Escape View File

@ -25,6 +25,18 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"
size="mini">
<el-option
v-for="item in storageList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button-group>
<el-button
@ -55,31 +67,15 @@
</template>
</el-table-column>
<el-table-column label="往来单位" prop="fromCorp" width="220">
<el-table-column label="往来单位" prop="fromCorp" width="250">
<template slot-scope="scope">
<!-- {{ scope.row.fromCorp }}-->
<p v-if="scope.row.fromCorp == null">
<el-button
type="primary"
size="mini"
@click.native.stop="handleUnitClick(scope.row)"
>选择往来单位
</el-button
>
</p>
<p v-if="scope.row.fromCorp !== null">
<el-button
type="primary"
size="mini"
@click.native.stop="handleUnitClick(scope.row)"
>{{ scope.row.fromCorp }}
</el-button
>
</p>
{{ scope.row.fromCorp }}
</template>
</el-table-column>
<el-table-column label="当前仓库" prop="locStorageCode" width="150">
<template slot-scope="scope">
<span>{{ getStorageName(scope.row.locStorageCode) }}</span>
</template>
</el-table-column>
<el-table-column label="创建时间" prop="actDate" show-overflow-tooltip>
<template slot-scope="scope">
@ -102,7 +98,7 @@
</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="300" fixed="right">
<el-table-column label="操作" width="120" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
@ -262,6 +258,7 @@ import addOrder from "./IOAddOrder";
import store from "../../store";
import {getBussinessType} from "../../api/basic/bussinessType";
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
import {filterAllByUser} from "@/api/basic/invWarehouse";
const formJson = {
site_id: "",
@ -321,6 +318,7 @@ export default {
codeDetailVisible: false,
total: 0,
loading: true,
storageList: [],
index: null,
formName: null,
errorDetail: "1111111111111",
@ -379,7 +377,22 @@ export default {
closeDetailDialog(val) {
this.codeDetailVisible = false;
},
getStorage() {
this.storageList = [];
filterAllByUser()
.then((response) => {
this.storageList = response.data || [];
})
.catch(() => {
});
},
getStorageName(code) {
for (let i = 0; i < this.storageList.length; i++) {
if (this.storageList[i].code === code) {
return this.storageList[i].name;
}
}
},
closeDialog() {
this.addOrderVisible = false;
this.getList();
@ -540,6 +553,7 @@ export default {
};
},
created() {
this.getStorage();
this.getBusType();
let query = this.$route.query;
this.filterQuery = Object.assign(this.filterQuery, query);

2
src/views/inout/IOCheckErrorOrder.vue
Unescape Escape View File

@ -806,7 +806,7 @@ export default {
orderId: row.id,
};
this.loading = true;
repeatPrintCheck(tQuery)
repeatCheck(tQuery)
.then((response) => {
this.loading = false;
if (response.code === 20000) {

2
src/views/inout/IONewOrder.vue
Unescape Escape View File

@ -171,7 +171,7 @@
size="small"
v-if="scope.row.status !== -1"
@click.native.stop="onUpload(scope.row.id)"
>立即提交
>立即处理
</el-button
>
</template>

Write Preview
Loading…
Cancel
Save