优化

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

@@ -21,7 +21,16 @@
           placeholder="Enter回车"
         />
       </el-form-item>
-
+      <el-form-item
+        label="印件号"
+      >
+        <el-input
+          v-model="yjno"
+          style="width: 120px;"
+          @keyup.enter="handleShowDetail"
+          placeholder="Enter回车"
+        />
+      </el-form-item>
       <el-table
         :data="detailData"
         border
@@ -140,11 +149,17 @@ const props = defineProps({
     type: String,
     default: '',
   },
+  yjno: {
+    type: Number,
+    default: '',
+  },
 })
 const emits = defineEmits(['destroy'])
 const detailData = ref([])
 const input = ref(props['gdbh'])
-
+const yjno = ref(props['yjno'])
+console.log(yjno)
+console.log(122)
 const handleShowDetail = async() => {
   if (!input.value) {
     ElMessage({
@@ -153,7 +168,8 @@ const handleShowDetail = async() => {
     })
     return
   }
-  const res = await getOrderGy({ order: input.value })
+
+  const res = await getOrderGy({ order: input.value ,yjno:yjno.value})
   if (res['code'] === 0) {
     const { data } = res
     detailData.value = data.map(item => ({

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

@@ -1,24 +1,11 @@
 <template>
-  <el-dialog
-    :model-value="modelValue"
-    title="工序产量核查"
-    fullscreen
-    :before-close="()=>{emits('update:modelValue', false )}"
-  >
-    <el-button
-      type="primary"
-      style="width:80px; height: 40px;margin-bottom: 20px"
-      @click="emits('update:modelValue', false )"
-    >退出</el-button>
+  <el-dialog :model-value="modelValue" title="工序产量核查" fullscreen :before-close="()=>{emits('update:modelValue', false )}" >
+    <el-button type="primary" style="width:80px; height: 40px;margin-bottom: 20px" @click="emits('update:modelValue', false )">退出</el-button>
 
     <el-form inline>
       <el-form-item label="工单编号">
-        <el-input
-          v-model="input"
-          style="width: 100px"
-          @keyup.enter="handleGetTable"
-          placeholder="Enter回车"
-        />
+        <el-input v-model="input" style="width: 100px" @keyup.enter="handleGetTable"  placeholder="Enter回车" />
+        <el-input v-model="jjcp_yjno" style="width: 100px" @keyup.enter="handleGetTable"  placeholder="Enter回车" />
         <el-input
           v-model="cpmc"
           class="cpmc"
@@ -59,7 +46,7 @@
         <el-table-column
           label="折算车头产量"
           width="120"
-          prop=""
+          prop="折算车头产量"
         />
 
         <el-table-column
@@ -70,7 +57,7 @@
         <el-table-column
           label="制程废品"
           width="120"
-          prop=""
+          prop="sczl_zcfp"
         />
         <el-table-column
           label="制程废品率"
@@ -138,18 +125,23 @@ const getGxMc = (params) => {
 <script setup>
 import { watch, ref, reactive, defineProps, defineEmits, onBeforeUnmount } from 'vue'
 
-const props = defineProps(['modelValue', 'gdbh'])
+const props = defineProps(['modelValue', 'gdbh','jjcp_yjno'])
+console.log(props)
 const emits = defineEmits(['update:modelValue'])
 const input = ref(props.gdbh)
+const jjcp_yjno = ref(props.jjcp_yjno)
 const cpmc = ref('')
 const tableData = ref([])
 const handleGetTable = async() => {
+  console.log(jjcp_yjno.value)
+  console.log(input.value)
   const ret = await getGxMc({ gdbh: input.value })
   if (ret['code'] === 0) {
     cpmc.value = ret['data'][0]['Gd_cpmc']
-    console.log(ret['data'])
+    // console.log(ret['data'])
   }
-  const res = await getOrderProcessCount({ order: input.value })
+  const res = await getOrderProcessCount({ order: input.value,yjno:jjcp_yjno.value })
+  console.log(res)
   if (res['code'] === 0) {
     const { data } = res
     tableData.value = data.map(item => ({

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

@@ -45,6 +45,7 @@
               </el-button>
             </el-form-item>
 			
+<<<<<<< HEAD
 			<el-form-item label="印件名称">
 			  <el-input
 			    v-model="form.jjcp_yjno"
@@ -52,8 +53,17 @@
 			    style="width: 100px;"
 			  />
 			</el-form-item>
+=======
+            
+            <el-form-item label="印件号">
+              <el-input
+                v-model="form.jjcp_yjno"
+                style="width: 100px;"
+              />
+            </el-form-item>
+>>>>>>> 3b060240315e393ba2d346996eac75d0c12f60f4
 
-            <el-form-item label="印件名称">
+            <el-form-item label="印件号">
               <el-input
                 v-model="form.yjmc"
                 readonly
@@ -167,9 +177,15 @@ const handleExcel = () => {
 }
 
 const handleSearch = async() => {
+
   const order = form.value['gdbh']
+<<<<<<< HEAD
   const jjcp_yjno = props.jjcp_yjno;
   const res = await getWasteDistribution({ order,jjcp_yjno })
+=======
+  const yjno = form.value['jjcp_yjno']
+  const res = await getWasteDistribution({ order,yjno })
+>>>>>>> 3b060240315e393ba2d346996eac75d0c12f60f4
   if (res['code'] === 0) {
     console.log(res['data'])
     form.value = {

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

@@ -5,17 +5,8 @@
     fullscreen
     :before-close="()=>{emits('update:modelValue', false )}"
   >
-    <el-button
-      type="primary"
-      disabled
-      style="width:80px; height: 40px;margin-bottom: 20px"
-      @click=""
-    >更新</el-button>
-    <el-button
-      type="primary"
-      style="width:80px; height: 40px;margin-bottom: 20px"
-      @click="emits('update:modelValue', false )"
-    >退出</el-button>
+    <el-button  type="primary" style="width:80px; height: 40px;margin-bottom: 20px" @click="renew">更新</el-button>
+    <el-button type="primary" style="width:80px; height: 40px;margin-bottom: 20px" @click="emits('update:modelValue', false )">退出</el-button>
 
     <el-form
       inline
@@ -31,6 +22,15 @@
         />
       </el-form-item>
 
+      <el-form-item label="印件号">
+        <el-input
+          v-model="yjno"
+          autocomplete="off"
+          style="width: 100px"
+          @keyup.enter="handleGetTable"
+          placeholder="Enter回车"
+        />
+      </el-form-item>
       <el-table
         :data="tableData"
         border
@@ -114,19 +114,52 @@ export const getOrderYj = (params) => {
     params
   })
 }
+export const updateOrderYj = (params) => {
+  return service({
+    url: '/mes_server/order_super_loss/updateOrderYj',
+    method: 'get',
+    params
+  })
+}
 
 </script>
 
 <script setup>
 import { watch, ref, reactive, defineProps, defineEmits, onBeforeUnmount, onMounted } from 'vue'
-
-const props = defineProps(['modelValue', 'gdbh'])
+import { ElMessage, ElMessageBox } from 'element-plus'
+const props = defineProps(['modelValue', 'gdbh','yjno'])
 const emits = defineEmits(['update:modelValue'])
 const input = ref(props.gdbh)
+const yjno =ref(props.yjno)
 const tableData = ref([])
+// const modelValue =ref(true)
+
+//更新
+const renew = async() => {
+  let params = {};
+  params.order = tableData.value['0']['Yj_gdbh']
+  params.yj_yjno = tableData.value['0']['yj_Yjno']
+  params.examine = tableData.value['0']['新考核设置']
+  console.log(params)
+    const res = await updateOrderYj(params);
+    if (res['code'] === 0) {
+    ElMessage({type: 'success',message: '更新成功'})
+    emits('update:modelValue', false )
+  } else {
+    ElMessage({type: 'error',message: '更新失败'})
+  }
+  console.log(res)  
+
+
+  
+}
+
+
+
+
 const handleGetTable = async() => {
   if (!input.value) return
-  const res = await getOrderYj({ order: input.value })
+  const res = await getOrderYj({ order: input.value ,yjno:yjno.value})
   if (res['code'] === 0) {
     const { data } = res
     data['当前考核设置'] = data['质量考核'] === 0 ? '参与' : '剔除'
@@ -136,6 +169,7 @@ const handleGetTable = async() => {
     tableData.value = arr
   }
 }
+//
 
 // 进入后自动搜索
 onMounted(() => {

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

@@ -12,7 +12,7 @@
               <!--<el-button type="primary" disabled icon="edit" @click="" style="margin-left: 10px">工艺方案复制</el-button>-->
               <el-button type="primary" icon="edit" class="bt" @click=" () => { dialogGdcjstj = true; }">工单超节损统计</el-button>
 
-              <el-button type="primary" icon="edit" class="bt"@click=" () => { dialogKhsz = true; }">考核设置</el-button>
+              <el-button type="primary" icon="edit" class="bt" @click=" () => { dialogKhsz = true}">考核设置</el-button>
 
               <el-button type="primary" icon="edit" class="bt"@click=" () => { dialogXzgdtl = true; }">修正工单投料</el-button>
 
@@ -35,7 +35,9 @@
           <!-- 弹窗 -->
           <div>
             <!-- 查改 -->
-            <Detail v-if="dialogDetail" :is-show="dialogDetail" :gdbh="gdbh"@destroy="() => {dialogDetail = false;}"/>
+            <Detail v-if="dialogDetail" :is-show="dialogDetail" :gdbh="gdbh"
+            :yjno="yjno"
+            @destroy="() => {dialogDetail = false;}"/>
 
             <!-- 工单超节损统计 -->
             <el-dialog v-model="dialogGdcjstj"  title="工单超节损统计" destroy-on-close >
@@ -55,7 +57,7 @@
             </el-dialog>
 
             <!-- 修正工单印件质量考核设置 -->
-            <Khsz v-if="dialogKhsz" v-model="dialogKhsz" :gdbh="gdbh" />
+            <Khsz v-if="dialogKhsz" v-model="dialogKhsz" :gdbh="gdbh" :yjno="yjno" />
 
             <!-- 修正工单投料 -->
             <Xzgdtl v-if="dialogXzgdtl" v-model="dialogXzgdtl" @update-data = "exitXzgdtl" :gdbh="gdbh" :yjno="yjno"/>
@@ -262,9 +264,9 @@ import {
   EmployeeDataCollect,
   getTable,
 } from '@/api/mes_api_gty/orderAccounting'
+import Khsz from '@/view/performance/12-orderAccounting/componets/khsz.vue'
 import {hiprint} from "vue-plugin-hiprint";
 import Gdcjstj from '@/view/performance/12-orderAccounting/componets/gdcjstj.vue'
-import Khsz from '@/view/performance/12-orderAccounting/componets/khsz.vue'
 import Xzgdtl from '@/view/performance/12-orderAccounting/componets/xzgdtl.vue'
 import Gxclhc from '@/view/performance/12-orderAccounting/componets/gxclhc.vue'
 import Gongdanzhijianfeipintongji from '@/view/performance/09-workOrderVerification/componets/gongdanzhijianfeipintongji.vue'
@@ -396,9 +398,11 @@ const handleNodeClick = async(node) => {
 
 // 显示下方表格
 const showOrderSuperLossGy = async() => {
-  // jjcp_yjno.value  =  currentRow.value['jjcp_yjno']
+  jjcp_yjno.value  =  currentRow.value['jjcp_yjno']
   const { Gd_gdbh: order } = currentRow.value
-  const res = await getOrderSuperLossGy({ order })
+  const yjno = jjcp_yjno.value
+  console.log(yjno)
+  const res = await getOrderSuperLossGy({ order,yjno })
   if (res.code === 0) {
     const { data } = res
     tableData2.value = data.map((item) => ({