fix:退火审批问题修改

src/App.vue

@@ -301,5 +301,12 @@ export default {
 	width: 9vh !important;
 	height: 9vh !important;
 }
+#progressbwlq .el-progress-bar__innerText{
+	width: 100%;
+    position: absolute;
+    top: 4px;
+    left: 50%;
+    color: #cccccc;
+}
 //排放系统
 </style>

src/views/wpm_gx/handover_form.vue

@@ -14,35 +14,6 @@
 			label-width="80px"
 		>
 			<el-row>
-				<el-col :md="12" :sm="24">
-					<el-form-item label="交接物料" prop="wm">
-						<el-select
-							v-model="form.wm"
-							placeholder="交接物料"
-							filterable
-							clearable
-							style="width: 100%"
-							@change="materialChange"
-						>
-							<el-option
-								v-for="item in materialOptions"
-								:key="item.id"
-								:label="item.batch"
-								:value="item.id"
-							>
-								<span>{{ item.batch }}</span>
-								<div style="float: right">
-									<span>{{ item.count }}</span>
-									<span
-										v-if="item.notok_sign_name !== null"
-										style="color: #aaaaaa"
-										>({{ item.notok_sign_name }})</span
-									>
-								</div>
-							</el-option>
-						</el-select>
-					</el-form-item>
-				</el-col>
 				<el-col :md="12" :sm="24">
 					<el-form-item label="交送日期" prop="send_date">
 						<el-date-picker
@@ -55,7 +26,7 @@
 						/>
 					</el-form-item>
 				</el-col>
-				<el-col :md="12" :sm="24">
+				<!-- <el-col :md="12" :sm="24">
 					<el-form-item label="交接数量" width="100">
 						<el-input-number
 							v-model="form.count"
@@ -68,7 +39,7 @@
 						>
 						</el-input-number>
 					</el-form-item>
-				</el-col>
+				</el-col> -->
 				<el-col :md="12" :sm="24">
 					<el-form-item label="交送人" prop="send_user">
 						<el-select
@@ -141,7 +112,60 @@
 						</el-select>
 					</el-form-item>
 				</el-col>
+				
 			</el-row>
+			<el-row>
+				<el-form-item label="交接物料">
+					<el-button type="primary" icon="el-icon-plus" @click="addMaterial"></el-button>
+				</el-form-item>
+			</el-row>
+			<el-row v-for="(listItem,$index) in form.handoverb" :key="listItem">
+					<el-col :span="11">
+						<el-form-item label="交接物料">
+							<el-select
+								v-model="listItem.wm"
+								placeholder="交接物料"
+								filterable
+								clearable
+								style="width: 100%"
+							>
+								<el-option
+									v-for="item in materialOptions"
+									:key="item.id"
+									:label="item.batch"
+									:value="item.id"
+								>
+									<span>{{ item.batch }}</span>
+									<div style="float: right">
+										<span>{{ item.count }}</span>
+										<span
+											v-if="item.notok_sign_name !== null"
+											style="color: #aaaaaa"
+											>({{ item.notok_sign_name }})</span
+										>
+									</div>
+								</el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="11">
+						<el-form-item label="交接数量">
+							<el-input-number
+								v-model="listItem.count"
+								controls-position="right"
+								:min="0"
+								step="1"
+								:step-strictly="true"
+								style="width: 100%"
+								placeholder="交接数量"
+							>
+							</el-input-number>
+						</el-form-item>
+					</el-col>
+					<el-col :span="2">
+						<el-button type="danger" icon="el-icon-delete" @click="delMaterial($index)"></el-button>
+					</el-col>
+				</el-row>
 		</el-form>
 		<el-footer>
 			<el-button type="primary" v-loading="isSaveing" @click="submit"
@@ -178,16 +202,15 @@ export default {
 				edit: "编辑交接记录",
 				show: "查看交接记录",
 			},
+			lists:[],//交接数组
 			handle_user: [],
 			form: {
-				batch: "",
-				count: 0, //送料数
-				wm: "",
 				send_date: "",
 				send_user: "",
 				send_mgroup: "",
 				recive_user: "",
 				recive_mgroup: "",
+				handoverb:[{wm:'',count:''}],
 			},
 			rules: {
 				batch: [
@@ -355,6 +378,12 @@ export default {
 					that.userList2 = res;
 				});
 		},
+		addMaterial(){
+			this.form.handoverb.push({wm:'',count:''});
+		},
+		delMaterial(index){
+			this.form.handoverb.splice(index,1);
+		},
 		//显示
 		open(mode = "add") {
 			this.mode = mode;
@@ -372,33 +401,28 @@ export default {
 			this.$refs.dialogForm.validate(async (valid) => {
 				if (valid) {
 					if (this.mode == "add") {
-						this.$API.wpm.handover.create
+						this.$API.wpm.handover.create.req(this.form).then((res) => {
-							.req(this.form)
+							this.isSaveing = false;
-							.then((res) => {
+							this.$emit("success", this.form, this.mode);
-								this.isSaveing = false;
+							this.visible = false;
-								this.$emit("success", this.form, this.mode);
+							this.$message.success("操作成功");
-								this.visible = false;
+						}).catch((err) => {
-								this.$message.success("操作成功");
+							//可以处理校验错误
-							})
+							this.isSaveing = false;
-							.catch((err) => {
+							return err;
-								//可以处理校验错误
+						});
-								this.isSaveing = false;
-								return err;
-							});
 					} else if (this.mode == "edit") {
-						this.$API.wpm.handover.update
+						this.$API.wpm.handover.update.req(this.form.id, this.form).then((res) => {
-							.req(this.form.id, this.form)
+							this.isSaveing = false;
-							.then((res) => {
+							this.$emit("success", this.form, this.mode);
-								this.isSaveing = false;
+							this.visible = false;
-								this.$emit("success", this.form, this.mode);
+							this.$message.success("操作成功");
-								this.visible = false;
+						})
-								this.$message.success("操作成功");
+						.catch((err) => {
-							})
+							//可以处理校验错误
-							.catch((err) => {
+							this.isSaveing = false;
-								//可以处理校验错误
+							return err;
-								this.isSaveing = false;
+						});
-								return err;
-							});
 					}
 				}
 			});

src/views/wpm_gx/inm.vue

@@ -102,7 +102,7 @@
 						<el-button
 							link size="small"
 							@click="table_Check(scope.row)"
-							v-auth="'mgroup.update'"
+							v-auth="'ftestwork.create'"
 							type="primary"
 							v-if="scope.row.notok_sign_name == null"
 							>检验

src/views/wpm_gx/mlog_detail.vue

@@ -39,6 +39,9 @@
 					<el-descriptions-item label="创建时间">{{
 						mlogItem.create_time
 					}}</el-descriptions-item>
+					<el-descriptions-item label="工单状态" v-if="mlogItem.mgroup_name=='退火'">
+						<el-tag v-if="mlogItem.ticket_">{{act_states[mlogItem.ticket_.act_state]}}</el-tag>
+					</el-descriptions-item>
 					<el-descriptions-item label="检验表单" v-if="mlogItem.mgroup_name=='退火'||mlogItem.mgroup_name=='黑化'">
 						<el-link :href="mlogItem.test_file" target="_blank" type="primary" :underline="false">{{mlogItem.test_file}}</el-link>
 					</el-descriptions-item>
@@ -60,7 +63,6 @@
 						@click="mlogSubmit"
 						>提交</el-button
 					>
-					
 					<!-- 退火-->
 					<el-button
 						type="primary"
@@ -351,12 +353,7 @@
 						</el-col>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="强度落球">
-								<el-input-number
+								<el-input v-model="oinfo_json.强度落球"/>
-									v-model="oinfo_json.强度落球"
-									:min="0"
-									style="width: 100%"
-									controls-position="right"
-								/>
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -443,6 +440,14 @@ export default {
 				抽检数:'',
 				强度落球:'',
 			},
+			act_states: {
+				0: "草稿中",
+				1: "进行中",
+				2: "被退回",
+				3: "被撤回",
+				4: "已完成",
+				5: "已关闭",
+			},
 			fileList:[],
 			test_file:'',
 			deptId: "",
@@ -479,6 +484,10 @@ export default {
 			let that = this;
 			that.$API.wpm.mlog.item.req(that.mlogId).then((res) => {
 				that.mlogItem = res;
+				if(res.test_file!==null){
+					that.fileList = [{name:res.test_file,url:res.test_file}];
+					that.form.test_file = res.test_file;
+				}
 				that.mgroup = res.mgroup;
 				that.materialIn = res.material_in;
 				that.deptId = res.belong_dept;
@@ -581,7 +590,7 @@ export default {
 					sum+=item;
 				});
 				this.oinfo_json.退火时间 = sum;
-				this.oinfo_json.退火炉号 = this.mlogItem.equipment_name.split("|")[0];
+				this.oinfo_json.退火炉号 =this.mlogItem.equipment_name!==null?this.mlogItem.equipment_name.split("|")[0]:'';
 				this.ticketDialog = true;
 			}
 		},

src/views/wpm_gx/mlogs.vue

@@ -276,11 +276,13 @@ export default {
 				let currentTime = data.getTime();
 				//开始时间
 				let startTime = new Date(row.work_start_time).getTime();
+				//结束时间
 				let endTime = new Date(row.work_end_time).getTime();
 				//已开始工作的时长
 				let times = (currentTime-startTime)/1000/60;
+				//总时长
 				let sum = row.reminder_interval_list[0]+row.reminder_interval_list[1];
-				if(currentTime>endTime){
+				if(endTime!==0&&(currentTime>endTime)){
 					percent = 100;
 					color = row.mstate_json[1].color;
 					context = '已完成';