liuhairui 1 년 전
부모
커밋
67a78037b2
3개의 변경된 파일106개의 추가작업 그리고 132개의 파일을 삭제
  1. 1 1
      src/view/performance/06-packingDocuments/index.vue
  2. 2 1
      src/view/performance/09-workOrderVerification/index.vue
  3. 103 130
      src/view/performance/chejianbaogong.vue

+ 1 - 1
src/view/performance/06-packingDocuments/index.vue

@@ -825,7 +825,7 @@ const SelectClickBz = (row, column, event) => {
 			restoredData[`sczl_Jtbh${num}`] = item.sczl_Jtbh1
 			restoredData[`sczl_dedh${num}`] = item.sczl_dedh
 		})
-		console.log(restoredData)
+	
 		const res = await addPackingTable(restoredData)
 		if (res.code === 0) {
 			ElMessage({

+ 2 - 1
src/view/performance/09-workOrderVerification/index.vue

@@ -88,7 +88,7 @@
 								</el-col>
 								<el-col :span="5">
 									<el-form-item label="废品总数">
-										<el-input v-model="detailData.qczl_fp" @keydown="ent1($event)" style="width: 100px;" />
+										<el-input v-model="detailData.qczl_fp"  @keydown="ent1($event)" style="width: 100px;" />
 									</el-form-item>
 								</el-col>
 							</el-row>
@@ -1083,6 +1083,7 @@
 					obj['qczl_NumDesc6'] = '0'
 					obj['qczl_NumDesc7'] = '0'
 					obj['qczl_NumDesc8'] = '0'
+					obj['qczl_fp'] = ''
 					Object.assign(detailData, obj)
 					const table = []
 

+ 103 - 130
src/view/performance/chejianbaogong.vue

@@ -1376,12 +1376,12 @@
 								  </el-col>
                   <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
                     <el-form-item label="装版总时长"  prop="id" style="margin-top=0px; margin-bottom: 1px;">
-                      <el-input v-model="formData3.装版总时长" id="装版总时长" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '墨色', '装版总时长', '打样总工时')"   placeholder="" />
+                      <el-input v-model="formData3.装版总时长" disabled id="装版总时长" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '墨色', '装版总时长', '打样总工时')"   placeholder="" />
                     </el-form-item>
                   </el-col>
                     <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
                       <el-form-item label="打样总工时" label-width="100" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-                        <el-input v-model="formData3.打样总工时" style="margin-top=0px; margin-bottom: 1px;" id="打样总工时"  @keydown="ent($event, '装版总时长', '打样总工时', '通电工时')"  placeholder="" />
+                        <el-input v-model="formData3.打样总工时" disabled style="margin-top=0px; margin-bottom: 1px;" id="打样总工时"  @keydown="ent($event, '装版总时长', '打样总工时', '通电工时')"  placeholder="" />
                       </el-form-item>
                     </el-col>
                     <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
@@ -1390,38 +1390,36 @@
                       </el-form-item>
                     </el-col>
                   </el-row>
-
-
-               					<el-row :gutter="20" style="margin-top=0px; margin-bottom: 1vh;">
-									<el-col :span="1" style="margin-top=0px; margin-bottom: 1px;">
-									</el-col>
-               					    <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
-               					    <el-form-item label="定额代号" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-               					      <el-input v-model="formData3.定额代号" id="定额代号" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '通电工时', '定额代号', '码包')"  placeholder="" />
-               					    </el-form-item>
-               					    </el-col>
-               						<el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
-               						</el-col>
-               						  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
-               						  <el-form-item label="码包" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-               							<el-input v-model="formData3.码包" style="margin-top=0px; margin-bottom: 1px;" id="码包"  @keydown="ent($event, '定额代号', '码包', '主电表')"  placeholder="" />
-               						  </el-form-item>
-               						  </el-col>
-               						  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
-               						  <el-form-item label="主电表" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-               							<el-input v-model="formData3.主电表" style="margin-top=0px; margin-bottom: 1px;" id="主电表"  @keydown="ent($event, '码包', '主电表', '辅电表')"  placeholder="" />
-               						  </el-form-item>
-               						  </el-col>
-               						  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
-               						  <el-form-item label="辅电表" prop="id" style="margin-top=0px; margin-bottom: 1px;">
-               							<el-input v-model="formData3.辅电表" id="辅电表" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '主电表', '辅电表', 'bzdh')"  placeholder="" />
-               						  </el-form-item>
-               						  </el-col>
-               					  </el-row>
+					<el-row :gutter="20" style="margin-top=0px; margin-bottom: 1vh;">
+					<el-col :span="1" style="margin-top=0px; margin-bottom: 1px;">
+					</el-col>
+					<el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+					<el-form-item label="定额代号" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+					  <el-input v-model="formData3.定额代号" id="定额代号" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '通电工时', '定额代号', '码包')"  placeholder="" />
+					</el-form-item>
+					</el-col>
+					<el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+					</el-col>
+					  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+					  <el-form-item label="码包" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+						<el-input v-model="formData3.码包" style="margin-top=0px; margin-bottom: 1px;" id="码包"  @keydown="ent($event, '定额代号', '码包', '主电表')"  placeholder="" />
+					  </el-form-item>
+					  </el-col>
+					  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+					  <el-form-item label="主电表" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+						<el-input v-model="formData3.主电表" style="margin-top=0px; margin-bottom: 1px;" id="主电表"  @keydown="ent($event, '码包', '主电表', '辅电表')"  placeholder="" />
+					  </el-form-item>
+					  </el-col>
+					  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+					  <el-form-item label="辅电表" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+						<el-input v-model="formData3.辅电表" id="辅电表" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '主电表', '辅电表', 'bzdh')"  placeholder="" />
+					  </el-form-item>
+					  </el-col>
+				  </el-row>
                	<div style="display: flex;">
-               				  <div style="width: 248vh;">组员及分配比例</div>
-               				  <div style="width: 22vh;">特殊组员</div>
-               				  <div style="">拉料人员</div>
+					  <div style="width: 248vh;">组员及分配比例</div>
+					  <div style="width: 22vh;">特殊组员</div>
+					  <div style="">拉料人员</div>
                	</div>
                	<el-row :gutter="10" style="margin-top: 1vh;">
                		 <el-col :span="2">
@@ -1442,38 +1440,36 @@
                	   <el-col :span="2">
                	     <el-input v-model="formData3.sczl_bh5" id="bh5"  @keydown="ent($event, 'bh4', 'bh5', 'bh6')" @keyup.enter.native="getygsubmit($event, '5')"  placeholder="" />
                	   </el-col>
-               				<el-col :span="2">
-               				  <el-input v-model="formData3.sczl_bh6" id="bh6"  @keydown="ent($event, 'bh5', 'bh6', 'bh7')" @keyup.enter.native="getygsubmit($event, '6')"  placeholder="" />
-               				</el-col>
-               				<el-col :span="2">
-               				  <el-input v-model="formData3.sczl_bh7" id="bh7"  @keydown="ent($event, 'bh6', 'bh7', 'bh8')" @keyup.enter.native="getygsubmit($event, '7')"  placeholder="" />
-               				</el-col>
-               				<el-col :span="2">
-               				  <el-input v-model="formData3.sczl_bh8" id="bh8"  @keydown="ent($event, 'bh7', 'bh8', 'bh9')" @keyup.enter.native="getygsubmit($event, '8')"  placeholder="" />
-               				</el-col>
-               				<el-col :span="2">
-               				  <el-input v-model="formData3.sczl_bh9" id="bh9"  @keydown="ent($event, 'bh8', 'bh9', 'bh10')" @keyup.enter.native="getygsubmit($event, '9')"  placeholder="" />
-               				</el-col>
-               				<el-col :span="2">
-               				  <el-input v-model="formData3.sczl_bh10" id="bh10"  @keydown="ent($event, 'bh9', 'bh10', 'bh11')" @keyup.enter.native="getygsubmit($event, '10')"  placeholder="" />
-               				</el-col>
-               				<el-col :span="2">
-								<el-select v-model="formData3.sczl_bh11" id="bh11" @change="GetLl('create')">
-									<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-input v-model="formData3.sczl_bh11" id="bh11"  @keyup.enter.native="getygsubmit($event, '11','1')"  placeholder="" /> -->
-               				</el-col>
-               	 </el-row>
+					<el-col :span="2">
+					  <el-input v-model="formData3.sczl_bh6" id="bh6"  @keydown="ent($event, 'bh5', 'bh6', 'bh7')" @keyup.enter.native="getygsubmit($event, '6')"  placeholder="" />
+					</el-col>
+					<el-col :span="2">
+					  <el-input v-model="formData3.sczl_bh7" id="bh7"  @keydown="ent($event, 'bh6', 'bh7', 'bh8')" @keyup.enter.native="getygsubmit($event, '7')"  placeholder="" />
+					</el-col>
+					<el-col :span="2">
+					  <el-input v-model="formData3.sczl_bh8" id="bh8"  @keydown="ent($event, 'bh7', 'bh8', 'bh9')" @keyup.enter.native="getygsubmit($event, '8')"  placeholder="" />
+					</el-col>
+					<el-col :span="2">
+					  <el-input v-model="formData3.sczl_bh9" id="bh9"  @keydown="ent($event, 'bh8', 'bh9', 'bh10')" @keyup.enter.native="getygsubmit($event, '9')"  placeholder="" />
+					</el-col>
+					<el-col :span="2">
+					  <el-input v-model="formData3.sczl_bh10" id="bh10"  @keydown="ent($event, 'bh9', 'bh10', 'bh11')" @keyup.enter.native="getygsubmit($event, '10')"  placeholder="" />
+					</el-col>
+					<el-col :span="2">
+						<el-select v-model="formData3.sczl_bh11" id="bh11" @change="GetLl('create')">
+							<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-input v-model="formData3.sczl_bh11" id="bh11"  @keyup.enter.native="getygsubmit($event, '11','1')"  placeholder="" /> -->
+					</el-col>
+		 </el-row>
 <!-- 19231 -->
-
-
                	<el-row :gutter="10" style="margin-top: 10px;">
                		 <el-col :span="2">
 
@@ -1493,30 +1489,27 @@
                	   <el-col :span="2">
                	     <el-input v-model="formData3.sczl_name5" id="name5"  @keydown="ent($event, 'name4', 'name5', 'name6')"  placeholder="" />
                	   </el-col>
-               				<el-col :span="2">
-               				  <el-input v-model="formData3.sczl_name6" id="name6"  @keydown="ent($event, 'name5', 'name6', 'name7')"  placeholder="" />
-               				</el-col>
-               				<el-col :span="2">
-               				  <el-input v-model="formData3.sczl_name7" id="name7"  @keydown="ent($event, 'name6', 'name7', 'name8')"  placeholder="" />
-               				</el-col>
-               				<el-col :span="2">
-               				  <el-input v-model="formData3.sczl_name8" id="name8"  @keydown="ent($event, 'name7', 'name8', 'name9')"  placeholder="" />
-               				</el-col>
-               				<el-col :span="2">
-               				  <el-input v-model="formData3.sczl_name9" id="name9"  @keydown="ent($event, 'name8', 'name9', 'name10')"  placeholder="" />
-               				</el-col>
-               				<el-col :span="2">
-               				  <el-input v-model="formData3.sczl_name10" id="name10"  @keydown="ent($event, 'name9', 'name10', 'name11')"  placeholder="" />
-               				</el-col>
-               				<el-col :span="2">
-               				  <el-input v-model="formData3.sczl_name11" id="name11"  @keydown="ent($event, 'name10', 'name11', 'rate1')"  placeholder="" />
-               				</el-col>
+					<el-col :span="2">
+					  <el-input v-model="formData3.sczl_name6" id="name6"  @keydown="ent($event, 'name5', 'name6', 'name7')"  placeholder="" />
+					</el-col>
+					<el-col :span="2">
+					  <el-input v-model="formData3.sczl_name7" id="name7"  @keydown="ent($event, 'name6', 'name7', 'name8')"  placeholder="" />
+					</el-col>
+					<el-col :span="2">
+					  <el-input v-model="formData3.sczl_name8" id="name8"  @keydown="ent($event, 'name7', 'name8', 'name9')"  placeholder="" />
+					</el-col>
+					<el-col :span="2">
+					  <el-input v-model="formData3.sczl_name9" id="name9"  @keydown="ent($event, 'name8', 'name9', 'name10')"  placeholder="" />
+					</el-col>
+					<el-col :span="2">
+					  <el-input v-model="formData3.sczl_name10" id="name10"  @keydown="ent($event, 'name9', 'name10', 'name11')"  placeholder="" />
+					</el-col>
+					<el-col :span="2">
+					  <el-input v-model="formData3.sczl_name11" id="name11"  @keydown="ent($event, 'name10', 'name11', 'rate1')"  placeholder="" />
+					</el-col>
                	 </el-row>
-
                	<el-row :gutter="10" style="margin-top: 10px;">
-               		 <el-col :span="2">
-
-               		 </el-col>
+               		<el-col :span="2"></el-col>
                	   <el-col :span="2">
                	     <el-input v-model="formData3.sczl_rate1" id="rate1"  @keydown="ent($event, 'name11', 'rate1', 'rate2')"   placeholder="" />
                	   </el-col>
@@ -1532,45 +1525,33 @@
                	   <el-col :span="2">
                	     <el-input v-model="formData3.sczl_rate5" id="rate5"  @keydown="ent($event, 'rate4', 'rate5', 'rate6')"  placeholder="" />
                	   </el-col>
-               				<el-col :span="2">
-               				  <el-input v-model="formData3.sczl_rate6" id="rate6"  @keydown="ent($event, 'rate5', 'rate6', 'rate7')"  placeholder="" />
-               				</el-col>
-               				<el-col :span="2">
-               				  <el-input v-model="formData3.sczl_rate7" id="rate7"  @keydown="ent($event, 'rate6', 'rate7', 'rate8')"  placeholder="" />
-               				</el-col>
-               				<el-col :span="2">
-               				  <el-input v-model="formData3.sczl_rate8" id="rate8"  @keydown="ent($event, 'rate7', 'rate8', 'rate9')"  placeholder="" />
-               				</el-col>
-               				<el-col :span="2">
-               				  <el-input v-model="formData3.sczl_rate9" id="rate9"  @keydown="ent($event, 'rate8', 'rate9', 'rate10')"  placeholder="" />
-               				</el-col>
-               				<el-col :span="2">
-               				  <el-input v-model="formData3.sczl_rate10" id="rate10"  @keydown="ent($event, 'rate9', 'rate10', '工单编号')"  placeholder="" />
-               				</el-col>
-               				<el-col :span="2">
-               				</el-col>
+					<el-col :span="2">
+					  <el-input v-model="formData3.sczl_rate6" id="rate6"  @keydown="ent($event, 'rate5', 'rate6', 'rate7')"  placeholder="" />
+					</el-col>
+					<el-col :span="2">
+					  <el-input v-model="formData3.sczl_rate7" id="rate7"  @keydown="ent($event, 'rate6', 'rate7', 'rate8')"  placeholder="" />
+					</el-col>
+					<el-col :span="2">
+					  <el-input v-model="formData3.sczl_rate8" id="rate8"  @keydown="ent($event, 'rate7', 'rate8', 'rate9')"  placeholder="" />
+					</el-col>
+					<el-col :span="2">
+					  <el-input v-model="formData3.sczl_rate9" id="rate9"  @keydown="ent($event, 'rate8', 'rate9', 'rate10')"  placeholder="" />
+					</el-col>
+					<el-col :span="2">
+					  <el-input v-model="formData3.sczl_rate10" id="rate10"  @keydown="ent($event, 'rate9', 'rate10', '工单编号')"  placeholder="" />
+					</el-col>
+					<el-col :span="2">
+					</el-col>
                	 </el-row>
                </div>
-
-
 		   <el-table
 		     tooltip-effect="dark"
-		     :data="chanliangselectData"
-		     row-key="ID"
-		     highlight-current-row="true"
-		     border
-		     style="width:100%"
-		     height="40vh"
-		     @row-dblclick="batchaddSelectClick"
-		     :selectable="row => rowSelectable(row)"
-		     @selection-change="chanliangSelectionChange"
-		   >
+		     :data="chanliangselectData" row-key="ID"
+		     highlight-current-row="true" border
+		     style="width:100%"  height="40vh"
+		     @row-dblclick="batchaddSelectClick" :selectable="row => rowSelectable(row)" @selection-change="chanliangSelectionChange">
 		     <el-table-column type="selection" width="55" align="center" label=""></el-table-column>
-		     <el-table-column
-		       prop="batch"
-		       label="物料编号"
-		       width="150"
-		     />
+		     <el-table-column prop="batch" label="物料编号" width="150" />
 		     <el-table-column
 		   	prop="BOM_物料名称"
 		   	label="物料名称"
@@ -1586,16 +1567,8 @@
 		   	label="供方批次"
 		   	width="400"
 		     />
-		     <el-table-column
-		       prop="卷号"
-		       label="卷号"
-		       width="150"
-		     />
-		     <el-table-column
-		       prop="Uniqid"
-		       label="UniqID"
-		       width="150"
-		     />
+		     <el-table-column prop="卷号" label="卷号" width="150" />
+		     <el-table-column prop="Uniqid" label="UniqID" width="150"/>
 		   </el-table>
 
 		  <!-- </el-scrollbar> -->