修改新增

src/api/jixiaoguanli/jitairibaobiao.js

@@ -726,6 +726,13 @@ export const chanliangEdit = (data) => {
     data
   })
 }
+export const MachineChanliangDetailEdit = (data) => {
+  return service({
+    url:'/mes_server/facility/MachineChanliangDetailEdit',
+    method: 'post',
+    data
+  })
+}
 //关联工资核算
 //设备点检->左侧菜单栏
 export const  relatedTab= (params) => {

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -4,13 +4,13 @@
 	    <header>
 			<el-button type="primary" @click="onBZ">班组维护</el-button>
 			<el-button type="primary" @click="onzhicheng"  >制程检验</el-button>
-			<el-button type="primary" @click="onDel">删除</el-button>
 			<el-button type="primary" @click="onxuncha">管理巡查</el-button>
 			<el-button type="primary" @click="ondianjian">设备点检</el-button>
 			<el-button type="primary" @click="onyinban">印版领退</el-button>
 			<!-- <el-button type="primary" @click="onstatus" >设置机台状态</el-button> -->
 			<el-button type="primary" @click="oncomplaints" >客诉记录</el-button>
 			<el-button type="primary" @click="onClear" >换型清场</el-button>
+			<el-button type="primary" @click="onDel">删除</el-button>
 			<el-button type="primary" @click="onADD">新增</el-button>
 			<!-- <el-button type="primary" @click="onClear2" >换型清场</el-button> -->
 		</header>
@@ -1516,7 +1516,14 @@
 			  </el-col>
 			  <el-col :span="7">
 			    <el-form-item label="开工时间:" prop="flatFeed" class="mab">
-			     <el-input v-model="formdata3.value.starttime"  id="日期"  @keydown="ent1($event)" @blur="getJtbhsubmit()" style="width: 100px;" />
+			     <!-- <el-input v-model="formdata3.value.starttime"  id="日期"  @keydown="ent1($event)" @blur="getJtbhsubmit()" style="width: 100px;" /> -->
+				 <el-date-picker
+				         v-model="formdata3.value.starttime"
+				         type="datetime"
+				         
+				         format="YYYY/MM/DD hh:mm:ss"
+				         value-format="YYYY-MM-DD h:m:s"
+				       />
 			    </el-form-item>
 			  </el-col>
 				<el-col :span="5" style="margin-top=0px; margin-bottom: 1px;">
@@ -1715,37 +1722,37 @@
 		  		
 		  		  	 </el-col>
 		  		     <el-col :span="2">
-		  		       <el-input v-model="formdata3.value.组员1['姓名']" id="name1"  @keydown="ent($event, 'bh11', 'name1', 'name2')"   placeholder="" />
+		  		       <el-input v-model="formdata3.value.组员1['姓名']" id="name1"  :readonly=true   placeholder="" />
 		  		     </el-col>
 		  		     <el-col :span="2">
-		  		       <el-input v-model="formdata3.value.组员2['姓名']" id="name2"  @keydown="ent($event, 'name1', 'name2', 'name3')"   placeholder="" />
+		  		       <el-input v-model="formdata3.value.组员2['姓名']" id="name2"  :readonly=true  placeholder="" />
 		  		     </el-col>
 		  		     <el-col :span="2">
-		  		       <el-input v-model="formdata3.value.组员3['姓名']" id="name3"  @keydown="ent($event, 'name2', 'name3', 'name4')"  placeholder="" />
+		  		       <el-input v-model="formdata3.value.组员3['姓名']" id="name3"  :readonly=true  placeholder="" />
 		  		     </el-col>
 		  		     <el-col :span="2">
-		  		       <el-input v-model="formdata3.value.组员4['姓名']" id="name4"  @keydown="ent($event, 'name3', 'name4', 'name5')"  placeholder="" />
+		  		       <el-input v-model="formdata3.value.组员4['姓名']" id="name4"  :readonly=true placeholder="" />
 		  		     </el-col>
 		  		     <el-col :span="2">
-		  		       <el-input v-model="formdata3.value.组员5['姓名']" id="name5"  @keydown="ent($event, 'name4', 'name5', 'name6')"  placeholder="" />
+		  		       <el-input v-model="formdata3.value.组员5['姓名']" id="name5"  :readonly=true  placeholder="" />
 		  		     </el-col>
 		  			<el-col :span="2">
-		  			  <el-input v-model="formdata3.value.组员6['姓名']" id="name6"  @keydown="ent($event, 'name5', 'name6', 'name7')"  placeholder="" />
+		  			  <el-input v-model="formdata3.value.组员6['姓名']" id="name6"  :readonly=true  placeholder="" />
 		  			</el-col>
 		  			<el-col :span="2">
-		  			  <el-input v-model="formdata3.value.组员7['姓名']" id="name7"  @keydown="ent($event, 'name6', 'name7', 'name8')"  placeholder="" />
+		  			  <el-input v-model="formdata3.value.组员7['姓名']" id="name7"  :readonly=true  placeholder="" />
 		  			</el-col>
 		  			<el-col :span="2">
-		  			  <el-input v-model="formdata3.value.组员8['姓名']" id="name8"  @keydown="ent($event, 'name7', 'name8', 'name9')"  placeholder="" />
+		  			  <el-input v-model="formdata3.value.组员8['姓名']" id="name8"  :readonly=true  placeholder="" />
 		  			</el-col>
 		  			<el-col :span="2">
-		  			  <el-input v-model="formdata3.value.组员9['姓名']" id="name9"  @keydown="ent($event, 'name8', 'name9', 'name10')"  placeholder="" />
+		  			  <el-input v-model="formdata3.value.组员9['姓名']" id="name9"  :readonly=true  placeholder="" />
 		  			</el-col>
 		  			<el-col :span="2">
-		  			  <el-input v-model="formdata3.value.组员10['姓名']" id="name10"  @keydown="ent($event, 'name9', 'name10', 'name11')"  placeholder="" />
+		  			  <el-input v-model="formdata3.value.组员10['姓名']" id="name10"  :readonly=true  placeholder="" />
 		  			</el-col>
 		  			<el-col :span="2">
-		  			  <el-input v-model="formdata3.value.拉料['姓名']" id="name11"  @keydown="ent($event, 'name10', 'name11', 'rate1')"  placeholder="" />
+		  			  <el-input v-model="formdata3.value.拉料['姓名']" id="name11"  :readonly=true  placeholder="" />
 		  			</el-col>
 		  		   </el-row>
 		  		
@@ -1868,7 +1875,8 @@ import {
    productionGdmc,
    productionYjmc,
    ChanliangDel,
-   ChanliangAdd
+   ChanliangAdd,
+   MachineChanliangDetailEdit,
 } from '@/api/jixiaoguanli/jitairibaobiao'
 
 import {
@@ -3032,21 +3040,18 @@ function getUid(row, column, event) {
  uid.value=row.UniqId
  console.log(uid.value)
 }
-
 //获取详细信息
 const MachineChanliang = async(value) => {
  const response = await MachineChanliangDetail({UniqId:value});
-   if (response.code === 0) {
-     console.log(response)
+   if (response.code === 0) {  
 	 chanliangVisible.value=true
 	 formdata3.value=response.data
 	 const pattern = /-(.*?)〖(.*?)$/;
 	 const matches = formdata3.value.gxmc.match(pattern);
-	 console.log(matches)
 	 formdata3.value.gymc=matches[1]
 	 formdata3.value.sczl_jtbh=JTMC
 	 formdata3.value.rq=date
-	 console.log(formdata3.value.拉料['姓名'])
+
    }
  }
  const yjnoArr = ref([0])
@@ -3169,7 +3174,17 @@ const MachineChanliang = async(value) => {
  }
  //日报表新增
  const add = async () => {
-   console.log(formdata3.value)
+	 // console.log(date+''+formdata3.value.starttime)
+	 const rate1=(parseFloat(formdata3.value.组员1['比例']) / 100).toFixed(5)
+	 const rate2=(parseFloat(formdata3.value.组员2['比例']) / 100).toFixed(5)
+	 const rate3=(parseFloat(formdata3.value.组员3['比例']) / 100).toFixed(5)
+	 const rate4=(parseFloat(formdata3.value.组员4['比例']) / 100).toFixed(5)
+	 const rate5=(parseFloat(formdata3.value.组员5['比例']) / 100).toFixed(5)
+	 const rate6=(parseFloat(formdata3.value.组员6['比例']) / 100).toFixed(5)
+	 const rate7=(parseFloat(formdata3.value.组员7['比例']) / 100).toFixed(5)
+	 const rate8=(parseFloat(formdata3.value.组员8['比例']) / 100).toFixed(5)
+	 const rate9=(parseFloat(formdata3.value.组员9['比例']) / 100).toFixed(5)
+	 const rate10=(parseFloat(formdata3.value.组员10['比例']) / 100).toFixed(5)
    const restoredData = {
      sczl_gdbh:formdata3.value.工单编号,
      sczl_yjno:formdata3.value.yjno,
@@ -3187,18 +3202,18 @@ const MachineChanliang = async(value) => {
  	sczl_bh9: formdata3.value.组员9['编号'],
  	sczl_bh10: formdata3.value.组员10['编号'],
  	sczl_bh98:formdata3.value.组员1['编号'],
- 	sczl_rate1: formdata3.value.组员1['比例'],
- 	sczl_rate2: formdata3.value.组员2['比例'],
- 	sczl_rate3: formdata3.value.组员3['比例'],
- 	sczl_rate4: formdata3.value.组员4['比例'],
- 	sczl_rate5: formdata3.value.组员5['比例'],
- 	sczl_rate6: formdata3.value.组员6['比例'],
- 	sczl_rate7: formdata3.value.组员7['比例'],
- 	sczl_rate8: formdata3.value.组员8['比例'],
- 	sczl_rate9: formdata3.value.组员9['比例'],
- 	sczl_rate10: formdata3.value.组员10['比例'],
+ 	sczl_rate1: rate1,
+ 	sczl_rate2: rate2,
+ 	sczl_rate3: rate3,
+ 	sczl_rate4: rate4,
+ 	sczl_rate5: rate5,
+ 	sczl_rate6: rate6,
+ 	sczl_rate7: rate7,
+ 	sczl_rate8: rate8,
+ 	sczl_rate9: rate9,
+ 	sczl_rate10: rate10,
  	sczl_jtbh: formdata3.value.sczl_jtbh,
-	开工时间:"2024-03-12 08:30:00",
+	开工时间:formdata3.value.starttime,
 	码开始行:formdata3.value.码开始行,
 	码结束行:formdata3.value.码结束行,
 	sys_id:"[68-ED-A4-26-5F-37/JY01#]",
@@ -3207,12 +3222,8 @@ const MachineChanliang = async(value) => {
 	sczl_异常类型1:formdata3.value.异常类型,
 	sczl_异常工时1:formdata3.value.异常总工时,
     sczl_dedh:formdata3.value.dedh,
-	
-	
-	
-	
-	
- 	sczl_rq: formdata3.value.rq,
+		
+ 	sczl_rq: date,
  	sczl_num: formdata3.value.num,
  	// sczl_rq: formData3.value.sczl_rq,
  	sczl_cl: formdata3.value.产量,
@@ -3228,13 +3239,11 @@ const MachineChanliang = async(value) => {
  	码包: formdata3.value.码包,
  	辅电表: formdata3.value.辅电表,
  	sczl_bh98: formdata3.value.拉料['编号'],
- 	UniqId: formdata3.value.UniqId,
- 	// bom: formData3.value.formattedArray
+ 	
    }
-   // console.log(restoredData)
-   // console.log(formData3.value.formattedArray)
+
    const response = await ChanliangAdd(restoredData);
-   console.log(response)
+   console.log(restoredData)
    if (response.code === 0) {
  	  ElMessage({
  	    type: 'success',
@@ -3248,56 +3257,75 @@ const MachineChanliang = async(value) => {
  //日报表上传
  const SubmitDailyProduction = async () => {
  
+    const rate1=(parseFloat(formdata3.value.组员1['比例']) / 100).toFixed(5)
+    const rate2=(parseFloat(formdata3.value.组员2['比例']) / 100).toFixed(5)
+    const rate3=(parseFloat(formdata3.value.组员3['比例']) / 100).toFixed(5)
+    const rate4=(parseFloat(formdata3.value.组员4['比例']) / 100).toFixed(5)
+    const rate5=(parseFloat(formdata3.value.组员5['比例']) / 100).toFixed(5)
+    const rate6=(parseFloat(formdata3.value.组员6['比例']) / 100).toFixed(5)
+    const rate7=(parseFloat(formdata3.value.组员7['比例']) / 100).toFixed(5)
+    const rate8=(parseFloat(formdata3.value.组员8['比例']) / 100).toFixed(5)
+    const rate9=(parseFloat(formdata3.value.组员9['比例']) / 100).toFixed(5)
+    const rate10=(parseFloat(formdata3.value.组员10['比例']) / 100).toFixed(5)
    const restoredData = {
-  //    sczl_gdbh:formData3.value.工单编号,
-  //    sczl_yjno:formData3.value.yjno,
-  //    sczl_gxh:formData3.value.gxh,
-  //    sczl_gxmc: formData3.value.gxmc,
- 	// sczl_bzdh: formData3.value.sczl_bzdh,
- 	// sczl_bh1: formdata3.value.组员1['编号'],
- 	// sczl_bh2: formdata3.value.组员2['编号'],
- 	// sczl_bh3: formdata3.value.组员3['编号'],
- 	// sczl_bh4: formdata3.value.组员4['编号'],
- 	// sczl_bh5: formdata3.value.组员5['编号'],
- 	// sczl_bh6: formdata3.value.组员6['编号'],
- 	// sczl_bh7: formdata3.value.组员7['编号'],
- 	// sczl_bh8: formdata3.value.组员8['编号'],
- 	// sczl_bh9: formdata3.value.组员9['编号'],
- 	// sczl_bh10: formdata3.value.组员10['编号'],
- 	// sczl_bh98:formdata3.value.组员1['编号'],
- 	// sczl_rate1: formData3.value.sczl_rate1,
- 	// sczl_rate2: formData3.value.sczl_rate2,
- 	// sczl_rate3: formData3.value.sczl_rate3,
- 	// sczl_rate4: formData3.value.sczl_rate4,
- 	// sczl_rate5: formData3.value.sczl_rate5,
- 	// sczl_rate6: formData3.value.sczl_rate6,
- 	// sczl_rate7: formData3.value.sczl_rate7,
- 	// sczl_rate8: formData3.value.sczl_rate8,
- 	// sczl_rate9: formData3.value.sczl_rate9,
- 	// sczl_rate10: formData3.value.sczl_rate10,
- 	// sczl_jtbh: formData3.value.sczl_jtbh,
- 	sczl_rq: formdata3.value.日期,
- 	sczl_num: formdata3.value.sczl_num,
- 	// sczl_rq: formData3.value.sczl_rq,
- 	sczl_cl: formdata3.value.产量,
- 	sczl_zcfp: formdata3.value.制程废品,
- 	sczl_zccp: formdata3.value.制程次品,
- 	sczl_前工序废: formdata3.value.前工序废,
- 	sczl_来料少数: formdata3.value.来料异常,
- 	sczl_ls: formdata3.value.联数,
- 	sczl_ms: formdata3.value.色度数,
- 	sczl_装版总工时: formdata3.value.sczl_装版总工时,
- 	sczl_打样总工时: formdata3.value.打样总工时,
- 	sczl_设备运行工时: formdata3.value.sczl_设备运行工时,
- 	码包: formdata3.value.码包,
- 	辅电表: formdata3.value.辅电表,
- 	sczl_bh98: formdata3.value.拉料['编号'],
- 	UniqId: formdata3.value.UniqId,
- 	// bom: formData3.value.formattedArray
+    sczl_gdbh:formdata3.value.工单编号,
+     sczl_yjno:formdata3.value.yjno,
+     sczl_gxh:formdata3.value.gxh,
+     sczl_gxmc: formdata3.value.gxmc,
+    sczl_bzdh: formdata3.value.bzdh,
+    sczl_bh1: formdata3.value.组员1['编号'],
+    sczl_bh2: formdata3.value.组员2['编号'],
+    sczl_bh3: formdata3.value.组员3['编号'],
+    sczl_bh4: formdata3.value.组员4['编号'],
+    sczl_bh5: formdata3.value.组员5['编号'],
+    sczl_bh6: formdata3.value.组员6['编号'],
+    sczl_bh7: formdata3.value.组员7['编号'],
+    sczl_bh8: formdata3.value.组员8['编号'],
+    sczl_bh9: formdata3.value.组员9['编号'],
+    sczl_bh10: formdata3.value.组员10['编号'],
+    sczl_bh98:formdata3.value.组员1['编号'],
+    sczl_rate1: rate1,
+    sczl_rate2: rate2,
+    sczl_rate3: rate3,
+    sczl_rate4: rate4,
+    sczl_rate5: rate5,
+    sczl_rate6: rate6,
+    sczl_rate7: rate7,
+    sczl_rate8: rate8,
+    sczl_rate9: rate9,
+    sczl_rate10: rate10,
+    sczl_jtbh: formdata3.value.sczl_jtbh,
+    开工时间:"2024-03-12 08:30:00",
+    码开始行:formdata3.value.码开始行,
+    码结束行:formdata3.value.码结束行,
+    sys_id:"[68-ED-A4-26-5F-37/JY01#]",
+    sczl_装版工时:formdata3.value.装版工时,
+    sczl_打样工时:formdata3.value.打样工时,
+    sczl_异常类型1:formdata3.value.异常类型,
+    sczl_异常工时1:formdata3.value.异常总工时,
+    sczl_dedh:formdata3.value.dedh,
+    	
+    sczl_rq: date,
+    sczl_num: formdata3.value.num,
+    // sczl_rq: formData3.value.sczl_rq,
+    sczl_cl: formdata3.value.产量,
+    sczl_zcfp: formdata3.value.制程废品,
+    sczl_zccp: formdata3.value.制程次品,
+    sczl_前工序废: formdata3.value.前工序废,
+    sczl_来料少数: formdata3.value.来料异常,
+    sczl_ls: formdata3.value.联数,
+    sczl_ms: formdata3.value.色度数,
+    sczl_装版总工时: formdata3.value.装版补产工时,
+    sczl_打样总工时: formdata3.value.打样补产工时,
+    sczl_设备运行工时: formdata3.value.通电工时,
+    码包: formdata3.value.码包,
+    辅电表: formdata3.value.辅电表,
+    sczl_bh98: formdata3.value.拉料['编号'],
+	UniqId:uid.value
    }
    console.log(restoredData)
    // console.log(formData3.value.formattedArray)
-   const response = await chanliangEdit(restoredData);
+   const response = await MachineChanliangDetailEdit(restoredData);
    console.log(response)
    if (response.code === 0) {
  	  ElMessage({