Skip to content

T
tianjin
Commit 7d6bcc71 authored by 李翠鸿's avatar 李翠鸿
Browse files
Options

MaterialWarehousing_Button

parent 5f1b70da
Hide whitespace changes
Inline Side-by-side
Showing with 167 additions and 9 deletions
src/components/public/TableMain.vue
View file @ 7d6bcc71
...@@ -7,11 +7,12 @@ ...@@ -7,11 +7,12 @@
--> -->
<template> <template>
<div class="table-container"> <div class="table-container">
<!-- :header-cell-style="[{background:(($store.state.color=='grey')?'#D9DBDE':'#5a6c98')},{color:(($store.state.color=='grey')?'#000':'#fff')}, {'border-left':'1px solid #cccccc',height:'50px',padding:'0'}]" -->
<el-table <el-table
:data="data" :data="data"
border border
highlight-current-row highlight-current-row
:header-cell-style="[{background:(($store.state.color=='grey')?'#D9DBDE':'#5a6c98')},{color:(($store.state.color=='grey')?'#000':'#fff')}, {'border-left':'1px solid #cccccc',height:'50px',padding:'0'}]" :header-cell-style="{background:(($store.state.color=='grey')?'#D9DBDE':'#5a6c98'),color:(($store.state.color=='grey')?'#000':'#fff'), 'border-left':'1px solid #cccccc',height:'50px',padding:'0'}"
row-class-name="high-light" row-class-name="high-light"
height="100%" height="100%"
width="100%" width="100%"
......
src/views/education/MaterialDelivery.vue
View file @ 7d6bcc71
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="box-container"> <div class="box-container">
<div class="wrap"> <div class="wrap">
<h1 class="page-title">物料出库管理</h1> <h1 class="page-title">物料出库管理</h1>
<search-form ref="form" :formList="[1,2,3]" :searchList="searchList" :btnList="[1,2]" :formData="formData" @scanGunCode="scanGunCode" @searchData="searchData" @openDialog="openDialog" @delData="delData" /> <search-form ref="form" :formList="[1,2,3]" :searchList="searchList" :btnList="[1,2,3]" :manualBtnText="manualBtnText" @changeManualBtn="changeManualBtn" :formData="formData" @scanGunCode="scanGunCode" @searchData="searchData" @openDialog="openDialog" @delData="delData" />
<el-table <el-table
border border
:height="$store.state.tableHeight" :height="$store.state.tableHeight"
...@@ -97,6 +97,7 @@ export default { ...@@ -97,6 +97,7 @@ export default {
components: { searchForm, storeDialog, deletePop, Pagination }, components: { searchForm, storeDialog, deletePop, Pagination },
data () { data () {
return { return {
manualBtnText:'手动',
tableData: [], tableData: [],
AllTableData: [], AllTableData: [],
cloneData: [], cloneData: [],
...@@ -154,8 +155,38 @@ export default { ...@@ -154,8 +155,38 @@ export default {
created() { created() {
this.searchData() this.searchData()
// this.scanGunCode() // this.scanGunCode()
this.getManualBtnData()
}, },
methods: { methods: {
changeManualBtn(){
this.$axios({
method:"post",
url:"/api/MaterialDelivery/MaterialDelivery_ButtonUP"
}).then(res=>{
if(res.data){
this.manualBtnText = res.data.data.Desc
}
}).catch(err=>{
console.log('err',err)
})
},
getManualBtnData(){
this.$axios({
method:"post",
url:"/api/MaterialDelivery/MaterialDelivery_Button"
}).then(res=>{
if(res.data){
// console.log(res.data.data)
this.manualBtnText = res.data.data.Desc
// console.log(this.manualBtnText)
}
}).catch(err=>{
console.log('err',err)
})
},
searchData () { searchData () {
var $this = this var $this = this
var postData = this.resetData() var postData = this.resetData()
......
src/views/education/MaterialWarehousingMoudle.vue
View file @ 7d6bcc71
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="box-container"> <div class="box-container">
<div class="wrap"> <div class="wrap">
<h1 class="page-title">物料入库管理</h1> <h1 class="page-title">物料入库管理</h1>
<search-form ref="form" :formList="[1,2,3]" :btnList="[1,2]" :searchList="searchList" :formData="formData" @scanGunCode="scanGunCode" @searchData="searchData" @openDialog="openDialog" @delData="delData" /> <search-form ref="form" :formList="[1,2,3]" :btnList="[1,2,3]" :manualBtnText="manualBtnText" @changeManualBtn="changeManualBtn" :searchList="searchList" :formData="formData" @scanGunCode="scanGunCode" @searchData="searchData" @openDialog="openDialog" @delData="delData" />
<el-table <el-table
border border
:height="$store.state.tableHeight" :height="$store.state.tableHeight"
...@@ -95,6 +95,7 @@ export default { ...@@ -95,6 +95,7 @@ export default {
components: { searchForm, storeDialog, deletePop, Pagination }, components: { searchForm, storeDialog, deletePop, Pagination },
data () { data () {
return { return {
manualBtnText:'手动',
tableData: [], tableData: [],
AllTableData: [], AllTableData: [],
cloneData: [], cloneData: [],
...@@ -151,8 +152,38 @@ export default { ...@@ -151,8 +152,38 @@ export default {
}, },
created() { created() {
this.searchData() this.searchData()
this.getManualBtnData()
}, },
methods: { methods: {
changeManualBtn(){
this.$axios({
method:"post",
url:"/api/MaterialWarehousing/MaterialWarehousing_ButtonUP"
}).then(res=>{
if(res.data){
this.manualBtnText = res.data.data.Desc
}
}).catch(err=>{
console.log('err',err)
})
},
getManualBtnData(){
this.$axios({
method:"post",
url:"/api/MaterialWarehousing/MaterialWarehousing_Button"
}).then(res=>{
if(res.data){
// console.log(res.data.data)
this.manualBtnText = res.data.data.Desc
// console.log(this.manualBtnText)
}
}).catch(err=>{
console.log('err',err)
})
},
searchData () { searchData () {
var $this = this var $this = this
var postData = this.resetData() var postData = this.resetData()
......
src/views/education/ProductDelivery.vue
View file @ 7d6bcc71
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="box-container"> <div class="box-container">
<div class="wrap"> <div class="wrap">
<h1 class="page-title">产品出库管理</h1> <h1 class="page-title">产品出库管理</h1>
<search-form ref="form" :formList="[1,2,3]" :btnList="[1,2]" :searchList="searchList" :formData="formData" @scanGunCode="scanGunCode" @searchData="searchData" @openDialog="openDialog" @delData="delData" /> <search-form ref="form" :formList="[1,2,3]" :btnList="[1,2,3]" :manualBtnText="manualBtnText" @changeManualBtn="changeManualBtn" :searchList="searchList" :formData="formData" @scanGunCode="scanGunCode" @searchData="searchData" @openDialog="openDialog" @delData="delData" />
<el-table <el-table
border border
:height="$store.state.tableHeight" :height="$store.state.tableHeight"
...@@ -97,6 +97,7 @@ export default { ...@@ -97,6 +97,7 @@ export default {
components: { searchForm, storeDialog, deletePop, Pagination }, components: { searchForm, storeDialog, deletePop, Pagination },
data () { data () {
return { return {
manualBtnText:'手动',
tableData: [], tableData: [],
AllTableData: [], AllTableData: [],
popShow: false, popShow: false,
...@@ -153,8 +154,38 @@ export default { ...@@ -153,8 +154,38 @@ export default {
}, },
created() { created() {
this.searchData() this.searchData()
this.getManualBtnData()
}, },
methods: { methods: {
changeManualBtn(){
this.$axios({
method:"post",
url:"/api/ProductDelivery/MaterialDelivery_ButtonUP"
}).then(res=>{
if(res.data){
this.manualBtnText = res.data.data.Desc
}
}).catch(err=>{
console.log('err',err)
})
},
getManualBtnData(){
this.$axios({
method:"post",
url:"/api/ProductDelivery/MaterialDelivery_Button"
}).then(res=>{
if(res.data){
// console.log(res.data.data)
this.manualBtnText = res.data.data.Desc
// console.log(this.manualBtnText)
}
}).catch(err=>{
console.log('err',err)
})
},
searchData () { searchData () {
var $this = this var $this = this
var postData = this.resetData() var postData = this.resetData()
......
src/views/education/ProductStorage.vue
View file @ 7d6bcc71
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="box-container"> <div class="box-container">
<div class="wrap"> <div class="wrap">
<h1 class="page-title">产品入库管理</h1> <h1 class="page-title">产品入库管理</h1>
<search-form ref="form" :formList="[1,2,3]" :btnList="[1,2]" :searchList="searchList" :formData="formData" @scanGunCode="scanGunCode" @searchData="searchData" @openDialog="openDialog" @delData="delData" /> <search-form ref="form" :formList="[1,2,3]" :btnList="[1,2,3]" :manualBtnText="manualBtnText" :searchList="searchList" :formData="formData" @changeManualBtn="changeManualBtn" @scanGunCode="scanGunCode" @searchData="searchData" @openDialog="openDialog" @delData="delData" />
<el-table <el-table
border border
ref="multipleTable" ref="multipleTable"
...@@ -97,6 +97,7 @@ export default { ...@@ -97,6 +97,7 @@ export default {
components: { searchForm, storeDialog, deletePop, Pagination }, components: { searchForm, storeDialog, deletePop, Pagination },
data () { data () {
return { return {
manualBtnText:'手动',
tableData: [], tableData: [],
AllTableData: [], AllTableData: [],
cloneData: [], cloneData: [],
...@@ -153,8 +154,38 @@ export default { ...@@ -153,8 +154,38 @@ export default {
}, },
created() { created() {
this.searchData() this.searchData()
this.getManualBtnData()
}, },
methods: { methods: {
changeManualBtn(){
this.$axios({
method:"post",
url:"/api/ProductStorage/MaterialStorage_ButtonUP"
}).then(res=>{
if(res.data){
this.manualBtnText = res.data.data.Desc
}
}).catch(err=>{
console.log('err',err)
})
},
getManualBtnData(){
this.$axios({
method:"post",
url:"/api/ProductStorage/MaterialStorage_Button"
}).then(res=>{
if(res.data){
// console.log(res.data.data)
this.manualBtnText = res.data.data.Desc
// console.log(this.manualBtnText)
}
}).catch(err=>{
console.log('err',err)
})
},
searchData () { searchData () {
var $this = this var $this = this
var postData = this.resetData() var postData = this.resetData()
......
src/views/education/component/SearchForm.vue
View file @ 7d6bcc71
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<div class="search-btn" @click="searchData" >查询</div> <div class="search-btn" @click="searchData" >查询</div>
<div class="search-block search-input" v-if="formList.includes(3)" style="width: 280px; margin-left: 20px"> <div class="search-block search-input" v-if="formList.includes(3)" style="width: 280px; margin-left: 20px">
<el-input type="text" ref="codeInput" placeholder="扫码前请点击" v-model="formData.scanValue" @keyup.enter.native="scanGunCode" ></el-input> <el-input :disabled="manualBtnText == '手动'" type="text" ref="codeInput" placeholder="扫码前请点击" v-model="formData.scanValue" @keyup.enter.native="scanGunCode" ></el-input>
</div> </div>
</div> </div>
...@@ -52,10 +52,14 @@ ...@@ -52,10 +52,14 @@
<span class="deText" >删除</span> <span class="deText" >删除</span>
<div class="deleteImg"></div> <div class="deleteImg"></div>
</div> </div>
<div class="add" @click="openDialog" v-if="btnList.includes(1)" > <div class="add" :class="{'disable':manualBtnText == '扫码'?true:false}" @click="openDialog" v-if="btnList.includes(1)" >
<span class="addText">添加</span> <span class="addText">添加</span>
<div class="addImg"></div> <div class="addImg"></div>
</div> </div>
<div @click="changeManualBtn" :style="{background:manualBtnText == '手动'?'#16BB39':'#4270e4'}" class="manual" v-if="btnList.includes(3)" >
<span class="addText">{{manualBtnText}}</span>
<!-- <div class="addImg"></div> -->
</div>
</div> </div>
</div> </div>
</template> </template>
...@@ -65,6 +69,10 @@ import moment from 'moment' ...@@ -65,6 +69,10 @@ import moment from 'moment'
export default { export default {
props: { props: {
manualBtnText:{
type: String,
default: ''
},
headText: { headText: {
type: String, type: String,
default: '查询条件' default: '查询条件'
...@@ -156,6 +164,9 @@ export default { ...@@ -156,6 +164,9 @@ export default {
}, },
openDialog () { openDialog () {
this.$emit('openDialog') this.$emit('openDialog')
},
changeManualBtn(){
this.$emit('changeManualBtn')
} }
} }
} }
...@@ -256,5 +267,26 @@ export default { ...@@ -256,5 +267,26 @@ export default {
background: url("../../../assets/images/icon_addfile.png"); background: url("../../../assets/images/icon_addfile.png");
background-size:cover ; background-size:cover ;
} }
.manual{
float: right;
line-height: 40px;
position: relative;
width:120px;
height:40px;
background:#16BB39;
// border:1px solid #16BB39;
border-radius:4px;
font-size:16px;
font-family:Microsoft YaHei;
font-weight:400;
color:#ffffff;
margin-right: 14px;
cursor: pointer;
user-select: none;
text-align:center
}
.disable {
pointer-events: none;
}
} }
</style> </style>
\ No newline at end of file
vue.config.js
View file @ 7d6bcc71
...@@ -34,7 +34,7 @@ module.exports = { ...@@ -34,7 +34,7 @@ module.exports = {
'/api': { '/api': {
//这里最好有一个 / //这里最好有一个 /
// 192.168.1.237 192.168.1.125 // 192.168.1.237 192.168.1.125
target: 'http://192.168.1.125:8803', // 后台接口域名 target: 'http://192.168.1.152:8803', // 后台接口域名
ws: true, //如果要代理 websockets，配置这个参数 ws: true, //如果要代理 websockets，配置这个参数
secure: false, // 如果是https接口，需要配置这个参数 secure: false, // 如果是https接口，需要配置这个参数
changeOrigin: true, //是否跨域 changeOrigin: true, //是否跨域
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment