退料单

src/views/material/back/component/dialogFormByCq.vue

@@ -6,17 +6,17 @@
     :title="dialogTitle"
     :visible.sync="dialogShowFlag"
     append-to-body
-    width="800px"
+    width="1000px"
   >
-    <div id="printcontent" style="height: 500px;overflow-y: scroll;padding: 0 20px;">
+    <div id="printcontent" style="height: 600px;overflow-y: scroll;padding: 0 20px;">
       <vue-easy-print tableShow ref="printRef">
         <div class="order_box">
           <div class="order_box_one">
             <div>
-              <span>工程名称：</span><span>{{ rowObj.lotName }}</span>
+              <span>工程名称：</span><span>{{ rowObj.proName }}</span>
             </div>
             <div>
-              <span>退料时间：</span><span>{{ rowObj.backTime }}</span>
+              <span>退料时间：</span><span>{{ rowObj.createTime }}</span>
             </div>
           </div>
           <div class="order_box_one">
@@ -24,14 +24,19 @@
               <span>退料单位：</span><span>{{ rowObj.unitName }}</span>
             </div>
             <div>
-              <span>编号：</span><span>{{ rowObj.code }}</span>
+              <span>单号：</span><span>{{ rowObj.code }}</span>
             </div>
           </div>
         </div>
         <el-table :data="tableData" border style="width: 100%;margin-bottom: 10px;padding: 2px;">
           <el-table-column label="编号" align="center" type="index" />
+          <el-table-column label="物资类型"
+            align="center"
+            prop=""
+            :show-overflow-tooltip="true"
+          />
           <el-table-column
-            label="类型名称"
+            label="物资名称"
             align="center"
             prop="typeName"
             :show-overflow-tooltip="true"
@@ -39,7 +44,13 @@
           <el-table-column
             label="规格型号"
             align="center"
-            prop="typeCode"
+            prop="typeModel"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="计量单位"
+            align="center"
+            prop="unitName"
             :show-overflow-tooltip="true"
           />
           <el-table-column
@@ -50,6 +61,18 @@
             prop="num"
           >
           </el-table-column>
+          <el-table-column
+            label="编号"
+            align="center"
+            class-name="small-padding fixed-width"
+            width="200"
+            prop="num"
+          >
+          <template slot-scope="scope">
+              <span v-if="scope.row.manageType==1">无编码</span>
+              <span v-if="scope.row.manageType==0" style="color: rgb(2, 167, 240);" @click="checkDetail(scope.row)">查看明细</span>
+            </template>
+          </el-table-column>
           <!-- <el-table-column prop="remarks" label="备注" align="center">
             <template slot-scope="scope">
               <span
@@ -61,8 +84,8 @@
           </el-table-column> -->
         </el-table>
         <div class="order_footer">
-          <div>审核：</div>
+          <div>审核人：</div>
-          <div>退料：</div>
+          <div>退料人：</div>
           <div>操作人：</div>
         </div>
       </vue-easy-print>
@@ -70,21 +93,21 @@
         <el-button type="primary" @click="print">打印</el-button>
       </div>
     </div>
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
       <div style="height: 500px;overflow-y: scroll;padding: 0 20px;">
       <vue-easy-print tableShow ref="remarksPrintRef">
         <div class="remarks_box">
           <div class="remarks_box_title">退料编码明细</div>
         </div>
-        <el-table :data="tableData" border style="width: 100%;margin-bottom: 10px;padding: 2px;">
+        <el-table :data="tableSubData" border style="width: 100%;margin-bottom: 10px;padding: 2px;">
           <el-table-column label="序号" align="center" type="index" />
-          <el-table-column prop="name" label="名称" align="center">
+          <el-table-column prop="" label="物资类型" align="center">
           </el-table-column>
-          <el-table-column prop="type" label="规格型号" align="center">
+          <el-table-column prop="materialName" label="物资名称" align="center">
           </el-table-column>
-          <el-table-column prop="unit" label="单位" align="center">
+          <el-table-column prop="typeName" label="规格型号" align="center">
           </el-table-column>
-          <el-table-column prop="number" label="数量" align="center">
+          <el-table-column prop="maCode" label="设备编号" align="center">
           </el-table-column>
         </el-table>
       </vue-easy-print>
@@ -96,10 +119,13 @@
   </el-dialog>
 </template>
 <script>
-// import vueEasyPrint from 'vue-easy-print';
+import vueEasyPrint from 'vue-easy-print';
-// import { materialReturnNoteByApply } from "@/api/claimAndRefund/return.js"
+import { 
+    getBackApplyInfo, 
+} from '@/api/back/index.js' 
+// import { getViewByApply,materialReturnNoteByApply } from "@/api/claimAndRefund/return.js"
 export default {
-  // components: { vueEasyPrint, },
+  components: { vueEasyPrint },
   props: {
     // 弹窗是否显示
     isShowFlag: {
@@ -142,19 +168,21 @@ export default {
     return {
       fullscreenLoading: false,
       tableData: [],
+      tableSubData: [],
       open: false,
       title: ""
     };
   },
   methods: {
     init() {
-      let params = {
+      // let params = {
-        id: this.rowObj.id,
+      //   id: this.rowObj.id, 
-        agreementId: this.rowObj.agreementId,
+      // }
-      }
+      console.log(this.rowObj)
-      // materialReturnNoteByApply(params).then(res => {
+      getBackApplyInfo(this.rowObj.id).then(res => {
-      //   this.tableData = res.data
+        console.log(res)
-      // })
+        this.tableData = res.data.backApplyDetailsList
+      })
     },
     // 取消按钮
     cancel() {
@@ -163,8 +191,9 @@ export default {
     print() {
       this.$refs.printRef.print();
     },
-    remarksClick() {
+    checkDetail(row) {
       this.title = '查看'
+      this.tableSubData = row.maCodeList
       this.open = true
     },
     remarksPrint() {

src/views/material/back/component/home.vue

@@ -319,12 +319,12 @@
         />
  
         <!-- 退料单 -->
-        <!-- <dialogFormByCq
+        <dialogFormByCq
             :dialogTitle="title"
             :isShowFlag.sync="isShowOneFlag"
             :priKey="priKey"
             :rowObj="rowObj"
-        ></dialogFormByCq> -->
+        ></dialogFormByCq>
         <!-- 提交 -->
         <el-dialog
             v-loading.fullscreen.lock="fullscreenLoading"
@@ -390,12 +390,12 @@ import {
 //     getAgreementInfoById,
 //     // getUseNumByTypeId
 // } from '@/api/claimAndRefund/receive.js'
-// import dialogFormByCq from '@/views/claimAndRefund/return/dialogFormByCq.vue'
+import dialogFormByCq from '@/views/material/back/component/dialogFormByCq.vue'
  
 export default {
     name: '',
     dicts: ['back_task_status'],
-    // components: { dialogFormByCq },
+    components: { dialogFormByCq },
     data() {
         return {
             fullscreenLoading: false,