MES-WEB-VUEUI.git

			@@ -5,7 +5,7 @@
			<el-button type="primary" @click="close">退出</el-button>
			<!-- <el-button @click="cancel">取消</el-button> -->
			</div>
			<div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">器具档案编辑</div>
			<div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">容器档案编辑</div>
			<el-form ref="form" :model="form" :rules="rules" label-width="140px">
			<el-tabs v-model="activeName" type="card">
			<el-tab-pane label="基本信息" name="first">
			@@ -30,25 +30,25 @@
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="器具编号" prop="HMouldNo" v-show="isShow">
			<el-input v-model="form.HMouldNo" placeholder="请输入器具编号" />
			<el-form-item label="容器编号" prop="HMouldNo" v-show="isShow">
			<el-input v-model="form.HMouldNo" placeholder="请输入容器编号" />
			</el-form-item>
			</el-col>
			</el-row>
			<el-row>
			<el-col :span="6">
			<el-form-item label="器具名称" prop="HName" v-show="isShow">
			<el-input v-model="form.HName" placeholder="请输入器具名称" />
			<el-form-item label="容器名称" prop="HName" v-show="isShow">
			<el-input v-model="form.HName" placeholder="请输入容器名称" />
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="器具规格" prop="HModel" v-show="isShow">
			<el-input v-model="form.HModel" placeholder="请输入器具规格" />
			<el-form-item label="容器规格" prop="HModel" v-show="isShow">
			<el-input v-model="form.HModel" placeholder="请输入容器规格" />
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="器具型号" prop="HModel2" v-show="isShow">
			<el-input v-model="form.HModel2" placeholder="请输入器具型号" />
			<el-form-item label="容器型号" prop="HModel2" v-show="isShow">
			<el-input v-model="form.HModel2" placeholder="请输入容器型号" />
			</el-form-item>
			</el-col>
			<el-col :span="6">
			@@ -88,8 +88,8 @@
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="器具分类" prop="HMouleTypeName" v-show="isHide">
			<el-input v-model="form.HMouleTypeName" placeholder="请输入器具分类" disabled>
			<el-form-item label="容器分类" prop="HMouleTypeName" v-show="isHide">
			<el-input v-model="form.HMouleTypeName" placeholder="请输入容器分类" disabled>
			<el-button slot="append" icon="el-icon-search"></el-button>
			</el-input>
			</el-form-item>
			@@ -129,7 +129,7 @@
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="器具状态" prop="HMouldStatus" v-show="isHide">
			<el-form-item label="容器状态" prop="HMouldStatus" v-show="isHide">
			<el-select v-model="form.HMouldStatus" placeholder="请选择">
			<el-option label="在库" value="在库" />
			<el-option label="上机" value="上机" />
			@@ -232,14 +232,14 @@
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="器具类型" prop="HMouldClass" v-show="isHide">
			<el-form-item label="容器类型" prop="HMouldClass" v-show="isHide">
			<el-select v-model="form.HMouldClass" placeholder="请选择">
			<el-option label="模具" value="模具" />
			<el-option label="工装" value="工装" />
			<el-option label="夹具" value="夹具" />
			<el-option label="刀具" value="刀具" />
			<el-option label="检具" value="检具" />
			<el-option label="周转器具" value="周转器具" />
			<el-option label="周转容器" value="周转容器" />
			<el-option label="其他" value="其他" />
			</el-select>
			</el-form-item>
			@@ -266,7 +266,7 @@
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="器具可用状态" prop="HMouldUseStatus" v-show="isHide">
			<el-form-item label="容器可用状态" prop="HMouldUseStatus" v-show="isHide">
			<el-select v-model="form.HMouldUseStatus" placeholder="请选择">
			<el-option label="正常" value="正常" />
			<el-option label="异常" value="异常" />
			@@ -389,7 +389,7 @@
			</el-tab-pane>
			</el-tabs>
			<el-tabs type="border-card" v-show="isHide">
			<el-tab-pane label="子器具">
			<el-tab-pane label="子容器">
			<div style="margin-bottom: 10px;">
			<el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(type = 'edit')"
			size="mini">增加一行</el-button>
			@@ -400,7 +400,7 @@
			@selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
			<el-table-column type="selection" width="55" align="center" />
			<el-table-column align="center" label="序号" type="index" width="80" />
			<el-table-column align="center" label="子器具">
			<el-table-column align="center" label="子容器">
			<template slot-scope="scope">
			<el-input v-model="scope.row.HMouldFileName" />
			</template>
			@@ -992,6 +992,7 @@
			HDeleteDate: '',
			HInComDate: moment(new Date()).format('YYYY-MM-DD'),
			DateTime: moment(new Date()).format('YYYY-MM-DD'),
			HCalibrationDate: moment(new Date()).format('YYYY-MM-DD'),
			}
			this.editData = []
			this.editBtData = []
			@@ -1065,6 +1066,7 @@
			axios.get(this.baseURL + "/Gy_Mould_Edit/xg", {
			params: { 'HInterID': rowHmainid }
			}).then(response => {
			console.log(response.data)
			if (response.data.count == 1) {
			var result = response.data
			var data = response.data.data[0]
			@@ -1137,12 +1139,16 @@
			this.form.HMouldUseStatus = data.模具可用状态
			this.form.HNextMainDate = data.校正日期
			this.form.HUSEORGID = data.HUSEORGID
			this.form.HMouldLength = data.HMouldLength
			this.form.HMouldWidth = data.HMouldWidth
			this.form.HMouldHeight = data.HMouldHeight
			this.form.HMouldFoldHeight = data.HMouldFoldHeight
			this.form.HTransPackFlag = data.HTransPackFlag == 0 ? false : true
			this.form.HSendPackFlag = data.HSendPackFlag == 0 ? false : true
			// this.form.HMouldLength = data.HMouldLength
			// this.form.HMouldWidth = data.HMouldWidth
			// this.form.HMouldHeight = data.HMouldHeight
			// this.form.HMouldFoldHeight = data.HMouldFoldHeight
			this.form.HTransPackFlag = data.发货容器标记
			this.form.HSendPackFlag = data.周转容器标记
			this.form.HMouldFoldHeight = data.折叠高度
			this.form.HMouldLength = data.长
			this.form.HMouldWidth = data.宽
			this.form.HMouldHeight = data.高
			for (var i = 0; i < result.data.length; i++) {
			this.editData.push(
			{