From b244eb1ccdb54d69f955d9d9fa27c90916c3a39a Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 31 七月 2024 14:40:40 +0800
Subject: [PATCH] 1、新增设备车间管理页面 2、修改浏览器页签logo
---
/dev/null | 0
public/index.html | 2
src/views/system/ProductionManager.vue | 647 ++++++++++++++++++++++++++++++++
src/views/system/modules/ProductionManager/ProductionEquipment.vue | 331 ++++++++++++++++
public/logo.png | 0
src/views/system/modules/ProductionManager/ProductionModal.vue | 180 +++++++++
6 files changed, 1,159 insertions(+), 1 deletions(-)
diff --git a/public/index.html b/public/index.html
index 918da5d..0adf960 100644
--- a/public/index.html
+++ b/public/index.html
@@ -6,7 +6,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<title>MDC鏅烘収杞﹂棿</title>
- <link rel="icon" href="<%= BASE_URL %>lzxn.png">
+ <link rel="icon" href="<%= BASE_URL %>logo.png">
<script src="<%= BASE_URL %>cdn/babel-polyfill/polyfill_7_2_5.js"></script>
<style>
html,
diff --git a/public/logo.png b/public/logo.png
index 1c356e3..4631add 100644
--- a/public/logo.png
+++ b/public/logo.png
Binary files differ
diff --git a/public/lxzn.png b/public/lxzn.png
deleted file mode 100644
index 4631add..0000000
--- a/public/lxzn.png
+++ /dev/null
Binary files differ
diff --git a/src/views/system/ProductionManager.vue b/src/views/system/ProductionManager.vue
new file mode 100644
index 0000000..de94956
--- /dev/null
+++ b/src/views/system/ProductionManager.vue
@@ -0,0 +1,647 @@
+<template xmlns:background-color="http://www.w3.org/1999/xhtml">
+ <a-row :gutter="10">
+ <a-col :md="12" :sm="24">
+ <a-card :bordered="false">
+
+ <!-- 鎸夐挳鎿嶄綔鍖哄煙 -->
+ <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-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
+ :action="importExcelUrl" @change="handleImportExcel">
+ <a-button type="primary" icon="import">瀵煎叆</a-button>
+ </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>-->
+ </a-row>
+ `
+ <div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px">
+ <a-alert type="info" :showIcon="true">
+ <div slot="message">
+ 褰撳墠閫夋嫨锛�<span v-if="this.currSelected.title">{{ getCurrSelectedTitle() }}</span>
+ <a v-if="this.currSelected.title" style="margin-left: 10px" @click="onClearSelected">鍙栨秷閫夋嫨</a>
+ </div>
+ </a-alert>
+ <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="departTree"-->
+ <!--: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="departTree"
+ :checkStrictly="checkStrictly"
+ :expandedKeys="iExpandedKeys"
+ :autoExpandParent="autoExpandParent"
+ @expand="onExpand"/>
+ </a-col>
+ </div>
+ </a-card>
+ <!---- author:os_chengtgen -- date:20190827 -- for:鍒囨崲鐖跺瓙鍕鹃�夋ā寮� =======------>
+ <div class="drawer-bottom-button">
+ <a-dropdown :trigger="['click']" placement="topCenter">
+ <a-menu slot="overlay">
+ <a-menu-item key="1" @click="switchCheckStrictly(1)">鐖跺瓙鍏宠仈</a-menu-item>
+ <a-menu-item key="2" @click="switchCheckStrictly(2)">鍙栨秷鍏宠仈</a-menu-item>
+ <a-menu-item key="3" @click="checkALL">鍏ㄩ儴鍕鹃��</a-menu-item>
+ <a-menu-item key="4" @click="cancelCheckALL">鍙栨秷鍏ㄩ��</a-menu-item>
+ <a-menu-item key="5" @click="expandAll">灞曞紑鎵�鏈�</a-menu-item>
+ <a-menu-item key="6" @click="closeAll">鍚堝苟鎵�鏈�</a-menu-item>
+ </a-menu>
+ <a-button>
+ 鏍戞搷浣�
+ <a-icon type="up"/>
+ </a-button>
+ </a-dropdown>
+ </div>
+ <!---- author:os_chengtgen -- date:20190827 -- for:鍒囨崲鐖跺瓙鍕鹃�夋ā寮� =======------>
+ </a-col>
+ <a-col :md="12" :sm="24">
+ <a-tabs defaultActiveKey="1">
+ <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="productionCode" label="杞﹂棿缂栧彿">
+ <a-input placeholder="璇疯緭鍏ヤ骇绾�/杞﹂棿缂栧彿" v-model="model.productionCode"/>
+ </a-form-model-item>
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionName" label="杞﹂棿鍚嶇О">
+ <a-input placeholder="璇疯緭鍏ヤ骇绾�/杞﹂棿鍚嶇О" v-model="model.productionName"/>
+ </a-form-model-item>
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="涓婄骇杞﹂棿">
+ <a-tree-select
+ style="width:100%"
+ :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
+ :treeData="treeData"
+ :disabled="disable"
+ v-model="model.parentId"
+ placeholder="鏃�">
+ </a-tree-select>
+ </a-form-model-item>
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="鎺掑簭">
+ <a-input-number v-model="model.productionOrder"/>
+ </a-form-model-item>
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="澶囨敞">
+ <a-textarea placeholder="璇疯緭鍏ュ娉�" v-model="model.memo"/>
+ </a-form-model-item>
+ </a-form-model>
+ <div class="anty-form-btn">
+ <a-button @click="emptyCurrForm" type="default" htmlType="button" icon="sync">閲嶇疆</a-button>
+ <a-button @click="submitCurrForm" type="primary" htmlType="button" icon="form">淇濆瓨</a-button>
+ </div>
+ </a-card>
+ <a-card v-else>
+ <a-empty>
+ <span slot="description"> 璇峰厛閫夋嫨涓�涓溅闂�! </span>
+ </a-empty>
+ </a-card>
+ </a-tab-pane>
+ <!--<a-tab-pane tab="閮ㄩ棬鏉冮檺" key="2" forceRender>-->
+ <!--<depart-auth-modal ref="departAuth"/>-->
+ <!--</a-tab-pane>-->
+ <a-tab-pane tab="璁惧鍒楄〃" key="2" forceRender>
+ <!--<depart-auth-modal/>-->
+ <production-equipment ref="departAuth"></production-equipment>
+ </a-tab-pane>
+ </a-tabs>
+
+ </a-col>
+ <production-modal ref="departModal" @ok="loadTree"></production-modal>
+ </a-row>
+</template>
+<script>
+ import ProductionEquipment from './modules/ProductionManager/ProductionEquipment'
+ import { queryProductionTreeList, searchByKeywords, deleteByProduction } from '@/api/api'
+ import { httpAction, deleteAction } from '@/api/manage'
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import ProductionModal from './modules/ProductionManager/ProductionModal'
+
+ export default {
+ name: 'ProductionManager',
+ mixins: [JeecgListMixin],
+ components: {
+ ProductionEquipment,
+ ProductionModal
+ },
+ data() {
+ return {
+ iExpandedKeys: [],
+ loading: false,
+ autoExpandParent: true,
+ currFlowId: '',
+ currFlowName: '',
+ disable: true,
+ treeData: [],
+ visible: false,
+ departTree: [],
+ rightClickSelectedKey: '',
+ rightClickSelectedOrgCode: '',
+ hiding: true,
+ model: {},
+ dropTrigger: '',
+ depart: {},
+ disableSubmit: false,
+ checkedKeys: [],
+ selectedKeys: [],
+ autoIncr: 1,
+ currSelected: {},
+ allTreeKeys: [],
+ checkStrictly: true,
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 }
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 }
+ },
+ graphDatasource: {
+ nodes: [],
+ edges: []
+ },
+ validatorRules: {
+ productionName: [{ required: true, message: '璇疯緭鍏ヤ骇绾�/杞﹂棿鍚嶇О!' }]
+ },
+ url: {
+ delete: '/mdc/mdcProduction/delete',
+ edit: '/mdc/mdcProduction/edit',
+ deleteBatch: '/mdc/mdcProduction/deleteBatch',
+ exportXlsUrl: '/mdc/mdcProduction/exportXls',
+ importExcelUrl: '/mdc/mdcProduction/importExcel'
+ },
+ orgCategoryDisabled: false,
+ isIncludesNotLeaf: false
+ }
+ },
+ computed: {
+ importExcelUrl: function() {
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+ }
+ },
+ methods: {
+ loadData() {
+ this.refresh()
+ },
+ loadTree() {
+ var that = this
+ that.treeData = []
+ that.departTree = []
+ queryProductionTreeList().then((res) => {
+ if (res.success) {
+ //閮ㄩ棬鍏ㄩ�夊悗锛屽啀娣诲姞閮ㄩ棬锛岄�変腑鏁伴噺澧炲
+ this.allTreeKeys = []
+ for (let i = 0; i < res.result.length; i++) {
+ let temp = res.result[i]
+ that.treeData.push(temp)
+ that.departTree.push(temp)
+ that.setThisExpandedKeys(temp)
+ that.getAllKeys(temp)
+ // console.log(temp.id)
+ }
+ this.loading = false
+ }
+ })
+ },
+ setThisExpandedKeys(node) {
+ if (node.children && node.children.length > 0) {
+ this.iExpandedKeys.push(node.key)
+ for (let a = 0; a < node.children.length; a++) {
+ this.setThisExpandedKeys(node.children[a])
+ }
+ }
+ },
+ refresh() {
+ 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.departTree)
+ console.log('isIncludesNotLeaf', this.isIncludesNotLeaf)
+
+ // 涓簍rue鍒欒〃绀洪�変腑椤瑰寘鍚潪鍙跺瓙缁撶偣 false鍒欒〃绀洪�変腑椤瑰潎涓哄彾瀛愮粨鐐�
+ if (!this.isIncludesNotLeaf) {
+ if (this.checkedKeys.length <= 0) {
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+ this.$notification.warning({
+ message: '娑堟伅',
+ description: '璇烽�夋嫨涓�鏉¤褰�'
+ })
+ } else {
+ var ids = ''
+ for (var a = 0; a < this.checkedKeys.length; a++) {
+ ids += this.checkedKeys[a] + ','
+ }
+ var that = this
+ this.$confirm({
+ title: '纭鍒犻櫎',
+ content: '纭畾瑕佸垹闄ゆ墍閫変腑鐨� ' + this.checkedKeys.length + ' 鏉℃暟鎹�?',
+ onOk: function() {
+ deleteAction(that.url.deleteBatch, { ids: ids }).then((res) => {
+ if (res.success) {
+ // that.$message.success(res.message)
+ that.$notification.success({
+ message: '娑堟伅',
+ description: res.message
+ })
+ that.loadTree()
+ that.onClearSelected()
+ } else {
+ // that.$message.warning(res.message)
+ that.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ })
+ }
+ })
+ }
+ } else {
+ this.$notification.warning({
+ message: '娑堟伅',
+ description: '閫変腑椤瑰寘鍚凡鎸傝浇瀛愯妭鐐硅溅闂�'
+ })
+ }
+ },
+ includesNotLeaf(treeData) {
+ for (let i = 0; i < treeData.length; i++) {
+ if (!treeData[i].leaf) {
+ this.includesNotLeaf(treeData[i].children)
+ }
+ if (this.checkedKeys.includes(treeData[i].id) && !treeData[i].leaf) {
+ this.isIncludesNotLeaf = true
+ }
+ }
+ },
+ onSearch(value) {
+ let that = this
+ if (value) {
+ searchByKeywords({ keyWord: value }).then((res) => {
+ if (res.success) {
+ that.departTree = []
+ for (let i = 0; i < res.result.length; i++) {
+ let temp = res.result[i]
+ that.departTree.push(temp)
+ }
+ } else {
+ // that.$message.warning(res.message)
+ that.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ })
+ } else {
+ that.loadTree()
+ }
+
+ },
+ 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) {
+ this.checkedKeys = checkedKeys.checked
+ } else {
+ this.checkedKeys = checkedKeys
+ }
+ //---- 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.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)
+ },
+ // 瑙﹀彂onSelect浜嬩欢鏃�,涓洪儴闂ㄦ爲鍙充晶鐨刦orm琛ㄥ崟璧嬪��
+ setValuesToForm(record) {
+ if (record.orgCategory == '1') {
+ this.orgCategoryDisabled = true
+ } else {
+ this.orgCategoryDisabled = false
+ }
+ },
+ getCurrSelectedTitle() {
+ return !this.currSelected.title ? '' : this.currSelected.title
+ },
+ onClearSelected() {
+ this.hiding = true
+ 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
+ },
+ submitCurrForm() {
+ this.$refs.form.validate(valid => {
+ if (valid) {
+ if (!this.currSelected.id) {
+ // this.$message.warning('璇风偣鍑婚�夋嫨瑕佷慨鏀硅溅闂�!')
+ this.$notification.warning({
+ message: '娑堟伅',
+ description: '璇风偣鍑婚�夋嫨瑕佷慨鏀硅溅闂达紒'
+ })
+ return
+ }
+
+ httpAction(this.url.edit, this.currSelected, 'put').then((res) => {
+ if (res.success) {
+ // this.$message.success('淇濆瓨鎴愬姛!')
+ this.$notification.success({
+ message: '娑堟伅',
+ description: '淇濆瓨鎴愬姛'
+ })
+ this.loadTree()
+ } else {
+ // this.$message.error(res.message)
+ this.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ })
+ }
+ })
+ },
+ emptyCurrForm() {
+ 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('璇峰厛鐐瑰嚮閫変腑涓婄骇杞﹂棿锛�')
+ this.$notification.warning({
+ message: '娑堟伅',
+ description: '璇峰厛鐐瑰嚮閫変腑涓婄骇杞﹂棿锛�'
+ })
+ return false
+ }
+ this.$refs.departModal.add(this.selectedKeys)
+ this.$refs.departModal.title = '鏂板'
+ } else {
+ this.$refs.departModal.add(this.rightClickSelectedKey)
+ this.$refs.departModal.title = '鏂板'
+ }
+ },
+ handleDelete() {
+ var that = this
+ if (this.currSelected.leaf) {
+ this.$confirm({
+ title: '纭鍒犻櫎',
+ content: `纭畾瑕佸垹闄� ${that.currSelected.productionName} 鍚�?`,
+ onOk: function() {
+ deleteByProduction({ id: that.currSelected.id }).then((resp) => {
+ if (resp.success) {
+ //鍒犻櫎鎴愬姛鍚庯紝鍘婚櫎宸查�変腑涓殑鏁版嵁
+ // that.checkedKeys.splice(that.checkedKeys.findIndex(key => key === that.rightClickSelectedKey), 1)
+ // that.$message.success('鍒犻櫎鎴愬姛!')
+ that.$notification.success({
+ message: '娑堟伅',
+ description: '鍒犻櫎鎴愬姛'
+ })
+ that.loadTree()
+ //鍒犻櫎鍚庡悓姝ユ竻绌哄彸渚у熀鏈俊鎭唴瀹�
+ // let orgCode=that.model.orgCode;
+ // if(orgCode && orgCode === that.rightClickSelectedOrgCode){
+ that.onClearSelected()
+ // }
+ } else {
+ // that.$message.warning('鍒犻櫎澶辫触!')
+ that.$notification.warning({
+ message: '娑堟伅',
+ description: '鍒犻櫎澶辫触'
+ })
+ }
+ })
+ }
+ })
+ } else {
+ this.$notification.warning({
+ 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:鍒囨崲鐖跺瓙鍕鹃�夋ā寮� =======------
+ expandAll() {
+ this.iExpandedKeys = this.allTreeKeys
+ },
+ closeAll() {
+ this.iExpandedKeys = []
+ },
+ checkALL() {
+ this.checkStriccheckStrictlytly = false
+ this.checkedKeys = this.allTreeKeys
+ },
+ cancelCheckALL() {
+ //this.checkedKeys = this.defaultCheckedKeys
+ this.checkedKeys = []
+ },
+ switchCheckStrictly(v) {
+ if (v == 1) {
+ this.checkStrictly = false
+ } else if (v == 2) {
+ this.checkStrictly = true
+ }
+ },
+ 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++) {
+ this.getAllKeys(node.children[a])
+ }
+ }
+ }
+ //---- author:os_chengtgen -- date:20190827 -- for:鍒囨崲鐖跺瓙鍕鹃�夋ā寮� =======------
+
+ },
+ created() {
+ this.currFlowId = this.$route.params.id
+ this.currFlowName = this.$route.params.name
+ // this.loadTree()
+ }
+
+ }
+</script>
+<style scoped>
+ .ant-card-body .table-operator {
+ margin: 15px;
+ }
+
+ .anty-form-btn {
+ width: 100%;
+ text-align: center;
+ }
+
+ .anty-form-btn button {
+ margin: 0 5px;
+ }
+
+ .anty-node-layout .ant-layout-header {
+ padding-right: 0
+ }
+
+ .header {
+ padding: 0 8px;
+ }
+
+ .header button {
+ margin: 0 3px
+ }
+
+ .ant-modal-cust-warp {
+ height: 100%
+ }
+
+ .ant-modal-cust-warp .ant-modal-body {
+ height: calc(100% - 110px) !important;
+ overflow-y: auto
+ }
+
+ .ant-modal-cust-warp .ant-modal-content {
+ height: 90% !important;
+ overflow-y: hidden
+ }
+
+ /** Button鎸夐挳闂磋窛 */
+ .ant-btn {
+ margin-left: 3px
+ }
+
+ .drawer-bottom-button {
+ /*position: absolute;*/
+ bottom: 0;
+ width: 100%;
+ border-top: 1px solid #e8e8e8;
+ padding: 10px 16px;
+ text-align: left;
+ left: 0;
+ background: #fff;
+ border-radius: 0 0 2px 2px;
+ }
+</style>
\ No newline at end of file
diff --git a/src/views/system/modules/ProductionManager/ProductionEquipment.vue b/src/views/system/modules/ProductionManager/ProductionEquipment.vue
new file mode 100644
index 0000000..6227bb9
--- /dev/null
+++ b/src/views/system/modules/ProductionManager/ProductionEquipment.vue
@@ -0,0 +1,331 @@
+<template>
+ <a-card :bordered="false">
+ <template v-if="this.productionId">
+ <div class="table-page-search-wrapper">
+ <a-form layout="inline" @keyup.enter.native="searchQuery">
+ <a-row :gutter="24">
+
+ <a-col :md="6" :sm="12">
+ <a-form-item label="璁惧缂栧彿">
+ <a-input placeholder="璇疯緭鍏ヨ澶囩紪鍙�" v-model="queryParam.equipmentId"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :md="6" :sm="8">
+ <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+ </a-col>
+ </a-row>
+ </a-form>
+ </div>
+ <div class="table-operator" style="border-top: 5px">
+ <a-dropdown v-if="selectedRowKeys.length > 0">
+ <a-menu slot="overlay" @click="handleMenuClick">
+ <a-menu-item key="1">
+ <a-icon type="delete" @click="batchDel"/>
+ 鎵归噺绉婚櫎
+ </a-menu-item>
+ </a-menu>
+ <a-button style="margin-left: 8px">
+ 鎵归噺鎿嶄綔
+ <a-icon type="down"/>
+ </a-button>
+ </a-dropdown>
+ </div>
+ <a-table
+ ref="table"
+ bordered
+ size="middle"
+ rowKey="id"
+ :scroll="{x: 500}"
+ :columns="columns"
+ :dataSource="dataSource"
+ :pagination="ipagination"
+ :loading="loading"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+ @change="handleTableChange">
+
+ <!--<template slot="avatarslot" slot-scope="text, record, index">-->
+ <!--<div class="anty-img-wrap">-->
+ <!--<a-avatar shape="square" :src="getAvatarView(record.avatar)" icon="user"/>-->
+ <!--</div>-->
+ <!--</template>-->
+
+ <span slot="action" slot-scope="text, record">
+ <a-popconfirm title="纭畾绉婚櫎鍚�?" @confirm="() => handleDelete(record.id)">
+ <a>绉婚櫎</a>
+ </a-popconfirm>
+ </span>
+ </a-table>
+ </template>
+ <a-card v-else :bordered="false" style="height:200px">
+ <a-empty>
+ <span slot="description"> 璇峰厛閫夋嫨涓�涓儴闂�! </span>
+ </a-empty>
+ </a-card>
+ </a-card>
+</template>
+
+<script>
+ import { filterObj } from '@/utils/util';
+ import {queryTreeListForRole,queryDepartPermission,saveDepartPermission} from '@/api/api'
+ import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+ import { getAction,postAction } from '@/api/manage'
+ import qs from 'qs'
+ export default {
+ name: 'ProductionEquipment',
+ mixins: [JeecgListMixin],
+ data(){
+ return {
+ queryParam:{},
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key:'rowIndex',
+ width:60,
+ align:"center",
+ customRender:function (t,r,index) {
+ return parseInt(index)+1;
+ }
+ },
+ {
+ title: '璁惧缂栧彿',
+ align: "center",
+ dataIndex: 'equipmentId',
+ width: 120,
+ // sorter: true
+ },
+ {
+ title: '璁惧鍚嶇О',
+ align: "center",
+ width: 150,
+ dataIndex: 'equipmentName',
+ },
+ {
+ title: '璁惧绫诲瀷',
+ align: "center",
+ width: 120,
+ dataIndex: 'equipmentType',
+ // scopedSlots: {customRender: "avatarslot"}
+ },
+
+ {
+ title: '椹卞姩绫诲瀷',
+ align: "center",
+ width: 80,
+ dataIndex: 'driveType',
+ // sorter: true
+ },
+
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ scopedSlots: {customRender: 'action'},
+ align: "center",
+ width: 120
+ }
+
+ ],
+ disableMixinCreated:true,
+ productionId:"",
+ title:"閮ㄩ棬鏉冮檺閰嶇疆",
+ visible: false,
+ loading: false,
+ url:{
+ list:'/mdc/mdcEquipment/equipmentListByProduction',
+ removeEquipmentForDepart:'/mdc/mdcEquipment/removeEquipmentForProduction',
+ serachEquipment:'/mdc/mdcEquipment/equipmentListByProduction',
+ removeEquipmentsForProduction:"/mdc/mdcEquipment/removeEquipmentsForProduction"
+ }
+ }
+ },
+ methods: {
+
+ show(productionId){
+ this.productionId=productionId
+ this.loadData();
+ },
+ close () {
+ this.reset()
+ this.$emit('close');
+ this.visible = false;
+ },
+ searchReset() {
+ this.queryParam = {}
+ this.loadData();
+ },
+ searchQuery() {
+ var id = this.queryParam.equipmentId
+ this.loading = true;
+ var params = this.getQueryParams();//鏌ヨ鏉′欢
+
+ params.pageNo = this.ipagination.current;
+ params.pageSize = this.ipagination.pageSize;
+ getAction(this.url.serachEquipment,{equipmentId:this.queryParam.equipmentId,productionId:this.productionId,pageNo:params.pageNo,pageSize:params.pageSize}).then((res)=>{
+ if (res.success) {
+ // console.log(res)
+ //update-begin---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
+ this.dataSource = res.result.records||res.result;
+ if(res.result.total)
+ {
+ this.ipagination.total = res.result.total;
+ }else{
+ this.ipagination.total = 0;
+ }
+ //update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
+ }else{
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+ }
+ }).finally(() => {
+ this.loading = false
+ })
+ },
+ handleTableChange(pagination, filters, sorter) {
+ //鍒嗛〉銆佹帓搴忋�佺瓫閫夊彉鍖栨椂瑙﹀彂
+ //TODO 绛涢��
+ // console.log(pagination)
+ if (Object.keys(sorter).length > 0) {
+ this.isorter.column = sorter.field;
+ this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
+ }
+ this.ipagination = pagination;
+ this.loadData();
+ },
+ loadData(){
+ //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
+ // if (arg === 1) {
+ // this.ipagination.current = 1;
+ // }
+ var params = this.getQueryParams();//鏌ヨ鏉′欢
+
+ params.pageNo = this.ipagination.current;
+ params.pageSize = this.ipagination.pageSize;
+ this.loading = true;
+ getAction(this.url.list,params).then((res)=>{
+ if (res.success) {
+ // console.log(res)
+ //update-begin---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
+ this.dataSource = res.result.records||res.result;
+ if(res.result.total)
+ {
+ this.ipagination.total = res.result.total;
+ }else{
+ this.ipagination.total = 0;
+ }
+ //update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
+ }else{
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+ }
+ }).finally(() => {
+ this.loading = false
+ })
+ },
+ getQueryParams() {
+ //鑾峰彇鏌ヨ鏉′欢
+ let sqp = {}
+ if(this.superQueryParams){
+ sqp['superQueryParams']=encodeURI(this.superQueryParams)
+ sqp['superQueryMatchType'] = this.superQueryMatchType
+ }
+ var param = Object.assign(sqp, this.queryParam, this.isorter ,this.filters);
+ param.field = this.getQueryField();
+ param.pageNo = this.ipagination.current;
+ param.pageSize = this.ipagination.pageSize;
+ param.productionId = this.productionId;
+ //鑾峰彇鐢ㄦ埛瀹氬埗鐨勫弬鏁板睘鎬�
+ if (this.getCustomQueryParams) {
+ param = this.getCustomQueryParams(param);
+ if(!param){
+ return false;
+ }
+ }
+
+ return filterObj(param);
+ },
+ handleDelete(equipmentId){
+
+ postAction(this.url.removeEquipmentForDepart,qs.stringify({productionId:this.productionId,equipmentId:equipmentId})).then((res)=>{
+ if (res.success) {
+ this.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ });
+ this.loadData(this.productionId);
+ }else{
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+ }
+ }).finally(() => {
+
+ })
+ },
+ handleMenuClick(e) {
+ if (e.key == 1) {
+ this.batchDel();
+ }
+ },
+ batchDel: function () {
+ if(!this.url.removeEquipmentsForProduction){
+ this.$message.error("璇疯缃畊rl.removeEquipmentsForProduction灞炴��!")
+ return
+ }
+ if (this.selectedRowKeys.length <= 0) {
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨涓�鏉¤褰�"
+ });
+ return;
+ } else {
+ var ids = "";
+ for (var a = 0; a < this.selectedRowKeys.length; a++) {
+ ids += this.selectedRowKeys[a] + ",";
+ }
+ var that = this;
+ this.$confirm({
+ title: "纭鍒犻櫎",
+ content: "鏄惁鍒犻櫎閫変腑鏁版嵁?",
+ onOk: function () {
+ that.loading = true;
+ postAction(that.url.removeEquipmentsForProduction,qs.stringify({productionId:that.productionId,equipmentIds:ids})).then((res) => {
+ if (res.success) {
+ //閲嶆柊璁＄畻鍒嗛〉闂
+ that.reCalculatePage(that.selectedRowKeys.length)
+ // that.$message.success(res.message);
+ this.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ });
+ that.loadData(that.productionId);
+ that.onClearSelected();
+ } else {
+ // that.$message.warning(res.message);
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+ }
+ }).finally(() => {
+ that.loading = false;
+ });
+ }
+ });
+ }
+ },
+ },
+ }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/system/modules/ProductionManager/ProductionModal.vue b/src/views/system/modules/ProductionManager/ProductionModal.vue
new file mode 100644
index 0000000..7c76baf
--- /dev/null
+++ b/src/views/system/modules/ProductionManager/ProductionModal.vue
@@ -0,0 +1,180 @@
+<template>
+ <a-modal
+ :title="title"
+ :width="800"
+ :ok=false
+ :visible="visible"
+ :confirmLoading="confirmLoading"
+ :okButtonProps="{ props: {disabled: disableSubmit} }"
+ @ok="handleOk"
+ @cancel="handleCancel"
+ cancelText="鍏抽棴">
+
+ <a-spin :spinning="confirmLoading">
+ <a-form-model ref="form" :model="model" :rules="validatorRules">
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="杞﹂棿缂栫爜"
+ prop="productionCode"
+ :hidden="false"
+ hasFeedback >
+ <a-input id="productionCode" placeholder="璇疯緭鍏ヤ骇绾�/杞﹂棿缂栧彿" v-model="model.productionCode"/>
+ </a-form-model-item>
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="杞﹂棿鍚嶇О"
+ prop="productionName"
+ :hidden="false"
+ hasFeedback >
+ <a-input id="departName" placeholder="璇疯緭鍏ヤ骇绾�/杞﹂棿鍚嶇О" v-model="model.productionName"/>
+ </a-form-model-item>
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" :hidden="seen" label="涓婄骇杞﹂棿" hasFeedback>
+ <a-tree-select
+ style="width:100%"
+ :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
+ :treeData="departTree"
+ v-model="model.parentId"
+ placeholder="璇烽�夋嫨涓婄骇杞﹂棿"
+ :disabled="condition">
+ </a-tree-select>
+ </a-form-model-item>
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="鎺掑簭">
+ <a-input-number v-model="model.productionOrder"/>
+ </a-form-model-item>
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ label="澶囨敞">
+ <a-textarea placeholder="璇疯緭鍏ュ娉�" v-model="model.memo"/>
+ </a-form-model-item>
+
+ </a-form-model>
+ </a-spin>
+ </a-modal>
+</template>
+
+<script>
+ import { httpAction } from '@/api/manage'
+ import { queryById } from '@/api/api'
+ import pick from 'lodash.pick'
+ export default {
+ name: "ProductionModal",
+ components: { },
+ data () {
+ return {
+ departTree:[],
+ orgTypeData:[],
+ phoneWarning:'',
+ departName:"",
+ title:"鎿嶄綔",
+ seen:false,
+ visible: false,
+ condition:true,
+ disableSubmit:false,
+ model: {},
+ menuhidden:false,
+ menuusing:true,
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 },
+ },
+
+ confirmLoading: false,
+ validatorRules:{
+ productionName:[{ required: true, message: '璇疯緭鍏ヤ骇绾�/杞﹂棿鍚嶇О!' }],
+ },
+ url: {
+ add: "/mdc/mdcProduction/add",
+ },
+ dictDisabled:true,
+ }
+ },
+ created () {
+ },
+ methods: {
+ loadTreeData(){
+ var that = this;
+ queryById().then((res)=>{
+ if(res.success){
+ that.departTree = [];
+ for (let i = 0; i < res.result.length; i++) {
+ let temp = res.result[i];
+ that.departTree.push(temp);
+ }
+ }
+
+ })
+ },
+ add (depart) {
+ if(depart){
+ this.seen = false;
+ this.dictDisabled = false;
+ }else{
+ this.seen = true;
+ this.dictDisabled = true;
+ }
+ this.edit(depart);
+ },
+ edit (record) {
+ this.visible = true;
+ this.model = Object.assign({}, this.defaultModel, record)
+ this.loadTreeData();
+ this.model.parentId = record!=null?record.toString():null;
+ },
+ close () {
+ this.$emit('close');
+ this.disableSubmit = false;
+ this.visible = false;
+ this.$refs.form.resetFields();
+ },
+ handleOk () {
+ const that = this;
+ // 瑙﹀彂琛ㄥ崟楠岃瘉
+ this.$refs.form.validate(valid => {
+ if (valid) {
+ that.confirmLoading = true;
+ httpAction(this.url.add,this.model,"post").then((res)=>{
+ if(res.success){
+ // that.$message.success(res.message);
+ that.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ });
+ that.loadTreeData();
+ that.$emit('ok');
+ }else{
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ that.close();
+ })
+
+ }else{
+ return false;
+ }
+ })
+ },
+ handleCancel () {
+ this.close()
+ },
+ }
+ }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
--
Gitblit v1.9.3