物资详情页面添加所属矿区功能

ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesHistorydata.java

@@ -65,6 +65,9 @@ public class ActSuppliesHistorydata extends BaseEntity
     /**时间*/
     private String date;
 
+    /**所属矿区*/
+    private String mining;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -183,6 +186,14 @@ public class ActSuppliesHistorydata extends BaseEntity
         this.date = date;
     }
 
+    public String getMining() {
+        return mining;
+    }
+
+    public void setMining(String mining) {
+        this.mining = mining;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesHistorydataServiceImpl.java

@@ -133,6 +133,7 @@ public class ActSuppliesHistorydataServiceImpl implements IActSuppliesHistorydat
                     actSuppliesHistorydata1.setStatus(1L);
                     actSuppliesHistorydata1.setIdentifyingCode(0L);
                     actSuppliesHistorydata1.setDate(actSuppliesHistorydata.get(i).getDate());
+                    actSuppliesHistorydata1.setMining(actSuppliesHistorydata.get(i).getMining());
                     actSuppliesHistorydataMapper.insertActSuppliesHistorydata(actSuppliesHistorydata1);
 
                 }

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

@@ -62,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="date != null">date,</if>
+            <if test="mining != null">ssk_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="importUuid != null">#{importUuid},</if>
@@ -76,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="date != null">#{date},</if>
+            <if test="mining != null">#{mining},</if>
         </trim>
     </insert>
 
@@ -133,6 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="date != null">date = #{date},</if>
+            <if test="mining != null">ssk_id = #{mining},</if>
         </trim>
         <where>
             import_uuid = #{importUuid}

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

@@ -171,9 +171,7 @@ export default {
       },
       // 表单参数
       form: {},
-      // 表单校验
-      rules: {
-      }
+
     };
   },
   created() {

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

@@ -23,6 +23,16 @@
                         placeholder="选择月">
                     </el-date-picker>
                 </el-form-item>
+                <el-form-item label="所属矿区" prop="status">
+                    <el-select v-model="mining" placeholder="请选择矿区" >
+                        <el-option label="东欢坨矿" :value="1"></el-option>
+                        <el-option label="范矿" :value="2"></el-option>
+                        <el-option label="林西矿" :value="3"></el-option>
+                        <el-option label="吕矿" :value="4"></el-option>
+                        <el-option label="钱家营矿" :value="5"></el-option>
+                        <el-option label="唐山矿" :value="6"></el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item>
                     <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
                 </el-form-item>
@@ -107,6 +117,7 @@ export default {
             // 表单参数
             from: {},
             date: '',
+            mining:'',
             froms: {
                 hId : "",
                 projectId : "",
@@ -1193,6 +1204,7 @@ export default {
             let month = ("0" + (date.getMonth() + 1)).slice(-2);
             let datastr = fullYear + month;
             this.dfrom.date = datastr
+            this.dfrom.mining = this.mining
             this.from.status=this.dfrom.status=0;
             list.push(this.dfrom);
             this.from.historyName=fileName+'(生成文件)';