Browse Source

部分更新

master
ruanqi 4 years ago
parent
commit
f318178ad6
  1. 4
      src/api/base/site.js
  2. 1
      src/views/modules/base/maintainProductRouting.vue
  3. 54
      src/views/modules/base/referencePartInfo.vue
  4. 219
      src/views/modules/base/searchPart.vue
  5. 149
      src/views/modules/base/searchPartNo.vue
  6. 26
      src/views/modules/base/unitMeasure.vue
  7. 1
      src/views/modules/common/updateProductRouting.vue
  8. 309
      src/views/modules/common/updateRoutingRev.vue
  9. 28
      src/views/modules/schedule/order_schedule.vue

4
src/api/base/site.js

@ -156,3 +156,7 @@ export const addSORoutingResource= data => createAPI(`/base/addSORoutingResource
//删除可用机台 //删除可用机台
export const deleteSORoutingResource= data => createAPI(`/base/deleteSORoutingResource`,'post',data) export const deleteSORoutingResource= data => createAPI(`/base/deleteSORoutingResource`,'post',data)
//
export const getSORoutingRevNo= data => createAPI(`/base/getSORoutingRevNo`,'post',data)
//
export const updateRevNoData= data => createAPI(`/base/updateRevNoData`,'post',data)

1
src/views/modules/base/maintainProductRouting.vue

@ -1674,6 +1674,7 @@
this.dataList2=data.rows; this.dataList2=data.rows;
} }
}) })
this.$message({ this.$message({
message: '操作成功', message: '操作成功',
type: 'success', type: 'success',

54
src/views/modules/base/referencePartInfo.vue

@ -54,30 +54,30 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-dialog :title=buttons.dataUpdate :close-on-click-modal="false" v-drag :visible.sync="modelFlag" width="500px" >
<el-dialog :title=buttons.dataUpdate :close-on-click-modal="false" v-drag :visible.sync="modelFlag" width="600px" >
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
<el-form-item :label=buttons.site> <el-form-item :label=buttons.site>
<el-input v-model="modelData.site" :disabled="modelInputFlag" style="width: 130px"></el-input> <el-input v-model="modelData.site" :disabled="modelInputFlag" style="width: 130px"></el-input>
</el-form-item> </el-form-item>
<el-form-item >
<span slot="label" style="" @click="getBaseList(92,0)"><a herf="#">{{buttons.customerID}}</a></span>
<el-input v-model="modelData.customerID" :disabled="modelInputFlag" style="width: 130px"></el-input>
</el-form-item>
<el-form-item > <el-form-item >
<span slot="label" style="" @click="getBaseList(5,1)"><a herf="#">{{buttons.fGPartNo}}</a></span> <span slot="label" style="" @click="getBaseList(5,1)"><a herf="#">{{buttons.fGPartNo}}</a></span>
<el-input v-model="modelData.fGPartNo" :disabled="modelInputFlag" @change="getFGPartNo()" style="width: 130px"></el-input> <el-input v-model="modelData.fGPartNo" :disabled="modelInputFlag" @change="getFGPartNo()" style="width: 130px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label=buttons.fGPartDescription>
<el-input v-model="modelData.fGPartDescription" disabled style="width: 260px"></el-input>
</el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
<el-form-item :label=buttons.fGPartDescription>
<el-input v-model="modelData.fGPartDescription" disabled style="width: 130px"></el-input>
<el-form-item >
<span slot="label" style="" @click="getBaseList(92,0)"><a herf="#">{{buttons.customerID}}</a></span>
<el-input v-model="modelData.customerID" :disabled="modelInputFlag" style="width: 130px"></el-input>
</el-form-item> </el-form-item>
<el-form-item > <el-form-item >
<span slot="label" style="" @click="getBaseList(5,2)"><a herf="#">{{buttons.partNo}}</a></span> <span slot="label" style="" @click="getBaseList(5,2)"><a herf="#">{{buttons.partNo}}</a></span>
<el-input v-model="modelData.partNo" :disabled="modelInputFlag" @change="getPartNo()" style="width: 130px"></el-input> <el-input v-model="modelData.partNo" :disabled="modelInputFlag" @change="getPartNo()" style="width: 130px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label=buttons.partDescription> <el-form-item :label=buttons.partDescription>
<el-input v-model="modelData.partDescription" disabled style="width: 130px"></el-input>
<el-input v-model="modelData.partDescription" disabled style="width: 260px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
@ -85,16 +85,16 @@
<el-input v-model="modelData.umid" disabled style="width: 130px"></el-input> <el-input v-model="modelData.umid" disabled style="width: 130px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label=buttons.referencePartDesc> <el-form-item :label=buttons.referencePartDesc>
<el-input v-model="modelData.referencePartDesc" style="width: 130px"></el-input>
<el-input v-model="modelData.referencePartDesc" style="width: 260px"></el-input>
</el-form-item> </el-form-item>
</el-form>
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
<el-form-item > <el-form-item >
<span slot="label" style="" @click="getBaseList(3,0)"><a herf="#">{{buttons.supplierID}}</a></span> <span slot="label" style="" @click="getBaseList(3,0)"><a herf="#">{{buttons.supplierID}}</a></span>
<el-input v-model="modelData.supplierID" @change="getSupplierID()" style="width: 130px"></el-input> <el-input v-model="modelData.supplierID" @change="getSupplierID()" style="width: 130px"></el-input>
</el-form-item> </el-form-item>
</el-form>
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
<el-form-item :label=buttons.supplierName> <el-form-item :label=buttons.supplierName>
<el-input v-model="modelData.supplierName" disabled style="width: 130px"></el-input>
<el-input v-model="modelData.supplierName" disabled style="width: 260px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-footer style="height:40px;margin-top: 20px;text-align:center"> <el-footer style="height:40px;margin-top: 20px;text-align:center">
@ -102,8 +102,6 @@
<el-button type="primary" @click="modelFlag = false">{{buttons.close}}</el-button> <el-button type="primary" @click="modelFlag = false">{{buttons.close}}</el-button>
</el-footer> </el-footer>
</el-dialog> </el-dialog>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist> <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
<!-- 动态列 --> <!-- 动态列 -->
<column v-if="visible" ref="column" @refreshData="getTableUserColumn"></column> <column v-if="visible" ref="column" @refreshData="getTableUserColumn"></column>
@ -194,7 +192,7 @@
}, },
{ {
functionId: this.$route.meta.menuId, functionId: this.$route.meta.menuId,
languageValue: '数据维护',
languageValue: '物料参照信息',
objectId: 'dataUpdate', objectId: 'dataUpdate',
objectType: "button", objectType: "button",
tableId: "6021Table" tableId: "6021Table"
@ -318,7 +316,7 @@
download:'导出', download:'导出',
settingTable: '设置列表', settingTable: '设置列表',
work:'操作', work:'操作',
dataUpdate:'数据维护',
dataUpdate:'物料参照信息',
site:'工厂编码', site:'工厂编码',
update:'编辑', update:'编辑',
delete:'删除', delete:'删除',
@ -557,7 +555,17 @@
], ],
} }
}, },
watch: {
modelData: {
deep: true,
handler: function (newV, oldV) {
this.modelData.fGPartNo = this.modelData.fGPartNo.toUpperCase()
this.modelData.partNo = this.modelData.partNo.toUpperCase()
this.modelData.supplierID = this.modelData.supplierID.toUpperCase()
this.modelData.customerID = this.modelData.customerID.toUpperCase()
}
}
},
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
this.height = window.innerHeight - 140; this.height = window.innerHeight - 140;
@ -671,6 +679,7 @@
} }
if (this.tagNo === 3){ if (this.tagNo === 3){
this.modelData.supplierID = val.SupplierID this.modelData.supplierID = val.SupplierID
this.getSupplierID();
} }
}, },
// //
@ -693,7 +702,9 @@
if (val1 === 3){ if (val1 === 3){
strVal = this.modelData.supplierID strVal = this.modelData.supplierID
} }
this.$refs.baseList.init(val1,strVal)
if(this.modelInputFlag==false) {
this.$refs.baseList.init(val1, strVal)
}
}) })
}, },
@ -822,6 +833,7 @@
// this.modelData.fGPartDescription=outList[0].partDescription; // this.modelData.fGPartDescription=outList[0].partDescription;
this.$set(this.modelData,'fGPartDescription',outList[0].partDescription) this.$set(this.modelData,'fGPartDescription',outList[0].partDescription)
}else { }else {
this.modelData.fGPartDescription='';
} }
}) })
}, },
@ -838,6 +850,8 @@
this.$set(this.modelData,'partDescription',outList[0].partDescription) this.$set(this.modelData,'partDescription',outList[0].partDescription)
this.$set(this.modelData,'umid',outList[0].umid) this.$set(this.modelData,'umid',outList[0].umid)
}else { }else {
this.modelData.partDescription='';
this.modelData.umid='';
} }
}) })
}, },
@ -853,10 +867,6 @@
this.$set(this.modelData,'supplierName',outList[0].supplierName) this.$set(this.modelData,'supplierName',outList[0].supplierName)
}else { }else {
this.modelData.supplierName=''; this.modelData.supplierName='';
this.modelData.supplierID='';
this.$alert('该供应商不存在', '错误', {
confirmButtonText: '确定'
})
} }
}) })
}, },

219
src/views/modules/base/searchPart.vue

@ -1,219 +0,0 @@
<template>
<!-- //-->
<div class="mod-config">
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
<el-form-item :label="'工厂编号:'">
<el-input v-model="searchData.site" style="width: 130px"></el-input>
</el-form-item>
<el-form-item :label="'物料编码:'">
<el-input v-model="searchData.site" style="width: 130px"></el-input>
</el-form-item>
<el-form-item :label="'物料名称:'">
<el-input v-model="searchData.site" style="width: 130px"></el-input>
</el-form-item>
<el-form-item :label="'规格型号:'">
<el-input v-model="searchData.site" style="width: 130px"></el-input>
</el-form-item>
<el-form-item :label="'版本号:'">
<el-input v-model="searchData.site" style="width: 130px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
<el-form-item :label="'工艺路线类型:'">
<el-select filterable v-model="searchData.status" style="width: 130px">
<el-option label="全部" value=""></el-option>
</el-select>
</el-form-item>
<el-form-item :label="'加工中心编码:'">
<el-input v-model="searchData.site" style="width: 130px"></el-input>
</el-form-item>
<el-form-item :label="'加工中心名称:'">
<el-input v-model="searchData.site" style="width: 417px"></el-input>
</el-form-item>
<el-form-item :label="'默认:'">
<el-select filterable v-model="searchData.status" style="width: 130px">
<el-option label="全部" value=""></el-option>
</el-select>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
<el-form-item :label="'状态:'">
<el-select filterable v-model="searchData.status" style="width: 130px">
<el-option label="全部" value=""></el-option>
</el-select>
</el-form-item>
<el-form-item :label="'启用日期:'">
<el-date-picker
style="width: 130px"
v-model="searchData.date1"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item :label="'至:'">
<el-date-picker
style="width: 130px"
v-model="searchData.date1"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item :label="'停用日期:'">
<el-date-picker
style="width: 130px"
v-model="searchData.date1"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item :label="'至:'">
<el-date-picker
style="width: 130px"
v-model="searchData.date1"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-form>
<el-table
:height="height"
:data="dataList"
border
style="width: 100%;">
<el-table-column
v-for="(item,index) in columnList" :key="index"
:prop="item.columnProp"
:header-align="item.headerAlign"
:align="item.align"
:min-width="item.width"
:label="item.columnLabel">
</el-table-column>
<el-table-column
header-align="center"
align="center"
min-width="70"
label="操作">
<template slot-scope="scope">
</template>
</el-table-column>
</el-table>
</div>
</template>
<script>
import {} from "@/api/sysLanguage.js"
export default {
name: "searchPartNo",
data() {
return {
height: 300,
searchData:{
site:'',
status:'',
date1:'',
},
dataList: [],
columnList: [
{
columnProp:'datetype',
headerAlign:'center',
align:'left',
width:'50',
columnLabel:'物料编码',
},
{
columnProp:'exceptexacttime1',
headerAlign:'center',
align:'left',
width:'100',
columnLabel:'物料名称',
},
{
columnProp:'exceptduration1',
headerAlign:'center',
align:'right',
width:'40',
columnLabel:'计量单位',
},
{
columnProp:'exceptexacttime2',
headerAlign:'center',
align:'left',
width:'35',
columnLabel:'版本号',
},
{
columnProp:'exceptduration2',
headerAlign:'center',
align:'left',
width:'50',
columnLabel:'启动日期',
},
{
columnProp:'exceptexacttime3',
headerAlign:'center',
align:'left',
width:'50',
columnLabel:'停用日期',
},
{
columnProp:'exceptduration3',
headerAlign:'center',
align:'left',
width:'50',
columnLabel:'工艺路线类型',
},
{
columnProp:'exceptexacttime4',
headerAlign:'center',
align:'left',
width:'40',
columnLabel:'状态',
},
{
columnProp:'exceptduration4',
headerAlign:'center',
align:'left',
width:'100',
columnLabel:'备注',
},
{
columnProp:'exceptexacttime5',
headerAlign:'center',
align:'left',
width:'30',
columnLabel:'默认',
},
{
columnProp:'exceptduration5',
headerAlign:'center',
align:'left',
width:'40',
columnLabel:'工序号',
},
{
columnProp:'exceptexacttime6',
headerAlign:'center',
align:'left',
width:'100',
columnLabel:'工序名称',
}
],
}
},
mounted() {
this.$nextTick(() => {
this.height = window.innerHeight - 320;
})
},
methods: {},
created() {
}
}
</script>
<style scoped>
</style>

149
src/views/modules/base/searchPartNo.vue

@ -4,7 +4,8 @@
<el-form-item :label=buttons.site> <el-form-item :label=buttons.site>
<el-input v-model="searchData.site" style="width: 120px"></el-input> <el-input v-model="searchData.site" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label=buttons.partNo>
<el-form-item >
<span slot="label" style="" @click="getBaseList(5)"><a herf="#">{{buttons.partNo}}</a></span>
<el-input v-model="searchData.partNo" style="width: 120px" oninput="this.value = this.value.toUpperCase()"></el-input> <el-input v-model="searchData.partNo" style="width: 120px" oninput="this.value = this.value.toUpperCase()"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label=buttons.partDescription> <el-form-item :label=buttons.partDescription>
@ -85,11 +86,14 @@
<!-- 动态列 --> <!-- 动态列 -->
<column v-if="visible" ref="column" @refreshData="getTableUserColumn"></column> <column v-if="visible" ref="column" @refreshData="getTableUserColumn"></column>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
</div> </div>
</template> </template>
<script> <script>
import {getCRollInfoList} from '@/api/crollinfo/crollinfo.js'
import column from "../common/column"; import column from "../common/column";
import Chooselist from '@/views/modules/common/Chooselist';
import { import {
searchSysLanguagePackList, searchSysLanguagePackList,
searchSysLanguageParam, searchSysLanguageParam,
@ -115,9 +119,10 @@
export default { export default {
name: "searchPartNo", name: "searchPartNo",
components: {column},
components: {column,Chooselist},
data() { data() {
return { return {
tagNo:'',
// start // start
buttonList: [ buttonList: [
{ {
@ -200,7 +205,7 @@
}, },
{ {
functionId: this.$route.meta.menuId, functionId: this.$route.meta.menuId,
languageValue: '规型号',
languageValue: '规型号',
objectId: 'spec', objectId: 'spec',
objectType: "button", objectType: "button",
tableId: "100005Table" tableId: "100005Table"
@ -245,7 +250,7 @@
no:'否', no:'否',
partNo:'物料编码', partNo:'物料编码',
partDescription:'物料名称', partDescription:'物料名称',
spec:'规型号',
spec:'规型号',
newDate:'新增日期', newDate:'新增日期',
to:'至', to:'至',
}, },
@ -444,12 +449,23 @@
columnWidth: 60 columnWidth: 60
} }
], ],
//start
loading: false,
pagination: {
page: 1,
pageSize: 200,
total: 0,
},
totalPage: 5,
countTotal: 200,
//end
} }
}, },
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
this.height = window.innerHeight - 180; this.height = window.innerHeight - 180;
this.lazyLoading();
}) })
}, },
methods: { methods: {
@ -481,6 +497,22 @@
} }
}) })
}, },
getBaseData(val){
if (this.tagNo === 5){
this.searchData.partNo = val.PartNo
}
},
//
getBaseList(val){
this.tagNo = val
this.$nextTick(() => {
let strVal = "";
if (val === 5){
strVal = this.searchData.partNo
}
this.$refs.baseList.init(val, strVal);
})
},
// //
getSysLanguageParamList() { getSysLanguageParamList() {
searchSysLanguageParam(this.queryTable).then(({data}) => { searchSysLanguageParam(this.queryTable).then(({data}) => {
@ -545,18 +577,18 @@
}) })
}, },
// end // end
getData(){
if((this.searchData.site==null||this.searchData.site=='')&&(this.searchData.partNo==null||this.searchData.partNo=='')&&(this.searchData.partDescription==null||this.searchData.partDescription=='')&&
(this.searchData.spec==null||this.searchData.spec=='')&&(this.searchData.date1==null||this.searchData.date1=='')&&(this.searchData.date2==null||this.searchData.date2=='')){
this.$alert("数据量过大,请至少输入一个查询条件!",'提示',{
confirmButtonText:'确定'
})
return false;
}
searchPartNoData(this.searchData).then(({data}) => {
this.dataList = data.rows
})
},
// getData(){
// if((this.searchData.site==null||this.searchData.site=='')&&(this.searchData.partNo==null||this.searchData.partNo=='')&&(this.searchData.partDescription==null||this.searchData.partDescription=='')&&
// (this.searchData.spec==null||this.searchData.spec=='')&&(this.searchData.date1==null||this.searchData.date1=='')&&(this.searchData.date2==null||this.searchData.date2=='')){
// this.$alert("",'',{
// confirmButtonText:''
// })
// return false;
// }
// searchPartNoData(this.searchData).then(({data}) => {
// this.dataList = data.rows
// })
// },
//excel //excel
createExportData() { createExportData() {
@ -585,6 +617,91 @@
return s return s
}, },
// end // end
lazyLoading() {
let dom = document.querySelector(".el-table__body-wrapper");
dom.addEventListener("scroll", (v) => {
const scrollDistance = dom.scrollHeight - dom.scrollTop - dom.clientHeight;
//console.log("-scrollDistance", scrollDistance)
// if (scrollDistance <= 0) { // 100% scrollDistance 0.201 -0.201
if (scrollDistance <= 1) {
//0
if (this.pagination.page >= this.totalPage) {
//
// this.$message.warning("~线 ()");
}
if (this.pagination.page < this.totalPage) {
//
this.pagination.page++; //
this.pagination.pageSize = this.countTotal;
this.getDataListAdd()
}
}
});
},
//
getDataListAdd(val) {
this.dataListLoading = true
let query = {
parttypeFlag:'R',
limit: this.pagination.pageSize,
page: this.pagination.page,
site:this.searchData.site,
partNo:this.searchData.partNo,
partDescription:this.searchData.partDescription,
active:this.searchData.active,
spec:this.searchData.spec,
date1:this.searchData.date1,
date2:this.searchData.date2,
user:this.$store.state.user.name,
}
searchPartNoData(query).then(({data}) => {
if (data && data.code === 0) {
let voList = data.page.list
this.dataList.push(...voList)
}
this.dataListLoading = false
})
// this.searchShow = false
},
//
getData(val) {
if((this.searchData.site==null||this.searchData.site=='')&&(this.searchData.partNo==null||this.searchData.partNo=='')&&(this.searchData.partDescription==null||this.searchData.partDescription=='')&&
(this.searchData.spec==null||this.searchData.spec=='')&&(this.searchData.date1==null||this.searchData.date1=='')&&(this.searchData.date2==null||this.searchData.date2=='')){
this.$alert("数据量过大,请至少输入一个查询条件!",'提示',{
confirmButtonText:'确定'
})
return false;
}
this.dataListLoading = true
if (val != 0){
this.pagination.pageSize=200
}
let query = {
parttypeFlag:'R',
limit: this.pagination.pageSize,
page: this.pagination.page,
site:this.searchData.site,
partNo:this.searchData.partNo,
partDescription:this.searchData.partDescription,
active:this.searchData.active,
spec:this.searchData.spec,
date1:this.searchData.date1,
date2:this.searchData.date2,
user:this.$store.state.user.name,
}
searchPartNoData(query).then(({data}) => {
if (data && data.code === 0) {
this.dataList = data.page.list
this.totalPage = data.page.totalPage
// this.countTotal = data.page.totalCount
this.pagination.page = data.page.currPage
this.pagination.total = data.page.totalCount
}
this.dataListLoading = false
})
// this.searchShow = false
},
}, },
created() { created() {
this.getTableUserColumn() this.getTableUserColumn()

26
src/views/modules/base/unitMeasure.vue

@ -53,7 +53,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-dialog title="数据维护" :close-on-click-modal="false" v-drag :visible.sync="modelFlag" width="350px" >
<el-dialog :title="buttons.umidModal" :close-on-click-modal="false" v-drag :visible.sync="modelFlag" width="350px" >
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
<el-form-item :label=buttons.site> <el-form-item :label=buttons.site>
<el-input v-model="modelData.site" :disabled="modelInputFlag" style="width: 130px"></el-input> <el-input v-model="modelData.site" :disabled="modelInputFlag" style="width: 130px"></el-input>
@ -118,6 +118,13 @@
return { return {
// start // start
buttonList: [ buttonList: [
{
functionId: this.$route.meta.menuId,
languageValue: '计量单位',
objectId: 'umidModal',
objectType: "button",
tableId: "6003Table"
},
{ {
functionId: this.$route.meta.menuId, functionId: this.$route.meta.menuId,
languageValue: '设置默认配置', languageValue: '设置默认配置',
@ -204,7 +211,7 @@
}, },
{ {
functionId: this.$route.meta.menuId, functionId: this.$route.meta.menuId,
languageValue: '库存计量单位',
languageValue: '计量单位',
objectId: 'umid', objectId: 'umid',
objectType: "button", objectType: "button",
tableId: "6003Table" tableId: "6003Table"
@ -252,6 +259,7 @@
languageCode: this.$i18n.locale languageCode: this.$i18n.locale
}, },
buttons:{ buttons:{
umidModal:'计量单位',
defaultTable:'设置默认配置', defaultTable:'设置默认配置',
search:'查询', search:'查询',
add:'新增', add:'新增',
@ -331,7 +339,7 @@
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
sortLv: 0,
sortLv: 1,
status: true, status: true,
fixed: false, fixed: false,
columnWidth: 200 columnWidth: 200
@ -349,7 +357,7 @@
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
sortLv: 0,
sortLv: 2,
status: true, status: true,
fixed: false, fixed: false,
columnWidth: 60 columnWidth: 60
@ -367,7 +375,7 @@
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
sortLv: 0,
sortLv: 3,
status: true, status: true,
fixed: false, fixed: false,
columnWidth: 80 columnWidth: 80
@ -375,6 +383,14 @@
], ],
} }
}, },
watch: {
modelData: {
deep: true,
handler: function (newV, oldV) {
this.modelData.umid = this.modelData.umid.toUpperCase()
}
}
},
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
this.height = window.innerHeight - 140; this.height = window.innerHeight - 140;

1
src/views/modules/common/updateProductRouting.vue

@ -720,7 +720,6 @@
// this.jump(); // this.jump();
// } // }
} }
}, },
methods: { methods: {
getBaseData(val){ getBaseData(val){

309
src/views/modules/common/updateRoutingRev.vue

@ -0,0 +1,309 @@
<template>
<div class="customer-css">
<el-dialog title="更改工艺路线版本" v-drag v-bind="$attrs" v-on="$listeners" width="490px" class="customer-dialog" >
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;margin-left:10px">
<el-form-item :label="'物料编码:'">
<el-input v-model="mainData.partNo" class="customer-input-color-red" readonly style="width: 130px"></el-input>
</el-form-item>
<el-form-item :label="'名称/规格型号:'">
<el-input v-model="mainData.partDesc" class="customer-input-color-red" readonly style="width: 300px"></el-input>
</el-form-item>
</el-form>
<fieldset style="margin-left: 10px; margin-top: 0px; width: 446px;">
<legend>产品结构</legend>
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -8px;">
<el-form-item >
<span slot="label" style="" @click="revNoModal"><a herf="#">版本号</a></span>
<el-input v-model="mainData.revNo" class="customer-input-color-red" readonly style="width: 120px;text-align: right" ></el-input>
</el-form-item>
<el-form-item :label="'状态:'">
<el-input v-model="mainData.status" class="customer-input-color-red" readonly style="width: 120px;text-align: right" ></el-input>
</el-form-item>
<el-form-item :label="'启用日期:'">
<el-input v-model="mainData.phaseInDate" class="customer-input-color-red" readonly style="width: 120px;text-align: right" ></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -0px;">
<el-form-item :label="'备注:'">
<el-input v-model="mainData.remark" class="customer-input-color-red" readonly style="width: 255px;text-align: right" ></el-input>
</el-form-item>
<el-form-item :label="'停用日期:'">
<el-input v-model="mainData.phaseOutDate" class="customer-input-color-red" readonly style="width: 120px;text-align: right" ></el-input>
</el-form-item>
</el-form>
</fieldset>
<el-footer style="height:40px;margin-top: 20px;text-align:center">
<el-button type="primary" @click="updateRevNo">确定</el-button>
<el-button type="primary" @click="closeDialog">关闭</el-button>
</el-footer>
</el-dialog>
<el-dialog title="数据表" :close-on-click-modal="false" v-drag :visible.sync="modelFlag" width="480px" >
<el-table
height="180"
:data="dataList"
border
@row-dblclick="tableHanddle"
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
v-for="(item,index) in columnList" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed"
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span>
</template>
</el-table-column>
</el-table>
<el-footer style="height:40px;margin-top: 5px;text-align:center">
<el-button type="primary" @click="modelFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
</div>
</template>
<script>
import {
getSORoutingRevNo,
updateRevNoData,
}from "@/api/base/site.js"
export default {
name: "updateRoutingRev",
data () {
return {
dataListLoading:false,
modelFlag:false,
mainData:{
partNo:'',
partDesc:'',
revNo:'',
status:'',
phaseInDate:'',
remark:'',
phaseOutDate:'',
site:'',
orderNo:'',
routingTypeDb:'',
routingType:'',
repairFlag:'',
},
dataList:[],
columnList:[
{
userId: this.$store.state.user.name,
functionId: 6099,
serialNumber: '6099TableRevNo',
tableId: "6099Table",
tableName: "工艺路线版本数据表",
columnProp: "revNo",
headerAlign: "center",
align: "left",
columnLabel: "版本号",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 6099,
serialNumber: '6099TablePhaseInDate',
tableId: "6099Table",
tableName: "工艺路线版本数据表",
columnProp: "phaseInDate",
headerAlign: "center",
align: "left",
columnLabel: "启用日期",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 6099,
serialNumber: '6099TableStatus',
tableId: "6099Table",
tableName: "工艺路线版本数据表",
columnProp: "status",
headerAlign: "center",
align: "left",
columnLabel: "状态",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
columnWidth: 80
},
{
userId: this.$store.state.user.name,
functionId: 6099,
serialNumber: '6099TableRoutingType',
tableId: "6099Table",
tableName: "工艺路线版本数据表",
columnProp: "routingType",
headerAlign: "center",
align: "left",
columnLabel: "工艺路线类型",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 6099,
serialNumber: '6099TablePhaseOutDate',
tableId: "6099Table",
tableName: "工艺路线版本数据表",
columnProp: "phaseOutDate",
headerAlign: "center",
align: "left",
columnLabel: "结束日期",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 6099,
serialNumber: '6099TableRemark',
tableId: "6099Table",
tableName: "工艺路线版本数据表",
columnProp: "remark",
headerAlign: "center",
align: "left",
columnLabel: "备注",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
columnWidth: 160
},
{
userId: this.$store.state.user.name,
functionId: 6099,
serialNumber: '6099TableRepairFlag',
tableId: "6099Table",
tableName: "工艺路线版本数据表",
columnProp: "repairFlag",
headerAlign: "center",
align: "left",
columnLabel: "修复版本",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
columnWidth: 60
}
],
}
},
mounted(){},
watch: {
'$route' (to, from) {
// if(localStorage.getItem('calendar')!=undefined){
// this.jump();
// }
}
},
methods: {
init(searchData){
// site orderNo partNo 3
getSORoutingRevNo(searchData).then(({data}) => {
if(data.rows.length>0){
this.mainData=data.rows[0];
this.dataList=data.rows;
}
})
},
/*关闭modal*/
closeDialog(){
//
this.$emit('update:visible', false);
},
updateRevNo(){
if(this.mainData.revNo==''){
this.$alert("版本号不能为空,请输入!",'错误',{
confirmButtonText:'确定'
})
return false;
}
let inData={
orderNo:this.mainData.orderNo,
site:this.mainData.site,
partNo:this.mainData.partNo,
revNo:this.mainData.revNo,
user:this.$store.state.user.name,
}
this.$confirm(`确实要更新产品工艺路线吗?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
updateRevNoData(inData).then(({data}) => {
if (data && data.code == 200) {
this.$emit('update:visible', false);
this.$emit('updateRoutingRevClosed');
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {
}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
})
},
revNoModal(){
this.modelFlag=true;
},
tableHanddle(row){
this.mainData=row;
this.modelFlag=false;
}
},
}
</script>
<style scoped>
/*统一的input内容颜色样式*/
.customer-input-color-red /deep/ .el-input__inner {
color: red;
}
</style>

28
src/views/modules/schedule/order_schedule.vue

@ -317,6 +317,12 @@
:visible.sync="updateProductRouting" :visible.sync="updateProductRouting"
> >
</updateProductRouting> </updateProductRouting>
<updateRoutingRev ref="updateRoutingRev" :close-on-click-modal="false"
:visible.sync="updateRoutingRev"
@updateRoutingRevClosed="updateRoutingRevClosed"
>
</updateRoutingRev>
</div> </div>
</template> </template>
@ -328,6 +334,8 @@
import comBatchWorkCalendar from "../common/com_batch_work_calendar";/*批量维护工作日历外组件*/ import comBatchWorkCalendar from "../common/com_batch_work_calendar";/*批量维护工作日历外组件*/
import comPartStock from "../common/com_part_stock";/*展示物料库存的组件*/ import comPartStock from "../common/com_part_stock";/*展示物料库存的组件*/
import comChangeWaitTime from "./com_change_wait_time";/*修改等待派工单的等待时间*/ import comChangeWaitTime from "./com_change_wait_time";/*修改等待派工单的等待时间*/
import updateRoutingRev from "../common/updateRoutingRev";
import { import {
getResourceRestList, getResourceRestList,
getShopOrderList, getShopOrderList,
@ -353,6 +361,7 @@ export default {
showWorkCalendarOut: false, showWorkCalendarOut: false,
showBatchWorkCalendar: false, showBatchWorkCalendar: false,
showSplitScheduleFlag: false, showSplitScheduleFlag: false,
updateRoutingRev:false,
showPartStockFlag: false, showPartStockFlag: false,
showChangeWaitTime: false, showChangeWaitTime: false,
scheduleIndex: -1, scheduleIndex: -1,
@ -1840,6 +1849,7 @@ export default {
/*组件*/ /*组件*/
components: { components: {
updateRoutingRev,
Chooselist,/*列表的组件*/ Chooselist,/*列表的组件*/
comSplitSchedule,/* 分批排产的组件 */ comSplitSchedule,/* 分批排产的组件 */
comWorkCalendarOut,/*工作日历外组件*/ comWorkCalendarOut,/*工作日历外组件*/
@ -2031,6 +2041,21 @@ export default {
this.updateProductRouting = true; this.updateProductRouting = true;
this.$refs.updateProductRouting.init(tempData); this.$refs.updateProductRouting.init(tempData);
}) })
}else if('更改工艺路线版本' === menuName) {
//
if (this.currentRoutingRow == null || this.currentRoutingRow == {}) {
//
this.detailMenuButton.updateProductRouting = true;
//
this.$message.error('请选择工单!');
return false;
}
let tempData = {'site': this.pageData.site, 'orderNo': this.currentRoutingRow.orderNo,'partNo': this.currentRoutingRow.partNo};
//
this.$nextTick(() => {
this.updateRoutingRev = true;
this.$refs.updateRoutingRev.init(tempData);
})
} }
}, },
@ -2556,6 +2581,9 @@ export default {
} }
}); });
}, },
updateRoutingRevClosed(){
this.getShopOrderList();
},
}, },

Loading…
Cancel
Save