From fcc3f96a76d35abc14210cfcaaf4d218fd194ad3 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 14 八月 2025 20:47:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/base/FactoryManager.vue | 205 +++++++++++++++-----------------------------------
1 files changed, 62 insertions(+), 143 deletions(-)
diff --git a/src/views/base/FactoryManager.vue b/src/views/base/FactoryManager.vue
index d0048aa..1ed3c6c 100644
--- a/src/views/base/FactoryManager.vue
+++ b/src/views/base/FactoryManager.vue
@@ -5,13 +5,13 @@
<!-- 鎸夐挳鎿嶄綔鍖哄煙 -->
<a-row style="margin-left: 14px">
- <a-button @click="handleAdd(1)" type="primary">娣诲姞杞﹂棿</a-button>
- <a-button @click="handleAdd(2)" type="primary">娣诲姞涓嬬骇</a-button>
- <a-button type="primary" icon="download" @click="handleExportXls('杞﹂棿淇℃伅')">瀵煎嚭</a-button>
+ <a-button @click="handleAdd(1)" type="primary">娣诲姞宸ュ巶</a-button>
+ <a-button v-if="this.factoryCategory == '1' || this.factoryCategory == '2'" @click="handleAdd(2)" type="primary">娣诲姞涓嬬骇</a-button>
+ <!-- <a-button type="primary" icon="download" @click="handleExportXls('杞﹂棿淇℃伅')">瀵煎嚭</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
:action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">瀵煎叆</a-button>
- </a-upload>
+ </a-upload> -->
<a-button @click="handleDelete" v-if="selectedKeys.length>0">鍒犻櫎</a-button>
<a-button title="鍒犻櫎澶氭潯鏁版嵁" @click="batchDel" v-if="checkedKeys.length>0">鎵归噺鍒犻櫎</a-button>
<!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">鍒锋柊</a-button>-->
@@ -27,38 +27,11 @@
<a-input-search @search="onSearch" style="width:100%;margin-top: 10px" placeholder="璇疯緭鍏ヨ溅闂村悕绉�"/>
<!-- 鏍�-->
<a-col :md="10" :sm="24">
- <!--<template>-->
- <!--<a-dropdown :trigger="[this.dropTrigger]" @visibleChange="dropStatus">-->
- <!--<span style="user-select: none">-->
- <!--<a-tree-->
- <!--checkable-->
- <!--multiple-->
- <!--@select="onSelect"-->
- <!--@check="onCheck"-->
- <!--@rightClick="rightHandle"-->
- <!--:selectedKeys="selectedKeys"-->
- <!--:checkedKeys="checkedKeys"-->
- <!--:treeData="factoryTree"-->
- <!--:checkStrictly="checkStrictly"-->
- <!--:expandedKeys="iExpandedKeys"-->
- <!--:autoExpandParent="autoExpandParent"-->
- <!--@expand="onExpand"/>-->
- <!--</span>-->
- <!--<!–鏂板鍙抽敭鐐瑰嚮浜嬩欢,鍜屽鍔犳坊鍔犲拰鍒犻櫎鍔熻兘–>-->
-
- <!--<a-menu slot="overlay">-->
- <!--<a-menu-item @click="handleAdd(3)" key="1">娣诲姞</a-menu-item>-->
- <!--<a-menu-item @click="handleDelete" key="2">鍒犻櫎</a-menu-item>-->
- <!--<a-menu-item @click="closeDrop" key="3">鍙栨秷</a-menu-item>-->
- <!--</a-menu>-->
- <!--</a-dropdown>-->
- <!--</template>-->
<a-tree
checkable
multiple
@select="onSelect"
@check="onCheck"
- @rightClick="rightHandle"
:selectedKeys="selectedKeys"
:checkedKeys="checkedKeys"
:treeData="factoryTree"
@@ -93,13 +66,16 @@
<a-tab-pane tab="鍩烘湰淇℃伅" key="1">
<a-card :bordered="false" v-if="selectedKeys.length>0">
<a-form-model ref="form" :model="model" :rules="validatorRules">
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factoryCode" label="杞﹂棿缂栧彿">
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factoryCode" :label="codeLabel">
<a-input placeholder="璇疯緭鍏ヤ骇绾�/杞﹂棿缂栧彿" v-model="model.factoryCode"/>
</a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factoryName" label="杞﹂棿鍚嶇О">
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factoryName" :label="nameLabel">
<a-input placeholder="璇疯緭鍏ヤ骇绾�/杞﹂棿鍚嶇О" v-model="model.factoryName"/>
</a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="涓婄骇杞﹂棿">
+ <a-form-model-item v-if="this.factoryCategory == '3'" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionType" :label="nameLabel">
+ <j-dict-select-tag type="list" placeholder="璇烽�夋嫨浜х嚎绫诲瀷" v-model="model.productionType" dictCode="production_type"/>
+ </a-form-model-item>
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="鐖惰妭鐐�">
<a-tree-select
style="width:100%"
:dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
@@ -110,7 +86,7 @@
</a-tree-select>
</a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="鎺掑簭">
- <a-input-number v-model="model.sorter"/>
+ <a-input-number v-model="model.sorter" style="width:100%"/>
</a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="澶囨敞">
<a-textarea placeholder="璇疯緭鍏ュ娉�" v-model="model.remark"/>
@@ -128,9 +104,17 @@
</a-card>
</a-tab-pane>
- <!-- <a-tab-pane tab="璁惧鍒楄〃" key="2" forceRender>
- <factory-equipment ref="departAuth"></factory-equipment>
- </a-tab-pane> -->
+ <a-tab-pane tab="浜哄憳鍒楄〃" key="2" forceRender>
+ <user-factory ref="userFactory"></user-factory>
+ <!-- <a-card v-if="factoryCategory == '3'">
+ <user-factory ref="userFactory"></user-factory>
+ </a-card>
+ <a-card v-else>
+ <a-empty>
+ <span slot="description"> 璇峰厛閫夋嫨涓�涓骇绾�! </span>
+ </a-empty>
+ </a-card> -->
+ </a-tab-pane>
</a-tabs>
</a-col>
@@ -138,17 +122,17 @@
</a-row>
</template>
<script>
- import FactoryEquipment from './modules/FactoryManager/FactoryEquipment'
+ import UserFactory from './modules/factoryManager/UserFactory'
import { queryFactoryTreeList, searchByKeywords, deleteByFactory } from '@/api/api'
import { httpAction, deleteAction } from '@/api/manage'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
- import FactoryModal from './modules/FactoryManager/FactoryModal'
+ import FactoryModal from './modules/factoryManager/FactoryModal'
export default {
name: 'FactoryManager',
mixins: [JeecgListMixin],
components: {
- FactoryEquipment,
+ UserFactory,
FactoryModal
},
data() {
@@ -162,16 +146,10 @@
treeData: [],
visible: false,
factoryTree: [],
- rightClickSelectedKey: '',
- rightClickSelectedOrgCode: '',
hiding: true,
model: {},
- dropTrigger: '',
- depart: {},
- disableSubmit: false,
checkedKeys: [],
selectedKeys: [],
- autoIncr: 1,
currSelected: {},
allTreeKeys: [],
checkStrictly: true,
@@ -188,7 +166,9 @@
edges: []
},
validatorRules: {
- factoryName: [{ required: true, message: '璇疯緭鍏ヤ骇绾�/杞﹂棿鍚嶇О!' }]
+ factoryCode:[{ required: true, message: '璇疯緭鍏ュ伐鍘�/杞﹂棿/浜х嚎缂栧彿!' }],
+ factoryName:[{ required: true, message: '璇疯緭鍏ュ伐鍘�/杞﹂棿/浜х嚎鍚嶇О!' }],
+ productionType:[{ required: false, message: '璇烽�夋嫨浜х嚎绫诲瀷!' }],
},
url: {
delete: '/base/factory/delete',
@@ -198,13 +178,34 @@
importExcelUrl: '/base/factory/importExcel'
},
orgCategoryDisabled: false,
- isIncludesNotLeaf: false
+ isIncludesNotLeaf: false,
+ factoryCategory:''
}
},
computed: {
importExcelUrl: function() {
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
- }
+ },
+ // 鏂板璁＄畻灞炴�э細鍔ㄦ�佺紪鍙锋爣绛�
+ codeLabel() {
+ if (!this.currSelected.factoryCategory) return "杞﹂棿缂栧彿";
+ const typeMap = {
+ '1': '宸ュ巶缂栧彿',
+ '2': '杞﹂棿缂栧彿',
+ '3': '浜х嚎缂栧彿'
+ };
+ return typeMap[this.currSelected.factoryCategory] || "杞﹂棿缂栧彿";
+ },
+ // 鏂板璁＄畻灞炴�э細鍔ㄦ�佸悕绉版爣绛�
+ nameLabel() {
+ if (!this.currSelected.factoryCategory) return "杞﹂棿鍚嶇О";
+ const typeMap = {
+ '1': '宸ュ巶鍚嶇О',
+ '2': '杞﹂棿鍚嶇О',
+ '3': '浜х嚎鍚嶇О'
+ };
+ return typeMap[this.currSelected.factoryCategory] || "杞﹂棿鍚嶇О";
+ }
},
methods: {
loadData() {
@@ -216,7 +217,6 @@
that.factoryTree = []
queryFactoryTreeList().then((res) => {
if (res.success) {
- //閮ㄩ棬鍏ㄩ�夊悗锛屽啀娣诲姞閮ㄩ棬锛岄�変腑鏁伴噺澧炲
this.allTreeKeys = []
for (let i = 0; i < res.result.length; i++) {
let temp = res.result[i]
@@ -224,7 +224,6 @@
that.factoryTree.push(temp)
that.setThisExpandedKeys(temp)
that.getAllKeys(temp)
- // console.log(temp.id)
}
this.loading = false
}
@@ -242,40 +241,14 @@
this.loading = true
this.loadTree()
},
- // 鍙抽敭鎿嶄綔鏂规硶
- rightHandle({ event, node }) {
- this.dropTrigger = 'contextmenu'
- const record = node.dataRef
- this.rightClickSelectedKey = record.id
- this.rightClickSelected = record
- this.rightClickSelectedOrgCode = record.orgCode
- },
onExpand(expandedKeys) {
- console.log('onExpand', expandedKeys)
this.iExpandedKeys = expandedKeys
this.autoExpandParent = false
},
- backFlowList() {
- this.$router.back(-1)
- },
- // 鍙抽敭鐐瑰嚮涓嬫媺妗嗘敼鍙樹簨浠�
- dropStatus(visible) {
- if (visible == false) {
- this.dropTrigger = ''
- }
- },
- // 鍙抽敭涓嬫媺鍏抽棴涓嬫媺妗�
- closeDrop() {
- this.dropTrigger = ''
- },
- addRootNode() {
- this.$refs.nodeModal.add(this.currFlowId, '')
- },
+
batchDel: function() {
- console.log(this.checkedKeys)
this.isIncludesNotLeaf = false
this.includesNotLeaf(this.factoryTree)
- console.log('isIncludesNotLeaf', this.isIncludesNotLeaf)
// 涓簍rue鍒欒〃绀洪�変腑椤瑰寘鍚潪鍙跺瓙缁撶偣 false鍒欒〃绀洪�変腑椤瑰潎涓哄彾瀛愮粨鐐�
if (!this.isIncludesNotLeaf) {
@@ -355,17 +328,7 @@
}
},
- nodeModalOk() {
- this.loadTree()
- },
- nodeModalClose() {
- },
- hide() {
- console.log(111)
- this.visible = false
- },
onCheck(checkedKeys, info) {
- console.log('onCheck', checkedKeys, info)
this.hiding = false
//---- author:os_chengtgen -- date:20190827 -- for:鍒囨崲鐖跺瓙鍕鹃�夋ā寮� =======------
if (this.checkStrictly) {
@@ -376,17 +339,21 @@
//---- author:os_chengtgen -- date:20190827 -- for:鍒囨崲鐖跺瓙鍕鹃�夋ā寮� =======------
},
onSelect(selectedKeys, e) {
- console.log('selected', selectedKeys, e)
this.hiding = false
this.deleteTrigger = 'leftClick'
let record = e.node.dataRef
- console.log('onSelect-record', record)
+ this.factoryCategory = record.factoryCategory
this.currSelected = Object.assign({}, record)
this.model = this.currSelected
this.selectedKeys = [record.key]
this.model.parentId = record.parentId
this.setValuesToForm(record)
- this.$refs.departAuth.show(record.id)
+ if(record.factoryCategory == '3'){
+ this.$refs.userFactory.show(record.id)
+ this.validatorRules.productionType[0].required = true
+ }else{
+ this.$refs.userFactory.factoryId = ''
+ }
},
// 瑙﹀彂onSelect浜嬩欢鏃�,涓洪儴闂ㄦ爲鍙充晶鐨刦orm琛ㄥ崟璧嬪��
setValuesToForm(record) {
@@ -404,16 +371,7 @@
this.checkedKeys = []
this.currSelected = {}
this.selectedKeys = []
- this.$refs.departAuth.departId = ''
- },
- handleNodeTypeChange(val) {
- this.currSelected.nodeType = val
- },
- notifyTriggerTypeChange(value) {
- this.currSelected.notifyTriggerType = value
- },
- receiptTriggerTypeChange(value) {
- this.currSelected.receiptTriggerType = value
+ this.$refs.userFactory.departId = ''
},
submitCurrForm() {
this.$refs.form.validate(valid => {
@@ -450,22 +408,11 @@
this.$refs.form.resetFields()
this.model = {}
},
- nodeSettingFormSubmit() {
- this.$refs.form.validate(valid => {
- if (valid) {
- console.log('Received values of form: ', this.model)
- }
- })
- },
- openSelect() {
- this.$refs.sysDirectiveModal.show()
- },
handleAdd(num) {
if (num == 1) {
this.$refs.departModal.add()
this.$refs.departModal.title = '鏂板'
} else if (num == 2) {
- console.log(this.currSelected)
let key = this.currSelected.key
if (!key) {
// this.$message.warning('璇峰厛鐐瑰嚮閫変腑涓婄骇杞﹂棿锛�')
@@ -475,7 +422,7 @@
})
return false
}
- this.$refs.departModal.add(this.selectedKeys)
+ this.$refs.departModal.add(this.selectedKeys,this.factoryCategory)
this.$refs.departModal.title = '鏂板'
} else {
this.$refs.departModal.add(this.currSelected)
@@ -487,7 +434,7 @@
if (this.currSelected.leaf) {
this.$confirm({
title: '纭鍒犻櫎',
- content: `纭畾瑕佸垹闄� ${that.currSelected.productionName} 鍚�?`,
+ content: `纭畾瑕佸垹闄� ${that.currSelected.factoryName} 鍚�?`,
onOk: function() {
deleteByFactory({ id: that.currSelected.id }).then((resp) => {
if (resp.success) {
@@ -499,13 +446,8 @@
description: '鍒犻櫎鎴愬姛'
})
that.loadTree()
- //鍒犻櫎鍚庡悓姝ユ竻绌哄彸渚у熀鏈俊鎭唴瀹�
- // let orgCode=that.model.orgCode;
- // if(orgCode && orgCode === that.rightClickSelectedOrgCode){
that.onClearSelected()
- // }
} else {
- // that.$message.warning('鍒犻櫎澶辫触!')
that.$notification.warning({
message: '娑堟伅',
description: '鍒犻櫎澶辫触'
@@ -519,28 +461,6 @@
message: '娑堟伅',
description: '姝よ溅闂村凡鎸傝浇瀛愯妭鐐�'
})
- }
- console.log('deletedRecord', deletedRecord)
- },
- selectDirectiveOk(record) {
- console.log('閫変腑鎸囦护鏁版嵁', record)
- this.nodeSettingForm.setFieldsValue({ directiveCode: record.directiveCode })
- this.currSelected.sysCode = record.sysCode
- },
- getFlowGraphData(node) {
- this.graphDatasource.nodes.push({
- id: node.id,
- text: node.flowNodeName
- })
- if (node.children.length > 0) {
- for (let a = 0; a < node.children.length; a++) {
- let temp = node.children[a]
- this.graphDatasource.edges.push({
- source: node.id,
- target: temp.id
- })
- this.getFlowGraphData(temp)
- }
}
},
//---- author:os_chengtgen -- date:20190827 -- for:鍒囨崲鐖跺瓙鍕鹃�夋ā寮� =======------
@@ -566,7 +486,6 @@
}
},
getAllKeys(node) {
- // console.log('node',node);
this.allTreeKeys.push(node.key)
if (node.children && node.children.length > 0) {
for (let a = 0; a < node.children.length; a++) {
--
Gitblit v1.9.3