ui 代码提交

ruoyi-ui/package.json

@@ -4,13 +4,13 @@
   "description": "开滦集团报送系统",
   "author": "若依",
   "license": "MIT",
-    "scripts": {
-        "dev": "vue-cli-service serve",
-        "build:prod": "vue-cli-service build",
-        "build:stage": "vue-cli-service build --mode staging",
-        "preview": "node build/index.js --preview",
-        "lint": "eslint --ext .js,.vue src"
-    },
+  "scripts": {
+    "dev": "vue-cli-service serve",
+    "build:prod": "vue-cli-service build",
+    "build:stage": "vue-cli-service build --mode staging",
+    "preview": "node build/index.js --preview",
+    "lint": "eslint --ext .js,.vue src"
+  },
   "husky": {
     "hooks": {
       "pre-commit": "lint-staged"
@@ -61,6 +61,7 @@
     "jsencrypt": "3.0.0-rc.1",
     "lint-staged": "10.5.3",
     "luckyexcel": "^1.0.1",
+    "moment": "^2.30.1",
     "nprogress": "0.2.0",
     "quill": "1.3.7",
     "runjs": "4.4.2",

ruoyi-ui/public/index.html

@@ -17,13 +17,6 @@
     <script src="/expendPlugins/chart/chartmix.umd.min.js"></script>
 
 
-<!--<link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/luckysheet@latest/dist/plugins/css/pluginsCss.css' />
-    <link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/luckysheet@latest/dist/plugins/plugins.css' />
-    <link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/luckysheet@latest/dist/css/luckysheet.css' />
-    <link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/luckysheet@latest/dist/assets/iconfont/iconfont.css' />
-    <script src="./luckysheet/plugins/js/jquery.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/luckysheet@latest/dist/plugins/js/plugin.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/luckysheet@latest/dist/luckysheet.umd.js"></script>-->
 
     <title><%= webpackConfig.name %></title>
 	  <style>

ruoyi-ui/src/api/Actsupplies/cleaning_rule.js

@@ -8,14 +8,13 @@ export function selectActSuppliesHistorydata(tylkStatus) {
 
   })
 }
-
-// 查询通用凭证单表数据
+//查询通用凭证单表数据
 export function selectActSuppliesHistorydataAcc(tylkStatus) {
-    return request({
-        url: '/system/cleaningrule/queryAllAcc/'+tylkStatus,
-        method: 'get'
+  return request({
+    url: '/system/cleaningrule/queryAllAcc/'+tylkStatus,
+    method: 'get'
 
-    })
+  })
 }
 
 
@@ -50,6 +49,8 @@ export function selectActSuppliesHistorydataAcc(tylkStatus) {
 
 
 
+
+
 
 
 

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

@@ -2,27 +2,27 @@ import request from '@/utils/request'
 import LuckyExcel from "luckyexcel";
 //查询6矿物聊
 export function materialListPZ() {
-    return request({
-        url: '/ActSuppliesDetails/ActSuppliesDetails/materialListPZ' ,
-        method: 'get'
-    })
+  return request({
+      url: '/ActSuppliesDetails/ActSuppliesDetails/materialListPZ' ,
+      method: 'get'
+  })
 }
 
 //小物料转大物料
 export function materialConvert(data) {
-    return request({
-        url: '/ActSuppliesConvert/ActSuppliesConvert/converSupplies',
-        method: 'post',
-        data: data
-    })
+  return request({
+    url: '/ActSuppliesConvert/ActSuppliesConvert/converSupplies',
+    method: 'post',
+    data: data
+  })
 }
 // 查询Excel模板列表
 export function listSuppliesTemplate(query) {
-    return request({
-        url: '/SuppliesTemplate/SuppliesTemplate/list',
-        method: 'get',
-        params: query
-    })
+  return request({
+    url: '/SuppliesTemplate/SuppliesTemplate/list',
+    method: 'get',
+    params: query
+  })
 }
 
 // 查询导入规则列表
@@ -44,32 +44,32 @@ export function getSuppliesrole(id) {
 
 export function department(sskId){
     return request({
-        url: `/ActClassification/ActClassification/SunDy/${sskId}`,
-        method: 'get'
+      url: `/ActClassification/ActClassification/SunDy/${sskId}`,
+      method: 'get'
     })
 }
 //获取到会计科目编码
 export function accountingcode(newData){
     return request({
-        url: `/ActSuppliesAccount/ActSuppliesAccount/options`,
-        method: 'post',
-        data: newData
+      url: `/ActSuppliesAccount/ActSuppliesAccount/options`,
+      method: 'post',
+      data: newData
     })
 }
 //展示excel模板
 export function listSuppliesTemplateId(id) {
-    return request({
-        url: '/SuppliesTemplate/SuppliesTemplate/listId/' + id,
-        method: 'get'
-    })
+  return request({
+    url: '/SuppliesTemplate/SuppliesTemplate/listId/' + id,
+    method: 'get'
+  })
 }
 
 // 查询Excel模板详细
 export function getSuppliesTemplate(id) {
-    return request({
-        url: '/SuppliesTemplate/SuppliesTemplate/' + id,
-        method: 'get'
-    })
+  return request({
+    url: '/SuppliesTemplate/SuppliesTemplate/' + id,
+    method: 'get'
+  })
 }
 
 // 修改导入规则
@@ -83,23 +83,23 @@ export function updateSuppliesrole(id) {
 
 // 新增Excel模板
 export function addSuppliesTemplate(data) {
-    return request({
-        url: '/SuppliesTemplate/SuppliesTemplate',
-        headers:{
-            repeatSubmit:false
-        },
-        method: 'post',
-        data: data
-    })
+  return request({
+    url: '/SuppliesTemplate/SuppliesTemplate',
+    headers:{
+      repeatSubmit:false
+    },
+    method: 'post',
+    data: data
+  })
 }
 
 // 修改Excel模板
 export function updateSuppliesTemplate(data) {
-    return request({
-        url: '/SuppliesTemplate/SuppliesTemplate',
-        method: 'put',
-        data: data
-    })
+  return request({
+    url: '/SuppliesTemplate/SuppliesTemplate',
+    method: 'put',
+    data: data
+  })
 }
 
 export function releaseTemplateStatus(id){
@@ -125,123 +125,123 @@ export function CopyTemplate(id){
 
 // 删除Excel模板
 export function delSuppliesTemplate(id) {
-    return request({
-        url: '/SuppliesTemplate/SuppliesTemplate/' + id,
-        method: 'delete'
-    })
+  return request({
+    url: '/SuppliesTemplate/SuppliesTemplate/' + id,
+    method: 'delete'
+  })
 }
 
 // 展示Excel模板
 export function delSuppliesSave(id) {
-    return request({
-        url: '/SuppliesTemplate/SuppliesTemplate/save/' + id,
-        method: 'get'
-    })
+  return request({
+    url: '/SuppliesTemplate/SuppliesTemplate/save/' + id,
+    method: 'get'
+  })
 }
 
 //启用
 export function toggleEnable(id) {
-    return request({
-        url: '/SuppliesTemplate/SuppliesTemplate/enable/' +id,
-        method: 'get',
+  return request({
+    url: '/SuppliesTemplate/SuppliesTemplate/enable/' +id,
+    method: 'get',
 
-    })
+  })
 }
 //禁用
 export function toggleDisable(id) {
-    return request({
-        url: '/SuppliesTemplate/SuppliesTemplate/disable/' + id,
-        method: 'get',
-    })
+  return request({
+    url: '/SuppliesTemplate/SuppliesTemplate/disable/' + id,
+    method: 'get',
+  })
 }
 
 
 export function findName(name) {
-    return request({
-        url: '/SuppliesTemplate/SuppliesTemplate/ifName/' + name,
-        method: 'get'
-    })
+  return request({
+    url: '/SuppliesTemplate/SuppliesTemplate/ifName/' + name,
+    method: 'get'
+  })
 }
 
 
 // 模板转换页面查询规则对应用友物料名称
 export function getSuppliesName(name) {
-    return request({
-        url: '/ActSuppliesConvert/ActSuppliesConvert/saveSuppliesname/' + name,
-        method: 'get'
-    })
+  return request({
+    url: '/ActSuppliesConvert/ActSuppliesConvert/saveSuppliesname/' + name,
+    method: 'get'
+  })
 }
 
 
 // 模板转换页面查询Excel模板列表
 export function templateList(query) {
-    return request({
-        url: '/ActSuppliesConvert/ActSuppliesConvert/list',
-        method: 'get',
-        params: query
-    })
+  return request({
+    url: '/ActSuppliesConvert/ActSuppliesConvert/list',
+    method: 'get',
+    params: query
+  })
 }
 // 模板转换页面查询Excel模板内容列表
 export function templateListid(id) {
-    return request({
-        url: '/ActSuppliesConvert/ActSuppliesConvert/listid/' + id,
-        method: 'get'
-    })
+  return request({
+    url: '/ActSuppliesConvert/ActSuppliesConvert/listid/' + id,
+    method: 'get'
+  })
 }
 // 模板转换页面查询规则列表
 export function roleList(id) {
-    return request({
-        url: '/ActSuppliesConvert/ActSuppliesConvert/rolelist/' + id,
-        method: 'get'
-    })
+  return request({
+    url: '/ActSuppliesConvert/ActSuppliesConvert/rolelist/' + id,
+    method: 'get'
+  })
 }
 // 模板转换页面查询规则详情列表
 export function roleListid(id) {
-    return request({
-        url: '/ActSuppliesConvert/ActSuppliesConvert/rolelistid/' + id,
-        method: 'get'
-    })
+  return request({
+    url: '/ActSuppliesConvert/ActSuppliesConvert/rolelistid/' + id,
+    method: 'get'
+  })
 }
 
 
 // 查询规则列表
 export function listRule(query) {
-    return request({
-        url: '/system/ruleManagement/list',
-        method: 'get',
-        params: query
-    })
+  return request({
+    url: '/system/ruleManagement/list',
+    method: 'get',
+    params: query
+  })
 }
 // 查询规则详情详细
 export function getRule(id) {
-    return request({
-        url: '/system/ruleManagement/' + id,
-        method: 'get'
-    })
+  return request({
+    url: '/system/ruleManagement/' + id,
+    method: 'get'
+  })
 }
 // 新增规则详情
 export function addRuleManagement(data) {
-    return request({
-        url: '/system/ruleManagement/add',
-        method: 'post',
-        data: data
-    })
+  return request({
+    url: '/system/ruleManagement/add',
+    method: 'post',
+    data: data
+  })
 }
 
 // 修改规则详情
 export function updateRuleManagement(data) {
-    return request({
-        url: '/system/ruleManagement/edit',
-        method: 'put',
-        data: data
-    })
+  return request({
+    url: '/system/ruleManagement/edit',
+    method: 'put',
+    data: data
+  })
 }
 // 删除规则详情
 export function delRuleManagement(id) {
-    return request({
-        url: '/system/ruleManagement/' + id,
-        method: 'delete'
-    })
+  return request({
+    url: '/system/ruleManagement/' + id,
+    method: 'delete'
+  })
 }
 
 //查询六矿物料

ruoyi-ui/src/api/system/historydata.js

@@ -55,66 +55,63 @@ export function exportHistorydata(query) {
 
 // 新增 历史数据
 export function addInsert(data) {
-    return request({
-        url: '/system/historydata/addInsert',
-        method: 'post',
-        data: data
-    })
+  return request({
+    url: '/system/historydata/addInsertAccount',
+    method: 'post',
+    data: data
+  })
 }
 
 // 数据清洗 历史数据
 export function addInsert1(data) {
-    return request({
-        url: '/system/historydata/addInsert1',
-        method: 'post',
-        data: data
-    })
+  return request({
+    url: '/system/historydata/addInsert1',
+    method: 'post',
+    data: data
+  })
+}
+
+//清洗通用凭证单
+export function addInsertAccount1(data) {
+  return request({
+    url: '/system/historydata/addInsertAccount1',
+    method: 'post',
+    data: data
+  })
+}
+//清洗通用凭证单
+
+export function addInsertAccount2(data) {
+  console.log(data,'我发送的数据')
+  return request({
+    url: '/system/historydata/addInsertAccount2',
+    method: 'post',
+    data: data
+  })
 }
 
 // 数据清洗 历史数据
 export function addInsert2(data) {
-    return request({
-        url: '/system/historydata/addInsert2',
-        method: 'post',
-        data: data
-    })
+  return request({
+    url: '/system/historydata/addInsert2',
+    method: 'post',
+    data: data
+  })
 }
-
 // 数据清洗 历史数据
 export function addInsertConvert1(data) {
-    return request({
-        url: '/system/historydata/addInsertConvert1',
-        method: 'post',
-        data: data
-    })
+  return request({
+    url: '/system/historydata/addInsertConvert1',
+    method: 'post',
+    data: data
+  })
 }
 
 // 数据清洗 历史数据
 export function addInsertConvert2(data) {
-    return request({
-        url: '/system/historydata/addInsertConvert2',
-        method: 'post',
-        data: data
-    })
-}
-
-
-//清洗通用凭证单
-export function addInsertAccount1(data) {
-    return request({
-        url: '/system/historydata/addInsertAccount1',
-        method: 'post',
-        data: data
-    })
-}
-//清洗通用凭证单
-export function addInsertAccount2(data) {
-    return request({
-        url: '/system/historydata/addInsertAccount2',
-        method: 'post',
-        data: data
-    })
+  return request({
+    url: '/system/historydata/addInsertConvert2',
+    method: 'post',
+    data: data
+  })
 }
-
-
-

ruoyi-ui/src/components/PanThumb/index.vue

@@ -5,7 +5,7 @@
         <slot />
       </div>
     </div>
-    <!-- eslint-disable-next-line -->
+     eslint-disable-next-line -->
     <div :style="{backgroundImage: `url(${image})`}" class="pan-thumb"></div>
   </div>
 </template>

ruoyi-ui/src/store/index.js

@@ -6,6 +6,7 @@ import tagsView from './modules/tagsView'
 import permission from './modules/permission'
 import settings from './modules/settings'
 import getters from './getters'
+import userInfo from './modules/userInfo'
 
 Vue.use(Vuex)
 
@@ -15,7 +16,8 @@ const store = new Vuex.Store({
     user,
     tagsView,
     permission,
-    settings
+    settings,
+    userInfo
   },
   getters
 })

ruoyi-ui/src/store/modules/userInfo.js

+
+const state = {
+    nickName: null
+  }
+  
+  const mutations = {
+    SET_NICKNAME(state, nickname) {
+      state.nickName = nickname
+    }
+  }
+  
+  const actions = {
+    setNickName({ commit }, nickname) {
+      commit('SET_NICKNAME', nickname)
+    }
+  }
+  
+  export default {
+    namespaced: true,
+    state,
+    mutations,
+    actions
+  }
\ No newline at end of file

ruoyi-ui/src/utils/request.js

@@ -10,7 +10,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 1000000000
+  timeout: 10000000000000
 })
 // request拦截器
 service.interceptors.request.use(config => {

ruoyi-ui/src/views/ActSuppliesConvert/convert/index.vue

@@ -111,30 +111,6 @@
       @pagination="getList"
     />
 
-<!--    &lt;!&ndash; 添加或修改通用规则对话框 &ndash;&gt;-->
-<!--    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>-->
-<!--      <el-form ref="form" :model="form" :rules="rules" label-width="80px">-->
-<!--        <el-form-item label="模板id" prop="tempId">-->
-<!--          <el-input v-model="form.tempId" placeholder="请输入模板id" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="规则名称" prop="name">-->
-<!--          <el-input v-model="form.name" placeholder="请输入规则名称" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="规则内容">-->
-<!--          <editor v-model="form.content" :min-height="192"/>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="状态">-->
-<!--          <el-radio-group v-model="form.status">-->
-<!--            <el-radio label="1">请选择字典生成</el-radio>-->
-<!--          </el-radio-group>-->
-<!--        </el-form-item>-->
-<!--      </el-form>-->
-<!--      <div slot="footer" class="dialog-footer">-->
-<!--        <el-button type="primary" @click="submitForm">确 定</el-button>-->
-<!--        <el-button @click="cancel">取 消</el-button>-->
-<!--      </div>-->
-<!--    </el-dialog>-->
-
       <el-dialog :title="title" :visible.sync="open" width="1300px" append-to-body>
           <el-form ref="form" :model="form" :rules="rules" label-width="80px">
               <el-form-item label="所属模板" prop="roleId">
@@ -159,10 +135,9 @@
                   </el-col>
               </el-row>
               <!-- 生成输入框 -->
-              <div v-for="index in instea" :key="index" v-if="">
+              <div v-for="index in instea" :key="index">
 
                   <el-form-item label="导入表行/列/单元格选择" prop="detailMH" class="form-item-inline">
-<!--                      <el-input-number size="medium" v-model="ZE[index-1]" :min="1" :step="1">1</el-input-number>-->
                       <el-select v-model="ZE[index-1]" filterable placeholder="请选择运算方法" >
                           <el-option
                               v-for="option in optionsOne"
@@ -183,7 +158,6 @@
                   </el-form-item>
 
                   <el-form-item label="模板表行/列/单元格选择" prop="detailMH" class="form-item-inline">
-<!--                      <el-input-number size="medium" v-model="ZT[index-1]" :min="1" :step="1">1</el-input-number>-->
                       <el-select v-model="ZT[index-1]" filterable placeholder="请选择运算方法" >
                           <el-option
                               v-for="option in optionsOne"

ruoyi-ui/src/views/ActSuppliesConvert/convert/indexConvert.vue

@@ -4,7 +4,6 @@
             <el-form-item label="模板" prop="name">
                 <el-select v-model="selectedOption" ref="mySelect" size="mini" @change="handleOptionChange" filterable
                            placeholder="请选择您要查看的模板">
-                    <!--  <el-option label="自设的模板名" value="使用空白模板"></el-option>-->
                     <el-option
                         v-for="item in depss" :key="item.id" :label="item.templateName" :value="item.id">
                     </el-option>

ruoyi-ui/src/views/activiti/definition/index.vue

@@ -59,23 +59,6 @@
       <el-table-column label="流程描述" align="center" prop="description" width="150" />
       <el-table-column label="所属分类" align="center" prop="category" width="120" />
       <el-table-column label="部署时间" align="center" prop="deploymentTime" width="100" />
-      <!--<el-table-column label="流程定义" align="center" prop="resourceName" width="120">
-        <template slot-scope="scope">
-          <a
-            :href="baseURL + '/activiti/definition/readResource?pdid=' + scope.row.id + '&resourceName=' + scope.row.resourceName "
-            target="_blank"
-            style="color: #409EFF;"
-          >{{ scope.row.resourceName.substring(scope.row.resourceName.lastIndexOf('/') + 1) }}</a>
-        </template>
-      </el-table-column>
-      <el-table-column label="流程图" align="center" prop="diagramResourceName" width="120">
-        <template slot-scope="scope">
-          <img
-            style="width: 100px;"
-            :src="baseURL + '/activiti/definition/readResource?pdid=' + scope.row.id + '&resourceName=' + scope.row.diagramResourceName"
-          />
-        </template>
-      </el-table-column>-->
       <el-table-column label="状态" align="center" prop="suspendStateName" width="90" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">

ruoyi-ui/src/views/example/demo/demoForm.vue

@@ -24,7 +24,6 @@
                           :readonly="taskName!=='调整申请'">
           </el-date-picker>
         </el-form-item>
-        <!--<el-form-item label="流程实例ID" prop="instanceId">
           <el-input v-model="form.instanceId" readonly />
         </el-form-item>-->
         <el-form-item label="备注" prop="remark">

ruoyi-ui/src/views/index.vue

@@ -16,6 +16,7 @@
 </template>
 
 <script>
+import { getInfo } from "@/api/login";
 
 
 
@@ -28,14 +29,18 @@ export default {
         return {
 
         }
+    },
+    mounted() {
+        
     },
     methods: {
-
+      
+    
     }
 }
 </script>
 <style scoped>
-.container{
+.container {
     display: flex;
     flex-direction: column;
     height: calc(100vh - 84px);
@@ -44,7 +49,7 @@ export default {
     background-size: cover;
 }
 
-.main-footer{
+.main-footer {
     position: absolute;
     left: 0;
     bottom: 0;
@@ -58,78 +63,10 @@ export default {
     padding: 15px;
 }
 
-.main-footer .split{
+.main-footer .split {
     padding: 0 10px;
     font-size: 12px;
 }
 </style>
 
 
-
-
-
-
-
-<!--<template>-->
-<!--  <div class="container">-->
-
-<!--      <div class="index">-->
-
-<!--      </div>-->
-
-<!--      <div class="input" style="position: absolute; bottom: 0;">-->
-<!--          开发中心-->
-<!--      </div>-->
-
-<!--  </div>-->
-<!--&lt;!&ndash;    开滦（集团）财务共享中心&河北天翼科贸发展有限公司&ndash;&gt;-->
-<!--</template>-->
-
-<!--<script>-->
-
-
-
-<!--export default {-->
-<!--  name: 'Index',-->
-<!--  components: {-->
-
-<!--  },-->
-<!--  data() {-->
-<!--    return {-->
-
-<!--    }-->
-<!--  },-->
-<!--  methods: {-->
-
-<!--  }-->
-<!--}-->
-<!--</script>-->
-<!--<style rel="stylesheet/scss" lang="scss">-->
-<!--  .index {-->
-<!--    display: flex;-->
-<!--    justify-content: center;-->
-<!--    align-items: center;-->
-<!--      flex: 9;-->
-<!--      height: 90vh;-->
-<!--    background-image: url("../assets/images/login-background2.jpg");-->
-<!--      background-position: center;-->
-<!--    background-size: cover;-->
-<!--  }-->
-<!--  .title {-->
-<!--    margin: 0px auto 30px auto;-->
-<!--    text-align: center;-->
-<!--    color: #707070;-->
-<!--  }-->
-<!--  .input{-->
-<!--      flex: 1;-->
-<!--      font-size: 30px;-->
-<!--      color: #1b1b19;-->
-<!--  }-->
-<!--  .container {-->
-<!--      display: flex;-->
-<!--      flex-direction: column;-->
-<!--      height: 100vh;-->
-<!--  }-->
-
-<!--</style>-->
-

ruoyi-ui/src/views/login.vue

@@ -7,7 +7,7 @@
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
       <h3 class="title">开滦采集转换系统</h3>
       <el-form-item prop="username">
-        <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
+        <el-input v-model="loginForm.username" type="btext" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
@@ -58,7 +58,7 @@
 </template>
 
 <script>
-import { getCodeImg } from "@/api/login";
+import { getCodeImg } from "@/api/login"; 
 import Cookies from "js-cookie";
 import { encrypt, decrypt } from '@/utils/jsencrypt'
 

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

@@ -493,7 +493,7 @@ export default {
             this.fetchOptions();
             this.reset();
             this.open = true;
-            this.title = "新增物料分类";
+            this.title = "新增物料";
         },
         /** 修改按钮操作 */
         handleUpdate(row) {

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

@@ -492,7 +492,7 @@ export default {
         handleAdd() {
             this.reset();
             this.open = true;
-            this.title = "新增物料分类";
+            this.title = "新增二级分类";
         },
         /** 修改按钮操作 */
         async handleUpdate(row) {

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

@@ -80,13 +80,13 @@
             @click="handleDetails(scope.row)"
             v-hasPermi="['system:historydata']"
           >详情</el-button>
-<!--          <el-button
+          <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:historydata:remove']"
-          >删除</el-button>-->
+          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -166,13 +166,11 @@ export default {
         roleId: null,
         historyName: null,
         historyContent: null,
-          historyRole:null,
         identifyingCode: null,
         status: null,
       },
       // 表单参数
       form: {},
-        formContent:{},
 
     };
   },
@@ -210,8 +208,7 @@ export default {
         exportUuid: null,
         roleId: null,
         historyName: null,
-        historyRole: null,
-          historyContent: null,
+        historyContent: null,
         identifyingCode: null,
         status: 0,
         createBy: null,
@@ -273,27 +270,22 @@ export default {
     },
     handleDetails(row) {
 
-        getHistorydata(row.id).then(response => {
-            this.formContent = response.data;
-            this.positionValue = 'absolute';
-            luckysheet.destroy();
-            luckysheet.create({
-                container: "luckysheet", // Luckysheet 的容器元素 ID
-                title: this.formContent.historyName, // Excel 文件名
-                data: JSON.parse(this.formContent.historyContent), // Excel 数据
-                showtoolbar: false, //是否第二列显示工具栏
-                showinfobar: true, //是否显示顶部名称栏
-                showsheetbar: false, //是否显示底部表格名称区域
-                pointEdit: false, //是否是编辑器插入表格模式
-                pointEditUpdate: null, //编辑器表格更新函数
-                allowEdit: false,//作用：是否允许前台编辑
-                functionButton: '<button id="exportButton" class="btn btn-primary" style=" padding:3px 6px; font-size: 16px;width: 100px;height: 27px; margin-right: 85px;" onclick="handleReturnButtonClick()">返回</button>',
+        this.positionValue = 'absolute';
+        luckysheet.destroy();
+        luckysheet.create({
+            container: "luckysheet", // Luckysheet 的容器元素 ID
+            title: row.historyName, // Excel 文件名
+            data: JSON.parse(row.historyContent), // Excel 数据
+            showtoolbar: false, //是否第二列显示工具栏
+            showinfobar: true, //是否显示顶部名称栏
+            showsheetbar: false, //是否显示底部表格名称区域
+            pointEdit: false, //是否是编辑器插入表格模式
+            pointEditUpdate: null, //编辑器表格更新函数
+            allowEdit: false,//作用：是否允许前台编辑
+            functionButton: '<button id="exportButton" class="btn btn-primary" style=" padding:3px 6px; font-size: 16px;width: 100px;height: 27px; margin-right: 85px;" onclick="handleReturnButtonClick()">返回</button>',
 
-            });
         });
 
-
-
     },
       /**详情返回按钮 */
       handleReturnButtonClick() {
@@ -301,7 +293,7 @@ export default {
           luckysheet.destroy();
       },
     /** 删除按钮操作 */
-   /* handleDelete(row) {
+    handleDelete(row) {
       const ids = row.id || this.ids;
       this.$confirm('是否确认删除 历史数据编号为"' + ids + '"的数据项?', "警告", {
           confirmButtonText: "确定",
@@ -313,7 +305,7 @@ export default {
           this.getList();
           this.msgSuccess("删除成功");
         })
-    },*/
+    },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;

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

@@ -330,6 +330,7 @@ export default {
     name: "SuppliesTemplate",
     data() {
         return {
+            uploading:'',
             selectedOption:'',
             positionValue: 'static',
             fileList: [{
@@ -444,9 +445,9 @@ export default {
 
         /**上传事件 */
         async beforeUpload(file) {
+            console.log(file)
             //存在重复
             findName(file.name).then(result => {
-                console.log(result.data)
                 if (result.data === "存在重复") {
 
                     this.fileListName = [];
@@ -462,6 +463,7 @@ export default {
             }
             this.uploading = true;
             await LuckyExcel.transformExcelToLucky(file, (exportJson, lucksheetfile) => {
+                console.log(exportJson, lucksheetfile)
                 this.form.templateName = file.name;
                 this.form.templateContent = JSON.stringify(exportJson.sheets);
             });
@@ -555,7 +557,7 @@ export default {
             if (row.status===1) {
                 this.title = "修改导入规则";
                 this.selectedOption = '';
-                this.forms = '';
+                this.forms = {};
                 this.instea = '';
                 const id = row.id || this.ids
                 listSuppliesrole(id).then(response => {

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

@@ -230,6 +230,7 @@ export default {
                         data: exportJson.sheets,
                         userInfo: exportJson.info.name.creator
                     })
+                    console.log(exportJson.sheets,'2222222222222')
                     data1=exportJson.sheets[0];
                     name1=exportJson.sheets[0].name;
                     let suffixArr = exportJson.info.name.split('.');

ruoyi-ui/vue.config.js

@@ -21,7 +21,6 @@ module.exports = {
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: 'dist',
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
-  assetsDir: 'static',
   // 是否开启eslint保存检测，有效值：ture | false | 'error'
   lintOnSave: false,//process.env.NODE_ENV === 'development'
   // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
@@ -34,9 +33,9 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://192.168.10.105:5001`,
+        target: `http://192.168.0.111:8080`,
         // target: `http://localhost:5001`,
-        target: `http://localhost:8080`,
+        // target: `http://localhost:8080`,
 
         changeOrigin: true,
         pathRewrite: {