.

ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesRoleMapper.xml

@@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             status = 1
             <if test="roleName !=null and roleName !=''">and role_name=#{roleName}</if>
-            <if test="temp_id !=null and temp_id !=''">and temp_id=#{tempId}</if>
+            <if test="tempId !=null and tempId !=''">and temp_id=#{tempId}</if>
         </where>
     </select>
 

ruoyi-ui/src/api/ruoyi-myLuckyexcel/myluckyexcel.js

@@ -223,7 +223,13 @@ export function delRuleManagement(id) {
   })
 }
 
-
+//查询六矿物料
+export function materialList() {
+    return request({
+        url: '/ActSuppliesDetails/ActSuppliesDetails/materialList' ,
+        method: 'get'
+    })
+}
 
 
 

ruoyi-ui/src/views/system/supplies/index.vue

@@ -69,6 +69,7 @@ import {addInsert}from "@/api/system/historydata"
 /*import luckysheet from 'luckysheet'*/
 import LuckyExcel from 'luckyexcel'
 //导入库export.js 这个文件是es6的，不能在普通的HTML文件直接引入js文件（虽然都是js文件，但是有区别，具体请百度es6与es5）！需要把es6转es5才可以直接引入使用！
+import {materialList} from "@/api/ruoyi-myLuckyexcel/myluckyexcel";
 import { exportExcel } from '../../../../public/exportExcel';
 import { v4 as uuidv4 } from 'uuid';
 
@@ -568,8 +569,10 @@ export default {
                                 if (allNull || allNull1 ||allNull2) {
                                     throw new Error("导入失败,导入文件错误,所选文件与模板规则不匹");
                                 }
+
                         materialConvert(smallMat)
                             .then(response => {
+
                             let array = response.rows;
                             //console.log(array);
                             //luckysheet.setCellValue(12, 1, {bg:"#FF0000"})
@@ -893,6 +896,11 @@ export default {
                                 if (allNull ) {
                                     throw new Error("导入失败,导入文件错误,所选文件与模板规则不匹");
                                 }
+                                debugger
+
+
+
+
                         materialConvert(smallMat)
                             .then(response => {
                             let array = response.rows;