Skip to content

T
tianjin
Commit 22da3240 authored by 徐来柯's avatar 徐来柯
Browse files
Options

update

parent 9879ace4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 23 deletions
src/views/education/ProductionPlan.vue
View file @ 22da3240
......@@ -110,10 +110,10 @@
</div>
</div>
</div>
<LinePop :typePop='type' :tData="tData" :data="itemdata" type="6" v-if="popShow" @openRelate="openRelate" ></LinePop>
<LinePop :typePop='type' ref="linePop" :tData="tData" :data="itemdata" type="6" v-if="popShow" @openRelate="openRelate" ></LinePop>
<deletePop ref="delete" :deletetext="deletetext" :type="typeV" v-if="deleteShow"></deletePop>
<div v-if="popShow || deleteShow" class="box"></div>
<relate-dialog v-if="relateShow" @closeDialog="closeDialog" />
<relate-dialog v-if="relateShow" :relateType="relateType" @conserve="saveData" @closeDialog="closeDialog" />
</div>
</template>
......@@ -152,7 +152,8 @@ export default {
deleteManyData:[],
typeV:'',
tData:[],
relateShow: false
relateShow: false,
relateType: ''
}
},
props:[],
......@@ -165,7 +166,7 @@ export default {
query(){
this.$axios({
method:"post",
url:`/api/Plan/Plan_Query?argKeyWord=${this.argKeyWord}&&argID=${this.argID}`,
url:`/api/Plan/Plan_Query?argKeyWord=${this.argKeyWord}&argID=${this.argID}`,
}).then((res)=>{
if(res.data.data.length != 0 ){
for(let i=0;i<res.data.data.length;i++){
......@@ -190,8 +191,14 @@ export default {
console.log('err',err)
})
},
openRelate () {
// 保存变量
saveData (data, type) {
debugger
this.$refs.linePop[type] = data.Name
this.relateShow = false
},
openRelate (type) {
this.relateType = type
this.relateShow = true
},
closeDialog () {
......
src/views/education/component/linePop.vue
View file @ 22da3240
This diff is collapsed.
src/views/education/component/relateDialog.vue
View file @ 22da3240
......@@ -103,19 +103,28 @@
</div>
</div>
</div>
<deletePop ref="delete" :deletetext="deletetext" :type="typeV" v-if="deleteShow"></deletePop>
</div>
</template>
<script>
import Pagination from './Pagination'
import deletePop from './deletePop'
export default {
components: { Pagination },
components: { Pagination, deletePop },
props: {
relateType: {
type: String,
default: ''
}
},
data() {
return {
argDevice: '',
argGroup: '',
argDataType: '',
argDevice: '不限',
argGroup: '不限',
argDataType: '不限',
argKeyWord: '',
deviceList: [],
typeList: [],
......@@ -123,6 +132,8 @@ export default {
cloneData: [],
innerTableData: [],
currentRow: {},
deleteShow: false,
typeV: '',
// 分页数据
totalCount: 0,
// pageIndex: 1,
......@@ -152,13 +163,11 @@ export default {
};
}
},
created () {
this.$nextTick(() => {
this.getDevices()
this.getGroups()
this.getTypes()
this.getData()
})
async created () {
await this.getDevices()
await this.getGroups()
await this.getTypes()
this.getData()
},
methods:{
// guid() {
......@@ -226,20 +235,75 @@ export default {
}
},
conserve () {
this.$emit('conserve', this.currentRow)
if (this.relateType) {
// var flag = Object.prototype.toString.call(this.relateType)
if (this.relateType === 'VPID') {
if (this.currentRow.DateType.indexOf('字符串') !== -1) {
return this.$emit('conserve', this.currentRow, this.relateType)
} else {
this.typeV = '5'
this.deleteShow = true
this.deletetext = '该变量不是字符串变量，请重新选择'
return
}
}
if (this.relateType === 'VPlanQuantity') {
if (this.currentRow.DateType.indexOf('整型') !== -1) {
return this.$emit('conserve', this.currentRow, this.relateType)
} else {
this.typeV = '5'
this.deleteShow = true
this.deletetext = '该变量不是整型变量，请重新选择'
return
}
}
if (this.relateType === 'VDeliveryDt') {
if (this.currentRow.DateType.indexOf('日期') !== -1 || this.currentRow.DateType.indexOf('时间') !== -1) {
return this.$emit('conserve', this.currentRow, this.relateType)
} else {
this.typeV = '5'
this.deleteShow = true
this.deletetext = '该变量不是日期时间型变量，请重新选择'
return
}
}
if (this.relateType === 'VStatus') {
if (this.currentRow.DateType.indexOf('二进制') !== -1) {
return this.$emit('conserve', this.currentRow, this.relateType)
} else {
this.typeV = '5'
this.deleteShow = true
this.deletetext = '该变量不是二进制变量，请重新选择'
return
}
}
} else {
this.$emit('conserve', this.currentRow)
}
},
//关闭弹窗
cancel_delete(){
this.deleteShow = false
},
getDevices () {
return new Promise((resolve, reject)=>{
var $this = this
this.$axios({
method:"post",
url:`/api/FormulaManage/FormulaManage_GstCondition`,
}).then((res)=>{
this.deviceList = res.data.data
$this.deviceList = res.data.data
resolve()
})
})
},
getGroups () {
return new Promise((resolve, reject)=>{
var $this = this
this.argGroup = ''
this.argDataType = ''
// this.argGroup = ''
// this.argDataType = ''
this.groupList = []
this.typeList = []
this.$axios({
......@@ -249,11 +313,16 @@ export default {
res.data.data.forEach(item => {
if (item.DeviceName === this.argDevice) {
$this.groupList = item.Groups
$this.argGroup = item.Groups[0].GroupName
$this.getTypes()
}
resolve()
})
})
})
},
getTypes () {
return new Promise((resolve, reject)=>{
var $this = this
this.argDataType = ''
this.typeList = []
......@@ -266,11 +335,14 @@ export default {
item.Groups.forEach(item => {
if (item.GroupName === $this.argGroup) {
$this.typeList = item.DataTypes
$this.argDataType = item.DataTypes[0]
}
})
}
resolve()
})
})
})
},
}
}
......
src/views/education/deviceManage.vue
View file @ 22da3240
......@@ -93,7 +93,7 @@
</div>
</div>
<!-- 弹窗内容 -->
<LinePop :typePop='type' :tData="tData" :tData2="tData2" :data="itemdata" type="7" v-if="popShow" @openRelate="openRelate" ></LinePop>
<LinePop :typePop='type' :tData="tData" :tData2="tData2" ref="linePop" :data="itemdata" type="7" v-if="popShow" @openRelate="openRelate" ></LinePop>
<deletePop ref="delete" :deletetext="deletetext" :type="typeV" v-if="deleteShow"></deletePop>
<div v-if="popShow || deleteShow" class="box"></div>
<relate-dialog v-if="relateShow" @conserve="saveData" @closeDialog="closeDialog" />
......@@ -180,7 +180,8 @@ export default {
},
// 保存变量
saveData (data) {
console.log(data)
this.$refs.linePop.Proalert = data.Name
this.relateShow = false
},
//查询添加工序
queryWord(){
......
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