wilson
/
rongxing-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
Rui_Li 4 years ago
parent
68aa2f805d 59677eff22
commit
c39142b713
2 changed files with 245 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/api/base/site.js
  2. 243
      src/views/modules/base/maintainProductRouting.vue

4
src/api/base/site.js
View File

@ -133,3 +133,7 @@ export const changeRoutingStatus= data => createAPI(`/base/changeRoutingStatus`,
export const checkRoutingAndOrder= data => createAPI(`/base/checkRoutingAndOrder`,'post',data)
//修改订单工艺路线
export const changeOrderRouting= data => createAPI(`/base/changeOrderRouting`,'post',data)
//保存复制产品工艺路线
export const saveCopyRouting= data => createAPI(`/base/saveCopyRouting`,'post',data)
//保存默认
export const setDefault = data => createAPI(`/base/setDefault`,'post',data)

243
src/views/modules/base/maintainProductRouting.vue
View File

@ -38,8 +38,16 @@
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
<el-form-item :label="'备注：'">
<el-input v-model="mainData.remark" readonly style="width: 417px"></el-input>
<el-checkbox style="margin-left: 20px" disabled v-model="mainData.defaultflag">默认</el-checkbox>
<el-checkbox style="margin-left: 80px" disabled v-model="mainData.repairFlag">修复版本</el-checkbox>
<!-- <el-checkbox style="margin-left: 20px" disabled v-model="mainData.defaultflag">默认</el-checkbox>-->
<!-- <el-checkbox style="margin-left: 80px" disabled v-model="mainData.repairFlag">修复版本</el-checkbox>-->
</el-form-item>
<el-form-item :label="'默认：'">
<el-checkbox style="margin-left: 0px" disabled v-model="mainData.defaultflag"></el-checkbox>
</el-form-item>
<el-form-item :label="'修复版本：'" style="margin-left: 20px">
<el-checkbox style="margin-left: 0px" disabled v-model="mainData.repairFlag"></el-checkbox>
<el-button @click="setDefault()" type="primary" style="margin-left: 58px;margin-top: 0px">{{'设为默认'}}</el-button>
<el-button @click="copyRouting()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'复制产品工艺路线'}}</el-button>
</el-form-item>
</el-form>
<el-tabs v-model="activeName" >
@ -363,6 +371,85 @@
</el-footer>
</el-form>
</el-dialog>
<el-dialog title="复制产品工艺路线" :close-on-click-modal="false" v-drag :visible.sync="copyRoutingModelFlag" width="600px" >
<el-container>
<el-main style="width: 450px;margin-top: -20px">
<fieldset style="margin-left: 0px; margin-top: 0px; width: 420px;">
<legend>源产品工艺路线</legend>
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -8px;">
<el-form-item :label="'工艺路线编码：'">
<el-input v-model="copyRoutingData.partNo" disabled style="width: 120px;text-align: right" ></el-input>
</el-form-item>
<el-form-item :label="'工艺路线名称：'">
<el-input v-model="copyRoutingData.partDescription" disabled style="width: 250px;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="copyRoutingData.revNo" disabled style="width: 120px;text-align: right" ></el-input>
</el-form-item>
<el-form-item :label="'启用日期：'">
<el-input v-model="copyRoutingData.phaseInDate" disabled style="width: 120px;text-align: right" ></el-input>
</el-form-item>
<el-form-item :label="'修复版本：'">
<el-checkbox style="margin-left: 0px" disabled v-model="copyRoutingData.repairFlag"></el-checkbox>
</el-form-item>
</el-form>
</fieldset>
<fieldset style="margin-left: 0px; margin-top: 0px; width: 420px;">
<legend>新产品工艺路线</legend>
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -8px;">
<el-form-item >
<span slot="label" style="" @click="getBaseList(5)"><a herf="#">工艺路线编码：</a></span>
<el-input v-model="copyRoutingData.partNo1" @change="getPartDescription()" style="width: 120px;text-align: right" ></el-input>
</el-form-item>
<el-form-item :label="'工艺路线名称：'">
<el-input v-model="copyRoutingData.partDescription1" disabled style="width: 250px;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="copyRoutingData.revNo1" style="width: 120px;text-align: right" ></el-input>
</el-form-item>
<el-form-item :label="'启用日期：'">
<el-date-picker
style="width: 130px"
v-model="copyRoutingData.phaseInDate1"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item :label="'修复版本：'">
<el-checkbox style="margin-left: 0px" v-model="copyRoutingData.repairFlag1"></el-checkbox>
</el-form-item>
</el-form>
</fieldset>
</el-main>
<el-main style="width: 140px">
<div style="width: 115px;">
<el-checkbox style="margin-left: 0px" v-model="copyRoutingData.oldFlag"></el-checkbox>
<span style="font-size: 11px">自动停用早期所有版本 </span>
</div>
<div>
<span style="font-size: 11px;width: 115px">
(仅用于相同产品版本升级的时候)
</span>
</div>
<div style="width: 115px;margin-top: 15px">
<el-checkbox style="margin-left: 0px" v-model="copyRoutingData.toolFlag"></el-checkbox>
<span style="font-size: 11px">复制工具信息 </span>
</div>
<div style="width: 115px;margin-top: 15px">
<el-checkbox style="margin-left: 0px" v-model="copyRoutingData.resourceFlag"></el-checkbox>
<span style="font-size: 11px">复制可用机台 </span>
</div>
</el-main>
</el-container>
<el-footer style="height:40px;margin-top: 0px;text-align:center">
<el-button type="primary" @click="saveCopyRouting()">保存</el-button>
<el-button type="primary" @click="copyRoutingModelFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
</div>
</template>
@ -386,6 +473,8 @@
changeRoutingStatus,
checkRoutingAndOrder,
changeOrderRouting,
saveCopyRouting,
setDefault,
}from "@/api/base/site.js"
import Chooselist from '@/views/modules/common/Chooselist'
export default {
@ -431,12 +520,28 @@
configurationTemplateID:'',
modelFlag:'',
},
copyRoutingData:{
partNo:'',
partDescription:'',
revNo:'',
phaseInDate:'',
repairFlag:'',
partNo1:'',
partDescription1:'',
revNo1:'',
phaseInDate1:'',
repairFlag1:false,
oldFlag:false,
toolFlag:false,
resourceFlag:false,
},
activeName:'first',
modelFlag:false,
ToolmodelFlag:false,
detailmodelFlag:false,
detailmodelInputFlag:false,
toolmodelInputFlag:false,
copyRoutingModelFlag:false,
partFlag:false,
statusFlag:false,
dataList:[],
@ -1241,6 +1346,10 @@
this.toolData.toolID = val.ToolID
this.getToolDesc();
}
if (this.tagNo === 5){
this.copyRoutingData.partNo1 = val.PartNo
this.getPartDescription();
}
},
// 获取基础数据列表
getBaseList(val){
@ -1253,6 +1362,9 @@
if (val === 70){
strVal = this.toolData.toolID
}
if (val === 5){
strVal = this.copyRoutingData.partNo1
}
this.$refs.baseList.init(val,strVal)
})
},
@ -1923,6 +2035,133 @@
})
})
},
copyRouting(){
if(this.mainData.partNo==null||this.mainData.partNo==''){
this.$alert("请选择物料编码！", '错误', {
confirmButtonText: '确定'
})
return false;
}
this.copyRoutingData={
partNo:this.mainData.partNo,
partDescription:this.mainData.spec,
revNo:this.mainData.revNo,
phaseInDate:this.mainData.phaseInDate,
repairFlag:this.mainData.repairFlag,
partNo1:'',
partDescription1:'',
revNo1:'',
phaseInDate1:new Date(),
repairFlag1:false,
oldFlag:false,
toolFlag:false,
resourceFlag:false,
},
this.copyRoutingModelFlag=true;
},
saveCopyRouting(){
if(this.copyRoutingData.partNo1==''||this.copyRoutingData.partNo1==null){
this.$alert("请输入新物料号！",'错误',{
confirmButtonText:'确定'
})
return false;
}
if(this.copyRoutingData.revNo1==''||this.copyRoutingData.revNo1==null){
this.$alert("请输入新版本号！",'错误',{
confirmButtonText:'确定'
})
return false;
}
if(this.copyRoutingData.phaseInDate1==''||this.copyRoutingData.phaseInDate1==null){
this.$alert("请选择新启用日期！",'错误',{
confirmButtonText:'确定'
})
return false;
}
let repairFlag1='N';
if(this.copyRoutingData.repairFlag1===true){
repairFlag1='Y';
}
let inData={
site:this.mainData.site,
partNo:this.copyRoutingData.partNo,
revNo:this.copyRoutingData.revNo,
partNo1:this.copyRoutingData.partNo1,
revNo1:this.copyRoutingData.revNo1,
phaseInDate1:this.copyRoutingData.phaseInDate1,
repairFlag1:repairFlag1,
oldFlag:this.copyRoutingData.oldFlag,
toolFlag:this.copyRoutingData.toolFlag,
resourceFlag:this.copyRoutingData.resourceFlag,
user:this.$store.state.user.name
}
saveCopyRouting(inData).then(({data}) => {
if (data && data.code == 200) {
this.copyRoutingModelFlag = false
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {
}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
},
getPartDescription(){
let inData={
user:this.$store.state.user.name,
site:this.mainData.site,
partNo:this.copyRoutingData.partNo1
}
searchPartNoData(inData).then(({data}) => {
if (data.rows.length==0){
return false;
}
this.copyRoutingData.partDescription1 = data.rows[0].partDescription;
})
},
setDefault(){
if(this.mainData.partNo==null||this.mainData.partNo==''){
this.$alert("请选择物料编码！", '错误', {
confirmButtonText: '确定'
})
return false;
}
this.$confirm(`是否将此工艺路线版本设为默认?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let data1 = {
site: this.mainData.site,
partNo: this.mainData.partNo,
revNo: this.mainData.revNo,
}
setDefault(data1).then(({data}) => {
if (data && data.code == 200) {
this.mainData.defaultflag=true;
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {
}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
})
},
},
created() {

Write Preview
Loading…
Cancel
Save