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

10/12 bug优化

Browse Source
20240912_adapter
wangwei 9 months ago
parent df7e17875e
commit 56927debf5
11 changed files with 128 additions and 75 deletions
Show Stats Download Patch File Download Diff File

8
src/api/basic/workPlace/sysWorkplaceManage.js
Unescape Escape View File

@ -12,6 +12,14 @@ export function listPage(query) {
}); });
} }
export function getListByBusType(query) {
return axios({
url: "/udiwms/sysWorkplace/getListByBusType",
method: "post",
data: query
});
}
export function addWorkplace(query) { export function addWorkplace(query) {
return axios({ return axios({

7
src/views/basic/product/drug/drugAdd.vue
Unescape Escape View File

@ -151,7 +151,6 @@
<el-form-item label="计量单位:" prop="distributeLevel" label-width="160px"> <el-form-item label="计量单位:" prop="distributeLevel" label-width="160px">
<el-select v-model="newProductData.distributeLevel" size="small" style="width: 90%" <el-select v-model="newProductData.distributeLevel" size="small" style="width: 90%"
clearable
@change="distributeLevelDiChange" @change="distributeLevelDiChange"
placeholder="请选择计量单位" placeholder="请选择计量单位"
> >
@ -171,7 +170,6 @@
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
<el-form-item label="允许采集的最大层级:" prop="distributeMaxLevel" label-width="160px"> <el-form-item label="允许采集的最大层级:" prop="distributeMaxLevel" label-width="160px">
<el-select v-model="newProductData.distributeMaxLevel" size="small" style="width: 90%" <el-select v-model="newProductData.distributeMaxLevel" size="small" style="width: 90%"
clearable
placeholder="请选择允许采集的最大层级" placeholder="请选择允许采集的最大层级"
> >
<el-option <el-option
@ -1059,6 +1057,11 @@ export default {
this.isSave = true this.isSave = true
this.$message.success('删除成功') this.$message.success('删除成功')
this.getDetailList() this.getDetailList()
this.getDiLevel()
this.newProductData.distributeLevel = null
this.newProductData.distributeMaxLevel = null
this.newProductData.useLevel = null
this.newProductData.useMaxLevel = null
} }
}) })
} else { } else {

24
src/views/basic/workplace/cargowWorkplaceManage.vue
Unescape Escape View File

@ -1025,7 +1025,29 @@ export default {
this.deptList = res.data.list || [] this.deptList = res.data.list || []
} }
}) })
} },
edit(row) {
this.formData = row
// this.formData.invCode = String(row.invCode)
if (row.chargeUser == 0) {
this.formData.chargeUser = null
} else if (row.chargeUser == 1) {
this.formData.chargeUser = Number(row.chargeUser)
} else {
this.formData.chargeUser = row.chargeUser
}
this.fromName = 'edit'
this.invQuery.deptCode = row.deptCode
getUsers(this.invQuery).then(res => {
if (res.code == 20000) {
this.users = res.data.list || []
} else {
this.$message.error('错误')
}
})
this.getTree()
this.addWorkplaceDialogVisible = true
},
}, },
created() { created() {
this.getDepts() this.getDepts()

2
src/views/collect/CollectOrderAllotCardComponents.vue
Unescape Escape View File

@ -727,7 +727,7 @@ export default {
onReset() { onReset() {
this.filterQuery = { this.filterQuery = {
billNo: null, billNo: null,
tagStatus: null, tagStatus: 1,
page: 1, page: 1,
limit: 9, limit: 9,
}; };

1
src/views/collect/CollectOrderNew.vue
Unescape Escape View File

@ -758,6 +758,7 @@ export default {
if (response.code == 20000) { if (response.code == 20000) {
this.getList(); this.getList();
this.getErrorList(this); this.getErrorList(this);
this.panelALive = false
this.$message({ this.$message({
type: "success", type: "success",
message: "删除成功！", message: "删除成功！",

3
src/views/collect/DealOrder.vue
Unescape Escape View File

@ -1252,7 +1252,8 @@ export default {
this.formData.confirmFinish = false; this.formData.confirmFinish = false;
this.refreshCodesPanel(this) this.refreshCodesPanel(this)
this.clearCode() this.clearCode()
this.$refs.inputRef.focus();
this.$refs.inputRef.select();
}, },
toggleBusType() { toggleBusType() {
//隐藏下拉框内容 //隐藏下拉框内容

4
src/views/collect/IoCreateOrder.vue
Unescape Escape View File

@ -190,7 +190,7 @@
<el-button <el-button
type="primary" type="primary"
size="mini" size="mini"
@click.native.stop="addCode()" @click.native.stop="enterKey($event)"
style="margin-left: 15px" style="margin-left: 15px"
>添加 >添加
</el-button> </el-button>
@ -1060,6 +1060,7 @@ export default {
key: val, key: val,
page: 1, page: 1,
limit: 10, limit: 10,
workPlaceClass: 2
} }
filterWorkOptimize(query) filterWorkOptimize(query)
.then((response) => { .then((response) => {
@ -1769,6 +1770,7 @@ export default {
type: "warning", type: "warning",
closeOnClickModal: true, closeOnClickModal: true,
callback: (action) => { callback: (action) => {
this.scanCode = ""
this.$refs.inputRef.focus(); this.$refs.inputRef.focus();
this.$refs.inputRef.select(); this.$refs.inputRef.select();
}, },

119
src/views/collect/PanelOrderUpload.vue
Unescape Escape View File

@ -278,17 +278,17 @@
<script> <script>
import addOrder from '@/views/inout/DialogCreateOrder' import addOrder from '@/views/inout/DialogCreateOrder'
import errOrder from '@/views/inout/IoCreateErrorOrder' import errOrder from '@/views/inout/IoCreateErrorOrder'
import {executeFuc, getHead} from '@/utils/customConfig' import { executeFuc, getHead } from '@/utils/customConfig'
import {convertDate} from '@/utils/date' import { convertDate } from '@/utils/date'
import prescribeCodePanel from './PanelOrderTagCode' import prescribeCodePanel from './PanelOrderTagCode'
import PanelOrderManuTagCode from './PanelOrderManuTagCode' import PanelOrderManuTagCode from './PanelOrderManuTagCode'
import prescribeOriginPanel from '@/views/collect/PannelOrderBiz' import prescribeOriginPanel from '@/views/collect/PannelOrderBiz'
import PanelOrderAllDetail from '@/views/collect/PanelOrderAllDetail' import PanelOrderAllDetail from '@/views/collect/PanelOrderAllDetail'
import CollectFinishOrderBackupDetail from "./CollectFinishOrderBackupDetail" import CollectFinishOrderBackupDetail from './CollectFinishOrderBackupDetail'
import {orderFinish, orderPage, orderUpload} from '@/api/collect/collectOrder' import { orderFinish, orderPage, orderUpload } from '@/api/collect/collectOrder'
import {filterWorkOptimize} from '@/api/basic/workPlace/sysWorkplaceManage' import { filterWorkOptimize } from '@/api/basic/workPlace/sysWorkplaceManage'
import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments' import { getWorkBindBusTypes, removeBusTypeById } from '@/api/basic/workPlace/sysWorkplaceDocuments'
export default { export default {
name: 'panelOrderUpload', name: 'panelOrderUpload',
@ -343,33 +343,33 @@ export default {
pickerOptions: { pickerOptions: {
shortcuts: [ shortcuts: [
{ {
text: "最近一周", text: '最近一周',
onClick(picker) { onClick(picker) {
const end = new Date(); const end = new Date()
const start = new Date(); const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
picker.$emit("pick", [start, end]); picker.$emit('pick', [start, end])
}, }
}, },
{ {
text: "最近一个月", text: '最近一个月',
onClick(picker) { onClick(picker) {
const end = new Date(); const end = new Date()
const start = new Date(); const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30); start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
picker.$emit("pick", [start, end]); picker.$emit('pick', [start, end])
}, }
}, },
{ {
text: "最近三个月", text: '最近三个月',
onClick(picker) { onClick(picker) {
const end = new Date(); const end = new Date()
const start = new Date(); const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90); start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
picker.$emit("pick", [start, end]); picker.$emit('pick', [start, end])
}, }
}, }
], ]
}, },
actDateRange: [], actDateRange: [],
//界面配置-------------end //界面配置-------------end
@ -384,7 +384,7 @@ export default {
page: 1, page: 1,
limit: 10 limit: 10
}, },
defaultSort: {prop: 'createTime', order: 'desc'}, defaultSort: { prop: 'createTime', order: 'desc' },
loading: false, loading: false,
list: [], list: [],
total: 0, total: 0,
@ -403,7 +403,7 @@ export default {
isLinkDisabled: false, isLinkDisabled: false,
options: { options: {
findWorkPlace: [], findWorkPlace: [],
getBusType: [], getBusType: []
}, },
showType: 1 showType: 1
} }
@ -426,14 +426,14 @@ export default {
_this.busQuery.workplaceCode = query _this.busQuery.workplaceCode = query
getWorkBindBusTypes(this.busQuery).then(res => { getWorkBindBusTypes(this.busQuery).then(res => {
if (res.code == 20000) { if (res.code == 20000) {
let busTypes = res.data.list || []; let busTypes = res.data.list || []
// _this.options.getWorkPlace = res.data.list || []; // _this.options.getWorkPlace = res.data.list || [];
let getWorkPlace = busTypes.map(busType => { let getWorkPlace = busTypes.map(busType => {
return { return {
code: busType.documentTypeCode, code: busType.documentTypeCode,
label: busType.busName label: busType.busName
}; }
}); })
_this.options.getBusType = getWorkPlace _this.options.getBusType = getWorkPlace
if (_this.options.getBusType.length == 1) { if (_this.options.getBusType.length == 1) {
_this.filterQuery.busType = _this.options.getBusType[0].code _this.filterQuery.busType = _this.options.getBusType[0].code
@ -468,24 +468,32 @@ export default {
hideSearch() { hideSearch() {
this.showSearch = !this.showSearch this.showSearch = !this.showSearch
this.$nextTick(() => { this.$nextTick(() => {
console.log('组件已刷新'); console.log('组件已刷新')
}); })
}, },
onReset() { onReset() {
this.filterQuery = { this.filterQuery = {
busType: null, busType: null,
tagStatus: null, tagStatus: null,
uploadStatus: 1,
billNo: null, billNo: null,
workPlaceCode: null, workPlaceCode: null,
page: 1, page: 1,
limit: 10 limit: 10
},
this.filterQuery.tagStatus = this.tagStatus
this.filterQuery.uploadStatus = String(this.status)
if (this.status == 2) {
this.filterQuery.uploadStatusName = '已上传'
} }
this.actDateRange = [] this.actDateRange = []
this.getList() this.getList()
}, },
onSubmit(_this) { onSubmit(_this) {
if (_this == null) if (_this == null) {
_this = this _this = this
}
_this.filterQuery.page = 1 _this.filterQuery.page = 1
_this.getList() _this.getList()
}, },
@ -493,11 +501,11 @@ export default {
getList() { getList() {
this.loading = true this.loading = true
if (this.actDateRange !== null) { if (this.actDateRange !== null) {
this.filterQuery.startTime = this.actDateRange[0]; this.filterQuery.startTime = this.actDateRange[0]
this.filterQuery.endTime = this.actDateRange[1]; this.filterQuery.endTime = this.actDateRange[1]
} else { } else {
this.filterQuery.startTime = null; this.filterQuery.startTime = null
this.filterQuery.endTime = null; this.filterQuery.endTime = null
} }
orderFinish(this.filterQuery).then(res => { orderFinish(this.filterQuery).then(res => {
this.loading = false this.loading = false
@ -549,35 +557,34 @@ export default {
}) })
}, },
orderUpload(_this, row) { orderUpload(_this, row) {
let params = row; let params = row
_this.$confirm("该订单将上传到外部系统，是否继续?", "提示", { _this.$confirm('该订单将上传到外部系统，是否继续?', '提示', {
confirmButtonText: "确定", confirmButtonText: '确定',
cancelButtonText: "取消", cancelButtonText: '取消',
type: "warning", type: 'warning'
}) })
.then(() => { .then(() => {
orderUpload({billNo: params.billNo}) orderUpload({ billNo: params.billNo })
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
_this.getList(); _this.getList()
_this.$message({ _this.$message({
type: "success", type: 'success',
message: "上传成功！", message: '上传成功！'
}); })
} else if (response.code == 520) { } else if (response.code == 520) {
_this.$message.error(response.message); _this.$message.error(response.message)
_this.getList(); _this.getList()
} else { } else {
_this.$message.error(response.message); _this.$message.error(response.message)
_this.getList(); _this.getList()
} }
}) })
.catch(() => { .catch(() => {
}); })
}) })
.catch(() => { .catch(() => {
}); })
} }

14
src/views/collect/SelectCollectOrderEndDialog.vue
Unescape Escape View File

@ -504,7 +504,8 @@ export default {
userIdFlag: true, userIdFlag: true,
key: val, key: val,
page: 1, page: 1,
limit: 10 limit: 10,
workPlaceClass:1
} }
filterWorkOptimize(query) filterWorkOptimize(query)
.then((response) => { .then((response) => {
@ -523,12 +524,13 @@ export default {
}, },
created() { created() {
if (this.$route.query.workplaceId != null) { // if (this.$route.query.workplaceId != null) {
this.isLinkDisabled = true // this.isLinkDisabled = true
this.filterQuery.workPlaceCode = this.$route.query.workplaceId // this.filterQuery.workPlaceCode = this.$route.query.workplaceId
this.showType = 2 // this.showType = 2
} // }
this.findWorkPlace(this, '') this.findWorkPlace(this, '')
this.getWorkBindBusTypes(this, '')
getHead('prescribePanelSelect', '1').then((re) => { getHead('prescribePanelSelect', '1').then((re) => {
// 处理返回的数据 // 处理返回的数据
this.tableObj = re.data this.tableObj = re.data

16
src/views/collect/bindWorkDialog.vue
Unescape Escape View File

@ -58,7 +58,7 @@ import {
addWorkplace, addWorkplace,
updateWorkplace, updateWorkplace,
deleteWorkplace, deleteWorkplace,
createWorkplaceId createWorkplaceId, getListByBusType
} from '@/api/basic/workPlace/sysWorkplaceManage' } from '@/api/basic/workPlace/sysWorkplaceManage'
import {bindWork} from "@/api/collect/collectOrder"; import {bindWork} from "@/api/collect/collectOrder";
@ -81,7 +81,8 @@ export default {
invCode: null,//this.$store.getters.locInvCode invCode: null,//this.$store.getters.locInvCode
page: 1, page: 1,
limit: 10, limit: 10,
workPlaceClass:1 workPlaceClass:1,
busType: null
}, },
showSearch: true, showSearch: true,
loading: false, loading: false,
@ -114,13 +115,16 @@ export default {
path: '' path: ''
}) })
this.query = { this.query = {
page: 1, invCode: null,//this.$store.getters.locInvCode
limit: 20 page: 1,
} limit: 10,
workPlaceClass:1
},
this.getList() this.getList()
}, },
getList() { getList() {
listPage(this.query).then(res => { this.query.busType = this.prescribeListData.busType
getListByBusType(this.query).then(res => {
if (res.code != 20000) { if (res.code != 20000) {
return this.$message.error('错误错误') return this.$message.error('错误错误')
} }

5
src/views/collect/selectCollectOrderDialog.vue
Unescape Escape View File

@ -123,7 +123,7 @@
</el-button-group> </el-button-group>
</div> </div>
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
<el-tabs type="border-card" style="margin-top: 55px"> <el-tabs type="border-card" style="margin-top: 55px" @tab-click="handleTabClick">
<el-tab-pane label="待处理单据"> <el-tab-pane label="待处理单据">
<el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row <el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row
@ -779,6 +779,9 @@ export default {
return return
}) })
}, },
handleTabClick(tab){
this.panelALive = false
}
}, },
created() { created() {
if (this.$route.query.workplaceId != null) { if (this.$route.query.workplaceId != null) {

Write Preview
Loading…
Cancel
Save