Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

src/views/mtm/materials_gx.vue

@@ -190,7 +190,7 @@ export default {
 	},
 	data() {
 		return {
-			materialTemplate: "/media/template/material.xlsx",
+			materialTemplate: " /media/default/template/material.xlsx",
 			dialog: {
 				save: false,
 			},

src/views/qm/products_form.vue

@@ -88,9 +88,27 @@
 								></el-input-number>
 							</el-form-item>
 						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="检验人" prop="test_user">
+								<el-select
+									v-model="form.test_user"
+									placeholder="检验人"
+									clearable
+									filterable
+									style="width: 100%"
+								>
+									<el-option
+										v-for="item in userList"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id"
+									/>
+								</el-select>
+							</el-form-item>
+						</el-col>
 					</el-row>
 					<el-divider style="margin-top:0"></el-divider>
-					<el-row v-if="mode=='sizeAdd'||mode=='sizeEdit'">
+					<el-row v-if="mode=='sizeAdd'||mode=='sizeEdit'||mode=='sizeShow'">
 						<el-col :md="12" :sm="24">
 							<el-form-item label="黑圈内径">
 								<el-input-number
@@ -187,8 +205,44 @@
 								></el-input-number>
 							</el-form-item>
 						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="准合格">
+								<el-input-number
+									controls-position="right"
+									v-model="count_notok_json.count_n_zhg"
+									style="width: 100%"
+									precision="0"
+									:disabled="mode=='sizeShow'||mode=='facadeShow'"
+									@change="handleCountChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="圆准">
+								<el-input-number
+									controls-position="right"
+									v-model="count_notok_json.count_n_yz"
+									style="width: 100%"
+									precision="0"
+									:disabled="mode=='sizeShow'||mode=='facadeShow'"
+									@change="handleCountChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
 					</el-row>
 					<el-row v-else>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="脏">
+								<el-input-number
+									controls-position="right"
+									v-model="count_notok_json.count_n_z"
+									style="width: 100%"
+									precision="0"
+									:disabled="mode=='sizeShow'||mode=='facadeShow'"
+									@change="handleCountChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="气泡">
 								<el-input-number
@@ -336,6 +390,7 @@ export default {
 			},
 			loading: false,
 			form: {
+				type:'prod',
 				type2:20,
 				test_date: "",
 				batch: "",
@@ -354,7 +409,10 @@ export default {
 				count_n_yd: 0,
 				count_n_txd: 0,
 				count_n_hd: 0,
+				count_n_zhg: 0,
+				count_n_yz: 0,
 				//外观和内质
+				count_n_z:0,
 				count_n_qp: 0,
 				count_n_swen: 0,
 				count_n_bb: 0,
@@ -386,12 +444,13 @@ export default {
 			visible: false,
 			isSaveing: false,
 			options: [],
+			userList:[],
 			selectionFilters: [],
 			setFiltersVisible: false,
 		};
 	},
 	mounted() {
-		
+		this.getUsers();
 	},
 	methods: {
 		//显示
@@ -401,6 +460,15 @@ export default {
 			this.getMaterialBatch();
 			return this;
 		},
+		getUsers(){
+			let that = this;
+			let userList = [];
+			that.$API.system.user.list
+			.req({ page: 0, posts__code__contains: "check" })
+			.then((res) => {
+				that.userList = res;
+			});
+		},
 		handleCheckChange(){
 			this.form.count_ok  = this.form.count-this.form.count_notok;
 		},
@@ -433,7 +501,10 @@ export default {
 				this.count_notok_json.count_n_yd+
 				this.count_notok_json.count_n_txd+
 				this.count_notok_json.count_n_hd+
+				this.count_notok_json.count_n_zhg+
+				this.count_notok_json.count_n_yz+
 				this.count_notok_json.count_n_qp+
+				this.count_notok_json.count_n_z+
 				this.count_notok_json.count_n_swen+
 				this.count_notok_json.count_n_zb+
 				this.count_notok_json.count_n_hs+
@@ -511,7 +582,6 @@ export default {
 		setData(data) {
 			Object.assign(this.form, data);
 			this.formCount = this.form.count;
-			// this.form.test_group = this.form.split(",");
 		},
 		//设置过滤项
 		setFilters(filters) {

src/views/wpm_gx/check_form.vue

@@ -95,6 +95,24 @@
 								/>
 							</el-form-item>
 						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="检验人" prop="test_user">
+								<el-select
+									v-model="form.test_user"
+									placeholder="检验人"
+									clearable
+									filterable
+									style="width: 100%"
+								>
+									<el-option
+										v-for="item in userList"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id"
+									/>
+								</el-select>
+							</el-form-item>
+						</el-col>
 					</el-row>
 					<el-divider style="margin-top:0"></el-divider>
 					<el-row>
@@ -250,6 +268,7 @@ export default {
 			modeTitle: '',
 			loading: false,
 			form: {
+				type:'process',
 				type2:10,
 				test_date: "",
 				batch: "",
@@ -294,6 +313,7 @@ export default {
 			visible: false,
 			isSaveing: false,
 			options: [],
+			userList : [],
 			selectionFilters: [],
 			setFiltersVisible: false,
 		};
@@ -303,6 +323,8 @@ export default {
 		this.form.batch = this.itemObj.batch;
 		this.form.wm = this.itemObj.id;
 		this.form.count = this.itemObj.count;
+		this.deptID = this.$TOOL.data.get('gx_deptID');
+		this.getUsers();
 	},
 	methods: {
 		//显示
@@ -310,8 +332,25 @@ export default {
 			this.mode = mode;
 			this.modeTitle = mode+'抽检';
 			this.visible = true;
+			
 			return this;
 		},
+		getUsers(){
+			let that = this;
+			let userList = [];
+			that.$API.system.user.list
+			.req({ page: 0, posts__code__contains: "check" })
+			.then((res) => {
+				userList = res;
+				that.$API.system.user.list.req({ depts: that.deptID, page: 0 })
+				.then((res2) => {
+					res2.forEach((item) => {
+						userList.push(item);
+					});
+					that.userList = userList ;
+				});
+			});
+		},
 		handleCheckChange(){
 			this.form.count_ok  = this.form.count-this.form.count_notok;
 		},

src/views/wpm_gx/inm.vue

@@ -1,15 +1,15 @@
 <template>
 	<el-container>
 		<el-header>
-			<div class="left-panel" v-if="mgroupName!=='size'&&mgroupName!=='facade'">
+			<div class="left-panel">
 				<el-button type="primary" @click="tomio" v-auth="'mio.do'"
+				 v-if="mgroupName!=='size'&&mgroupName!=='facade'"
 					>领料</el-button
 				>
 				<el-button type="primary" @click="tomio" v-auth="'mio.do'"
 					>入库</el-button
 				>
 			</div>
-			<div class="left-panel" v-else></div>
 			<div class="right-panel">
 				<!-- <el-button type="primary" @click="materialsChoses('wm')"
 					>选择物料</el-button
@@ -191,6 +191,7 @@ export default {
 					return;
 				}
 				that.mgroupId = res[0].id;
+				that.$TOOL.data.set('gx_deptID',res[0].belong_dept)
 				that.params.mgroupx = res[0].id;
 				that.apiObj = that.$API.wpm.wmaterial.list;
 			});