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

src/api/jixiaoguanli/jitairibaobiao.js

@@ -49,7 +49,15 @@ export const getDateMachine = (params) => {
 }
 
 
-
+//机台生产日报表维护
+//新增
+export const productionadd = (data) => {
+  return service({
+    url:'/mes_server/machine_production_report/add',
+    method: 'post',
+    data
+  })
+}
 export const getproductionCount = (data) => {
   return service({
     url:'/mes_server/machine_production_report/getTab',
@@ -57,7 +65,15 @@ export const getproductionCount = (data) => {
     data
   })
 }
-
+//机台生产日报表维护附加
+//新增
+export const reportadd = (data) => {
+  return service({
+    url:'/mes_server/machine_production_report_add/add',
+    method: 'post',
+    data
+  })
+}
 export const getproductionList = (params) => {
   return service({
     url:'/mes_server/machine_production_report/getList',
@@ -177,6 +193,22 @@ export const getMachineScrapFactor = (params) => {
   })
 }
 
+export const machineAdd = (data) => {
+  return service({
+    url:'/mes_server/inspect/machineAdd',
+    method: 'post',
+    data
+  })
+}
+
+export const packagingAdd = (data) => {
+  return service({
+    url:'/mes_server/packaging_process_output/add',
+    method: 'post',
+    data
+  })
+}
+
 export const getJtbh = (params) => {
   return service({
     url:'/mes_server/inspect/getJtbh',
@@ -266,6 +298,14 @@ export const  getInspectCountByGdbh= (params) => {
     params
   })
 }
+//新增
+export const  inspectadd= (data) => {
+  return service({
+    url:'/mes_server/inspect/add',
+    method: 'post',
+    data
+  })
+}
 //机台生产日报表维护附加
 //获取详细信息
 export const  addgetInfo= (params) => {
@@ -493,6 +533,30 @@ export const  finishedgetCk= (params) => {
 	params
   })
 }
+//新增
+export const  finishedadd= (data) => {
+  return service({
+    url:'/mes_server/finished_product_warehousing/add',
+    method: 'post',
+	data
+  })
+}
+//各日统计
+export const  getDayList= (params) => {
+  return service({
+    url:'/mes_server/finished_product_warehousing/getDayList',
+    method: 'get',
+	params
+  })
+}
+//入仓末板数据统计
+export const  mbList= (params) => {
+  return service({
+    url:'/mes_server/finished_product_warehousing/mbList',
+    method: 'get',
+	params
+  })
+}
 //获取工单信息
 export const  finishedgetGd= (params) => {
   return service({
@@ -513,7 +577,7 @@ export const  finishedgetGdsl= (params) => {
 export const  finisheddel= (params) => {
   return service({
     url:'/mes_server/finished_product_warehousing/del',
-    method: 'get',
+    method: 'post',
 	params
   })
 }

src/api/yunyin/yunying.js

@@ -157,30 +157,38 @@ export const WorkList = (params) => {
         params
     })
 }
-// 工艺资料
-export const Craft = (params) => {
+//工单印件、工艺、BOM详情
+export const workOrderListDetail = (params) => {
     return service({
-        url: '/mes_server/work_order/Craft',
-        method: 'get',
-        params
-    })
-}
-// 印件资料
-export const Printed = (params) => {
-    return service({
-        url: '/mes_server/work_order/Printed',
-        method: 'get',
-        params
-    })
-}
-// BOM资料
-export const Bom = (params) => {
-    return service({
-        url: '/mes_server/work_order/Bom',
+        url: '/mes_server/work_order/workOrderListDetail',
         method: 'get',
         params
     })
 }
+// // 工艺资料
+// export const Craft = (params) => {
+//     return service({
+//         url: '/mes_server/work_order/Craft',
+//         method: 'get',
+//         params
+//     })
+// }
+// // 印件资料
+// export const Printed = (params) => {
+//     return service({
+//         url: '/mes_server/work_order/Printed',
+//         method: 'get',
+//         params
+//     })
+// }
+// // BOM资料
+// export const Bom = (params) => {
+//     return service({
+//         url: '/mes_server/work_order/Bom',
+//         method: 'get',
+//         params
+//     })
+// }
 
 //工单查改->获取工单信息
 export const DataCorrection = (params) => {
@@ -378,14 +386,6 @@ export const scheduleProcess = (params) => {
         params
     })
 }
-//查找工单
-export const WorkOrderSearch = (params) => {
-    return service({
-        url: '/mes_server/manufacture/WorkOrderSearch',
-        method: 'get',
-        params
-    })
-}
 //工序完工
 export const complete = (params) => {
     return service({

src/view/performance/Dayreportattached.vue

@@ -19,7 +19,7 @@
                 <el-input v-model="searchInfo" placeholder="输入工单编号或产品名称" />
               </el-row>
               <el-button type="primary" :icon="Search" @click="onSearch">搜索</el-button>
-              <el-button type="primary" :icon="Refresh">重置</el-button>
+              <el-button type="primary"  @click="onAdd">新增</el-button>
 			  <el-button type="primary"  @click="onDel">删除</el-button>
               <div style="margin-left: auto;">
                 <el-button type="primary" :icon="Download" @click="exportExcel">导出到Excel</el-button>
@@ -152,6 +152,7 @@ import {
   addedit,
   addgetJtbh,
   addgetInfo,
+  reportadd
 } from '@/api/jixiaoguanli/jitairibaobiao'
 
 // 全量引入格式化工具 请按需保留
@@ -200,6 +201,7 @@ const formData = ref({
              sczl_bzdh: '',
              sczl_设备运行工时: '',
              sczl_desc: '',
+			 sys_id:'[1002/郑小丽]',
 })
 
 // 验证规则
@@ -387,6 +389,7 @@ function doubleClick(row, column, event) {
     		 console.log(lastCellValue)
   table.value=lastCellValue
   	 dialogFormVisible.value = true
+	 
 	 AddgetInfo(table.value)
 }
 //获取详细信息
@@ -453,6 +456,7 @@ const GetMachineDedhhandleNodeClick = (node,check,nodeData) => {
 	    GetjtbhVisible.value=false
      }
 }
+
 // 更新数据
 const updateDetailData = async() => {
   const restoredData = {
@@ -462,16 +466,35 @@ const updateDetailData = async() => {
 	sczl_bzdh:formData.value.sczl_bzdh,
 	sczl_设备运行工时:formData.value.sczl_设备运行工时,
 	sczl_desc:formData.value.sczl_desc,
+	sys_id:'[1002/郑小丽]',
   }
-
-  console.log(restoredData)
-    console.log(lastCellValue)
-    formData.value.UniqId=lastCellValue
-    console.log(formData)
-	restoredData.UniqId='10'
-   const response = await addedit(restoredData);
-  // console.log(FormData)
-  console.log(response)
+ if(ADD.value=='新增'){
+	 // console.log('新增')
+	 console.log('新增')
+	 console.log(ADD.value)
+	 console.log(restoredData)
+	 const response = await reportadd(restoredData);
+	 // ADD.value='1'
+	 // console.log(ADD.value)
+	 ADD.value='0'
+	 console.log(response)
+	 
+ }else{
+	 const response = await addedit(restoredData);
+	 console.log('修改')
+	  console.log(ADD.value)
+	  console.log(response)
+	 // ADD.value='0'
+	 // console.log(ADD.value)
+ }
+ //  console.log(restoredData)
+ //    console.log(lastCellValue)
+ //    formData.value.UniqId=lastCellValue
+ //    console.log(formData)
+	// restoredData.UniqId='10'
+ //   // const response = await addedit(restoredData);
+ //  // console.log(FormData)
+ //  console.log(response)
 }
 
 const AddDel = async (value) => {
@@ -481,7 +504,22 @@ const AddDel = async (value) => {
 	 console.log('333') 
   }
 }
-
+const ADD=ref('0')
+//新增
+function onAdd() {
+	ADD.value='新增'
+	console.log(ADD.value)
+	dialogFormVisible.value = true
+	// Productionadd()
+}
+//新增
+const Reportadd = async () => {
+  const response = await reportadd();
+  if (response.code === 0) {
+	console.log(333)
+  }
+  getTableData()
+}
 //删除
 function onDel() {
 	AddDel()

src/view/performance/Dayreports.vue

@@ -20,6 +20,7 @@
               </el-row>
               <el-button type="primary" :icon="Search" @click="onSearch">搜索</el-button>
 			  <el-button type="primary"  @click="onCountByGdbh">按工单显示</el-button>
+			  <el-button type="primary" @click="onAdd">新增</el-button>
               <el-button type="primary" @click="onDel">删除</el-button>
               <div style="margin-left: auto;">
                 <el-button type="primary" :icon="Download" @click="exportExcel">导出到Excel</el-button>
@@ -98,14 +99,14 @@
               <el-row :gutter="20">
                 <el-col :span="4">
                   <el-form-item label="工单编号" prop="id">
-                    <el-input v-model="formData.sczl_gdbh" @keyup.enter.native="getCPMCsubmit"  :clearable="true" placeholder="2023.12.14" />
+                    <el-input v-model="formData.sczl_gdbh" @keyup.enter.native="getCPMCsubmit"  :clearable="true" placeholder="" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
                   <el-form-item label="产品名称" prop="name">
                     <el-row :gutter="20">
                       <el-col :span="12">
-                        <el-input v-model="formData.Gd_cpmc" :clearable="true" placeholder="ZT01733" />
+                        <el-input v-model="formData.Gd_cpmc" :clearable="true" placeholder="" />
                       </el-col>                      
                     </el-row>
                   </el-form-item>
@@ -117,12 +118,12 @@
                   <el-row :gutter="20">
                     <el-col :span="14">
                       <el-form-item label="印件号" prop="id">
-                        <el-input v-model="formData.sczl_yjno" @keyup.enter.native="getYJMCsubmit" :clearable="true" placeholder="0.00" />
+                        <el-input v-model="formData.sczl_yjno" @keyup.enter.native="getYJMCsubmit" :clearable="true" placeholder="0." />
                       </el-form-item>
                     </el-col>
                     <el-col :span="10">
                       <el-form-item label="印件名称" prop="id">
-                        <el-input v-model="formData.yj_yjmc" :clearable="true" placeholder="是" />
+                        <el-input v-model="formData.yj_yjmc" :clearable="true" placeholder="" />
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -132,19 +133,19 @@
              <el-row :gutter="20">
                 <el-col :span="4">
                   <el-form-item label="工序名称" prop="id">
-                    <el-input v-model="formData.sczl_gxmc"  @keyup.enter.native="getGXsubmit" :clearable="true" placeholder="2023.12.14" />
+                    <el-input v-model="formData.sczl_gxmc"  @keyup.enter.native="getGXsubmit" :clearable="true" placeholder="" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">          
                     <el-row :gutter="20">
                       <el-col :span="12">
-                        <el-input v-model="formData.sczl_gxh" :clearable="true" placeholder="ZT01733" />
+                        <el-input v-model="formData.sczl_gxh" :clearable="true" placeholder="" />
                       </el-col>
                     </el-row>
                 </el-col>
                 <el-col :span="3">
                   <el-form-item label="工艺名称" prop="name">
-                    <el-input v-model="formData.sczl_type" :clearable="true" placeholder="A班" />
+                    <el-input v-model="formData.sczl_type" :clearable="true" placeholder="" />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -153,21 +154,21 @@
 			  <el-row :gutter="20">
 			     <el-col :span="4">
 			       <el-form-item label="日期" prop="id">
-			         <el-input v-model="formData.sczl_rq" :clearable="true" placeholder="2023.12.14" />
+			         <el-input v-model="formData.sczl_rq" :clearable="true" placeholder="" />
 			       </el-form-item>
 			     </el-col>
 			     <el-col :span="6">          
 			         <el-row :gutter="20">
 			           <el-col :span="12">
 						<el-form-item label="机器" prop="id">
-			             <el-input v-model="formData.sczl_jtbh" :clearable="true" placeholder="ZT01733" />
+			             <el-input v-model="formData.sczl_jtbh" :clearable="true" placeholder="" />
 						</el-form-item>
 			           </el-col>
 			         </el-row>
 			     </el-col>
 			     <el-col :span="3">
 			       <el-form-item label="组别" prop="name">
-			         <el-input v-model="formData.sczl_bzdh" :clearable="true" placeholder="A班" />
+			         <el-input v-model="formData.sczl_bzdh" :clearable="true" placeholder="" />
 			       </el-form-item>
 			     </el-col>
 			   </el-row>
@@ -175,26 +176,26 @@
 			  <el-row :gutter="20">
 			     <el-col :span="4">
 			       <el-form-item label="墨色" prop="id">
-			         <el-input v-model="formData.sczl_ms" :clearable="true" placeholder="2023.12.14" />
+			         <el-input v-model="formData.sczl_ms" :clearable="true" placeholder="" />
 			       </el-form-item>
 			     </el-col>
 			     <el-col :span="6">          
 			         <el-row :gutter="20">
 			           <el-col :span="12">
 						 <el-form-item label="加工联数" prop="id">
-			             <el-input v-model="formData.sczl_ls" :clearable="true" placeholder="ZT01733" />
+			             <el-input v-model="formData.sczl_ls" :clearable="true" placeholder="" />
 						 </el-form-item>
 			           </el-col>
 			         </el-row>
 			     </el-col>
 			     <el-col :span="3">
 			       <el-form-item label="产量" prop="name">
-			         <el-input v-model="formData.sczl_cl" :clearable="true" placeholder="A班" />
+			         <el-input v-model="formData.sczl_cl" :clearable="true" placeholder="" />
 			       </el-form-item>
 			     </el-col>
 				 <el-col :span="3">
 				   <el-form-item label="制程废品" prop="name">
-				     <el-input v-model="formData.sczl_zcfp" :clearable="true" placeholder="A班" />
+				     <el-input v-model="formData.sczl_zcfp" :clearable="true" placeholder="" />
 				   </el-form-item>
 				 </el-col>
 			   </el-row>
@@ -203,26 +204,26 @@
 			   <el-row :gutter="20">
 			      <el-col :span="4">
 			        <el-form-item label="装版总工时" prop="id">
-			          <el-input v-model="formData.sczl_装版总工时" :clearable="true" placeholder="2023.12.14" />
+			          <el-input v-model="formData.sczl_装版总工时" :clearable="true" placeholder="" />
 			        </el-form-item>
 			      </el-col>
 			      <el-col :span="6">          
 			          <el-row :gutter="20">
 			            <el-col :span="12">
 			   						 <el-form-item label="装版补产工时" prop="id">
-			              <el-input v-model="formData.sczl_装版工时" :clearable="true" placeholder="ZT01733" />
+			              <el-input v-model="formData.sczl_装版工时" :clearable="true" placeholder="" />
 			   						 </el-form-item>
 			            </el-col>
 			          </el-row>
 			      </el-col>
 			      <el-col :span="3">
 			        <el-form-item label="保养工时" prop="name">
-			          <el-input v-model="formData.sczl_保养工时" :clearable="true" placeholder="A班" />
+			          <el-input v-model="formData.sczl_保养工时" :clearable="true" placeholder="" />
 			        </el-form-item>
 			      </el-col>
 			   				 <el-col :span="3">
 			   				   <el-form-item label="异常停机" prop="name">
-			   				     <el-input v-model="formData.sczl_异常停机工时" :clearable="true" placeholder="A班" />
+			   				     <el-input v-model="formData.sczl_异常停机工时" :clearable="true" placeholder="" />
 			   				   </el-form-item>
 			   				 </el-col>
 			    </el-row>
@@ -231,21 +232,21 @@
 			  <el-row :gutter="20">
 			     <el-col :span="4">
 			       <el-form-item label="打样总工时" prop="id">
-			         <el-input v-model="formData.sczl_打样总工时" :clearable="true" placeholder="2023.12.14" />
+			         <el-input v-model="formData.sczl_打样总工时" :clearable="true" placeholder="" />
 			       </el-form-item>
 			     </el-col>
 			     <el-col :span="6">          
 			         <el-row :gutter="20">
 			           <el-col :span="12">
 			  						 <el-form-item label="打样补产工时" prop="id">
-			             <el-input v-model="formData.sczl_打样工时" :clearable="true" placeholder="ZT01733" />
+			             <el-input v-model="formData.sczl_打样工时" :clearable="true" placeholder="" />
 			  						 </el-form-item>
 			           </el-col>
 			         </el-row>
 			     </el-col>
 			     <el-col :span="3">
 			       <el-form-item label="通电时间" prop="name">
-			         <el-input v-model="formData.sczl_设备运行工时" :clearable="true" placeholder="A班" />
+			         <el-input v-model="formData.sczl_设备运行工时" :clearable="true" placeholder="" />
 			       </el-form-item>
 			     </el-col>			  				
 			   </el-row>
@@ -258,14 +259,14 @@
 			         <el-row :gutter="20">
 			           <el-col :span="12">
 			  						 <el-form-item label="拆片联拼系数" prop="id">
-			             <el-input v-model="formData.拆片联拼系数" :clearable="true" placeholder="ZT01733" />
+			             <el-input v-model="formData.拆片联拼系数" :clearable="true" placeholder="" />
 			  						 </el-form-item>
 			           </el-col>
 			         </el-row>
 			     </el-col>
 			     <el-col :span="3">
 			       <el-form-item label="拆片条小盒系数" prop="name">
-			         <el-input v-model="formData.拆片条小盒系数" :clearable="true" placeholder="A班" />
+			         <el-input v-model="formData.拆片条小盒系数" :clearable="true" placeholder="" />
 			       </el-form-item>
 			     </el-col>			  				 
 			   </el-row>
@@ -277,19 +278,19 @@
 			         <el-row :gutter="20">
 			           <el-col :span="12">
 			  						 <el-form-item label="定额代号" prop="id">
-			             <el-input v-model="formData.sczl_dedh" @keyup.enter.native="getDedhsubmit" :clearable="true" placeholder="ZT01733" />
+			             <el-input v-model="formData.sczl_dedh" @keyup.enter.native="getDedhsubmit" :clearable="true" placeholder="" />
 			  						 </el-form-item>
 			           </el-col>
 			         </el-row>
 			     </el-col>
 			     <el-col :span="3">
 			       <el-form-item label="工价系数" prop="name">
-			         <el-input v-model="formData.sczl_工价系数" :clearable="true" placeholder="A班" />
+			         <el-input v-model="formData.sczl_工价系数" :clearable="true" placeholder="" />
 			       </el-form-item>
 			     </el-col>
 				  <el-col :span="3">
 					<el-form-item label="计产系数" prop="name">
-					  <el-input v-model="formData.sczl_计产系数" :clearable="true" placeholder="A班" />
+					  <el-input v-model="formData.sczl_计产系数" :clearable="true" placeholder="" />
 					</el-form-item>
 				  </el-col>
 			   </el-row>
@@ -335,34 +336,34 @@
 				   <span>班组成员</span>
 				 </el-col>
                 <el-col :span="2">
-                  <el-input v-model="formData.sczl_bh1" @keyup.enter.native="getGxMcsubmit($event, '1')":clearable="true" placeholder="ZI00401" />
+                  <el-input v-model="formData.sczl_bh1" @keyup.enter.native="getGxMcsubmit($event, '1')":clearable="true" placeholder="" />
                 </el-col>
                 <el-col :span="2">
-                  <el-input v-model="formData.sczl_bh2" @keyup.enter.native="getGxMcsubmit($event, '2')" :clearable="true" placeholder="瞿春生" />
+                  <el-input v-model="formData.sczl_bh2" @keyup.enter.native="getGxMcsubmit($event, '2')" :clearable="true" placeholder="" />
                 </el-col>
                 <el-col :span="2">
-                  <el-input v-model="formData.sczl_bh3" @keyup.enter.native="getGxMcsubmit($event, '3')" :clearable="true" placeholder="11.0" />
+                  <el-input v-model="formData.sczl_bh3" @keyup.enter.native="getGxMcsubmit($event, '3')" :clearable="true" placeholder="" />
                 </el-col>
                 <el-col :span="2">
-                  <el-input v-model="formData.sczl_bh4" @keyup.enter.native="getGxMcsubmit($event, '4')" :clearable="true" placeholder="打包废纸" />
+                  <el-input v-model="formData.sczl_bh4" @keyup.enter.native="getGxMcsubmit($event, '4')" :clearable="true" placeholder="" />
                 </el-col>
                 <el-col :span="2">
-                  <el-input v-model="formData.sczl_bh5" @keyup.enter.native="getGxMcsubmit($event, '5')" :clearable="true" placeholder="是" />
+                  <el-input v-model="formData.sczl_bh5" @keyup.enter.native="getGxMcsubmit($event, '5')" :clearable="true" placeholder="" />
                 </el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_bh6" @keyup.enter.native="getGxMcsubmit($event, '6')" :clearable="true" placeholder="ZI00401" />
+				  <el-input v-model="formData.sczl_bh6" @keyup.enter.native="getGxMcsubmit($event, '6')" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_bh7" @keyup.enter.native="getGxMcsubmit($event, '7')" :clearable="true" placeholder="瞿春生" />
+				  <el-input v-model="formData.sczl_bh7" @keyup.enter.native="getGxMcsubmit($event, '7')" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_bh8" @keyup.enter.native="getGxMcsubmit($event, '8')" :clearable="true" placeholder="11.0" />
+				  <el-input v-model="formData.sczl_bh8" @keyup.enter.native="getGxMcsubmit($event, '8')" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_bh9" @keyup.enter.native="getGxMcsubmit($event, '9')" :clearable="true" placeholder="打包废纸" />
+				  <el-input v-model="formData.sczl_bh9" @keyup.enter.native="getGxMcsubmit($event, '9')" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_bh10" @keyup.enter.native="getGxMcsubmit($event, '10')" :clearable="true" placeholder="是" />
+				  <el-input v-model="formData.sczl_bh10" @keyup.enter.native="getGxMcsubmit($event, '10')" :clearable="true" placeholder="" />
 				</el-col>
               </el-row>
             </el-form>
@@ -373,34 +374,34 @@
 							   
 							 </el-col>
 			   <el-col :span="2">
-			     <el-input v-model="formData.sczl_bh1_name"  :clearable="true" placeholder="ZI00401" />
+			     <el-input v-model="formData.sczl_bh1_name"  :clearable="true" placeholder="" />
 			   </el-col>
 			   <el-col :span="2">
-			     <el-input v-model="formData.sczl_bh2_name" :clearable="true" placeholder="瞿春生" />
+			     <el-input v-model="formData.sczl_bh2_name" :clearable="true" placeholder="" />
 			   </el-col>
 			   <el-col :span="2">
-			     <el-input v-model="formData.sczl_bh3_name" :clearable="true" placeholder="11.0" />
+			     <el-input v-model="formData.sczl_bh3_name" :clearable="true" placeholder="" />
 			   </el-col>
 			   <el-col :span="2">
-			     <el-input v-model="formData.sczl_bh4_name" :clearable="true" placeholder="打包废纸" />
+			     <el-input v-model="formData.sczl_bh4_name" :clearable="true" placeholder="" />
 			   </el-col>
 			   <el-col :span="2">
-			     <el-input v-model="formData.sczl_bh5_name" :clearable="true" placeholder="是" />
+			     <el-input v-model="formData.sczl_bh5_name" :clearable="true" placeholder="" />
 			   </el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_bh6_name" :clearable="true" placeholder="ZI00401" />
+				  <el-input v-model="formData.sczl_bh6_name" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_bh7_name" :clearable="true" placeholder="瞿春生" />
+				  <el-input v-model="formData.sczl_bh7_name" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_bh8_name" :clearable="true" placeholder="11.0" />
+				  <el-input v-model="formData.sczl_bh8_name" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_bh9_name" :clearable="true" placeholder="打包废纸" />
+				  <el-input v-model="formData.sczl_bh9_name" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_bh10_name" :clearable="true" placeholder="是" />
+				  <el-input v-model="formData.sczl_bh10_name" :clearable="true" placeholder="" />
 				</el-col>
 			 </el-row>
 			
@@ -409,34 +410,34 @@
 				  
 				 </el-col>
 			   <el-col :span="2">
-			     <el-input v-model="formData.sczl_rate1" :clearable="true" placeholder="ZI00401" />
+			     <el-input v-model="formData.sczl_rate1" :clearable="true" placeholder="" />
 			   </el-col>
 			   <el-col :span="2">
-			     <el-input v-model="formData.sczl_rate2" :clearable="true" placeholder="瞿春生" />
+			     <el-input v-model="formData.sczl_rate2" :clearable="true" placeholder="" />
 			   </el-col>
 			   <el-col :span="2">
-			     <el-input v-model="formData.sczl_rate3" :clearable="true" placeholder="11.0" />
+			     <el-input v-model="formData.sczl_rate3" :clearable="true" placeholder="" />
 			   </el-col>
 			   <el-col :span="2">
-			     <el-input v-model="formData.sczl_rate4" :clearable="true" placeholder="打包废纸" />
+			     <el-input v-model="formData.sczl_rate4" :clearable="true" placeholder="" />
 			   </el-col>
 			   <el-col :span="2">
-			     <el-input v-model="formData.sczl_rate5" :clearable="true" placeholder="是" />
+			     <el-input v-model="formData.sczl_rate5" :clearable="true" placeholder="" />
 			   </el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_rate6" :clearable="true" placeholder="ZI00401" />
+				  <el-input v-model="formData.sczl_rate6" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_rate7" :clearable="true" placeholder="瞿春生" />
+				  <el-input v-model="formData.sczl_rate7" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_rate8" :clearable="true" placeholder="11.0" />
+				  <el-input v-model="formData.sczl_rate8" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_rate9" :clearable="true" placeholder="打包废纸" />
+				  <el-input v-model="formData.sczl_rate9" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_rate10" :clearable="true" placeholder="是" />
+				  <el-input v-model="formData.sczl_rate10" :clearable="true" placeholder="" />
 				</el-col>
 			 </el-row>
 			 
@@ -508,7 +509,8 @@ import {
   productionDedh,
   productionedit,
   productiondel,
-  getYg
+  getYg,
+  productionadd
 } from '@/api/jixiaoguanli/jitairibaobiao'
 
 // 全量引入格式化工具 请按需保留
@@ -839,6 +841,22 @@ function onSearch() {
 	page.value = 1
 	GetLocate()
 }
+const ADD=ref('0')
+//新增
+function onAdd() {
+	ADD.value='新增'
+	console.log(ADD.value)
+	dialogFormVisible.value = true
+	// Productionadd()
+}
+//新增
+const Productionadd = async () => {
+  const response = await productionadd();
+  if (response.code === 0) {
+	console.log(333)
+  }
+  getTableData()
+}
 //删除
 function onDel() {
 	Del()
@@ -983,7 +1001,7 @@ const onDelete = async () => {
 }
 
 // 行为控制标记（弹窗内部需要增还是改）
-const type = ref('')
+// const type = ref('')
 
 // 更新行
 const updateCompanyFunc = async (row) => {
@@ -1090,6 +1108,7 @@ const updateDetailData = async() => {
    sczl_rate8: formData.value.sczl_rate8,
    sczl_rate9: formData.value.sczl_rate9,
    sczl_rate10: formData.value.sczl_rate10,
+   sys_id:'[1002/郑小丽]',
   }
   // detailData.table.forEach((item, index, array) => {
   //   const num = index + 1
@@ -1101,13 +1120,31 @@ const updateDetailData = async() => {
   //   restoredData[`sczl_PgCl${num}`] = item.sczl_PgCl
   //   restoredData[`sczl_clAdd${num}`] = item.sczl_clAdd
   // })
+  if(ADD.value=='新增'){
+  	 // console.log('新增')
+  	 console.log('新增')
+  	 console.log(ADD.value)
+  	 console.log(restoredData)
+  	 const response = await productionadd(restoredData);
+  	 // ADD.value='1'
+  	 // console.log(ADD.value)
+  	 ADD.value='0'
+  	 console.log(response)
+  	 
+  }else{
+  	  const response = await productionedit(restoredData);
+  	 console.log('修改')
+  	  console.log(ADD.value)
+  	  console.log(response)
+  	 // ADD.value='0'
+  	 // console.log(ADD.value)
+  }
+ //   console.log(restoredData)
+ //    console.log(lastCellValue)
+ //    formData.value.UniqId=lastCellValue
+ //    console.log(formData)
+	// restoredData.UniqId='5'
   
-   console.log(restoredData)
-    console.log(lastCellValue)
-    formData.value.UniqId=lastCellValue
-    console.log(formData)
-	restoredData.UniqId='5'
-   const response = await productionedit(restoredData);
   // console.log(FormData)
   console.log(response)
 }

src/view/performance/MachineDocuments.vue

@@ -21,6 +21,7 @@
               <el-button type="primary" :icon="Search" @click="onSearch">搜索</el-button>
               <el-button type="primary" :icon="Refresh" @click="onRefresh">刷新质检系数</el-button>
 			   <el-button type="primary"  @click="onCountByGdbh">按工单显示</el-button>
+			   <el-button type="primary" :icon="Refresh" @click="onAdd">新增</el-button>
 			  <el-button type="primary" :icon="Refresh" @click="onDel">删除</el-button>
               <div style="margin-left: auto;">
                 <el-button type="primary" :icon="Download" @click="exportExcel">导出到Excel</el-button>
@@ -73,14 +74,14 @@
 			  <el-row :gutter="20">
 					 <el-col :span="4">
 					   <el-form-item label="日期" prop="id">
-						 <el-input v-model="formData.sczl_rq" :clearable="true" placeholder="2023.12.14" />
+						 <el-input v-model="formData.sczl_rq" :clearable="true" placeholder="" />
 					   </el-form-item>
 					 </el-col>
 					 <el-col :span="6">
 					   <el-form-item label="组别" prop="name">
 						 <el-row :gutter="20">
 						   <el-col :span="12">
-							 <el-input v-model="formData.sczl_bzdh" :clearable="true" placeholder="ZT01733" />
+							 <el-input v-model="formData.sczl_bzdh" :clearable="true" placeholder="" />
 						   </el-col>                      
 						 </el-row>
 					   </el-form-item>
@@ -91,20 +92,20 @@
 				<el-row :gutter="20">
 					 <el-col :span="4">
 					   <el-form-item label="工单编号" prop="id">
-						 <el-input v-model="formData.sczl_gdbh" @keyup.enter="getMachineGxMcsubmit" :clearable="true" placeholder="2023.12.14" />
+						 <el-input v-model="formData.sczl_gdbh" @keyup.enter="getMachineGxMcsubmit" :clearable="true" placeholder="" />
 					   </el-form-item>
 					 </el-col>
 					 <el-col :span="20">
 					   <!-- <el-form-item label="组别" prop="name"> -->
 						 <el-row :gutter="20">
 						   <el-col :span="5">
-							 <el-input v-model="formData.sczl_bzdh" :clearable="true" placeholder="ZT01733" />
+							 <el-input v-model="formData.sczl_yjgx" :clearable="true" placeholder="" />
 						   </el-col>
 							<el-col :span="5">
-							 <el-input v-model="formData.sczl_bzdh" :clearable="true" placeholder="ZT01733" />
+							 <el-input v-model="formData.sczl_gxmc" :clearable="true" placeholder="" />
 							</el-col>  
 							<el-col :span="5">
-							 <el-input v-model="formData.sczl_bzdh" :clearable="true" placeholder="ZT01733" />
+							 <el-input v-model="formData.yj_yjmc" :clearable="true" placeholder="" />
 							</el-col>  					 
 						 </el-row>
 					   <!-- </el-form-item> -->
@@ -115,26 +116,26 @@
 					<el-row :gutter="20">
 					 <el-col :span="4">
 					   <el-form-item label="机台编号" prop="id">
-						 <el-input v-model="formData.sczl_jtbh" @keyup.enter.native="getJtbhsubmit" :clearable="true" placeholder="2023.12.14" />
+						 <el-input v-model="formData.sczl_jtbh" @keyup.enter.native="getJtbhsubmit" :clearable="true" placeholder="" />
 					   </el-form-item>
 					 </el-col>
 					 <el-col :span="6">          
 						 <el-row :gutter="20">
 						   <el-col :span="12">
 							<el-form-item label="检验类型" prop="id">
-							 <el-input v-model="formData.sczl_单据类型" :clearable="true" placeholder="ZT01733" />
+							 <el-input v-model="formData.sczl_单据类型" :clearable="true" placeholder="" />
 							</el-form-item>
 						   </el-col>
 						 </el-row>
 					 </el-col>
 					 <el-col :span="3">
 					   <el-form-item label="检验类别" prop="name">
-						 <el-input v-model="formData.sczl_检验类别" :clearable="true" placeholder="A班" />
+						 <el-input v-model="formData.sczl_检验类别" :clearable="true" placeholder="" />
 					   </el-form-item>
 					 </el-col>
 					 <el-col :span="3">
 					   <el-form-item label="废品率系数" prop="name">
-						 <el-input v-model="formData.sczl_废品率系数" :clearable="true" placeholder="A班" />
+						 <el-input v-model="formData.sczl_废品率系数" :clearable="true" placeholder="" />
 					   </el-form-item>
 					 </el-col>
 				   </el-row>
@@ -142,17 +143,17 @@
 					   <el-row :gutter="20">
 					   <el-col :span="4">
 						 <el-form-item label="计件箱数" prop="id">
-						   <el-input v-model="formData.sczl_cl" :clearable="true" placeholder="2023.12.14" />
+						   <el-input v-model="formData.sczl_cl" :clearable="true" placeholder="" />
 						 </el-form-item>
 					   </el-col>
 					 <el-col :span="3">
 						 <el-form-item label="每箱数量" prop="name">
-						   <el-input v-model="formData.sczl_PgCl" :clearable="true" placeholder="A班" />
+						   <el-input v-model="formData.sczl_PgCl" :clearable="true" placeholder="" />
 						 </el-form-item>
 					   </el-col>
 					   <el-col :span="3">
 						 <el-form-item label="定额代号" @keyup.enter.native="getMachineDedhsubmit" prop="name">
-						   <el-input v-model="formData.sczl_dedh" :clearable="true" placeholder="A班" />
+						   <el-input v-model="formData.sczl_dedh" :clearable="true" placeholder="" />
 						 </el-form-item>
 					   </el-col>
 					 </el-row>
@@ -162,42 +163,42 @@
 					 <el-row :gutter="1">
 					 			     <el-col :span="4">
 					 			       <el-form-item label="流程单号" prop="id">
-					 			         <el-input v-model="formData.address" :clearable="true" placeholder="2023.12.14" />
+					 			         <el-input v-model="formData.address" :clearable="true" placeholder="" />
 					 			       </el-form-item>
 					 			     </el-col>
 					 							 <el-col :span="1">
-					 							   <el-input v-model="formData.流程单号1" :clearable="true" placeholder="ZT01733" />
+					 							   <el-input v-model="formData.流程单号1" :clearable="true" placeholder="" />
 					 							 </el-col>
 					 				            <el-col :span="1">
-					 				              <el-input v-model="formData.流程单号2" :clearable="true" placeholder="ZT01733" />
+					 				              <el-input v-model="formData.流程单号2" :clearable="true" placeholder="" />
 					 				            </el-col>
 					 			  				  <el-col :span="1">			  			
-					 			  				    <el-input v-model="formData.流程单号3" :clearable="true" placeholder="ZT01733" />
+					 			  				    <el-input v-model="formData.流程单号3" :clearable="true" placeholder="" />
 					 			  				  </el-col>
 					 							  
 					 			  				  <el-col :span="1">
-					 			  				    <el-input v-model="formData.流程单号4" :clearable="true" placeholder="ZT01733" />
+					 			  				    <el-input v-model="formData.流程单号4" :clearable="true" placeholder="" />
 					 			  				  </el-col>
 					 			  				  <el-col :span="1">
-					 			  				    <el-input v-model="formData.流程单号5" :clearable="true" placeholder="ZT01733" />
+					 			  				    <el-input v-model="formData.流程单号5" :clearable="true" placeholder="" />
 					 			  				  </el-col>
 					 			  				  <el-col :span="1">
-					 			  				    <el-input v-model="formData.流程单号6" :clearable="true" placeholder="ZT01733" />
+					 			  				    <el-input v-model="formData.流程单号6" :clearable="true" placeholder="" />
 					 			  				  </el-col>
 					 			  				  <el-col :span="1">
-					 			  				    <el-input v-model="formData.流程单号7" :clearable="true" placeholder="ZT01733" />
+					 			  				    <el-input v-model="formData.流程单号7" :clearable="true" placeholder="" />
 					 			  				  </el-col>
 					 			  				  <el-col :span="1">
-					 			  				    <el-input v-model="formData.流程单号8" :clearable="true" placeholder="ZT01733" />
+					 			  				    <el-input v-model="formData.流程单号8" :clearable="true" placeholder="" />
 					 			  				  </el-col>
 					 							  <el-col :span="1">
-					 			  				    <el-input v-model="formData.流程单号9" :clearable="true" placeholder="ZT01733" />
+					 			  				    <el-input v-model="formData.流程单号9" :clearable="true" placeholder="" />
 					 			  				  </el-col>
 					 			     <el-col :span="6">          
 					 			         <el-row :gutter="20">
 					 			           <el-col :span="12">
 					 			  						 <el-form-item label="备注" prop="id">
-					 			             <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="ZT01733" />
+					 			             <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="" />
 					 			  						 </el-form-item>
 					 			           </el-col>
 					 			         </el-row>
@@ -208,26 +209,26 @@
 				<el-row :gutter="20">
 							     <el-col :span="4">
 							       <el-form-item label="换模补产工时" prop="id">
-							         <el-input v-model="formData.sczl_装版工时" :clearable="true" placeholder="2023.12.14" />
+							         <el-input v-model="formData.sczl_装版工时" :clearable="true" placeholder="" />
 							       </el-form-item>
 							     </el-col>
 							     <el-col :span="6">          
 							         <el-row :gutter="20">
 							           <el-col :span="12">
 							  						<el-form-item label="设备保养工时" prop="id">
-							             <el-input v-model="formData.sczl_保养工时" :clearable="true" placeholder="ZT01733" />
+							             <el-input v-model="formData.sczl_保养工时" :clearable="true" placeholder="" />
 							  						</el-form-item>
 							           </el-col>
 							         </el-row>
 							     </el-col>
 							     <el-col :span="3">
 							       <el-form-item label="异常停机" prop="name">
-							         <el-input v-model="formData.sczl_异常停机工时" :clearable="true" placeholder="A班" />
+							         <el-input v-model="formData.sczl_异常停机工时" :clearable="true" placeholder="" />
 							       </el-form-item>
 							     </el-col>
 								 <el-col :span="3">
 								   <el-form-item label="设备通电工时" prop="name">
-									 <el-input v-model="formData.sczl_设备运行工时" :clearable="true" placeholder="A班" />
+									 <el-input v-model="formData.sczl_设备运行工时" :clearable="true" placeholder="" />
 								   </el-form-item>
 								 </el-col>
 							   </el-row>				   
@@ -237,28 +238,28 @@
 								   <span>组员信息</span>
 								 </el-col>
 				                <el-col :span="2">
-				                  <el-input v-model="formData.sczl_bh1" @keyup.enter.native="getGxMcsubmit($event, '1')" :clearable="true" placeholder="ZI00401" />
+				                  <el-input v-model="formData.sczl_bh1" @keyup.enter.native="getGxMcsubmit($event, '1')" :clearable="true" placeholder="" />
 				                </el-col>
 				                <el-col :span="2">
-				                  <el-input v-model="formData.sczl_bh2" @keyup.enter.native="getGxMcsubmit($event, '2')" :clearable="true" placeholder="瞿春生" />
+				                  <el-input v-model="formData.sczl_bh2" @keyup.enter.native="getGxMcsubmit($event, '2')" :clearable="true" placeholder="" />
 				                </el-col>
 				                <el-col :span="2">
-				                  <el-input v-model="formData.sczl_bh3" @keyup.enter.native="getGxMcsubmit($event, '3')" :clearable="true" placeholder="11.0" />
+				                  <el-input v-model="formData.sczl_bh3" @keyup.enter.native="getGxMcsubmit($event, '3')" :clearable="true" placeholder="" />
 				                </el-col>
 				                <el-col :span="2">
-				                  <el-input v-model="formData.sczl_bh4" @keyup.enter.native="getGxMcsubmit($event, '4')" :clearable="true" placeholder="打包废纸" />
+				                  <el-input v-model="formData.sczl_bh4" @keyup.enter.native="getGxMcsubmit($event, '4')" :clearable="true" placeholder="" />
 				                </el-col>
 				                <el-col :span="2">
-				                  <el-input v-model="formData.sczl_bh5" @keyup.enter.native="getGxMcsubmit($event, '5')" :clearable="true" placeholder="是" />
+				                  <el-input v-model="formData.sczl_bh5" @keyup.enter.native="getGxMcsubmit($event, '5')" :clearable="true" placeholder="" />
 				                </el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh6" @keyup.enter.native="getGxMcsubmit($event, '6')" :clearable="true" placeholder="ZI00401" />
+								  <el-input v-model="formData.sczl_bh6" @keyup.enter.native="getGxMcsubmit($event, '6')" :clearable="true" placeholder="" />
 								</el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh7" @keyup.enter.native="getGxMcsubmit($event, '7')" :clearable="true" placeholder="瞿春生" />
+								  <el-input v-model="formData.sczl_bh7" @keyup.enter.native="getGxMcsubmit($event, '7')" :clearable="true" placeholder="" />
 								</el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh8" @keyup.enter.native="getGxMcsubmit($event, '8')" :clearable="true" placeholder="11.0" />
+								  <el-input v-model="formData.sczl_bh8" @keyup.enter.native="getGxMcsubmit($event, '8')" :clearable="true" placeholder="" />
 								</el-col>
 				              </el-row>
 										 
@@ -267,28 +268,28 @@
 								   <span></span>
 								 </el-col>
 							    <el-col :span="2">
-							      <el-input v-model="formData.sczl_bh1_name"   :clearable="true" placeholder="ZI00401" />
+							      <el-input v-model="formData.sczl_bh1_name"   :clearable="true" placeholder="" />
 							    </el-col>
 							    <el-col :span="2">
-							      <el-input v-model="formData.sczl_bh2_name"   :clearable="true" placeholder="瞿春生" />
+							      <el-input v-model="formData.sczl_bh2_name"   :clearable="true" placeholder="" />
 							    </el-col>
 							    <el-col :span="2">
-							      <el-input v-model="formData.sczl_bh3_name" :clearable="true" placeholder="11.0" />
+							      <el-input v-model="formData.sczl_bh3_name" :clearable="true" placeholder="" />
 							    </el-col>
 							    <el-col :span="2">
-							      <el-input v-model="formData.sczl_bh4_name" :clearable="true" placeholder="打包废纸" />
+							      <el-input v-model="formData.sczl_bh4_name" :clearable="true" placeholder="" />
 							    </el-col>
 							    <el-col :span="2">
-							      <el-input v-model="formData.sczl_bh5_name" :clearable="true" placeholder="是" />
+							      <el-input v-model="formData.sczl_bh5_name" :clearable="true" placeholder="" />
 							    </el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh6_name" :clearable="true" placeholder="ZI00401" />
+								  <el-input v-model="formData.sczl_bh6_name" :clearable="true" placeholder="" />
 								</el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh7_name" :clearable="true" placeholder="瞿春生" />
+								  <el-input v-model="formData.sczl_bh7_name" :clearable="true" placeholder="" />
 								</el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh8_name" :clearable="true" placeholder="11.0" />
+								  <el-input v-model="formData.sczl_bh8_name" :clearable="true" placeholder="" />
 								</el-col>
 							  </el-row>
 													   
@@ -298,28 +299,28 @@
 								   <span></span>
 								 </el-col>
 							    <el-col :span="2">
-							      <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="ZI00401" />
+							      <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="" />
 							    </el-col>
 							    <el-col :span="2">
-							      <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="瞿春生" />
+							      <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="" />
 							    </el-col>
 							    <el-col :span="2">
-							      <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="11.0" />
+							      <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="" />
 							    </el-col>
 							    <el-col :span="2">
-							      <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="打包废纸" />
+							      <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="" />
 							    </el-col>
 							    <el-col :span="2">
-							      <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="是" />
+							      <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="" />
 							    </el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="ZI00401" />
+								  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="" />
 								</el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="瞿春生" />
+								  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="" />
 								</el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="11.0" />
+								  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="" />
 								</el-col>
 							  </el-row>
 																	 
@@ -327,7 +328,7 @@
 				<el-row :gutter="20">
 			   <el-col :span="20">
 			     <el-form-item label="其他备注" prop="id">
-			       <el-input v-model="formData.流程单号" :clearable="true" placeholder="2023.12.14" />
+			       <el-input v-model="formData.流程单号" :clearable="true" placeholder="" />
 			     </el-form-item>
 			   </el-col>
 			 </el-row>													 
@@ -440,7 +441,8 @@ import {
   getJtbh,
   machineEdit,
   machineDel,
-  getMachineCountByGdbh
+  getMachineCountByGdbh,
+  machineAdd
 } from '@/api/jixiaoguanli/jitairibaobiao'
 
 // 全量引入格式化工具 请按需保留
@@ -867,6 +869,7 @@ const updateDetailData = async() => {
 	sczl_bh7: formData.value.sczl_bh7,
 	sczl_bh8: formData.value.sczl_bh8,
 	sczl_desc: formData.value.sczl_desc,
+	sys_id:'[1008/姜剑娟]',
   }
   // detailData.table.forEach((item, index, array) => {
   //   const num = index + 1
@@ -878,15 +881,29 @@ const updateDetailData = async() => {
   //   restoredData[`sczl_PgCl${num}`] = item.sczl_PgCl
   //   restoredData[`sczl_clAdd${num}`] = item.sczl_clAdd
   // })
-  console.log(restoredData)
-    console.log(lastCellValue)
-    formData.value.UniqId=lastCellValue
-    console.log(formData)
-	restoredData.UniqId='5'
-   const response = await machineEdit(restoredData);
-  // console.log(FormData)
-  console.log(response)
-}
+  if(ADD.value=='新增'){
+  	 // console.log('新增')
+  	 console.log('新增')
+  	 console.log(ADD.value)
+  	 console.log(restoredData)
+  	 const response = await machineAdd(restoredData);
+  	 // ADD.value='1'
+  	 // console.log(ADD.value)
+  	 ADD.value='0'
+  	 console.log(response)
+  	 
+  }else{
+		 console.log(restoredData)
+  	     console.log(lastCellValue)
+  	     formData.value.UniqId=lastCellValue
+  	     console.log(formData)
+  	 	restoredData.UniqId='5'
+  	    const response = await machineEdit(restoredData);
+  	   // console.log(FormData)
+  	   console.log(response)
+  	 }
+  }
+ 
 //删除
 const MachineDel = async () => {
   const response = await machineDel({UniqId:lastCellValue});
@@ -926,6 +943,14 @@ function onSearch() {
 function onRefresh() {
 	GetMachineScrapFactor(ScrapFactor)
 }
+const ADD=ref('0')
+//新增
+function onAdd() {
+	ADD.value='新增'
+	console.log(ADD.value)
+	dialogFormVisible.value = true
+	// Productionadd()
+}
 //删除
 function onDel() {
 	MachineDel()

src/view/performance/Manualdocuments.vue

@@ -19,10 +19,10 @@
                 <el-input v-model="positionvalue" placeholder="输入工单编号或产品名称" />
               </el-row>
               <el-button type="primary" :icon="Search" @click="onSearch">搜索</el-button>
-              <el-button type="primary" :icon="Refresh">重置</el-button>
-			  <el-button type="primary" :icon="Refresh" @click="onRefresh">刷新质检系数</el-button>
-			  <el-button type="primary" :icon="Refresh" @click="onCountByGdbh">按工单显示</el-button>
-			  <el-button type="primary" :icon="Refresh" @click="onDel">删除</el-button>
+              <el-button type="primary"  @click="onAdd">新增</el-button>
+			  <el-button type="primary"  @click="onRefresh">刷新质检系数</el-button>
+			  <el-button type="primary"  @click="onCountByGdbh">按工单显示</el-button>
+			  <el-button type="primary"  @click="onDel">删除</el-button>
               <div style="margin-left: auto;">
                 <el-button type="primary" :icon="Download" @click="exportExcel">导出到Excel</el-button>
               </div>
@@ -65,14 +65,14 @@
               <el-row :gutter="20">
                 <el-col :span="4">
                   <el-form-item label="日期" prop="id">
-                    <el-input v-model="formData.sczl_rq" :clearable="true" placeholder="2023.12.14" />
+                    <el-input v-model="formData.sczl_rq" :clearable="true" placeholder="" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
                   <el-form-item label="组别" prop="name">
                     <el-row :gutter="20">
                       <el-col :span="12">
-                        <el-input v-model="formData.sczl_bzdh" :clearable="true" placeholder="ZT01733" />
+                        <el-input v-model="formData.sczl_bzdh" :clearable="true" placeholder="" />
                       </el-col>                      
                     </el-row>
                   </el-form-item>
@@ -81,10 +81,10 @@
 				  <el-form-item label="组长" prop="name">
 				    <el-row :gutter="20">
 				      <el-col :span="12">
-				        <el-input v-model="formData.sczl_bh0" @keyup.enter.native="getygsubmit($event, '0')":clearable="true" placeholder="ZT01733" />
+				        <el-input v-model="formData.sczl_bh0" @keyup.enter.native="getygsubmit($event, '0')":clearable="true" placeholder="" />
 				      </el-col>
 						<el-col :span="12">
-						  <el-input v-model="formData.sczl_bh0_name" :clearable="true" placeholder="ZT01733" />
+						  <el-input v-model="formData.sczl_bh0_name" :clearable="true" placeholder="" />
 						</el-col>  
 				    </el-row>
 				  </el-form-item>
@@ -93,7 +93,7 @@
 				  <el-form-item label="箱数" prop="name">
 				    <el-row :gutter="20">
 				      <el-col :span="2">
-				        <el-input v-model="formData.sczl_cl0" :clearable="true" placeholder="ZT01733" />
+				        <el-input v-model="formData.sczl_cl0" :clearable="true" placeholder="" />
 				      </el-col>                      
 				    </el-row>
 				  </el-form-item>
@@ -102,7 +102,7 @@
 				  <el-form-item label="每箱数" prop="name">
 				    <el-row :gutter="20">
 				      <el-col :span="2">
-				        <el-input v-model="formData.sczl_fp0" :clearable="true" placeholder="ZT01733" />
+				        <el-input v-model="formData.sczl_fp0" :clearable="true" placeholder="" />
 				      </el-col>                      
 				    </el-row>
 				  </el-form-item>
@@ -114,17 +114,17 @@
                   <el-row :gutter="20">
                     <el-col :span="5">
                       <el-form-item label="工单编号" prop="id">
-                        <el-input v-model="formData.sczl_gdbh" @keyup.enter="getGxMcsubmit" :clearable="true" placeholder="0.00" />
+                        <el-input v-model="formData.sczl_gdbh" @keyup.enter="getGxMcsubmit" :clearable="true" placeholder="" />
                       </el-form-item>
                     </el-col>
                     <el-col :span="5">                      
-                        <el-input v-model="formData.sczl_yjgx" :clearable="true" placeholder="是" />
+                        <el-input v-model="formData.sczl_yjgx" :clearable="true" placeholder="" />
                     </el-col>
 					<el-col :span="5">
-					    <el-input v-model="formData.sczl_gxmc" :clearable="true" placeholder="是" />
+					    <el-input v-model="formData.sczl_gxmc" :clearable="true" placeholder="" />
 					</el-col>
 					<el-col :span="5">
-					    <el-input v-model="formData.yj_yjmc" :clearable="true" placeholder="是" />
+					    <el-input v-model="formData.yj_yjmc" :clearable="true" placeholder="" />
 					</el-col>
                   </el-row>
                 </el-col>
@@ -133,26 +133,26 @@
 			  <el-row :gutter="20">
 			     <el-col :span="4">
 			       <el-form-item label="产量合计" prop="id">
-			         <el-input v-model="formData.sczl_cl" :clearable="true" placeholder="2023.12.14" />
+			         <el-input v-model="formData.sczl_cl" :clearable="true" placeholder="" />
 			       </el-form-item>
 			     </el-col>
 			     <el-col :span="6">          
 			         <el-row :gutter="20">
 			           <el-col :span="12">
 						<el-form-item label="定额代号" prop="id">
-			             <el-input v-model="formData.sczl_dedh" @keyup.enter.native="getDedhsubmit" :clearable="true" placeholder="ZT01733" />
+			             <el-input v-model="formData.sczl_dedh" @keyup.enter.native="getDedhsubmit" :clearable="true" placeholder="" />
 						</el-form-item>
 			           </el-col>
 			         </el-row>
 			     </el-col>
 			     <el-col :span="3">
 			       <el-form-item label="检验类别" prop="name">
-			         <el-input v-model="formData.sczl_检验类别" :clearable="true" placeholder="A班" />
+			         <el-input v-model="formData.sczl_检验类别" :clearable="true" placeholder="" />
 			       </el-form-item>
 			     </el-col>
 				 <el-col :span="3">
 				   <el-form-item label="废品率系数" prop="name">
-				     <el-input v-model="formData.sczl_废品率系数" :clearable="true" placeholder="A班" />
+				     <el-input v-model="formData.sczl_废品率系数" :clearable="true" placeholder="" />
 				   </el-form-item>
 				 </el-col>
 			   </el-row>
@@ -160,14 +160,14 @@
 			  <el-row :gutter="20">
 			     <el-col :span="4">
 			       <el-form-item label="计时时数" prop="id">
-			         <el-input v-model="formData.sczl_jsss" :clearable="true" placeholder="2023.12.14" />
+			         <el-input v-model="formData.sczl_jsss" :clearable="true" placeholder="" />
 			       </el-form-item>
 			     </el-col>
 			     <el-col :span="6">          
 			         <el-row :gutter="20">
 			           <el-col :span="12">
 						 <el-form-item label="冲月定额" prop="id">
-			             <el-input v-model="formData.sczl_冲定额" :clearable="true" placeholder="ZT01733" />
+			             <el-input v-model="formData.sczl_冲定额" :clearable="true" placeholder="" />
 						 </el-form-item>
 			           </el-col>
 			         </el-row>
@@ -178,38 +178,38 @@
 			   <el-row :gutter="1">
 			      <el-col :span="4">
 			        <el-form-item label="流程单号" prop="id">
-			          <el-input v-model="formData.流程单号1" :clearable="true" placeholder="2023.12.14" />
+			          <el-input v-model="formData.流程单号1" :clearable="true" placeholder="" />
 			        </el-form-item>
 			      </el-col>
 				  <el-col :span="1">			  			
-				    <el-input v-model="formData.流程单号2" :clearable="true" placeholder="ZT01733" />
+				    <el-input v-model="formData.流程单号2" :clearable="true" placeholder="" />
 				  </el-col>
 				  <el-col :span="1">
-				    <el-input v-model="formData.流程单号3" :clearable="true" placeholder="ZT01733" />
+				    <el-input v-model="formData.流程单号3" :clearable="true" placeholder="" />
 				  </el-col>
 				  <el-col :span="1">
-				    <el-input v-model="formData.流程单号4" :clearable="true" placeholder="ZT01733" />
+				    <el-input v-model="formData.流程单号4" :clearable="true" placeholder="" />
 				  </el-col>
 				  <el-col :span="1">
-				    <el-input v-model="formData.流程单号5" :clearable="true" placeholder="ZT01733" />
+				    <el-input v-model="formData.流程单号5" :clearable="true" placeholder="" />
 				  </el-col>
 				  <el-col :span="1">
-				    <el-input v-model="formData.流程单号6" :clearable="true" placeholder="ZT01733" />
+				    <el-input v-model="formData.流程单号6" :clearable="true" placeholder="" />
 				  </el-col>
 				  <el-col :span="1">
-				    <el-input v-model="formData.流程单号7" :clearable="true" placeholder="ZT01733" />
+				    <el-input v-model="formData.流程单号7" :clearable="true" placeholder="" />
 				  </el-col>
 				  <el-col :span="1">
-				    <el-input v-model="formData.流程单号8" :clearable="true" placeholder="ZT01733" />
+				    <el-input v-model="formData.流程单号8" :clearable="true" placeholder="" />
 				  </el-col>
 				  <el-col :span="1">
-				    <el-input v-model="formData.流程单号9" :clearable="true" placeholder="ZT01733" />
+				    <el-input v-model="formData.流程单号9" :clearable="true" placeholder="" />
 				  </el-col>
 			      <el-col :span="6">          
 			          <el-row :gutter="20">
 			            <el-col :span="12">
 			   						 <el-form-item label="备注" prop="id">
-			              <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="ZT01733" />
+			              <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="" />
 			   						 </el-form-item>
 			            </el-col>
 			          </el-row>
@@ -254,30 +254,30 @@
 				   <span></span>
 				 </el-col>
 			     <el-col :span="2">
-			       <el-input v-model="formData.sczl_bh1" :clearable="true" @keyup.enter.native="getygsubmit($event, '1')"  placeholder="ZI00401" />
+			       <el-input v-model="formData.sczl_bh1" :clearable="true" @keyup.enter.native="getygsubmit($event, '1')"  placeholder="" />
 			     </el-col>
 			     <el-col :span="2">
-			       <el-input v-model="formData.sczl_bh1_name" :clearable="true" placeholder="瞿春生" />
+			       <el-input v-model="formData.sczl_bh1_name" :clearable="true" placeholder="" />
 			     </el-col>
 			     <el-col :span="2">
-			       <el-input v-model="formData.sczl_cl1" :clearable="true" placeholder="11.0" />
+			       <el-input v-model="formData.sczl_cl1" :clearable="true" placeholder="" />
 			     </el-col>
 			     <el-col :span="2">
-			       <el-input v-model="formData.sczl_fp1" :clearable="true" placeholder="打包废纸" />
+			       <el-input v-model="formData.sczl_fp1" :clearable="true" placeholder="" />
 			     </el-col>
 			     <el-col :span="2">			       
 			     </el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_bh7" @keyup.enter.native="getygsubmit($event, '7')" :clearable="true" placeholder="ZI00401" />
+				  <el-input v-model="formData.sczl_bh7" @keyup.enter.native="getygsubmit($event, '7')" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_bh7_name" :clearable="true" placeholder="瞿春生" />
+				  <el-input v-model="formData.sczl_bh7_name" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_cl7" :clearable="true" placeholder="11.0" />
+				  <el-input v-model="formData.sczl_cl7" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_fp7" :clearable="true" placeholder="打包废纸" />
+				  <el-input v-model="formData.sczl_fp7" :clearable="true" placeholder="" />
 				</el-col>
 			   </el-row>	
 						 
@@ -286,30 +286,30 @@
 			  				   <span></span>
 			  				 </el-col>
 			     <el-col :span="2">
-			       <el-input v-model="formData.sczl_bh2" @keyup.enter.native="getygsubmit($event, '2')" :clearable="true" placeholder="ZI00401" />
+			       <el-input v-model="formData.sczl_bh2" @keyup.enter.native="getygsubmit($event, '2')" :clearable="true" placeholder="" />
 			     </el-col>
 			     <el-col :span="2">
-			       <el-input v-model="formData.sczl_bh2_name" :clearable="true" placeholder="瞿春生" />
+			       <el-input v-model="formData.sczl_bh2_name" :clearable="true" placeholder="" />
 			     </el-col>
 			     <el-col :span="2">
-			       <el-input v-model="formData.sczl_cl2" :clearable="true" placeholder="11.0" />
+			       <el-input v-model="formData.sczl_cl2" :clearable="true" placeholder="" />
 			     </el-col>
 			     <el-col :span="2">
-			       <el-input v-model="formData.sczl_fp2" :clearable="true" placeholder="打包废纸" />
+			       <el-input v-model="formData.sczl_fp2" :clearable="true" placeholder="" />
 			     </el-col>
 			     <el-col :span="2">			       
 			     </el-col>
 			  				<el-col :span="2">
-			  				  <el-input v-model="formData.sczl_bh8" @keyup.enter.native="getygsubmit($event, '8')" :clearable="true" placeholder="ZI00401" />
+			  				  <el-input v-model="formData.sczl_bh8" @keyup.enter.native="getygsubmit($event, '8')" :clearable="true" placeholder="" />
 			  				</el-col>
 			  				<el-col :span="2">
-			  				  <el-input v-model="formData.sczl_bh8_name" :clearable="true" placeholder="瞿春生" />
+			  				  <el-input v-model="formData.sczl_bh8_name" :clearable="true" placeholder="" />
 			  				</el-col>
 			  				<el-col :span="2">
-			  				  <el-input v-model="formData.sczl_cl8" :clearable="true" placeholder="11.0" />
+			  				  <el-input v-model="formData.sczl_cl8" :clearable="true" placeholder="" />
 			  				</el-col>
 			  				<el-col :span="2">
-			  				  <el-input v-model="formData.sczl_fp8" :clearable="true" placeholder="打包废纸" />
+			  				  <el-input v-model="formData.sczl_fp8" :clearable="true" placeholder="" />
 			  				</el-col>
 			   </el-row>
 				
@@ -318,30 +318,30 @@
 								   <span></span>
 								 </el-col>
 				   <el-col :span="2">
-				     <el-input v-model="formData.sczl_bh3" @keyup.enter.native="getygsubmit($event, '3')" :clearable="true" placeholder="ZI00401" />
+				     <el-input v-model="formData.sczl_bh3" @keyup.enter.native="getygsubmit($event, '3')" :clearable="true" placeholder="" />
 				   </el-col>
 				   <el-col :span="2">
-				     <el-input v-model="formData.sczl_bh3_name" :clearable="true" placeholder="瞿春生" />
+				     <el-input v-model="formData.sczl_bh3_name" :clearable="true" placeholder="" />
 				   </el-col>
 				   <el-col :span="2">
-				     <el-input v-model="formData.sczl_cl3" :clearable="true" placeholder="11.0" />
+				     <el-input v-model="formData.sczl_cl3" :clearable="true" placeholder="" />
 				   </el-col>
 				   <el-col :span="2">
-				     <el-input v-model="formData.sczl_fp3" :clearable="true" placeholder="打包废纸" />
+				     <el-input v-model="formData.sczl_fp3" :clearable="true" placeholder="" />
 				   </el-col>
 				   <el-col :span="2">			       
 				   </el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh9" @keyup.enter.native="getygsubmit($event, '9')" :clearable="true" placeholder="ZI00401" />
+								  <el-input v-model="formData.sczl_bh9" @keyup.enter.native="getygsubmit($event, '9')" :clearable="true" placeholder="" />
 								</el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh9_name" :clearable="true" placeholder="瞿春生" />
+								  <el-input v-model="formData.sczl_bh9_name" :clearable="true" placeholder="" />
 								</el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.sczl_cl9" :clearable="true" placeholder="11.0" />
+								  <el-input v-model="formData.sczl_cl9" :clearable="true" placeholder="" />
 								</el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.sczl_fp9" :clearable="true" placeholder="打包废纸" />
+								  <el-input v-model="formData.sczl_fp9" :clearable="true" placeholder="" />
 								</el-col>
 				 </el-row>
 				 
@@ -351,30 +351,30 @@
 								   <span></span>
 								 </el-col>
 				   <el-col :span="2">
-				     <el-input v-model="formData.sczl_bh4" @keyup.enter.native="getygsubmit($event, '4')" :clearable="true" placeholder="ZI00401" />
+				     <el-input v-model="formData.sczl_bh4" @keyup.enter.native="getygsubmit($event, '4')" :clearable="true" placeholder="" />
 				   </el-col>
 				   <el-col :span="2">
-				     <el-input v-model="formData.sczl_bh4_name" :clearable="true" placeholder="瞿春生" />
+				     <el-input v-model="formData.sczl_bh4_name" :clearable="true" placeholder="" />
 				   </el-col>
 				   <el-col :span="2">
-				     <el-input v-model="formData.sczl_cl4" :clearable="true" placeholder="11.0" />
+				     <el-input v-model="formData.sczl_cl4" :clearable="true" placeholder="" />
 				   </el-col>
 				   <el-col :span="2">
-				     <el-input v-model="formData.sczl_fp4" :clearable="true" placeholder="打包废纸" />
+				     <el-input v-model="formData.sczl_fp4" :clearable="true" placeholder="" />
 				   </el-col>
 				   <el-col :span="2">			       
 				   </el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh10" @keyup.enter.native="getygsubmit($event, '10')" :clearable="true" placeholder="ZI00401" />
+								  <el-input v-model="formData.sczl_bh10" @keyup.enter.native="getygsubmit($event, '10')" :clearable="true" placeholder="" />
 								</el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh10_name" :clearable="true" placeholder="瞿春生" />
+								  <el-input v-model="formData.sczl_bh10_name" :clearable="true" placeholder="" />
 								</el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.sczl_cl10" :clearable="true" placeholder="11.0" />
+								  <el-input v-model="formData.sczl_cl10" :clearable="true" placeholder="" />
 								</el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.sczl_fp10" :clearable="true" placeholder="打包废纸" />
+								  <el-input v-model="formData.sczl_fp10" :clearable="true" placeholder="" />
 								</el-col>
 				 </el-row>
 				  
@@ -384,30 +384,30 @@
 				  				   <span></span>
 				  				 </el-col>
 				     <el-col :span="2">
-				       <el-input v-model="formData.sczl_bh5" @keyup.enter.native="getygsubmit($event, '5')" :clearable="true" placeholder="ZI00401" />
+				       <el-input v-model="formData.sczl_bh5" @keyup.enter.native="getygsubmit($event, '5')" :clearable="true" placeholder="" />
 				     </el-col>
 				     <el-col :span="2">
-				       <el-input v-model="formData.sczl_bh5_name" :clearable="true" placeholder="瞿春生" />
+				       <el-input v-model="formData.sczl_bh5_name" :clearable="true" placeholder="" />
 				     </el-col>
 				     <el-col :span="2">
-				       <el-input v-model="formData.sczl_cl5" :clearable="true" placeholder="11.0" />
+				       <el-input v-model="formData.sczl_cl5" :clearable="true" placeholder="" />
 				     </el-col>
 				     <el-col :span="2">
-				       <el-input v-model="formData.sczl_fp5" :clearable="true" placeholder="打包废纸" />
+				       <el-input v-model="formData.sczl_fp5" :clearable="true" placeholder="" />
 				     </el-col>
 				     <el-col :span="2">			       
 				     </el-col>
 				  				<el-col :span="2">
-				  				  <el-input v-model="formData.sczl_bh11" @keyup.enter.native="getygsubmit($event, '11')" :clearable="true" placeholder="ZI00401" />
+				  				  <el-input v-model="formData.sczl_bh11" @keyup.enter.native="getygsubmit($event, '11')" :clearable="true" placeholder="" />
 				  				</el-col>
 				  				<el-col :span="2">
-				  				  <el-input v-model="formData.sczl_bh11_name" :clearable="true" placeholder="瞿春生" />
+				  				  <el-input v-model="formData.sczl_bh11_name" :clearable="true" placeholder="" />
 				  				</el-col>
 				  				<el-col :span="2">
-				  				  <el-input v-model="formData.sczl_cl11" :clearable="true" placeholder="11.0" />
+				  				  <el-input v-model="formData.sczl_cl11" :clearable="true" placeholder="" />
 				  				</el-col>
 				  				<el-col :span="2">
-				  				  <el-input v-model="formData.sczl_fp11" :clearable="true" placeholder="打包废纸" />
+				  				  <el-input v-model="formData.sczl_fp11" :clearable="true" placeholder="" />
 				  				</el-col>
 				   </el-row>
 				   
@@ -417,30 +417,30 @@
 				   				   <span></span>
 				   				 </el-col>
 				      <el-col :span="2">
-				        <el-input v-model="formData.sczl_bh6" @keyup.enter.native="getygsubmit($event, '6')" :clearable="true" placeholder="ZI00401" />
+				        <el-input v-model="formData.sczl_bh6" @keyup.enter.native="getygsubmit($event, '6')" :clearable="true" placeholder="" />
 				      </el-col>
 				      <el-col :span="2">
-				        <el-input v-model="formData.sczl_bh6_name" :clearable="true" placeholder="瞿春生" />
+				        <el-input v-model="formData.sczl_bh6_name" :clearable="true" placeholder="" />
 				      </el-col>
 				      <el-col :span="2">
-				        <el-input v-model="formData.sczl_cl6" :clearable="true" placeholder="11.0" />
+				        <el-input v-model="formData.sczl_cl6" :clearable="true" placeholder="" />
 				      </el-col>
 				      <el-col :span="2">
-				        <el-input v-model="formData.sczl_fp6" :clearable="true" placeholder="打包废纸" />
+				        <el-input v-model="formData.sczl_fp6" :clearable="true" placeholder="" />
 				      </el-col>
 				      <el-col :span="2">			       
 				      </el-col>
 				   				<el-col :span="2">
-				   				  <el-input v-model="formData.sczl_bh12" @keyup.enter.native="getygsubmit($event, '12')" :clearable="true" placeholder="ZI00401" />
+				   				  <el-input v-model="formData.sczl_bh12" @keyup.enter.native="getygsubmit($event, '12')" :clearable="true" placeholder="" />
 				   				</el-col>
 				   				<el-col :span="2">
-				   				  <el-input v-model="formData.sczl_bh12_name" :clearable="true" placeholder="瞿春生" />
+				   				  <el-input v-model="formData.sczl_bh12_name" :clearable="true" placeholder="" />
 				   				</el-col>
 				   				<el-col :span="2">
-				   				  <el-input v-model="formData.sczl_cl12" :clearable="true" placeholder="11.0" />
+				   				  <el-input v-model="formData.sczl_cl12" :clearable="true" placeholder="" />
 				   				</el-col>
 				   				<el-col :span="2">
-				   				  <el-input v-model="formData.sczl_fp12" :clearable="true" placeholder="打包废纸" />
+				   				  <el-input v-model="formData.sczl_fp12" :clearable="true" placeholder="" />
 				   				</el-col>
 				    </el-row>
 					
@@ -449,7 +449,7 @@
 					<el-row :gutter="20">
 					   <el-col :span="20">
 						 <el-form-item label="其他备注" prop="id">
-						   <el-input v-model="formData.sczl_desc" :clearable="true" placeholder="2023.12.14" />
+						   <el-input v-model="formData.sczl_desc" :clearable="true" placeholder="" />
 						 </el-form-item>
 					   </el-col>			  				
 					 </el-row>
@@ -530,7 +530,8 @@ import {
   shougongedit,
   shougongdel,
   getYg,
-  getInspectCountByGdbh
+  getInspectCountByGdbh,
+  inspectadd
 } from '@/api/jixiaoguanli/jitairibaobiao'
 
 // 全量引入格式化工具 请按需保留
@@ -918,6 +919,14 @@ const GetScrapFactor = async (value) => {
   // console.log(response)
   // const rowIndex = tableData.findIndex(row => row.UniqId === 123);
 }
+const ADD=ref('0')
+//新增
+function onAdd() {
+	ADD.value='新增'
+	console.log(ADD.value)
+	dialogFormVisible.value = true
+	// Productionadd()
+}
 const ScrapFactor={
 	gdbh:'',
 	yjno:'',
@@ -993,6 +1002,7 @@ const updateDetailData = async() => {
    sczl_fp10: formData.value.sczl_fp10,
    sczl_fp11: formData.value.sczl_fp11,
    sczl_fp12: formData.value.sczl_fp12,
+   sys_id:'[1013/洪丽]',
   }
   // detailData.table.forEach((item, index, array) => {
   //   const num = index + 1
@@ -1004,14 +1014,33 @@ const updateDetailData = async() => {
   //   restoredData[`sczl_PgCl${num}`] = item.sczl_PgCl
   //   restoredData[`sczl_clAdd${num}`] = item.sczl_clAdd
   // })
-  console.log(restoredData)
-    console.log(lastCellValue)
-    formData.value.UniqId=lastCellValue
-    console.log(formData)
-	restoredData.UniqId='5'
-   const response = await shougongedit(restoredData);
+  if(ADD.value=='新增'){
+  	 // console.log('新增')
+  	 console.log('新增')
+  	 console.log(ADD.value)
+  	 console.log(restoredData)
+  	 const response = await inspectadd(restoredData);
+  	 // ADD.value='1'
+  	 // console.log(ADD.value)
+  	 ADD.value='0'
+  	 console.log(response)
+  	 
+  }else{
+  	const response = await shougongedit(restoredData);
+  	 console.log('修改')
+  	  console.log(ADD.value)
+  	  console.log(response)
+  	 // ADD.value='0'
+  	 // console.log(ADD.value)
+  }
+ //  console.log(restoredData)
+ //    console.log(lastCellValue)
+ //    formData.value.UniqId=lastCellValue
+ //    console.log(formData)
+	// restoredData.UniqId='5'
+   
   // console.log(FormData)
-  console.log(response)
+  // console.log(response)
 }
 // 删除
 function onDel() {

src/view/performance/Packagingoutput.vue

@@ -21,7 +21,7 @@
               <el-button type="primary" :icon="Search" @click="onSearch">搜索</el-button>
               <el-button type="primary" :icon="Refresh">重置</el-button>
 			  <el-button type="primary" :icon="Search" @click="positioningVisible">定位</el-button>
-			  <el-button type="primary" :icon="Search">查改</el-button>
+			  <el-button type="primary" :icon="Search" @click="onAdd">新增</el-button>
 			  <el-button type="primary" :icon="Delete" @click="Del">删除</el-button>
               <div style="margin-left: auto;">
                 <el-button type="primary" :icon="Download" @click="exportExcel">导出到Excel</el-button>
@@ -69,7 +69,7 @@
                   <el-form-item label="日期" prop="name">
                     <el-row :gutter="20">
                       <el-col :span="12">
-                        <el-input v-model="sczl_rqValue" :clearable="true" placeholder="ZT01733" />
+                        <el-input v-model="sczl_rqValue" :clearable="true" placeholder="" />
                       </el-col>
                     </el-row>
                   </el-form-item>
@@ -394,7 +394,8 @@ import {
   getInfo,
   getGxMc,
   edit,
-  del
+  del,
+  packagingAdd
 } from '@/api/jixiaoguanli/jitairibaobiao'
 
 // 全量引入格式化工具 请按需保留
@@ -682,6 +683,7 @@ const updateDetailData = async() => {
     sczl_cl: detailData.sczl_cl,
     sczl_PgCl: detailData.sczl_PgCl,
     sczl_clAdd: detailData.sczl_clAdd,
+	sys_id:'[1084/胡庆司]',
   }
   detailData.table.forEach((item, index, array) => {
     const num = index + 1
@@ -693,10 +695,29 @@ const updateDetailData = async() => {
     restoredData[`sczl_PgCl${num}`] = item.sczl_PgCl
     restoredData[`sczl_clAdd${num}`] = item.sczl_clAdd
   })
-   // restoredData.UniqId = 1
-   // const res = await edit(restoredData)
-  console.log(restoredData)
-  console.log(res)
+  
+  if(ADD.value=='新增'){
+  	 // console.log('新增')
+	 // 生成表格数据
+  	 console.log('新增')
+  	 console.log(ADD.value)
+  	 console.log(restoredData)
+  	 const response = await packagingAdd(restoredData);
+  	 // ADD.value='1'
+  	 // console.log(ADD.value)
+  	 ADD.value='0'
+  	 console.log(response)
+  	 
+  }else{
+  	 // restoredData.UniqId = 1
+  	  const res = await edit(restoredData)
+  	 console.log(restoredData)
+  	 console.log(res)
+  	 // ADD.value='0'
+  	 // console.log(ADD.value)
+  }
+  
+  
 }
 
 
@@ -884,6 +905,17 @@ const positioningVisible = () => {
     positioningVisibleshow.value = true
 }
 
+const ADD=ref('0')
+//新增
+function onAdd() {
+	ADD.value='新增'
+	console.log(ADD.value)
+	getpickInfo(lastCellValue)
+	dialogFormVisible.value = true
+	
+	// Productionadd()
+}
+
 const Del = () => {
    GxMcdel()
 }

src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -24,43 +24,36 @@
           <!--按钮弹窗部分-->
 
           <!--状态设置-->
-          <el-dialog v-model="onstatuslist" title="状态设置" width="20%" style="height: 25%;" align-center>
-            <div style="display: flex; flex-direction: column; align-items: center; height: 100%;">
-              <div style="width: 100%; height: 230px; margin: 0 auto; padding: 0px">
-                <div style="width: 100%; height: 50px;margin-left: 50px">
-                  <el-radio-group v-model="status">
-                    <el-radio label="在产">在产</el-radio>
-                    <el-radio label="停产">停产</el-radio>
-                  </el-radio-group>
-                </div>
-                <div style="width: 100%; display: flex; justify-content: flex-end; align-items: flex-end; height: 35%;">
-                  <div slot="footer" class="dialog-footer" style="text-align: right; margin-right: 15px;">
-                    <el-button @click="handleCancel">取消</el-button>
-                    <el-button type="primary" @click="handleConfirm">确定</el-button>
-                  </div>
-                </div>
-              </div>
+          <el-dialog v-model="onstatuslist" title="状态设置" style="width: 300px; top: 20%">
+            <div>
+              <el-radio-group v-model="status">
+                <el-radio label="在产">在产</el-radio>
+                <el-radio label="停产">停产</el-radio>
+              </el-radio-group>
+            </div>
+            <div slot="footer" class="dialog-footer" style="text-align: right;">
+              <el-button @click="handleCancel">取消</el-button>
+              <el-button type="primary" @click="handleConfirm">确定</el-button>
             </div>
           </el-dialog>
 
           <!--工艺方案更名-->
-          <el-dialog v-model="gygmlist" title="工艺方案更名" width="35%" style="height: 40%; " align-center>
-            <div style="display: flex; flex-direction: column;  height: 100%;">
-              <el-form-item label="产品代号:" prop="process">
+          <el-dialog v-model="gygmlist" title="工艺方案更名"  style="width: 35%;top: 15%;">
+              <el-form-item label="产品代号:" prop="process" class="mab">
                 <el-input v-model="gyformData['process']" disabled :clearable="true" placeholder="" style="width: 160px;"/>
               </el-form-item>
               <br>
-              <el-form-item label="产品名称" prop="processName">
+              <el-form-item label="产品名称" prop="processName" class="mab">
                 <el-input v-model="gyformData['processName']" disabled :clearable="true" placeholder="" style="width: 90%;" />
               </el-form-item>
               <br>
-              <el-form-item label="工艺方案原名:" prop="originalName">
+              <el-form-item label="工艺方案原名:" prop="originalName" class="mab">
                 <el-select v-model="gyformData.originalName" placeholder="请选择" style="width: 160px;">
                   <el-option v-for="option in gyformData.originalNameOptions" :key="option" :label="option" :value="option" />
                 </el-select>
               </el-form-item>
               <br>
-              <el-form-item label="工艺方案新名:" prop="newName" >
+              <el-form-item label="工艺方案新名:" prop="newName"  class="mab">
                 <el-input v-model="gyformData['newName']" :clearable="true" placeholder="" style="width: 160px;"/>
               </el-form-item>
 
@@ -68,7 +61,6 @@
                 <el-button @click="gygmhandleCancel">取消</el-button>
                 <el-button type="primary" @click="gygmhandleConfirm">确定</el-button>
               </div>
-            </div>
           </el-dialog>
 
           <!--工艺方案附加 -->
@@ -561,6 +553,7 @@
                       border tooltip-effect="dark" :data="tableData" row-key="ID"
                       :row-class-name="tableRowClass" highlight-current-row="true"
                       size="small"
+                      :cell-class-name="tableDataCellClass"
                       @selection-change="handleSelectionChange"
                       @row-dblclick="updateCompanyFunc"
                       @row-click="tableRowClick"
@@ -580,11 +573,16 @@
               <el-table-column align="left" label="建档日期" prop="Sys_rq" width="160" />
               <el-table-column sortable align="left" label="更新日期" prop="Mod_rq" width="160" />
             </el-table>
-            <!--            <div class="gva-pagination">-->
-            <!--              <el-pagination layout="total, sizes, prev, pager, next, jumper" :current-page="page"-->
-            <!--                             :page-size="pageSize" :page-sizes="[10, 30, 50, 100]" :total="total"-->
-            <!--                             @current-change="handleCurrentChange" @size-change="handleSizeChange" />-->
-            <!--            </div>-->
+            <div class="gva-pagination">
+              <el-pagination
+                  @size-change="handleSizeChange"
+                  @current-change="handleCurrentChange"
+                  :current-page="page"
+                  :page-sizes="[10, 30, 50, 100]"
+                  layout="total, sizes, prev, pager, next, jumper"
+                  :total="total">
+              </el-pagination>
+            </div>
           </div>
 
           <!--   印件资料、工艺资料、印版资料、技术资料附件表格 -->
@@ -1774,14 +1772,14 @@ const _getProduct = async ()=>{
 // ========分页==============
 const page = ref(1)
 const total = ref(0)
-const pageSize = ref(10)
+const pageSize = ref(50)
 const handleCurrentChange = (val) => {
   page.value = val;
   _getProduct();
 };
 // 修改页面容量 点击多少条/页
 const handleSizeChange = (val) => {
-  page.value = 2;//默认显示十条
+  page.value = 1;
   pageSize.value = val;
   _getProduct();
 };
@@ -1981,8 +1979,19 @@ const ent = (event,id1,id2,id3) => {
   }
 }
 
+
+//表格文字变色
+const tableDataCellClass = ({row, column, rowIndex, columnIndex}) =>{
+  console.log(column)
+  if (column.property === 'gyData' || column.property === 'yjData') {
+    return 'plan-usage-low';
+  }
+}
 </script>
 <style scoped>
+:deep(.plan-usage-low div) {
+  color: red !important;
+}
 .JKWTree-container {
   display: flex;
 }
@@ -2010,7 +2019,6 @@ const ent = (event,id1,id2,id3) => {
 }
 
 
-
 </style>
 <style scoped>
 :deep(.el-table td .cell) {

src/view/yunyin/renliziyuan/renyuanjibenziliao.vue

@@ -82,31 +82,37 @@
           <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" width="900px" style="height: 52%;" :title="'修改员工基本资料'" destroy-on-close>
             <el-form :model="formDataTest" label-position="right" ref="elFormRef" :rules="rule" label-width="90px">
               <div>
-                <div style="float: left; width: 34%;">
+                <div style="float: left; width: 35%;">
                   <!-- 左侧部分 -->
-                  <el-form-item label="员工编号：" prop="employeeId" class="mab">
-                    <el-input v-model="formDataTest['员工编号']"  placeholder="" style="width: 190px;" />
+                  <el-form-item label="员工编号：" prop="employeeId" class="mab" >
+                    <el-input v-model="formDataTest['员工编号']"  placeholder="" style="width: 190px;"
+                              id="员工编号" @keydown="handleKeyDown($event, '员工编号', '在职状态', '性别')" />
                   </el-form-item>
                   <el-form-item label="性别：" prop="gender" class="mab">
-                    <el-input v-model="formDataTest['性别']"  placeholder="" style="width: 190px;" />
+                    <el-input v-model="formDataTest['性别']"  placeholder="" style="width: 190px;"
+                              id="性别" @keydown="handleKeyDown($event, '性别', '员工编号', '身份证号')" />
                   </el-form-item>
                   <el-form-item label="身份证号：" prop="gender" class="mab">
-                    <el-input v-model="formDataTest['身份证号']"  placeholder="" style="width: 200px;" />
+                    <el-input v-model="formDataTest['身份证号']"  placeholder="" style="width: 190px;"
+                              id="身份证号"  @keydown="handleKeyDown($event, '身份证号', '性别', '所在部门')" />
                   </el-form-item>
                   <el-form-item label="部门名称：" prop="gender"  class="mab">
-                    <el-input v-model="formDataTest['所在部门']"  placeholder="" style="width: 190px;" />
+                    <el-input v-model="formDataTest['所在部门']"  placeholder="" style="width: 190px;"
+                              id="所在部门" @keydown="handleKeyDown($event, '所在部门', 'input3', '聘用日期')" />
                   </el-form-item>
                   <el-form-item label="入职日期:" prop="joinDate" class="mab">
-                    <el-input v-model="formDataTest['聘用日期']"  placeholder="" style="width: 190px;" />
+                    <el-input v-model="formDataTest['聘用日期']"  placeholder="" style="width: 190px;"
+                              id="聘用日期" @keydown="handleKeyDown($event, '聘用日期', 'input4', '班次类型')" />
                   </el-form-item>
-                  <el-form-item label="人员类别:" prop="joinDate"  v>
+                  <el-form-item label="人员类别:" prop="joinDate" >
                     <el-select v-model="formDataTest['人员类别']" placeholder="" style="width: 190px;">
                       <el-option label="生产" value="生产"></el-option>
                       <el-option label="行政" value="行政"></el-option>
                     </el-select>
                   </el-form-item>
                   <el-form-item label="班次类型:" prop="joinDate" class="mab">
-                    <el-input v-model="formDataTest['班次类型']"  placeholder="" style="width: 190px;" />
+                    <el-input v-model="formDataTest['班次类型']"  placeholder="" style="width: 190px;"
+                              id="班次类型" @keydown="handleKeyDown($event, '班次类型', '聘用日期', 'U8在职')" />
                   </el-form-item>
                   <el-form-item label="工资表类别:" prop="joinDate" class="mab">
                     <el-select v-model="formDataTest['工资表类别']" placeholder="" style="width: 190px;">
@@ -117,30 +123,37 @@
                     </el-select>
                   </el-form-item>
                   <el-form-item label="U8在职:" prop="joinDate" class="mab">
-                    <el-input v-model="formDataTest['U8在职']"   placeholder="" style="width: 190px;" />
+                    <el-input v-model="formDataTest['U8在职']"   placeholder="" style="width: 190px;"
+                              id="U8在职" @keydown="handleKeyDown($event, 'U8在职', '班次类型', '员工姓名')" />
                   </el-form-item>
                 </div>
                 <div style="float: left; width: 33%;margin-left: 50px">
                   <!-- 中间部分 -->
-                  <el-form-item label="员工姓名:" prop="name" class="mab">
-                    <el-input v-model="formDataTest['员工姓名']"  placeholder="" style="width: 190px;" />
+                  <el-form-item label="员工姓名:" prop="name" class="mab" label-width="100">
+                    <el-input v-model="formDataTest['员工姓名']"  placeholder="" style="width: 190px;"
+                              id="员工姓名" @keydown="handleKeyDown($event, '员工姓名', 'U8在职', '出生日期')" />
                   </el-form-item>
-                  <el-form-item label="出生日期:" prop="birthDate" class="mab">
-                    <el-input v-model="formDataTest['出生日期']"  placeholder="" style="width: 190px;" />
+                  <el-form-item label="出生日期:" prop="birthDate" class="mab" label-width="100">
+                    <el-input v-model="formDataTest['出生日期']"  placeholder="" style="width: 190px;"
+                              id="出生日期" @keydown="handleKeyDown($event, '出生日期', '员工姓名', '职称职务')" />
                   </el-form-item>
-                  <el-form-item label="职务:" prop="position" class="mab">
-                    <el-input v-model="formDataTest['职称职务']" placeholder="" style="width: 190px;" />
+                  <el-form-item label="职务:" prop="position" class="mab" label-width="100">
+                    <el-input v-model="formDataTest['职称职务']" placeholder="" style="width: 190px;"
+                              id="职称职务" @keydown="handleKeyDown($event, '职称职务', '出生日期', '部门编码')" />
                   </el-form-item>
-                  <el-form-item label="部门编号:" prop="position" class="mab">
-                    <el-input v-model="formDataTest['部门编码']" placeholder="" style="width: 190px;" />
+                  <el-form-item label="部门编号:" prop="position" class="mab" label-width="100">
+                    <el-input v-model="formDataTest['部门编码']" placeholder="" style="width: 190px;"
+                              id="部门编码" @keydown="handleKeyDown($event, '部门编码', '职称职务', '转正日期')" />
                   </el-form-item>
-                  <el-form-item label="转正日期:" prop="departmentId" class="mab">
-                    <el-input v-model="formDataTest['转正日期']" placeholder="" style="width: 190px;" />
+                  <el-form-item label="转正日期:" prop="departmentId" class="mab" label-width="100">
+                    <el-input v-model="formDataTest['转正日期']" placeholder="" style="width: 190px;"
+                              id="转正日期" @keydown="handleKeyDown($event, '转正日期', '部门编码', '扣减司龄')" />
                   </el-form-item>
-                  <el-form-item label="扣减司龄:" prop="departmentId" class="mab">
-                    <el-input v-model="formDataTest['扣减司龄']" placeholder="" style="width: 190px;" />
+                  <el-form-item label="扣减司龄:" prop="departmentId" class="mab" label-width="100">
+                    <el-input v-model="formDataTest['扣减司龄']" placeholder="" style="width: 190px;"
+                              id="扣减司龄" @keydown="handleKeyDown($event, '扣减司龄', '转正日期', '薪酬核算分组')" />
                   </el-form-item>
-                  <el-form-item label="人员性质:" prop="departmentId" class="mab">
+                  <el-form-item label="人员性质:" prop="departmentId" class="mab" label-width="100">
                     <el-select v-model="formDataTest['人员性质']" placeholder="" style="width: 190px;">
                       <el-option label="退休返聘" value="退休返聘"></el-option>
                       <el-option label="劳动合同工" value="劳动合同工"></el-option>
@@ -149,14 +162,16 @@
                       <el-option label="实习生" value="实习生"></el-option>
                     </el-select>
                   </el-form-item>
-                  <el-form-item label="工资核算分组:" prop="joinDate" class="mab">
-                    <el-input v-model="formDataTest['薪酬核算分组']"  placeholder="" style="width: 190px;" />
+                  <el-form-item label="工资核算分组:" prop="joinDate" class="mab" label-width="100" >
+                    <el-input v-model="formDataTest['薪酬核算分组']"  placeholder="" style="width: 190px;"
+                              id="薪酬核算分组" @keydown="handleKeyDown($event, '薪酬核算分组', '扣减司龄', '在职状态')" />
                   </el-form-item>
-                  <el-form-item label="在职状态:" prop="joinDate" class="mab">
-                    <el-input v-model="formDataTest['在职状态']" placeholder="" style="width: 190px;" />
+                  <el-form-item label="在职状态:" prop="joinDate" class="mab" label-width="100"  >
+                    <el-input v-model="formDataTest['在职状态']" placeholder="" style="width: 190px;"
+                              id="在职状态" @keydown="handleKeyDown($event, '在职状态', '薪酬核算分组', '员工编号')" />
                   </el-form-item>
                 </div>
-
+              </div>
 <!--                <div style="float: left; text-align: center; margin-left: 50px;">-->
 <!--                  &lt;!&ndash; 右侧图片 &ndash;&gt;-->
 <!--                  <div style="height: 200px; width: 160px; background-color: #eee; position: relative;">-->
@@ -168,7 +183,7 @@
 <!--                  </div>-->
 <!--                </div>-->
 
-              </div>
+<!--              </div>-->
             </el-form>
             <!-- 添加编辑页面取消确定按钮 -->
 <!--            <template #footer>-->
@@ -179,12 +194,8 @@
 <!--            </template>-->
           </el-dialog>
         </el-main>
-
       </layout-content>
-
       </layout>
-
-
     </layout>
   </div>
 </template>
@@ -200,6 +211,42 @@ export default {
     };
   },
   methods: {
+    handleKeyDown(event, currentId, prevId, nextId) {
+      const currentElement = document.getElementById(currentId);
+      const isEmpty = currentElement.value === '';
+      const atStart = currentElement.selectionStart === 0;
+      const atEnd = currentElement.selectionStart === currentElement.value.length;
+      switch (event.keyCode) {
+        case 13: // Enter
+        case 40: // 向下箭头
+          if (nextId) {
+            document.getElementById(nextId).focus();
+          }
+          break;
+        case 38: // 向上箭头
+          if (prevId) {
+            document.getElementById(prevId).focus();
+          }
+          break;
+        case 8: // 删除键
+          if (prevId && (isEmpty || atStart)) {
+            document.getElementById(prevId).focus();
+          }
+          break;
+        case 37: // 向左箭头
+          if (prevId && atStart) {
+            document.getElementById(prevId).focus();
+          }
+          break;
+        case 39: // 向右箭头
+          if (nextId && atEnd) {
+            document.getElementById(nextId).focus();
+          }
+          break;
+        default:
+          break;
+      }
+    },
     closeDialog() {
       // 关闭对话框的逻辑
       this.dialogFormVisible = false;
@@ -237,6 +284,7 @@ const exportToExcel = () => {
 // 导出Excel弹窗
 const dialogexportToExcel = ref(false)
 
+
 // =========== 获取左侧树侧形结构 ===========
 const treeData = ref({})
 const _department_code = ref(null)

src/view/yunyin/shengchanguanli/chengpinrucang.vue

@@ -22,6 +22,7 @@
               <el-button type="primary" @click="onDel">删除</el-button>
 			  <el-button type="primary" @click="onSMB">入仓末板数据统计</el-button>
 			  <el-button type="primary" @click="onDay">各日统计</el-button>
+			  <el-button type="primary" @click="onAdd">新增</el-button>
 			  
               <div style="margin-left: auto;">			
                 <el-button type="primary" :icon="Download" @click="exportExcel">导出到Excel</el-button>
@@ -76,7 +77,7 @@
               <el-row :gutter="20">
 			 <el-col :span="4">
 			   <el-form-item label="入仓类型" prop="id">
-				 <el-input v-model="formData.入仓类型" :clearable="true" placeholder="2023.12.14" />
+				 <el-input v-model="formData.入仓类型" :clearable="true" placeholder="" />
 			   </el-form-item>
 			 </el-col>
 			 <el-col :span="6">
@@ -86,7 +87,7 @@
 					 <el-input v-model="formData.仓库编号" @keyup.enter.native="getCKsubmit" :clearable="true" placeholder="ZT01733" />
 				   </el-col>   
 				   <el-col :span="12">
-					 <el-input v-model="formData.仓库名称" :clearable="true" placeholder="ZT01733" />
+					 <el-input v-model="formData.仓库名称" :clearable="true" placeholder="" />
 				   </el-col>  
 				 </el-row>
 			   </el-form-item>
@@ -97,7 +98,7 @@
 		   <el-row :gutter="20">
 			 <el-col :span="4">
 			   <el-form-item label="单据编号" prop="id">
-				 <el-input v-model="formData.jjcp_num"  :clearable="true" placeholder="2023.12.14" />
+				 <el-input v-model="formData.jjcp_num"  :clearable="true" placeholder="" />
 			   </el-form-item>
 			 </el-col>
 		   </el-row> 
@@ -107,14 +108,14 @@
 		   <el-row :gutter="20">
 			 <el-col :span="4">
 			   <el-form-item label="工单编号" prop="id">
-				 <el-input v-model="formData.jjcp_gdbh" @keyup.enter.native="getGDsubmit" :clearable="true" placeholder="2023.12.14" />
+				 <el-input v-model="formData.jjcp_gdbh" @keyup.enter.native="getGDsubmit" :clearable="true" placeholder="" />
 			   </el-form-item>
 			 </el-col>
 			 <el-col :span="6">
 			   <el-form-item label="印件号" prop="name">
 				 <el-row :gutter="20">
 				   <el-col :span="12">
-					 <el-input v-model="formData.jjcp_yjno" :clearable="true" placeholder="ZT01733" />
+					 <el-input v-model="formData.jjcp_yjno" :clearable="true" placeholder="" />
 				   </el-col>  				
 				 </el-row>
 			   </el-form-item>	   
@@ -123,7 +124,7 @@
 			   <el-form-item label="订单编号" prop="name">
 				 <el-row :gutter="20">
 				   <el-col :span="12">
-					 <el-input v-model="formData.订单编号" :clearable="true" placeholder="ZT01733" />
+					 <el-input v-model="formData.订单编号" :clearable="true" placeholder="" />
 				   </el-col>  				
 				 </el-row>
 			   </el-form-item>
@@ -133,11 +134,11 @@
            <el-row :gutter="20">
 			 <el-col :span="4">
 			   <el-form-item label="印件编号" prop="id">
-				 <el-input v-model="formData.jjcp_cpdh" :clearable="true" placeholder="2023.12.14" />
+				 <el-input v-model="formData.jjcp_cpdh" :clearable="true" placeholder="" />
 			   </el-form-item>
 			 </el-col>
 			 <el-col :span="4">
-			 <el-input v-model="formData.jjcp_cpmc" :clearable="true" placeholder="2023.12.14" />					   
+			 <el-input v-model="formData.jjcp_cpmc" :clearable="true" placeholder="" />					   
 			 </el-col>
            </el-row> 
             
@@ -145,18 +146,18 @@
 			<el-row :gutter="20">
 			 <el-col :span="4">
 			   <el-form-item label="产品编号" prop="id">
-				 <el-input v-model="formData.jjcp_cpdh"@keyup.enter.native="getSLsubmit" :clearable="true" placeholder="2023.12.14" />
+				 <el-input v-model="formData.jjcp_cpdh"@keyup.enter.native="getSLsubmit" :clearable="true" placeholder="" />
 			   </el-form-item>
 			 </el-col>
 			 <el-col :span="4">
-			 <el-input v-model="formData.jjcp_cpmc" :clearable="true" placeholder="2023.12.14" />					   
+			 <el-input v-model="formData.jjcp_cpmc" :clearable="true" placeholder="" />					   
 			 </el-col>
 			</el-row> 
 
             <el-row :gutter="20">
 			 <el-col :span="4">
 			   <el-form-item label="客户料号" prop="id">
-				 <el-input v-model="formData.客户料号" :clearable="true" placeholder="2023.12.14" />
+				 <el-input v-model="formData.客户料号" :clearable="true" placeholder="" />
 			   </el-form-item>
 			 </el-col>
             </el-row> 
@@ -164,12 +165,12 @@
 			  <el-row :gutter="20">
 			   <el-col :span="4">
 			     <el-form-item label="首末版" prop="id">
-			  	 <el-input v-model="formData.jjcp_smb" :clearable="true" placeholder="2023.12.14" />
+			  	 <el-input v-model="formData.jjcp_smb" :clearable="true" placeholder="" />
 			     </el-form-item>
 			   </el-col>
 			   <el-col :span="4">
 				   <el-form-item label="入仓时间" prop="id">
-			   <el-input v-model="formData.jjcp_sj" :clearable="true" placeholder="2023.12.14" />	
+			   <el-input v-model="formData.jjcp_sj" :clearable="true" placeholder="" />	
 					</el-form-item>
 			   </el-col>
 			  </el-row> 
@@ -178,12 +179,12 @@
 			  <el-row :gutter="20">
 			   <el-col :span="4">
 			     <el-form-item label="入仓数量" prop="id">
-			  	 <el-input v-model="formData.jjcp_sl" :clearable="true" placeholder="2023.12.14" />
+			  	 <el-input v-model="formData.jjcp_sl" :clearable="true" placeholder="" />
 			     </el-form-item>
 			   </el-col>
 			   <el-col :span="4">
 			  	<el-form-item label="入仓单位" prop="id">
-			   <el-input v-model="formData.jjcp_dw" :clearable="true" placeholder="2023.12.14" />	
+			   <el-input v-model="formData.jjcp_dw" :clearable="true" placeholder="" />	
 			    </el-form-item>
 			   </el-col>
 			  </el-row> 
@@ -192,17 +193,17 @@
 			  <el-row :gutter="20">
 			   <el-col :span="4">
 			     <el-form-item label="订单数量" prop="id">
-			  	 <el-input v-model="formData.订单数量" :clearable="true" placeholder="2023.12.14" />
+			  	 <el-input v-model="formData.订单数量" :clearable="true" placeholder="" />
 			     </el-form-item>
 			   </el-col>
 			   <el-col :span="4">
 			  	<el-form-item label="已完工" prop="id">
-			   <el-input v-model="formData.jjcp_sls" :clearable="true" placeholder="2023.12.14" />	
+			   <el-input v-model="formData.jjcp_sls" :clearable="true" placeholder="" />	
 			    </el-form-item>
 			   </el-col>
 			   <el-col :span="4">
 			   			  	<el-form-item label="机型备注" prop="id">
-			   <el-input v-model="formData.机型备注" :clearable="true" placeholder="2023.12.14" />	
+			   <el-input v-model="formData.机型备注" :clearable="true" placeholder="" />	
 			    </el-form-item>
 			   </el-col>
 			  </el-row> 
@@ -211,7 +212,7 @@
 			  <el-row :gutter="20">
 				 <el-col :span="4">
 				   <el-form-item label="入仓备注" prop="id">
-					 <el-input v-model="formData.jjcp_desc" :clearable="true" placeholder="2023.12.14" />
+					 <el-input v-model="formData.jjcp_desc" :clearable="true" placeholder="" />
 				   </el-form-item>
 				 </el-col>
 			  </el-row> 
@@ -326,7 +327,9 @@
 		    v-model="TJVisible"
 		    title="各日统计"
 		    destroy-on-close
-		    width="600px"
+		    width="80%px;"
+			style="height: 80%;"
+			
 		  			>
 			<el-row :gutter="20">
 			<el-col :span="41">
@@ -342,35 +345,36 @@
 		      highlight-current-row="true"
 		      border
 		      style="width:100%"
+			  height="300px"
 		      @row-dblclick="TJSelectClick"
 		    >
 		      <el-table-column
-		        prop="编号"
+		        prop="jjcp_sj"
 		        label="完工日期"
 		        width="200"
 		      />
 			  <el-table-column
-				prop="名称"
+				prop="jjcp_gdbh"
 				label="工单编号"
 				width="200"
 			  />
 			  <el-table-column
-			    prop="编号"
+			    prop="jjcp_cpmc"
 			    label="印件(产品名称)"
 			    width="200"
 			  />
 			  <el-table-column
-				prop="名称"
+				prop="实际投料"
 				label="实际投料"
 				width="200"
 			  />
 			  <el-table-column
-			    prop="编号"
+			    prop="入仓数量"
 			    label="入仓数量"
 			    width="200"
 			  />
 			  <el-table-column
-				prop="名称"
+				prop="投入产出率"
 				label="投入产出率"
 				width="200"
 			  />
@@ -464,6 +468,9 @@ import {
   finishedgetGd,
   finishedgetGdsl,
   finisheddel,
+  getDayList,
+  mbList,
+  finishedadd
 } from '@/api/jixiaoguanli/jitairibaobiao'
 
 // 全量引入格式化工具 请按需保留
@@ -589,6 +596,14 @@ function onSearch() {
   page.value = 1
   GetmachineLocate()
 }
+const ADD=ref('0')
+//新增
+function onAdd() {
+	ADD.value='新增'
+	console.log(ADD.value)
+	dialogFormVisible.value = true
+	// Productionadd()
+}
 //删除
 function onDel() {
 	Del()
@@ -602,16 +617,34 @@ const Del = async () => {
   getTableData()
 }
 const TJVisible = ref(false)
-const TJselectData = reactive([])
+const TJselectData = ref([]);
 //每日统计
 function onDay() {
-	TJVisible.value=TRUE
+	GetDayList()
+	TJVisible.value=true
+}
+const GetDayList = async (value) => {
+  const response = await getDayList({key_word:'',page:page.value,limit:limit.value});
+  console.log(response.data) 
+  if (response.code === 0) {
+	 TJselectData.value=response.data.rows
+	 console.log(TJselectData)
+  }
 }
 const SMVisible = ref(false)
-const SMselectData = reactive([])
+const SMselectData = ref([]);
 //首末版统计
 function onSMB() {
-	SMVisible.value=TRUE
+	MbList()
+	SMVisible.value=true
+}
+const MbList = async (value) => {
+  const response = await mbList({page:page.value,limit:limit.value});
+  console.log(response.data) 
+  if (response.code === 0) {
+	 SMselectData.value=response.data.rows
+	 console.log(TJselectData)
+  }
 }
 //定位
 const GetmachineLocate = async () => {
@@ -792,29 +825,83 @@ const closeDialog = () => {
 }
 // 弹窗确定
 const enterDialog = async () => {
-  elFormRef.value?.validate(async (valid) => {
-    if (!valid) return
-    let res
-    switch (type.value) {
-      case 'create':
-        res = await createCompany(formData.value)
-        break
-      case 'update':
-        res = await updateCompany(formData.value)
-        break
-      default:
-        res = await createCompany(formData.value)
-        break
-    }
-    if (res.code === 0) {
-      ElMessage({
-        type: 'success',
-        message: '创建/更改成功'
-      })
-      closeDialog()
-      getTableData()
-    }
-  })
+  // elFormRef.value?.validate(async (valid) => {
+  //   if (!valid) return
+  //   let res
+  //   switch (type.value) {
+  //     case 'create':
+  //       res = await createCompany(formData.value)
+  //       break
+  //     case 'update':
+  //       res = await updateCompany(formData.value)
+  //       break
+  //     default:
+  //       res = await createCompany(formData.value)
+  //       break
+  //   }
+  //   if (res.code === 0) {
+  //     ElMessage({
+  //       type: 'success',
+  //       message: '创建/更改成功'
+  //     })
+  //     closeDialog()
+  //     getTableData()
+  //   }
+  // })
+  // dialogFormVisible.value=false
+  updateDetailData()
+}
+// 更新数据
+const updateDetailData = async() => {
+  const restoredData = {
+   UniqId: lastCellValue, 
+   Sys_id:'[1035/刘晓庆]',
+   入仓类型:formData.value.入仓类型,
+   仓库编号:formData.value.入仓类型,
+   仓库名称:formData.value.仓库名称,
+   jjcp_num:formData.value.jjcp_num,
+   jjcp_gdbh:formData.value.jjcp_gdbh,
+   jjcp_yjno:formData.value.jjcp_yjno,
+   订单编号:formData.value.订单编号,
+   jjcp_cpdh:formData.value.jjcp_cpdh,
+   jjcp_cpmc:formData.value.jjcp_cpmc,
+   成品编码:formData.value.成品编码,
+   成品名称:formData.value.成品名称,
+   客户料号:formData.value.客户料号,
+   jjcp_smb:formData.value.jjcp_smb,
+   jjcp_sj:formData.value.jjcp_sj,
+   jjcp_sl:formData.value.jjcp_sl,
+   jjcp_dw:formData.value.jjcp_dw,
+   机型备注:formData.value.机型备注,
+   jjcp_desc:formData.value.jjcp_desc,
+  }
+  if(ADD.value=='新增'){
+  	 // console.log('新增')
+  	 console.log('新增')
+  	 console.log(ADD.value)
+  	 console.log(restoredData)
+  	 const response = await finishedadd(restoredData);
+  	 // ADD.value='1'
+  	 // console.log(ADD.value)
+  	 // ADD.value='0'
+  	 console.log(response)
+  	 
+  }else{
+  	  // const response = await productionedit(restoredData);
+  	  console.log('修改')
+  	  console.log(ADD.value)
+  	  // console.log(response)
+  	 // ADD.value='0'
+  	 // console.log(ADD.value)
+  }
+ //   console.log(restoredData)
+ //    console.log(lastCellValue)
+ //    formData.value.UniqId=lastCellValue
+ //    console.log(formData)
+	// restoredData.UniqId='5'
+  
+  // console.log(FormData)
+  // console.log(response)
 }
 let table=ref(5);
 let lastCellValue=ref()

src/view/yunyin/shengchanguanli/gongdanshengchan.vue

@@ -652,7 +652,7 @@ const gdtableRowClick = async (row) => {
   }
 };
 
-//点击左侧树形获取表格列表
+//点击左侧树形获取表格列表//机台侧边栏
 const tableData = ref([]);
 const _machine = ref(null);
 const treeType = ref('customTree') // dataTree // 计划中，排产中 ,dataTree 车间
@@ -665,24 +665,21 @@ const handleNodeClick = async (node) => {
     const custom_code = node.label;
     // 使用字符串分割获取#前面的数据
     const dataBeforeHash = custom_code.split('#')[0].trim();
-    const machine = dataBeforeHash + '#';
-    console.log(machine)
-    _machine.value = machine;
-
-    const zhubiao = await MachineWorkOrderList({ machine, status: '排程' })
-    const  fubiao = await MachineWorkOrderList({ machine, status: '制程' })
-    // console.log(zhubiao, fubiao)
-
-    chejianData.value = zhubiao.data;
-    chejianfuData.value = fubiao.data;
+    _machine.value = dataBeforeHash + '#';
+    console.log(_machine.value)
+    const zhubiao = await MachineWorkOrderList({ machine:_machine.value})
+    chejianData.value = zhubiao.data['排程'];
+    chejianfuData.value = zhubiao.data['制程'];
   }
 };
 //计划中已完工搜索
 const searchInfo = ref('');
 // 提交搜索
 const onSubmit = () => {
+  console.log(searchInfo.value)
+  console.log(currentNode.value)
+  console.log(_machine.value)
   if(searchInfo.value === '' || searchInfo.value === null ){
-    tableData.value = [];
     ElMessage({type: 'warning',message: '请选择具体的工单后，再操作此功能'})
     return false;
   }
@@ -694,39 +691,20 @@ const onSubmit = () => {
     _Schedule();
     return false;
   }
-  console.log(searchInfo.value)
-  console.log(currentNode.value)
-  console.log(_machine.value)
-
-return false;
-  if(searchInfo.value === '' || searchInfo.value === null || searchInfo.value.length < 6 ){
-    tableData.value = [];
-    ElMessage({type: 'warning',message: '请选择具体的工单后，再操作此功能'})
-    return  false;
-  }else{
-    if(currentNode.value === '计划中' || currentNode.value === '已完工'){
-      _Project();
-    }else if(currentNode.value === '排程中' || currentNode.value === '制程中'){
-      _Schedule();
-    }else{
-      ElMessage({type: 'warning',message: '请选择具体的工单后，再操作此功能'})
-      return false;
-    }
+  if(_machine.value){
+    console.log(2131211111111111111111111111111)
+    _MachineWorkOrderList();
   }
 };
-const errorMessage = ref('');
 // 搜索计划中、已完工一条工单
 const _Project = async () => {
   const status = currentNode.value;
   const search = searchInfo.value;
   const Project_search = await Project({status:status,search:search});
   console.log(Project_search);
-  if(Project_search.code === 0){
+  if(Project_search.msg === '成功'){
     tableData.value = Project_search.data;
   }else{
-    tableData.value = [];
-    yjtableData.value = [];
-    gytableData.value = [];
     ElMessage({type: 'warning',message: '查不到具体条件的工单'})
     return false;
   }
@@ -739,10 +717,24 @@ const _Schedule = async () => {
   console.log(search)
   const Schedule_search = await Schedule({status:status,search:search});
   console.log(Schedule_search);
-  if(Schedule_search.code === 0){
-    tableData.value = Schedule_search.data;
+  if(Schedule_search.msg === '成功'){
+    chejianData.value = Schedule_search.data;
+  }else{
+    ElMessage({type: 'warning',message: '查不到具体条件的工单'})
+    return false;
+  }
+};
+//机台搜索一条工单
+const _MachineWorkOrderList = async () => {
+  console.log(123)
+  const status = searchInfo.value;
+  const search = _machine.value;
+
+  const MachineWorkOrderList_search = await MachineWorkOrderList({status:status,search:search});
+  console.log(MachineWorkOrderList_search);
+  if(MachineWorkOrderList_search.code === 0){
+    tableData.value = MachineWorkOrderList_search.data;
   }else{
-    tableData.value = [];
     ElMessage({type: 'warning',message: '查不到具体条件的工单'})
     return false;
   }
@@ -791,30 +783,21 @@ const gxztgzzCancel = () => {
   gxztgzzlist.value = false;
 };
 
-//点击车间表格【获取车间工单编号】
-// const _PC_gdbh = ref(null)
-// const chejianRowClick = (row) => {
-//   // console.log(row['工单编号'])
-//   _PC_gdbh.value = row['工单编号'];
-// };
 //加入排产【按钮】
 const onjrpcClick = async () => {
   if(_PC_gdbh.value == null || _PC_gdbh.value == ''){
     ElMessage({type: 'warning',message: '请选择排程中工单'})
   }else{
     let params = {}
-    // params.workOrder = '2311116';
-    // params.machine = 'JY01#';
     params.workOrder = _PC_gdbh.value;
     params.machine = _machine.value;
     params.printCode = 1;
     params.processCode = 1;
-    console.log(params)
     const ProductionSchedulingAdd_add = await ProductionSchedulingAdd(params);
-    console.log(ProductionSchedulingAdd_add)
     if (ProductionSchedulingAdd_add .code === 0) {
-      const  fubiao = await MachineWorkOrderList({ machine:_machine.value, status: '制程' });
-      chejianfuData.value = fubiao.data;
+      const  pc_zc_table = await MachineWorkOrderList({ machine:_machine.value});
+      chejianfuData.value = pc_zc_table.data['制程'];
+      chejianData.value = pc_zc_table.data['"排程"'];
       ElMessage({type: 'success',message: '加入排产 更新成功'});
     } else {
       ElMessage({ type: 'error',message: '更新失败'})
@@ -822,35 +805,24 @@ const onjrpcClick = async () => {
   }
 };
 
-// const _ZC_gdbh = ref(null)
-// const chejianfuRowClick = (row) => {
-//   // console.log(row['工单编号'])
-//   _ZC_gdbh.value = row['工单编号'];
-// };
-
 //暂停排产【按钮】
 const onztwgClick = async () => {
   if(_ZC_gdbh.value == null || _ZC_gdbh.value == ''){
     ElMessage({type: 'warning', message: '请选择制程中工单'})
   }else{
     let params = {}
-    // params.workOrder = '2311116';
-    // params.machine = 'JY01#';
     params.workOrder = _ZC_gdbh.value;
     params.machine = _machine.value;
     params.printCode = 1;
     params.processCode = 1;
-    console.log(params)
-
     const ProductionSchedulingAdd_stop = await ProductionSchedulingPause(params);
     console.log(ProductionSchedulingAdd_stop)
     if (ProductionSchedulingAdd_stop .code === 0) {
-
-      const zhubiao = await MachineWorkOrderList({ machine:_machine.value, status: '排程' });
-      chejianData.value = zhubiao.data;
+      const pc_zc_table = await MachineWorkOrderList({ machine:_machine.value});
+      chejianData.value = pc_zc_table.data['"排程"'];
+      chejianfuData.value = pc_zc_table.data['制程'];
       ElMessage({type: 'success',message: '暂停排产 更新成功'});
     } else {
-      console.log(ygjbzledit_eddt);
       ElMessage({ type: 'error',message: '更新失败'})
     }
   }
@@ -865,17 +837,14 @@ const ongxwgClick = async () => {
       message: '请选择制程中工单'
     })
   }else{
-    // let combinedValue = `${_ZC_gdbh.value},${_PC_gdbh.value}`;
-    // console.log(combinedValue);
     let params = {}
     params.workOrder = _ZC_gdbh.value;
     params.processCode = _gxh.value;
-    console.log(params)
     const complete_get = await complete(params);
-    console.log(complete_get)
     if (complete_get .code === 0) {
-      const  fubiao = await MachineWorkOrderList({ machine:_machine.value, status: '制程' });
-      chejianfuData.value = fubiao.data;
+      const  pc_zc_table = await MachineWorkOrderList({ machine:_machine.value});
+      chejianData.value = pc_zc_table.data['"排程"'];
+      chejianfuData.value = pc_zc_table.data['制程'];
       ElMessage({type: 'success',message: '工序完工 更新成功'})
     } else {
       ElMessage({ type: 'error',message: '更新失败'})
@@ -886,7 +855,6 @@ const ongxwgClick = async () => {
 const _PC_gdbh = ref(null)
 const PC_handleChange = (arr) => {
   let str = arr.map((val) => val['工单编号']).join(",");
-  console.log(str);
   _PC_gdbh.value = str;
 }
 //加入制程【下面到上面】
@@ -896,8 +864,6 @@ const ZP_handleChange = (arr) => {
   console.log(arr)
   let str = arr.map((val) => val['工单编号']).join(",");
   let gxh = arr.map((val) => val['gxh']).join(",");
-  console.log(str);
-  console.log(gxh);
   _ZC_gdbh.value = str;
   _gxh.value = gxh;
 }
@@ -1118,9 +1084,6 @@ const cjsbpcCancel = () => {
 
 
 
-
-
-
 </script>
 <style scoped>
 :deep(.el-tabs__header){