feat:领料管理添加子数据展示

sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue

@@ -6,7 +6,14 @@
     </el-row>
     <el-row :gutter="24" class="mb8">
       <el-col :span="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+          v-show="showSearch"
+          label-width="100px"
+        >
           <el-form-item label="领料类型" prop="leaseTypeName">
             <el-input
               v-model="queryParams.leaseTypeName"
@@ -50,30 +57,92 @@
         </el-form>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button
+            <el-button type="success" plain icon="el-icon-back" size="mini" @click="handleBack">领料管理</el-button>
-              type="success"
-              plain
-              icon="el-icon-back"
-              size="mini"
-              @click="handleBack"
-            >领料管理</el-button>
           </el-col>
         </el-row>
       </el-col>
     </el-row>
     <el-row :gutter="24" class="mb8">
       <el-col :span="18">
-        <el-table v-loading="loading" :data="queryParams.leaseApplyDetails" @selection-change="handleSelectionChange">
+        <el-table
+          v-loading="loading"
+          :data="queryParams.leaseApplyDetails"
+          @selection-change="handleSelectionChange"
+        >
           <!--          <el-table-column type="selection" width="55" align="center" />-->
           <el-table-column label="序号" align="center" type="index" />
-          <el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
+          <el-table-column
-          <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
+            label="类型名称"
-          <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
+            align="center"
+            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"
+            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="num" :show-overflow-tooltip="true" />
           <el-table-column label="预领数量" align="center" prop="preNum" :show-overflow-tooltip="true" />
-          <el-table-column label="申请人" align="center" prop="applyFor" :show-overflow-tooltip="true" />
+          <el-table-column
-          <el-table-column label="申请时间" align="center" prop="updateTimes" :show-overflow-tooltip="true" />
+            label="申请人"
-          <el-table-column label="任务状态" align="center" prop="taskName" :show-overflow-tooltip="true" />
+            align="center"
+            prop="applyFor"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="申请时间"
+            align="center"
+            prop="updateTimes"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="任务状态"
+            align="center"
+            prop="taskName"
+            :show-overflow-tooltip="true"
+          />
           <!--      <el-table-column label="审批结果 " align="center" prop="dictName" :show-overflow-tooltip="true" />-->
           <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
           <!--          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
@@ -106,7 +175,14 @@
               <p class="time">申请时间：{{queryParams.updateTimes}}</p>
             </el-card>
           </el-timeline-item>
-          <el-timeline-item  v-for="(v,i) in flowPath" :type="v.type" :color="v.color" :icon="v.icon" :key="i" placement="top">
+          <el-timeline-item
+            v-for="(v,i) in flowPath"
+            :type="v.type"
+            :color="v.color"
+            :icon="v.icon"
+            :key="i"
+            placement="top"
+          >
             <el-card>
               <p class="title">{{v.name}}</p>
               <p class="author" v-if="queryParams[v.authorKey]">审核人：{{queryParams[v.authorKey]}}</p>
@@ -114,49 +190,102 @@
               <p class="remark" v-if="queryParams[v.remarkKey]">审核意见：{{ queryParams[v.remarkKey] }}</p>
             </el-card>
           </el-timeline-item>
-
         </el-timeline>
       </el-col>
     </el-row>
 
-
+    <div
-    <div slot="footer" class="dialog-footer" style="text-align: right;margin-right: 200px;" v-if="queryParams.taskStatus<33&&!this.isView">
+      slot="footer"
+      class="dialog-footer"
+      style="text-align: right;margin-right: 200px;"
+      v-if="queryParams.taskStatus<33&&!this.isView"
+    >
       <el-button type="primary" @click="agree">同意</el-button>
       <el-button @click="refuse">驳回</el-button>
     </div>
-    <div slot="footer" class="dialog-footer" style="text-align: right;margin-right: 200px;" v-if="queryParams.taskStatus==117&&!this.isView">
+    <div
+      slot="footer"
+      class="dialog-footer"
+      style="text-align: right;margin-right: 200px;"
+      v-if="queryParams.taskStatus==117&&!this.isView"
+    >
       <el-button type="primary" @click="confirm">确认</el-button>
     </div>
 
     <!-- 同意 -->
-    <el-dialog title="审核意见" :visible.sync="examineVisible" width="600px" :close-on-click-modal="false">
+    <el-dialog
-      <el-input placeholder="请输入审核意见" type="textarea" maxlength="200" :autosize="{ minRows: 4, maxRows: 6}" v-model="queryParams.companyAuditRemarks"></el-input>
+      title="审核意见"
+      :visible.sync="examineVisible"
+      width="600px"
+      :close-on-click-modal="false"
+    >
+      <el-input
+        placeholder="请输入审核意见"
+        type="textarea"
+        maxlength="200"
+        :autosize="{ minRows: 4, maxRows: 6}"
+        v-model="queryParams.companyAuditRemarks"
+      ></el-input>
       <div slot="footer" class="dialog-footer">
         <el-button @click="examineVisible=false">取 消</el-button>
-        <el-button type="primary" @click="subAuditLeaseByCompany(9)" v-if="queryParams.taskStatus==31" v-hasPermi="['receive:examine:fgs']">确 定</el-button>
+        <el-button
-        <el-button type="primary" @click="subAuditLeaseByCompany(1)" v-if="queryParams.taskStatus==32" v-hasPermi="['receive:examine:nbs']">确 定</el-button>
+          type="primary"
-        
+          @click="subAuditLeaseByCompany(9)"
+          v-if="queryParams.taskStatus==31"
+          v-hasPermi="['receive:examine:fgs']"
+        >确 定</el-button>
+        <el-button
+          type="primary"
+          @click="subAuditLeaseByCompany(1)"
+          v-if="queryParams.taskStatus==32"
+          v-hasPermi="['receive:examine:nbs']"
+        >确 定</el-button>
       </div>
     </el-dialog>
     <!-- 驳回 -->
-    <el-dialog title="审核意见" :visible.sync="refuseVisible" width="600px" :close-on-click-modal="false">
+    <el-dialog
-      <el-input placeholder="请输入审核意见" type="textarea" maxlength="200" :autosize="{ minRows: 4, maxRows: 6}" v-model="queryParams.companyAuditRemarks"></el-input>
+      title="审核意见"
+      :visible.sync="refuseVisible"
+      width="600px"
+      :close-on-click-modal="false"
+    >
+      <el-input
+        placeholder="请输入审核意见"
+        type="textarea"
+        maxlength="200"
+        :autosize="{ minRows: 4, maxRows: 6}"
+        v-model="queryParams.companyAuditRemarks"
+      ></el-input>
       <div slot="footer" class="dialog-footer">
         <el-button @click="refuseVisible=false">取 消</el-button>
-        <el-button type="primary" @click="refuseAuditLeaseByCompany(10)" v-if="queryParams.taskStatus==31" v-hasPermi="['receive:examine:fgs']">确 定</el-button>
+        <el-button
-        <el-button type="primary" @click="refuseAuditLeaseByCompany(2)" v-if="queryParams.taskStatus==32" v-hasPermi="['receive:examine:nbs']">确 定</el-button>
+          type="primary"
-
+          @click="refuseAuditLeaseByCompany(10)"
+          v-if="queryParams.taskStatus==31"
+          v-hasPermi="['receive:examine:fgs']"
+        >确 定</el-button>
+        <el-button
+          type="primary"
+          @click="refuseAuditLeaseByCompany(2)"
+          v-if="queryParams.taskStatus==32"
+          v-hasPermi="['receive:examine:nbs']"
+        >确 定</el-button>
       </div>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
+import { listType, getType, delType, addType, updateType, refreshCache } from '@/api/system/dict/type'
-import { auditLeaseByCompanyCq, getLeaseListAllCq,rejectLeaseByCompanyCq,updateLeaseTaskStatusConfirmByCq  } from '@/api/claimAndRefund/receive'
+import {
+  auditLeaseByCompanyCq,
+  getLeaseListAllCq,
+  rejectLeaseByCompanyCq,
+  updateLeaseTaskStatusConfirmByCq,
+} from '@/api/claimAndRefund/receive'
 import { mapState } from 'vuex'
 export default {
-  name: "ReceiveExamine",
+  name: 'ReceiveExamine',
   data() {
     return {
       flowPath: [
@@ -172,20 +301,22 @@ export default {
           name: '机具分公司审核',
           remarkKey: 'deptAuditRemark',
           authorKey: 'deptAuditBy',
-          timeKey:'deptAuditTime'
+          timeKey: 'deptAuditTime',
-        },{
+        },
+        {
           id: 32,
           name: '施工部审核',
           remarkKey: 'directAuditRemark',
           authorKey: 'directAuditBy',
-          timeKey:'directAuditTime'
+          timeKey: 'directAuditTime',
-        },{
+        },
+        {
           id: 117,
           name: '机具分公司确认',
           remarkKey: 'directAuditRemark',
           authorKey: 'directAuditBy',
-          timeKey:'directAuditTime'
+          timeKey: 'directAuditTime',
-        }
+        },
       ],
       isView: false,
       examineVisible: false,
@@ -205,57 +336,51 @@ export default {
       // 字典表格数据
       typeList: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       // 日期范围
       dateRange: [],
       // 查询参数
       queryParams: {
-        leaseApplyInfo:{
+        leaseApplyInfo: {},
-
-        },
         leaseApplyDetails: [],
-        companyAuditRemarks:''
+        companyAuditRemarks: '',
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        dictName: [
+        dictName: [{ required: true, message: '字典名称不能为空', trigger: 'blur' }],
-          { required: true, message: "字典名称不能为空", trigger: "blur" }
+        dictType: [{ required: true, message: '字典类型不能为空', trigger: 'blur' }],
-        ],
-        dictType: [
-          { required: true, message: "字典类型不能为空", trigger: "blur" }
-        ]
       },
       peopleOpen: false,
       noticeOpen: false,
       nform: {
-        notice:''
+        notice: '',
       },
       nrules: {
-        notice: [
+        notice: [{ required: true, message: '通知内容不能为空', trigger: 'blur' }],
-          { required: true, message: "通知内容不能为空", trigger: "blur" }
-        ]
       },
       deptName: undefined,
-      activities: [{
+      activities: [
+        {
           content: '小洁发起申请',
-        timestamp: '2018-04-15'
+          timestamp: '2018-04-15',
-      }, {
+        },
+        {
           content: '分公司审批',
-        timestamp: '2018-04-13'
+          timestamp: '2018-04-13',
-      }, {
+        },
+        {
           content: '部门审批',
-        timestamp: '2018-04-11'
+          timestamp: '2018-04-11',
-      }],
+        },
-
+      ],
-
+    }
-    };
   },
   computed: {
-    ...mapState(['user'])
+    ...mapState(['user']),
   },
   created() {
     let taskId = this.$route.query.taskId
@@ -296,7 +421,9 @@ export default {
       const res = await auditLeaseByCompanyCq(params)
       if (res.code == 200) {
         this.examineVisible = false
-        this.$tab.closeOpenPage({ path: "/claimAndRefund/receiveByCq/receiveManage"});
+        this.$tab.closeOpenPage({
+          path: '/claimAndRefund/receiveByCq/receiveManage',
+        })
       }
       // console.log('subAuditLeaseByCompany ==================',res)
     },
@@ -306,13 +433,12 @@ export default {
       // console.log(taskData)
       let param = {
         taskId: taskData.taskId,
-          taskStatus:33
+        taskStatus: 33,
       }
       updateLeaseTaskStatusConfirmByCq(param).then(response => {
-          this.$modal.msgSuccess("操作成功");
+        this.$modal.msgSuccess('操作成功')
         this.getData(taskData.taskId)
-        });
+      })
-
     },
     //审核  驳回
     refuse() {
@@ -323,11 +449,11 @@ export default {
     async refuseAuditLeaseByCompany(type) {
       const params = JSON.parse(JSON.stringify(this.queryParams))
       if (params.taskStatus == 31) {
-        params.taskStatus=99;
+        params.taskStatus = 99
         params.examineStatusId = 99
       }
       if (params.taskStatus == 32) {
-        params.taskStatus=100;
+        params.taskStatus = 100
         params.examineStatusId = 100
       }
       params.updateTime = params.updateTimes
@@ -342,13 +468,17 @@ export default {
       const res = await rejectLeaseByCompanyCq(params)
       if (res.code == 200) {
         this.examineVisible = false
-        this.$tab.closeOpenPage({ path: "/claimAndRefund/receiveByCq/receiveManage"});
+        this.$tab.closeOpenPage({
+          path: '/claimAndRefund/receiveByCq/receiveManage',
+        })
       }
       // console.log('subAuditLeaseByCompany ==================',res)
     },
     /** 修改按钮操作 */
     handleBack(row) {
-      this.$tab.closeOpenPage({ path: "/claimAndRefund/receiveByCq/receiveManage"});
+      this.$tab.closeOpenPage({
+        path: '/claimAndRefund/receiveByCq/receiveManage',
+      })
     },
     /** 查询 */
     async getData(taskId) {
@@ -380,7 +510,7 @@ export default {
         }
         if (this.flowPath[i].id == this.queryParams.examineStatusId) {
           this.flowPath[i].type = 'primary'
-          this.flowPath[i].color = "#1890ff"
+          this.flowPath[i].color = '#1890ff'
           this.flowPath[i].icon = 'el-icon-more'
           break
         }
@@ -412,8 +542,8 @@ export default {
     },
     // 取消按钮
     cancel() {
-      this.open = false;
+      this.open = false
-      this.reset();
+      this.reset()
     },
     // 表单重置
     reset() {
@@ -421,30 +551,30 @@ export default {
         dictId: undefined,
         dictName: undefined,
         dictType: undefined,
-        status: "0",
+        status: '0',
-        remark: undefined
+        remark: undefined,
-      };
+      }
-      this.resetForm("form");
+      this.resetForm('form')
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
+      this.queryParams.pageNum = 1
-      this.getList();
+      this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRange = [];
+      this.dateRange = []
-      this.resetForm("queryForm");
+      this.resetForm('queryForm')
-      this.handleQuery();
+      this.handleQuery()
     },
     handleNotice() {
-      this.noticeOpen = true;
+      this.noticeOpen = true
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
+      this.reset()
-      this.open = true;
+      this.open = true
-      this.title = "添加字典类型";
+      this.title = '添加字典类型'
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -454,59 +584,67 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
+      this.reset()
       const dictId = row.dictId || this.ids
       getType(dictId).then(response => {
-        this.form = response.data;
+        this.form = response.data
-        this.open = true;
+        this.open = true
-        this.title = "验收";
+        this.title = '验收'
-      });
+      })
     },
     /** 提交按钮 */
     submitForm: function() {
-      this.$refs["form"].validate(valid => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.dictId != undefined) {
             updateType(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.$modal.msgSuccess('修改成功')
-              this.open = false;
+              this.open = false
-              this.getList();
+              this.getList()
-            });
+            })
           } else {
             addType(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.$modal.msgSuccess('新增成功')
-              this.open = false;
+              this.open = false
-              this.getList();
+              this.getList()
-            });
+            })
           }
         }
-      });
+      })
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const dictIds = row.dictId || this.ids;
+      const dictIds = row.dictId || this.ids
-      this.$modal.confirm('是否确认删除该数据项？').then(function() {
+      this.$modal
-        return delType(dictIds);
+        .confirm('是否确认删除该数据项？')
-      }).then(() => {
+        .then(function() {
-        this.getList();
+          return delType(dictIds)
-        this.$modal.msgSuccess("删除成功");
+        })
-      }).catch(() => {});
+        .then(() => {
+          this.getList()
+          this.$modal.msgSuccess('删除成功')
+        })
+        .catch(() => {})
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/dict/type/export', {
+      this.download(
-        ...this.queryParams
+        'system/dict/type/export',
-      }, `type_${new Date().getTime()}.xlsx`)
+        {
+          ...this.queryParams,
+        },
+        `type_${new Date().getTime()}.xlsx`
+      )
     },
     /** 刷新缓存按钮操作 */
     handleRefreshCache() {
       refreshCache().then(() => {
-        this.$modal.msgSuccess("刷新成功");
+        this.$modal.msgSuccess('刷新成功')
-        this.$store.dispatch('dict/cleanDict');
+        this.$store.dispatch('dict/cleanDict')
-      });
+      })
+    },
+  },
 }
-  }
-};
 </script>
 
 <style lang="scss" scoped>

sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue

@@ -16,8 +16,7 @@
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
-                >
+        ></el-date-picker>
-                </el-date-picker>
       </el-form-item>
       <el-form-item label="往来单位" prop="unitId">
         <el-select
@@ -28,13 +27,7 @@
           style="width: 240px"
           placeholder="请选择"
         >
-                    <el-option
+          <el-option v-for="item in unitList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-                        v-for="item in unitList"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    >
-                    </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="工程名称" prop="proId">
@@ -46,13 +39,7 @@
           style="width: 240px"
           placeholder="请选择"
         >
-                    <el-option
+          <el-option v-for="item in proList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-                        v-for="item in proList"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    >
-                    </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="关键字" prop="keyword">
@@ -66,19 +53,8 @@
       </el-form-item>
 
       <el-form-item>
-                <el-button
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
-                    type="primary"
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-                    icon="el-icon-search"
-                    size="mini"
-                    @click="handleQuery"
-                    >查询</el-button
-                >
-                <el-button
-                    icon="el-icon-refresh"
-                    size="mini"
-                    @click="resetQuery"
-                    >重置</el-button
-                >
       </el-form-item>
     </el-form>
 
@@ -93,14 +69,7 @@
         >新建</el-button>
       </el-col>-->
       <el-col :span="1.5">
-                <el-button
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
-                    type="warning"
-                    plain
-                    icon="el-icon-download"
-                    size="mini"
-                    @click="handleExport"
-                    >导出</el-button
-                >
       </el-col>
       <!--      <el-col :span="1.5">-->
       <!--        <el-button-->
@@ -112,72 +81,30 @@
       <!--          v-hasPermi="['store:labelType:remove']"-->
       <!--        >刷新缓存</el-button>-->
       <!--      </el-col>-->
-            <right-toolbar
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-                :showSearch.sync="showSearch"
-                @queryTable="getList"
-            ></right-toolbar>
     </el-row>
 
-        <el-table
+    <el-table v-loading="loading" :data="leaseAuditList" @selection-change="handleSelectionChange">
-            v-loading="loading"
-            :data="leaseAuditList"
-            @selection-change="handleSelectionChange"
-        >
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="序号" align="center" type="index" />
-            <el-table-column
+      <el-table-column label="领料单号" align="center" prop="code" :show-overflow-tooltip="true" />
-                label="领料单号"
+      <el-table-column label="领料类型" align="center" prop="leaseType" :show-overflow-tooltip="true">
-                align="center"
-                prop="code"
-                :show-overflow-tooltip="true"
-            />
-            <el-table-column
-                label="领料类型"
-                align="center"
-                prop="leaseType"
-                :show-overflow-tooltip="true"
-            >
         <template slot-scope="scope">
           <span v-if="scope.row.leaseType == 0">工程租赁</span>
           <span v-if="scope.row.leaseType == 1">长期领用</span>
         </template>
       </el-table-column>
-            <el-table-column
+      <el-table-column label="领料单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
-                label="领料单位"
+      <el-table-column label="领料工程" align="center" prop="proName" :show-overflow-tooltip="true" />
-                align="center"
-                prop="unitName"
-                :show-overflow-tooltip="true"
-            />
-            <el-table-column
-                label="领料工程"
-                align="center"
-                prop="proName"
-                :show-overflow-tooltip="true"
-            />
       <el-table-column
         label="协议号"
         align="center"
         prop="agreementCode"
         :show-overflow-tooltip="true"
       />
-            <el-table-column
+      <el-table-column label="领料人" align="center" prop="leasePerson" :show-overflow-tooltip="true" />
-                label="领料人"
+      <el-table-column label="联系电话" align="center" prop="leasePhone" :show-overflow-tooltip="true" />
-                align="center"
+      <el-table-column label="申请人" align="center" prop="applyFor" :show-overflow-tooltip="true" />
-                prop="leasePerson"
-                :show-overflow-tooltip="true"
-            />
-            <el-table-column
-                label="联系电话"
-                align="center"
-                prop="leasePhone"
-                :show-overflow-tooltip="true"
-            />
-            <el-table-column
-                label="申请人"
-                align="center"
-                prop="applyFor"
-                :show-overflow-tooltip="true"
-            />
       <el-table-column
         label="预计领料时间"
         align="center"
@@ -190,18 +117,9 @@
         prop="createTimes"
         :show-overflow-tooltip="true"
       />
-            <el-table-column
+      <el-table-column label="任务状态" align="center" prop="taskName" :show-overflow-tooltip="true" />
-                label="任务状态"
-                align="center"
-                prop="taskName"
-                :show-overflow-tooltip="true"
-            />
       <!--      <el-table-column label="审批结果 " align="center" prop="dictName" :show-overflow-tooltip="true" />-->
-            <el-table-column
+      <el-table-column label="备注" align="center" :show-overflow-tooltip="true">
-                label="备注"
-                align="center"
-                :show-overflow-tooltip="true"
-            >
         <template slot-scope="scope">
           <span>{{ scope.row.leaseApplyInfoList[0].remark }}</span>
         </template>
@@ -214,9 +132,7 @@
         fixed="right"
       >
         <template slot-scope="scope">
-                    <el-button size="mini" @click="handleView(scope.row)"
+          <el-button size="mini" @click="handleView(scope.row)">查看</el-button>
-                        >查看</el-button
-                    >
           <el-button
             size="mini"
             type="primary"
@@ -226,23 +142,16 @@
                             Number(scope.row.examineStatusId) == 31 ||
                             Number(scope.row.examineStatusId) == 117
                         "
-                        >审批</el-button
+          >审批</el-button>
-                    >
           <el-button
             size="mini"
             type="primary"
             @click="handleExamine(scope.row)"
             v-hasPermi="['receive:examine:nbs']"
             v-if="Number(scope.row.examineStatusId) == 32"
-                        >审批</el-button
+          >审批</el-button>
-                    >
 
-                    <el-button
+          <el-button size="mini" type="info" @click="openLld(scope.row)">领料单</el-button>
-                        size="mini"
-                        type="info"
-                        @click="openLld(scope.row)"
-                        >领料单</el-button
-                    >
         </template>
       </el-table-column>
     </el-table>
@@ -266,13 +175,8 @@
                             font-weight: 600;
                             font-size: 16px;
                         "
-                    >
+          >领料单</div>
-                        领料单
+          <div class="info" style="margin-top: 10px; display: flex; flex-wrap: wrap">
-                    </div>
-                    <div
-                        class="info"
-                        style="margin-top: 10px; display: flex; flex-wrap: wrap"
-                    >
             <div
               class="item"
               style="
@@ -282,7 +186,8 @@
                                 font-size: 14px;
                             "
             >
-                            <span>领料单位：</span>{{ leaseApplyData.unitName }}
+              <span>领料单位：</span>
+              {{ leaseApplyData.unitName }}
             </div>
             <div
               class="item"
@@ -293,7 +198,8 @@
                                 font-size: 14px;
                             "
             >
-                            <span>工程名称：</span>{{ leaseApplyData.proName }}
+              <span>工程名称：</span>
+              {{ leaseApplyData.proName }}
             </div>
             <div
               class="item"
@@ -304,7 +210,8 @@
                                 font-size: 14px;
                             "
             >
-                            <span>时间：</span>{{ leaseApplyData.updateTimes }}
+              <span>时间：</span>
+              {{ leaseApplyData.updateTimes }}
             </div>
             <div
               class="item"
@@ -315,7 +222,8 @@
                                 font-size: 14px;
                             "
             >
-                            <span>编号：</span>{{ leaseApplyData.code }}
+              <span>编号：</span>
+              {{ leaseApplyData.code }}
             </div>
           </div>
           <el-table
@@ -325,42 +233,48 @@
             style="margin-top: 20px; padding: 1px"
           >
             <!--          <el-table-column type="selection" width="55" align="center" />-->
-                        <el-table-column
+            <el-table-column label="序号" align="center" type="index" />
-                            label="序号"
+            <el-table-column label="类型名称" align="center" prop="typeName" />
-                            align="center"
+            <el-table-column type="expand">
-                            type="index"
+              <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="计量单位"
+                      label="单位"
                       align="center"
                       prop="unitName"
+                      :show-overflow-tooltip="true"
                     />
                     <el-table-column
                       label="预领数量"
                       align="center"
-                            prop="preNum"
+                      prop="partNum"
-                        />
+                      :show-overflow-tooltip="true"
-                        <el-table-column
-                            label="备注"
-                            align="center"
-                            prop="remark"
-                        />
-                        <el-table-column
-                            label="出库方式"
-                            align="center"
-                            prop="manageTypeName"
                     />
                   </el-table>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="规格型号" align="center" prop="typeModelName" />
+            <el-table-column label="计量单位" align="center" prop="unitName" />
+            <el-table-column label="预领数量" align="center" prop="preNum" />
+            <el-table-column label="备注" align="center" prop="remark" />
+            <el-table-column label="出库方式" align="center" prop="manageTypeName" />
+          </el-table>
 
           <div
             class="fillIn"
@@ -394,20 +308,8 @@
 </template>
 
 <script>
-    import {
+import { listType, getType, delType, addType, updateType, refreshCache } from '@/api/system/dict/type'
-        listType,
+import { getLeaseManageListAllCq, getUnitData, getProData, getLeaseListAllCq } from '@/api/claimAndRefund/receive'
-        getType,
-        delType,
-        addType,
-        updateType,
-        refreshCache,
-    } from '@/api/system/dict/type'
-    import {
-        getLeaseManageListAllCq,
-        getUnitData,
-        getProData,
-        getLeaseListAllCq,
-    } from '@/api/claimAndRefund/receive'
 import { getInfo } from '@/api/login'
 import vueEasyPrint from 'vue-easy-print'
 export default {
@@ -518,8 +420,7 @@
         unitId: this.queryParams.unitId,
         projectId: this.queryParams.proId,
         keyWord: this.queryParams.keyword,
-                    startTime:
+        startTime: this.queryParams.time && this.queryParams.time[0],
-                        this.queryParams.time && this.queryParams.time[0],
         endTime: this.queryParams.time && this.queryParams.time[1],
         types: this.queryParams.types,
         souceBy: 0,
@@ -624,10 +525,7 @@
       this.leaseApplyDetails = res.rows[0].leaseApplyDetails
       this.leaseApplyData = res.rows[0]
 
-                console.log(
+      console.log('this.leaseApplyData ============', this.leaseApplyData)
-                    'this.leaseApplyData ============',
-                    this.leaseApplyData,
-                )
     },
     // 领料单 打印
     print() {
@@ -636,7 +534,7 @@
 
     // 多选框选中数据
     handleSelectionChange(selection) {
-                this.ids = selection.map((item) => item.dictId)
+      this.ids = selection.map(item => item.dictId)
       this.single = selection.length != 1
       this.multiple = !selection.length
     },
@@ -644,7 +542,7 @@
     handleUpdate(row) {
       this.reset()
       const dictId = row.dictId || this.ids
-                getType(dictId).then((response) => {
+      getType(dictId).then(response => {
         this.form = response.data
         this.open = true
         this.title = '验收'
@@ -652,16 +550,16 @@
     },
     /** 提交按钮 */
     submitForm: function() {
-                this.$refs['form'].validate((valid) => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.dictId != undefined) {
-                            updateType(this.form).then((response) => {
+            updateType(this.form).then(response => {
               this.$modal.msgSuccess('修改成功')
               this.open = false
               this.getList()
             })
           } else {
-                            addType(this.form).then((response) => {
+            addType(this.form).then(response => {
               this.$modal.msgSuccess('新增成功')
               this.open = false
               this.getList()
@@ -691,7 +589,7 @@
         {
           ...this.queryParams,
         },
-                    `领料审批单_${new Date().getTime()}.xlsx`,
+        `领料审批单_${new Date().getTime()}.xlsx`
       )
     },
     /** 刷新缓存按钮操作 */

sgzb-ui/vue.config.js

@@ -1,15 +1,15 @@
-"use strict";
+'use strict'
-const path = require("path");
+const path = require('path')
 
 function resolve(dir) {
-  return path.join(__dirname, dir);
+  return path.join(__dirname, dir)
 }
 
-const CompressionPlugin = require("compression-webpack-plugin");
+const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || "施工装备管理系统"; // 网页标题
+const name = process.env.VUE_APP_TITLE || '施工装备管理系统' // 网页标题
 
-const port = process.env.port || process.env.npm_config_port || 80; // 端口
+const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
@@ -18,18 +18,18 @@ module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.NODE_ENV === "production" ? "/" : "/", ///gl/
+  publicPath: process.env.NODE_ENV === 'production' ? '/' : '/', ///gl/
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
-  outputDir: "dist",
+  outputDir: 'dist',
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
-  assetsDir: "static",
+  assetsDir: 'static',
   // 是否开启eslint保存检测，有效值：ture | false | 'error'
-  lintOnSave: process.env.NODE_ENV === "development",
+  lintOnSave: process.env.NODE_ENV === 'development',
   // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
   productionSourceMap: false,
   // webpack-dev-server 相关配置
   devServer: {
-    host: "0.0.0.0",
+    host: '0.0.0.0',
     port: port,
     open: true,
     proxy: {
@@ -42,10 +42,10 @@ module.exports = {
         // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
         // target: `https://z.csgmall.com.cn`,
 
-        // target: `http://10.40.92.8:8080`, //超
+        target: `http://10.40.92.8:8080`, //超
         // target: `http://10.40.92.253:8080`,//韩
         // target: `http://10.40.92.209:8080`,//川/
-        target: `http://10.40.92.153:8080`, //帅
+        // target: `http://10.40.92.153:8080`, //帅
         // target: `http://10.40.92.14:8080`, //福
 
         //******** 注意事项  ********* */
@@ -61,7 +61,7 @@ module.exports = {
 
         changeOrigin: true,
         pathRewrite: {
-          ["^" + process.env.VUE_APP_BASE_API]: "",
+          ['^' + process.env.VUE_APP_BASE_API]: '',
         },
       },
     },
@@ -70,7 +70,7 @@ module.exports = {
   css: {
     loaderOptions: {
       sass: {
-        sassOptions: { outputStyle: "expanded" },
+        sassOptions: { outputStyle: 'expanded' },
       },
     },
   },
@@ -78,7 +78,7 @@ module.exports = {
     name: name,
     resolve: {
       alias: {
-        "@": resolve("src"),
+        '@': resolve('src'),
       },
     },
     plugins: [
@@ -86,71 +86,71 @@ module.exports = {
       new CompressionPlugin({
         cache: false, // 不启用文件缓存
         test: /\.(js|css|html)?$/i, // 压缩文件格式
-        filename: "[path].gz[query]", // 压缩后的文件名
+        filename: '[path].gz[query]', // 压缩后的文件名
-        algorithm: "gzip", // 使用gzip压缩
+        algorithm: 'gzip', // 使用gzip压缩
         minRatio: 0.8, // 压缩率小于1才会压缩
       }),
     ],
   },
   chainWebpack(config) {
-    config.plugins.delete("preload"); // TODO: need test
+    config.plugins.delete('preload') // TODO: need test
-    config.plugins.delete("prefetch"); // TODO: need test
+    config.plugins.delete('prefetch') // TODO: need test
 
     // set svg-sprite-loader
-    config.module.rule("svg").exclude.add(resolve("src/assets/icons")).end();
+    config.module.rule('svg').exclude.add(resolve('src/assets/icons')).end()
     config.module
-      .rule("icons")
+      .rule('icons')
       .test(/\.svg$/)
-      .include.add(resolve("src/assets/icons"))
+      .include.add(resolve('src/assets/icons'))
       .end()
-      .use("svg-sprite-loader")
+      .use('svg-sprite-loader')
-      .loader("svg-sprite-loader")
+      .loader('svg-sprite-loader')
       .options({
-        symbolId: "icon-[name]",
+        symbolId: 'icon-[name]',
       })
-      .end();
+      .end()
 
-    config.when(process.env.NODE_ENV !== "development", (config) => {
+    config.when(process.env.NODE_ENV !== 'development', config => {
       config
-        .plugin("ScriptExtHtmlWebpackPlugin")
+        .plugin('ScriptExtHtmlWebpackPlugin')
-        .after("html")
+        .after('html')
-        .use("script-ext-html-webpack-plugin", [
+        .use('script-ext-html-webpack-plugin', [
           {
             // `runtime` must same as runtimeChunk name. default is `runtime`
             inline: /runtime\..*\.js$/,
           },
         ])
-        .end();
+        .end()
 
       config.optimization.splitChunks({
-        chunks: "all",
+        chunks: 'all',
         cacheGroups: {
           libs: {
-            name: "chunk-libs",
+            name: 'chunk-libs',
             test: /[\\/]node_modules[\\/]/,
             priority: 10,
-            chunks: "initial", // only package third parties that are initially dependent
+            chunks: 'initial', // only package third parties that are initially dependent
           },
           elementUI: {
-            name: "chunk-elementUI", // split elementUI into a single package
+            name: 'chunk-elementUI', // split elementUI into a single package
             test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm
             priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
           },
           commons: {
-            name: "chunk-commons",
+            name: 'chunk-commons',
-            test: resolve("src/components"), // can customize your rules
+            test: resolve('src/components'), // can customize your rules
             minChunks: 3, //  minimum common number
             priority: 5,
             reuseExistingChunk: true,
           },
         },
-      });
+      })
 
-      config.optimization.runtimeChunk("single"),
+      config.optimization.runtimeChunk('single'),
         {
-          from: path.resolve(__dirname, "./public/robots.txt"), //防爬虫文件
+          from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
-          to: "./", //到根目录下
+          to: './', //到根目录下
-        };
+        }
-    });
+    })
   },
-};
+}