Merge remote-tracking branch 'origin/master'

ruoyi-ui/package.json

@@ -5,9 +5,9 @@
   "author": "若依",
   "license": "MIT",
   "scripts": {
-    "dev": "vue-cli-service serve",
-    "build:prod": "vue-cli-service build",
-    "build:stage": "vue-cli-service build --mode staging",
+    "dev": "set NODE_OPTIONS=--openssl-legacy-provider & vue-cli-service serve",
+    "build:prod": "set NODE_OPTIONS=--openssl-legacy-provider & vue-cli-service build",
+    "build:stage": "set NODE_OPTIONS=--openssl-legacy-provider & vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src"
   },
@@ -65,7 +65,7 @@
     "vue-router": "3.4.9",
     "vuedraggable": "2.24.3",
     "vuex": "3.6.0",
-    "xlsx": "^0.17.2"
+    "xlsx": "^0.17.5"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.6",

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

@@ -115,7 +115,7 @@
     <!-- 添加或修改Excel模板对话框 -->
     <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="sid">
+        <el-form-item label="关联ID" prop="detId">
           <el-select v-model="form.detId" filterable placeholder="请选择关联项" >
             <el-option
               v-for="option in options3"
@@ -201,6 +201,9 @@ export default {
       form: {
       },
       rules: {
+        detId: [
+          { required: true, message: "关联id不能为空", trigger: "change" }
+        ]
       },
       date:[],
       filename:""