Merge branch 'master' of http://172.16.100.139/new-business/drp-web

.env.development

@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 德荣供应链管理平台
+VUE_APP_TITLE = 德荣资源平台
 
 # 开发环境配置
 ENV = 'development'
 
-# 德荣供应链管理平台/开发环境
+# 德荣资源平台/开发环境
 VUE_APP_BASE_API = '/drp-admin'
 #应用访问路径 例如使用前缀 /drp/
 VUE_APP_CONTEXT_PATH = '/drp'

.env.production

@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 德荣供应链管理平台
+VUE_APP_TITLE = 德荣资源平台
 
 # 生产环境配置
 ENV = 'production'
 
-# 德荣供应链管理平台/生产环境
+# 德荣资源平台/生产环境
 VUE_APP_BASE_API = '/drp-admin'
 #应用访问路径 例如使用前缀 /drp/
 VUE_APP_CONTEXT_PATH = '/drp'

.env.staging

@@ -1,12 +1,12 @@
 # 页面标题
-VUE_APP_TITLE = 德荣供应链管理平台
+VUE_APP_TITLE = 德荣资源平台
 
 NODE_ENV = production
 
 # 测试环境配置
 ENV = 'staging'
 
-# 德荣供应链管理平台/测试环境
+# 德荣资源平台/测试环境
 VUE_APP_BASE_API = '/drp-admin'
 #应用访问路径 例如使用前缀 /drp/
 VUE_APP_CONTEXT_PATH = '/drp'

package.json

@@ -1,7 +1,7 @@
 {
   "name": "ruoyi",
   "version": "3.8.5",
-  "description": "德荣供应链管理平台",
+  "description": "德荣资源平台",
   "author": "德荣",
   "license": "MIT",
   "scripts": {

public/index.html

@@ -7,7 +7,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <!-- <title><%= webpackConfig.name %></title> -->
-    <title>德荣供应链管理平台</title>
+    <title>德荣资源平台</title>
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
 	  <style>
     html,

src/components/PopDialog/index.vue

@@ -77,7 +77,7 @@
                 align="center"
                 sortable="custom"
                 min-width="90"
-                label="code"
+                label="物料编码"
               >
               </el-table-column>
               <el-table-column

src/layout/components/Navbar.vue

@@ -9,13 +9,13 @@
       <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
         
-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
+        <!-- <el-tooltip content="源码地址" effect="dark" placement="bottom">
           <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
-        </el-tooltip>
+        </el-tooltip> -->
 
-        <el-tooltip content="文档地址" effect="dark" placement="bottom">
+        <!-- <el-tooltip content="文档地址" effect="dark" placement="bottom">
           <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip>
+        </el-tooltip> -->
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 

src/layout/components/Sidebar/Logo.vue

@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: '德荣供应链管理平台',
+      title: '德荣资源平台',
       logo: logoImg
     }
   }

src/views/index.vue

@@ -55,7 +55,7 @@
       <el-col :sm="24" :lg="12" style="padding-left: 20px">
         <h2>德荣后台管理框架</h2>
         <p>
-          一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了德荣供应链管理平台，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
+          一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了德荣资源平台平台，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
         </p>
         <p>
           <b>当前版本:</b> <span>v{{ version }}</span>

src/views/login.vue

@@ -1,12 +1,7 @@
 <template>
   <div class="login">
-    <el-form
-      ref="loginForm"
-      :model="loginForm"
-      :rules="loginRules"
-      class="login-form"
-    >
-      <h3 class="title">德荣供应链管理平台</h3>
+    <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"

src/views/material/changeApply/add.vue

@@ -16,7 +16,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="物料编码" prop="materialCode">
-                <el-input :disabled="disable" v-model="basicForm.materialCode">
+                <el-input readonly :disabled="disable" v-model="basicForm.materialCode">
                   <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="test01"></el-button>
                 </el-input>
               </el-form-item>
@@ -147,7 +147,7 @@
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="交货周期" prop="leadTime">
-                <el-input type="number" :disabled="disable" v-model="basicForm.leadTime"></el-input>
+                <el-input type="number" min="0" :disabled="disable" v-model="basicForm.leadTime"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">

src/views/material/changeApply/index.vue

@@ -22,7 +22,7 @@
         <el-col :span="1.5">
           <span style="font-size: 14px;margin-right: 5px;">物料编码</span>
           <el-input
-            v-model="queryParams.code"
+            v-model="queryParams.materialCode"
             size="small"
             placeholder="请输入物料编码查询"
             clearable
@@ -152,7 +152,7 @@ export default {
     return{
       tableList: [],
       queryParams: {
-        code: '',
+        materialCode: '',
         materialName: '',
         status: '',
         pageNum: 1,
@@ -185,7 +185,7 @@ export default {
   },
   methods: {
     reset() {
-      this.queryParams.code = ''
+      this.queryParams.materialCode = ''
       this.queryParams.materialName = ''
       this.queryParams.pageNum = 1
       this.queryParams.status = ''

src/views/material/requisition/add.vue

@@ -259,7 +259,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="有效期" prop="usefulLife">
-                <el-input type="number" :disabled="disable" v-model="basicForm.usefulLife"></el-input>
+                <el-input type="number" min="0" :disabled="disable" v-model="basicForm.usefulLife"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -300,7 +300,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="近效期预警天数" prop="recentWarningPeriod">
-                <el-input type="number" :disabled="disable" v-model="basicForm.recentWarningPeriod"></el-input>
+                <el-input type="number" min="0" :disabled="disable" v-model="basicForm.recentWarningPeriod"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -365,7 +365,7 @@
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="交货周期" prop="deliveryPeriod">
-                <el-input type="number" :disabled="disable" v-model="basicForm.deliveryPeriod"></el-input>
+                <el-input type="number" min="0" :disabled="disable" v-model="basicForm.deliveryPeriod"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -1026,11 +1026,13 @@ export default {
         registrant: [{required: true, message: '请输入注册人/上市许可持有人', trigger: 'blur'}],
         originPlace: [{ required: true, message: '请选择产地', trigger: 'change' }],
         storageCondition: [{ required: true, message: '请选择存储条件', trigger: 'change' }],
+        materialRate: [{ required: true, message: '请选择物料税类', trigger: 'change' }],
         deliveryPeriod: [{required: true, message: '请输入交货周期', trigger: 'blur'}],
         minOrderQty: [{required: true, message: '请输入最小起定量', trigger: 'blur'}],
+        minPackQty: [{required: true, message: '请输入最小包装量', trigger: 'blur'}],
         puPersonnelId: [{ required: true, message: '请选择采购员', trigger: 'change' }],
         minBatchQty: [{required: true, message: '请输入最小批量', trigger: 'blur'}],
-        packExplain: [{required: true, message: '请输入包装说明', trigger: 'blur'}]
+        packExplain: [{required: true, message: '请输入包装说明', trigger: 'blur'}],
       },
       basicForm2: {
         // 是否药品
@@ -1306,7 +1308,7 @@ export default {
             this.basicForm.businessDepartment = res.data.businessDepartment
             this.getDepartDetails(res.data.businessDepartment)
           }
-          if(res.data.unitId) {this.basicForm.unitId = res.data.unitId.toString()}
+          if(res.data.unitId) {this.basicForm.unitId = res.data.unitId}
           if(res.data.manufacturerId) {this.basicForm.manufacturerId = res.data.manufacturerId.toString()}
           if(res.data.usefulLifeUnitId) {this.basicForm.usefulLifeUnitId = res.data.usefulLifeUnitId.toString()}
           if(res.data.expiryUnitId) {this.basicForm.expiryUnitId = res.data.expiryUnitId.toString()}

src/views/register.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">德荣供应链管理平台</h3>
+      <h3 class="title">德荣资源平台</h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />