领料出库

src/api/lease/out.js

@@ -9,6 +9,14 @@ export function getListLeaseOut(query) {
   })
 }
 
+// 领料出库-出库详情信息
+export function outInfoList(id) {
+  return request({
+    url: '/material/lease_apply_info/' + id,
+    method: 'get'
+  })
+}
+
 // 领料出库-新增
 export function addApplyInfo(data) {
   return request({
@@ -38,16 +46,3 @@ export function getLeaseOutInfo(id) {
 
 
 
-
-
-
-// 上传报告附件
-export function uploadPurchaseFile(data) {
-  return request({
-    url: '/material/bm_file_info',
-    method: 'post',
-    data: data
-  })
-}
-
-

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

@@ -42,7 +42,6 @@
         >
           <el-option
             v-for="dict in dict.type.lease_task_status"
-            v-if="dict.value != 2 && dict.value != 4 && dict.value != 5"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -220,7 +219,7 @@
             style="margin-bottom: 10px"
             type="primary"
             @click="handleUpdate(scope.row)"
-            v-if="scope.row.taskStatus != 3"
+            v-if="scope.row.taskStatus == 1"
             v-hasPermi="['purchase:info:edit']"
             >编辑
           </el-button>
@@ -234,10 +233,18 @@
             v-hasPermi="['purchase:person:notice']"
             >发布
           </el-button>
-          <el-button size="mini" type="warning" @click="handleLld(scope.row)"
+          <el-button
+            size="mini"
+            type="warning"
+            @click="handleLld(scope.row)"
+            v-if="scope.row.taskStatus == 4"
             >领料单
           </el-button>
-          <el-button size="mini" type="warning" @click="handlePrint(scope.row)"
+          <el-button
+            size="mini"
+            type="warning"
+            @click="handlePrint(scope.row)"
+            v-if="scope.row.taskStatus == 4"
             >出库检验单
           </el-button>
 
@@ -687,7 +694,7 @@ export default {
         typeId: this.queryParams.typeId,
         pageSize: this.queryParams.pageSize,
         pageNum: this.queryParams.pageNum,
-        statusList: [1],
+        statusList: [1, 2, 3, 4],
       };
       getListLeaseApply(this.addDateRange(params)).then((response) => {
         this.typeList = response.rows;

src/views/material/lease/outBound/index.vue

@@ -117,7 +117,7 @@
       <el-table-column
         label="申请数量"
         align="center"
-        prop="code"
+        prop="preCountNum"
         width="110px"
         :show-overflow-tooltip="true"
       >
@@ -126,7 +126,7 @@
       <el-table-column
         label="已出库数量"
         align="center"
-        prop="code"
+        prop="alNum"
         width="110px"
         :show-overflow-tooltip="true"
       >
@@ -265,25 +265,25 @@
         <el-table-column
           label="类型名称"
           align="center"
-          prop="userName"
+          prop="maTypeName"
           :show-overflow-tooltip="true"
         />
         <el-table-column
           label="规格型号"
           align="center"
-          prop="deptName"
+          prop="typeName"
           :show-overflow-tooltip="true"
         />
         <el-table-column
           label="待出库数量"
           align="center"
-          prop="roleName"
+          prop="outName"
           :show-overflow-tooltip="true"
         />
         <el-table-column
           label="已出库数量"
           align="center"
-          prop="telphone"
+          prop="alNum"
           :show-overflow-tooltip="true"
         />
         <el-table-column
@@ -363,13 +363,13 @@
         <el-table-column
           label="类型名称"
           align="center"
-          prop="userName"
+          prop="maTypeName"
           :show-overflow-tooltip="true"
         />
         <el-table-column
           label="规格型号"
           align="center"
-          prop="deptName"
+          prop="typeName"
           :show-overflow-tooltip="true"
         />
         <el-table-column
@@ -381,7 +381,7 @@
         <el-table-column
           label="已出库数量"
           align="center"
-          prop="telphone"
+          prop="alNum"
           :show-overflow-tooltip="true"
         />
         <el-table-column
@@ -562,12 +562,8 @@
 </template>
 
 <script>
-import {
+import { getListLeaseApply } from "@/api/lease/apply";
-  getListLeaseApply,
+import { outInfoList } from "@/api/lease/out";
-  getAcceptanceForm,
-  purchaseCheckInfoRemove,
-} from "@/api/lease/apply";
-
 export default {
   dicts: ["lease_task_status"],
   // components: { vueEasyPrint },
@@ -593,7 +589,7 @@ export default {
       // 弹出层标题
       title: "",
       //出库数量
-      getListOutInfo: [{ deptName: 1, manageType: 0 }],
+      getListOutInfo: [],
       // 日期范围
       dateRange: [],
       statusDataRange: [],
@@ -679,6 +675,10 @@ export default {
     handleOut(row) {
       this.title = "出库";
       this.showOutInfo = true;
+      outInfoList(row.id).then((response) => {
+        this.getListOutInfo = response.data.leaseApplyDetailsList;
+        // this.loading = false;
+      });
     },
 
     //编码出库
@@ -690,21 +690,10 @@ export default {
       this.outNum = row.outNum;
       this.outQuery.typeId = row.typeId;
       this.outObj = row;
-      this.handleOutQuery();
+      this.handleCodeOutQuery();
-    },
-
-    //编码出库
-    numOut(row) {
-      // this.title = '编码出库'
-      this.openCode = true;
-      this.resetForm("numOutForm");
-      this.resetForm("outQuery");
-      this.outNum = row.outNum;
-      this.outQuery.typeId = row.typeId;
-      this.outObj = row;
-      this.handleOutQuery();
     },
 
+    handleCodeOutQuery() {},
     // 表单重置
     reset() {
       this.form = {

src/views/material/repair/testExamine/component/queryToolsApply.vue

@@ -0,0 +1,257 @@
+<template>
+  <div>
+    <el-form
+      :model="maForm"
+      ref="maForm"
+      size="small"
+      :rules="rules"
+      :inline="true"
+      label-width="120px"
+    >
+      <el-form-item label="退料单位" prop="leaseUnitId">
+        <el-input
+          v-model="maForm.leaseUnitId"
+          placeholder="请输入退料单位"
+          clearable
+          maxlength="50"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+          disabled
+        />
+      </el-form-item>
+      <el-form-item label="工程名称" prop="leaseProjectId">
+        <el-input
+          v-model="maForm.leaseProjectId"
+          placeholder="请输入工程名称"
+          clearable
+          maxlength="50"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+          disabled
+        />
+      </el-form-item>
+      <el-form-item label="维修单号" prop="leasePerson">
+        <el-input
+          v-model="maForm.leasePerson"
+          placeholder="请输入维修单号"
+          clearable
+          maxlength="50"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+          disabled
+        />
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handlePassAll"
+          >合格</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleFailAll"
+          >驳回</el-button
+        >
+      </el-col>
+    </el-row>
+    <el-table v-loading="loading" :data="equipmentList">
+      <el-table-column label="序号" align="center" type="index" />
+      <el-table-column
+        label="类型名称"
+        align="center"
+        prop="maTypeName"
+        :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>
+      <el-table-column
+        label="退料数量"
+        align="center"
+        prop="storageNum"
+        :show-overflow-tooltip="true"
+      >
+      </el-table-column>
+      <el-table-column
+        label="已修数量"
+        align="center"
+        prop="preNum"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="待修数量"
+        align="center"
+        prop="alNum"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="管理模式"
+        align="center"
+        prop="alNum"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="操作" align="center" width="300">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            style="margin-bottom: 10px"
+            type="primary"
+            @click="handlePass(scope.row)"
+            v-if="scope.row.status != '2'"
+            >通过
+          </el-button>
+
+          <el-button
+            size="mini"
+            type="danger"
+            @click="handleFail(scope.row)"
+            v-if="scope.row.status == '0'"
+            >驳回
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { getPurchaseCheckInfo } from "@/api/purchase/goodsArrived";
+import {
+  uploadPurchaseFile,
+  getPurchaseFileList,
+} from "@/api/purchase/goodsAccept";
+import { getApplyInfo, getListProject, getListUnite } from "@/api/lease/apply";
+import { getToken } from "@/utils/auth";
+export default {
+  name: "QueryTools",
+  components: {
+    // UploadImg,
+  },
+  props: {
+    isView: {
+      type: Boolean,
+      default: () => {
+        return false;
+      },
+    },
+    queryTaskId: {
+      type: [String, Number],
+      default: () => {
+        return "";
+      },
+    },
+    queryId: {
+      type: [String, Number],
+      default: () => {
+        return "";
+      },
+    },
+  },
+  data() {
+    return {
+      //任务ID
+      taskId: "",
+      // 遮罩层
+      loading: true,
+      //租赁单位
+      uniteList: [],
+      //租赁工程
+      projectList: [],
+      // 表格数据
+      equipmentList: [],
+      // 是否显示弹出层
+      open: false,
+      rowData: {},
+      maForm: {
+        leaseUnitId: undefined,
+        leaseProjectId: undefined,
+      },
+    };
+  },
+  computed: {},
+  mounted() {
+    this.taskId = this.queryTaskId;
+    this.id = this.queryId;
+    this.projectInfoList();
+    this.getTaskInfo();
+  },
+  methods: {
+    /** 租赁单位和工程-下拉选 */
+    projectInfoList() {
+      getListUnite({ id: null }).then((response) => {
+        this.uniteList = response.data;
+      });
+      getListProject({ id: null }).then((response) => {
+        this.projectList = response.data;
+      });
+    },
+    //获取任务详情-列表数据
+    getTaskInfo() {
+      this.loading = true;
+      getApplyInfo(this.id).then((response) => {
+        this.maForm = response.data.leaseApplyInfo;
+        this.equipmentList = response.data.leaseApplyDetailsList;
+
+        this.loading = false;
+      });
+    },
+    // /** 导出按钮操作 */
+    // handleExport() {
+    //   this.download(
+    //     "/material/purchase_check_info/exportDetails",
+    //     { taskId: this.taskId },
+    //     `领料申请详情_${new Date().getTime()}.xlsx`
+    //   );
+    // },
+  },
+};
+</script>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 60px !important;
+  margin-bottom: 10px;
+}
+//隐藏图片上传框的css
+::v-deep.disabled {
+  .el-upload--picture-card {
+    display: none;
+  }
+}
+.custom-textarea {
+  width: 300px;
+  height: 100px;
+}
+.accept-img {
+  color: #409eff;
+
+  .a-two {
+    margin-left: 20px;
+  }
+}
+
+.left-tip {
+  font-size: 16px;
+  letter-spacing: 1px;
+}
+</style>