账号/操作人,大废品新增 修改

src/pinia/modules/user.js

@@ -41,11 +41,14 @@ export const useUserStore = defineStore('user', () => {
       ...value
     }
   }
+  
+  
   /* 获取用户信息*/
   const GetUserInfo = async() => {
     const res = await getUserInfo()
     if (res.code === 0) {
       setUserInfo(res.data.userInfo)
+	  console.log(res)
     }
     return res
   }

src/view/job/job/job.vue

@@ -226,7 +226,9 @@ import {
 import { getDictFunc, formatDate, formatBoolean, filterDict, ReturnArrImg, onDownloadFile } from '@/utils/format'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ref, reactive } from 'vue'
-
+import { useUserStore } from '@/pinia/modules/user'
+const userStore = useUserStore() 
+const sys_id='['+userStore.userInfo.userName+'/'+userStore.userInfo.nickName+']'
 defineOptions({
     name: 'Company'
 })

src/view/job/piece/piece.vue

@@ -210,7 +210,9 @@ import {
 import { getDictFunc, formatDate, formatBoolean, filterDict, ReturnArrImg, onDownloadFile } from '@/utils/format'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ref, reactive } from 'vue'
-
+import { useUserStore } from '@/pinia/modules/user'
+const userStore = useUserStore() 
+const sys_id='['+userStore.userInfo.userName+'/'+userStore.userInfo.nickName+']'
 defineOptions({
     name: 'Company'
 })

src/view/job/process/process.vue

@@ -185,7 +185,9 @@ import {
 import { getDictFunc, formatDate, formatBoolean, filterDict, ReturnArrImg, onDownloadFile } from '@/utils/format'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ref, reactive } from 'vue'
-
+import { useUserStore } from '@/pinia/modules/user'
+const userStore = useUserStore() 
+const sys_id='['+userStore.userInfo.userName+'/'+userStore.userInfo.nickName+']'
 defineOptions({
     name: 'Company'
 })

src/view/job/related/related.vue

@@ -347,7 +347,9 @@ import { ref, reactive, onMounted, onBeforeMount, nextTick } from 'vue'
 import { getPackingSideTable, getPackingTable } from '@/api/mes_api_gty/myapi'
 import { Value } from 'sass'
 import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
-
+import { useUserStore } from '@/pinia/modules/user'
+const userStore = useUserStore() 
+const sys_id='['+userStore.userInfo.userName+'/'+userStore.userInfo.nickName+']'
 defineOptions({
   name: '06-packingDocuments'
 })

src/view/job/rewards/rewards.vue

@@ -301,13 +301,14 @@
                   <el-input
                     v-model="detailData.sczl_gxmc"
                     @blur="getGXsubmit()"
+					 @keydown="ent1($event)"
                     style="width: 300px;"
                   />
                 </el-form-item>
                 <el-form-item prop="image">
                   <el-input
                     v-model="detailData.sczl_gxh"
-                    
+                     @keydown="ent1($event)"
                     style="width: 50px;"
                   />
                 </el-form-item>
@@ -317,7 +318,7 @@
                 >
                   <el-input
                     v-model="detailData.sczl_numDesc"
-                    
+                     @keydown="ent1($event)"
                   />
                 </el-form-item>
               </el-form>
@@ -336,7 +337,7 @@
                 >
                   <el-input
                     v-model="detailData.sczl_rq"
-                    
+                     @keydown="ent1($event)"
                     style="width: 120px;"
                   />
                 </el-form-item>
@@ -346,7 +347,7 @@
                 >
                   <el-input
                     v-model="detailData.sczl_cl"
-                    
+                     @keydown="ent1($event)"
                     style="width: 120px;"
                   />
                 </el-form-item>
@@ -356,7 +357,7 @@
                 >
                   <el-input
                     v-model="detailData.sczl_ls"
-                    
+                     @keydown="ent1($event)"
                     style="width: 120px;"
                   />
                 </el-form-item>
@@ -375,7 +376,7 @@
                 >
                   <el-input
                     v-model="detailData.sczl_fplxA"
-                    
+                     @keydown="ent1($event)"
                     style="width: 300px;"
                   />
                 </el-form-item>
@@ -383,6 +384,7 @@
                   <el-checkbox
                     v-model="detailData"
                     style="width: 30px;"
+					 @keydown="ent1($event)"
                   >制程废</el-checkbox>
                 </el-form-item>
                 <el-form-item
@@ -391,7 +393,7 @@
                 >
                   <el-input
                     v-model="detailData.责任部门"
-                    
+                     @keydown="ent1($event)"
                     style="width: 250px;"
                   />
                 </el-form-item>
@@ -457,57 +459,59 @@
                   <div class="sub-title">奖励班组：</div>
                   <el-input
                     v-model="detailData.Jl_bzdh"
-                    
+                     @keydown="ent1($event)"
                     style="width: 45px;"
                   />
                   <el-input
                     v-model="detailData.jl_jtbh"
-                    
+                     @blur="getJtbhsubmit('1')"
+					 @keydown="ent1($event)"
+					id="jt"
                     style="width: 65px;"
                   />
                   <el-input
                     v-model="detailData.JL_bh1"
-                    
+                    id="bh1"  @keydown="ent($event, 'jt', 'bh1', 'bh2')" @keyup.enter.native="GetYg($event, '1')"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.JL_bh2"
-                    
+                    id="bh2"  @keydown="ent($event, 'bh1', 'bh2', 'bh3')" @keyup.enter.native="GetYg($event, '2')"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.JL_bh3"
-                    
+                    id="bh3"  @keydown="ent($event, 'bh2', 'bh3', 'bh4')" @keyup.enter.native="GetYg($event, '3')"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.JL_bh4"
-                    
+                    id="bh4"  @keydown="ent($event, 'bh3', 'bh4', 'bh5')" @keyup.enter.native="GetYg($event, '4')"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.JL_bh5"
-                    
+                    id="bh5"  @keydown="ent($event, 'bh4', 'bh5', 'bh6')" @keyup.enter.native="GetYg($event, '5')"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.JL_bh6"
-                    
+                    id="bh6"  @keydown="ent($event, 'bh5', 'bh6', 'bh7')" @keyup.enter.native="GetYg($event, '6')"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.JL_bh7"
-                    
+                    id="bh7"  @keydown="ent($event, 'bh6', 'bh7', 'bh8')" @keyup.enter.native="GetYg($event, '7')"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.JL_bh8"
-                    
+                    id="bh8"  @keydown="ent($event, 'bh7', 'bh8', 'bh9')" @keyup.enter.native="GetYg($event, '8')"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.JL_bh9"
-                    
+                    id="bh9"  @keydown="ent($event, 'bh8', 'bh9', 'name1')" @keyup.enter.native="GetYg($event, '9')"
                     style="width: 85px;"
                   />
                 </el-form-item>
@@ -526,47 +530,48 @@
                   />
                   <el-input
                     v-model="detailData.jlname1"
-                    
+                    id="name1"
+					 @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.jlname2"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.jlname3"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.jlname4"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.jlname5"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.jlname6"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.jlname7"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.jlname8"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.jlname9"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                 </el-form-item>
@@ -585,47 +590,47 @@
                   >奖励金额：</div>
                   <el-input
                     v-model="detailData.JL_Je1"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.JL_Je2"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.JL_Je3"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.JL_Je4"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.JL_Je5"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.JL_Je6"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.JL_Je7"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.JL_Je8"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.JL_Je9"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                 </el-form-item>
@@ -691,57 +696,59 @@
                   <div class="sub-title">责任班组：</div>
                   <el-input
                     v-model="detailData.sczl_bzdh"
-                    
+                     @keydown="ent1($event)"
                     style="width: 45px;"
                   />
                   <el-input
                     v-model="detailData.sczl_jtbh"
-                    
+                    id="jt2"
+					 @blur="getJtbhsubmit('2')"
+					 @keydown="ent1($event)"
                     style="width: 65px;"
                   />
                   <el-input
                     v-model="detailData.sczl_bh1"
-                    
+                    id="dh1"  @keydown="ent($event, 'jt2', 'dh1', 'dh2')" @keyup.enter.native="GetYg($event, '10')"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.sczl_bh2"
-                    
+                    id="dh2"  @keydown="ent($event, 'dh1', 'dh2', 'dh3')" @keyup.enter.native="GetYg($event, '11')"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.sczl_bh3"
-                    
+                   id="dh3"  @keydown="ent($event, 'dh2', 'dh3', 'dh4')" @keyup.enter.native="GetYg($event, '12')"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.sczl_bh4"
-                    
+                   id="dh4"  @keydown="ent($event, 'dh3', 'dh4', 'dh5')" @keyup.enter.native="GetYg($event, '13')"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.sczl_bh5"
-                    
+                    id="dh5"  @keydown="ent($event, 'dh4', 'dh5', 'dh6')" @keyup.enter.native="GetYg($event, '14')"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.sczl_bh6"
-                    
+                    id="dh6"  @keydown="ent($event, 'dh5', 'dh6', 'dh7')" @keyup.enter.native="GetYg($event, '15')"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.sczl_bh7"
-                    
+                    id="dh7"  @keydown="ent($event, 'dh6', 'dh7', 'dh8')" @keyup.enter.native="GetYg($event, '16')"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.sczl_bh8"
-                    
+                   id="dh8"  @keydown="ent($event, 'dh7', 'dh8', 'dh9')" @keyup.enter.native="GetYg($event, '17')"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.sczl_bh9"
-                    
+                    id="dh9"  @keydown="ent($event, 'dh8', 'dh9', 'name2')" @keyup.enter.native="GetYg($event, '18')"
                     style="width: 85px;"
                   />
                 </el-form-item>
@@ -760,47 +767,48 @@
                   />
                   <el-input
                     v-model="detailData.zrname1"
-                    
+                    id="name2"
+					 @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.zrname2"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.zrname3"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.zrname4"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.zrname5"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.zrname6"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.zrname7"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.zrname8"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.zrname9"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                 </el-form-item>
@@ -819,47 +827,47 @@
                   >处罚金额：</div>
                   <el-input
                     v-model="detailData.sczl_je1"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.sczl_je2"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.sczl_je3"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.sczl_je4"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.sczl_je5"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.sczl_je6"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.sczl_je7"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.sczl_je8"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                   <el-input
                     v-model="detailData.sczl_je9"
-                    
+                     @keydown="ent1($event)"
                     style="width: 85px;"
                   />
                 </el-form-item>
@@ -895,8 +903,7 @@
 		      highlight-current-row="true" border style="width:100%"
 		      @row-dblclick="SelectClickJtbh"
 		    >
-		      <el-table-column prop="jtbh" label="设备编号" width="150" />			        	 
-		      <el-table-column prop="设备名称" label="设备名称" width="600" />			        	 
+		      <el-table-column prop="设备编号" label="设备编号" width="150" />			        	 			        	 
 		    </el-table>
 		  </el-dialog>
 
@@ -940,12 +947,15 @@
 <script setup>
 import { getRewardDetail, getRewardList, getRewardTab, getRewardTabByGd,JunkWorkOrderList,PrintCodeList,
 ProcessList,MachineClassList,MachineList,JunkDetailDel,JunkDetailEdit,JunkDetailAdd} from '@/api/mes/job'
+import {getYg} from '@/api/jixiaoguanli/jitairibaobiao'
 import { createCompany, deleteCompany, deleteCompanyByIds, findCompany, updateCompany } from '@/api/company'
 import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
 // 全量引入格式化工具 请按需保留
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ref, reactive, nextTick, onMounted, onBeforeMount } from 'vue'
-
+import { useUserStore } from '@/pinia/modules/user'
+const userStore = useUserStore() 
+const sys_id='['+userStore.userInfo.userName+'/'+userStore.userInfo.nickName+']'
 defineOptions({
   name: 'Company'
 })
@@ -1183,13 +1193,45 @@ const handleSelectClick = (row, column, event) => {
 const selectDataJtbh = reactive([])
 const JtbhVisible = ref(false)
 const SelectClickJtbh = (row, column, event) => {
-  const {jtbh,设备编号 } = row
-
-	formData.value.sczl_jtbh=row.jtbh
-
+  const {设备编号 } = row
+ if(jtbh.value==='JL'){
+ 	detailData.jl_jtbh=row.设备编号
+ }else if(jtbh.value==='ZR'){
+ 	detailData.sczl_jtbh=row.设备编号
+ }
   JtbhVisible.value = false
 }
-
+const jtbh=ref()
+//机台失去焦点事件
+const getJtbhsubmit = (value) => {
+	if(value==='1'){
+		jtbh.value='JL'
+	}else if(value==='2'){
+		jtbh.value='ZR'
+	}
+	console.log(jtbh.value)
+	MachineList().then(response=>{
+		if (response.code === 0) {			
+		selectDataJtbh.splice(0, selectDataJtbh.length, ...response.data)
+		JtbhVisible.value=true				  
+		}
+	})
+}
+//获取员工信息
+const GetYg = (event, inputName) => {
+    if (event.target.value !== '') {
+        getYg({ sczl_bh: event.target.value }).then(response => {
+            if (response.code === 0) {
+                // 设置值
+                if (inputName >= 1 && inputName <= 9) {
+                    detailData['jlname' + inputName] = response.data.ygxm;
+                } else if (inputName >= 10 && inputName <= 18) {
+                    detailData['zrname' + (inputName - 9)] = response.data.ygxm;
+                }
+            }
+        });
+    }
+}
 // ============== 表格控制部分结束 ===============
 
 // 获取需要的字典 可能为空 按需保留
@@ -1296,7 +1338,27 @@ const closeDetailShow = () => {
     name: '',
   }
 }
-
+//删除
+function onDel() {
+	Del()
+}
+// 删除
+const Del = async() => {
+	
+    const res = await JunkDetailDel({ UniqId:lastCellValue})
+    if (res.code === 0) {
+    ElMessage({
+      type: 'success',
+      message: '成功'
+    })
+	getTableData()
+    }else{
+	ElMessage({
+	  type: 'error',
+	  message: '失败'
+	})
+	}
+}
 // 打开弹窗
 const openDialog = () => {
   type.value = 'create'
@@ -1314,32 +1376,219 @@ const closeDialog = () => {
 }
 // 弹窗确定
 const enterDialog = async() => {
-  elFormRef.value?.validate(async(valid) => {
-    if (!valid) return
-    let res
-    switch (type.value) {
-      case 'create':
-        res = await createCompany(detailData.value)
-        break
-      case 'update':
-        res = await updateCompany(detailData.value)
-        break
-      default:
-        res = await createCompany(detailData.value)
-        break
+	if (type.value === 'update') {
+		  SubmitDailyProduction()
+	} else if (type.value === 'create') {
+		  add()   
+	}
+	// SubmitDailyProduction()
+  // elFormRef.value?.validate(async(valid) => {
+  //   if (!valid) return
+  //   let res
+  //   switch (type.value) {
+  //     case 'create':
+  //       res = await createCompany(detailData.value)
+  //       break
+  //     case 'update':
+  //       res = await updateCompany(detailData.value)
+  //       break
+  //     default:
+  //       res = await createCompany(detailData.value)
+  //       break
+  //   }
+  //   if (res.code === 0) {
+  //     ElMessage({
+  //       type: 'success',
+  //       message: '创建/更改成功'
+  //     })
+  //     closeDialog()
+  //     getTableData()
+  //   }
+  // })
+}
+ //日报表上传
+ const SubmitDailyProduction = async () => {
+ 
+   
+   const restoredData = {
+	   
+     sczl_gdbh:detailData.sczl_gdbh,
+     sczl_yjno:detailData.sczl_yjno,
+     sczl_gxh:detailData.sczl_gxh,
+     sczl_gxmc: detailData.sczl_gxmc,
+    sczl_numDesc: detailData.sczl_numDesc,
+    sczl_bh1: detailData.sczl_bh1,
+    sczl_bh2: detailData.sczl_bh2,
+    sczl_bh3: detailData.sczl_bh3,
+    sczl_bh4: detailData.sczl_bh4,
+    sczl_bh5: detailData.sczl_bh5,
+    sczl_bh6: detailData.sczl_bh6,
+    sczl_bh7: detailData.sczl_bh7,
+    sczl_bh8: detailData.sczl_bh8,
+    sczl_bh9: detailData.sczl_bh9,
+    sczl_bh10: '',
+	
+	sczl_je1: detailData.sczl_je1,
+	sczl_je2: detailData.sczl_je2,
+	sczl_je3: detailData.sczl_je3,
+	sczl_je4: detailData.sczl_je4,
+	sczl_je5: detailData.sczl_je5,
+	sczl_je6: detailData.sczl_je6,
+	sczl_je7: detailData.sczl_je7,
+	sczl_je8: detailData.sczl_je8,
+	sczl_je9: detailData.sczl_je9,
+	sczl_je10: '',
+	
+	JL_bh1: detailData.JL_bh1,
+	JL_bh2: detailData.JL_bh2,
+	JL_bh3: detailData.JL_bh3,
+	JL_bh4: detailData.JL_bh4,
+	JL_bh5: detailData.JL_bh5,
+	JL_bh6: detailData.JL_bh6,
+	JL_bh7: detailData.JL_bh7,
+	JL_bh8: detailData.JL_bh8,
+	JL_bh9: detailData.JL_bh9,
+	JL_bh10:'',
+	
+	JL_Je1: detailData.JL_Je1,
+	JL_Je2: detailData.JL_Je2,
+	JL_Je3: detailData.JL_Je3,
+	JL_Je4: detailData.JL_Je4,
+	JL_Je5: detailData.JL_Je5,
+	JL_Je6: detailData.JL_Je6,
+	JL_Je7: detailData.JL_Je7,
+	JL_Je8: detailData.JL_Je8,
+	JL_Je9: detailData.JL_Je9,
+	JL_Je10: '',
+
+    sczl_rq: detailData.sczl_rq,
+	sczl_ls: detailData.sczl_ls,
+	sczl_fplxA: detailData.sczl_fplxA,
+	sczl_fplxB: '0',
+	责任部门: detailData.责任部门,
+	sczl_cl: detailData.sczl_cl,
+	jl_jtbh: detailData.jl_jtbh,
+	Jl_bzdh: detailData.Jl_bzdh,
+	sczl_jtbh: detailData.sczl_jtbh,
+	sczl_bzdh: detailData.sczl_bzdh,
+	sys_id: sys_id,  
+	UniqId:lastCellValue
+   }
+   console.log(restoredData)
+   // console.log(formData3.value.formattedArray)
+   const response = await JunkDetailEdit(restoredData);
+   console.log(response)
+   if (response.code === 0) {
+ 	  ElMessage({
+ 	    type: 'success',
+ 	    message: '成功'
+ 	  })
+   }
+   detailShow.value = false
+   getTableData()
+ }
+ const add = async () => {
+ 	const restoredData = {
+ 		   
+ 	  sczl_gdbh:detailData.sczl_gdbh,
+ 	  sczl_yjno:detailData.sczl_yjno,
+ 	  sczl_gxh:detailData.sczl_gxh,
+ 	  sczl_gxmc: detailData.sczl_gxmc,
+ 	 sczl_numDesc: detailData.sczl_numDesc,
+ 	 sczl_bh1: detailData.sczl_bh1,
+ 	 sczl_bh2: detailData.sczl_bh2,
+ 	 sczl_bh3: detailData.sczl_bh3,
+ 	 sczl_bh4: detailData.sczl_bh4,
+ 	 sczl_bh5: detailData.sczl_bh5,
+ 	 sczl_bh6: detailData.sczl_bh6,
+ 	 sczl_bh7: detailData.sczl_bh7,
+ 	 sczl_bh8: detailData.sczl_bh8,
+ 	 sczl_bh9: detailData.sczl_bh9,
+ 	 sczl_bh10: '',
+ 		
+ 		sczl_je1: detailData.sczl_je1,
+ 		sczl_je2: detailData.sczl_je2,
+ 		sczl_je3: detailData.sczl_je3,
+ 		sczl_je4: detailData.sczl_je4,
+ 		sczl_je5: detailData.sczl_je5,
+ 		sczl_je6: detailData.sczl_je6,
+ 		sczl_je7: detailData.sczl_je7,
+ 		sczl_je8: detailData.sczl_je8,
+ 		sczl_je9: detailData.sczl_je9,
+ 		sczl_je10: '',
+ 		
+ 		JL_bh1: detailData.JL_bh1,
+ 		JL_bh2: detailData.JL_bh2,
+ 		JL_bh3: detailData.JL_bh3,
+ 		JL_bh4: detailData.JL_bh4,
+ 		JL_bh5: detailData.JL_bh5,
+ 		JL_bh6: detailData.JL_bh6,
+ 		JL_bh7: detailData.JL_bh7,
+ 		JL_bh8: detailData.JL_bh8,
+ 		JL_bh9: detailData.JL_bh9,
+ 		JL_bh10:'',
+ 		
+ 		JL_Je1: detailData.JL_Je1,
+ 		JL_Je2: detailData.JL_Je2,
+ 		JL_Je3: detailData.JL_Je3,
+ 		JL_Je4: detailData.JL_Je4,
+ 		JL_Je5: detailData.JL_Je5,
+ 		JL_Je6: detailData.JL_Je6,
+ 		JL_Je7: detailData.JL_Je7,
+ 		JL_Je8: detailData.JL_Je8,
+ 		JL_Je9: detailData.JL_Je9,
+ 		JL_Je10: '',
+ 	
+ 	 sczl_rq: detailData.sczl_rq,
+ 		sczl_ls: detailData.sczl_ls,
+ 		sczl_fplxA: detailData.sczl_fplxA,
+ 		sczl_fplxB: '0',
+ 		责任部门: detailData.责任部门,
+ 		sczl_cl: detailData.sczl_cl,
+ 		jl_jtbh: detailData.jl_jtbh,
+ 		Jl_bzdh: detailData.Jl_bzdh,
+ 		sczl_jtbh: detailData.sczl_jtbh,
+ 		sczl_bzdh: detailData.sczl_bzdh,
+ 		sys_id: sys_id,  
+ 	}
+ 	console.log(restoredData)
+ 	// console.log(formData3.value.formattedArray)
+ 	const response = await JunkDetailAdd(restoredData);
+ 	console.log(response)
+ 	if (response.code === 0) {
+ 	 	  ElMessage({
+ 	 	    type: 'success',
+ 	 	    message: '成功'
+ 	 	  })
+ 	}
+ 	detailShow.value = false
+ 	getTableData()
+ }
+//键盘 input框跳转
+const ent = (event,id1,id2,id3) => {
+  if (event.keyCode === 13 || event.keyCode === 40) { // Enter 或向下箭头
+	if(id3!=''){
+      document.getElementById(id3).focus()
     }
-    if (res.code === 0) {
-      ElMessage({
-        type: 'success',
-        message: '创建/更改成功'
-      })
-      closeDialog()
-      getTableData()
+  } else if (event.keyCode === 38) { // 向上箭头
+    if(id1!=''){
+      document.getElementById(id1).focus()
     }
-  })
+  }else if (event.keyCode === 8) { // 删除箭头
+    if(id1!='' && document.getElementById(id2).value===''){
+      document.getElementById(id1).focus()
+    }
+  }else if (event.keyCode === 37) { // 向左箭头
+    if(id1!='' && document.getElementById(id2).selectionStart==0){
+      document.getElementById(id1).focus()
+    }
+  }else if (event.keyCode === 39) { // 向右箭头
+    if(id3!='' && document.getElementById(id2).selectionStart == document.getElementById(id2).value.length){
+      document.getElementById(id3).focus()
+    }
+  }
 }
 
-
 const ent1 = (event) => {
   const inputs = document.getElementsByTagName('input');
   const currentIndex = Array.from(inputs).indexOf(event.target);

src/view/job/sampling/sampling.vue

@@ -519,7 +519,9 @@ import{getYg}from '@/api/mes_api_gty/myapi'
 // 全量引入格式化工具 请按需保留
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref,nextTick ,onMounted, onBeforeMount} from 'vue'
-
+import { useUserStore } from '@/pinia/modules/user'
+const userStore = useUserStore() 
+const sys_id='['+userStore.userInfo.userName+'/'+userStore.userInfo.nickName+']'
 defineOptions({
   name: 'Sampling'
 })

src/view/layout/index.vue

@@ -283,8 +283,9 @@ onMounted(() => {
   }
 })
 
-const userStore = useUserStore()
-
+const userStore = useUserStore() 
+// console.log(userStore.userInfo.authority.authorityName )
+// console.log(userStore.userInfo.nickName )
 const asideWidth = () => {
   if (isMobile.value) {
     return isCollapse.value ? '0px' : '220px'

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

@@ -374,7 +374,9 @@ import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 // import { Download, Search, Delete } from '@element-plus/icons-vue'
 import { reactive, ref } from 'vue'
 import { getGxMc, getInfo, getLocate, getPackingSideTable, getPackingTable, updatePackingTable, getYg, DeletePackingTable, addPackingTable, getDedh } from '@/api/mes_api_gty/myapi'
-
+import { useUserStore } from '@/pinia/modules/user'
+const userStore = useUserStore() 
+const sys_id='['+userStore.userInfo.userName+'/'+userStore.userInfo.nickName+']'
 defineOptions({
   name: '06PackingDocuments',
 })
@@ -698,7 +700,7 @@ const handleShowAdd = async() => {
 }
 const addDetailData = async() => {
   const restoredData = {
-    sys_id: params.sys_id,
+    sys_id:sys_id,
     sczl_rq: detailData.sczl_rq,
     sczl_bh: detailData.sczl_bh,
     // name: detailData.name,

src/view/performance/07-otherDocuments/index.vue

@@ -357,7 +357,9 @@ import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/w
 import { ElMessage, dayjs } from 'element-plus'
 import { ref, reactive } from 'vue'
 import { getSide, getTable, getYg, getGdmc, getDedh, getGxMc, updateData, add } from '@/api/mes_api_gty/otherDocuments'
-
+import { useUserStore } from '@/pinia/modules/user'
+const userStore = useUserStore() 
+const sys_id='['+userStore.userInfo.userName+'/'+userStore.userInfo.nickName+']'
 defineOptions({
   name: '07OtherDocuments'
 })
@@ -627,7 +629,7 @@ const enterDialog = async() => {
 // 新增
 const addDetailData = async() => {
   const restoredData = {
-    Sys_id: '[1009/李美芬]',
+    Sys_id: sys_id,
     Sczl_bh1: detailData.Sczl_bh1,
     sczl_Type: detailData.sczl_Type,
     // name: detailData.name,

src/view/performance/08-timesheet/index.vue

@@ -455,7 +455,9 @@ import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/w
 import { ElMessage, dayjs } from 'element-plus'
 import { ref, reactive } from 'vue'
 import { getSide, getTable, getDetail, updateData, getLocate, createData, getYg } from '@/api/mes_api_gty/timesheet'
-
+import { useUserStore } from '@/pinia/modules/user'
+const userStore = useUserStore() 
+const sys_id='['+userStore.userInfo.userName+'/'+userStore.userInfo.nickName+']'
 defineOptions({
   name: '08Timesheet'
 })

src/view/performance/09-workOrderVerification/index.vue

@@ -500,6 +500,9 @@ import Meirihejiantongji from '@/view/performance/09-workOrderVerification/compo
 import Gongdanzhijianfeipintongji from '@/view/performance/09-workOrderVerification/componets/gongdanzhijianfeipintongji.vue'
 import Shebeizhuangtai from '@/view/performance/09-workOrderVerification/componets/shebeizhuangtai.vue'
 import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
+import { useUserStore } from '@/pinia/modules/user'
+const userStore = useUserStore() 
+const sys_id='['+userStore.userInfo.userName+'/'+userStore.userInfo.nickName+']'
 defineOptions({
   name: '06PackingDocuments'
 })
@@ -910,7 +913,7 @@ const addDetailData = async () => {
     qczl_NumDesc6: detailData.qczl_NumDesc6,
     qczl_NumDesc7: detailData.qczl_NumDesc7,
     qczl_NumDesc8: detailData.qczl_NumDesc8,
-    sys_id: '[1003/洪桂芬]'
+    sys_id: sys_id
   };
 
   detailData.table.forEach((item, index) => {

src/view/performance/12-orderAccounting/index.vue

@@ -368,6 +368,9 @@ import Hjfpfb from './componets/hjfpfb.vue'
 import PrintPage from '@/view/yunyin/shengchanguanli/components/print.vue'
 import { reactive } from 'vue'
 import { exportExcelFile } from '@/utils/excel'
+import { useUserStore } from '@/pinia/modules/user'
+const userStore = useUserStore() 
+const sys_id='['+userStore.userInfo.userName+'/'+userStore.userInfo.nickName+']'
 
 // 弹窗
 const dialogGdcjstj = ref(false)

src/view/performance/14-overTimePayVerification/index.vue

@@ -147,6 +147,9 @@ import { Download, Refresh, Search } from '@element-plus/icons-vue'
 import { reactive, ref } from 'vue'
 import { getDownData, getSide, getUpData } from '@/api/mes_api_gty/overTimePayVerification'
 import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
+import { useUserStore } from '@/pinia/modules/user'
+const userStore = useUserStore() 
+const sys_id='['+userStore.userInfo.userName+'/'+userStore.userInfo.nickName+']'
 defineOptions({
   name: '06PackingDocuments',
 })

src/view/performance/Dayreportattached.vue

@@ -169,7 +169,10 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { Search, Refresh, Download } from '@element-plus/icons-vue'
 import { ref, reactive, onMounted, onBeforeMount } from 'vue'
 import { getPackingSideTable, getPackingTable } from '@/api/mes_api_gty/myapi'
-import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
+import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
+import { useUserStore } from '@/pinia/modules/user'
+const userStore = useUserStore() 
+const sys_id='['+userStore.userInfo.userName+'/'+userStore.userInfo.nickName+']'
 defineOptions({
   name: '06-packingDocuments'
 })
@@ -207,7 +210,7 @@ const formData = ref({
              sczl_bzdh: '',
              sczl_设备运行工时: '0.00',
              sczl_desc: '',
-			 sys_id:'[1002/郑小丽]',
+			 sys_id:sys_id,
 })
 const initFormData = () => {
 	formData.value = {
@@ -217,7 +220,7 @@ const initFormData = () => {
 		 sczl_bzdh: '',
 		 sczl_设备运行工时: '0.00',
 		 sczl_desc: '',
-		 sys_id:'[1002/郑小丽]',
+		 sys_id:sys_id,
 	};
 }
 
@@ -606,7 +609,7 @@ const updateDetailData = async() => {
 	sczl_bzdh:formData.value.sczl_bzdh,
 	sczl_设备运行工时:formData.value.sczl_设备运行工时,
 	sczl_desc:formData.value.sczl_desc,
-	sys_id:'[1002/郑小丽]',
+	sys_id:sys_id,
   }
  if(ADD.value=='新增'){
 	 const response = await reportadd(restoredData);

src/view/performance/Dayreports.vue

@@ -477,7 +477,10 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { Search, Refresh, Download } from '@element-plus/icons-vue'
 import { ref, reactive, nextTick, onMounted, onBeforeMount } from 'vue'
 import { getPackingSideTable, getPackingTable } from '@/api/mes_api_gty/myapi'
-import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
+import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
+import { useUserStore } from '@/pinia/modules/user'
+const userStore = useUserStore() 
+const sys_id='['+userStore.userInfo.userName+'/'+userStore.userInfo.nickName+']'
 defineOptions({
   name: '06-packingDocuments'
 })
@@ -1868,7 +1871,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/郑小丽]',
+   sys_id:sys_id,
   }
   // detailData.table.forEach((item, index, array) => {
   //   const num = index + 1

src/view/performance/MachineDocuments.vue

@@ -303,7 +303,10 @@ import { Search, Refresh, Download } from '@element-plus/icons-vue'
 import { ref, reactive, nextTick, onMounted, onBeforeMount } from 'vue'
 import { getPackingSideTable, getPackingTable } from '@/api/mes_api_gty/myapi'
 import { login } from '@/api/user'
-import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
+import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
+import { useUserStore } from '@/pinia/modules/user'
+const userStore = useUserStore() 
+const sys_id='['+userStore.userInfo.userName+'/'+userStore.userInfo.nickName+']'
 defineOptions({
   name: '06-packingDocuments'
 })
@@ -1052,7 +1055,7 @@ const updateDetailData = async() => {
 	sczl_rate7: formData.value.sczl_rate7,
 	sczl_rate8: formData.value.sczl_rate8,
 	sczl_desc: formData.value.sczl_desc,
-	sys_id:'[1008/姜剑娟]',
+	sys_id:sys_id,
   }
   // detailData.table.forEach((item, index, array) => {
   //   const num = index + 1

src/view/performance/Manualdocuments.vue

@@ -301,7 +301,10 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { Search, Refresh, Download } from '@element-plus/icons-vue'
 import { ref, reactive, nextTick, onMounted, onBeforeMount } from 'vue'
 import { getPackingSideTable, getPackingTable } from '@/api/mes_api_gty/myapi'
-import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
+import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
+import { useUserStore } from '@/pinia/modules/user'
+const userStore = useUserStore() 
+const sys_id='['+userStore.userInfo.userName+'/'+userStore.userInfo.nickName+']'
 defineOptions({
   name: '06-packingDocuments'
 })
@@ -1489,7 +1492,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/洪丽]',
+   sys_id:sys_id,
   }
   if(ADD.value=='新增'){
   	 const response = await inspectadd(restoredData);

src/view/performance/Packagingoutput.vue

@@ -178,7 +178,10 @@ import { ElMessage, ElMessageBox, LAST_KEYS } from 'element-plus'
 import { Search, Refresh, Download } from '@element-plus/icons-vue'
 import { ref, reactive, nextTick, onMounted, onBeforeMount } from 'vue'
 import { getPackingSideTable, getPackingTable } from '@/api/mes_api_gty/myapi'
-import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
+import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
+import { useUserStore } from '@/pinia/modules/user'
+const userStore = useUserStore() 
+const sys_id='['+userStore.userInfo.userName+'/'+userStore.userInfo.nickName+']'
 defineOptions({
   name: '06-packingDocuments'
 })
@@ -644,7 +647,7 @@ const updateDetailData = async() => {
 		 sczl_clAdd4: formData.value.sczl_clAdd4,
 		 sczl_clAdd5:formData.value.sczl_clAdd5,
 		 sczl_clAdd6: formData.value.sczl_clAdd6,
-		 sys_id:'[1084/胡庆司]',
+		 sys_id:sys_id,
 	}
   
   if(ADD.value=='新增'){

src/view/performance/chejianbaogong.vue

@@ -2237,7 +2237,9 @@ import { getDictFunc, formatDate, formatBoolean, filterDict, ReturnArrImg, onDow
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ref, reactive } from 'vue'
 import Shebeizhuangtai from '@/view/performance/09-workOrderVerification/componets/shebeizhuangtai.vue'
-
+import { useUserStore } from '@/pinia/modules/user'
+const userStore = useUserStore() 
+const sys_id='['+userStore.userInfo.userName+'/'+userStore.userInfo.nickName+']'
 const dialogSbyxgl=ref(false)
 const zhichengstatus=ref(false)
 const yinbanselectData = ref([])

src/view/performance/yuangongrigongzi.vue

@@ -365,7 +365,10 @@ import { Search, Refresh, Download } from '@element-plus/icons-vue'
 import { ref, reactive, onMounted, onBeforeMount } from 'vue'
 import { getPackingSideTable, getPackingTable } from '@/api/mes_api_gty/myapi'
 import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
-import Ygjjmx from './printYgjjmx.vue'
+import Ygjjmx from './printYgjjmx.vue'
+import { useUserStore } from '@/pinia/modules/user'
+const userStore = useUserStore() 
+const sys_id='['+userStore.userInfo.userName+'/'+userStore.userInfo.nickName+']'
 defineOptions({
   name: '06-packingDocuments'
 })

src/view/yunyin/shengchanguanli/chengpinrucang.vue

@@ -493,7 +493,9 @@ import { Search, Refresh, Download } from '@element-plus/icons-vue'
 import { ref, reactive, onMounted, onBeforeMount } from 'vue'
 import { getPackingSideTable, getPackingTable } from '@/api/mes_api_gty/myapi'
 import { TRUE } from 'sass'
-
+import { useUserStore } from '@/pinia/modules/user'
+const userStore = useUserStore() 
+const sys_id='['+userStore.userInfo.userName+'/'+userStore.userInfo.nickName+']'
 defineOptions({
   name: '06-packingDocuments'
 })
@@ -945,7 +947,7 @@ const enterDialog = async () => {
 const updateDetailData = async() => {
   const restoredData = {
    UniqId: lastCellValue, 
-   Sys_id:'[1035/刘晓庆]',
+   Sys_id:sys_id,
    入仓类型:formData.value.入仓类型,
    仓库编号:formData.value.仓库编号,
    仓库名称:formData.value.仓库名称,

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -1889,7 +1889,9 @@ import Shebeizhuangtai from '@/view/performance/09-workOrderVerification/compone
 import { getDictFunc, formatDate, formatBoolean, filterDict, ReturnArrImg, onDownloadFile } from '@/utils/format'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ref, reactive } from 'vue'
-
+import { useUserStore } from '@/pinia/modules/user'
+const userStore = useUserStore() 
+const sys_id='['+userStore.userInfo.userName+'/'+userStore.userInfo.nickName+']'
 
 defineOptions({
     name: 'Company'
@@ -3300,28 +3302,7 @@ const MachineChanliang = async(value) => {
 		 		}
 		 	})
 	 }
-	
-	 
-	 
-	 
-	 
-	 // const propertyName = `组员${inputName}['编号']`;
-	 // console.log(propertyName)
-	 // console.log(formdata3.value.组员1['编号'])
-	 // console.log(formdata3.value[propertyName])
-	 // const value = eval('formdata3.value.' + propertyName);
-	 // console.log(value); // 输出：ZM01074
- 	// if(formdata3.value[propertyName]!=''){
- 	// 	EmployeeData({code:formdata3.value.组员+inputName+['编号']}).then(response=>{
- 	// 		if (response.code === 0) {
- 	// 			//设置比例
- 	// 			// formdata3.value.组员1['姓名'] = response.data.ygxm;
-		// 		// formdata3.value.组员+inputName+['姓名'] = response.data[0].员工姓名;
- 	// 		}else{
- 	// 			// formdata3.value['sczl_bh'+inputName+'_name'] = '';
- 	// 		}
- 	// 	})
- 	// }
+
  }
  //追加字体颜色和不可输入
  const setColorReadonly = (id) => {
@@ -3389,7 +3370,7 @@ const MachineChanliang = async(value) => {
 	开工时间:formdata3.value.starttime,
 	码开始行:formdata3.value.码开始行,
 	码结束行:formdata3.value.码结束行,
-	sys_id:"[68-ED-A4-26-5F-37/JY01#]",
+	sys_id:sys_id,
 	sczl_装版工时:formdata3.value.装版补产工时,
 	sczl_打样工时:formdata3.value.打样补产工时,
 	sczl_异常类型1:formdata3.value.异常类型,
@@ -3472,7 +3453,7 @@ const MachineChanliang = async(value) => {
     开工时间:"2024-03-12 08:30:00",
     码开始行:formdata3.value.码开始行,
     码结束行:formdata3.value.码结束行,
-    sys_id:"[68-ED-A4-26-5F-37/JY01#]",
+    sys_id:sys_id,
     sczl_装版工时:formdata3.value.装版补产工时,
     sczl_打样工时:formdata3.value.打样补产工时,
     sczl_异常类型1:formdata3.value.异常类型,