Merge remote-tracking branch 'origin/master'

.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,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">德荣供应链管理平台</h3>
+      <h3 class="title">德荣资源平台</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
@@ -9,7 +9,11 @@
           auto-complete="off"
           placeholder="账号"
         >
-          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+          <svg-icon
+            slot="prefix"
+            icon-class="user"
+            class="el-input__icon input-icon"
+          />
         </el-input>
       </el-form-item>
       <el-form-item prop="password">
@@ -20,7 +24,11 @@
           placeholder="密码"
           @keyup.enter.native="handleLogin"
         >
-          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+          <svg-icon
+            slot="prefix"
+            icon-class="password"
+            class="el-input__icon input-icon"
+          />
         </el-input>
       </el-form-item>
       <el-form-item prop="code" v-if="captchaEnabled">
@@ -31,26 +39,36 @@
           style="width: 63%"
           @keyup.enter.native="handleLogin"
         >
-          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
+          <svg-icon
+            slot="prefix"
+            icon-class="validCode"
+            class="el-input__icon input-icon"
+          />
         </el-input>
         <div class="login-code">
-          <img :src="codeUrl" @click="getCode" class="login-code-img"/>
+          <img :src="codeUrl" @click="getCode" class="login-code-img" />
         </div>
       </el-form-item>
-      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
-      <el-form-item style="width:100%;">
+      <el-checkbox
+        v-model="loginForm.rememberMe"
+        style="margin: 0px 0px 25px 0px"
+        >记住密码</el-checkbox
+      >
+      <el-form-item style="width: 100%">
         <el-button
           :loading="loading"
           size="medium"
           type="primary"
-          style="width:100%;"
+          style="width: 100%"
           @click.native.prevent="handleLogin"
         >
           <span v-if="!loading">登 录</span>
           <span v-else>登 录 中...</span>
         </el-button>
-        <div style="float: right;" v-if="register">
-          <router-link class="link-type" :to="'/register'">立即注册</router-link>
+        <div style="float: right" v-if="register">
+          <router-link class="link-type" :to="'/register'"
+            >立即注册</router-link
+          >
         </div>
       </el-form-item>
     </el-form>
@@ -64,7 +82,7 @@
 <script>
 import { getCodeImg } from "@/api/login";
 import Cookies from "js-cookie";
-import { encrypt, decrypt } from '@/utils/jsencrypt'
+import { encrypt, decrypt } from "@/utils/jsencrypt";
 
 export default {
   name: "Login",
@@ -72,36 +90,36 @@ export default {
     return {
       codeUrl: "",
       loginForm: {
-        username: "002201",
+        username: "drp",
         password: "drp0330",
         rememberMe: false,
         code: "",
-        uuid: ""
+        uuid: "",
       },
       loginRules: {
         username: [
-          { required: true, trigger: "blur", message: "请输入您的账号" }
+          { required: true, trigger: "blur", message: "请输入您的账号" },
         ],
         password: [
-          { required: true, trigger: "blur", message: "请输入您的密码" }
+          { required: true, trigger: "blur", message: "请输入您的密码" },
         ],
-        code: [{ required: true, trigger: "change", message: "请输入验证码" }]
+        code: [{ required: true, trigger: "change", message: "请输入验证码" }],
       },
       loading: false,
       // 验证码开关
       captchaEnabled: true,
       // 注册开关
       register: false,
-      redirect: undefined
+      redirect: undefined,
     };
   },
   watch: {
     $route: {
-      handler: function(route) {
+      handler: function (route) {
         this.redirect = route.query && route.query.redirect;
       },
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   created() {
     this.getCode();
@@ -109,8 +127,9 @@ export default {
   },
   methods: {
     getCode() {
-      getCodeImg().then(res => {
-        this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled;
+      getCodeImg().then((res) => {
+        this.captchaEnabled =
+          res.captchaEnabled === undefined ? true : res.captchaEnabled;
         if (this.captchaEnabled) {
           this.codeUrl = "data:image/gif;base64," + res.img;
           this.loginForm.uuid = res.uuid;
@@ -120,38 +139,46 @@ export default {
     getCookie() {
       const username = Cookies.get("username");
       const password = Cookies.get("password");
-      const rememberMe = Cookies.get('rememberMe')
+      const rememberMe = Cookies.get("rememberMe");
       this.loginForm = {
         username: username === undefined ? this.loginForm.username : username,
-        password: password === undefined ? this.loginForm.password : decrypt(password),
-        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
+        password:
+          password === undefined ? this.loginForm.password : decrypt(password),
+        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
       };
     },
     handleLogin() {
-      this.$refs.loginForm.validate(valid => {
+      this.$refs.loginForm.validate((valid) => {
         if (valid) {
           this.loading = true;
           if (this.loginForm.rememberMe) {
             Cookies.set("username", this.loginForm.username, { expires: 30 });
-            Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
-            Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
+            Cookies.set("password", encrypt(this.loginForm.password), {
+              expires: 30,
+            });
+            Cookies.set("rememberMe", this.loginForm.rememberMe, {
+              expires: 30,
+            });
           } else {
             Cookies.remove("username");
             Cookies.remove("password");
-            Cookies.remove('rememberMe');
+            Cookies.remove("rememberMe");
           }
-          this.$store.dispatch("Login", this.loginForm).then(() => {
-            this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
-          }).catch(() => {
-            this.loading = false;
-            if (this.captchaEnabled) {
-              this.getCode();
-            }
-          });
+          this.$store
+            .dispatch("Login", this.loginForm)
+            .then(() => {
+              this.$router.push({ path: this.redirect || "/" }).catch(() => {});
+            })
+            .catch(() => {
+              this.loading = false;
+              if (this.captchaEnabled) {
+                this.getCode();
+              }
+            });
         }
       });
-    }
-  }
+    },
+  },
 };
 </script>
 

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">
@@ -444,8 +444,8 @@ export default {
         twoClass: [{required: true, message: '请填写二级分类', trigger: 'blur'}],
         threeClass: [{required: true, message: '请填写三级分类', trigger: 'blur'}],
         fourClass: [{required: true, message: '请填写四级分类', trigger: 'blur'}],
-        specification: [{required: true, message: '请填写型号分类', trigger: 'blur'}],
-        model: [{required: true, message: '请填写四级分类', trigger: 'blur'}],
+        specification: [{required: true, message: '请填写规格', trigger: 'blur'}],
+        model: [{required: true, message: '请填写型号', trigger: 'blur'}],
         factory: [{required: true, message: '请选择生产厂家/代理人', trigger: 'blur'}],
         registrant: [{required: true, message: '请填写注册人/上市许可持有人', trigger: 'blur'}],
         storageConditions: [{required: true, message: '请选择存储条件', trigger: 'blur'}],
@@ -667,10 +667,14 @@ export default {
           this.basicForm.fourClass = data.fourClass
           this.basicForm.specification = data.specification
           this.basicForm.model = data.model
+          this.basicForm.factory = data.manufacturerId
           this.basicForm.registrant = data.registrant
           this.basicForm.storageConditions = data.storageCondition
           this.basicForm.transportCondition = data.transportationCondition
           this.basicForm.leadTime = data.deliveryPeriod
+          if(data.manufacturerId) {
+            this.getFactoryDetails(data.manufacturerId)
+          }
           if(data.medcines.length !== 0) {
             this.basicForm2.drug = data.medcines[0].isDrug
             this.basicForm2.registrationNo = data.medcines[0].registrationNo
@@ -714,6 +718,7 @@ export default {
   height: calc(100vh - 84px);
   padding: 12px;
   box-sizing: border-box;
+  overflow-y: auto;
 }
 .btn_group {
   width: 100%;

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/classify/index.vue

@@ -24,7 +24,7 @@
       </el-col> -->
     </el-row>
 
-    <el-card>
+    <el-card v-loading="loading">
       <el-row :gutter="10" class="content">
         <el-col :span="6">
           <el-input
@@ -124,15 +124,25 @@
             <el-row :gutter="20">
               <el-col :span="24">
                 <el-form-item label="" prop="name">
-                  <el-checkbox-group :disabled="disable" v-model="checkList">
-                    <el-checkbox label="库存状态"></el-checkbox>
-                    <!-- <el-checkbox label="项目"></el-checkbox>
+                  <!-- <el-checkbox-group :disabled="disable" v-model="checkList"> -->
+                  <el-checkbox
+                    :disabled="disable"
+                    v-model="ruleForm.isInventory"
+                    label="isInventory"
+                    >库存状态</el-checkbox
+                  >
+                  <!-- <el-checkbox label="项目"></el-checkbox>
                   <el-checkbox label="供应商"></el-checkbox>
                   <el-checkbox label="生产厂商"></el-checkbox>
                   <el-checkbox label="客户"></el-checkbox>
                   <el-checkbox label="特征码"></el-checkbox> -->
-                    <el-checkbox label="产品批号"></el-checkbox>
-                  </el-checkbox-group>
+                  <el-checkbox
+                    :disabled="disable"
+                    v-model="ruleForm.isProductBatch"
+                    label="isProductBatch"
+                    >产品批号</el-checkbox
+                  >
+                  <!-- </el-checkbox-group> -->
                 </el-form-item>
               </el-col>
             </el-row>
@@ -167,6 +177,7 @@ export default {
   dicts: ["material_enable", "sys_assist_condtion"],
   data() {
     return {
+      loading: false,
       filterText: "",
       data: [],
       defaultProps: {
@@ -179,6 +190,8 @@ export default {
         isEnable: "0",
         delFlag: "",
         marasstframe: "",
+        isInventory: "",
+        isProductBatch: "",
       },
       rules: {
         code: [
@@ -214,12 +227,17 @@ export default {
   methods: {
     // 获取树形结构
     getTreeData(data) {
-      getTree(data).then((res) => {
-        let { code, rows } = res;
-        if (code === 200) {
-          this.data = rows;
-        }
-      });
+      this.loading = true;
+      getTree(data)
+        .then((res) => {
+          let { code, rows } = res;
+          if (code === 200) {
+            this.data = rows;
+          }
+        })
+        .finally(() => {
+          this.loading = false;
+        });
     },
     // 获取物料基本分类详情
     getDetailData(id) {
@@ -228,6 +246,9 @@ export default {
         if (code === 200) {
           console.log("data", data);
           this.ruleForm = data;
+          this.ruleForm.isInventory = data.isInventory === "0" ? true : false;
+          this.ruleForm.isProductBatch =
+            data.isProductBatch === "0" ? true : false;
         }
       });
     },
@@ -260,6 +281,8 @@ export default {
       }
     },
     submitForm(formName) {
+      let isInventory = this.ruleForm.isInventory ? "0" : "2";
+      let isProductBatch = this.ruleForm.isProductBatch ? "0" : "2";
       this.$refs[formName].validate((valid) => {
         if (valid) {
           if (this.isAdd) {
@@ -267,7 +290,12 @@ export default {
             console.log("add!");
             console.log(this.biao.parentId);
             console.log(this.ruleForm);
-            let params = { ...this.ruleForm, ...this.biao };
+            let params = {
+              ...this.ruleForm,
+              ...this.biao,
+              isInventory,
+              isProductBatch,
+            };
             console.log("params", params);
             add(params).then((res) => {
               if (res.code === 200) {
@@ -285,7 +313,12 @@ export default {
             console.log("edit");
             let ids = { id: this.biao.parentId };
             console.log("ids", ids);
-            let params = { ...this.ruleForm, ...ids };
+            let params = {
+              ...this.ruleForm,
+              ...ids,
+              isInventory,
+              isProductBatch,
+            };
             console.log("params", params);
             edit(params).then((res) => {
               if (res.code === 200) {
@@ -336,11 +369,11 @@ export default {
         console.log("删除", this.delId);
         delClassify({ id: this.delId }).then((res) => {
           if (res.code === 200) {
+            this.getTreeData();
             this.$message({
               message: "删除成功",
               type: "success",
             });
-            this.getTreeData();
           }
         });
       }

src/views/material/requisition/add.vue

@@ -158,9 +158,6 @@
                       :value="item.id"
                     />
                 </el-select>
-                <!-- <el-input :disabled="disable" v-model="basicForm.originPlace">
-                  <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="test01"></el-button>
-                </el-input> -->
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -259,7 +256,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 +297,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>
@@ -356,16 +353,13 @@
                       :value="item.id"
                     />
                 </el-select>
-                <!-- <el-input :disabled="disable" v-model="basicForm.materialRate">
-                  <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="test01"></el-button>
-                </el-input> -->
               </el-form-item>
             </el-col>
           </el-row>
           <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">
@@ -397,9 +391,6 @@
                       :value="item.code"
                     />
                 </el-select>
-                <!-- <el-input :disabled="disable" v-model="basicForm.puPersonnelId">
-                  <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="test01"></el-button>
-                </el-input> -->
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -458,9 +449,6 @@
                       :value="item.id"
                     />
                 </el-select>
-                <!-- <el-input :disabled="disable" v-model="basicForm.businessLine">
-                  <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="test01"></el-button>
-                </el-input> -->
               </el-form-item>
             </el-col>
           </el-row>
@@ -645,9 +633,6 @@
                       :value="item.id"
                     />
                 </el-select>
-                <!-- <el-input :disabled="disable" v-model="basicForm2.dosageFrom">
-                  <el-button :disabled="disable" slot="append" icon="el-icon-more" @click="test01"></el-button>
-                </el-input> -->
               </el-form-item>
             </el-col>
           </el-row>
@@ -793,13 +778,6 @@
       </el-col>
     </div>
 
-    <popDialog
-      ref="contractSelect"
-      @doSubmit="selectionsToInput"
-      :selectData="selectData"
-      :single="true"
-    />
-
     <factory
       ref="factory"
       @doSubmit="acceptFactory"
@@ -873,7 +851,6 @@
 </template>
 
 <script>
-import popDialog from '@/components/PopDialog/index.vue'
 import factory from '@/components/PopDialog/productFactory.vue'
 import fourClass from '@/components/PopDialog/fourClass.vue'
 import unit from '@/components/PopDialog/unit.vue'
@@ -897,7 +874,6 @@ export default {
   name: 'requisition_add',
   dicts: ['sys_storage_condition', 'sys_conditions_carriage', 'sys_medicine', 'medical_instruments', 'curing_type', 'period_unit', 'expiry_date'],
   components: {
-    popDialog,
     factory,
     fourClass,
     unit,
@@ -1026,11 +1002,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: {
         // 是否药品
@@ -1097,10 +1075,6 @@ export default {
       console.log('页面状态',this.pageStu)
       console.log('数据', this.row)
       this.getDetails(this.row)
-      // 获取树形详情
-      if (this.row.classifyId) {
-        this.getTreeDetails(this.row.classifyId)
-      }
       // 生产厂家代理人用于回显
       if (this.row.manufacturerId) {
         this.getFactoryDetails(this.row.manufacturerId)
@@ -1142,10 +1116,6 @@ export default {
       } else {
         this.isControl = true
       }
-      // 获取树形详情
-      if (this.row.classifyId) {
-        this.getTreeDetails(this.row.classifyId)
-      }
       // 生产厂家代理人用于回显
       if (this.row.manufacturerId) {
         this.getFactoryDetails(this.row.manufacturerId)
@@ -1298,6 +1268,10 @@ export default {
         console.log('res',res)
         if(res.code === 200) {
           this.basicForm = res.data
+          // 获取树形详情
+          if (res.data.classifyId) {
+            this.getTreeDetails(res.data.classifyId)
+          }
           if(res.data.purchasingOrganization) {
             this.basicForm.purchasingOrganization = res.data.purchasingOrganization
             this.getOrgDetails(res.data.purchasingOrganization)
@@ -1306,7 +1280,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()}
@@ -1419,45 +1393,7 @@ export default {
     //   let params = {...this.basicForm, ...this.basicForm2}
     //   console.log('暂存总表单', params)
     // },
-    // 设置选中
-    selectionsToInput (selections) {
-      console.log('父组件拿到的：', selections)
-      this.selectData = selections
-      this.$emit('getInfo', this.selectData)
-      getMaterialDetails(selections[0].id).then(res => {
-        console.log('res',res)
-        if (res.code === 200) {
-          let data = res.data.data
-          // 物料id
-          this.basicForm.materialId = data.id
-          // 物料分类Id
-          this.basicForm.materialClassifyId = data.classifyId
-          this.basicForm.materialCode = data.code
-          this.basicForm.materialName = data.name
-          this.basicForm.medicineMaterial = data.isMedicine
-          this.basicForm.oneClass = data.oneClass
-          this.basicForm.twoClass = data.twoClass
-          this.basicForm.threeClass = data.threeClass
-          this.basicForm.fourClass = data.fourClass
-          this.basicForm.specification = data.specification
-          this.basicForm.model = data.model
-          this.basicForm.registrant = data.registrant
-          this.basicForm.storageConditions = data.storageCondition
-          this.basicForm.transportCondition = data.transportationCondition
-          this.basicForm.remark = data.deliveryPeriod
-          if(data.medcines.length !== 0) {
-            this.basicForm2.drug = data.medcines[0].isDrug
-            this.basicForm2.registrationNo = data.medcines[0].registrationNo
-            this.basicForm2.medicalDevices = data.medcines[0].medicalInstruments
-            this.basicForm2.maintenanceType = data.medcines[0].curingType
-          }
-        }
-      })
-    },
-    test01() {
-      console.log('测试点击')
-      this.$refs.contractSelect.init()
-    },
+
     // 选择生产厂家/代理人
     acceptFactory (selections) {
       console.log('选择的数据',selections)
@@ -1584,6 +1520,7 @@ export default {
   height: calc(100vh - 84px);
   padding: 12px;
   box-sizing: border-box;
+  overflow-y: auto;
 }
 .btn_group {
   width: 100%;

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" />

src/views/system/table-template/index.vue

@@ -36,8 +36,7 @@ export default {
   --padding: var(--size);
 }
 .container {
-  width: calc(100% - calc(var(--size) * 2));
-  margin: var(--padding);
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04);
+  width: calc(100% - calc(var(--size)));
+  margin-right: var(--padding);
 }
 </style>