8/26 工位组别修改

20240912_adapter_z
wangwei 7 months ago
parent 60c7fd5ad1
commit b56b0e37ac

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

Loading…
Cancel
Save