Эх сурвалжийг харах

各个页面工序产量核查优化

zck 1 жил өмнө
parent
commit
2ed7a6f2ac

+ 2 - 2
src/view/performance/12-orderAccounting/componets/gxclhc.vue

@@ -46,7 +46,7 @@
         <el-table-column
         <el-table-column
           label="折算车头产量"
           label="折算车头产量"
           width="120"
           width="120"
-          prop="折算车头产量"
+          prop=""
         />
         />
 
 
         <el-table-column
         <el-table-column
@@ -57,7 +57,7 @@
         <el-table-column
         <el-table-column
           label="制程废品"
           label="制程废品"
           width="120"
           width="120"
-          prop="sczl_zcfp"
+          prop=""
         />
         />
         <el-table-column
         <el-table-column
           label="制程废品率"
           label="制程废品率"

+ 50 - 8
src/view/yunyin/shengchanguanli/gongdanshengchan.vue

@@ -101,7 +101,7 @@
                          show-checkbox
                          show-checkbox
                          :default-expanded-keys="jizuList[0].value"
                          :default-expanded-keys="jizuList[0].value"
                          @check="checkTreeHandle"
                          @check="checkTreeHandle"
-                         style="margin-right: 10px; padding: 10px; border-1px solid #ececec"></el-tree>
+                         style="margin-right: 10px; padding: 10px; border:-1px solid #ececec"></el-tree>
               </el-col>
               </el-col>
               <el-col :span="6">
               <el-col :span="6">
                 <div><el-button type="primary" @click="saveJizuTiaozheng">确定</el-button></div>
                 <div><el-button type="primary" @click="saveJizuTiaozheng">确定</el-button></div>
@@ -177,12 +177,14 @@
 
 
             <div style="width: 100%; height: 60px; padding: 0px; margin: 10px 0px 0px 0px; display: flex; align-items: center;">
             <div style="width: 100%; height: 60px; padding: 0px; margin: 10px 0px 0px 0px; display: flex; align-items: center;">
               <div style="width: 100%; height: 60px; padding: 0px;  display: flex; align-items: center;">
               <div style="width: 100%; height: 60px; padding: 0px;  display: flex; align-items: center;">
-                <el-form-item label="工单编号" prop="currentProcess" style="margin-right: 20px; padding: 0px">
+                <el-form-item label="工单编号" prop="currentProcess" style="margin-right: 20px; padding: 20px 0 0 0">
                   <el-input v-model="gxclhcformData['gdbh']"  @keyup.enter="gxclhcProductValue" placeholder="" />
                   <el-input v-model="gxclhcformData['gdbh']"  @keyup.enter="gxclhcProductValue" placeholder="" />
                 </el-form-item>
                 </el-form-item>
-                <el-form-item label="印件号" prop="currentProcess" style="margin-right: 20px; padding: 0px">
-                  <el-input v-model="gxclhcformData['yjno']"  @keyup.enter="gxclhcProductValue" placeholder="" />
-                </el-form-item>
+                印件选择:
+                <el-select v-model="gdwhformData.yjno" placeholder="请选择" allow-create filterable style="width: 100px; margin-right: 10px;">
+                  <el-option v-for="option in gdwhformData.yinjian" @click="ongdwhfanclick" :key="option" :label="option" :value="option" />
+                </el-select>
+                <el-input v-model="inputCpmc" readonly style="width: 50vw; margin-right: 10px;" />
               </div>
               </div>
             </div>
             </div>
             <el-table ref="paichengRef"
             <el-table ref="paichengRef"
@@ -476,7 +478,8 @@ import {
   getOrderProcessRight,
   getOrderProcessRight,
   gdzl_MachineList,
   gdzl_MachineList,
   EquipmentSchedulingEdit,
   EquipmentSchedulingEdit,
-  MachineTeamEdit
+  MachineTeamEdit,
+  PrintDetailList
 } from "@/api/yunyin/yunying";
 } from "@/api/yunyin/yunying";
 
 
 import PrintPage from './components/print.vue'
 import PrintPage from './components/print.vue'
@@ -1011,6 +1014,14 @@ const gxclhcformData = reactive({
   gdmc: '',
   gdmc: '',
   yjno: '',
   yjno: '',
 });
 });
+const gdwhformData = reactive({
+  // 下拉框选项数据
+  yinjian: [],
+  // 设置默认值
+  yjno: '',
+});
+const inputCpmc = ref('')
+
 // 工序产量核查按钮
 // 工序产量核查按钮
 const pd_gxclhconClick = async () => {
 const pd_gxclhconClick = async () => {
   if(_Gd_gdbh.value === '' || _Gd_gdbh.value === null){
   if(_Gd_gdbh.value === '' || _Gd_gdbh.value === null){
@@ -1018,22 +1029,53 @@ const pd_gxclhconClick = async () => {
     return false;
     return false;
   }
   }
   gxclhcformData['gdbh'] = _Gd_gdbh.value;
   gxclhcformData['gdbh'] = _Gd_gdbh.value;
-  gxclhcformData['yjno'] = _Gd_yjno.value;
   pd_gxclhclist.value = true;
   pd_gxclhclist.value = true;
+  const response = await PrintDetailList ({workOrder:_Gd_gdbh.value});
+  console.log(response)
+  gdwhformData.yjno = response.data[0].no
+  inputCpmc.value = response.data[0].name
+  if (response.code === 0) {
+	  const noFields = response.data.map(item => item.no);
+	  gdwhformData.yinjian = noFields
+	} else {
+	  console.error('查询失败:', response.msg);
+	}
   _getOrderProcessCount();
   _getOrderProcessCount();
 };
 };
+
+//点击印件下拉框
+const ongdwhfanclick = async() => {
+	_PrintDetailList();
+  _getOrderProcessCount();
+}
+
 //工序产量核查回车
 //工序产量核查回车
 const gxclhcProductValue = async () => {
 const gxclhcProductValue = async () => {
   _getOrderProcessCount();
   _getOrderProcessCount();
+  _PrintDetailList();
 }
 }
 //工序产量核查退出
 //工序产量核查退出
 const gxclhcCancel = async () => {
 const gxclhcCancel = async () => {
   pd_gxclhclist.value = false;
   pd_gxclhclist.value = false;
 };
 };
+
+//印件编号获取方法接口
+const _PrintDetailList = async () => {
+  const order = gxclhcformData['gdbh'];
+  const response = await PrintDetailList ({workOrder:order});
+  const matchingItem = response.data.find(item => item.no === gdwhformData.yjno);
+    if (matchingItem) {
+		console.log(matchingItem.name)
+		inputCpmc.value = matchingItem.name;
+	} else {
+		console.log(`No matching item found for no: ${gdwhformData.yjno}`);
+	}
+}
+
 //工序产量核查方法接口
 //工序产量核查方法接口
 const _getOrderProcessCount = async () => {
 const _getOrderProcessCount = async () => {
   const order = gxclhcformData['gdbh'];
   const order = gxclhcformData['gdbh'];
-  const yjno = gxclhcformData['yjno'];
+  const yjno = gdwhformData.yjno;
   const getOrderProcessCount_list = await getOrderProcessCount({order:order,yjno:yjno});
   const getOrderProcessCount_list = await getOrderProcessCount({order:order,yjno:yjno});
   const concatenatedData = getOrderProcessCount_list.data.map(item => {
   const concatenatedData = getOrderProcessCount_list.data.map(item => {
     // 优化后的代码,使用模板字符串连接字段值并在单个数字前添加零
     // 优化后的代码,使用模板字符串连接字段值并在单个数字前添加零

+ 53 - 8
src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -398,13 +398,18 @@
             <el-button type="" @click="gxclhcCancel">退出</el-button>
             <el-button type="" @click="gxclhcCancel">退出</el-button>
             <div style="width: 100%; height: 60px; padding: 0px; margin: 10px 0px 0px 0px; display: flex; align-items: center;">
             <div style="width: 100%; height: 60px; padding: 0px; margin: 10px 0px 0px 0px; display: flex; align-items: center;">
               <div style="width: 100%; height: 60px; padding: 0px;  display: flex; align-items: center;">
               <div style="width: 100%; height: 60px; padding: 0px;  display: flex; align-items: center;">
-                <el-form-item label="工单编号" prop="currentProcess" style="margin-right: 20px; padding: 0px">
+
+                <el-form-item label="工单编号" prop="currentProcess" style="margin-right: 20px; padding: 20px 0px 0px 0px">
                   <el-input v-model="gxclhcformData['gdbh']"  @keyup.enter="gxclhcProductValue"  />
                   <el-input v-model="gxclhcformData['gdbh']"  @keyup.enter="gxclhcProductValue"  />
                 </el-form-item>
                 </el-form-item>
-                <el-form-item label="工单编号" prop="currentProcess" style="margin-right: 20px; padding: 0px">
-                  <el-input v-model="gxclhcformData['yjno']"  @keyup.enter="gxclhcProductValue"  />
-                </el-form-item>
+                印件选择:
+                <el-select v-model="gdwhformData.yjno" placeholder="请选择" allow-create filterable style="width: 100px;margin-right: 20px; padding: 0px;">
+                  <el-option v-for="option in gdwhformData.yinjian" @click="ongdwhfanclick" :key="option" :label="option" :value="option" />
+                </el-select>
+                <el-input v-model="inputCpmc" readonly style="width: 50vw; margin-right: 0px;" />
+                
               </div>
               </div>
+              
             </div>
             </div>
             <el-table ref="paichengRef"
             <el-table ref="paichengRef"
                       :show-overflow-tooltip="true"
                       :show-overflow-tooltip="true"
@@ -1402,6 +1407,8 @@ export default {
 import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
 import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ref, reactive, computed, nextTick, watch } from 'vue'
 import { ref, reactive, computed, nextTick, watch } from 'vue'
+import { useUserStore } from '@/pinia/modules/user'
+
 import {
 import {
   DataList,WorkList, gdzl_MachineList,PrintCodeList,getProductYjList, getProductZzList,
   DataList,WorkList, gdzl_MachineList,PrintCodeList,getProductYjList, getProductZzList,
   U8workOrder, ProcessDetailEdit, PrintedEdit, PrintJobOrder,WorkOrderAdd,PrintDetailAdd,
   U8workOrder, ProcessDetailEdit, PrintedEdit, PrintJobOrder,WorkOrderAdd,PrintDetailAdd,
@@ -1418,7 +1425,7 @@ import {
 import PrintPage from './components/print.vue'
 import PrintPage from './components/print.vue'
 import AddGongYi from './components/addGongYi.vue'
 import AddGongYi from './components/addGongYi.vue'
 defineOptions({name: 'Company'})
 defineOptions({name: 'Company'})
-import { useUserStore } from '@/pinia/modules/user'
+
 const userStore = useUserStore()
 const userStore = useUserStore()
 const _username = ref('')
 const _username = ref('')
 _username.value = userStore.userInfo.userName + '/' + userStore.userInfo.nickName
 _username.value = userStore.userInfo.userName + '/' + userStore.userInfo.nickName
@@ -1734,30 +1741,68 @@ const gxclhcformData = reactive({
   gdmc: '',
   gdmc: '',
   yjno: '',
   yjno: '',
 });
 });
+const gdwhformData = reactive({
+  // 下拉框选项数据
+  yinjian: [],
+  // 设置默认值
+  yjno: '',
+});
+const inputCpmc = ref('')
+
 // 工序产量核查按钮
 // 工序产量核查按钮
 const gd_gxclhconClick = async () => {
 const gd_gxclhconClick = async () => {
   if(_Gd_gdbh.value === '' || _Gd_gdbh.value === null){
   if(_Gd_gdbh.value === '' || _Gd_gdbh.value === null){
     ElMessage({type: 'warning',message: '请选择具体的工单,在进行操作'})
     ElMessage({type: 'warning',message: '请选择具体的工单,在进行操作'})
     return false;
     return false;
   }
   }
-  gxclhcformData['gdbh'] = _Gd_gdbh.value;
-  gxclhcformData['yjno']= yjtableData['_rawValue'][0]['印件号']
   gd_gxclhclist.value = true;
   gd_gxclhclist.value = true;
+  gxclhcformData['gdbh'] = _Gd_gdbh.value;
+  const response = await PrintDetailList ({workOrder:_Gd_gdbh.value});
+  console.log(response)
+  gdwhformData.yjno = response.data[0].no
+  inputCpmc.value = response.data[0].name
+  if (response.code === 0) {
+	  const noFields = response.data.map(item => item.no);
+	  gdwhformData.yinjian = noFields
+	} else {
+	  console.error('查询失败:', response.msg);
+	}
   _getOrderProcessCount();
   _getOrderProcessCount();
 };
 };
+
+//点击印件下拉框
+const ongdwhfanclick = async() => {
+	_PrintDetailList();
+  _getOrderProcessCount();
+}
+
 //工序产量核查回车
 //工序产量核查回车
 const gxclhcProductValue = async () => {
 const gxclhcProductValue = async () => {
   _getOrderProcessCount();
   _getOrderProcessCount();
+  _PrintDetailList();
 }
 }
 //工序产量核查退出
 //工序产量核查退出
 const gxclhcCancel = async () => {
 const gxclhcCancel = async () => {
   gd_gxclhclist.value = false;
   gd_gxclhclist.value = false;
 };
 };
+
+//印件编号获取方法接口
+const _PrintDetailList = async () => {
+  const order = gxclhcformData['gdbh'];
+  const response = await PrintDetailList ({workOrder:order});
+  const matchingItem = response.data.find(item => item.no === gdwhformData.yjno);
+    if (matchingItem) {
+		console.log(matchingItem.name)
+		inputCpmc.value = matchingItem.name;
+	} else {
+		console.log(`No matching item found for no: ${gdwhformData.yjno}`);
+	}
+}
 //工序产量核查方法接口
 //工序产量核查方法接口
 const _getOrderProcessCount = async () => {
 const _getOrderProcessCount = async () => {
   console.log(yjtableData['_rawValue'][0]['印件号'])
   console.log(yjtableData['_rawValue'][0]['印件号'])
   const order = gxclhcformData['gdbh'];
   const order = gxclhcformData['gdbh'];
-  const yjno = gxclhcformData['yjno'];
+  const yjno = gdwhformData.yjno;
   const getOrderProcessCount_list = await getOrderProcessCount({order:order,yjno:yjno});
   const getOrderProcessCount_list = await getOrderProcessCount({order:order,yjno:yjno});
   const concatenatedData = getOrderProcessCount_list.data.map(item => {
   const concatenatedData = getOrderProcessCount_list.data.map(item => {
     // 优化后的代码,使用模板字符串连接字段值并在单个数字前添加零
     // 优化后的代码,使用模板字符串连接字段值并在单个数字前添加零

+ 86 - 45
src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -737,38 +737,38 @@
 		  width="1100px"
 		  width="1100px"
 		  style="height: 78%;"
 		  style="height: 78%;"
 		>
 		>
-		  <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
-		    <el-col :span="4" style="margin-top=0px; margin-bottom: 0px;">
-		      <el-form-item label="工单编号" prop="id" style="margin-top=0px; margin-bottom: 0px;">
-		        <el-input v-model="xunchaData.order" :clearable="true" placeholder="" style="margin-top=0px; margin-bottom: 0px;"/>
+		  <el-row :gutter="24" style="margin-top:0px; margin-bottom: 1px;">
+		    <el-col :span="4" style="margin-top:0px; margin-bottom: 0px;">
+		      <el-form-item label="工单编号" prop="id" style="margin-top:0px;; margin-bottom: 0px;">
+		        <el-input v-model="xunchaData.order" :clearable="true" placeholder="" style="margin-top:0px;; margin-bottom: 0px;"/>
 		      </el-form-item>
 		      </el-form-item>
 		    </el-col>
 		    </el-col>
 
 
-		    <el-col :span="9" style="margin-top=0px; margin-bottom: 0px;">
-		      <el-row style="margin-top=0px; margin-bottom: 0px;">
-		        <el-col style="margin-top=0px; margin-bottom: 0px;">
-		          <el-input v-model="xunchaData.product_name" :clearable="true" placeholder="" style="margin-top=0px; margin-bottom: 0px;"/>
+		    <el-col :span="9" style="margin-top:0px; margin-bottom: 0px;">
+		      <el-row style="margin-top:0px; margin-bottom: 0px;">
+		        <el-col style="margin-top:0px; margin-bottom: 0px;">
+		          <el-input v-model="xunchaData.product_name" :clearable="true" placeholder="" style="margin-top:0px; margin-bottom: 0px;"/>
 		        </el-col>
 		        </el-col>
 		      </el-row>
 		      </el-row>
 		    </el-col>
 		    </el-col>
-				<el-col :span="4" style="margin-top=0px; margin-bottom: 0px;">
-				  <el-form-item label="流程单" prop="id" style="margin-top=0px; margin-bottom: 0px;">
-					<el-input v-model="xunchaData.lcdh" :clearable="true" placeholder="" style="margin-top=0px; margin-bottom: 0px;"/>
+				<el-col :span="4" style="margin-top:0px; margin-bottom: 0px;">
+				  <el-form-item label="流程单" prop="id" style="margin-top:0px; margin-bottom: 0px;">
+					<el-input v-model="xunchaData.lcdh" :clearable="true" placeholder="" style="margin-top:0px; margin-bottom: 0px;"/>
 				  </el-form-item>
 				  </el-form-item>
 				</el-col>
 				</el-col>
 
 
 		  </el-row>
 		  </el-row>
 
 
-		  <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
-		    <el-col :span="3" style="margin-top=0px; margin-bottom: 0px;">
-		      <el-form-item label="印件编号" prop="id" style="margin-top=0px; margin-bottom: 0px;">
-		        <el-input v-model="xunchaData.yjno" :clearable="true" placeholder="" style="margin-top=0px; margin-bottom: 0px;"/>
+		  <el-row :gutter="24" style="margin-top:0px; margin-bottom: 1px;">
+		    <el-col :span="3" style="margin-top:0px; margin-bottom: 0px;">
+		      <el-form-item label="印件编号" prop="id" style="margin-top:0px; margin-bottom: 0px;">
+		        <el-input v-model="xunchaData.yjno" :clearable="true" placeholder="" style="margin-top:0px; margin-bottom: 0px;"/>
 		      </el-form-item>
 		      </el-form-item>
 		    </el-col>
 		    </el-col>
-		    <el-col :span="10" style="margin-top=0px; margin-bottom: 0px;">
-		      <el-row style="margin-top=0px; margin-bottom: 0px;">
-		        <el-col style="margin-top=0px; margin-bottom: 0px;">
-		          <el-input v-model="xunchaData.gxmc" :clearable="true" placeholder="" style="margin-top=0px; margin-bottom: 0px;"/>
+		    <el-col :span="10" style="margin-top:0px; margin-bottom: 0px;">
+		      <el-row style="margin-top:0px; margin-bottom: 0px;">
+		        <el-col style="margin-top:0px; margin-bottom: 0px;">
+		          <el-input v-model="xunchaData.gxmc" :clearable="true" placeholder="" style="margin-top:0px; margin-bottom: 0px;"/>
 		        </el-col>
 		        </el-col>
 		      </el-row>
 		      </el-row>
 		    </el-col>
 		    </el-col>
@@ -1104,24 +1104,24 @@
 						  <el-descriptions-item :span="9">
 						  <el-descriptions-item :span="9">
 							  <el-row :gutter="24" style="margin-bottom: 0px;margin-top: 0px;">
 							  <el-row :gutter="24" style="margin-bottom: 0px;margin-top: 0px;">
 							    <el-col :span="6" style="margin-bottom: 0px;margin-top: 0px;">
 							    <el-col :span="6" style="margin-bottom: 0px;margin-top: 0px;">
-							      <el-form-item label="日期:" prop="id" style="margin-top=0px; margin-bottom: 0px;">
-									<el-input v-model="huanxingData.日期"  placeholder="" style="margin-top=0px; margin-bottom: 0px;"/>
+							      <el-form-item label="日期:" prop="id" style="margin-top:0px; margin-bottom: 0px;">
+									<el-input v-model="huanxingData.日期"  placeholder="" style="margin-top:0px; margin-bottom: 0px;"/>
 							      </el-form-item>
 							      </el-form-item>
 							    </el-col>
 							    </el-col>
 								<el-col :span="2" style="margin-bottom: 0px;margin-top: 0px;">
 								<el-col :span="2" style="margin-bottom: 0px;margin-top: 0px;">
 
 
 								</el-col>
 								</el-col>
 							    <el-col :span="6" style="margin-bottom: 0px;margin-top: 0px;">
 							    <el-col :span="6" style="margin-bottom: 0px;margin-top: 0px;">
-									<el-form-item label="机台编号:" prop="id" style="margin-top=0px; margin-bottom: 0px;">
-									 <el-input v-model="huanxingData.机台编号"  placeholder="" style="margin-top=0px; margin-bottom: 0px;"/>
+									<el-form-item label="机台编号:" prop="id" style="margin-top:0px; margin-bottom: 0px;">
+									 <el-input v-model="huanxingData.机台编号"  placeholder="" style="margin-top:0px; margin-bottom: 0px;"/>
 									</el-form-item>
 									</el-form-item>
 							    </el-col>
 							    </el-col>
 								<el-col :span="1" style="margin-bottom: 0px;margin-top: 0px;">
 								<el-col :span="1" style="margin-bottom: 0px;margin-top: 0px;">
 
 
 								</el-col>
 								</el-col>
 							    <el-col :span="6" style="margin-bottom: 0px;margin-top: 0px;">
 							    <el-col :span="6" style="margin-bottom: 0px;margin-top: 0px;">
-							      <el-form-item label="班组:" prop="id" style="margin-top=0px; margin-bottom: 0px;">
-									<el-input v-model="huanxingData.班组"  placeholder="" style="margin-top=0px; margin-bottom: 0px;"/>
+							      <el-form-item label="班组:" prop="id" style="margin-top:0px; margin-bottom: 0px;">
+									<el-input v-model="huanxingData.班组"  placeholder="" style="margin-top:0px; margin-bottom: 0px;"/>
 							      </el-form-item>
 							      </el-form-item>
 							    </el-col>
 							    </el-col>
 							  </el-row>
 							  </el-row>
@@ -1442,9 +1442,9 @@
 					   <el-date-picker v-model="formdata3.value.starttime" type="datetime"  format="YYYY/MM/DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" @keydown="ent1($event)" />
 					   <el-date-picker v-model="formdata3.value.starttime" type="datetime"  format="YYYY/MM/DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" @keydown="ent1($event)" />
 			    </el-form-item>
 			    </el-form-item>
 			  </el-col>
 			  </el-col>
-				<el-col :span="5" 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.value.num" id="流程单号" style="margin-top=0px; margin-bottom: 1px;"  @keydown="ent1($event)"  placeholder="" />
+				<el-col :span="5" 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.value.num" id="流程单号" style="margin-top:0px; margin-bottom: 1px;"  @keydown="ent1($event)"  placeholder="" />
 				</el-form-item>
 				</el-form-item>
 				</el-col>
 				</el-col>
 			</el-row>
 			</el-row>
@@ -1558,7 +1558,7 @@
 			  <el-row :gutter="24">
 			  <el-row :gutter="24">
 			    <el-col :span="6">
 			    <el-col :span="6">
 			      <el-form-item label="异常总工时:" prop="flatFeed" class="mab">
 			      <el-form-item label="异常总工时:" prop="flatFeed" class="mab">
-			  		<el-input v-model="formdata3.value.异常总工时" id="异常总工时" style="margin-top=0px; margin-bottom: 1px;"  @keydown="ent1($event)"  placeholder="" />
+			  		<el-input v-model="formdata3.value.异常总工时" id="异常总工时" style="margin-top:0px; margin-bottom: 1px;"  @keydown="ent1($event)"  placeholder="" />
 			      </el-form-item>
 			      </el-form-item>
 			    </el-col>
 			    </el-col>
 			    <el-col :span="8">
 			    <el-col :span="8">
@@ -1566,9 +1566,9 @@
 			      <el-input v-model="formdata3.value.异常类型"  disabled  id="异常类型"  :clearable="true" style="width: 100px;" />
 			      <el-input v-model="formdata3.value.异常类型"  disabled  id="异常类型"  :clearable="true" style="width: 100px;" />
 			      </el-form-item>
 			      </el-form-item>
 			    </el-col>
 			    </el-col>
-			  	<el-col :span="5" 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.value.异常补时" id="异常补贴工时" style="margin-top=0px; margin-bottom: 1px;"  @keydown="ent1($event)"  placeholder="" />
+			  	<el-col :span="5" 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.value.异常补时" id="异常补贴工时" style="margin-top:0px; margin-bottom: 1px;"  @keydown="ent1($event)"  placeholder="" />
 			  	</el-form-item>
 			  	</el-form-item>
 			  	</el-col>
 			  	</el-col>
 			  </el-row>
 			  </el-row>
@@ -1579,14 +1579,14 @@
 			      <el-input v-model="formdata3.value.通电工时"  id="通电工时"  @keydown="ent1($event)" :clearable="true" style="width: 100px;" />
 			      <el-input v-model="formdata3.value.通电工时"  id="通电工时"  @keydown="ent1($event)" :clearable="true" style="width: 100px;" />
 			      </el-form-item>
 			      </el-form-item>
 			    </el-col>
 			    </el-col>
-			  	<el-col :span="5" 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.value.dedh" id="定额代号" style="margin-top=0px; margin-bottom: 1px;"  @keydown="ent1($event)"  placeholder="" />
+			  	<el-col :span="5" 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.value.dedh" id="定额代号" style="margin-top:0px; margin-bottom: 1px;"  @keydown="ent1($event)"  placeholder="" />
 			  	</el-form-item>
 			  	</el-form-item>
 			  	</el-col>
 			  	</el-col>
-				<el-col :span="3" 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.value.码包" id="码包" style="margin-top=0px; margin-bottom: 1px;"  @keydown="ent1($event)"  placeholder="" />
+				<el-col :span="3" 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.value.码包" id="码包" style="margin-top:0px; margin-bottom: 1px;"  @keydown="ent1($event)"  placeholder="" />
 				</el-form-item>
 				</el-form-item>
 				</el-col>
 				</el-col>
 			  </el-row>
 			  </el-row>
@@ -2103,12 +2103,14 @@
             <el-button type="" @click="gxclhcCancel">退出</el-button>
             <el-button type="" @click="gxclhcCancel">退出</el-button>
             <div style="width: 100%; height: 60px; padding: 0px; margin: 10px 0px 0px 0px; display: flex; align-items: center;">
             <div style="width: 100%; height: 60px; padding: 0px; margin: 10px 0px 0px 0px; display: flex; align-items: center;">
               <div style="width: 100%; height: 60px; padding: 0px;  display: flex; align-items: center;">
               <div style="width: 100%; height: 60px; padding: 0px;  display: flex; align-items: center;">
-                <el-form-item label="工单编号" prop="currentProcess" style="margin-right: 20px; padding: 0px">
+                <el-form-item label="工单编号" prop="currentProcess" style="margin-right: 20px; padding: 20px 0 0 0">
                   <el-input v-model="gxclhcformData['gdbh']"  @keyup.enter="gxclhcProductValue"  />
                   <el-input v-model="gxclhcformData['gdbh']"  @keyup.enter="gxclhcProductValue"  />
                 </el-form-item>
                 </el-form-item>
-				<el-form-item label="印件号" prop="currentProcess" style="margin-right: 20px; padding: 0px">
-                  <el-input v-model="gxclhcformData['yjno']"  @keyup.enter="gxclhcProductValue"  />
-                </el-form-item>
+				印件选择:
+                <el-select v-model="gdwhformData.yjno" placeholder="请选择" allow-create filterable style="width: 100px;margin-right: 20px; padding: 0px;">
+                  <el-option v-for="option in gdwhformData.yinjian" @click="ongdwhfanclick" :key="option" :label="option" :value="option" />
+                </el-select>
+                <el-input v-model="inputCpmc" readonly style="width: 50vw; margin-right: 0px;" />
               </div>
               </div>
             </div>
             </div>
             <el-table ref="paichengRef"
             <el-table ref="paichengRef"
@@ -2260,7 +2262,7 @@ import {
 } from '@/api/company'
 } from '@/api/company'
 import {
 import {
   EquipmentSchedulingEdit, Procedure,
   EquipmentSchedulingEdit, Procedure,
-  teamDel, WorkList, WorkOrderDel
+  teamDel, WorkList, WorkOrderDel,PrintDetailList
 } from "@/api/yunyin/yunying";
 } from "@/api/yunyin/yunying";
 import {
 import {
   facilityTab,
   facilityTab,
@@ -6102,6 +6104,13 @@ const gxclhcformData = reactive({
   gdmc: '',
   gdmc: '',
   yjno: '',
   yjno: '',
 });
 });
+const gdwhformData = reactive({
+  // 下拉框选项数据
+  yinjian: [],
+  // 设置默认值
+  yjno: '',
+});
+const inputCpmc = ref('')
 // 工序产量核查按钮
 // 工序产量核查按钮
 const gd_gxclhconClick = async () => {
 const gd_gxclhconClick = async () => {
 	console.log(_rclsb_gdbh.value)
 	console.log(_rclsb_gdbh.value)
@@ -6113,20 +6122,52 @@ const gd_gxclhconClick = async () => {
   gxclhcformData['gdbh'] = _rclsb_gdbh.value;
   gxclhcformData['gdbh'] = _rclsb_gdbh.value;
   gxclhcformData['yjno'] = _rclsb_yjno.value;
   gxclhcformData['yjno'] = _rclsb_yjno.value;
   gd_gxclhclist.value = true;
   gd_gxclhclist.value = true;
+  const response = await PrintDetailList ({workOrder:_Gd_gdbh.value});
+  console.log(response)
+  gdwhformData.yjno = response.data[0].no
+  inputCpmc.value = response.data[0].name
+  if (response.code === 0) {
+	  const noFields = response.data.map(item => item.no);
+	  gdwhformData.yinjian = noFields
+	} else {
+	  console.error('查询失败:', response.msg);
+	}
   _getOrderProcessCount();
   _getOrderProcessCount();
 };
 };
+
+//点击印件下拉框
+const ongdwhfanclick = async() => {
+  _PrintDetailList();
+  _getOrderProcessCount();
+}
+
 //工序产量核查回车
 //工序产量核查回车
 const gxclhcProductValue = async () => {
 const gxclhcProductValue = async () => {
   _getOrderProcessCount();
   _getOrderProcessCount();
+  _PrintDetailList();
 }
 }
 //工序产量核查退出
 //工序产量核查退出
 const gxclhcCancel = async () => {
 const gxclhcCancel = async () => {
   gd_gxclhclist.value = false;
   gd_gxclhclist.value = false;
 };
 };
+
+//印件编号获取方法接口
+const _PrintDetailList = async () => {
+  const order = gxclhcformData['gdbh'];
+  const response = await PrintDetailList ({workOrder:order});
+  const matchingItem = response.data.find(item => item.no === gdwhformData.yjno);
+    if (matchingItem) {
+		console.log(matchingItem.name)
+		inputCpmc.value = matchingItem.name;
+	} else {
+		console.log(`No matching item found for no: ${gdwhformData.yjno}`);
+	}
+}
+
 //工序产量核查方法接口
 //工序产量核查方法接口
 const _getOrderProcessCount = async () => {
 const _getOrderProcessCount = async () => {
   const order = gxclhcformData['gdbh'];
   const order = gxclhcformData['gdbh'];
-  const yjno = gxclhcformData['yjno'];
+  const yjno = gdwhformData.yjno;
   const getOrderProcessCount_list = await getOrderProcessCount({order:order,yjno:yjno});
   const getOrderProcessCount_list = await getOrderProcessCount({order:order,yjno:yjno});
   const concatenatedData = getOrderProcessCount_list.data.map(item => {
   const concatenatedData = getOrderProcessCount_list.data.map(item => {
     // 优化后的代码,使用模板字符串连接字段值并在单个数字前添加零
     // 优化后的代码,使用模板字符串连接字段值并在单个数字前添加零
@@ -6584,7 +6625,7 @@ const sbzyqdsatusCellClass = ({row, column, rowIndex, columnIndex}) =>{
 :deep(.el-table__body tr.current-row)>td {
 :deep(.el-table__body tr.current-row)>td {
   background: #ff80ff !important;
   background: #ff80ff !important;
 }
 }
-deep(.statusy-plan-usage-low div) {
+:deep(.statusy-plan-usage-low div) {
   color: #8c939d !important;
   color: #8c939d !important;
 }
 }
 /* 设备作业清单 正在生产中 背景颜色 */
 /* 设备作业清单 正在生产中 背景颜色 */

+ 50 - 7
src/view/yunyin/shengchanguanli/shengchanjincheng.vue

@@ -43,12 +43,14 @@
             <el-button type="" @click="gxclhcCancel">退出</el-button>
             <el-button type="" @click="gxclhcCancel">退出</el-button>
             <div style="width: 100%; height: 60px; padding: 0px; margin: 10px 0px 0px 0px; display: flex; align-items: center;">
             <div style="width: 100%; height: 60px; padding: 0px; margin: 10px 0px 0px 0px; display: flex; align-items: center;">
               <div style="width: 100%; height: 60px; padding: 0px;  display: flex; align-items: center;">
               <div style="width: 100%; height: 60px; padding: 0px;  display: flex; align-items: center;">
-                <el-form-item label="工单编号" prop="currentProcess" style="margin-right: 20px; padding: 0px">
+                <el-form-item label="工单编号" prop="currentProcess" style="margin-right: 20px; padding: 20px 0 0 0 ">
                   <el-input v-model="gxclhcformData['gdbh']"  @keyup.enter="gxclhcProductValue"  />
                   <el-input v-model="gxclhcformData['gdbh']"  @keyup.enter="gxclhcProductValue"  />
-                </el-form-item>
-                <el-form-item label="印件号" prop="currentProcess" style="margin-right: 20px; padding: 0px">
-                  <el-input v-model="gxclhcformData['yjno']"  @keyup.enter="gxclhcProductValue"  />
-                </el-form-item>
+                </el-form-item> 
+                印件选择:
+                <el-select v-model="gdwhformData.yjno" placeholder="请选择" allow-create filterable style="width: 100px;margin-right: 20px; padding: 0px;">
+                  <el-option v-for="option in gdwhformData.yinjian" @click="ongdwhfanclick" :key="option" :label="option" :value="option" />
+                </el-select>
+                <el-input v-model="inputCpmc" readonly style="width: 50vw; margin-right: 0px;" />
               </div>
               </div>
             </div>
             </div>
             <el-table ref="paichengRef"
             <el-table ref="paichengRef"
@@ -146,7 +148,8 @@ import {ref, reactive} from 'vue'
 import {
 import {
 	jcgetTab,
 	jcgetTab,
 	workOrderDetail,
 	workOrderDetail,
-	getOrderProcessCount
+	getOrderProcessCount,
+  PrintDetailList
 	} from '@/api/yunyin/yunying'
 	} from '@/api/yunyin/yunying'
 import PrintPage from './components/print.vue'
 import PrintPage from './components/print.vue'
 import {ElMessage} from "element-plus";
 import {ElMessage} from "element-plus";
@@ -272,6 +275,13 @@ const gxclhcformData = reactive({
   gdbh: '',
   gdbh: '',
   gdmc: '',
   gdmc: '',
 });
 });
+const gdwhformData = reactive({
+  // 下拉框选项数据
+  yinjian: [],
+  // 设置默认值
+  yjno: '',
+});
+const inputCpmc = ref('')
 // 工序产量核查按钮
 // 工序产量核查按钮
 const gd_gxclhconClick = async () => {
 const gd_gxclhconClick = async () => {
   if(_Gd_gdbh.value === '' || _Gd_gdbh.value === null){
   if(_Gd_gdbh.value === '' || _Gd_gdbh.value === null){
@@ -281,21 +291,54 @@ const gd_gxclhconClick = async () => {
   gxclhcformData['gdbh'] = _Gd_gdbh.value;
   gxclhcformData['gdbh'] = _Gd_gdbh.value;
   gxclhcformData['yjno'] = 1;
   gxclhcformData['yjno'] = 1;
   gd_gxclhclist.value = true;
   gd_gxclhclist.value = true;
+  const response = await PrintDetailList ({workOrder:_Gd_gdbh.value});
+  console.log(response)
+  gdwhformData.yjno = response.data[0].no
+  inputCpmc.value = response.data[0].name
+  if (response.code === 0) {
+	  const noFields = response.data.map(item => item.no);
+	  gdwhformData.yinjian = noFields
+	} else {
+	  console.error('查询失败:', response.msg);
+	}
   _getOrderProcessCount();
   _getOrderProcessCount();
 };
 };
+
+//点击印件下拉框
+const ongdwhfanclick = async() => {
+  _PrintDetailList();
+  _getOrderProcessCount();
+}
+
 //工序产量核查回车
 //工序产量核查回车
 const gxclhcProductValue = async () => {
 const gxclhcProductValue = async () => {
 	console.log("工序产量核查回车")
 	console.log("工序产量核查回车")
   _getOrderProcessCount();
   _getOrderProcessCount();
+  _PrintDetailList();
 }
 }
+
 //工序产量核查退出
 //工序产量核查退出
 const gxclhcCancel = async () => {
 const gxclhcCancel = async () => {
   gd_gxclhclist.value = false;
   gd_gxclhclist.value = false;
 };
 };
+
+//印件编号获取方法接口
+const _PrintDetailList = async () => {
+  const order = gxclhcformData['gdbh'];
+  const response = await PrintDetailList ({workOrder:order});
+  const matchingItem = response.data.find(item => item.no === gdwhformData.yjno);
+    if (matchingItem) {
+		console.log(matchingItem.name)
+		inputCpmc.value = matchingItem.name;
+	} else {
+		console.log(`No matching item found for no: ${gdwhformData.yjno}`);
+	}
+}
+
 //工序产量核查方法接口
 //工序产量核查方法接口
 const _getOrderProcessCount = async () => {
 const _getOrderProcessCount = async () => {
   const order = gxclhcformData['gdbh'];
   const order = gxclhcformData['gdbh'];
-  const yjno = gxclhcformData['yjno'];
+  const yjno = gdwhformData.yjno;
   const getOrderProcessCount_list = await getOrderProcessCount({order:order,yjno:yjno});
   const getOrderProcessCount_list = await getOrderProcessCount({order:order,yjno:yjno});
   const concatenatedData = getOrderProcessCount_list.data.map(item => {
   const concatenatedData = getOrderProcessCount_list.data.map(item => {
     // 优化后的代码,使用模板字符串连接字段值并在单个数字前添加零
     // 优化后的代码,使用模板字符串连接字段值并在单个数字前添加零