浏览代码

文档功能优化

Lexie 1 年之前
父节点
当前提交
6b2b0d2427

+ 8 - 0
src/api/jixiaoguanli/jitairibaobiao.js

@@ -757,6 +757,14 @@ export const ChromaDataEdit = (data) => {
     data
   })
 }
+//每日上报产量凹印版距修改
+export const PrintingModeDataEdit = (params) => {
+  return service({
+    url:'/mes_server/Facility/PrintingModeDataEdit',
+    method: 'get',
+    params
+  })
+}
 //关联工资核算
 //设备点检->左侧菜单栏
 export const  relatedTab= (params) => {

+ 8 - 0
src/api/yunyin/yunying.js

@@ -228,6 +228,14 @@ export const getProcessLoss = (params) => {
         params
     })
 }
+//3.8工艺资料-获取损耗代号
+export const getLossCode = (params) => {
+    return service({
+        url: '/mes_server/Product/getLossCode',
+        method: 'get',
+        params
+    })
+}
 //3.9印版资料-获取产品印版资料
 export const getProductYbInfo = (params) => {
     return service({

+ 15 - 16
src/view/job/rewards/rewards.vue

@@ -477,7 +477,7 @@
                   />
                   <el-input
                     v-model="detailData.JL_bh1"
-                    id="bh1"  @keydown="ent($event, 'jt', 'bh1', 'bh2')" @keyup.enter.native="GetYg($event, '1')"
+                    id="bh1"   @keyup.enter.native="GetYg($event, '1')" @keydown="ent($event, 'jt', 'bh1', 'bh2')"
                     style="width: 85px;"
                   />
                   <el-input
@@ -1225,21 +1225,20 @@ const getJtbhsubmit = (value) => {
 }
 //获取员工信息
 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;
-					detailData['JL_bh' + inputName] = response.data.员工编号;
-                } else if (inputName >= 10 && inputName <= 18) {
-                    detailData['zrname' + (inputName - 9)] = response.data.ygxm;
-					detailData['sczl_bh' + (inputName - 9)] = response.data.员工编号;					
-                }
-            }
-        });
-    }
-}
+  console.log(inputName);
+  // var num = parseInt(inputName) - 1;
+  // if (num >= 1 && num <= 9) {
+  //   getYg({ sczl_bh: detailData['JL_bh' + num] }).then(response => {
+  //     detailData['jlname' + num] = response.data.ygxm;
+  //     detailData['JL_bh' + num] = response.data.员工编号;
+  //   });
+  // } else if (num >= 9 && num <= 18) {
+  //   getYg({ sczl_bh: detailData['sczl_bh' + (num - 9)] }).then(response => {
+  //     detailData['zrname' + (num - 9)] = response.data.ygxm;
+  //     detailData['sczl_bh' + (num - 9)] = response.data.员工编号;
+  //   });
+  // }
+};
 // ============== 表格控制部分结束 ===============
 
 // 获取需要的字典 可能为空 按需保留

+ 49 - 8
src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -1605,6 +1605,7 @@ import {
   getAnnexTable,
   annexAdd,
   annexDel,
+  getLossCode
 } from '@/api/yunyin/yunying'
 defineOptions({   name: 'Company'})
 import { useUserStore } from '@/pinia/modules/user'
@@ -2958,7 +2959,7 @@ const add_gyformData = reactive({
   Gy0_shdh: '',
   工价系数: '',
   难度系数:'1.000',
-  损耗率:'0.00140',
+  损耗率:'',
   损耗系数: '1.000',
   工序备注: '',
   质量要求: '',
@@ -3020,13 +3021,50 @@ const getSH = (code) => {
   _getSH()
 }
 const _getSH = async () => {
-  const response = await getProcessLoss({code:add_gyformData.标准损耗});
-  // getSHListdata.value = processData(response.data);
-  // searchSHModel.value = true
-  console.log(response.data[0].sys_mc)
-  add_gyformData.标准损耗2=response.data[0].sys_mc
-  console.log(getSHListdata.value);
+  const response = await getLossCode({ code: '' });
+
+  if (response.code === 0) {
+    const data = response.data;
+
+    const treeData = [];
+    const map = {};
+
+    // 构建树形结构
+    data.forEach(item => {
+      map[item.sys_bh] = { ...item, children: [], label: `${item.sys_bh}---${item.sys_mc}---${item.sys_rate0}---${item.sys_rate1}` };
+    });
+
+    data.forEach(item => {
+      if (item.sys_bh.length === 3) {
+        map[item.sys_bh].level = 1;
+        treeData.push(map[item.sys_bh]);
+      } else {
+        map[item.sys_bh].level = 2;
+        map[item.sys_bh.substring(0, 3)].children.push(map[item.sys_bh]);
+      }
+    });
+
+    getSHListdata.value = treeData;
+    searchSHModel.value = true;
+  } else {
+    // 处理错误情况
+    console.error('获取损耗列表失败');
+  }
 };
+const selectSHNode = (node,check) => {
+   console.log(node.level)
+   if(node.level==1){
+   	console.log(node.label)
+	
+   }
+   if(node.level==2){
+   	add_gyformData.标准损耗=node.sys_bh
+	add_gyformData.标准损耗2=node.sys_mc
+	add_gyformData.Gy0_shdh=node.sys_rate0
+	add_gyformData.损耗率=node.sys_rate1
+	searchSHModel.value = false;
+   }
+}
 // const processData = (data) => {
 //   const map = {};
 //   const tree = [];
@@ -3071,7 +3109,7 @@ const addgyenterDialog = () => {
     Gy0_Ms: add_gyformData['Gy0_Ms'],
     Gy0_sbbh: add_gyformData['Gy0_sbbh'],
     Gy0_shdh: add_gyformData['Gy0_shdh'],
-    工价系数: add_gyformData['工价系数'],
+    工价系数: add_gyformData['损耗率'],
     损耗系数: add_gyformData['损耗系数'],
     工序备注:add_gyformData['工序备注'],
     质量要求: add_gyformData['质量要求'],
@@ -3088,6 +3126,9 @@ const addgyenterDialog = () => {
   		  message: '成功'
   		})
 		addgydialogFormVisible.value = false
+	 Object.keys(add_gyformData).forEach(key => {
+			add_gyformData[key] = '';
+		  });
   	}else{
   		ElMessage({
   		  type: 'error',

+ 44 - 6
src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -1947,7 +1947,10 @@ import {
    EmployeeData,
    RemodelDetail,
    AdditionalInspectionRecordAdd,
-   ProcessInspectionRecordsItemAdd
+   ProcessInspectionRecordsItemAdd,
+   CoefficientEdit,
+   ChromaDataEdit,
+   PrintingModeDataEdit
 } from '@/api/jixiaoguanli/jitairibaobiao'
 import {
 MachineTeamAdd,
@@ -3750,7 +3753,7 @@ const MachineChanliang = async(value) => {
  const SFType=ref(false)
  const CPType=ref(false)
  const SDType=ref(false)
-if(selected.value=== '难度调整系数'){
+if(selected.value==='难度调整系数'){
  	 SFType.value=true
 	 CPType.value=false
 	 SDType.value=false
@@ -3781,7 +3784,7 @@ if(selected.value=== '难度调整系数'){
 }
  //核算调整弹窗确定
  const hesuanenterDialog = async () => {
- if(selected.value=== '难度调整系数'){
+ if(selected.value==='难度调整系数'){
 	const id=ref('')
 	// console.log(multipleSelection.value.length)
 	// console.log(multipleSelection.value[0])
@@ -3789,12 +3792,47 @@ if(selected.value=== '难度调整系数'){
 		id.value+=multipleSelection.value[i].UniqId+','
 		console.log(multipleSelection.value[i].UniqId)
 	}
-	console.log(id.value)
-	
+	const res = await CoefficientEdit({id:id.value,工价系数:hesuanValue.缩放系数 })
+	console.log(res)
+	if(res.code===0){
+		ElMessage({
+		  type: 'success',
+		  message: '成功'
+		})
+		multipleSelection.value='' 
+		multipleTable.clearSelection();
+		console.log(multipleSelection.value)
+		hesuanVisible.value=false
+	}else{
+		ElMessage({
+		  type: 'error',
+		  message: '失败'
+		})
+	}	
  }else if(selected.value=== '凹印版距'){
 	 console.log('凹印版距')
  }else if(selected.value=== '色度数'){
-	  console.log('色度数')
+	  const id=ref('')
+	  // console.log(multipleSelection.value.length)
+	  // console.log(multipleSelection.value[0])
+	  for(let i=0;i<multipleSelection.value.length;i++){
+	  	id.value+=multipleSelection.value[i].UniqId+','
+	  	console.log(multipleSelection.value[i].UniqId)
+	  }
+	  const res = await CoefficientEdit({id:id.value,工价系数:hesuanValue.缩放系数 })
+	  console.log(res)
+	  if(res.code===0){
+	  	ElMessage({
+	  	  type: 'success',
+	  	  message: '成功'
+	  	})
+	  	hesuanVisible.value=false
+	  }else{
+	  	ElMessage({
+	  	  type: 'error',
+	  	  message: '失败'
+	  	})
+ }
  }
  }
  const ent1 = (event) => {