diff --git a/public/index.html b/public/index.html
index c795e9f4..29e26569 100644
--- a/public/index.html
+++ b/public/index.html
@@ -41,11 +41,11 @@
-

+
-
-
+
+
diff --git a/src/views/qm/first_check.vue b/src/views/qm/first_check.vue
index acd6c079..2eb81d74 100644
--- a/src/views/qm/first_check.vue
+++ b/src/views/qm/first_check.vue
@@ -1,28 +1,12 @@
-
+
-
+
-
+
@@ -47,47 +31,24 @@
-
-
+
+
-
-
-
+
+
+
-
-
+
+
@@ -113,7 +74,7 @@ export default {
return {
loading: false,
form: {
- ftestitems:[
+ ftestitems: [
// {testitem:'椭圆度(≤0.02mm)',test_val:'',check_val:''},
// {testitem:'锥度(≤0.05mm)',test_val:'',check_val:''},
// {testitem:'直径(≥29.0)',test_val:'',check_val:''},
@@ -121,18 +82,18 @@ export default {
],
},
rules: {
- belong_dept: [{required: true, message: "请选择所属部门", trigger: "blur"}],
- test_date: [{required: true, message: "请选择检验日期", trigger: "blur"}],
- test_user: [{required: true, message: "请选择操作人", trigger: "blur"}],
- check_user: [{required: true, message: "请选择专检人", trigger: "blur"}],
- test_group:[{required: true, message: "请选择检测工序集", trigger: "blur"}],
- is_ok: [{required: true, message: "请选择是否合格", trigger: "blur"}],
- },
+ belong_dept: [{ required: true, message: "请选择所属部门", trigger: "blur" }],
+ test_date: [{ required: true, message: "请选择检验日期", trigger: "blur" }],
+ test_user: [{ required: true, message: "请选择操作人", trigger: "blur" }],
+ check_user: [{ required: true, message: "请选择专检人", trigger: "blur" }],
+ test_group: [{ required: true, message: "请选择检测工序集", trigger: "blur" }],
+ is_ok: [{ required: true, message: "请选择是否合格", trigger: "blur" }],
+ },
visible: false,
isSaveing: false,
- userList:[],
+ userList: [],
options: [],
- processOptions: ['粗中细磨','抛光','半抛光'],
+ processOptions: ['粗中细磨', '抛光', '半抛光'],
deptOptions: [],
selectionFilters: [],
setFiltersVisible: false,
@@ -154,12 +115,12 @@ export default {
return this;
},
//获取检验项目
- getTextItem(){
+ getTextItem() {
let that = this;
- that.$API.qm.getTestItem.get({tag:'first',page:0}).then(res=>{
+ that.$API.qm.getTestItem.get({ tag: 'first', page: 0 }).then(res => {
console.log(res)
let ftestitems = [];
- res.forEach(item=>{
+ res.forEach(item => {
let obj = {};
obj.testitem = item.id;
obj.testName = item.name;
@@ -173,15 +134,15 @@ export default {
},
//获取部门列表
getDeptOptions() {
- this.$API.system.dept.list.req({ page: 0, type__in: 'dept' }).then((res) => {
- this.deptOptions = res;
- });
+ this.$API.system.dept.list.req({ page: 0, type__in: 'dept' }).then((res) => {
+ this.deptOptions = res;
+ });
},
//获取员工
- getUserList(){
+ getUserList() {
let that = this;
- this.$API.system.user.list.req({page_size:20,page:1}).then(res=>{
- that.userList = res.results;
+ this.$API.system.user.list.req({ page: 0, depts__name: '检验管理部' }).then(res => {
+ that.userList = res;
});
},
// getProcess(){
@@ -204,21 +165,21 @@ export default {
this.isSaveing = true;
try {
if (this.mode == "add") {
- this.$API.qm.ftest.create.req(this.form).then(res=>{
+ this.$API.qm.ftest.create.req(this.form).then(res => {
this.isSaveing = false;
this.$emit("success");
this.visible = false;
this.$message.success("操作成功");
})
} else if (this.mode == "edit") {
- this.$API.qm.ftest.update.req(this.form.id,this.form).then(res=>{
+ this.$API.qm.ftest.update.req(this.form.id, this.form).then(res => {
this.isSaveing = false;
this.$emit("success");
this.visible = false;
this.$message.success("操作成功");
})
}
-
+
} catch (err) {
//可以处理校验错误
this.isSaveing = false;
@@ -241,5 +202,4 @@ export default {
};
-
+