lsun 协议管理

package.json

@@ -64,7 +64,8 @@
     "vue-meta": "2.4.0",
     "vue-router": "3.4.9",
     "vuedraggable": "2.24.3",
-    "vuex": "3.6.0"
+    "vuex": "3.6.0",
+    "vue-easy-print": "0.0.8"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.6",

src/views/material/lease/apply/component/homeApply.vue

@@ -55,10 +55,12 @@
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
-          >搜索</el-button
+        >搜索
+        </el-button
         >
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
+        >重置
+        </el-button
         >
       </el-form-item>
     </el-form>
@@ -71,7 +73,8 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          >领料申请</el-button
+        >领料申请
+        </el-button
         >
       </el-col>
       <el-col :span="1.5">
@@ -81,7 +84,8 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleSendAll"
-          >发布</el-button
+        >发布
+        </el-button
         >
       </el-col>
       <el-col :span="1.5">
@@ -91,7 +95,8 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          >导出</el-button
+        >导出
+        </el-button
         >
       </el-col>
       <right-toolbar
@@ -107,8 +112,8 @@
       @selection-change="handleSelectionChange"
       border
     >
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column width="60" align="center" label="序号" type="index" />
+      <el-table-column width="60" align="center" label="序号" type="index"/>
       <el-table-column
         align="center"
         width="160"
@@ -207,7 +212,8 @@
             style="margin-bottom: 10px"
             type="normal"
             @click="handleView(scope.row)"
-            >查看</el-button
+          >查看
+          </el-button
           >
           <el-button
             size="mini"
@@ -216,7 +222,8 @@
             @click="handleUpdate(scope.row)"
             v-if="scope.row.status != '2'"
             v-hasPermi="['purchase:info:edit']"
-            >编辑</el-button
+          >编辑
+          </el-button
           >
 
           <el-button
@@ -226,13 +233,16 @@
             @click="handleSend(scope.row)"
             v-if="scope.row.status == '0'"
             v-hasPermi="['purchase:person:notice']"
-            >发布</el-button
+          >发布
+          </el-button
+          >
+          <el-button size="mini" type="warning" @click="handleLld(scope.row)"
+          >领料单
+          </el-button
           >
           <el-button size="mini" type="warning" @click="handlePrint(scope.row)"
-            >领料单</el-button
+          >出库检验单
-          >
+          </el-button
-          <el-button size="mini" type="warning" @click="handlePrint(scope.row)"
-            >出库检验单</el-button
           >
 
           <el-button
@@ -241,7 +251,8 @@
             @click="handleDeletePurchase(scope.row)"
             v-if="scope.row.status == '0'"
             v-hasPermi="['purchase:info:remove']"
-            >删除</el-button
+          >删除
+          </el-button
           >
         </template>
       </el-table-column>
@@ -316,7 +327,7 @@
             border
           >
             <!--          <el-table-column type="selection" width="55" align="center" />-->
-            <el-table-column label="序号" align="center" type="index" row="2" />
+            <el-table-column label="序号" align="center" type="index" row="2"/>
             <el-table-column
               label="物资名称"
               align="center"
@@ -327,7 +338,7 @@
               align="center"
               prop="specificationType"
             />
-            <el-table-column label="单位" align="center" prop="unitName" />
+            <el-table-column label="单位" align="center" prop="unitName"/>
             <el-table-column label="配送信息" align="center">
               <el-table-column
                 label="到货数量"
@@ -352,7 +363,7 @@
                 />
               </el-table-column>
             </el-table-column>
-            <el-table-column label="备注" align="center" prop="unitName" />
+            <el-table-column label="备注" align="center" prop="unitName"/>
 
             <!--                        <el-table-column-->
             <!--                            label="合格证及技术资料"-->
@@ -396,6 +407,119 @@
         <el-button @click="openPrint = false">关 闭</el-button>
       </div>
     </el-dialog>
+
+
+    <!-- 领料单弹窗 -->
+    <el-dialog :visible.sync="open" width="800px" append-to-body>
+      <div style="height: 500px; overflow-y: scroll; padding: 0 20px">
+        <vue-easy-print tableShow ref="remarksPrintRef" class="print">
+          <div class="title" style="text-align: center;font-weight: 600;font-size: 16px;">领料单</div>
+          <div class="info" style="margin-top: 10px; display: flex; flex-wrap: wrap">
+            <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
+              <span>领料单位：</span>
+              {{ leaseApplyData.leaseUnit }}
+            </div>
+            <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
+              <span>工程名称：</span>
+              {{ leaseApplyData.leaseProject }}
+            </div>
+            <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
+              <span>时间：</span>
+              {{ leaseApplyData.createTime }}
+            </div>
+            <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
+              <span>编号：</span>
+              {{ leaseApplyData.code }}
+            </div>
+          </div>
+          <el-table :data="leaseApplyDetails" class="table" border style="margin-top: 20px; padding: 1px">
+            <el-table-column label="序号" align="center" type="index"/>
+            <el-table-column label="类型名称" align="center" prop="typeName"/>
+<!--            <el-table-column type="expand">
+              <template slot-scope="scope">
+                <div class="nested-table-container">
+                  <el-table :data="scope.row.maTypeDetails" style="width: 100%">
+                    &lt;!&ndash; 子表格的列 &ndash;&gt;
+                    <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="typeName"
+                      :show-overflow-tooltip="true"
+                    />
+                    <el-table-column
+                      label="单位"
+                      align="center"
+                      prop="unitName"
+                      :show-overflow-tooltip="true"
+                    />
+                    <el-table-column
+                      label="预领数量"
+                      align="center"
+                      prop="preNum"
+                      :show-overflow-tooltip="true"
+                    />
+                  </el-table>
+                </div>
+              </template>
+            </el-table-column>-->
+            <el-table-column
+              label="规格型号"
+              align="center"
+              prop="typeName"
+            />
+            <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">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.ma_type_manage_type" :value="scope.row.manageType"/>
+              </template>
+            </el-table-column>
+<!--            <el-table-column-->
+<!--              label="出库方式"-->
+<!--              align="center"-->
+<!--              prop="manageTypeName"-->
+<!--            />-->
+
+
+          </el-table>
+
+          <div class="fillIn" style="margin-top: 30px;display: flex;justify-content: space-between;">
+            <div class="item" style="width: 25%">
+              <span>审核：</span>
+            </div>
+            <div class="item" style="width: 25%">
+              <span>领料：</span>
+            </div>
+            <div class="item" style="width: 25%">
+              <span>仓库：</span>
+            </div>
+            <div class="item" style="width: 25%">
+              <span>操作人：</span>
+            </div>
+          </div>
+        </vue-easy-print>
+      </div>
+      <div slot="footer" class="dialog-footer" style="text-align: center">
+        <el-button type="primary" @click="print">打 印</el-button>
+        <el-button @click="open = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -406,12 +530,15 @@ import {
   getAcceptanceForm,
   purchaseCheckInfoRemove,
   queryStatusDataApi,
+  getApplyInfo,
   applyRemove,
 } from "@/api/lease/apply";
 
+import vueEasyPrint from 'vue-easy-print'
+
 export default {
   name: "Home",
-  dicts: ["lease_apply_status"],
+  dicts: ["lease_apply_status","ma_type_manage_type"],
   // components: { vueEasyPrint },
   data() {
     return {
@@ -463,14 +590,20 @@ export default {
       // 表单校验
       rules: {
         remark: [
-          { required: true, message: "通知内容不能为空", trigger: "blur" },
+          {required: true, message: "通知内容不能为空", trigger: "blur"},
         ],
       },
       openPrint: false,
+      open: false,
       printData: {},
       printTableData: [],
       // 供应商
       supplierStr: "",
+
+      //领料单
+      leaseApplyDetails: [],
+      // 领料任务详情数据
+      leaseApplyData: {},
     };
   },
   created() {
@@ -478,6 +611,7 @@ export default {
     this.getList();
     // this.getTypeList()
   },
+  components: { vueEasyPrint },
   methods: {
     // getTypeList() {
     //     getTypeList({ level: '3' }).then((response) => {
@@ -556,7 +690,7 @@ export default {
 
     //获取验收单数据
     getPrintTable(taskId) {
-      getAcceptanceForm({ taskId: taskId }).then((response) => {
+      getAcceptanceForm({taskId: taskId}).then((response) => {
         this.printData = response.data;
         this.printTableData = response.data.checkDetailsList;
 
@@ -578,6 +712,18 @@ export default {
       this.openPrint = true;
       this.title = "机具设备到货验收单";
     },
+
+    //打开领料单
+    async handleLld(row) {
+      this.open = true
+      var ids = row.id
+      const res = await getApplyInfo(ids)
+      console.log(res)
+      this.leaseApplyDetails = res.data.leaseApplyDetailsList
+      this.leaseApplyData = res.data.leaseApplyInfo
+      console.log(this.leaseApplyData)
+    },
+
     //打印
     print() {
       this.$refs.remarksPrintRef.print();
@@ -598,14 +744,15 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
 
     /** 导出按钮操作 */
     handleExport() {
       this.download(
         "/material/lease_apply_info/export",
-        { ...this.queryParams },
+        {...this.queryParams},
         `领料申请_${new Date().getTime()}.xlsx`
       );
     },