Skip to content

T
tianjin
Commit 448cfd1f authored by 徐来柯's avatar 徐来柯
Browse files
Options

update 产品管理 api对接

parent 9ef08298
Show whitespace changes
Inline Side-by-side
Showing with 129 additions and 39 deletions
src/views/education/component/BomPop.vue
View file @ 448cfd1f
...@@ -61,6 +61,12 @@ ...@@ -61,6 +61,12 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.Quantity" placeholder="请输入内容"></el-input> <el-input v-model="scope.row.Quantity" placeholder="请输入内容"></el-input>
</template> </template>
</el-table-column>
<el-table-column
prop="Prounit"
label="单位"
:show-overflow-tooltip="true"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="操作"> label="操作">
...@@ -144,13 +150,13 @@ export default { ...@@ -144,13 +150,13 @@ export default {
url:`/api/Product/Product_WindowBomQuery?argID=${this.id}`, url:`/api/Product/Product_WindowBomQuery?argID=${this.id}`,
}).then((res)=>{ }).then((res)=>{
this.tableData = res.data.data this.tableData = res.data.data
console.log('bomRes==>',this.tableData)
}).catch(function(err){ }).catch(function(err){
console.log('err',err) console.log('err',err)
}) })
}, },
//添加值 //添加值
dataFun(data){ dataFun(data){
debugger
for(let i=0;i<this.tableData.length;i++){ for(let i=0;i<this.tableData.length;i++){
if(this.tableData[i].BomInfo.ID == data.BomID){ if(this.tableData[i].BomInfo.ID == data.BomID){
this.tableData[i].BomMaterielInfos.push(data) this.tableData[i].BomMaterielInfos.push(data)
......
src/views/education/component/head.vue
View file @ 448cfd1f
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
</div> </div>
<div v-if="type==='10' || type=== '11' || type === '12' || type === '8'" class="select"> <div v-if="type==='10' || type=== '11' || type === '12' || type === '8'" class="select">
<span>查询条件: </span> <span>查询条件: </span>
<el-select class="selectName" v-model="value" placeholder="请选择"> <el-select class="selectName" v-model="argWhere" placeholder="请选择">
<el-option <el-option
v-for="item in productNameArr" v-for="item in productNameArr"
:key="item.name" :key="item.name"
:label="item.name" :label="item.id"
:value="item.name"> :value="item.name">
</el-option> </el-option>
</el-select> </el-select>
...@@ -42,7 +42,10 @@ ...@@ -42,7 +42,10 @@
<div class="input"> <div class="input">
<el-input type="text" @input="inputchargeFun()" v-model="input" :placeholder="placeText"></el-input> <el-input type="text" @input="inputchargeFun()" v-model="input" :placeholder="placeText"></el-input>
</div> </div>
<div class="bottom" @click="query()">查询</div> <div>
<div v-if="type=== '10'" class="bottom" @click="searchQuery" >查询</div>
<div class="bottom" v-else @click="query()">查询</div>
</div>
<div v-if="type == 9" class="add xy"> <div v-if="type == 9" class="add xy">
<span class="addText">导入</span> <span class="addText">导入</span>
</div> </div>
...@@ -81,6 +84,7 @@ export default { ...@@ -81,6 +84,7 @@ export default {
headText:'产品名称', headText:'产品名称',
dateValue: [moment().format('YYYY-MM-DD 00:00:00'), moment().format('YYYY-MM-DD 23:59:59')], dateValue: [moment().format('YYYY-MM-DD 00:00:00'), moment().format('YYYY-MM-DD 23:59:59')],
value:'不限', value:'不限',
argWhere: ' ',
} }
}, },
...@@ -95,6 +99,34 @@ export default { ...@@ -95,6 +99,34 @@ export default {
this.headText='设备名称' this.headText='设备名称'
}else if(this.type==='10' || this.type ==='11' || this.type === '12'){ }else if(this.type==='10' || this.type ==='11' || this.type === '12'){
this.placeText = '请输入关键字' this.placeText = '请输入关键字'
if (this.type==='10') {
this.productNameArr = [
{
id: '不限',
name: ' '
},
{
id: '产品编号',
name: '产品编号'
},
{
id: '产品名称',
name: '产品名称'
},
{
id: '产品描述',
name: '产品描述'
},
{
id: '产品工艺',
name: '产品工艺'
},
{
id: '最近修改时间',
name: '最近修改时间'
},
]
}
}else{ }else{
this.placeText = '请输入名称' this.placeText = '请输入名称'
} }
...@@ -106,6 +138,7 @@ export default { ...@@ -106,6 +138,7 @@ export default {
}, },
//查询 //查询
query(){ query(){
for(let i=0;i<this.productNameArr.length;i++){ for(let i=0;i<this.productNameArr.length;i++){
if(this.value == this.productNameArr[i].name){ if(this.value == this.productNameArr[i].name){
this.argID = this.productNameArr[i].id this.argID = this.productNameArr[i].id
...@@ -114,6 +147,16 @@ export default { ...@@ -114,6 +147,16 @@ export default {
} }
this.$parent.query() this.$parent.query()
}, },
searchQuery () {
var postData = {
argKeyWord: this.input,
argWhere: this.argWhere,
Stime: this.dateValue ? moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '',
Etime: this.dateValue ? moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
}
this.$emit('searchQuery', postData)
},
//删除 //删除
deleteFun(){ deleteFun(){
this.$parent.deletePop() this.$parent.deletePop()
......
src/views/education/component/linePop.vue
View file @ 448cfd1f
...@@ -17,6 +17,12 @@ ...@@ -17,6 +17,12 @@
<span>{{name}}编号：</span> <span>{{name}}编号：</span>
<input v-model="modelV" class="nameipt" /> <input v-model="modelV" class="nameipt" />
</div> </div>
<div v-if="type==2" class="name" style="margin-top:10px" >
<span>{{name}}编号：</span>
<input v-model="CellNuber" class="nameipt" />
</div>
<div v-if="type != 6" class="name" style="margin-top:10px"> <div v-if="type != 6" class="name" style="margin-top:10px">
<span>{{name}}名称：</span> <span>{{name}}名称：</span>
<input v-model="nameV" class="nameipt" /> <input v-model="nameV" class="nameipt" />
...@@ -73,12 +79,12 @@ ...@@ -73,12 +79,12 @@
<div v-if="type == 5" style="margin-top:20px" class="name"> <div v-if="type == 5" style="margin-top:20px" class="name">
<span>{{name}}描述：</span> <span>{{name}}描述：</span>
<input v-model="describeV" class="nameipt" /> <input v-model="prodescribe" class="nameipt" />
</div> </div>
<div v-if="type == 5" style="margin-top:20px" class="name"> <div v-if="type == 5" style="margin-top:20px" class="name">
<span>单位：</span> <span>单位：</span>
<input v-model="unit" class="nameipt" /> <input v-model="prounit" class="nameipt" />
</div> </div>
<div v-if="type == 5" style="margin-top:10px" class="name"> <div v-if="type == 5" style="margin-top:10px" class="name">
...@@ -99,7 +105,7 @@ ...@@ -99,7 +105,7 @@
<div v-if="type == 4" style="margin-top:10px" class="name"> <div v-if="type == 4" style="margin-top:10px" class="name">
<span>单位：</span> <span>单位：</span>
<input v-model="unit" class="nameipt" /> <input v-model="Company" class="nameipt" />
</div> </div>
<div v-if="type == 6" class="name2" style="margin:15px auto"> <div v-if="type == 6" class="name2" style="margin:15px auto">
...@@ -197,6 +203,8 @@ export default { ...@@ -197,6 +203,8 @@ export default {
numberV2:'',//编号2 numberV2:'',//编号2
modelV:'',//型号 modelV:'',//型号
describeV:'',//描述 describeV:'',//描述
prodescribe: '', //type === 5 产品描述
prounit: '', //type ===5 单位
// num:1, //数量 // num:1, //数量
dNum:'',//订单数量 dNum:'',//订单数量
dtatime:'',//交货日期 dtatime:'',//交货日期
...@@ -205,7 +213,9 @@ export default { ...@@ -205,7 +213,9 @@ export default {
lineValue:'', lineValue:'',
editDataArr:[], editDataArr:[],
istech:false,//适用工艺 istech:false,//适用工艺
planNo: '' planNo: '',
CellNuber: '', //工序编号
Company: '', //单位
} }
}, },
directives: { directives: {
...@@ -407,7 +417,11 @@ export default { ...@@ -407,7 +417,11 @@ export default {
//编辑转态 //编辑转态
this.nameV = this.data.Name this.nameV = this.data.Name
this.describeV = this.data.Desc this.describeV = this.data.Desc
this.prodescribe = this.data.Prodescribe
this.prounit = this.data.Prounit
this.workValue = this.data.CellName this.workValue = this.data.CellName
this.CellNuber = this.data.CellNuber
this.Company = this.data.Company
this.lineValue = this.data.LineName this.lineValue = this.data.LineName
this.numberV = this.data.MID this.numberV = this.data.MID
this.modelV = this.data.PID this.modelV = this.data.PID
...@@ -439,7 +453,6 @@ export default { ...@@ -439,7 +453,6 @@ export default {
//保存 //保存
conserve(){ conserve(){
if(this.typePop == 'add'){ if(this.typePop == 'add'){
debugger
var guid = this.guid() var guid = this.guid()
this.edit_Add_dataFun(guid) this.edit_Add_dataFun(guid)
this.$parent.addFun(this.valuedata) this.$parent.addFun(this.valuedata)
...@@ -466,10 +479,12 @@ export default { ...@@ -466,10 +479,12 @@ export default {
if(this.type ==1 || this.type==2 || this.type==4){ if(this.type ==1 || this.type==2 || this.type==4){
this.valuedata ={ this.valuedata ={
Name:this.nameV, Name:this.nameV,
Desc:this.describeV Desc:this.describeV,
CellNuber: this.CellNuber,
} }
if(this.type==4){ if(this.type==4){
this.valuedata.MID = this.numberV this.valuedata.MID = this.numberV
this.valuedata.Company = this.Company
} }
}else if(this.type==3){ }else if(this.type==3){
this.valuedata={ this.valuedata={
...@@ -479,9 +494,11 @@ export default { ...@@ -479,9 +494,11 @@ export default {
}else if(this.type==5){ }else if(this.type==5){
console.log('technologyOptions',this.technologyOptions) console.log('technologyOptions',this.technologyOptions)
this.valuedata={ this.valuedata={
Name:this.nameV, ProNumber:this.modelV, //产品编号
PID:this.modelV, Name:this.nameV, //产品名称
ProcessName:this.applyValue prodescribe:this.prodescribe, //产品描述
Prounit:this.prounit, //单位
ProcessName:this.applyValue,
} }
for(let i=0;i<this.technologyOptions.length;i++){ for(let i=0;i<this.technologyOptions.length;i++){
if( this.valuedata.ProcessName == this.technologyOptions[i].name){ if( this.valuedata.ProcessName == this.technologyOptions[i].name){
......
src/views/education/component/materielPop.vue
View file @ 448cfd1f
...@@ -161,6 +161,7 @@ export default { ...@@ -161,6 +161,7 @@ export default {
}, },
//添加 //添加
saveFun(){ saveFun(){
debugger
if(this.number=='' || this.value==''){ if(this.number=='' || this.value==''){
this.typeV = '8' this.typeV = '8'
this.deleteShow = true this.deleteShow = true
...@@ -170,10 +171,12 @@ export default { ...@@ -170,10 +171,12 @@ export default {
var id = this.guid() var id = this.guid()
var MaterielID var MaterielID
var materieNum var materieNum
var prounit
for(let i=0;i<this.MaterielData.length;i++){ for(let i=0;i<this.MaterielData.length;i++){
if(this.value == this.MaterielData[i].Name){ if(this.value == this.MaterielData[i].Name){
materieNum = this.MaterielData[i].MID materieNum = this.MaterielData[i].MID
MaterielID = this.MaterielData[i].ID MaterielID = this.MaterielData[i].ID
prounit = this.MaterielData[i].Company
} }
} }
console.log('data=4',this.data.BomMaterielInfos) console.log('data=4',this.data.BomMaterielInfos)
...@@ -186,7 +189,8 @@ export default { ...@@ -186,7 +189,8 @@ export default {
MaterielID:MaterielID, MaterielID:MaterielID,
MaterielName:this.value, MaterielName:this.value,
MID:materieNum, MID:materieNum,
Quantity:this.number Quantity:this.number,
Prounit: prounit
} }
this.$parent.dataFun(value) this.$parent.dataFun(value)
this.$parent.closeFun() this.$parent.closeFun()
......
src/views/education/materiel.vue
View file @ 448cfd1f
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<el-table-column <el-table-column
label="单位" label="单位"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="Unit" prop="Company"
width="200"> width="200">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
......
src/views/education/productManage.vue
View file @ 448cfd1f
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<template> <template>
<div class="lineBox"> <div class="lineBox">
<div class="LineCenten"> <div class="LineCenten">
<Head type="10"></Head> <Head type="10" ref="head" @searchQuery="query" ></Head>
<div class="conterFool_middle" style="width:98%;margin:auto"> <div class="conterFool_middle" style="width:98%;margin:auto">
<el-table <el-table
border border
...@@ -32,23 +32,23 @@ ...@@ -32,23 +32,23 @@
<el-table-column <el-table-column
label="产品编号" label="产品编号"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="Name" prop="ProNumber"
width="200"> width="200">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="PID" prop="Name"
label="产品名称" label="产品名称"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="210"> width="210">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="descipipt" prop="Prodescribe"
label="产品描述" label="产品描述"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="210"> width="210">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="unit" prop="Prounit"
label="单位" label="单位"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="210"> width="210">
...@@ -162,14 +162,21 @@ export default { ...@@ -162,14 +162,21 @@ export default {
props:[], props:[],
watch:{}, watch:{},
created(){ created(){
this.query() var postData = {
argKeyWord: '',
argWhere: '',
Stime: this.$moment().format('YYYY-MM-DD 00:00:00'),
Etime: this.$moment().format('YYYY-MM-DD 23:59:59')
}
this.query(postData)
}, },
methods:{ methods:{
//查询 //查询
query(){ query(keyWord){
var a = keyWord
this.$axios({ this.$axios({
method:"post", method:"post",
url:`/api/Product/Product_Query?argKeyWord=${this.argKeyWord}`, url:`/api/Product/Product_Query?argKeyWord=${ keyWord.argKeyWord }&argWhere=${ keyWord.argWhere }&Stime=${ keyWord.Stime }&Etime=${ keyWord.Etime }`,
}).then((res)=>{ }).then((res)=>{
console.log('产品res',res) console.log('产品res',res)
if(res.data.data.length != 0 ){ if(res.data.data.length != 0 ){
...@@ -230,6 +237,7 @@ export default { ...@@ -230,6 +237,7 @@ export default {
addFun(value){ addFun(value){
let data = value let data = value
data.UpdateTime = value.CreateTime data.UpdateTime = value.CreateTime
var $this = this
console.log('产品管理',data) console.log('产品管理',data)
this.$axios({ this.$axios({
method:"post", method:"post",
...@@ -238,14 +246,20 @@ export default { ...@@ -238,14 +246,20 @@ export default {
}).then((res)=>{ }).then((res)=>{
console.log('添加产品',res) console.log('添加产品',res)
if(res.data.code != 0){ if(res.data.code != 0){
this.typeV = '5' $this.typeV = '5'
this.deleteShow = true $this.deleteShow = true
}else{ }else{
this.typeV = '6' $this.typeV = '6'
this.cancelFun() $this.cancelFun()
} }
this.deletetext = res.data.msg $this.deletetext = res.data.msg
this.query() var postData = {
argKeyWord: $this.$refs.input,
argWhere: $this.$refs.argWhere,
Stime: $this.$refs.dateValue ? $this.moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '',
Etime: $this.$refs.dateValue ? $this.moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
}
$this.query(postData)
}).catch(function(err){ }).catch(function(err){
console.log('err',err) console.log('err',err)
}) })
...@@ -254,20 +268,27 @@ export default { ...@@ -254,20 +268,27 @@ export default {
A_editFun(value){ A_editFun(value){
let data = value let data = value
data.UpdateTime = value.CreateTime data.UpdateTime = value.CreateTime
var $this = this
this.$axios({ this.$axios({
method:"post", method:"post",
url:`/api/Product/Product_WindowEditSave`, url:`/api/Product/Product_WindowEditSave`,
data:data data:data
}).then((res)=>{ }).then((res)=>{
if(res.data.code != 0){ if(res.data.code != 0){
this.typeV = '5' $this.typeV = '5'
this.deleteShow = true $this.deleteShow = true
}else{ }else{
this.typeV = '6' $this.typeV = '6'
this.cancelFun() $this.cancelFun()
} }
this.deletetext = res.data.msg $this.deletetext = res.data.msg
this.query() var postData = {
argKeyWord: $this.$refs.input,
argWhere: $this.$refs.argWhere,
Stime: $this.$refs.dateValue ? $this.$moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '',
Etime: $this.$refs.dateValue ? $this.$moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
}
$this.query(postData)
}).catch(function(err){ }).catch(function(err){
console.log('err',err) console.log('err',err)
}) })
...@@ -455,7 +476,6 @@ export default { ...@@ -455,7 +476,6 @@ export default {
}, },
//bom弹窗 //bom弹窗
BomFun(item){ BomFun(item){
console.log('item',item)
this.BomShow = true this.BomShow = true
this.BomData = item this.BomData = item
}, },
......
src/views/education/technology.vue
View file @ 448cfd1f
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
label="工艺编号" label="工艺编号"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="185" width="185"
prop="Num"> prop="Nuber">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="工艺名称" label="工艺名称"
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<el-table-column <el-table-column
label="工艺描述" label="工艺描述"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="describe" prop="Desc"
width="300"> width="300">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
......
vue.config.js
View file @ 448cfd1f
...@@ -23,7 +23,7 @@ module.exports = { ...@@ -23,7 +23,7 @@ module.exports = {
proxy: { proxy: {
'/api': { '/api': {
//这里最好有一个 / //这里最好有一个 /
target: 'http://192.168.1.164:8802', // 后台接口域名 target: 'http://192.168.1.125:8802', // 后台接口域名
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