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

领用仓库与当前仓库修改，领用打印等功能

Browse Source
20231126-yw
anthonywj 2 years ago
parent d4ff3a8297
commit 23d148999e
8 changed files with 276 additions and 198 deletions
Show Stats Download Patch File Download Diff File

15
src/api/inout/receiveOrder.js
Unescape Escape View File

@ -46,5 +46,20 @@ export function addOrderDetailAndApply(data) {
} }
export function printOrder(data) {
return axios({
url: "/pur/receive/order/printOrder",
method: "post",
data: data,
headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
responseType: 'arraybuffer', //一定要设置响应类型，否则页面会是空白pdf
});
}

17
src/views/inout/PanelCreateOrderBizDetail.vue
Unescape Escape View File

@ -98,12 +98,19 @@
<el-table-column width="150" label="生产企业" prop="manufacturer" show-overflow-tooltip></el-table-column> <el-table-column width="150" label="生产企业" prop="manufacturer" show-overflow-tooltip></el-table-column>
<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" v-if="scope.row.index == selectedIndex" @click.stop="true" @click.native="saveChange(scope.row)">保存</el-button> <el-button type="text" size="small" v-if="scope.row.index == selectedIndex" @click.stop="true"
<el-button type="text" size="small" v-if="scope.row.index != selectedIndex" @click.stop="true" @click.native="rowChange(scope.row)">编辑</el-button> @click.native="saveChange(scope.row)">保存
</el-button>
<el-button type="text" size="small" v-if="scope.row.index != selectedIndex" @click.stop="true"
@click.native="rowChange(scope.row)">编辑
</el-button>
<el-button type="text" size="small" @click.stop="true" @click.native="copyDetail(scope.row)">复制</el-button> <el-button type="text" size="small" @click.stop="true" @click.native="copyDetail(scope.row)">复制</el-button>
<el-button type="text" size="small" @click.stop="true" @click.native="deleteDetail(scope.row)">删除</el-button> <el-button type="text" size="small" @click.stop="true" @click.native="deleteDetail(scope.row)">删除</el-button>
<el-button type="text" size="small" v-if="scope.row.bindRlFk==null" @click.native.stop="bindRl(scope.row)">绑定产品</el-button> <el-button type="text" size="small" v-if="scope.row.bindRlFk==null" @click.native.stop="bindRl(scope.row)">
<el-button type="text" size="small" v-if="scope.row.supId==null" @click.native.stop="handleUnitClick(scope.row)"></el-button> 绑定产品
</el-button>
<el-button type="text" size="small" v-if="scope.row.supId==null"
@click.native.stop="handleUnitClick(scope.row)"></el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -324,6 +331,8 @@ export default {
} else if (this.curBustype.corpType === 1) {//客户信息 } else if (this.curBustype.corpType === 1) {//客户信息
this.invQueryData.invCode = this.idQuery.invCode; this.invQueryData.invCode = this.idQuery.invCode;
this.selectInvProductVisible = true; this.selectInvProductVisible = true;
} else if (this.curBustype.corpType = 4) {
this.selectProductVisible = true;
} }
}, },

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

@ -10,7 +10,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="当前仓库:"> <el-form-item label="当前仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择领用仓库" style="width: 100%;"> <el-select v-model="filterQuery.targetInvCode" placeholder="请选择当前仓库" style="width: 100%;">
<el-option <el-option
v-for="item in invList" v-for="item in invList"
:key="item.code" :key="item.code"
@ -166,7 +166,6 @@ export default {
page: 1, page: 1,
limit: 10, limit: 10,
corpName: this.$store.getters.locInvName, corpName: this.$store.getters.locInvName,
invCode: '',
type: 2, type: 2,
editStatus: 2, editStatus: 2,
targetInvCode: null, targetInvCode: null,
@ -245,7 +244,7 @@ export default {
page: 1, page: 1,
limit: 10, limit: 10,
corpName: null, corpName: null,
invCode: this.invCodebe, targetInvCode: this.invCodebe,
type: 2, type: 2,
editStatus: 2, editStatus: 2,
}; };
@ -350,7 +349,7 @@ export default {
page: 1, page: 1,
limit: 10, limit: 10,
corpName: null, corpName: null,
invCode: this.invCodebe, targetInvCode: this.invCodebe,
type: 2, type: 2,
editStatus: 2, editStatus: 2,
}; };
@ -363,8 +362,8 @@ export default {
.then((response) => { .then((response) => {
this.invList = response.data || []; this.invList = response.data || [];
if (this.invList.length > 0) { if (this.invList.length > 0) {
this.filterQuery.invCode = this.invList[0].code this.filterQuery.targetInvCode = this.invList[0].code
this.invCodebe = this.filterQuery.invCode this.invCodebe = this.filterQuery.targetInvCode
} }
this.getList(); this.getList();
}) })

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

@ -1,16 +1,16 @@
<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 :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-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="领用仓库:"> <el-form-item label="领用仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择领用仓库" style="width: 90%;"> <el-select v-model="filterQuery.invCode" placeholder="请选择领用仓库" style="width: 90%;">
<el-option <el-option
v-for="item in invList" v-for="item in invList"
:key="item.code" :key="item.code"
@ -22,7 +22,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="往来信息:"> <el-form-item label="往来信息:">
<el-select v-model="filterQuery.corpName" placeholder="请输入往来信息" <el-select v-model="filterQuery.corpName" placeholder="请输入往来信息"
filterable filterable
remote remote
reserve-keyword reserve-keyword
@ -102,8 +102,9 @@
<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" @current-change="handleDetail" <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row="true"
:default-sort="defaultSort" @sort-change="handleSortChange"> @current-change="handleDetail"
: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>
@ -117,9 +118,18 @@
</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="操作">
<template slot-scope="scope">
<el-button type="text" size="small" @click.native.stop="printOrder(scope.row)"
>打印
</el-button>
</template>
</el-table-column>
</el-table> </el-table>
<pagination <pagination
@ -160,7 +170,7 @@
</template> </template>
<script> <script>
import {getOrderDetail, getReceiveOrder} 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 {filterSubAll, findInvByUser} from "@/api/system/invSubWarehouse";
@ -180,7 +190,7 @@ export default {
corpName: null, corpName: null,
type: 3, type: 3,
editStatus: 2, editStatus: 2,
invCode:null invCode: null
}, },
statusMap: { statusMap: {
1: "草稿", 1: "草稿",
@ -188,17 +198,17 @@ export default {
3: "已审核", 3: "已审核",
4: "已拒绝" 4: "已拒绝"
}, },
idQuery:null, idQuery: null,
invList:[], invList: [],
invCodebe:null, invCodebe: null,
newSpDistributionVisible:false, newSpDistributionVisible: false,
total: 0, total: 0,
thirdSys: [], thirdSys: [],
thirdSysDetail: null, thirdSysDetail: null,
busTypes: [], busTypes: [],
originTypes: [], originTypes: [],
list: [], list: [],
corpList:[], corpList: [],
detailList: [], detailList: [],
uploadFileUrl: null, uploadFileUrl: null,
fileList: [], fileList: [],
@ -320,7 +330,7 @@ export default {
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);
} }
@ -360,7 +370,7 @@ export default {
} }
this.filterQuery.isUser = true; this.filterQuery.isUser = true;
this.loading = true; this.loading = true;
this.detailList=[] this.detailList = []
getReceiveOrder(this.filterQuery) getReceiveOrder(this.filterQuery)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
@ -378,7 +388,7 @@ export default {
}); });
}, },
handleDetail(row) { handleDetail(row) {
var query={}; var query = {};
query.orderIdFk = row.billNo; query.orderIdFk = row.billNo;
getOrderDetail(query) //查找该单号下的所有条码 getOrderDetail(query) //查找该单号下的所有条码
.then((response) => { .then((response) => {
@ -392,11 +402,11 @@ export default {
this.filterQuery.page = val.page; this.filterQuery.page = val.page;
this.getList(); this.getList();
}, },
finCorpList(val){ finCorpList(val) {
let query ={ let query = {
name : val, name: val,
page : 1, page: 1,
limit : 10, limit: 10,
} }
filterSubAll(query) filterSubAll(query)
.then((response) => { .then((response) => {
@ -417,9 +427,9 @@ export default {
findInvByUser(query) findInvByUser(query)
.then((response) => { .then((response) => {
this.invList = response.data || []; this.invList = response.data || [];
if(this.invList.length>0){ if (this.invList.length > 0) {
this.filterQuery.invCode=this.invList[0].code this.filterQuery.invCode = this.invList[0].code
this.invCodebe=this.filterQuery.invCode this.invCodebe = this.filterQuery.invCode
} }
this.getList(); this.getList();
}) })
@ -427,6 +437,29 @@ export default {
}); });
}, },
printOrder(row) {
printOrder(row)
.then((response) => {
const binaryData = [];
binaryData.push(response);
//获取blob链接。
let url = window.URL.createObjectURL(
new Blob(binaryData, {type: "application/pdf"})
);
this.loading = false;
window.open(url);//打开新标签页，预览pdf。
this.getList();
})
.catch(() => {
});
},
closeDialog() {
this.newSpDistributionVisible = false;
},
}, },
components: { components: {
auditDetail auditDetail

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

@ -1,16 +1,16 @@
<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 :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-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="领用仓库:"> <el-form-item label="领用仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择领用仓库" style="width: 90%;"> <el-select v-model="filterQuery.targetInvCode" placeholder="请选择领用仓库" style="width: 90%;">
<el-option <el-option
v-for="item in invList" v-for="item in invList"
:key="item.code" :key="item.code"
@ -22,7 +22,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="往来信息:"> <el-form-item label="往来信息:">
<el-select v-model="filterQuery.corpName" placeholder="请输入往来信息" <el-select v-model="filterQuery.corpName" placeholder="请输入往来信息"
filterable filterable
remote remote
reserve-keyword reserve-keyword
@ -91,7 +91,6 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group style="display:flex;"> <el-button-group style="display:flex;">
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
@ -102,8 +101,9 @@
<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" @current-change="handleDetail" <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row="true"
:default-sort="defaultSort" @sort-change="handleSortChange"> @current-change="handleDetail"
: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>
@ -117,12 +117,15 @@
</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="deleteDialog(scope.row)" <el-button type="text" size="small" @click.native.stop="printOrder(scope.row)"
>打印
</el-button>
<el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
>删除 >删除
</el-button> </el-button>
</template> </template>
@ -167,7 +170,7 @@
</template> </template>
<script> <script>
import {getOrderDetail, getReceiveOrder} 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 {filterSubAll, findInvByUser} from "@/api/system/invSubWarehouse";
@ -186,7 +189,7 @@ export default {
limit: 10, limit: 10,
corpName: null, corpName: null,
type: 3, type: 3,
invCode:null targetInvCode: null,
}, },
statusMap: { statusMap: {
1: "草稿", 1: "草稿",
@ -194,17 +197,17 @@ export default {
3: "已审核", 3: "已审核",
4: "已拒绝" 4: "已拒绝"
}, },
idQuery:null, idQuery: null,
invList:[], invList: [],
invCodebe:null, invCodebe: null,
newSpDistributionVisible:false, newSpDistributionVisible: false,
total: 0, total: 0,
thirdSys: [], thirdSys: [],
thirdSysDetail: null, thirdSysDetail: null,
busTypes: [], busTypes: [],
originTypes: [], originTypes: [],
list: [], list: [],
corpList:[], corpList: [],
detailList: [], detailList: [],
uploadFileUrl: null, uploadFileUrl: null,
fileList: [], fileList: [],
@ -296,7 +299,7 @@ export default {
limit: 10, limit: 10,
corpName: null, corpName: null,
type: 3, type: 3,
invCode: this.invCodebe, targetInvCode: this.invCodebe,
}; };
this.actDateRange = []; this.actDateRange = [];
this.actAuditDateRange = []; this.actAuditDateRange = [];
@ -325,7 +328,7 @@ export default {
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);
} }
@ -364,7 +367,7 @@ export default {
this.filterQuery.endAuditTime = null; this.filterQuery.endAuditTime = null;
} }
this.loading = true; this.loading = true;
this.detailList=[] this.detailList = []
getReceiveOrder(this.filterQuery) getReceiveOrder(this.filterQuery)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
@ -382,7 +385,7 @@ export default {
}); });
}, },
handleDetail(row) { handleDetail(row) {
var query={}; var query = {};
query.orderIdFk = row.billNo; query.orderIdFk = row.billNo;
getOrderDetail(query) //查找该单号下的所有条码 getOrderDetail(query) //查找该单号下的所有条码
.then((response) => { .then((response) => {
@ -396,11 +399,11 @@ export default {
this.filterQuery.page = val.page; this.filterQuery.page = val.page;
this.getList(); this.getList();
}, },
finCorpList(val){ finCorpList(val) {
let query ={ let query = {
name : val, name: val,
page : 1, page: 1,
limit : 10, limit: 10,
} }
filterSubAll(query) filterSubAll(query)
.then((response) => { .then((response) => {
@ -421,9 +424,9 @@ export default {
findInvByUser(query) findInvByUser(query)
.then((response) => { .then((response) => {
this.invList = response.data || []; this.invList = response.data || [];
if(this.invList.length>0){ if (this.invList.length > 0) {
this.filterQuery.invCode=this.invList[0].code this.filterQuery.targetInvCode = this.invList[0].code
this.invCodebe=this.filterQuery.invCode this.invCodebe = this.filterQuery.targetInvCode
} }
this.getList(); this.getList();
}) })
@ -431,6 +434,27 @@ export default {
}); });
}, },
printOrder(row) {
printOrder(row)
.then((response) => {
const binaryData = [];
binaryData.push(response);
//获取blob链接。
let url = window.URL.createObjectURL(
new Blob(binaryData, {type: "application/pdf"})
);
this.loading = false;
window.open(url);//打开新标签页，预览pdf。
this.getList();
})
.catch(() => {
});
},
closeDialog() {
this.newSpDistributionVisible = false;
},
}, },
components: { components: {
auditDetail auditDetail

250
src/views/inventory/DeviceReceiveOrderNew.vue
Unescape Escape View File

@ -16,10 +16,10 @@
@change="getDeptList" @change="getDeptList"
> >
<el-option <el-option
v-for="item in deptList" v-for="item in deptList"
:key="item.name" :key="item.name"
:label="item.name" :label="item.name"
:value="item.code"> :value="item.code">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
</el-option> </el-option>
</el-select> </el-select>
@ -36,15 +36,15 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="登记时间:"> <el-form-item label="登记时间:">
<el-date-picker <el-date-picker
:picker-options="pickerOptions" :picker-options="pickerOptions"
v-model="actDateRange" v-model="actDateRange"
type="daterange" type="daterange"
format="yyyy 年 MM 月 dd 日" format="yyyy 年 MM 月 dd 日"
style="width: 90%" style="width: 90%"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始时间" start-placeholder="开始时间"
end-placeholder="结束时间" end-placeholder="结束时间"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -85,25 +85,25 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:limit.sync="filterQuery.limit" :limit.sync="filterQuery.limit"
:page.sync="filterQuery.page" :page.sync="filterQuery.page"
@pagination="getList" @pagination="getList"
></pagination> ></pagination>
</el-card> </el-card>
<el-dialog <el-dialog
:title="formMap[formName]" :title="formMap[formName]"
:visible.sync="formVisible" :visible.sync="formVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
width="85%" width="85%"
v-if="formVisible" v-if="formVisible"
> >
<deviceReceiveOrderModify <deviceReceiveOrderModify
:deviceReceiveOrder="deviceReceiveOrder" :deviceReceiveOrder="deviceReceiveOrder"
:closeDialog="closeDialog" :closeDialog="closeDialog"
></deviceReceiveOrderModify> ></deviceReceiveOrderModify>
</el-dialog> </el-dialog>
<el-card class="el-card"> <el-card class="el-card">
@ -131,11 +131,11 @@
<!-- </el-table-column>--> <!-- </el-table-column>-->
</el-table> </el-table>
<pagination <pagination
v-show="detailTotal>0" v-show="detailTotal>0"
:total="detailTotal" :total="detailTotal"
:limit.sync="detailQuery.limit" :limit.sync="detailQuery.limit"
:page.sync="detailQuery.page" :page.sync="detailQuery.page"
@pagination="getDetailList" @pagination="getDetailList"
></pagination> ></pagination>
</el-card> </el-card>
@ -299,12 +299,12 @@ export default {
getInvList() { getInvList() {
let params = {deptCode: this.filterQuery.fromDeptCode}; let params = {deptCode: this.filterQuery.fromDeptCode};
findInvByUser(params) findInvByUser(params)
.then((response) => { .then((response) => {
this.invList = response.data || []; this.invList = response.data || [];
this.getList(); this.getList();
}) })
.catch(() => { .catch(() => {
}); });
}, },
getSpaceList() { getSpaceList() {
let params = { let params = {
@ -332,7 +332,7 @@ export default {
binaryData.push(response); binaryData.push(response);
//获取blob链接。 //获取blob链接。
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。
@ -346,103 +346,101 @@ export default {
this.$message.error(error.message); this.$message.error(error.message);
}) })
}, },
addReceiveOrder() { addReceiveOrder() {
this.formVisible = true; this.formVisible = true;
this.formName = 'add'; this.formName = 'add';
this.deviceReceiveOrder = {}; this.deviceReceiveOrder = {};
}, },
editOrder(row) { editOrder(row) {
this.formVisible = true; this.formVisible = true;
this.formName = 'edit'; this.formName = 'edit';
this.deviceReceiveOrder = row; this.deviceReceiveOrder = row;
}, },
submitAudit(row) { submitAudit(row) {
let params = {id: row.id}; let params = {id: row.id};
submitAudit(params).then((res) => { submitAudit(params).then((res) => {
if (res.code === 20000) {
this.$message.success("提交成功！");
this.getList();
} else {
this.$message.error(res.message);
}
}).catch((error) => {
this.$message.error(error.message);
});
},
deleteDialog(rowId) {
this.$confirm('此操作将永久删除该领用记录, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let params = {id: rowId};
this.loading = true;
deleteDeviceReceiveOrder(params).then((res) => {
this.loading = false;
if (res.code === 20000) { if (res.code === 20000) {
this.$message.success("删除成功！"); this.$message.success("提交成功！");
this.getList(); this.getList();
this.detailList = []
} else { } else {
this.$message.error(res.message); this.$message.error(res.message);
} }
}).catch(() => { }).catch((error) => {
this.loading = false; this.$message.error(error.message);
}); });
}); },
}, deleteDialog(rowId) {
closeDialog() { this.$confirm('此操作将永久删除该领用记录, 是否继续?', '提示', {
this.formVisible = false; confirmButtonText: '确定',
this.getList(); cancelButtonText: '取消',
}, type: 'warning'
datailSelect(row) { }).then(() => {
this.detailQuery = row let params = {id: rowId};
this.deviceProjectSelectVisible = true this.loading = true;
}, deleteDeviceReceiveOrder(params).then((res) => {
handleChange(row) { this.loading = false;
this.detailQuery.orderIdFk = row.orderId; if (res.code === 20000) {
this.detailQuery.page = 1; this.$message.success("删除成功！");
this.getDetailList(); this.getList();
}, this.detailList = []
getDetailList() { } else {
getDeviceReceiveOrderDetailList(this.detailQuery).then((res) => { this.$message.error(res.message);
if (res.code === 20000) { }
this.detailList = res.data.list || []; }).catch(() => {
this.detailTotal = res.data.total || 0; this.loading = false;
} else { });
});
},
closeDialog() {
this.formVisible = false;
this.getList();
},
datailSelect(row) {
this.detailQuery = row
this.deviceProjectSelectVisible = true
},
handleChange(row) {
this.detailQuery.orderIdFk = row.orderId;
this.detailQuery.page = 1;
this.getDetailList();
},
getDetailList() {
getDeviceReceiveOrderDetailList(this.detailQuery).then((res) => {
if (res.code === 20000) {
this.detailList = res.data.list || [];
this.detailTotal = res.data.total || 0;
} else {
this.detailList = [];
this.detailTotal = 0;
}
}).catch(() => {
this.detailList = []; this.detailList = [];
this.detailTotal = 0; this.detailTotal = 0;
});
},
}
,
components: {
deviceReceiveOrderModify
}
,
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
}
,
created() {
//查询配置项
getConfig().then((res) => {
if (res.code == 20000 && !isBlank(res.data.paramValue)) {
this.paramValue = res.data.paramValue
} }
}).catch(() => { })
this.detailList = []; this.getDeptList();
this.detailTotal = 0; }
}); ,
},
}
,
components: {
deviceReceiveOrderModify
}
,
mounted()
{
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
}
,
created()
{
//查询配置项
getConfig().then((res) => {
if (res.code == 20000 && !isBlank(res.data.paramValue)) {
this.paramValue = res.data.paramValue
}
})
this.getDeptList();
}
,
} }
; ;
</script> </script>

7
src/views/system/ration/InvRationSet.vue
Unescape Escape View File

@ -132,11 +132,10 @@
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="180"></el-table-column> <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="在库数量" prop="invCount" width="90"></el-table-column> <el-table-column label="在库数量" prop="invCount" width="90"></el-table-column>
<el-table-column label="定额数量" prop="rationCount" width="90"></el-table-column> <el-table-column label="定额数量" prop="rationCount" width="90"></el-table-column>
<el-table-column label="剩余数量" width="90"> <el-table-column label="需补数量" width="90">
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="{ color: scope.row.rationCount - scope.row.invCount>0 ? 'red' : null }">{{
<span :style="{ color: scope.row.invCount - scope.row.rationCount<0 ? 'red' : 'blue' }">{{ scope.row.rationCount - scope.row.invCount > 0 ? scope.row.rationCount - scope.row.invCount : 0
scope.row.invCount - scope.row.rationCount
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>

5
src/views/system/user/authUser.vue
Unescape Escape View File

@ -32,7 +32,8 @@
<el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button> <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
<el-button type="primary" @click.native="handleForm(null, null)" icon="el-icon-plus" <el-button type="primary" @click.native="handleForm(null, null)" icon="el-icon-plus"
:disabled="!configParms.sysUser && query.customerId == 110" :disabled="!configParms.sysUser && query.customerId == 110"
v-hasPermi="['system:user:add']">新增</el-button> v-hasPermi="['system:user:add']">新增
</el-button>
</el-button-group> </el-button-group>
</div> </div>
@ -369,7 +370,7 @@ export default {
}; };
}, },
methods: { methods: {
getDeptList(){ getDeptList() {
}, },
hideSearch() { hideSearch() {

Write Preview
Loading…
Cancel
Save