8/26 工位组别修改

20240912_adapter_z
wangwei 8 months ago
parent 60c7fd5ad1
commit b56b0e37ac

@ -552,21 +552,27 @@
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col class="el-col"> <el-col class="el-col">
<el-form-item label="上级菜单" prop="parentCode"> <el-form-item label="上级菜单" prop="parentCode">
<el-select v-model="subData.parentCode" placeholder="选择上级菜单" <!--<el-select v-model="subData.parentCode" placeholder="选择上级菜单"-->
style="width: 80%" <!-- style="width: 80%"-->
clearable <!-- clearable-->
disabled <!-- disabled-->
<!--&gt;-->
<!-- <el-option-->
<!-- v-for="item in fromDeptOptions"-->
<!-- :key="item.parentCode"-->
<!-- :label="item.parentName"-->
<!-- :value="item.parentCode"-->
<!-- >-->
<!-- <span style="float: left">{{ item.parentName }}</span>-->
<!-- </el-option>-->
<!--</el-select>-->
<el-input
v-model="subData.parentName" style="width: 80%"
placeholder="全部"
auto-complete="off"
disabled
> >
<el-option </el-input>
v-for="item in fromDeptOptions"
:key="item.parentCode"
:label="item.parentName"
:value="item.parentCode"
>
<span style="float: left">{{ item.parentName }}</span>
</el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -644,17 +650,17 @@ import {
deleteWorkplace, deleteWorkplace,
createWorkplaceId, printWorkLabel, getUsers createWorkplaceId, printWorkLabel, getUsers
} from '@/api/basic/workPlace/sysWorkplaceManage' } from '@/api/basic/workPlace/sysWorkplaceManage'
import {filterAllByUser, getInvListByUser} from '@/api/system/invWarehouse' import { filterAllByUser, getInvListByUser } from '@/api/system/invWarehouse'
import {addTree, deleteTree, getTree, updateTree} from '@/api/basic/collectPoint/collectPointManage' import { addTree, deleteTree, getTree, updateTree } from '@/api/basic/collectPoint/collectPointManage'
import {getCollectBusType} from '@/api/basic/collectPoint/gatherOrderType' import { getCollectBusType } from '@/api/basic/collectPoint/gatherOrderType'
import panelGroup from '@/views/dashboard/PanelGroup' import panelGroup from '@/views/dashboard/PanelGroup'
import {delUserBindWork, getUserBindWork} from '@/api/basic/collectPoint/userWorkplace' import { delUserBindWork, getUserBindWork } from '@/api/basic/collectPoint/userWorkplace'
import selectBusType from './selectBusType' import selectBusType from './selectBusType'
import addBusTypeDialog from './addBusTypeDialog' import addBusTypeDialog from './addBusTypeDialog'
import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments' import { getWorkBindBusTypes, removeBusTypeById } from '@/api/basic/workPlace/sysWorkplaceDocuments'
export default { export default {
components: {selectBusType, addBusTypeDialog}, components: { selectBusType, addBusTypeDialog },
data() { data() {
return { return {
query: { query: {
@ -696,7 +702,7 @@ export default {
chargeUser: null, chargeUser: null,
constituencies: null, constituencies: null,
invRemindNumber: 0, invRemindNumber: 0,
remake: null, remake: null
}, },
workplaceCode: '6001', workplaceCode: '6001',
unitStorageList: [], unitStorageList: [],
@ -705,34 +711,34 @@ export default {
filterBadInv: true, filterBadInv: true,
formRules: { formRules: {
workplaceName: [ workplaceName: [
{required: true, message: '请输入工位名称', trigger: 'blur'} { required: true, message: '请输入工位名称', trigger: 'blur' }
], ],
operationType: [ operationType: [
{required: true, message: '请选择作业方式', trigger: 'blur'} { required: true, message: '请选择作业方式', trigger: 'blur' }
], ],
checkInsert: [ checkInsert: [
{required: true, message: '处理结果不能为空', trigger: 'blur'} { required: true, message: '处理结果不能为空', trigger: 'blur' }
], ],
// invRemindNumber: [ // invRemindNumber: [
// { required: true, message: '', trigger: 'blur' } // { required: true, message: '', trigger: 'blur' }
// ], // ],
warnType: [ warnType: [
{required: true, message: '请选择提醒方式', trigger: 'blur'} { required: true, message: '请选择提醒方式', trigger: 'blur' }
], ],
corpType: [ corpType: [
{required: true, message: '请选择往来单位类型', trigger: 'blur'} { required: true, message: '请选择往来单位类型', trigger: 'blur' }
], ],
orderId: [ orderId: [
{required: true, message: '请选择单据类型', trigger: 'blur'} { required: true, message: '请选择单据类型', trigger: 'blur' }
], ],
unitTittle: [ unitTittle: [
{required: true, message: '请输入往来类型标题', trigger: 'blur'} { required: true, message: '请输入往来类型标题', trigger: 'blur' }
], ],
workplaceStatus: [ workplaceStatus: [
{required: true, message: '请选择工位状态', trigger: 'blur'} { required: true, message: '请选择工位状态', trigger: 'blur' }
], ],
workplaceType: [ workplaceType: [
{required: true, message: '请选择工位类型', trigger: 'blur'} { required: true, message: '请选择工位类型', trigger: 'blur' }
] ]
}, },
invQuery: { invQuery: {
@ -752,7 +758,7 @@ export default {
}, },
inoutTypes: { inoutTypes: {
1: '入库', 1: '入库',
2: '出库', 2: '出库'
}, },
corpTypeMap: { corpTypeMap: {
1: '客户', 1: '客户',
@ -767,7 +773,7 @@ export default {
}, },
orderCirTypes: { orderCirTypes: {
1: '流通计量单位', 1: '流通计量单位',
2: '使用计量单位', 2: '使用计量单位'
}, },
workplaceStatusMap: { workplaceStatusMap: {
0: '暂停', 0: '暂停',
@ -800,7 +806,10 @@ export default {
edit: '编辑' edit: '编辑'
}, },
subFormVisible: false, subFormVisible: false,
subData: {}, subData: {
parentName: '全部',
parentCode: '1001'
},
groupData: null, groupData: null,
total: 0, total: 0,
userTotal: 0, userTotal: 0,
@ -862,11 +871,11 @@ export default {
workplaceType: 3, workplaceType: 3,
deptCode: null, deptCode: null,
chargeUser: null, chargeUser: null,
constituencies: "1001", constituencies: '1001',
invRemindNumber: 0, invRemindNumber: 0,
remake: null, remake: null
}; }
if (this.groupData != null){ if (this.groupData != null) {
this.formData.constituencies = this.groupData.code this.formData.constituencies = this.groupData.code
} }
// if (this.) // if (this.)
@ -1016,7 +1025,7 @@ export default {
const binaryData = [] const binaryData = []
binaryData.push(response) binaryData.push(response)
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) window.open(url)
@ -1238,10 +1247,10 @@ export default {
}).then(() => { }).then(() => {
removeBusTypeById(row).then(res => { removeBusTypeById(row).then(res => {
if (res.code == 20000) { if (res.code == 20000) {
this.$message.success('除成功') this.$message.success('除成功')
this.getWorkBindBusTypes() this.getWorkBindBusTypes()
} else { } else {
this.$message.error("移除失败") this.$message.error('删除失败')
} }
}) })
}).catch(() => { }).catch(() => {

Loading…
Cancel
Save