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

src/api/yunyin/yunying.js

@@ -1002,4 +1002,12 @@ export const workOrderDetail = (params) => {
         method: 'get',
         params
     })
+}
+// 每日上报产量废品率系数修改
+export const RejectionEdit = (data) => {
+    return service({
+        url: '/mes_server/facility/RejectionEdit',
+        method: 'post',
+        data
+    })
 }

src/view/performance/12-orderAccounting/componets/xzgdtl.vue

@@ -105,7 +105,7 @@
         width="150"
       >
         <template #default="{ row }">
-          <el-input v-model="row['实际投料']" />
+          <el-input @keyup.enter="handleUpdate" v-model="row['实际投料']" />
         </template>
       </el-table-column>
       <el-table-column
@@ -149,18 +149,18 @@ const updateOrderFeed = (data) => {
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { watch, ref, reactive, defineProps, defineEmits, onBeforeUnmount } from 'vue'
 
-const props = defineProps(['modelValue', 'date'])
-const emits = defineEmits(['update:modelValue'])
+const props = defineProps(['modelValue', 'gdbh','yjno'])
+const emits = defineEmits(['update:modelValue','update-data'])
 const tableData = ref([])
 const table = ref(null)
 const multipleSelection = ref([])
 const getTable = async() => {
   let params
-  if (props?.['date']) {
-    const { date } = props
+  if (props?.['gdbh']) {
+    const { gdbh,yjno } = props
     params = {
-      year: date.slice(0, 4),
-      month: date.slice(4, 6),
+      workorder: gdbh,
+      yjno: yjno,
     }
   } else {
     return
@@ -206,7 +206,10 @@ const handleSearch = () => {
 
 const handleUpdate = async() => {
   if (multipleSelection.value.length === 0) {
-    console.log('未选择行')
+    ElMessage({
+      type: 'error',
+      message: '未选择行',
+    })
     return
   }
   const params = multipleSelection.value.map(item => ({
@@ -219,6 +222,7 @@ const handleUpdate = async() => {
       type: 'success',
       message: '更新成功',
     })
+    emits('update-data', false);
   }
 }
 </script>

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

@@ -8,8 +8,7 @@
             ref="elSearchFormRef"
             inline
             class="demo-form-inline"
-            @submit.native.prevent
-          >
+            @submit.native.prevent>
             <el-form-item>
               <el-input
                 v-model="searchInfo"
@@ -173,7 +172,9 @@
             <Xzgdtl
               v-if="dialogXzgdtl"
               v-model="dialogXzgdtl"
-              :date="date"
+              @update-data = "exitXzgdtl"
+              :gdbh="gdbh"
+              :yjno="yjno"
             />
 
             <!-- 工序产量核查 -->
@@ -516,11 +517,13 @@ const tableData2 = ref([])
 const currentRow = ref({})
 const gdbh = ref('')
 const date = ref('')
+const yjno = ref ('')
 const searchInfo = ref('')
 
 watch(currentRow, (value, oldValue, onCleanup) => {
   gdbh.value = value?.['Gd_gdbh']
   date.value = value?.['date']
+  yjno.value = value?.['yj_Yjno']
   pd_lcdformData['gdbh'] = value?.['Gd_gdbh']
 })
 
@@ -538,7 +541,7 @@ const handleNodeClick = async(node) => {
           : '',
       date: date,
     }))
-    console.log(res.data)
+    console.log(tableData1.value )
   } else {
     // console.log(node.date, node.code)
   }
@@ -661,6 +664,11 @@ const exportExcel = () => {
   }
   exportExcelFile(data)
 }
+//关闭窗口
+const exitXzgdtl = (data) => {
+  console.log(data);
+  dialogXzgdtl.value = data;
+};
 </script>
 
 <style scoped>

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -2056,15 +2056,20 @@
 		      <div style="display: flex; align-items: center;margin-left: 40px;">
 		        <el-radio label="凹印版距"></el-radio>
 		      </div>
-
 		      <div style="display: flex; align-items: center;margin-left: 25px;">
 		        <el-radio label="色度数"></el-radio>
 		      </div>
+			  <div style="display: flex; align-items: center;margin-left: 55px;">
+			    <el-radio label="废品率系数"></el-radio>
+			  </div>
 		    </el-radio-group>
 		  </div>
 
 		  <div style="margin-left: 70px;">
 		    <el-col :span="15">
+				<el-form-item label="废品率系数:" prop="flatFeed" class="mab" v-if="FPlxs === true">
+				  <el-input v-model="hesuanValue.废品率系数" id="辅电表" @keydown="ent1($event)"  style="width: 200px;" v-if="FPlxs === true"/>
+				</el-form-item>
 		      <el-form-item label="缩放系数:" prop="flatFeed" class="mab" v-if="SFType === true">
 		        <el-input v-model="hesuanValue.缩放系数" id="辅电表" @keydown="ent1($event)"  style="width: 200px;" v-if="SFType === true"/>
 		      </el-form-item>
@@ -2312,6 +2317,7 @@ import{
 	AccountingParameterEdit,
 	gdzl_MachineList,
 	getOrderProcessCount,
+	RejectionEdit
   }  from "@/api/yunyin/yunying";
 import {
 MachineTeamAdd,
@@ -5640,6 +5646,7 @@ const tablebllickHandlerlist = async (row, column, event) => {
  const SFType=ref(false)
  const CPType=ref(false)
  const SDType=ref(false)
+ const FPlxs=ref(false)
 if(selected.value==='难度调整系数'){
  	 SFType.value=true
 	 CPType.value=false
@@ -5659,21 +5666,29 @@ if(selected.value==='难度调整系数'){
  	 SFType.value=true
 	 CPType.value=false
 	 SDType.value=false
+	 FPlxs.value=false
  }else if(selected.value=== '凹印版距'){
  	 CPType.value=true
 	 SFType.value=false
 	 SDType.value=false
+	 FPlxs.value=false
  }else if(selected.value=== '色度数'){
  	SDType.value=true
 	SFType.value=false
 	CPType.value=false
+	FPlxs.value=false
+ }else if(selected.value=== '废品率系数'){
+	 FPlxs.value=true
+	 SFType.value= false
+	 SDType.value= false
+	 CPType.value=false
+	 // hesuanValue.废品率系数 = '废品率系数'
  }
 }
 
  //核算调整弹窗确定
  const hesuanenterDialog = async () => {
 	 console.log(selected.value)
-	 // console.log(multipleSelection.value)
  if(selected.value==='难度调整系数'){
 	// console.log(multipleSelection.value.length)
 	// const Selection_ids=ref('')
@@ -5749,7 +5764,32 @@ if(selected.value==='难度调整系数'){
 	  	  type: 'error',
 	  	  message: '失败'
 	  	})
- }
+	  }
+ }else if(selected.value=== '废品率系数'){
+	  // const Selection_ids=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)
+	  // }
+	  console.log(uid.value)
+	  console.log(hesuanValue.废品率系数)
+	  const res = await RejectionEdit({id:Selection_ids.value,rejection:hesuanValue.废品率系数 })
+	  console.log(res)
+	  if(res.code===0){
+	  	ElMessage({
+	  	  type: 'success',
+	  	  message: '成功'
+	  	})
+	  	hesuanVisible.value=false
+		FacilitychanLiang()
+	  }else{
+	  	ElMessage({
+	  	  type: 'error',
+	  	  message: '失败'
+	  	})
+	  }
  }
  }