物资详情模块修改

导入规则的完善

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

@@ -38,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="detailML"    column="detail_m_l"    />
         <result property="detailYH"    column="detail_y_h"    />
         <result property="detailYL"    column="detail_y_l"    />
+        <result property="detailYS" column="detail_y_s"/>
 
         <result property="detailContent"    column="detail_content"    />
         <result property="convertStatus" column="convert_status" />
@@ -79,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="roleListid" parameterType="Integer" resultMap="ActSuppliesRoleDetailResult">
-        select id, role_id, detail_name, detail_content, convert_status from act_supplies_role_detail where status = 0  and role_id = #{id}
+        select id, role_id, detail_name, detail_content, convert_status, detail_y_s from act_supplies_role_detail where status = 0  and role_id = #{id}
     </select>
 
     <select id="selectSuppliesname" parameterType="String" resultMap="ActSuppliesResult">

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

@@ -247,7 +247,7 @@ export default {
         return
       }
 
-      
+
       LuckyExcel.transformExcelToLucky(
         evt,
         function(exportJson) {
@@ -260,16 +260,23 @@ export default {
             return
           }
           console.log("导入数据的规则是:"+rule);
+          let sysRulez;
+          let sysRules;
+          let value=[];
+          let map=new Map();
           //获取物料转换的规则
-          let sysRulez = JSON.parse(rule[0].detailContent);
+          for(let i=0;i<rule.length;i++){
+            if (rule[i].convertStatus==1){
+              sysRulez = JSON.parse(rule[i].detailContent);
+            }
+            if(rule[i].convertStatus==2){
+              sysRules = JSON.parse(rule[i].detailContent);
+            }
+          }
           //获取物料转换的sheet表
           let data=window.luckysheet.transToData(exportJson.sheets[sysRulez[0].se].celldata);
-          let map=new Map();
-          //let key_i=data[sysRulez[0].re][sysRulez[0].ce].m;
           let key_i=sysRulez[0].ce;
           //获取物料转换的数据
-          let value=[];
-          let sysRules = JSON.parse(rule[1].detailContent);
           for (let i=0;i<sysRules.length;i++){
             //value.push(data[sysRules[i].re][sysRules[i].ce].m);
             value.push(sysRules[i].ce);