Merge branch 'master' of https://git.7in6.com/Minong/mes-admin-backend-ui

src/view/performance/chejianbaogong.vue

@@ -1,7 +1,7 @@
 <template>
-  <div style="margin-left: 0px;padding: 0px;">
+  <div style="margin-left: 0px;padding: 2px;">
 	<header>
-		<div style="height: 110px;">
+		<div style="height: 140px;">
 			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 16px;font-weight: bold;width: 70px"  @click="onBZ" >班组维护</el-button>
 			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 16px;font-weight: bold;width: 90px"  @click="onchanliang"  v-if="zdtreeType === true" >日产量上报</el-button>
 			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 16px;font-weight: bold;width: 70px"  @click="onzhicheng"  >制程检验</el-button>
@@ -23,27 +23,27 @@
     <el-container>
       <el-container>
         <el-main style="padding: 0px;">
-			<div class="gva-search-box" style=" overflow: hidden; padding: 0; margin-top:50px;display: flex;">
+			<div class="gva-search-box" style=" overflow: hidden; padding: 0; display: flex;">
 			  <div style="flex: 1; border: 0px magenta solid; margin: 0; padding: 0; margin-left: 20px; margin-top: 20px; color: red;">
 	
 				<el-row :gutter="20">
 					<el-col :span="5">
-						<el-form-item label="机台号" prop="id" label-width="60" class="zy-label"><el-input v-model="formData.机台号"  placeholder=""/></el-form-item>
+						<el-form-item label="机台号" prop="id" label-width="60" class="zy-label"><el-input v-model="formData.机台号" readonly  placeholder=""/></el-form-item>
 					</el-col>
 					<el-col :span="6">
-						<el-form-item label="工单编号" prop="id"><el-input v-model="formData.工单编号"  placeholder=""  /></el-form-item>
+						<el-form-item label="工单编号" prop="id"><el-input v-model="formData.工单编号"    placeholder=""  /></el-form-item>
 					</el-col>
 					<el-col :span="12">
-						<el-form-item label=" "prop="name"><el-input v-model="formData.产品名称"  placeholder="" /></el-form-item>
+						<el-form-item label=" "prop="name"><el-input v-model="formData.产品名称"  readonly  placeholder="" /></el-form-item>
 					</el-col>
 				</el-row>
 		
 				<el-row :gutter="20">
 					<el-col :span="7">
-						<el-form-item label="印件编号" style="font-size: 1.5vh;" prop="id"><el-input v-model="formData.印件号"  placeholder="" /></el-form-item>
+						<el-form-item label="印件编号" style="font-size: 1.5vh;" prop="id"><el-input v-model="formData.印件号"  readonly  placeholder="" /></el-form-item>
 					</el-col>
 					<el-col :span="15">
-						<el-form-item label="工序名称" prop="name"><el-input v-model="formData.工序名称"  placeholder="" /></el-form-item>
+						<el-form-item label="工序名称" prop="name"><el-input v-model="formData.工序名称"  readonly  placeholder="" /></el-form-item>
 					</el-col>
 				</el-row>
 
@@ -56,14 +56,14 @@
 				<el-row :gutter="1">
 				  <!-- 循环生成 el-input 组件 -->
 				  <el-col v-for="i in 6" :span="4" :key="i">
-					<el-input v-model="formData[`sczl_bh${i}`]"  placeholder="" />
+					<el-input v-model="formData[`sczl_bh${i}`]"  readonly  placeholder="" />
 				  </el-col>
 				</el-row>
 
 				<el-row :gutter="1">
 				  <!-- 循环生成 el-input 组件 -->
 				  <el-col v-for="i in 6" :span="4" :key="i">
-					<el-input v-model="formData[`sczl_name${i}`]"  placeholder="" class="red-input"/>
+					<el-input v-model="formData[`sczl_name${i}`]"  readonly  placeholder="" class="red-input"/>
 				  </el-col>
 				</el-row>
 			</div>
@@ -71,7 +71,7 @@
 			<div style="border: 0px lawngreen solid; margin: 0; padding: 0;width:34%;">
 			 <el-table tooltip-effect="dark" :data="selectData" row-key="ID" highlight-current-row="true" border
 			  :row-style="{ height: '10px'}" :cell-style="{ padding: '0px'}"
-			  :header-row-style="{ height: '10px'}" style="width:100%;height: 30vh;"  @row-dblclick="handleSelectClick" >
+			  :header-row-style="{ height: '10px'}" style="width:100%;height: 28vh;"  @row-dblclick="handleSelectClick" >
 			   <el-table-column prop="process" label="印件及工序"width="290" />
 			   <el-table-column prop="completed" label="已完成板数"/>
 			 </el-table>
@@ -133,17 +133,17 @@
 					@selection-change="handleSelectionChange"
 					@row-click="clickybupdate">
 			    <el-table-column type="selection" label="选择" width="55" />
-				<el-table-column align="left" label="班组号" prop="班组号" width="80" />
-				<el-table-column align="left" label="组员1" prop="0" width="240" />
-				<el-table-column align="left" label="组员2" prop="1" width="240" />
-				<el-table-column align="left" label="组员3" prop="2" width="240" />
-				<el-table-column align="left" label="组员4" prop="3" width="240" />
-				<el-table-column align="left" label="组员5" prop="4" width="220" />
+				<el-table-column align="left" label="班组号" prop="班组号" width="70" />
+				<el-table-column align="left" label="组员1" prop="0" width="180" />
+				<el-table-column align="left" label="组员2" prop="1" width="180" />
+				<el-table-column align="left" label="组员3" prop="2" width="180" />
+				<el-table-column align="left" label="组员4" prop="3" width="180" />
+				<el-table-column align="left" label="组员5" prop="4" width="180" />
 				<el-table-column align="left" label="组员6" prop="5" width="100" />
 				<el-table-column align="left" label="组员7" prop="6" width="100" />
 				<el-table-column align="left" label="组员8" prop="7" width="100" />
 				<el-table-column align="left" label="组员9" prop="8" width="100" />
-				<el-table-column align="left" label="组员10" prop="9_正品版" width="120" />
+				<el-table-column align="left" label="组员10" prop="9" width="120" />
 			  </el-table>
 			</el-tab-pane>
 
@@ -595,7 +595,7 @@
 		    <div style="flex: 0.1;">
 		      <el-aside width="32vh" style="margin: 0;">
 		        <div class="JKWTree-tree" style="height: 100%; border-right: 1px solid #ebeef5;">
-		          <el-tree :data="zhichengtreeData" :props="defaultProps" highlight-current="true"
+		          <el-tree :data="zhichengtreeData" :props="zhichengtreeDatadefaultProps" highlight-current="true"
 		            @node-click="zhichengNodeClick"></el-tree>
 		        </div>
 		      </el-aside>
@@ -2484,13 +2484,18 @@ const huanxingselectData = ref([])
 const huanxingData = ref({})
 const dbformData=ref({})
 const huanxingstatus=ref(false)
-const zhichengtreeData=ref([{
-	label: '首件与过程确认'
-},{
-	label: '机台检验'
-},{
-	label: 'IPQC检验'
-}])
+// 定义树的数据
+const zhichengtreeData = ref([
+  { label: '首件与过程确认' },
+  { label: '机台检验' },
+  { label: 'IPQC检验' }
+]);
+
+// // 配置树的节点属性
+const zhichengtreeDatadefaultProps = {
+  children: 'children',  // 用来指定每个节点的子节点的字段
+  label: 'label'         // 用来指定每个节点的文本的字段
+};
 let  dianjiantreeData;
 let JTMC=ref()
 let CJMC=ref()