liuhairui 1 year ago
parent
commit
4a65ae7b66

+ 14 - 0
src/view/performance/06-packingDocuments/index.vue

@@ -123,6 +123,15 @@
 											<el-input v-model="row.Gd_cpmc" readonly />
 											<el-input v-model="row.Gd_cpmc" readonly />
 										</template>
 										</template>
 									</el-table-column>
 									</el-table-column>
+									
+									<el-table-column label="核算标准">
+										<template #default="{ row }">
+											<el-select v-model="row.hsbz" placeholder="请选择">
+												<el-option label="1000" value="1000"></el-option>
+												<el-option label="2500" value="2500"></el-option>
+											</el-select>
+										</template>
+									</el-table-column>
 
 
 									<el-table-column label="包装产量" width="100">
 									<el-table-column label="包装产量" width="100">
 										<template #default="{ row }">
 										<template #default="{ row }">
@@ -737,6 +746,7 @@ const SelectClickBz = (row, column, event) => {
 			restoredData[`sczl_gdbh${num}`] = item.sczl_gdbh
 			restoredData[`sczl_gdbh${num}`] = item.sczl_gdbh
 			restoredData[`sczl_yjGx${num}`] = item.sczl_yjGx
 			restoredData[`sczl_yjGx${num}`] = item.sczl_yjGx
 			restoredData[`sczl_gxmc${num}`] = item.sczl_gxmc
 			restoredData[`sczl_gxmc${num}`] = item.sczl_gxmc
+			restoredData[`sczl_type${num}`] = item.hsbz
 			restoredData[`Gd_cpmc${num}`] = item.Gd_cpmc
 			restoredData[`Gd_cpmc${num}`] = item.Gd_cpmc
 			restoredData[`sczl_cl${num}`] = item.sczl_cl
 			restoredData[`sczl_cl${num}`] = item.sczl_cl
 			restoredData[`sczl_返工产量${num}`] = item.sczl_返工产量
 			restoredData[`sczl_返工产量${num}`] = item.sczl_返工产量
@@ -745,6 +755,8 @@ const SelectClickBz = (row, column, event) => {
 			restoredData[`sczl_Jtbh${num}`] = item.sczl_Jtbh1
 			restoredData[`sczl_Jtbh${num}`] = item.sczl_Jtbh1
 			restoredData[`sczl_dedh${num}`] = item.sczl_dedh
 			restoredData[`sczl_dedh${num}`] = item.sczl_dedh
 		})
 		})
+		console.log(restoredData)
+		// return false;
 		const res = await updatePackingTable(restoredData)
 		const res = await updatePackingTable(restoredData)
 		if (res.code === 0) {
 		if (res.code === 0) {
 			ElMessage({
 			ElMessage({
@@ -804,6 +816,7 @@ const SelectClickBz = (row, column, event) => {
 			restoredData[`sczl_gdbh${num}`] = item.sczl_gdbh
 			restoredData[`sczl_gdbh${num}`] = item.sczl_gdbh
 			restoredData[`sczl_yjGx${num}`] = item.sczl_yjGx
 			restoredData[`sczl_yjGx${num}`] = item.sczl_yjGx
 			restoredData[`sczl_gxmc${num}`] = item.sczl_gxmc
 			restoredData[`sczl_gxmc${num}`] = item.sczl_gxmc
+			restoredData[`sczl_type${num}`] = item.hsbz
 			// restoredData[`Gd_cpmc${num}`] = item.Gd_cpmc
 			// restoredData[`Gd_cpmc${num}`] = item.Gd_cpmc
 			restoredData[`sczl_cl${num}`] = item.sczl_cl
 			restoredData[`sczl_cl${num}`] = item.sczl_cl
 			restoredData[`sczl_返工产量${num}`] = item.sczl_返工产量
 			restoredData[`sczl_返工产量${num}`] = item.sczl_返工产量
@@ -812,6 +825,7 @@ const SelectClickBz = (row, column, event) => {
 			restoredData[`sczl_Jtbh${num}`] = item.sczl_Jtbh1
 			restoredData[`sczl_Jtbh${num}`] = item.sczl_Jtbh1
 			restoredData[`sczl_dedh${num}`] = item.sczl_dedh
 			restoredData[`sczl_dedh${num}`] = item.sczl_dedh
 		})
 		})
+		console.log(restoredData)
 		const res = await addPackingTable(restoredData)
 		const res = await addPackingTable(restoredData)
 		if (res.code === 0) {
 		if (res.code === 0) {
 			ElMessage({
 			ElMessage({

+ 17 - 19
src/view/performance/09-workOrderVerification/componets/gongdanzhijianfeipintongji.vue

@@ -104,21 +104,7 @@ const tableData = ref([])
 const input = ref(props.val)
 const input = ref(props.val)
 const inputCpmc = ref('')
 const inputCpmc = ref('')
 const isLoading = ref(false)
 const isLoading = ref(false)
-// console.log(input.value)
-
-	
-// const ongdwhfanclick = () => {
-//   const workOrder = gdwhformData.cpgyfan;
-//   handleSearch();
-// }
-
-// PrintDetailList_list()
-
-// const PrintDetailList_list = async() => {
-	// 获取印件数据
-
-// }
-
+console.log(input.value)
 
 
 const handleExcel = () => {
 const handleExcel = () => {
   const el = document.getElementById('tab');
   const el = document.getElementById('tab');
@@ -145,7 +131,18 @@ const gdwhformData = reactive({
   // 设置默认值
   // 设置默认值
   yjno: '',
   yjno: '',
 });
 });
-
+const ongdwhfanclick = async() => {
+	console.log(gdwhformData.yjno)
+	const response = await PrintDetailList({ workOrder:input.value});
+	// console.log(response)
+	const matchingItem = response.data.find(item => item.no === gdwhformData.yjno);
+    if (matchingItem) {
+		console.log(matchingItem.name)
+		inputCpmc.value = matchingItem.name;
+	} else {
+		console.log(`No matching item found for no: ${gdwhformData.yjno}`);
+	}
+}
 
 
 const handleSearch = async() => {
 const handleSearch = async() => {
 	const response = await PrintDetailList({ workOrder:input.value});
 	const response = await PrintDetailList({ workOrder:input.value});
@@ -158,19 +155,20 @@ const handleSearch = async() => {
 	} else {
 	} else {
 	  console.error('查询失败:', response.msg);
 	  console.error('查询失败:', response.msg);
 	}
 	}
+	
   if (!input.value) { return }
   if (!input.value) { return }
   const params = { order: input.value,yjno:gdwhformData.yjno }
   const params = { order: input.value,yjno:gdwhformData.yjno }
   // console.log(params)
   // console.log(params)
   isLoading.value = true
   isLoading.value = true
   const res = await getOrderWasteTotal(params)
   const res = await getOrderWasteTotal(params)
-  // console.log(res)
+  console.log(res)
   isLoading.value = false
   isLoading.value = false
   if (res.code === 0) {
   if (res.code === 0) {
-    inputCpmc.value = res.data?.[0]?.['product_name']
+    // inputCpmc.value = res.data?.[0]?.['product_name']
     const val = res.data.map(item => {
     const val = res.data.map(item => {
       return { ...item, gdbh: params.order }
       return { ...item, gdbh: params.order }
     })
     })
-    console.log(res.data)
+    // console.log(res.data)
     tableData.value = val
     tableData.value = val
   }
   }
 }
 }