|
|
@@ -104,7 +104,9 @@
|
|
|
<div v-if="tenant.labelMachineConf == '1'" class="szbInput">
|
|
|
<span>
|
|
|
<span>{{ $t("prepare.form.labelMachinePrograme") }}：</span>
|
|
|
- <el-input v-model="tenant.labelMachinePrograme" :placeholder='$t("common.pleaseEnter")' style="width: 500px;"></el-input>
|
|
|
+ <el-tooltip content="例如:C_1" placement="top">
|
|
|
+ <el-input v-model="tenant.labelMachinePrograme" :placeholder='$t("common.pleaseEnter")' style="width: 500px;"></el-input>
|
|
|
+ </el-tooltip>
|
|
|
</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -449,13 +451,34 @@ export default {
|
|
|
return false
|
|
|
}
|
|
|
// 可执行设备（位置）-简单验证
|
|
|
- /*if(this.tenant.productionresourceList.length <= 0){
|
|
|
+ if(this.tenant.threeDimensionalConf=="1" && this.tenant.threeDimensionalPrograme==''){
|
|
|
this.$message({
|
|
|
- message: "【可执行设备（位置）】没有数据~",
|
|
|
+ message: "三坐标配置启用检测程序不能为空",
|
|
|
type: 'warning'
|
|
|
})
|
|
|
return false
|
|
|
- }*/
|
|
|
+ }
|
|
|
+ if(this.tenant.labelMachineConf=="1" && this.tenant.labelMachinePrograme==''){
|
|
|
+ this.$message({
|
|
|
+ message: "打标机配置启用打标程序不能为空",
|
|
|
+ type: 'warning'
|
|
|
+ })
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ if(this.tenant.threeDimensionalDeviationConf=="1" && this.tenant.threeDimensionalDeviationPrograme==''){
|
|
|
+ this.$message({
|
|
|
+ message: "三坐标配置点检测配置启用检测程序不能为空",
|
|
|
+ type: 'warning'
|
|
|
+ })
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ if(this.tenant.randomCheckConf=="1" && this.tenant.randomCheckPrograme==''){
|
|
|
+ this.$message({
|
|
|
+ message: "工序抽检配置启用抽检程序不能为空",
|
|
|
+ type: 'warning'
|
|
|
+ })
|
|
|
+ return false
|
|
|
+ }
|
|
|
// 所需原材料-简单验证
|
|
|
/*if(this.tenant.meterialList.length <= 0){
|
|
|
this.$message({
|
