liuhairui 1 year ago
parent
commit
a254a4899d

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

@@ -1,27 +1,10 @@
 <template>
-  <el-dialog
-    :model-value="modelValue"
-    :title="`修正工单实际投料(${props?.['date']})`"
-    fullscreen
-    :before-close="()=>{emits('update:modelValue', false )}"
-  >
-    <el-button
-      type="primary"
-      style="width:80px; height: 40px;margin-bottom: 20px"
-      @click="handleUpdate"
-    >更新</el-button>
-
-    <el-button
-      type="primary"
-      style="width:80px; height: 40px;margin-bottom: 20px"
-      @click="handleSearch"
-    >定位</el-button>
-
-    <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="`修正工单实际投料(${props?.['date']})`" fullscreen :before-close="()=>{emits('update:modelValue', false )}">
+    <el-button type="primary" style="width:80px; height: 40px;margin-bottom: 20px" @click="handleUpdate" >更新</el-button>
+
+    <el-button type="primary" style="width:80px; height: 40px;margin-bottom: 20px" @click="handleSearch" >定位</el-button>
+
+    <el-button type="primary" style="width:80px; height: 40px;margin-bottom: 20px" @click="emits('update:modelValue', false )">退出</el-button>
 
     <el-table
       ref="table"
@@ -34,27 +17,11 @@
       :header-row-style="{ height: '20px' }"
       :header-cell-style="{ padding: '0px' }"
       style="width: 100%;height: 75vh;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column
-        type="selection"
-        width="55"
-      />
-      <el-table-column
-        label="工单编号"
-        prop="Gd_gdbh"
-        width="100"
-      />
-      <el-table-column
-        label="印件号"
-        prop="yj_Yjno"
-        width="100"
-      />
-      <el-table-column
-        label="印件代号"
-        prop="yj_yjdh"
-        width="100"
-      />
+      @selection-change="handleSelectionChange">
+      <el-table-columntype="selection" width="55"/>
+      <el-table-column label="工单编号" prop="Gd_gdbh"  width="100"/>
+      <el-table-columnlabel="印件号" prop="yj_Yjno" width="100"/>
+      <el-table-column label="印件代号" prop="yj_yjdh" width="100" />
       <el-table-column
         label="开数*联数"
         prop="yj_ls"
@@ -158,6 +125,7 @@ const getTable = async() => {
   let params
   if (props?.['date']) {
     const { date } = props
+	console.log(date)
     params = {
       year: date.slice(0, 4),
       month: date.slice(4, 6),

+ 23 - 103
src/view/performance/12-orderAccounting/index.vue

@@ -59,29 +59,9 @@
               >考核设置
               </el-button>
 
-              <el-button
-                type="primary"
-                icon="edit"
-                class="bt"
-                @click="
-                  () => {
-                    dialogXzgdtl = true;
-                  }
-                "
-              >修正工单投料
-              </el-button>
+              <el-button type="primary" icon="edit" class="bt" @click="() => {dialogXzgdtl = true;}">修正工单投料</el-button>
 
-              <el-button
-                type="primary"
-                icon="edit"
-                class="bt"
-                @click="
-                  () => {
-                    dialogGxclhc = true;
-                  }
-                "
-              >工序产量核查
-              </el-button>
+              <el-button type="primary" icon="edit" class="bt"  @click=" () => { dialogGxclhc = true;}">工序产量核查 </el-button>
 
               <el-button
                 type="primary"
@@ -163,90 +143,37 @@
             </el-dialog>
 
             <!-- 修正工单印件质量考核设置 -->
-            <Khsz
-              v-if="dialogKhsz"
-              v-model="dialogKhsz"
-              :gdbh="gdbh"
-            />
+            <Khsz v-if="dialogKhsz" v-model="dialogKhsz" :gdbh="gdbh" />
 
             <!-- 修正工单投料 -->
-            <Xzgdtl
-              v-if="dialogXzgdtl"
-              v-model="dialogXzgdtl"
-              :date="date"
-            />
+            <Xzgdtl v-if="dialogXzgdtl" v-model="dialogXzgdtl" :date="date" />
 
             <!-- 工序产量核查 -->
-            <Gxclhc
-              v-if="dialogGxclhc"
-              v-model="dialogGxclhc"
-              :gdbh="gdbh"
-            />
+            <Gxclhc v-if="dialogGxclhc" v-model="dialogGxclhc" :gdbh="gdbh" />
 
             <!-- 工单质检废品统计 -->
-            <Gongdanzhijianfeipintongji
-              v-if="dialogGdzjfptj"
-              v-model="dialogGdzjfptj"
-              :val="gdbh"
-            />
+            <Gongdanzhijianfeipintongji v-if="dialogGdzjfptj" v-model="dialogGdzjfptj" :val="gdbh" />
 
             <!-- 核检废品分布 -->
-            <Hjfpfb
-              v-if="dialogHjfpfb"
-              v-model="dialogHjfpfb"
-              :val="gdbh"
-            />
+            <Hjfpfb v-if="dialogHjfpfb" v-model="dialogHjfpfb" :val="gdbh" />
 
             <!-- 工单打印 -->
             <PrintPage ref="printPageRef" />
 
             <!--流程单查询【弹窗】-->
-            <el-dialog
-              v-model="pd_lcdlist"
-              title="工单工序生产进程"
-              fullscreen
-            >
+            <el-dialog v-model="pd_lcdlist" title="工单工序生产进程" fullscreen >
               <div style="width: 100%; height: 100%">
-                <el-button
-                  type=""
-                  @click="
-                    () => {
-                      pd_lcdlist = false;
-                    }
-                  "
-                >退出</el-button>
+                <el-button type=""  @click=" () => { pd_lcdlist = false; } " >退出</el-button>
               </div>
               <div
-                style="
-                  width: 100%;
-                  height: 100%;
-                  display: flex;
-                  align-items: center;
-                "
-              >
-                <el-form-item
-                  label="工单编号"
-                  style="margin-right: 20px; padding: 0"
-                >
-                  <el-input
-                    v-model="pd_lcdformData['gdbh']"
-                    @keyup.enter="pd_lcdProductValue"
-                    placeholder="Enter回车"
-                  />
+                style=" width: 100%; height: 100%; display: flex; align-items: center; " >
+                <el-form-item label="工单编号" style="margin-right: 20px; padding: 0" >
+                  <el-input v-model="pd_lcdformData['gdbh']" @keyup.enter="pd_lcdProductValue"  placeholder="Enter回车" />
                 </el-form-item>
-                <el-form-item
-                  label=""
-                  style="margin-right: 5px; padding: 0"
-                >
-                  <el-input
-                    v-model="pd_lcdformData['code']"
-                    disabled
-                  />
+                <el-form-item label="" style="margin-right: 5px; padding: 0" >
+                  <el-input v-model="pd_lcdformData['code']" disabled />
                 </el-form-item>
-                <el-form-item
-                  label=""
-                  style="margin-right: 5px; padding: 0"
-                >
+                <el-form-item label="" style="margin-right: 5px; padding: 0" >
                   <el-input
                     v-model="pd_lcdformData['name']"
                     disabled
@@ -296,21 +223,10 @@
 
       <layout>
         <!--    左侧树侧形结构-->
-        <layout-sider
-          :resize-directions="['right']"
-          :width="190"
-          style="margin-right: 10px"
-        >
-          <div
-            class="JKWTree-tree"
-            style="height: 70vh"
-          >
+        <layout-sider  :resize-directions="['right']" :width="190" style="margin-right: 10px" >
+          <div class="JKWTree-tree" style="height: 70vh">
             <h3>工单超节损核算</h3>
-            <el-tree
-              :data="treeData"
-              highlight-current
-              @node-click="handleNodeClick"
-            />
+            <el-tree  :data="treeData" highlight-current @node-click="handleNodeClick" />
           </div>
         </layout-sider>
 
@@ -526,6 +442,7 @@ watch(currentRow, (value, oldValue, onCleanup) => {
 
 // 显示上方表格
 const handleNodeClick = async(node) => {
+	console.log("显示上方表格")
   console.log(node)
   if (!node.children) {
     const { date, code } = node
@@ -545,7 +462,10 @@ const handleNodeClick = async(node) => {
 }
 
 // 显示下方表格
-const showOrderSuperLossGy = async() => {
+const showOrderSuperLossGy = async(row) => {
+	console.log(row['Gd_gdbh'])
+	console.log(row['yj_Yjno'])
+	
   const { Gd_gdbh: order } = currentRow.value
   const res = await getOrderSuperLossGy({ order })
   if (res.code === 0) {