zck 1 жил өмнө
parent
commit
47363ac7ae

+ 8 - 5
src/view/performance/12-orderAccounting/index.vue

@@ -6,7 +6,7 @@
           <!--按钮部分-->
           <el-form ref="elSearchFormRef" inline class="demo-form-inline" @submit.native.prevent>
             <el-form-item>
-              <el-input v-model="searchInfo" placeholder="搜索工单编号 " clearable  style="width: 180px"/>
+              <el-input v-model="searchInfo" placeholder="搜索工单编号或产品名称 " clearable  style="width: 180px"/>
               <el-button type="primary" icon="search" class="search"  @click="handleSearch"/>
               <el-button type="primary"icon="edit"class="bt"@click=" () => { dialogDetail = true; } "><i class="el-icon-edit" />查改</el-button>
               <!--<el-button type="primary" disabled icon="edit" @click="" style="margin-left: 10px">工艺方案复制</el-button>-->
@@ -28,7 +28,7 @@
 
               <el-button type="primary" icon="edit" class="bt" @click="exportExcel">导出Excel</el-button>
 
-              <el-button type="primary" icon="edit" class="bt" @click="ygdy">超损员工打印</el-button>
+              <el-button type="primary" icon="edit" class="bt" @click="ygdy">超损员工打印</el-button>
             </el-form-item>
           </el-form>
 
@@ -62,7 +62,7 @@
 
             <!-- 工序产量核查 -->
             <Gxclhc v-if="dialogGxclhc"  v-model="dialogGxclhc"
-              :gdbh="gdbh"
+              :gdbh="gdbh" :jjcp_yjno = "jjcp_yjno"
             />
 
             <!-- 工单质检废品统计 -->
@@ -314,7 +314,7 @@ getSideData()
 
 // 表格数据
 const tableCols1 = [
-  { label: '超损工单', prop: 'csgd', width: '110' ,sortable:'sortable'},
+  // { label: '超损工单', prop: 'csgd', width: '110' ,sortable:'sortable'},
   { label: '工单编号', prop: 'Gd_gdbh', width: '110',sortable:'sortable',fixed:'fixed',align:'left'},
   { label: '印件号', prop: 'jjcp_yjno', width: '95' ,sortable:'sortable'},
   { label: '联数', prop: 'yj_ls', width: '80' ,sortable:'sortable'},
@@ -335,7 +335,7 @@ const tableCols1 = [
   { label: '处发废', prop: '外发废', width: '120',sortable:'sortable' },
   { label: '外摊废', prop: '分摊废', width: '120' ,sortable:'sortable'},
   { label: '工单计划损耗', prop: '工单计划损耗', width: '140',sortable:'sortable' },
-  { label: '工单制程废', prop: '', width: '120',sortable:'sortable' },
+  { label: '工单制程废', prop: 'zcfp', width: '120',sortable:'sortable' },
   { label: '工单检验废', prop: '工单质检废', width: '120',sortable:'sortable' },
   { label: '年月', prop: 'date', width: '120' ,sortable:'sortable'},
 ]
@@ -357,6 +357,7 @@ const tableData1 = ref([])
 const tableData2 = ref([])
 const currentRow = ref({})
 const gdbh = ref('')
+const jjcp_yjno = ref('')
 const date = ref('')
 const yjno = ref ('')
 const searchInfo = ref('')
@@ -365,6 +366,7 @@ watch(currentRow, (value, oldValue, onCleanup) => {
   gdbh.value = value?.['Gd_gdbh']
   date.value = value?.['date']
   yjno.value = value?.['yj_Yjno']
+  jjcp_yjno.value = value?.['jjcp_yjno']
   pd_lcdformData['gdbh'] = value?.['Gd_gdbh']
 })
 
@@ -393,6 +395,7 @@ const handleNodeClick = async(node) => {
 
 // 显示下方表格
 const showOrderSuperLossGy = async() => {
+  // jjcp_yjno.value  =  currentRow.value['jjcp_yjno']
   const { Gd_gdbh: order } = currentRow.value
   const res = await getOrderSuperLossGy({ order })
   if (res.code === 0) {