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

上材料

master
Rui_Li 4 years ago
parent
8d5a994622
commit
4b1833ef54
4 changed files with 24 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/views/modules/yieldReport/com_defect_roll.vue
  2. 2
      src/views/modules/yieldReport/com_produce_down.vue
  3. 24
      src/views/modules/yieldReport/com_produce_report_normal.vue
  4. 22
      src/views/modules/yieldReport/com_produce_tool.vue

2
src/views/modules/yieldReport/com_defect_roll.vue
View File

@ -30,7 +30,7 @@
<el-row> <el-row>
<el-col :span="18"> <el-col :span="18">
<el-form-item :label="'不良原因:'"> <el-form-item :label="'不良原因:'">
<el-input readonly v-model="pageData.defectDesc" style="width: 495px"></el-input>
<el-input :readonly="true" v-model="pageData.defectDesc" style="width: 495px"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

2
src/views/modules/yieldReport/com_produce_down.vue
View File

@ -43,7 +43,7 @@
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
<el-form-item :label="'停机描述:'"> <el-form-item :label="'停机描述:'">
<el-input readonly v-model="pageData.downTimeDesc" style="width: 180px"></el-input>
<el-input :readonly="true" v-model="pageData.downTimeDesc" style="width: 180px"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

24
src/views/modules/yieldReport/com_produce_report_normal.vue
View File

@ -8,43 +8,43 @@
<!-- 第一行信息 --> <!-- 第一行信息 -->
<el-form style="margin-top: -10px;"> <el-form style="margin-top: -10px;">
<el-form-item label="订单号:"> <el-form-item label="订单号:">
<el-input v-model="scheduleData.orderNo" readonly style="width: 130px;"></el-input>
<el-input v-model="scheduleData.orderNo" :readonly="true" style="width: 130px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="物料编码:"> <el-form-item label="物料编码:">
<el-input v-model="scheduleData.partNo" readonly style="width: 130px;"></el-input>
<el-input v-model="scheduleData.partNo" :readonly="true" style="width: 130px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="物料名称/规则:"> <el-form-item label="物料名称/规则:">
<el-input v-model="scheduleData.partDesc" readonly style="width: 200px;"></el-input>
<el-input v-model="scheduleData.partDesc" :readonly="true" style="width: 200px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="派工单号:"> <el-form-item label="派工单号:">
<el-input v-model="scheduleData.seqNo" readonly style="width: 80px;"></el-input>
<el-input v-model="scheduleData.seqNo" :readonly="true" style="width: 80px;"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- 第二行信息 --> <!-- 第二行信息 -->
<el-form> <el-form>
<el-form-item label="要求完工日期"> <el-form-item label="要求完工日期">
<el-input v-model="scheduleData.planFinishTime" readonly style="width: 130px;"></el-input>
<el-input v-model="scheduleData.planFinishTime" :readonly="true" style="width: 130px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="要求开工日期"> <el-form-item label="要求开工日期">
<el-input v-model="scheduleData.planStartTime" readonly style="width: 130px;"></el-input>
<el-input v-model="scheduleData.planStartTime" :readonly="true" style="width: 130px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="原始派工单需求数量"> <el-form-item label="原始派工单需求数量">
<el-input v-model="scheduleData.qtyRequiredOriginal" readonly style="width: 80px;"></el-input>
<el-input v-model="scheduleData.qtyRequiredOriginal" :readonly="true" style="width: 80px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="排产日期"> <el-form-item label="排产日期">
<el-input v-model="scheduleData.scheduledDate" readonly style="width: 80px;"></el-input>
<el-input v-model="scheduleData.scheduledDate" :readonly="true" style="width: 80px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="班次"> <el-form-item label="班次">
<el-input v-model="scheduleData.shiftNo" readonly style="width: 80px;"></el-input>
<el-input v-model="scheduleData.shiftNo" :readonly="true" style="width: 80px;"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- 第三行信息 --> <!-- 第三行信息 -->
<el-form> <el-form>
<el-form-item label="前道工序"> <el-form-item label="前道工序">
<el-input v-model="scheduleData.preItemDesc" readonly style="width: 180px;"></el-input>
<el-input v-model="scheduleData.preItemDesc" :readonly="true" style="width: 180px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="后道工序" prop="languageDefault"> <el-form-item label="后道工序" prop="languageDefault">
<el-input v-model="scheduleData.nextItemDesc" readonly style="width: 180px;"></el-input>
<el-input v-model="scheduleData.nextItemDesc" :readonly="true" style="width: 180px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="''" style="margin-left: -5px;"> <el-form-item :label="''" style="margin-left: -5px;">
<el-checkbox style="margin-top: 28px;" true-label="true" false-label="false" <el-checkbox style="margin-top: 28px;" true-label="true" false-label="false"
@ -3074,7 +3074,7 @@ export default {
//打开生产过程的工具的页面 //打开生产过程的工具的页面
this.$nextTick(() => { this.$nextTick(() => {
this.showToolFlag = true; this.showToolFlag = true;
this.$refs.comProduceTool.init(this.scheduleData, this.operatorData, false)
this.$refs.comProduceTool.init(this.scheduleData, this.operatorData, 0)
}); });
}, },

22
src/views/modules/yieldReport/com_produce_tool.vue
View File

@ -29,24 +29,24 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item class="customer-item" label="原工具实例编码:"> <el-form-item class="customer-item" label="原工具实例编码:">
<el-input v-model="pageData.oriToolInstanceId" readonly="readonlyFlag" style="width: 100px;" ></el-input>
<el-input v-model="pageData.oriToolInstanceId" :readonly="readonlyFlag" style="width: 100px;" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item class="customer-item" label="本卷生产数量:"> <el-form-item class="customer-item" label="本卷生产数量:">
<el-input v-model="pageData.consumeQty" readonly="readonlyFlag" style="width: 100px;" ></el-input>
<el-input v-model="pageData.consumeQty" :readonly="readonlyFlag" style="width: 100px;" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item class="customer-item" label="之前卷以生产数量:"> <el-form-item class="customer-item" label="之前卷以生产数量:">
<el-input v-model="pageData.oriConsumeQty" readonly="readonlyFlag" style="width: 100px;" ></el-input>
<el-input v-model="pageData.oriConsumeQty" :readonly="readonlyFlag" style="width: 100px;" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item class="customer-item" label="累计生产数量:"> <el-form-item class="customer-item" label="累计生产数量:">
<el-input v-model="pageData.totalConsumeQty" readonly="readonlyFlag" style="width: 100px;" ></el-input>
<el-input v-model="pageData.totalConsumeQty" :readonly="readonlyFlag" style="width: 100px;" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -73,7 +73,7 @@ export default {
data() { data() {
return { return {
titleCon: '刀模板', titleCon: '刀模板',
sfdcTimeList: [],
readonlyFlag: true,
scheduleData: { scheduleData: {
site: this.$store.state.user.site, site: this.$store.state.user.site,
userName: this.$store.state.user.name, userName: this.$store.state.user.name,
@ -106,13 +106,11 @@ export default {
seqNo: '', seqNo: '',
rollNo: '', rollNo: '',
operatorId: '', operatorId: '',
replaceFlag: false,
toolInstanceId: '', toolInstanceId: '',
oriToolInstanceId: '', oriToolInstanceId: '',
consumeQty: 0, consumeQty: 0,
oriConsumeQty: 0, oriConsumeQty: 0,
totalConsumeQty: 0, totalConsumeQty: 0,
readonlyFlag: true,
checkFlag: false, checkFlag: false,
}, },
operatorData: { operatorData: {
@ -130,13 +128,12 @@ export default {
methods: { methods: {
//初始化组件的参数 //初始化组件的参数
init(scheduleData, operatorData, replaceFlag) {
init(scheduleData, operatorData, histSeqNo) {
debugger;
//初始化参数 //初始化参数
this.scheduleData = scheduleData; this.scheduleData = scheduleData;
//初始化操作员对象 //初始化操作员对象
this.operatorData = JSON.parse(JSON.stringify(operatorData)); this.operatorData = JSON.parse(JSON.stringify(operatorData));
//是否是切换
this.pageData.replaceFlag = replaceFlag;
//设置参数 //设置参数
this.pageData.orderNo = scheduleData.orderNo; this.pageData.orderNo = scheduleData.orderNo;
this.pageData.itemNo = scheduleData.itemNo; this.pageData.itemNo = scheduleData.itemNo;
@ -152,16 +149,18 @@ export default {
this.$refs.toolInstanceId.focus(); this.$refs.toolInstanceId.focus();
}); });
//区分是否是切换切换的 //区分是否是切换切换的
if(replaceFlag){
if(histSeqNo > 0){
this.pageData.consumeQty = 0; this.pageData.consumeQty = 0;
this.pageData.oriConsumeQty = 0; this.pageData.oriConsumeQty = 0;
this.pageData.totalConsumeQty = 0; this.pageData.totalConsumeQty = 0;
this.readonlyFlag = false; this.readonlyFlag = false;
this.replaceFlag = true;
}else{ }else{
this.pageData.consumeQty = ''; this.pageData.consumeQty = '';
this.pageData.oriConsumeQty = ''; this.pageData.oriConsumeQty = '';
this.pageData.totalConsumeQty = ''; this.pageData.totalConsumeQty = '';
this.readonlyFlag = true; this.readonlyFlag = true;
this.replaceFlag = false;
} }
}, },
@ -177,7 +176,6 @@ export default {
return false; return false;
} }
checkToolInstanceId(this.pageData).then(({data}) => { checkToolInstanceId(this.pageData).then(({data}) => {
//判断检查是否通过
//判断是否存在异常 //判断是否存在异常
if(data.code == 500){ if(data.code == 500){
this.$message.error(data.msg); this.$message.error(data.msg);

Write Preview
Loading…
Cancel
Save