fix:修改

sgzb-ui/src/views/claimAndRefund/return/dialogFormExame.vue

@@ -13,18 +13,22 @@
         <div class="order_box">
           <div class="order_box_one">
             <div>
-              <span>工程名称：</span><span>{{ rowObj.lotName }}</span>
+              <span>工程名称：</span>
+              <span>{{ rowObj.lotName }}</span>
             </div>
             <div>
-              <span>退料时间：</span><span>{{ rowObj.backTime }}</span>
+              <span>退料时间：</span>
+              <span>{{ rowObj.backTime }}</span>
             </div>
           </div>
           <div class="order_box_one">
             <div>
-              <span>退料单位：</span><span>{{ rowObj.unitName }}</span>
+              <span>退料单位：</span>
+              <span>{{ rowObj.unitName }}</span>
             </div>
             <div>
-              <span>编号：</span><span>{{ rowObj.code }}</span>
+              <span>编号：</span>
+              <span>{{ rowObj.code }}</span>
             </div>
           </div>
         </div>
@@ -36,6 +40,40 @@
             prop="typeName"
             :show-overflow-tooltip="true"
           />
+          <el-table-column type="expand">
+            <template slot-scope="scope">
+              <div class="nested-table-container">
+                <el-table :data="scope.row.maTypeDetails" style="width: 100%">
+                  <!-- 子表格的列 -->
+                  <el-table-column label="序号" align="center" type="index" />
+                  <el-table-column
+                    label="类型名称"
+                    align="center"
+                    prop="typeName"
+                    :show-overflow-tooltip="true"
+                  />
+                  <el-table-column
+                    label="规格型号"
+                    align="center"
+                    prop="typeModelName"
+                    :show-overflow-tooltip="true"
+                  />
+                  <el-table-column
+                    label="单位"
+                    align="center"
+                    prop="unitName"
+                    :show-overflow-tooltip="true"
+                  />
+                  <el-table-column
+                    label="预领数量"
+                    align="center"
+                    prop="partNum"
+                    :show-overflow-tooltip="true"
+                  />
+                </el-table>
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column
             label="规格型号"
             align="center"
@@ -48,8 +86,7 @@
             class-name="small-padding fixed-width"
             width="200"
             prop="num"
-          >
+          ></el-table-column>
-          </el-table-column>
           <!-- <el-table-column prop="remarks" label="备注" align="center">
             <template slot-scope="scope">
               <span
@@ -58,7 +95,7 @@
                 >{{ scope.row.remarks }}</span
               >
             </template>
-          </el-table-column> -->
+          </el-table-column>-->
         </el-table>
         <div class="order_footer">
           <div>审核：</div>
@@ -72,22 +109,18 @@
     </div>
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <div style="height: 500px;overflow-y: scroll;padding: 0 20px;">
-      <vue-easy-print tableShow ref="remarksPrintRef">
+        <vue-easy-print tableShow ref="remarksPrintRef">
-        <div class="remarks_box">
+          <div class="remarks_box">
-          <div class="remarks_box_title">退料编码明细</div>
+            <div class="remarks_box_title">退料编码明细</div>
-        </div>
+          </div>
-        <el-table :data="tableData" border style="width: 100%;margin-bottom: 10px;padding: 2px;">
+          <el-table :data="tableData" border style="width: 100%;margin-bottom: 10px;padding: 2px;">
-          <el-table-column label="序号" align="center" prop="dictId" />
+            <el-table-column label="序号" align="center" prop="dictId" />
-          <el-table-column prop="name" label="名称" align="center">
+            <el-table-column prop="name" label="名称" align="center"></el-table-column>
-          </el-table-column>
+            <el-table-column prop="type" label="规格型号" align="center"></el-table-column>
-          <el-table-column prop="type" label="规格型号" align="center">
+            <el-table-column prop="unit" label="单位" align="center"></el-table-column>
-          </el-table-column>
+            <el-table-column prop="number" label="数量" align="center"></el-table-column>
-          <el-table-column prop="unit" label="单位" align="center">
+          </el-table>
-          </el-table-column>
+        </vue-easy-print>
-          <el-table-column prop="number" label="数量" align="center">
-          </el-table-column>
-        </el-table>
-      </vue-easy-print>
       </div>
       <div style="margin-top: 10px">
         <el-button type="primary" @click="remarksPrint">打印1</el-button>
@@ -96,62 +129,62 @@
   </el-dialog>
 </template>
 <script>
-import vueEasyPrint from 'vue-easy-print';
+import vueEasyPrint from 'vue-easy-print'
-import { getViewByApply,materialReturnNoteByExamine } from "@/api/claimAndRefund/return.js"
+import { getViewByApply, materialReturnNoteByExamine } from '@/api/claimAndRefund/return.js'
 export default {
-  components: { vueEasyPrint, },
+  components: { vueEasyPrint },
   props: {
     // 弹窗是否显示
     isShowFlag: {
       type: Boolean,
-      default: false
+      default: false,
     },
     // 对应操作数据键值
     priKey: {
       type: [String, Number],
-      default: ""
+      default: '',
     },
     //弹窗标题
     dialogTitle: {
       type: String,
-      default: ""
+      default: '',
     },
     rowObj: {
       type: Object,
-      default: {}
+      default: {},
-    }
+    },
   },
   watch: {
     isShowFlag(val) {
       if (val) {
-        this.init();
+        this.init()
       }
-    }
+    },
   },
   computed: {
     dialogShowFlag: {
       get() {
-        return this.isShowFlag;
+        return this.isShowFlag
       },
       set(v) {
-        this.$emit("update:isShowFlag", v);
+        this.$emit('update:isShowFlag', v)
-      }
+      },
-    }
+    },
   },
   data() {
     return {
       fullscreenLoading: false,
       tableData: [],
       open: false,
-      title: ""
+      title: '',
-    };
+    }
   },
   methods: {
     init() {
       let params = {
         taskId: this.rowObj.taskId,
         agreementId: this.rowObj.agreementId,
-        badId:this.rowObj.badId,
+        badId: this.rowObj.badId,
       }
       materialReturnNoteByExamine(params).then(res => {
         this.tableData = res.data
@@ -159,18 +192,18 @@ export default {
     },
     // 取消按钮
     cancel() {
-      this.dialogShowFlag = false;
+      this.dialogShowFlag = false
     },
     print() {
-      this.$refs.printRef.print();
+      this.$refs.printRef.print()
     },
     remarksClick() {
       this.title = '查看'
       this.open = true
     },
     remarksPrint() {
-      this.$refs.remarksPrintRef.print();
+      this.$refs.remarksPrintRef.print()
-    }
+    },
 
     // submit() {
     //   this.$refs["dynamicValidateForm"].validate(valid => {
@@ -183,8 +216,8 @@ export default {
     //     }
     //   });
     // }
-  }
+  },
-};
+}
 </script>
 <style lang="scss" scoped>
 .order_box {