|
|
@ -517,70 +517,69 @@ |
|
|
</el-form> |
|
|
</el-form> |
|
|
</fieldset> |
|
|
</fieldset> |
|
|
<!--其他操作--> |
|
|
<!--其他操作--> |
|
|
<fieldset class="customer-fieldset" |
|
|
|
|
|
style="margin-left: 680px; margin-bottom: 10px; width: 200px; height: 80px;"> |
|
|
|
|
|
<legend class="customer-legend">其他操作</legend> |
|
|
|
|
|
<el-form style="text-align: center;"> |
|
|
|
|
|
|
|
|
|
|
|
<el-form-item style="margin-top: 0px ; margin-left: 5px"> |
|
|
|
|
|
<el-popover |
|
|
|
|
|
placement="right" |
|
|
|
|
|
width="150" |
|
|
|
|
|
content |
|
|
|
|
|
v-model="popoverFlag" |
|
|
|
|
|
trigger="click"> |
|
|
|
|
|
<div style="text-align: right; margin: 0;width: 120px;"> |
|
|
|
|
|
<el-button type="primary" v-if="scheduleData.preItemNo <= 0" @click="finishPartRollModal" |
|
|
|
|
|
style=" width: 120px; margin-bottom: 5px; margin-left: 3PX"> |
|
|
|
|
|
产量报告 |
|
|
|
|
|
</el-button> |
|
|
|
|
|
<el-button type="primary" @click="switchRollReverse" |
|
|
|
|
|
style=" width: 120px; margin-bottom: 5px;margin-left: 3PX; "> |
|
|
|
|
|
删除卷 |
|
|
|
|
|
</el-button> |
|
|
|
|
|
<el-button type="primary" @click="notOverFinishRollModal" |
|
|
|
|
|
:disabled="!buttonTags.createNewRollFlag" |
|
|
|
|
|
style=" width: 120px; margin-bottom: 5px;margin-left: 3PX; "> |
|
|
|
|
|
未生产下机拆卷 |
|
|
|
|
|
</el-button> |
|
|
|
|
|
<el-button type="primary" @click="produceKeyMaterialModal" |
|
|
|
|
|
:disabled="buttonTags.createNewRollFlag" |
|
|
|
|
|
style=" width: 120px; margin-bottom: 5px;margin-left: 3PX; "> |
|
|
|
|
|
扫描卷 |
|
|
|
|
|
</el-button> |
|
|
|
|
|
</div> |
|
|
|
|
|
<el-button type="primary" class="controller-bun" :disabled="buttonTags.finishScheduleFlag" |
|
|
|
|
|
style=" width: 80px; margin-bottom: 5px; " |
|
|
|
|
|
slot="reference">其他操作 |
|
|
|
|
|
</el-button> |
|
|
|
|
|
</el-popover> |
|
|
|
|
|
</el-form-item> |
|
|
|
|
|
<el-form-item style="margin-top: 5px ; margin-left: 5px"> |
|
|
|
|
|
<el-popover |
|
|
|
|
|
placement="right" |
|
|
|
|
|
width="150" |
|
|
|
|
|
content |
|
|
|
|
|
v-model="popoverFlag2" |
|
|
|
|
|
trigger="click"> |
|
|
|
|
|
<div style="text-align: right; margin: 0;width: 120px;"> |
|
|
|
|
|
<el-button type="primary" :disabled="rollSplitButton " @click="rollSplit()" |
|
|
|
|
|
style=" width: 120px; margin-bottom: 5px; margin-left: 3PX"> |
|
|
|
|
|
创建分卷 |
|
|
|
|
|
</el-button> |
|
|
|
|
|
<el-button type="primary" @click="malformedMaterialModal" |
|
|
|
|
|
:disabled="malformedMaterialButtonFlag || rollSplitButton || scheduleData.closedFlag=='Y'" |
|
|
|
|
|
style=" width: 120px; margin-bottom: 5px; margin-left: 3PX"> |
|
|
|
|
|
扫描材料 |
|
|
|
|
|
</el-button> |
|
|
|
|
|
</div> |
|
|
|
|
|
<el-button type="primary" class="controller-bun" :disabled="buttonTags.materialMalformedFlag" |
|
|
|
|
|
style=" width: 80px; margin-bottom: 5px; " |
|
|
|
|
|
slot="reference">材料异常处理 |
|
|
|
|
|
</el-button> |
|
|
|
|
|
</el-popover> |
|
|
|
|
|
</el-form-item> |
|
|
|
|
|
</el-form> |
|
|
|
|
|
</fieldset> |
|
|
|
|
|
|
|
|
<!-- <fieldset class="customer-fieldset" style="margin-left: 680px; margin-bottom: 10px; width: 200px; height: 80px;">--> |
|
|
|
|
|
<!-- <legend class="customer-legend">其他操作</legend>--> |
|
|
|
|
|
<!-- <el-form style="text-align: center;">--> |
|
|
|
|
|
|
|
|
|
|
|
<!-- <el-form-item style="margin-top: 0px ; margin-left: 5px">--> |
|
|
|
|
|
<!-- <el-popover--> |
|
|
|
|
|
<!-- placement="right"--> |
|
|
|
|
|
<!-- width="150"--> |
|
|
|
|
|
<!-- content--> |
|
|
|
|
|
<!-- v-model="popoverFlag"--> |
|
|
|
|
|
<!-- trigger="click">--> |
|
|
|
|
|
<!-- <div style="text-align: right; margin: 0;width: 120px;">--> |
|
|
|
|
|
<!-- <el-button type="primary" v-if="scheduleData.preItemNo <= 0" @click="finishPartRollModal"--> |
|
|
|
|
|
<!-- style=" width: 120px; margin-bottom: 5px; margin-left: 3PX">--> |
|
|
|
|
|
<!-- 产量报告--> |
|
|
|
|
|
<!-- </el-button>--> |
|
|
|
|
|
<!-- <el-button type="primary" @click="switchRollReverse"--> |
|
|
|
|
|
<!-- style=" width: 120px; margin-bottom: 5px;margin-left: 3PX; ">--> |
|
|
|
|
|
<!-- 删除卷--> |
|
|
|
|
|
<!-- </el-button>--> |
|
|
|
|
|
<!-- <el-button type="primary" @click="notOverFinishRollModal"--> |
|
|
|
|
|
<!-- :disabled="!buttonTags.createNewRollFlag"--> |
|
|
|
|
|
<!-- style=" width: 120px; margin-bottom: 5px;margin-left: 3PX; ">--> |
|
|
|
|
|
<!-- 未生产下机拆卷--> |
|
|
|
|
|
<!-- </el-button>--> |
|
|
|
|
|
<!-- <el-button type="primary" @click="produceKeyMaterialModal"--> |
|
|
|
|
|
<!-- :disabled="buttonTags.createNewRollFlag"--> |
|
|
|
|
|
<!-- style=" width: 120px; margin-bottom: 5px;margin-left: 3PX; ">--> |
|
|
|
|
|
<!-- 扫描卷--> |
|
|
|
|
|
<!-- </el-button>--> |
|
|
|
|
|
<!-- </div>--> |
|
|
|
|
|
<!-- <el-button type="primary" class="controller-bun" :disabled="buttonTags.finishScheduleFlag"--> |
|
|
|
|
|
<!-- style=" width: 80px; margin-bottom: 5px; "--> |
|
|
|
|
|
<!-- slot="reference">其他操作--> |
|
|
|
|
|
<!-- </el-button>--> |
|
|
|
|
|
<!-- </el-popover>--> |
|
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
|
<!-- <el-form-item style="margin-top: 5px ; margin-left: 5px">--> |
|
|
|
|
|
<!-- <el-popover--> |
|
|
|
|
|
<!-- placement="right"--> |
|
|
|
|
|
<!-- width="150"--> |
|
|
|
|
|
<!-- content--> |
|
|
|
|
|
<!-- v-model="popoverFlag2"--> |
|
|
|
|
|
<!-- trigger="click">--> |
|
|
|
|
|
<!-- <div style="text-align: right; margin: 0;width: 120px;">--> |
|
|
|
|
|
<!-- <el-button type="primary" :disabled="rollSplitButton " @click="rollSplit()"--> |
|
|
|
|
|
<!-- style=" width: 120px; margin-bottom: 5px; margin-left: 3PX">--> |
|
|
|
|
|
<!-- 创建分卷--> |
|
|
|
|
|
<!-- </el-button>--> |
|
|
|
|
|
<!-- <el-button type="primary" @click="malformedMaterialModal"--> |
|
|
|
|
|
<!-- :disabled="malformedMaterialButtonFlag || rollSplitButton || scheduleData.closedFlag=='Y'"--> |
|
|
|
|
|
<!-- style=" width: 120px; margin-bottom: 5px; margin-left: 3PX">--> |
|
|
|
|
|
<!-- 扫描材料--> |
|
|
|
|
|
<!-- </el-button>--> |
|
|
|
|
|
<!-- </div>--> |
|
|
|
|
|
<!-- <el-button type="primary" class="controller-bun" :disabled="buttonTags.materialMalformedFlag"--> |
|
|
|
|
|
<!-- style=" width: 80px; margin-bottom: 5px; "--> |
|
|
|
|
|
<!-- slot="reference">材料异常处理--> |
|
|
|
|
|
<!-- </el-button>--> |
|
|
|
|
|
<!-- </el-popover>--> |
|
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
|
<!-- </el-form>--> |
|
|
|
|
|
<!-- </fieldset>--> |
|
|
|
|
|
|
|
|
<!-- 质量检验 --> |
|
|
<!-- 质量检验 --> |
|
|
<fieldset class="customer-fieldset" |
|
|
<fieldset class="customer-fieldset" |
|
|
@ -589,7 +588,7 @@ |
|
|
<el-form style="text-align: center;"> |
|
|
<el-form style="text-align: center;"> |
|
|
<el-form-item style="margin-top: 10px;"> |
|
|
<el-form-item style="margin-top: 10px;"> |
|
|
<el-button class="customer-bun-mid" type="primary" @click="openProcessInspectionModal" |
|
|
<el-button class="customer-bun-mid" type="primary" @click="openProcessInspectionModal" |
|
|
:style="processInspectionButtonStyle + 'margin-left: 15px; margin-bottom: 5px;'"> |
|
|
|
|
|
|
|
|
:disabled="buttonTags.processInspectionFlag" :style="processInspectionButtonStyle + 'margin-left: 15px; margin-bottom: 5px;'"> |
|
|
过程检验 |
|
|
过程检验 |
|
|
</el-button> |
|
|
</el-button> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
@ -3241,6 +3240,7 @@ export default { |
|
|
otherBunFlag: true, |
|
|
otherBunFlag: true, |
|
|
materialMalformedFlag: true, |
|
|
materialMalformedFlag: true, |
|
|
malformedMaterialFlag: true, |
|
|
malformedMaterialFlag: true, |
|
|
|
|
|
processInspectionFlag: true |
|
|
}, |
|
|
}, |
|
|
dataListLoading: false, |
|
|
dataListLoading: false, |
|
|
buttons: { |
|
|
buttons: { |
|
|
@ -4207,6 +4207,7 @@ export default { |
|
|
this.buttonTags.materialMalformedFlag = true |
|
|
this.buttonTags.materialMalformedFlag = true |
|
|
this.buttonTags.malformedMaterialFlag = true |
|
|
this.buttonTags.malformedMaterialFlag = true |
|
|
this.buttonTags.malformedMaterialButtonFlag = true |
|
|
this.buttonTags.malformedMaterialButtonFlag = true |
|
|
|
|
|
this.buttonTags.processInspectionFlag = true |
|
|
} else { |
|
|
} else { |
|
|
//存在人员既可以合并卷 |
|
|
//存在人员既可以合并卷 |
|
|
this.buttonTags.mergeRollFlag = false; |
|
|
this.buttonTags.mergeRollFlag = false; |
|
|
@ -4267,6 +4268,11 @@ export default { |
|
|
} else { |
|
|
} else { |
|
|
this.buttonTags.downTimeFlag = true; |
|
|
this.buttonTags.downTimeFlag = true; |
|
|
} |
|
|
} |
|
|
|
|
|
if (data.resultMap.processInspectionFlag == 'Y') { |
|
|
|
|
|
this.buttonTags.processInspectionFlag = false; |
|
|
|
|
|
} else { |
|
|
|
|
|
this.buttonTags.processInspectionFlag = true; |
|
|
|
|
|
} |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
let dto = { |
|
|
let dto = { |
|
|
|