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

库存盘点功能修改

Browse Source
dev_ksck2.0
anthonywj 1 year ago
parent d9575e989e
commit b7823c7246
7 changed files with 362 additions and 312 deletions
Show Stats Download Patch File Download Diff File

2
.env.development
Unescape Escape View File

@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI管理系统
ENV = 'development' ENV = 'development'
# 开发环境 # 开发环境
VUE_APP_BASE_API = 'http://127.0.0.1:9991' VUE_APP_BASE_API = 'http://192.168.0.166:9991'
VUE_APP_SYNC_API ="http://127.0.0.1:10001" VUE_APP_SYNC_API ="http://127.0.0.1:10001"

9
.env.production
Unescape Escape View File

@ -21,7 +21,7 @@ ENV = 'production'
# 平潭正式 # 平潭正式
VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
# 漳州中医院 # 漳州中医院
# VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
@ -30,7 +30,7 @@ VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.0.100:9160/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.100:9160/UDI_WMS_MC/'
# 平和县医院 # 平和县医院
# VUE_APP_BASE_API = 'http://192.168.0.43:9150/UDI_WMS_MC/' VUE_APP_BASE_API = 'http://192.168.0.43:9150/UDI_WMS_MC/'
@ -65,13 +65,12 @@ VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
# 南靖 # 南靖
VUE_APP_BASE_API = 'http://192.168.10.225:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.10.225:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.73.128:9150/UDI_WMS_MC/'
# 测试NIGINX # 测试NIGINX
# VUE_APP_BASE_API = 'https://test.udims.com/UDI_WMS_MC/' # VUE_APP_BASE_API = 'https://test.udims.com/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.20.128:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.20.128:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.0.125:9150/UDI_WMS_MC/'
# 应用访问路径 例如使用前缀 /admin/ # 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/' VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/'

2
src/views/inout/stat/IoStatCustomSearch.vue
Unescape Escape View File

@ -196,7 +196,7 @@ export default {
showSearch: true, showSearch: true,
filterQuery: { filterQuery: {
recordKey: null, recordKey: null,
type: 4, type: 5,
startTime: null, startTime: null,
endTime: null, endTime: null,
page: 1, page: 1,

60
src/views/inventory/count/InvCountOrderAudit.vue
Unescape Escape View File

@ -1,7 +1,8 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" size="mini" label-width="120px"> <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form"
size="mini" label-width="120px">
<!-- <el-row> <!-- <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item class="query-form-item" label="盘点单号:"> <el-form-item class="query-form-item" label="盘点单号:">
@ -45,7 +46,8 @@
</el-row> --> </el-row> -->
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList"> <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-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
@ -54,7 +56,8 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`"> <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-select v-model="filterQuery[item.columnName]" <el-select v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)" :disabled="executeEval(null,item.disabledFuc,false)"
@ -66,10 +69,13 @@
:value="dict.value" :value="dict.value"
/> />
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
<span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span> <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{
item.code
}}</span>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`"> <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-select <el-select
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
@ -85,10 +91,13 @@
:value="item.code" :value="item.code"
/> />
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
<span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span> <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{
item.code
}}</span>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`"> <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-date-picker <el-date-picker
:picker-options="pickerOptions" :picker-options="pickerOptions"
v-model="actDateRange" v-model="actDateRange"
@ -100,7 +109,8 @@
end-placeholder="结束日期" end-placeholder="结束日期"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`"> <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-date-picker <el-date-picker
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:style="`width:${item.width+'px'}`" :style="`width:${item.width+'px'}`"
@ -194,7 +204,9 @@
:key="item.columnName" :key="item.columnName"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span> <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
item.lableRuleObj[scope.row[item.columnName]]
}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -207,8 +219,11 @@
:key="item.columnName" :key="item.columnName"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])"> <el-tag
<span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span> :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> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
@ -243,7 +258,9 @@
:key="item.columnName" :key="item.columnName"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span> <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
scope.row[item.columnName]
}}</span>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
@ -315,7 +332,9 @@
:key="item.columnName" :key="item.columnName"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span> <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
item.lableRuleObj[scope.row[item.columnName]]
}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -328,8 +347,11 @@
:key="item.columnName" :key="item.columnName"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])"> <el-tag
<span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span> :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> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
@ -364,7 +386,9 @@
:key="item.columnName" :key="item.columnName"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span> <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
scope.row[item.columnName]
}}</span>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
@ -544,13 +568,13 @@ export default {
this.countOrder = {}; this.countOrder = {};
this.countType = type; this.countType = type;
}, },
deleteDialog(_this,rowId) { deleteDialog(_this, row) {
_this.$confirm('此操作将永久删除该盘点单, 是否继续?', '提示', { _this.$confirm('此操作将永久删除该盘点单, 是否继续?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
let params = {id: rowId}; let params = {id: row.id};
_this.loading = true; _this.loading = true;
deleteCountOrder(params).then((res) => { deleteCountOrder(params).then((res) => {
_this.loading = false; _this.loading = false;

49
src/views/inventory/count/InvCountOrderModify.vue
Unescape Escape View File

@ -119,7 +119,7 @@
</el-form> </el-form>
</el-card> </el-card>
<!-- :disabled="this.countProductList.length > 0"-->
<el-tabs type="border-card" style="margin: 5px"> <el-tabs type="border-card" style="margin: 5px">
<el-tab-pane label="盘点详情"> <el-tab-pane label="盘点详情">
@ -128,14 +128,13 @@
v-if="countType != 2" v-if="countType != 2"
type="primary" type="primary"
size="mini" size="mini"
:disabled="this.countProductList.length > 0"
@click.native="startCount(1)" @click.native="startCount(1)"
>录入产品 >录入产品
</el-button> </el-button>
<el-button <el-button
v-if="countType == 2" v-if="countType == 2"
type="primary" size="mini" type="primary" size="mini"
:disabled="this.countProductList.length > 0"
@click.native="startCount()" @click.native="startCount()"
>录入产品 >录入产品
</el-button> </el-button>
@ -342,7 +341,7 @@ import {
batchAddDetail, submitAudit, updateCountOrderStatus, updateCountOrderDetail batchAddDetail, submitAudit, updateCountOrderStatus, updateCountOrderDetail
} from "@/api/inventory/invCountOrder"; } from "@/api/inventory/invCountOrder";
import {addCode} from "@/api/inventory/invCountCodes"; import {addCode} from "@/api/inventory/invCountCodes";
import {getCountInvProductProduct} from "@/api/inventory/invPorduct"; import {getCountInvProductProduct, getProduct} from "@/api/inventory/invPorduct";
import {isBlank} from "@/utils/strUtil"; import {isBlank} from "@/utils/strUtil";
import {getInvListByUser} from "@/api/system/invWarehouse"; import {getInvListByUser} from "@/api/system/invWarehouse";
import invCountCodes from "@/views/inventory/count/InvCountCodes.vue"; import invCountCodes from "@/views/inventory/count/InvCountCodes.vue";
@ -488,24 +487,9 @@ export default {
saveOrderDetail() { saveOrderDetail() {
let orderDetails = [];
this.countProductList.forEach(product => {
let detailData = {
orderIdFk: this.formData.orderId,
productId: product.relIdFk,
nameCode: product.nameCode,
batchNo: product.batchNo,
produceDate: product.productionDate,
expireDate: product.expireDate,
invCode: this.formData.invStorageCode,
invSpaceCode: this.formData.invSpaceCode,
invNum: product.reCount,
};
orderDetails.push(detailData);
});
let params = { let params = {
orderId: this.formData.orderId, orderId: this.formData.orderId,
countOrderDetailList: orderDetails countOrderDetailList: this.countProductList
} }
batchAddDetail(params).then((res) => { batchAddDetail(params).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
@ -616,8 +600,11 @@ export default {
getList() { getList() {
let params = {orderIdFk: this.formData.orderId}; let params = {orderIdFk: this.formData.orderId};
getCountOrderDetailList(params).then((res) => { getCountOrderDetailList(params).then((res) => {
debugger
if (res.code === 20000) { if (res.code === 20000) {
console.log(res.data)
this.countProductList = res.data.list || []; this.countProductList = res.data.list || [];
console.log(this.countProductList)
} }
}); });
}, },
@ -646,7 +633,7 @@ export default {
queryInvProducts() { queryInvProducts() {
this.filterQuery.invCode = this.formData.invStorageCode; this.filterQuery.invCode = this.formData.invStorageCode;
this.filterQuery.invSpaceCode = this.formData.invWarehouseCode; this.filterQuery.invSpaceCode = this.formData.invWarehouseCode;
getCountInvProductProduct(this.filterQuery).then((res) => { getProduct(this.filterQuery).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
this.productList = res.data.list || []; this.productList = res.data.list || [];
this.productTotal = res.data.total || 0; this.productTotal = res.data.total || 0;
@ -667,14 +654,26 @@ export default {
return; return;
} }
if (this.countProductList.length === 0) { // if (this.countProductList.length === 0) {
//添加第一个产品，先保存单据，再添加单据详情 //添加第一个产品，先保存单据，再添加单据详情
this.multiProduct.forEach(product => { this.multiProduct.forEach(product => {
this.countProductList.push(product); let detailData = {
orderIdFk: this.formData.orderId,
productId: product.relIdFk,
nameCode: product.nameCode,
batchNo: product.batchNo,
produceDate: product.productionDate,
expireDate: product.expireDate,
invCode: this.formData.invStorageCode,
invSpaceCode: this.formData.invSpaceCode,
invNum: product.reCount,
};
this.countProductList.push(detailData);
}); });
// this.saveOrderDetail(); // this.saveOrderDetail();
this.saveOrder(1); this.saveOrder(1);
} // }
this.selectInvProductVisible = false; this.selectInvProductVisible = false;
}, },
getRowKeys(row) { getRowKeys(row) {
@ -687,7 +686,7 @@ export default {
}); });
}, },
startCount(val) { startCount(val) {
this.countProductList = []; // this.countProductList = [];
if (this.countType === 0 && val === 1) { if (this.countType === 0 && val === 1) {
if (isBlank(this.formData.invStorageCode)) { if (isBlank(this.formData.invStorageCode)) {
this.$message.warning("请先选择盘点仓库"); this.$message.warning("请先选择盘点仓库");

70
src/views/inventory/count/InvCountOrderNew.vue
Unescape Escape View File

@ -1,7 +1,8 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" size="mini" label-width="120px"> <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" size="mini"
label-width="120px">
<!-- <el-row> <!-- <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item class="query-form-item" label="盘点单号:"> <el-form-item class="query-form-item" label="盘点单号:">
@ -45,7 +46,8 @@
</el-row> --> </el-row> -->
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList"> <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-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
@ -54,7 +56,8 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`"> <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-select v-model="filterQuery[item.columnName]" <el-select v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)" :disabled="executeEval(null,item.disabledFuc,false)"
@ -66,10 +69,13 @@
:value="dict.value" :value="dict.value"
/> />
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
<span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span> <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{
item.code
}}</span>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`"> <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-select <el-select
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
@ -85,10 +91,13 @@
:value="item.code" :value="item.code"
/> />
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
<span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span> <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{
item.code
}}</span>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`"> <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-date-picker <el-date-picker
:picker-options="pickerOptions" :picker-options="pickerOptions"
v-model="actDateRange" v-model="actDateRange"
@ -100,7 +109,8 @@
end-placeholder="结束日期" end-placeholder="结束日期"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`"> <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-date-picker <el-date-picker
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:style="`width:${item.width+'px'}`" :style="`width:${item.width+'px'}`"
@ -201,7 +211,9 @@
:key="item.columnName" :key="item.columnName"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span> <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
item.lableRuleObj[scope.row[item.columnName]]
}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -214,8 +226,11 @@
:key="item.columnName" :key="item.columnName"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])"> <el-tag
<span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span> :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> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
@ -250,7 +265,9 @@
:key="item.columnName" :key="item.columnName"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span> <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
scope.row[item.columnName]
}}</span>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
@ -313,7 +330,9 @@
:key="item.columnName" :key="item.columnName"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span> <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
item.lableRuleObj[scope.row[item.columnName]]
}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -326,8 +345,11 @@
:key="item.columnName" :key="item.columnName"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])"> <el-tag
<span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span> :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> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
@ -362,7 +384,9 @@
:key="item.columnName" :key="item.columnName"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span> <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
scope.row[item.columnName]
}}</span>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
@ -417,8 +441,8 @@ export default {
showSearch: true, showSearch: true,
filterQuery: { filterQuery: {
orderId: null, orderId: null,
invStorageCode: this.$store.getters.locInvCode, invCode: this.$store.getters.locInvCode,
invWarehouseCode: null, invSpaceCode: null,
status: 0, status: 0,
page: 1, page: 1,
limit: 20, limit: 20,
@ -480,8 +504,8 @@ export default {
}); });
this.filterQuery = { this.filterQuery = {
orderId: null, orderId: null,
invStorageCode: this.$store.getters.locInvCode, invCode: this.$store.getters.locInvCode,
invWarehouseCode: null, invSpaceCode: null,
status: 0, status: 0,
page: 1, page: 1,
limit: 20, limit: 20,
@ -529,7 +553,7 @@ export default {
_this.getSpaceList(_this); _this.getSpaceList(_this);
}, },
getSpaceList(_this) { getSpaceList(_this) {
let params = {invWarehouseCode: _this.filterQuery.invStorageCode, status: 1}; let params = {invWarehouseCode: _this.filterQuery.invCode, status: 1};
getInvSpaceListOptimize(params).then((res) => { getInvSpaceListOptimize(params).then((res) => {
_this.options.getSpaceList = res.data.list || []; _this.options.getSpaceList = res.data.list || [];
_this.getList(); _this.getList();
@ -590,13 +614,13 @@ export default {
this.$message.error(error.message); this.$message.error(error.message);
}); });
}, },
deleteDialog(_this,rowId) { deleteDialog(_this, row) {
_this.$confirm('此操作将永久删除该盘点单, 是否继续?', '提示', { _this.$confirm('此操作将永久删除该盘点单, 是否继续?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
let params = {id: rowId}; let params = {id: row.id};
_this.loading = true; _this.loading = true;
deleteCountOrder(params).then((res) => { deleteCountOrder(params).then((res) => {
_this.loading = false; _this.loading = false;

4
src/views/inventory/supInoutSearchOrder.vue
Unescape Escape View File

@ -224,6 +224,10 @@
>查询 >查询
</el-button </el-button
> >
<el-button type="primary" icon="el-icon-document" @click="selectExport">选中导出Excel</el-button>
<el-button type="primary" icon="el-icon-document" @click="searchExport">结果导出Excel</el-button>
<el-button type="primary" icon="el-icon-printer" @click="optinPrint">选中打印</el-button>
<el-button type="primary" icon="el-icon-printer" @click="selectPrint">查询结果打印</el-button>
</el-button-group> </el-button-group>
</div> </div>
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>

Write Preview
Loading…
Cancel
Save