Browse Source

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

tty 1 year ago
parent
commit
a09a135f0d

+ 164 - 1
src/api/jixiaoguanli/jitairibaobiao.js

@@ -419,4 +419,167 @@ export const  dailysearch= (params) => {
     method: 'get',
 	params
   })
-}
+}
+//成品入仓
+//侧边栏
+export const  finishedTab= (params) => {
+  return service({
+    url:'/mes_server/finished_product_warehousing/getTab',
+    method: 'get',
+	params
+  })
+}
+//侧边栏 根据工单
+export const  finishedTabByGdbh= (params) => {
+  return service({
+    url:'/mes_server/finished_product_warehousing/getTabByGdbh',
+    method: 'get',
+	params
+  })
+}
+//列表
+export const  finishedList= (params) => {
+  return service({
+    url:'/mes_server/finished_product_warehousing/getList',
+    method: 'get',
+	params
+  })
+}
+//定位
+export const  finishedlocate= (params) => {
+  return service({
+    url:'/mes_server/finished_product_warehousing/locate',
+    method: 'get',
+	params
+  })
+}
+//获取详细信息
+export const  finishedInfo= (params) => {
+  return service({
+    url:'/mes_server/finished_product_warehousing/getInfo',
+    method: 'get',
+	params
+  })
+}
+//获取仓库信息
+export const  finishedgetCk= (params) => {
+  return service({
+    url:'/mes_server/finished_product_warehousing/getCk',
+    method: 'get',
+	params
+  })
+}
+//获取工单信息
+export const  finishedgetGd= (params) => {
+  return service({
+    url:'/mes_server/finished_product_warehousing/getGd',
+    method: 'get',
+	params
+  })
+}
+//查询工单数量
+export const  finishedgetGdsl= (params) => {
+  return service({
+    url:'/mes_server/finished_product_warehousing/getGdsl',
+    method: 'get',
+	params
+  })
+}
+//删除
+export const  finisheddel= (params) => {
+  return service({
+    url:'/mes_server/finished_product_warehousing/del',
+    method: 'get',
+	params
+  })
+}
+//设备运行跟踪
+//左侧菜单
+export const  facilityTab= (params) => {
+  return service({
+    url:'/mes_server/facility/getTab',
+    method: 'get',
+	params
+  })
+}
+//当日上报产量
+export const  facilitychanLiang= (params) => {
+  return service({
+    url:'/mes_server/facility/chanLiang',
+    method: 'get',
+	params
+  })
+}
+//当日制程检验记录
+export const  facilityInspect= (params) => {
+  return service({
+    url:'/mes_server/facility/Inspect',
+    method: 'get',
+	params
+  })
+}
+//当前生产订单
+export const  facilityProduction= (params) => {
+  return service({
+    url:'/mes_server/facility/Production',
+    method: 'get',
+	params
+  })
+}
+//班组人员及分配比例
+export const  facilityTeam= (params) => {
+  return service({
+    url:'/mes_server/facility/Team',
+    method: 'get',
+	params
+  })
+}
+//班组维护->机台编号下拉框
+export const  facilityMachineList= (params) => {
+  return service({
+    url:'/mes_server/facility/MachineList',
+    method: 'get',
+	params
+  })
+}
+//设备点检->检验项目
+export const  facilityInspectionItem= (params) => {
+  return service({
+    url:'/mes_server/facility/InspectionItem',
+    method: 'get',
+	params
+  })
+}
+//设备点检->左侧菜单栏
+export const  facilitySpotCheckItem= (params) => {
+  return service({
+    url:'/mes_server/facility/SpotCheckItem',
+    method: 'get',
+	params
+  })
+}
+//关联工资核算
+//设备点检->左侧菜单栏
+export const  relatedTab= (params) => {
+  return service({
+    url:'/mes_server/related_salary_accounting/getTab',
+    method: 'get',
+	params
+  })
+}
+//关联工资核算上侧列表
+export const  relatedList= (params) => {
+  return service({
+    url:'/mes_server/related_salary_accounting/getList',
+    method: 'get',
+	params
+  })
+}
+//关联工资核算上侧列表
+export const  relatedsearch= (params) => {
+  return service({
+    url:'/mes_server/related_salary_accounting/search',
+    method: 'get',
+	params
+  })
+}

+ 1 - 1
src/view/performance/Dayreportattached.vue

@@ -473,7 +473,7 @@ const updateDetailData = async() => {
   // console.log(FormData)
   console.log(response)
 }
-删除
+
 const AddDel = async (value) => {
   const response = await adddel({UniqId:'0'});
   console.log(response) 

+ 324 - 57
src/view/performance/Dayreports.vue

@@ -20,7 +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" :icon="Refresh">重置</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>
@@ -97,7 +97,7 @@
               <el-row :gutter="20">
                 <el-col :span="4">
                   <el-form-item label="工单编号" prop="id">
-                    <el-input v-model="formData.sczl_gdbh" :clearable="true" placeholder="2023.12.14" />
+                    <el-input v-model="formData.sczl_gdbh" @keyup.enter.native="getCPMCsubmit"  :clearable="true" placeholder="2023.12.14" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
@@ -116,7 +116,7 @@
                   <el-row :gutter="20">
                     <el-col :span="14">
                       <el-form-item label="印件号" prop="id">
-                        <el-input v-model="formData.sczl_yjno" :clearable="true" placeholder="0.00" />
+                        <el-input v-model="formData.sczl_yjno" @keyup.enter.native="getYJMCsubmit" :clearable="true" placeholder="0.00" />
                       </el-form-item>
                     </el-col>
                     <el-col :span="10">
@@ -131,7 +131,7 @@
              <el-row :gutter="20">
                 <el-col :span="4">
                   <el-form-item label="工序名称" prop="id">
-                    <el-input v-model="formData.sczl_gxmc" :clearable="true" placeholder="2023.12.14" />
+                    <el-input v-model="formData.sczl_gxmc"  @keyup.enter.native="getGXsubmit" :clearable="true" placeholder="2023.12.14" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">          
@@ -276,7 +276,7 @@
 			         <el-row :gutter="20">
 			           <el-col :span="12">
 			  						 <el-form-item label="定额代号" prop="id">
-			             <el-input v-model="formData.sczl_dedh" :clearable="true" placeholder="ZT01733" />
+			             <el-input v-model="formData.sczl_dedh" @keyup.enter.native="getDedhsubmit" :clearable="true" placeholder="ZT01733" />
 			  						 </el-form-item>
 			           </el-col>
 			         </el-row>
@@ -334,34 +334,34 @@
 				   <span>班组成员</span>
 				 </el-col>
                 <el-col :span="2">
-                  <el-input v-model="formData.sczl_bh1" :clearable="true" placeholder="ZI00401" />
+                  <el-input v-model="formData.sczl_bh1" @keyup.enter.native="getGxMcsubmit($event, '1')":clearable="true" placeholder="ZI00401" />
                 </el-col>
                 <el-col :span="2">
-                  <el-input v-model="formData.sczl_bh2" :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" :clearable="true" placeholder="11.0" />
+                  <el-input v-model="formData.sczl_bh3" @keyup.enter.native="getGxMcsubmit($event, '3')" :clearable="true" placeholder="11.0" />
                 </el-col>
                 <el-col :span="2">
-                  <el-input v-model="formData.sczl_bh4" :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" :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" :clearable="true" placeholder="ZI00401" />
+				  <el-input v-model="formData.sczl_bh6" @keyup.enter.native="getGxMcsubmit($event, '6')" :clearable="true" placeholder="ZI00401" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_bh7" :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" :clearable="true" placeholder="11.0" />
+				  <el-input v-model="formData.sczl_bh8" @keyup.enter.native="getGxMcsubmit($event, '8')" :clearable="true" placeholder="11.0" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_bh9" :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" :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>
@@ -372,7 +372,7 @@
 							   
 							 </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="ZI00401" />
 			   </el-col>
 			   <el-col :span="2">
 			     <el-input v-model="formData.sczl_bh2_name" :clearable="true" placeholder="瞿春生" />
@@ -386,21 +386,21 @@
 			   <el-col :span="2">
 			     <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-col>
-							<el-col :span="2">
-							  <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-col>
-							<el-col :span="2">
-							  <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-col>
+				<el-col :span="2">
+				  <el-input v-model="formData.sczl_bh6_name" :clearable="true" placeholder="ZI00401" />
+				</el-col>
+				<el-col :span="2">
+				  <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-col>
+				<el-col :span="2">
+				  <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-col>
 			 </el-row>
 			
 			<el-row :gutter="10" style="margin-top: 10px;">
@@ -449,6 +449,44 @@
             </template>
           </el-dialog>
 
+          <el-dialog
+            v-model="GetDedhVisible"
+            title="选择"
+            destroy-on-close
+            width="600px"
+          			>		     
+               <el-aside width="250px">
+                 <div class="JKWTree-tree">		          
+                   <el-tree :data="GetDedhtreeData" :props="defaultProps" highlight-current="true"
+                     @node-click="GetDedhhandleNodeClick" @node-dblclick="handleNodeDoubleClick"></el-tree>
+                 </div>
+               </el-aside>		       
+          </el-dialog>
+
+
+          <el-dialog
+            v-model="GXVisible"
+            title="选择"
+            destroy-on-close
+            width="800px"
+          			>
+            <el-table
+              tooltip-effect="dark"
+              :data="selectData"
+              row-key="ID"
+              highlight-current-row="true"
+              border
+              style="width:100%"
+              @row-dblclick="SelectClick"
+            >
+              <el-table-column
+                prop="sczl_gxmc"
+                label="工序名称"
+                width="800"
+              />			        	 
+            </el-table>
+          </el-dialog>
+
         </el-main>
       </el-container>
     </el-container>
@@ -468,7 +506,8 @@ import {
   productionGx,
   productionDedh,
   productionedit,
-  productiondel
+  productiondel,
+  getYg
 } from '@/api/jixiaoguanli/jitairibaobiao'
 
 // 全量引入格式化工具 请按需保留
@@ -481,7 +520,7 @@ import { getPackingSideTable, getPackingTable } from '@/api/mes_api_gty/myapi'
 defineOptions({
   name: '06-packingDocuments'
 })
-
+const GetDedhVisible = ref(false)
 // 侧边栏数据请求
 const treeData = reactive([]);
 const getTabdata = async () => {
@@ -661,7 +700,137 @@ const handleNodeClick = (node,check) => {
  }
 
 }
+//员工编号回车事件
+const getGxMcsubmit = (event, inputName) => {
+
+	  console.log(inputName)
+	  let combinedString = 'sczl_bh' + inputName;
+	  console.log(combinedString)
+	 //  let variableName = 'sczl_gdbh'+inputName;
+	  let variableValue = eval('formData.value.' + combinedString);
+	  console.log(variableValue)
+	  GetYg(variableValue,inputName)
+}
+
+//获取员工信息
+const GetYg = async (value,inputName) => {
+  const response = await getYg({sczl_bh:value});
+  console.log(response) 
+  if (response.code === 0) {
+	console.log(response.data.ygxm) 
+	let Bname = 'sczl_bh' + inputName+'_name';
+	formData.value[Bname]=response.data.ygxm
+	// console.log(formData.value[Bname])
+  }
+}
+
+//定额代号回车事件
+const getDedhsubmit = () => {
+
+	 GetDedh()
+}
+let GetDedhtreeData = reactive([]);
+//获取定额代号
+const GetDedh = async () => {
+  const response = await productionDedh();
+  console.log(response);
+
+  // Initialize the tree structure
+  let treeData = [];
+
+  if (response.code === 0) {
+    const data = response.data;
+   
+       // 递归函数来构建树形结构
+       const buildTree = (node) => {
+         const treeNode = {
+           label: node.sys_bh + '【' + node.sys_mc+'】',
+           children: []
+         };
+   
+         // 如果存在子节点,递归地添加它们
+         if (node.bh_mc && Array.isArray(node.bh_mc)) {
+           node.bh_mc.forEach(childNode => {
+             treeNode.children.push(buildTree(childNode)); // 递归调用
+           });
+         }
+   
+         return treeNode;
+       };
+   
+       // 构建树形结构的根节点
+       const treeData = data.bh_mc.map(buildTree);
+   
+       console.log(treeData);
+       GetDedhtreeData = treeData; // 假设这是外部可访问的变量
+       GetDedhVisible.value = true; // 假设这是一个响应式引用
+  }
+}
+//定额代号树形结构单机
+const GetDedhhandleNodeClick = (nodeData, node, component) => {
+  //存放当前节点的nodeId
+  //存放当前节点的nodeId
+  if (!nodeData.children || nodeData.children.length === 0) {
+          // 如果节点没有子节点,打印节点名称
+          console.log(nodeData.label.split("【")[0]);
+		  formData.value.sczl_dedh=nodeData.label.split("【")[0]
+		   GetDedhVisible.value = false
+        }
+}
 
+//工序回车事件
+const getGXsubmit = () => {
+	 GetGxMc()
+}
+const selectData = reactive([])
+const GXVisible = ref(false)
+//查询印件工序及产品名称
+const GetGxMc = async () => {
+  console.log(formData.value.sczl_gdbh)
+  const response = await productionGx({gdbh:formData.value.sczl_gdbh,yjno:formData.value.sczl_yjno});
+  console.log(response) 
+ 
+  if (response.code === 0) {
+	  selectData.splice(0, selectData.length, ...response.data)
+	  GXVisible.value=true
+	  }
+  }
+  //工序选择
+const SelectClick = (row, column, event) => {
+  const {sczl_gxmc } = row
+  formData.value.sczl_gxmc=sczl_gxmc
+  formData.value.sczl_gxh=sczl_gxmc.split("-")[0]
+  console.log(formData.value.sczl_gxmc)
+  console.log(formData.value.sczl_gxh)
+  GXVisible.value = false
+}
+//工单编号回车事件
+const getCPMCsubmit = () => {
+	 GetCPMC()
+}
+//获取工单名称
+const GetCPMC = async () => {
+  console.log(formData.value.sczl_gdbh)
+  const response = await productionGdmc({gdbh:formData.value.sczl_gdbh});
+  console.log(response) 
+  if (response.code === 0) {
+	  formData.value.Gd_cpmc=response.data.Gd_cpmc
+	  }
+  }
+  
+  //印件号回车事件
+  const getYJMCsubmit = () => {
+  	 GetYJMC()
+  }
+  //获取印件名称
+  const GetYJMC = async () => {
+    console.log(formData.value.sczl_gdbh)
+    const response = await productionYjmc({gdbh:formData.value.sczl_gdbh,yjno:formData.value.sczl_yjno});
+    console.log(response) 
+    if (response.code === 0) {
+  	  formData.value.yj_yjmc=response.data.yj_yjmc
+  	  }
+    }
 // 搜索
 function onSearch() {
     params.gdbh = positionvalue.value
@@ -669,6 +838,18 @@ function onSearch() {
 	page.value = 1
 	GetLocate()
 }
+//删除
+function onDel() {
+	Del()
+}
+//删除
+const Del = async () => {
+  const response = await productiondel({UniqId:lastCellValue});
+  if (response.code === 0) {
+	console.log(333)
+  }
+  getTableData()
+}
 // 按工单显示
 function onCountByGdbh() {
 	CountByGdbh()
@@ -752,7 +933,21 @@ setOptions()
 const multipleSelection = ref([])
 // 多选
 const handleSelectionChange = (val) => {
-  multipleSelection.value = val
+  // multipleSelection.value = val
+  if(val.length>0){
+  	// multipleSelection.value = val
+  	const lenth=val.length
+  	// ScrapFactor.gdbh=val[lenth-1].combinedProp.split('-')[0];
+  	// const parts = val[lenth-1].combinedProp2.split('-')
+  	// ScrapFactor.yjno=parts[0];
+  	// ScrapFactor.gxh=parts[1];
+  	// ScrapFactor.type=val[lenth-1].sczl_检验类别
+  	// console.log(ScrapFactor)
+  	lastCellValue=val[lenth-1].UniqId
+  	// console.log(val)
+  	val.splice(0, val.length);  // 清空 val 数组	
+  	console.log(lastCellValue)
+  }
 }
 
 // 批量删除控制标记
@@ -819,29 +1014,101 @@ 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()
+  //   }
+  // })
+  updateDetailData()
+}
+// 更新数据
+const updateDetailData = async() => {
+  const restoredData = {
+   UniqId: lastCellValue,
+   sczl_gdbh: formData.value.sczl_gdbh,
+   Gd_cpmc: formData.value.Gd_cpmc,
+   sczl_yjno: formData.value.sczl_yjno,
+   yj_yjmc: formData.value.yj_yjmc,
+   sczl_gxmc: formData.value.sczl_gxmc,
+   sczl_gxh: formData.value.sczl_gxh,
+   sczl_type: formData.value.sczl_type,
+   sczl_rq: formData.value.sczl_rq,
+   sczl_jtbh: formData.value.sczl_jtbh,
+   sczl_bzdh: formData.value.sczl_bzdh,
+   sczl_ms: formData.value.sczl_ms,
+   sczl_ls: formData.value.sczl_ls,
+   sczl_cl: formData.value.sczl_cl,
+   sczl_zcfp: formData.value.sczl_zcfp,
+   sczl_装版总工时: formData.value.sczl_装版总工时,
+   sczl_装版工时: formData.value.sczl_装版工时,
+   sczl_保养工时: formData.value.sczl_保养工时,
+   sczl_异常停机工时: formData.value.sczl_异常停机工时,
+   sczl_打样总工时: formData.value.sczl_打样总工时,
+   sczl_打样工时: formData.value.sczl_打样工时,
+   sczl_设备运行工时: formData.value.sczl_设备运行工时,
+   拆片联拼系数: formData.value.拆片联拼系数,
+   拆片条小盒系数: formData.value.拆片条小盒系数,
+   sczl_dedh: formData.value.sczl_dedh,
+   sczl_工价系数: formData.value.sczl_工价系数,
+   sczl_计产系数: formData.value.sczl_计产系数,
+   sczl_bh1: formData.value.sczl_bh1,
+   sczl_bh2: formData.value.sczl_bh2,
+   sczl_bh3: formData.value.sczl_bh3,
+   sczl_bh4: formData.value.sczl_bh4,
+   sczl_bh5: formData.value.sczl_bh5,
+   sczl_bh6: formData.value.sczl_bh6,
+   sczl_bh7: formData.value.sczl_bh7,
+   sczl_bh8: formData.value.sczl_bh8,
+   sczl_bh9: formData.value.sczl_bh9,
+   sczl_bh10: formData.value.sczl_bh10,
+   sczl_rate1: formData.value.sczl_rate1,
+   sczl_rate2: formData.value.sczl_rate2,
+   sczl_rate3: formData.value.sczl_rate3,
+   sczl_rate4: formData.value.sczl_rate4,
+   sczl_rate5: formData.value.sczl_rate5,
+   sczl_rate6: formData.value.sczl_rate6,
+   sczl_rate7: formData.value.sczl_rate7,
+   sczl_rate8: formData.value.sczl_rate8,
+   sczl_rate9: formData.value.sczl_rate9,
+   sczl_rate10: formData.value.sczl_rate10,
+  }
+  // detailData.table.forEach((item, index, array) => {
+  //   const num = index + 1
+  //   restoredData[`sczl_gdbh${num}`] = item.sczl_gdbh
+  //   restoredData[`sczl_yjGx${num}`] = item.sczl_yjGx
+  //   restoredData[`sczl_gxmc${num}`] = item.sczl_gxmc
+  //   // restoredData[`Gd_cpmc${num}`] = item.Gd_cpmc
+  //   restoredData[`sczl_cl${num}`] = item.sczl_cl
+  //   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 productionedit(restoredData);
+  // console.log(FormData)
+  console.log(response)
 }
 let table=ref(5);
 let lastCellValue=ref()

+ 20 - 0
src/view/performance/Manualdocuments.vue

@@ -879,6 +879,26 @@ response.data.bh_mc.forEach(item => {
   }
 
 }
+//定额代号树形结构单机
+const GetDedhhandleNodeClick = (node,check,nodeData) => {
+  //存放当前节点的nodeId
+  //存放当前节点的nodeId
+  if (node.params) {
+       // 点击的是父节点
+       // 执行相应的父节点单击事件处理逻辑
+	 //   console.log(node.params)
+	    formData.value.sczl_dedh=node.params.sys_bh
+		// console.log(formData.value.sczl_dedh)
+		GetDedhVisible.value=false
+		console.log(node.params)
+     } else {
+       // 点击的是子节点
+       // 执行相应的子节点单击事件处理逻辑
+    //    console.log('11111');
+	   // console.log(node.params)
+       // 例如,您可以在这里执行子节点单击事件触发的操作
+     }
+}
 let GetDedhtreeData = reactive([]);
 const GetDedhVisible = ref(false)
 //定额代号回车事件

+ 12 - 10
src/view/performance/yuangongrigongzi.vue

@@ -338,18 +338,18 @@ const treeData = reactive([]);
 
 const getTabdata = async () => {
     //接口调用函数
-    const response  = await getTab();
+    const response  = await dailygetTab();
 	console.log(response)
 	
 	
 	const transformedData = response.data.map(item => ({
-	      label: `${item.date.replace(/-/g, '.')}【单据数: ${item.counts}张】`,
-	      children: item.sys.map(sysItem => ({
-	        label: `${sysItem.sys_id} 【记录数: ${sysItem.count}张】`,
+	      label: `${item.label}`,
+	      children: item.children.map(sysItem => ({
+	        label: `${sysItem.label}`,
 	        params: {
-	          date: item.date.replace(/\./g, '-'),
-	          sys_id: sysItem.sys_id,
-	          total: sysItem.count,
+	          date: item.label,
+	          sys_id: sysItem.label,
+	          total:'',
 	        },
 	      })),
 	    }));
@@ -418,7 +418,7 @@ const getTableData = async () => {
 	
 	
   const response = await dailygetList({
-	  date: '202401', department: '胶印车间',});
+	  date: params.date, department: params.sys_id,});
   console.log(response)
   if (response.code === 0) {
 	   const originalData = response.data;
@@ -554,7 +554,8 @@ setOptions()
 const multipleSelection = ref([])
 // 多选
 const handleSelectionChange = (val) => {
-  multipleSelection.value = val
+  // multipleSelection.value = val
+  
 }
 
 // 批量删除控制标记
@@ -657,8 +658,9 @@ function ontable(row, column, event) {
   // # 截取第一个"-"之后到第二个"-"之前的内容并赋值给新变量2
   let new_variable2 = parts[1]
   console.log(new_variable1+new_variable2) 
+  console.log(new_variable1)
   console.log(row.bh)
-  Getundertable(new_variable1+new_variable2,row.bh)
+  Getundertable(new_variable1,row.bh)
 }
 //获取下列表
 const Getundertable = async (date,bh) => {

File diff suppressed because it is too large
+ 547 - 355
src/view/yunyin/shengchanguanli/chengpinrucang.vue


File diff suppressed because it is too large
+ 840 - 301
src/view/yunyin/shengchanguanli/shebeiyunxing.vue


Some files were not shown because too many files changed in this diff