From 2fa578a18ed9055f8cb9863a8a0f02977cfa8350 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期二, 19 十二月 2023 17:33:53 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/page/login/index.vue | 58 ++--
src/views/basic/location/index.vue | 21 +
vue.config.js | 7
src/views/technology/routing/routing-form.vue | 6
src/views/basic/post/post-form.vue | 1
src/const/crud/customerOrder/customerOrderForm.js | 56 ++--
src/views/basic/workstation/index.vue | 21 +
src/views/basic/factory/index.vue | 20 +
src/views/basic/shift/shift-form.vue | 1
src/views/basic/division/division-form.vue | 1
src/views/basic/company/company-form.vue | 1
src/views/basic/param/index.vue | 21 +
src/views/plan/productionschedul/index.vue | 10
src/views/basic/factory/factory-form.vue | 1
src/views/basic/part/index.vue | 27 +-
src/views/basic/staff/staff-form.vue | 1
src/views/technology/structure/single-structure-form.vue | 4
src/views/technology/operation/index.vue | 21 +
src/views/basic/warehouse/index.vue | 21 +
src/views/basic/shift/index.vue | 21 +
src/views/technology/structure/index.vue | 35 +--
src/views/basic/customizeparamtemplatetype/index.vue | 25 +
src/views/basic/location/location-form.vue | 4
src/views/basic/crew/crew-form.vue | 1
src/views/basic/template/index.vue | 24 +
src/page/index/sidebar/sidebarItem.vue | 2
src/views/plan/customerorder/index.vue | 1
src/views/basic/crew/index.vue | 41 ++-
src/views/basic/part/part-form.vue | 4
src/views/basic/post/index.vue | 20 +
src/views/basic/division/index.vue | 21 +
src/views/basic/staff/index.vue | 24 +
src/page/index/sidebar/index.vue | 13 +
src/views/basic/company/index.vue | 25 +
34 files changed, 332 insertions(+), 228 deletions(-)
diff --git a/src/const/crud/customerOrder/customerOrderForm.js b/src/const/crud/customerOrder/customerOrderForm.js
index 99d8a29..9fda846 100644
--- a/src/const/crud/customerOrder/customerOrderForm.js
+++ b/src/const/crud/customerOrder/customerOrderForm.js
@@ -39,30 +39,6 @@
minWidth: 200,
span: 24
}, {
- label: '闆朵欢瑙勬牸',
- prop: 'customerPartSpec',
- type: 'input',
- cell: true,
- minWidth: 200,
- span: 24
- }, {
- label: '鍒堕�犲睘鎬�',
- prop: 'manufactureAttr',
- cell: true,
- type: 'select',
- minWidth: 200,
- span: 24,
- dicData:[{
- label: '鏅��',
- value: 'N'
- },{
- label: '鏍峰搧',
- value: 'S'
- },{
- label: '鐮斿彂',
- value: 'D'
- }]
- }, {
label: '浜у搧鍚嶇О',
prop: 'productName',
cell: true,
@@ -70,13 +46,13 @@
minWidth: 200,
span: 24
}, {
- label: '闅跺睘鍝佺墝',
- prop: 'productType',
- cell: true,
+ label: '瑙勬牸鍨嬪彿',
+ prop: 'customerPartSpec',
type: 'input',
+ cell: true,
minWidth: 200,
span: 24
- }, {
+ }, {
label: '鍗曚綅',
prop: 'otcUnit',
slot: true,
@@ -95,6 +71,30 @@
span: 24,
rules:[{required:true,message:'绫诲瀷蹇呴』鏄暟瀛�',trigger:'blur'}]
}, {
+ label: '鍒堕�犲睘鎬�',
+ prop: 'manufactureAttr',
+ cell: true,
+ type: 'select',
+ minWidth: 200,
+ span: 24,
+ dicData:[{
+ label: '鏅��',
+ value: 'N'
+ },{
+ label: '鏍峰搧',
+ value: 'S'
+ },{
+ label: '鐮斿彂',
+ value: 'D'
+ }]
+ }, {
+ label: '闅跺睘鍝佺墝',
+ prop: 'productType',
+ cell: true,
+ type: 'input',
+ minWidth: 200,
+ span: 24
+ },{
label: '鏀惰揣鍦板潃',
prop: 'shippingAddress',
cell: true,
diff --git a/src/page/index/sidebar/index.vue b/src/page/index/sidebar/index.vue
index fce8399..35dc685 100644
--- a/src/page/index/sidebar/index.vue
+++ b/src/page/index/sidebar/index.vue
@@ -4,7 +4,7 @@
<el-scrollbar style="height:100%">
<div v-if="validatenull(menu)" class="avue-sidebar--tip">娌℃湁鍙戠幇鑿滃崟</div>
<el-menu :default-active="nowTagValue" :show-timeout="200" :collapse="keyCollapse" unique-opened mode="vertical">
- <sidebar-item :menu="menu" :screen="screen" :props="website.menu.props" :collapse="keyCollapse" first />
+ <sidebar-item :menu="filterMenu" :screen="screen" :props="website.menu.props" :collapse="keyCollapse" first />
</el-menu>
</el-scrollbar>
</div>
@@ -16,6 +16,10 @@
import sidebarItem from './sidebarItem'
export default {
name: 'Sidebar',
+ data(){
+ return {
+ }
+ },
inject: ["Index"],
components: { sidebarItem, logo },
created() {
@@ -23,10 +27,15 @@
},
computed: {
...mapGetters(['website', 'menu', 'tag', 'keyCollapse', 'screen']),
+ filterMenu: function(){
+ return this.menu.filter(ele=>{
+ return ele.children.length > 0
+ })
+ },
nowTagValue: function () {
return this.$router.$avueRouter.getValue(this.$route)
}
- }
+ },
}
</script>
diff --git a/src/page/index/sidebar/sidebarItem.vue b/src/page/index/sidebar/sidebarItem.vue
index 472745e..9a5c45b 100644
--- a/src/page/index/sidebar/sidebarItem.vue
+++ b/src/page/index/sidebar/sidebarItem.vue
@@ -25,7 +25,7 @@
<template v-for="(child,cindex) in item[childrenKey]">
<el-menu-item
v-if="validatenull(child[childrenKey])"
- :index="child[pathKey],cindex"
+ :index="child[pathKey]"
:class="{'is-active':vaildAvtive(child)}"
:key="child[labelKey]"
>
diff --git a/src/page/login/index.vue b/src/page/login/index.vue
index eaeeb30..0705f9d 100644
--- a/src/page/login/index.vue
+++ b/src/page/login/index.vue
@@ -74,35 +74,35 @@
created() {
this.getSysTitle()
},
- mounted() {
- const _that = this
- $.ajax({
- type: 'get',
- url: 'http://127.0.0.1:15211/LocalUnique',
- /* headers: {
- 'Content-Type': 'text/xml;charset=utf-8'
- }, */
- // data: requireData,
- success: function(response) {
- const resultData = JSON.parse(
- response
- .replace(/\r/g, '')
- .replace(/\n/g, '')
- .replace(/\s*/g, '')
- )
- const username = resultData[0].ID
- const password = resultData[0].Unique
- _that.$store
- .dispatch('LoginByMSL', { username: username, password: password })
- .then(() => {
- _that.$router.push({ path: _that.tagWel.value })
- })
- },
- error: function(XMLHttpRequest, textStatus, errorThrown) {
- console.error('璁块棶椹笂鑱婂嚭閿�')
- }
- })
- },
+ // mounted() {
+ // const _that = this
+ // $.ajax({
+ // type: 'get',
+ // url: 'http://127.0.0.1:15211/LocalUnique',
+ // /* headers: {
+ // 'Content-Type': 'text/xml;charset=utf-8'
+ // }, */
+ // // data: requireData,
+ // success: function(response) {
+ // const resultData = JSON.parse(
+ // response
+ // .replace(/\r/g, '')
+ // .replace(/\n/g, '')
+ // .replace(/\s*/g, '')
+ // )
+ // const username = resultData[0].ID
+ // const password = resultData[0].Unique
+ // _that.$store
+ // .dispatch('LoginByMSL', { username: username, password: password })
+ // .then(() => {
+ // _that.$router.push({ path: _that.tagWel.value })
+ // })
+ // },
+ // error: function(XMLHttpRequest, textStatus, errorThrown) {
+ // console.error('璁块棶椹笂鑱婂嚭閿�')
+ // }
+ // })
+ // },
computed: {
...mapGetters(['website', 'tagWel'])
},
diff --git a/src/views/basic/company/company-form.vue b/src/views/basic/company/company-form.vue
index ac6162b..f803fd6 100644
--- a/src/views/basic/company/company-form.vue
+++ b/src/views/basic/company/company-form.vue
@@ -377,6 +377,7 @@
this.$emit('refreshDataList')
})
}
+ this.isSubmit = false
} else {
this.isSubmit = false
}
diff --git a/src/views/basic/company/index.vue b/src/views/basic/company/index.vue
index 8ab14b4..c821434 100644
--- a/src/views/basic/company/index.vue
+++ b/src/views/basic/company/index.vue
@@ -11,7 +11,10 @@
:ajaxFun="ajaxFun"
ref="companyTable"
>
- <template #toolbar></template>
+ <template #toolbar>
+ <el-button type='primary' @click="addOrUpdateHandle"
+ v-if="permissions.basic_company_add">鏂板</el-button>
+ </template>
</ttable>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<table-form v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getData"></table-form>
@@ -73,13 +76,7 @@
{minWidth:'120',prop: "createTime",label:"鍒涘缓鏃堕棿",sort: true,isTrue:true,isSearch:true,searchInfoType:'datetimerange'},
],
- toolbar: [
- {
- text: '鏂板',
- type: 'primary',
- fun: this.addOrUpdateHandle
- }
- ],
+ toolbar: [],
operator:[
{
text: '鍒犻櫎',
@@ -109,6 +106,10 @@
},
methods: {
hello(){
+ if(!this.permissions.basic_company_copy){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
if(this.multipleSelection.length < 1){
this.$message.error("璇峰厛閫夋嫨瑕佸鍒剁殑鏁版嵁!")
return
@@ -123,6 +124,10 @@
},
// 鏂板 /淇敼
addOrUpdateHandle(row) {
+ if(!this.permissions.basic_company_edit && row.id!=null){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.addOrUpdateVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.init(row==null?null:row.id)
@@ -130,6 +135,10 @@
},
// 鍒犻櫎鍏徃淇℃伅
deleteHandle(row) {
+ if(!this.permissions.basic_company_del){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.$confirm('鏄惁纭鍒犻櫎鍏徃鍚嶄负:"'+row.companyName+'"', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
diff --git a/src/views/basic/crew/crew-form.vue b/src/views/basic/crew/crew-form.vue
index de33d0b..63d4488 100644
--- a/src/views/basic/crew/crew-form.vue
+++ b/src/views/basic/crew/crew-form.vue
@@ -90,6 +90,7 @@
this.$emit('refreshDataList')
})
}
+ this.isSubmit = false
} else {
this.isSubmit = false
}
diff --git a/src/views/basic/crew/index.vue b/src/views/basic/crew/index.vue
index a083b2c..8b281d4 100644
--- a/src/views/basic/crew/index.vue
+++ b/src/views/basic/crew/index.vue
@@ -12,7 +12,10 @@
:ajaxFun="ajaxFun"
ref="crewTable"
>
- <template #toolbar></template>
+ <template #toolbar>
+ <el-button type="primary" @click="addOrUpdateHandle"
+ v-if="permissions.basic_crew_add">鏂板</el-button>
+ </template>
</ttable>
</el-col>
<el-col :span="16">
@@ -25,7 +28,10 @@
:paramObj="paramObj"
ref="staffTable"
>
- <template #toolbar></template>
+ <template #toolbar>
+ <el-button type="primary" @click="addHandle"
+ v-if="permissions.basic_crew_person_add"></el-button>
+ </template>
</ttable>
</el-col>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
@@ -105,13 +111,7 @@
render: { fun: this.addOrUpdateHandle }
}
],
- toolbar: [
- {
- text: '鏂板',
- type: 'primary',
- fun: this.addOrUpdateHandle
- }
- ],
+ toolbar: [],
operator: [
{
text: '鍒犻櫎',
@@ -124,8 +124,8 @@
operatorConfig: {
fixed: 'right',
label: '鎿嶄綔',
- width: 100,
- minWidth: 100
+ width: 110,
+ minWidth: 110
}
},
crewId: null,
@@ -270,13 +270,7 @@
searchInfoType: 'text'
}
],
- toolbar: [
- {
- text: '娣诲姞',
- type: 'primary',
- fun: this.addHandle
- }
- ],
+ toolbar: [],
operator: [
{
text: '鍒犻櫎',
@@ -309,6 +303,9 @@
},
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
+ if(!this.permissions.basic_crew_edit && row.id!=null){
+ return
+ }
this.addOrUpdateVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.init(row == null ? null : row.id)
@@ -354,6 +351,10 @@
}
},
deleteStaff(row) {
+ if(!this.permissions.basic_crew_person_del){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
var newStaffList = []
newStaffList.push(row)
this.crewList = { id: this.crewId, staffList: newStaffList }
@@ -365,6 +366,10 @@
},
// 鍒犻櫎
deleteHandle(row) {
+ if(!this.permissions.basic_crew_del){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.$confirm('鏄惁纭鍒犻櫎鐝鍚嶇О涓猴細' + row.crewName, '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
diff --git a/src/views/basic/customizeparamtemplatetype/index.vue b/src/views/basic/customizeparamtemplatetype/index.vue
index 4d374ea..7882777 100644
--- a/src/views/basic/customizeparamtemplatetype/index.vue
+++ b/src/views/basic/customizeparamtemplatetype/index.vue
@@ -8,7 +8,10 @@
:ajaxFun="ajaxFun"
ref="paramTemplateTypeTable"
>
- <template #toolbar></template>
+ <template #toolbar>
+ <el-button type="primary" @click="addOrUpdateHandle"
+ v-if="permissions.basic_templatetyperelation_add">鏂板</el-button>
+ </template>
</ttable>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<table-form
@@ -24,6 +27,7 @@
import { remote } from '@/api/admin/dict'
import ttable from '@/views/common/ztt-table.vue'
import TableForm from './templatetype-form'
+import { mapGetters } from 'vuex'
export default {
data() {
@@ -87,13 +91,7 @@
searchInfoType: 'datetimerange'
}
],
- toolbar: [
- {
- text: '鏂板',
- type: 'primary',
- fun: this.addOrUpdateHandle
- }
- ],
+ toolbar: [],
operator: [
{
text: '鍒犻櫎',
@@ -113,6 +111,9 @@
dataTypeList: []
}
},
+ computed:{
+ ...mapGetters(['permissions'])
+ },
components: {
ttable,
TableForm
@@ -123,6 +124,10 @@
methods: {
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
+ if(!this.permissions.basic_templatetyperelation_edit && row.id!=null){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.addOrUpdateVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.init(row == null ? null : row.id)
@@ -130,6 +135,10 @@
},
// 鍒犻櫎
deleteHandle(row) {
+ if(!this.permissions.basic_templatetyperelation_del){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.$confirm('鏄惁纭鍒犻櫎绫诲瀷鍚嶇О涓�' + row.templateTypeName, '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
diff --git a/src/views/basic/division/division-form.vue b/src/views/basic/division/division-form.vue
index 43476c2..9f24fee 100644
--- a/src/views/basic/division/division-form.vue
+++ b/src/views/basic/division/division-form.vue
@@ -179,6 +179,7 @@
}
this.isSubmit = false
})
+ this.isSubmit = false
} else {
this.isSubmit = false
}
diff --git a/src/views/basic/division/index.vue b/src/views/basic/division/index.vue
index 2a86d74..2ed0999 100644
--- a/src/views/basic/division/index.vue
+++ b/src/views/basic/division/index.vue
@@ -11,7 +11,10 @@
:ajaxFun="ajaxFun"
ref="divisionTable"
>
- <template #toolbar></template>
+ <template #toolbar>
+ <el-button type="primary" @click="addOrUpdateHandle"
+ v-if="permissions.basic_division_add">鏂板</el-button>
+ </template>
</ttable>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<table-form
@@ -154,13 +157,7 @@
searchInfoType: 'text'
}
],
- toolbar: [
- {
- text: '鏂板',
- type: 'primary',
- fun: this.addOrUpdateHandle
- }
- ],
+ toolbar: [],
operator: [
{
text: '鍒犻櫎',
@@ -192,6 +189,10 @@
},
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
+ if(!this.permissions.basic_division_edit && row.id!=null){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.addOrUpdateVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.init(row == null ? null : row.id)
@@ -199,6 +200,10 @@
},
// 鍒犻櫎
deleteHandle(row) {
+ if(!this.permissions.basic_division_del){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.$confirm('鏄惁纭鍒犻櫎閮ㄩ棬鍚嶇О涓猴細' + row.divisionName, '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
diff --git a/src/views/basic/factory/factory-form.vue b/src/views/basic/factory/factory-form.vue
index 41374ac..328fa53 100644
--- a/src/views/basic/factory/factory-form.vue
+++ b/src/views/basic/factory/factory-form.vue
@@ -171,6 +171,7 @@
}
this.isSubmit = false
})
+ this.isSubmit = false
} else {
this.isSubmit = false
}
diff --git a/src/views/basic/factory/index.vue b/src/views/basic/factory/index.vue
index d5d4b83..8405e47 100644
--- a/src/views/basic/factory/index.vue
+++ b/src/views/basic/factory/index.vue
@@ -11,7 +11,10 @@
:ajaxFun="ajaxFun"
ref="factoryTable"
>
- <template #toolbar></template>
+ <template #toolbar>
+ <el-button type="primary" @click="addOrUpdateHandle"
+ v-if="permissions.basic_factory_add">鏂板</el-button>
+ </template>
</ttable>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<table-form
@@ -146,13 +149,7 @@
searchInfoType: 'text'
}
],
- toolbar: [
- {
- text: '鏂板',
- type: 'primary',
- fun: this.addOrUpdateHandle
- }
- ],
+ toolbar: [],
operator: [
{
text: '鍒犻櫎',
@@ -184,6 +181,9 @@
},
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
+ if(!this.permissions.basic_factory_edit && row.id!=null){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ }
this.addOrUpdateVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.init(row == null ? null : row.id)
@@ -191,6 +191,10 @@
},
// 鍒犻櫎
deleteHandle(row) {
+ if(!this.permissions.basic_factory_del){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.$confirm('鏄惁纭鍒犻櫎宸ュ巶鍚嶇О涓猴細' + row.factoryName, '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
diff --git a/src/views/basic/location/index.vue b/src/views/basic/location/index.vue
index e102c95..fecfaa3 100644
--- a/src/views/basic/location/index.vue
+++ b/src/views/basic/location/index.vue
@@ -11,7 +11,10 @@
:ajaxFun="ajaxFun"
ref="locationTable"
>
- <template #toolbar></template>
+ <template #toolbar>
+ <el-button type="primary" @click="addOrUpdateHandle"
+ v-if="permissions.basic_location_add">鏂板</el-button>
+ </template>
</ttable>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<table-form
@@ -206,13 +209,7 @@
searchInfoType: 'text'
} */
],
- toolbar: [
- {
- text: '鏂板',
- type: 'primary',
- fun: this.addOrUpdateHandle
- }
- ],
+ toolbar: [],
operator: [
{
text: '鍒犻櫎',
@@ -351,6 +348,10 @@
},
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
+ if(!this.permissions.basic_location_edit && row.id!=null){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.addOrUpdateVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.init(row == null ? null : row.id)
@@ -358,6 +359,10 @@
},
// 鍒犻櫎
deleteHandle(row) {
+ if(!this.permissions.basic_location_del){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.$confirm('鏄惁纭鍒犻櫎搴撲綅鍙蜂负' + row.locNo, '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
diff --git a/src/views/basic/location/location-form.vue b/src/views/basic/location/location-form.vue
index 26c0b1c..a63ba17 100644
--- a/src/views/basic/location/location-form.vue
+++ b/src/views/basic/location/location-form.vue
@@ -31,14 +31,14 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="鐖惰妭鐐圭被鍨�" prop="pType">
<el-input
v-model="dataForm.pType"
placeholder="鐖惰妭鐐圭被鍨�"
></el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
<el-row>
<el-col :span="12">
diff --git a/src/views/basic/param/index.vue b/src/views/basic/param/index.vue
index 071af0d..12f1ce7 100644
--- a/src/views/basic/param/index.vue
+++ b/src/views/basic/param/index.vue
@@ -10,7 +10,10 @@
:ajaxFun="ajaxFun"
ref="paramTable"
>
- <template #toolbar></template>
+ <template #toolbar>
+ <el-button type="primary" @click="addOrUpdateHandle"
+ v-if="permissions.technology_param_add">鏂板</el-button>
+ </template>
</ttable>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<table-form
@@ -148,13 +151,7 @@
searchInfoType: 'datetimerange'
}
],
- toolbar: [
- {
- text: '鏂板',
- type: 'primary',
- fun: this.addOrUpdateHandle
- }
- ],
+ toolbar: [],
operator: [
{
text: '鍒犻櫎',
@@ -191,6 +188,10 @@
},
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
+ if(!this.permissions.technology_param_edit && row.id!=null){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.addOrUpdateVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.init(row == null ? null : row.id)
@@ -218,6 +219,10 @@
},
// 鍒犻櫎
deleteHandle(row) {
+ if(!this.permissions.technology_param_del){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.$confirm('鏄惁纭鍒犻櫎缂栧彿涓�' + row.code, '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
diff --git a/src/views/basic/part/index.vue b/src/views/basic/part/index.vue
index 7da5a07..ea71043 100644
--- a/src/views/basic/part/index.vue
+++ b/src/views/basic/part/index.vue
@@ -12,7 +12,12 @@
:ajaxFun="ajaxFun"
ref="partTable"
>
- <template #toolbar></template>
+ <template #toolbar>
+ <el-button type="primary" @click="addOrUpdateHandle"
+ v-if="permissions.basic_part_add">鏂板</el-button>
+ <el-button type="primary" @click="() => (this.syncDateVisible = true)"
+ v-if="permissions.basic_part_mdm">鍚屾MDM</el-button>
+ </template>
</ttable>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<table-form
@@ -392,17 +397,6 @@
} */
],
toolbar: [
- {
- text: '鏂板',
- type: 'primary',
- fun: this.addOrUpdateHandle
- },
- {
- text: '鍚屾MDM',
- type: 'primary',
- fun: () => (this.syncDateVisible = true),
- loading: false
- }
// {
// text: '澶ф爣绛�',
// type: 'primary',
@@ -447,6 +441,7 @@
PrintLabelForm
},
created() {
+ this.uploadInfo.isShow = this.permissions.basic_part_upload
this.table.column.find((e) => e.label === 'IFS鍚敤鎵规绠＄悊').isTrue = false
this.table.column.find((e) => e.label === '璁″垝鏂规硶').isTrue = false
this.getCategoryType('category')
@@ -470,6 +465,10 @@
},
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
+ if(!this.permissions.basic_part_edit && row.id!=null){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.addOrUpdateVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.init(row == null ? null : row.id)
@@ -477,6 +476,10 @@
},
// 鍒犻櫎
deleteHandle(row) {
+ if(!this.permissions.basic_part_del){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.$confirm('鏄惁纭闆朵欢鍚嶄负:' + row.partName, '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
diff --git a/src/views/basic/part/part-form.vue b/src/views/basic/part/part-form.vue
index 72fb943..39c8942 100644
--- a/src/views/basic/part/part-form.vue
+++ b/src/views/basic/part/part-form.vue
@@ -31,6 +31,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="鍚嶇О" prop="partName">
+ <el-tooltip class="item" effect="dark" :content="dataForm.partName" >
<el-input
v-model="dataForm.partName"
placeholder="闆朵欢鍚嶇О"
@@ -42,6 +43,7 @@
@click="openPartDialog()"
></el-button> -->
</el-input>
+ </el-tooltip>
</el-form-item>
</el-col>
</el-row>
@@ -362,10 +364,12 @@
<el-row>
<el-col :span="12">
<el-form-item label="澶囨敞" prop="description">
+ <el-tooltip class="item" effect="dark" :content="dataForm.description" >
<el-input
v-model="dataForm.description"
placeholder="澶囨敞"
></el-input>
+ </el-tooltip>
</el-form-item>
</el-col>
</el-row>
diff --git a/src/views/basic/post/index.vue b/src/views/basic/post/index.vue
index 8ca0d4a..ec6a4f9 100644
--- a/src/views/basic/post/index.vue
+++ b/src/views/basic/post/index.vue
@@ -13,7 +13,10 @@
:ajaxFun="ajaxFun"
ref="partFamilyTable"
>
- <template #toolbar></template>
+ <template #toolbar>
+ <el-button @click="addOrUpdateHandle" type="primary"
+ v-if="permissions.basic_post_add">鏂板</el-button>
+ </template>
</ttable>
</el-col>
<el-col :span="12" style="padding-left: 10px">
@@ -115,13 +118,7 @@
searchInfoType: 'text'
}
],
- toolbar: [
- {
- text: '鏂板',
- type: 'primary',
- fun: this.addOrUpdateHandle
- }
- ],
+ toolbar: [],
operator: [
{
text: '鍒犻櫎',
@@ -212,6 +209,9 @@
},
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
+ if(!this.permissions.basic_post_edit && row.id!=null){
+ return
+ }
this.addOrUpdateVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.init(row == null ? null : row.id)
@@ -219,6 +219,10 @@
},
// 鍒犻櫎
deleteHandle(row) {
+ if(!this.permissions.basic_staff_del){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.$confirm('鏄惁纭鍒犻櫎缂栧彿涓�' + row.postNo, '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
diff --git a/src/views/basic/post/post-form.vue b/src/views/basic/post/post-form.vue
index 846d0be..2f9055e 100644
--- a/src/views/basic/post/post-form.vue
+++ b/src/views/basic/post/post-form.vue
@@ -101,6 +101,7 @@
this.$emit('refreshDataList')
})
}
+ this.isSubmit = false
} else {
this.isSubmit = false
}
diff --git a/src/views/basic/shift/index.vue b/src/views/basic/shift/index.vue
index 5dd38bd..447367d 100644
--- a/src/views/basic/shift/index.vue
+++ b/src/views/basic/shift/index.vue
@@ -11,7 +11,10 @@
:ajaxFun="ajaxFun"
ref="shiftTable"
>
- <template #toolbar></template>
+ <template #toolbar>
+ <el-button type="primary" @click="addOrUpdateHandle"
+ v-if="permissions.basic_shift_add">鏂板</el-button>
+ </template>
</ttable>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<table-form v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getData"></table-form>
@@ -58,13 +61,7 @@
column: [
{minWidth:'140',prop:"name",label:"鐝",sort: true,isTrue:true,isSearch:true,searchInfoType:'text',render:{fun:this.addOrUpdateHandle}}
],
- toolbar: [
- {
- text: '鏂板',
- type: 'primary',
- fun: this.addOrUpdateHandle
- }
- ],
+ toolbar: [],
operator: [
{
text: '鍒犻櫎',
@@ -97,6 +94,10 @@
},
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
+ if(!this.permissions.basic_shift_edit && row.id!=null){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.addOrUpdateVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.init(row == null ? null : row.id)
@@ -104,6 +105,10 @@
},
// 鍒犻櫎
deleteHandle(row) {
+ if(!this.permissions.basic_shift_del){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.$confirm('鏄惁纭鍒犻櫎鐝鍚嶇О涓猴細' + row.name, '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
diff --git a/src/views/basic/shift/shift-form.vue b/src/views/basic/shift/shift-form.vue
index be46727..5f14b80 100644
--- a/src/views/basic/shift/shift-form.vue
+++ b/src/views/basic/shift/shift-form.vue
@@ -366,6 +366,7 @@
this.$emit('refreshDataList')
})
}
+ this.isSubmit = false
} else {
this.isSubmit = false
}
diff --git a/src/views/basic/staff/index.vue b/src/views/basic/staff/index.vue
index d9ad232..981b800 100644
--- a/src/views/basic/staff/index.vue
+++ b/src/views/basic/staff/index.vue
@@ -10,7 +10,10 @@
:ajaxFun="ajaxFun"
ref="staffTable"
>
- <template #toolbar></template>
+ <template #toolbar>
+ <el-button type="primary" @click="addOrUpdateHandle"
+ v-if="permissions.basic_staff_add">鏂板</el-button>
+ </template>
</ttable>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<table-form
@@ -207,13 +210,7 @@
searchInfoType: 'text'
}
],
- toolbar: [
- {
- text: '鏂板',
- type: 'primary',
- fun: this.addOrUpdateHandle
- }
- ],
+ toolbar: [],
operator: [
{
text: '鍒犻櫎',
@@ -237,7 +234,7 @@
ttable
},
computed: {
- ...mapGetters(['permissions'])
+ ...mapGetters(['permissions']),
},
methods: {
// 鑾峰彇鏁版嵁鍒楄〃
@@ -246,6 +243,10 @@
},
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
+ if(!this.permissions.basic_staff_edit && row.id!=null){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.addOrUpdateVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.init(row == null ? null : row.id)
@@ -253,6 +254,10 @@
},
// 鍒犻櫎
deleteHandle(row) {
+ if(!this.permissions.basic_staff_del){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.$confirm('鏄惁纭鍒犻櫎浜哄憳鍚嶇О涓猴細' + row.staffName, '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -284,6 +289,7 @@
}
},
created() {
+ this.uploadInfo.isShow = this.permissions.basic_staff_upload
this.initPersonNatureSelect()
}
}
diff --git a/src/views/basic/staff/staff-form.vue b/src/views/basic/staff/staff-form.vue
index 411fdf5..6abcaef 100644
--- a/src/views/basic/staff/staff-form.vue
+++ b/src/views/basic/staff/staff-form.vue
@@ -248,6 +248,7 @@
}
this.isSubmit = false
})
+ this.isSubmit = false
} else {
this.isSubmit = false
}
diff --git a/src/views/basic/template/index.vue b/src/views/basic/template/index.vue
index 22996f0..8f1de0a 100644
--- a/src/views/basic/template/index.vue
+++ b/src/views/basic/template/index.vue
@@ -12,7 +12,10 @@
:ajaxFun="ajaxFun"
ref="templateTable"
>
- <template #toolbar></template>
+ <template #toolbar>
+ <el-button type="primary" @click="addOrUpdateHandle"
+ v-if="permissions.technology_operationtemplate_add">鏂板</el-button>
+ </template>
</ttable>
</el-col>
<el-col :span="12" style="padding-left: 10px">
@@ -26,6 +29,7 @@
<el-button
style="float: right; padding: 3px 0"
type="text"
+ v-if="permissions.technology_operationtemplate_param_add"
@click="relateOperationParam()"
>娣诲姞</el-button
>
@@ -107,7 +111,8 @@
<el-table-column label="鍗曚綅" prop="unit" align="center">
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center">
+ <el-table-column label="鎿嶄綔" align="center"
+ v-if="permissions.technology_operationtemplate_param_edit">
<template slot-scope="scope">
<el-button
type="text"
@@ -261,13 +266,7 @@
searchInfoType: 'text'
}
],
- toolbar: [
- {
- text: '鏂板',
- type: 'primary',
- fun: this.addOrUpdateHandle
- }
- ],
+ toolbar: [],
operator: [
{
text: '鍒犻櫎',
@@ -306,6 +305,9 @@
},
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
+ if(!this.permissions.technology_operationtemplate_edit && row.id!=null){
+ return
+ }
this.addOrUpdateVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.init(row == null ? null : row.id)
@@ -430,6 +432,10 @@
},
// 鍒犻櫎
deleteHandle(row) {
+ if(!this.permissions.technology_operationtemplate_del){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.$confirm('鏄惁纭鍒犻櫎妯℃澘缂栧彿涓�' + row.templateNo, '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
diff --git a/src/views/basic/warehouse/index.vue b/src/views/basic/warehouse/index.vue
index c2d706c..65c2b6f 100644
--- a/src/views/basic/warehouse/index.vue
+++ b/src/views/basic/warehouse/index.vue
@@ -11,7 +11,10 @@
:ajaxFun="ajaxFun"
ref="wareHouseTable"
>
- <template #toolbar></template>
+ <template #toolbar>
+ <el-button type="primary" @click="addOrUpdateHandle"
+ v-if="permissions.basic_warehouse_add">鏂板</el-button>
+ </template>
</ttable>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<table-form
@@ -177,13 +180,7 @@
searchInfoType: 'datetimerange'
}
],
- toolbar: [
- {
- text: '鏂板',
- type: 'primary',
- fun: this.addOrUpdateHandle
- }
- ],
+ toolbar: [],
operator: [
{
text: '鍒犻櫎',
@@ -259,6 +256,10 @@
},
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
+ if(!this.permissions.basic_warehouse_edit && row.id!=null){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.addOrUpdateVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.init(row == null ? null : row.id)
@@ -266,6 +267,10 @@
},
// 鍒犻櫎
deleteHandle(row) {
+ if(!this.permissions.basic_warehouse_del){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.$confirm('鏄惁纭鍒犻櫎浠撳簱鍚嶇О涓�' + row.warehouseName, '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
diff --git a/src/views/basic/workstation/index.vue b/src/views/basic/workstation/index.vue
index c038c4c..cc84dcf 100644
--- a/src/views/basic/workstation/index.vue
+++ b/src/views/basic/workstation/index.vue
@@ -10,7 +10,10 @@
:ajaxFun="ajaxFun"
ref="workstationTable"
>
- <template #toolbar></template>
+ <template #toolbar>
+ <el-button type="primary" @click="addOrUpdateHandle"
+ v-if="permissions.basic_workstation_add">鏂板</el-button>
+ </template>
</ttable>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<table-form
@@ -121,13 +124,7 @@
searchInfoType: 'text'
}
],
- toolbar: [
- {
- text: '鏂板',
- type: 'primary',
- fun: this.addOrUpdateHandle
- }
- ],
+ toolbar: [],
operator: [
{
text: '鍒犻櫎',
@@ -188,6 +185,10 @@
},
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
+ if(!this.permissions.basic_workstation_edit && row.id!=null){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.addOrUpdateVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.init(row == null ? null : row.id)
@@ -195,6 +196,10 @@
},
// 鍒犻櫎宸ヤ綔绔欑偣
deleteHandle(row) {
+ if(!this.permissions.basic_workstation_del){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.$confirm('鏄惁纭鍒犻櫎宸ヤ綔绔欎负' + row.name, '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index 061bfc5..159596c 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -414,7 +414,6 @@
width: '100px',
prop: 'contractNo',
label: '鍚堝悓缂栧彿',
- sort: true,
isTrue: true,
isSearch: true,
searchInfoType: 'text',
diff --git a/src/views/plan/productionschedul/index.vue b/src/views/plan/productionschedul/index.vue
index 2ae8a2b..72fd3d4 100644
--- a/src/views/plan/productionschedul/index.vue
+++ b/src/views/plan/productionschedul/index.vue
@@ -165,6 +165,10 @@
pagerCount: 5
},
option: {
+ defaultSort:{
+ prop:'id',
+ order:'descending'
+ },
height: 400,
selection: true,
columnBtn: false,
@@ -305,11 +309,11 @@
this.loading = true
this.getData()
this.getParamType()
- this.rowSort()
+ // this.rowSort()
this.rowCalc()
},
beforeUpdate() {
- this.rowSort()
+ // this.rowSort()
this.rowCalc()
},
watch:{
@@ -513,7 +517,7 @@
ele.span = this.rowSpan(ele.prop, parent)
})
},
- rowSort(list) {
+ rowSort() {
let propList = this.spanArr.map(ele => ele.prop)
this.spanArr.forEach((ele, index) => {
let key = ele.prop
diff --git a/src/views/technology/operation/index.vue b/src/views/technology/operation/index.vue
index 70e46eb..ec5239e 100644
--- a/src/views/technology/operation/index.vue
+++ b/src/views/technology/operation/index.vue
@@ -10,7 +10,10 @@
:ajaxFun="ajaxFun"
ref="operationTable"
>
- <template #toolbar></template>
+ <template #toolbar>
+ <el-button type="primary" @click="addOrUpdateHandle"
+ v-if="permissions.technology_operation_add">鏂板</el-button>
+ </template>
</ttable>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<table-form
@@ -220,13 +223,7 @@
searchInfoType: 'datetimerange'
}
],
- toolbar: [
- {
- text: '鏂板',
- type: 'primary',
- fun: this.addOrUpdateHandle
- }
- ],
+ toolbar: [],
operator: [
{
text: '鍒犻櫎',
@@ -271,6 +268,10 @@
},
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
+ if(!this.permissions.technology_operation_edit && row.id!=null){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.$router.push({
name: 'operationForm',
params: { id: row == null ? null : row.id }
@@ -278,6 +279,10 @@
},
// 鍒犻櫎
deleteHandle(row) {
+ if(!this.permissions.technology_operation_del){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.$confirm('鏄惁纭鍒犻櫎缂栧彿涓�' + row.operationNo, '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
diff --git a/src/views/technology/routing/routing-form.vue b/src/views/technology/routing/routing-form.vue
index 2fda547..a2b260e 100644
--- a/src/views/technology/routing/routing-form.vue
+++ b/src/views/technology/routing/routing-form.vue
@@ -657,7 +657,8 @@
typeOptions: [],
paramTemplateSelArr: [],
paramTemplateSelCol: 'operationTemplateNo',
- templateDefaultObj: { dataType: '鐢熶骇瑕佹眰' },
+ // templateDefaultObj: { dataType: '鐢熶骇瑕佹眰' },
+ templateDefaultObj: {},
paramSelArr: [],
paramSelCol: 'code',
operationIndex: null,
@@ -681,6 +682,7 @@
routingNo: null,
name: null,
partId: null,
+ partNo: null,
partName: null,
description: null,
state: null,
@@ -700,7 +702,7 @@
dataRule: {
partNo: [
{ required: true, message: '闆朵欢涓嶈兘涓虹┖', trigger: 'blur' }
- ],
+ ],
bomTypeDb: [
{ required: true, message: '宸ヨ壓绫诲瀷涓嶈兘涓虹┖', trigger: 'change' }
],
diff --git a/src/views/technology/structure/index.vue b/src/views/technology/structure/index.vue
index 53ae977..17fed50 100644
--- a/src/views/technology/structure/index.vue
+++ b/src/views/technology/structure/index.vue
@@ -13,13 +13,13 @@
ref="structureTable"
>
<template #toolbar>
- <!-- <el-button type="primary" :loading="ifsSynsLoading" @click="syncIfs"
- >ERP鍚屾</el-button
- > -->
+ <el-button type="primary" @click="addOrUpdateHandle"
+ v-if="permissions.technology_structure_add">鏂板</el-button>
+ <el-button type="primary" @click="copyStructure"
+ v-if="permissions.technology_structure_copy">澶嶅埗</el-button>
</template>
</ttable>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
- <!--<table-form v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getData"></table-form>-->
<el-dialog
title="瀵煎叆"
:visible.sync="importStructureVisible"
@@ -230,22 +230,7 @@
noShowTip: false
}
],
- toolbar: [
- {
- text: '鏂板',
- // icon: 'el-icon-plus',
- type: 'primary',
- fun: this.addOrUpdateHandle,
- disabled: false,
- permitArr: []
- },
- {
- text: '澶嶅埗',
- fun: this.copyStructure,
- disabled: false,
- permitArr: []
- }
- ],
+ toolbar: [],
operator: [
{
text: '鍒犻櫎',
@@ -313,6 +298,7 @@
this.getData()
},
created() {
+ this.uploadInfo.isShow = this.permissions.technology_structure_upload
this.table.column.find((e) => e.label === '宸插悓姝ヨ嚦ERP').isTrue = false
this.getBomTypeDbOptions()
},
@@ -332,14 +318,21 @@
},
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
+ if(!this.permissions.technology_structure_edit && row.id!=null){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.$router.push({
name: 'singleStructureForm',
params: { id: row == null ? null : row.id }
})
- // this.$router.push({name:"structureForm",query:{id:row==null?null:row.id}})
},
// 鍒犻櫎
deleteHandle(row) {
+ if(!this.permissions.technology_structure_del){
+ this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
+ return
+ }
this.$confirm('鏄惁纭鍒犻櫎ID涓�' + row.id, '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
diff --git a/src/views/technology/structure/single-structure-form.vue b/src/views/technology/structure/single-structure-form.vue
index 813347d..5e105b8 100644
--- a/src/views/technology/structure/single-structure-form.vue
+++ b/src/views/technology/structure/single-structure-form.vue
@@ -39,13 +39,15 @@
</el-input>
</el-form-item>
<el-form-item label="闆朵欢鍚嶇О" prop="partName">
+ <el-tooltip class="item" effect="dark" :content="dataForm.partName" >
<el-input
v-model="dataForm.partName"
placeholder="闆朵欢鍚嶇О"
- style="width: 150px"
+ style="width: 100%"
:readonly="true"
>
</el-input>
+ </el-tooltip>
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
<el-input
diff --git a/vue.config.js b/vue.config.js
index ba71dea..8c628af 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -7,10 +7,13 @@
const url = 'http://192.168.2.7:9999'
// const url = 'http://192.168.32.45:9999'
-
+// const url = 'http://192.168.2.7:9999'
+const url = 'http://192.168.32.45:9999'
+//const url = 'http://192.168.2.7:9999'
+//const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.0.23:9999'
-// const url = 'http://localhost:9999'
+const url = 'http://localhost:9999'
const localUrl = 'http://localhost:8089'
--
Gitblit v1.9.3