Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui

src/api/lease/out.js

@@ -17,6 +17,26 @@ export function outInfoList(id) {
   })
 }
 
+// 领料出库-编码出库详情信息
+export function getDetailsByTypeId(query) {
+  return request({
+    url: '/material/ma_machine/list',
+    method: 'get',
+    params: query,
+  })
+}
+
+// 领料出库-编码出库
+export function submitOut(data) {
+  return request({
+    url: '/material/lease_apply_info/leaseOut',
+    method: 'post',
+    data: data,
+  })
+}
+
+
+//-------暂未用到-----------
 // 领料出库-新增
 export function addApplyInfo(data) {
   return request({

src/api/repair/testExamine.js

@@ -8,6 +8,13 @@ export function getListTestExamineApply(query) {
     params: query
   })
 }
+// 查询修试审核详细列表
+export function getAudit(id) {
+  return request({
+    url: '/material/repair_audit_details/' + id,
+    method: 'get',
+  })
+}
 
 
 

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

@@ -182,7 +182,6 @@
             style="margin-bottom: 10px"
             type="normal"
             @click="handleView(scope.row)"
-            v-if="scope.row.taskStatus != 3"
             >查看</el-button
           >
           <el-button
@@ -425,7 +424,7 @@
       width="1200px"
       append-to-body
     >
-      <span style="margin-left: 25px">待出库数量：{{ outNum }}</span>
+      <span style="margin-left: 32px">待出库数量：{{ outNum }}</span>
 
       <el-form
         :model="outQuery"
@@ -474,13 +473,13 @@
         <el-table-column
           label="类型名称"
           align="center"
-          prop="myTypeName"
+          prop="materialName"
           :show-overflow-tooltip="true"
         />
         <el-table-column
           label="规格型号"
           align="center"
-          prop="typeName"
+          prop="materialModel"
           :show-overflow-tooltip="true"
         />
         <el-table-column
@@ -646,7 +645,7 @@
 
 <script>
 import { getListLeaseApply } from "@/api/lease/apply";
-import { outInfoList } from "@/api/lease/out";
+import { outInfoList, getDetailsByTypeId, submitOut } from "@/api/lease/out";
 export default {
   dicts: ["lease_task_status"],
   // components: { vueEasyPrint },
@@ -672,12 +671,14 @@ export default {
       // 总条数
       total: 0,
       ViewTotal: 0,
+      outTotal: 0,
       // 弹出层标题
       title: "",
       typeList: [],
       //出库数量
       getListOutInfo: [],
       outCodeList: [],
+      maCodeList: [],
       // 日期范围
       dateRange: [],
       statusDataRange: [],
@@ -713,6 +714,8 @@ export default {
       printData: {},
       printTableData: [],
       outNum: 0,
+      outObj: {},
+      parentIdTemp: undefined,
     };
   },
   created() {
@@ -721,7 +724,16 @@ export default {
   methods: {
     // 多选框选中数据
     handleSelectionChange(selection) {
+      this.maCodeList = [];
       this.ids = selection.map((item) => item.id);
+      selection.forEach((item) => {
+        this.maCodeList.push({
+          typeId: item.typeId,
+          manageType: 0,
+          maId: item.maId,
+          parentId: this.parentIdTemp,
+        });
+      });
       this.single = selection.length != 1;
       this.multiple = !selection.length;
     },
@@ -756,7 +768,18 @@ export default {
       this.handleQuery();
     },
     //出库搜索按钮
-    handleQueryOutInfo() {},
+    handleQueryOutInfo() {
+      this.queryOutInfo.pageNum = 1;
+      this.getDialogList();
+    },
+
+    /** 出库查询列表 */
+    getDialogList() {
+      outInfoList(this.queryOutInfo.id).then((response) => {
+        this.getListOutInfo = response.data.leaseApplyDetailsList;
+        // this.loading = false;
+      });
+    },
     resetQueryOutInfo() {},
 
     /** 查看按钮操作 */
@@ -768,6 +791,7 @@ export default {
     handleOut(row) {
       this.title = "出库";
       this.showOutInfo = true;
+      this.queryOutInfo.id = row.id;
       outInfoList(row.id).then((response) => {
         this.getListOutInfo = response.data.leaseApplyDetailsList;
         // this.loading = false;
@@ -783,23 +807,37 @@ export default {
       this.openCode = true;
       // this.resetForm("codeOutForm");
       // this.resetForm("outQuery");
+      this.parentIdTemp = row.parentId;
       this.outNum = row.outNum;
-      // this.outQuery.typeId = row.typeId;
+      this.outQuery.typeId = row.typeId;
-      // this.outObj = row;
+      this.outObj = row;
-      // this.handleCodeOutQuery();
+      this.handleOutQuery();
     },
 
     getCodeList() {
-      // getDetailsByTypeId(this.outQuery).then((response) => {
+      getDetailsByTypeId(this.outQuery).then((response) => {
-      //   this.outCodeList = response.data.rows;
+        this.outCodeList = response.rows;
-      //   if (response.data.total) {
+        if (response.total) {
-      //     this.outTotal = response.data.total;
+          this.outTotal = response.total;
-      //   }
+        }
-      // });
+      });
     },
-    handleOutQuery() {},
+    handleOutQuery() {
+      this.outQuery.pageNum = 1;
+      this.getCodeList();
+    },
+
     resetOutQuery() {},
-    saveCodeOut() {},
+
+    saveCodeOut() {
+      let param = { leaseOutDetailsList: this.maCodeList };
+      submitOut(param).then((response) => {
+        this.$modal.msgSuccess("出库成功");
+        this.openCode = false;
+        this.handleQueryOutInfo();
+        this.handleQuery();
+      });
+    },
     handleCodeOutQuery() {},
     // 表单重置
     reset() {

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

@@ -136,12 +136,7 @@
 </template>
 
 <script>
-import { getPurchaseCheckInfo } from "@/api/purchase/goodsArrived";
+import { getAuditInfo } from "@/api/repair/testExamine";
-import {
-  uploadPurchaseFile,
-  getPurchaseFileList,
-} from "@/api/purchase/goodsAccept";
-import { getApplyInfo, getListProject, getListUnite } from "@/api/lease/apply";
 import { getToken } from "@/utils/auth";
 export default {
   name: "QueryTools",
@@ -192,38 +187,29 @@ export default {
   computed: {},
   mounted() {
     this.taskId = this.queryTaskId;
-    this.id = this.queryId;
+    // this.projectInfoList();
-    this.projectInfoList();
     this.getTaskInfo();
   },
   methods: {
-    /** 租赁单位和工程-下拉选 */
+    // /** 租赁单位和工程-下拉选 */
-    projectInfoList() {
+    // projectInfoList() {
-      getListUnite({ id: null }).then((response) => {
+    //   getListUnite({ id: null }).then((response) => {
-        this.uniteList = response.data;
+    //     this.uniteList = response.data;
-      });
+    //   });
-      getListProject({ id: null }).then((response) => {
+    //   getListProject({ id: null }).then((response) => {
-        this.projectList = response.data;
+    //     this.projectList = response.data;
-      });
+    //   });
-    },
+    // },
     //获取任务详情-列表数据
     getTaskInfo() {
       this.loading = true;
-      getApplyInfo(this.id).then((response) => {
+      getAuditInfo(this.taskId).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>

src/views/material/repair/testExamine/index.vue

@@ -27,13 +27,13 @@
 import PageHeaderApply from "@/components/pageHeaderApply";
 import Home from "./component/homeApply.vue"; // 主列表
 // import AddTools from "./component/addToolsApply.vue"; // 新增机具 和 修改机具
-// import QueryTools from "./component/queryToolsApply.vue"; // 查询机具 和 验收机具
+import QueryTools from "./component/queryToolsApply.vue"; // 查询机具 和 验收机具
 export default {
   components: {
     Home,
     PageHeaderApply,
     // AddTools,
-    // QueryTools,
+    QueryTools,
   },
   data() {
     return {