|
|
@@ -121,8 +121,9 @@
|
|
|
<el-input
|
|
|
type="textarea"
|
|
|
v-model="row.remark"
|
|
|
- placeholder="请输入备注"
|
|
|
+ :placeholder="row.isPass === 0 ? '审核不通过,请输入备注(必填)' : '请输入备注'"
|
|
|
:rows="1"
|
|
|
+ :class="{ 'remark-error': row.isPass === 0 && !row.remark }"
|
|
|
></el-input>
|
|
|
</template>
|
|
|
</ele-pro-table>
|
|
|
@@ -185,8 +186,9 @@
|
|
|
<el-input
|
|
|
type="textarea"
|
|
|
v-model="row.remark"
|
|
|
- placeholder="请输入备注"
|
|
|
+ :placeholder="row.isPass === 0 ? '审核不通过,请输入备注(必填)' : '请输入备注'"
|
|
|
:rows="1"
|
|
|
+ :class="{ 'remark-error': row.isPass === 0 && !row.remark }"
|
|
|
></el-input>
|
|
|
</template>
|
|
|
</ele-pro-table>
|
|
|
@@ -570,6 +572,37 @@
|
|
|
this.visible = false;
|
|
|
});
|
|
|
},
|
|
|
+ // 校验放行规则备注(isPass为否时备注必填)
|
|
|
+ validateDetailsRemark() {
|
|
|
+ const scNoRemarkItems = this.scDetails.filter(
|
|
|
+ (item) => item.isPass === 0 && !item.remark
|
|
|
+ );
|
|
|
+ const zjNoRemarkItems = this.zjDetails.filter(
|
|
|
+ (item) => item.isPass === 0 && !item.remark
|
|
|
+ );
|
|
|
+
|
|
|
+ if (scNoRemarkItems.length > 0) {
|
|
|
+ const names = scNoRemarkItems
|
|
|
+ .map((item) => item.mainIndicatorName)
|
|
|
+ .join('、');
|
|
|
+ this.$message.warning(
|
|
|
+ `生产放行规则中【${names}】审核不通过,备注为必填项`
|
|
|
+ );
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (zjNoRemarkItems.length > 0) {
|
|
|
+ const names = zjNoRemarkItems
|
|
|
+ .map((item) => item.mainIndicatorName)
|
|
|
+ .join('、');
|
|
|
+ this.$message.warning(
|
|
|
+ `质检放行规则中【${names}】审核不通过,备注为必填项`
|
|
|
+ );
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
+ return true;
|
|
|
+ },
|
|
|
// 提交
|
|
|
// submit(type) {
|
|
|
// console.log('this.form', this.form);
|
|
|
@@ -634,6 +667,11 @@
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
+ // 校验放行规则备注(isPass为否时备注必填)
|
|
|
+ if (!this.validateDetailsRemark()) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
this.butLoading = true;
|
|
|
|
|
|
const text = type == 'save' ? '保存中...' : '提交中...';
|
|
|
@@ -957,4 +995,10 @@
|
|
|
cursor: pointer;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ .remark-error {
|
|
|
+ ::v-deep .el-textarea__inner {
|
|
|
+ border-color: #f56c6c !important;
|
|
|
+ }
|
|
|
+ }
|
|
|
</style>
|