zcdsj
/
hberp
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0525bugFixed

This commit is contained in:
shijing 2022-05-25 15:45:02 +08:00
parent 791b6606eb
commit 274503442f
3 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hb_client/src/views/inm/fifodetail.vue
View File

@ -53,8 +53,9 @@
v-if="this.$route.params.pu_order != null"
>
<template slot-scope="scope">
<el-tag v-if="scope.row.is_testok == false">不合格</el-tag>
<el-tag v-else>合格</el-tag>
<el-tag v-if="scope.row.is_testok">合格</el-tag>
<el-tag v-else-if="scope.row.is_testok===null">未复验</el-tag>
<el-tag v-else>不合格</el-tag>
</template>
</el-table-column>
@ -86,7 +87,7 @@
复验记录
</el-link>
<el-link
v-else-if="scope.row.need_test&&scope.row.test==[]"
v-if="scope.row.need_test&&scope.row.test.length===0"
type="primary"
@click="handleMaterial(scope)"
>

10
hb_client/src/views/mtm/materialdo.vue
View File

@ -154,6 +154,7 @@
:title="tableForm.name"
>
<customForm
v-if="dialogVisibleForm"
:results="dialogFieldList"
:hasPicture="hasPicture"
:formID="formID"
@ -549,7 +550,7 @@
};
const defaultrecordform = {enabled: false};
export default {
components: {Pagination, vueJsonEditor, Treeselect, customForm, faceLogin},
components: {Pagination,customForm, faceLogin},
data() {
return {
item:{},
@ -846,8 +847,10 @@
removeDomain(index) {
this.field_choice.splice(index, 1);
},
handleLook(scope) {
async handleLook(scope) {
debugger;
let that = this;
this.dialogFieldList=[];
that.tableForm = Object.assign({}, scope.row); // copy obj
that.formID = that.tableForm.id;
that.listQueryfield.form = that.formID;
@ -856,7 +859,7 @@
that.fieldList = response.data;
}
});
getrffieldList({page:0,form:that.formID}).then((response) => {
await getrffieldList({page:0,form:that.formID}).then((response) => {
if (response.data) {
this.hasPicture = false;
let list = response.data;
@ -885,7 +888,6 @@
that.dialogVisibleForm = true;
}
});
that.fieldLists();
},
checkPermission,
handleCurrentChange(row) {

36
hb_client/src/views/mtm/step.vue
View File

@ -251,16 +251,17 @@
>
<el-row v-for="(item,$index) in dialogFieldList" :key="$index">
<el-form-item v-if="item.field_type==='string'" :label="item.field_name">
<el-input placeholder="请输入"/>
<el-input placeholder="请输入" v-model="item.low_limit"/>
</el-form-item>
<el-form-item v-else-if="item.field_type==='int'" :label="item.field_name">
<el-input type="number" placeholder="请输入" />
<el-input type="number" placeholder="请输入" v-model="item.low_limit"/>
</el-form-item>
<el-form-item v-else-if="item.field_type==='float'" :label="item.field_name">
<el-input type="number" placeholder="请输入"/>
<el-input type="number" placeholder="请输入" v-model="item.low_limit"/>
</el-form-item>
<el-form-item v-else-if="item.field_type==='date'" :label="item.field_name">
<el-date-picker
v-model="item.low_limit"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd"
@ -270,6 +271,7 @@
</el-form-item>
<el-form-item v-else-if="item.field_type==='datetime'" :label="item.field_name">
<el-date-picker
v-model="item.low_limit"
type="datetime"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
@ -280,6 +282,7 @@
<el-form-item v-else-if="item.field_type==='select'" :label="item.field_name">
<el-select style="width: 100%" placeholder="请选择">
<el-option
v-model="item.low_limit"
v-for="item1 in item.field_choice"
:key="item1"
:label="item1"
@ -290,6 +293,7 @@
<el-form-item v-else-if="item.field_type==='selects'" :label="item.field_name">
<el-select style="width: 100%" multiple placeholder="请选择">
<el-option
v-model="item.low_limit"
v-for="item1 in item.field_choice"
:key="item1"
:label="item1"
@ -390,6 +394,9 @@
<el-form-item label="字段名称" prop="field_name">
<el-input v-model="field.field_name" placeholder="字段名称"/>
</el-form-item>
<el-form-item label="字段说明">
<el-input v-model="field.help_text" placeholder="字段说明"/>
</el-form-item>
<el-form-item
v-show="field.field_type==='radio'||field.field_type==='checkbox'||field.field_type==='select'||field.field_type==='selects'"
label="选项"
@ -755,12 +762,23 @@
},
//新增记录表
handleCreate() {
this.recordform = Object.assign({}, defaultrecordform);
this.dialogType = "new";
this.dialogVisible = true;
this.$nextTick(() => {
this.$refs["Forms"].clearValidate();
});
if(this.stepid!==''&&this.stepid!==null&&this.stepid!==undefined){
this.recordform = Object.assign({}, defaultrecordform);
this.dialogType = "new";
this.dialogVisible = true;
this.$nextTick(() => {
this.$refs["Forms"].clearValidate();
});
}else{
this.$confirm("请选择子工序", "警告", {
confirmButtonText: "确认",
type: "error",
}) .then(async () => {
})
.catch(() => {
});
}
},
//新增字段
handlefieldCreate() {