BUG

src/api/login/index.js

@@ -4,7 +4,7 @@ import { setToken } from '@/utils/token-util';
 /**
  * 登录
  */
-export async function login(data) {
+export async function login (data) {
   const res = await request.post('/main/user/login', data);
   if (res.data.code == 0) {
     setToken(res.data.data.token, data.remember);
@@ -12,11 +12,21 @@ export async function login(data) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+/**
+ * 获取用户信息
+ */
+export async function getLoginUser (data) {
+  const res = await request.get('/system/account/getLoginUser', data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
 
 /**
  * 获取验证码
  */
-export async function getCaptcha() {
+export async function getCaptcha () {
   const res = await request.get('/captcha');
   if (res.data.code === 0) {
     return res.data.data;

src/router/index.js

@@ -9,6 +9,7 @@ import store from '@/store';
 import { getToken } from '@/utils/token-util';
 import { routes, getMenuRoutes } from './routes';
 
+import { getLoginUser } from '@/api/login';
 Vue.use(VueRouter);
 
 const router = new VueRouter({
@@ -29,6 +30,11 @@ router.beforeEach((to, from, next) => {
   }
   // 判断是否登录
   if (getToken()) {
+    if (!store.state.user.info?.userId) {
+      getLoginUser().then((res) => {
+        store.commit('user/setUserInfo', res);
+      });
+    }
     // 还未注册动态路由则先获取
     if (!store.state.user.menus) {
       store

src/views/login/index.vue

@@ -109,13 +109,13 @@
 <script>
   import I18nIcon from '@/layout/components/i18n-icon.vue';
   import { getToken } from '@/utils/token-util';
-  import { login, getCaptcha, sub } from '@/api/login';
+  import { login, getCaptcha, getLoginUser } from '@/api/login';
 
   export default {
     // eslint-disable-next-line vue/multi-word-component-names
     name: 'Login',
     components: { I18nIcon },
-    data() {
+    data () {
       return {
         // 登录框方向, 0居中, 1居右, 2居左
         direction: 0,
@@ -135,7 +135,7 @@
     },
     computed: {
       // 表单验证规则
-      rules() {
+      rules () {
         return {
           loginName: [
             {
@@ -156,7 +156,7 @@
         };
       }
     },
-    created() {
+    created () {
       if (getToken()) {
         this.goHome();
       } else {
@@ -166,7 +166,7 @@
     },
     methods: {
       /* 提交 */
-      submit() {
+      submit () {
         this.$refs.form.validate((valid) => {
           if (!valid) {
             return false;
@@ -188,11 +188,11 @@
         });
       },
       /* 跳转到首页 */
-      goHome() {
+      goHome () {
         this.$router.push(this.$route?.query?.from ?? '/').catch(() => {});
       },
       /* 更换图形验证码 */
-      changeCaptcha() {
+      changeCaptcha () {
         // 这里演示的验证码是后端返回base64格式的形式, 如果后端地址直接是图片请参考忘记密码页面
         getCaptcha()
           .then((data) => {

src/views/produceOrder/components/report/Common.vue

@@ -61,15 +61,18 @@
             label=""
             label-width="0"
             class="w100"
+            required
             prop="categoryMsg.number"
           >
-            <el-input-number
+            <el-input
               class="w100"
-              :controls="false"
               v-model="categoryMsg.number"
-              :min="0"
+              @input="
+                (value) =>
+                  (categoryMsg.number = value ? parseInt(value) : value)
+              "
               clearable
-            ></el-input-number>
+            ></el-input>
           </el-form-item>
         </el-descriptions-item>
         <el-descriptions-item label="">
@@ -109,14 +112,19 @@
             label=""
             label-width="0"
             class="w100"
+            required
             prop="productInfo.standardNum"
-            ><el-input-number
+            ><el-input
               class="w100"
-              :controls="false"
               v-model="workReport.productInfo.standardNum"
-              :min="0"
+              @input="
+                (value) =>
+                  (workReport.productInfo.standardNum = value
+                    ? parseInt(value)
+                    : value)
+              "
               clearable
-            ></el-input-number> </el-form-item
+            ></el-input> </el-form-item
         ></el-descriptions-item>
         <el-descriptions-item label=""
           ><span class="label-required after" slot="label">合格品重量(KG)</span>
@@ -125,50 +133,58 @@
             label-width="0"
             class="w100"
             prop="productInfo.standardWeight"
-            ><el-input-number
+            ><el-input
               readonly
               class="w100"
-              :controls="false"
               :value="
                 (workReport.productInfo.standardWeight =
-                  workReport.productInfo.standardNum *
-                  (infoData.productUnitWeight || 1))
+                  workReport.productInfo.standardNum === ''
+                    ? ''
+                    : workReport.productInfo.standardNum *
+                      (infoData.productUnitWeight || 1))
               "
-              :min="0"
               clearable
-            ></el-input-number> </el-form-item
+            ></el-input> </el-form-item
         ></el-descriptions-item>
         <el-descriptions-item label="不合格品数量(PCS)">
-          <el-input-number
+          <el-input
             class="w100"
-            :controls="false"
             v-model="workReport.productInfo.noStandardNum"
-            :min="0"
+            @input="
+              (value) =>
+                (workReport.productInfo.noStandardNum = value
+                  ? parseInt(value)
+                  : value)
+            "
             clearable
-          ></el-input-number>
+          ></el-input>
         </el-descriptions-item>
         <el-descriptions-item label="不合格品重量(KG)"
-          ><el-input-number
+          ><el-input
             class="w100"
             readonly
-            :controls="false"
             :value="
               (workReport.productInfo.noStandardWeight =
-                workReport.productInfo.noStandardNum *
-                (infoData.productUnitWeight || 1))
+                workReport.productInfo.noStandardNum === ''
+                  ? ''
+                  : workReport.productInfo.noStandardNum *
+                    (infoData.productUnitWeight || 1))
             "
-            :min="0"
             clearable
-          ></el-input-number
+          ></el-input
         ></el-descriptions-item>
         <el-descriptions-item label="副产品重量(KG)"
-          ><el-input-number
+          ><el-input
             class="w100"
-            :controls="false"
             v-model="workReport.productInfo.byProductWeight"
-            :min="0"
+            @input="
+              (value) =>
+                (workReport.productInfo.byProductWeight = value
+                  ? parseInt(value)
+                  : value)
+            "
             clearable
-          ></el-input-number
+          ></el-input
         ></el-descriptions-item>
         <el-descriptions-item label="备注">
           <el-input v-model="workReport.remark"></el-input

src/views/produceOrder/components/report/Drying.vue

@@ -62,15 +62,18 @@
             label=""
             label-width="0"
             class="w100"
+            required
             prop="categoryMsg.number"
           >
-            <el-input-number
+            <el-input
               class="w100"
-              :controls="false"
               v-model="categoryMsg.number"
-              :min="0"
+              @input="
+                (value) =>
+                  (categoryMsg.number = value ? parseInt(value) : value)
+              "
               clearable
-            ></el-input-number>
+            ></el-input>
           </el-form-item>
         </el-descriptions-item>
         <el-descriptions-item label="">
@@ -120,16 +123,21 @@
           <span class="label-required after" slot="label">合格品数量(PCS)</span>
           <el-form-item
             label=""
+            required
             label-width="0"
             class="w100"
             prop="productInfo.standardNum"
-            ><el-input-number
+            ><el-input
               class="w100"
-              :controls="false"
               v-model="workReport.productInfo.standardNum"
-              :min="0"
+              @input="
+                (value) =>
+                  (workReport.productInfo.standardNum = value
+                    ? parseInt(value)
+                    : value)
+              "
               clearable
-            ></el-input-number> </el-form-item
+            ></el-input> </el-form-item
         ></el-descriptions-item>
         <el-descriptions-item label=""
           ><span class="label-required after" slot="label">合格品重量(KG)</span>
@@ -138,50 +146,60 @@
             label-width="0"
             class="w100"
             prop="productInfo.standardWeight"
-            ><el-input-number
+            ><el-input
               readonly
               class="w100"
               :controls="false"
               :value="
                 (workReport.productInfo.standardWeight =
-                  workReport.productInfo.standardNum *
-                  (infoData.productUnitWeight || 1))
+                  workReport.productInfo.standardNum === ''
+                    ? ''
+                    : workReport.productInfo.standardNum *
+                      (infoData.productUnitWeight || 1))
               "
               :min="0"
               clearable
-            ></el-input-number> </el-form-item
+            ></el-input> </el-form-item
         ></el-descriptions-item>
         <el-descriptions-item label="不合格品数量(PCS)">
-          <el-input-number
+          <el-input
             class="w100"
-            :controls="false"
             v-model="workReport.productInfo.noStandardNum"
-            :min="0"
+            @input="
+              (value) =>
+                (workReport.productInfo.noStandardNum = value
+                  ? parseInt(value)
+                  : value)
+            "
             clearable
-          ></el-input-number>
+          ></el-input>
         </el-descriptions-item>
         <el-descriptions-item label="不合格品重量(KG)"
-          ><el-input-number
+          ><el-input
             class="w100"
             readonly
-            :controls="false"
             :value="
               (workReport.productInfo.noStandardWeight =
-                workReport.productInfo.noStandardNum *
-                (infoData.productUnitWeight || 1))
+                workReport.productInfo.noStandardNum === ''
+                  ? ''
+                  : workReport.productInfo.noStandardNum *
+                    (infoData.productUnitWeight || 1))
             "
-            :min="0"
             clearable
-          ></el-input-number
+          ></el-input
         ></el-descriptions-item>
         <el-descriptions-item label="副产品重量(KG)"
-          ><el-input-number
+          ><el-input
             class="w100"
-            :controls="false"
             v-model="workReport.productInfo.byProductWeight"
-            :min="0"
+            @input="
+              (value) =>
+                (workReport.productInfo.byProductWeight = value
+                  ? parseInt(value)
+                  : value)
+            "
             clearable
-          ></el-input-number
+          ></el-input
         ></el-descriptions-item>
         <el-descriptions-item label="备注">
           <el-input v-model="workReport.remark"></el-input

src/views/produceOrder/components/report/Extrusion.vue

@@ -121,14 +121,19 @@
             label=""
             label-width="0"
             class="w100"
+            required
             prop="productInfo.standardNum"
-            ><el-input-number
+            ><el-input
               class="w100"
-              :controls="false"
-              v-model="workReport.productInfo.standardNum"
-              :min="0"
+              v-model.number="workReport.productInfo.standardNum"
+              @input="
+                (value) =>
+                  (workReport.productInfo.standardNum = value
+                    ? parseInt(value)
+                    : value)
+              "
               clearable
-            ></el-input-number> </el-form-item
+            ></el-input> </el-form-item
         ></el-descriptions-item>
         <el-descriptions-item label=""
           ><span class="label-required after" slot="label">合格品重量(KG)</span>
@@ -137,50 +142,57 @@
             label-width="0"
             class="w100"
             prop="productInfo.standardWeight"
-            ><el-input-number
+            ><el-input
               readonly
               class="w100"
-              :controls="false"
               :value="
                 (workReport.productInfo.standardWeight =
-                  workReport.productInfo.standardNum *
-                  (infoData.productUnitWeight || 1))
+                  workReport.productInfo.standardNum === ''
+                    ? ''
+                    : workReport.productInfo.standardNum *
+                      (infoData.productUnitWeight || 1))
               "
-              :min="0"
               clearable
-            ></el-input-number> </el-form-item
+            ></el-input> </el-form-item
         ></el-descriptions-item>
         <el-descriptions-item label="不合格品数量(PCS)">
-          <el-input-number
+          <el-input
             class="w100"
-            :controls="false"
             v-model="workReport.productInfo.noStandardNum"
-            :min="0"
+            @input="
+              (value) =>
+                (workReport.productInfo.noStandardNum = value
+                  ? parseInt(value)
+                  : value)
+            "
             clearable
-          ></el-input-number>
+          ></el-input>
         </el-descriptions-item>
         <el-descriptions-item label="不合格品重量(KG)"
-          ><el-input-number
+          ><el-input
             class="w100"
-            readonly
-            :controls="false"
             :value="
               (workReport.productInfo.noStandardWeight =
-                workReport.productInfo.noStandardNum *
-                (infoData.productUnitWeight || 1))
+                workReport.productInfo.noStandardNum === ''
+                  ? ''
+                  : workReport.productInfo.noStandardNum *
+                    (infoData.productUnitWeight || 1))
             "
-            :min="0"
             clearable
-          ></el-input-number
+          ></el-input
         ></el-descriptions-item>
         <el-descriptions-item label="副产品重量(KG)"
-          ><el-input-number
+          ><el-input
             class="w100"
-            :controls="false"
             v-model="workReport.productInfo.byProductWeight"
-            :min="0"
+            @input="
+              (value) =>
+                (workReport.productInfo.byProductWeight = value
+                  ? parseInt(value)
+                  : value)
+            "
             clearable
-          ></el-input-number
+          ></el-input
         ></el-descriptions-item>
         <el-descriptions-item label="备注">
           <el-input v-model="workReport.remark"></el-input

src/views/produceOrder/components/report/HalfAdded.vue

@@ -59,17 +59,20 @@
           <span class="label-required after" slot="label">投料数量（PCS）</span>
           <el-form-item
             label=""
+            required
             label-width="0"
             class="w100"
             prop="categoryMsg.number"
           >
-            <el-input-number
+            <el-input
               class="w100"
-              :controls="false"
               v-model="categoryMsg.number"
-              :min="0"
+              @input="
+                (value) =>
+                  (categoryMsg.number = value ? parseInt(value) : value)
+              "
               clearable
-            ></el-input-number>
+            ></el-input>
           </el-form-item>
         </el-descriptions-item>
         <el-descriptions-item label="">
@@ -84,9 +87,10 @@
               class="w100"
               :value="
                 (categoryMsg.totalWeight =
-                  categoryMsg.number * (infoData.productUnitWeight || 1))
+                  categoryMsg.number === ''
+                    ? ''
+                    : categoryMsg.number * (infoData.productUnitWeight || 1))
               "
-              :min="0"
               clearable
             ></el-input>
           </el-form-item>
@@ -119,16 +123,21 @@
           <span class="label-required after" slot="label">合格品数量(PCS)</span>
           <el-form-item
             label=""
+            required
             label-width="0"
             class="w100"
             prop="productInfo.standardNum"
-            ><el-input-number
+            ><el-input
               class="w100"
-              :controls="false"
               v-model="workReport.productInfo.standardNum"
-              :min="0"
+              @input="
+                (value) =>
+                  (workReport.productInfo.standardNum = value
+                    ? parseInt(value)
+                    : value)
+              "
               clearable
-            ></el-input-number> </el-form-item
+            ></el-input> </el-form-item
         ></el-descriptions-item>
         <el-descriptions-item label=""
           ><span class="label-required after" slot="label">合格品重量(KG)</span>
@@ -137,50 +146,58 @@
             label-width="0"
             class="w100"
             prop="productInfo.standardWeight"
-            ><el-input-number
+            ><el-input
               readonly
               class="w100"
-              :controls="false"
               :value="
                 (workReport.productInfo.standardWeight =
-                  workReport.productInfo.standardNum *
-                  (infoData.productUnitWeight || 1))
+                  workReport.productInfo.standardNum === ''
+                    ? ''
+                    : workReport.productInfo.standardNum *
+                      (infoData.productUnitWeight || 1))
               "
-              :min="0"
               clearable
-            ></el-input-number> </el-form-item
+            ></el-input> </el-form-item
         ></el-descriptions-item>
         <el-descriptions-item label="不合格品数量(PCS)">
-          <el-input-number
+          <el-input
             class="w100"
-            :controls="false"
             v-model="workReport.productInfo.noStandardNum"
-            :min="0"
+            @input="
+              (value) =>
+                (workReport.productInfo.noStandardNum = value
+                  ? parseInt(value)
+                  : value)
+            "
             clearable
-          ></el-input-number>
+          ></el-input>
         </el-descriptions-item>
         <el-descriptions-item label="不合格品重量(KG)"
-          ><el-input-number
+          ><el-input
             class="w100"
             readonly
-            :controls="false"
             :value="
               (workReport.productInfo.noStandardWeight =
-                workReport.productInfo.noStandardNum *
-                (infoData.productUnitWeight || 1))
+                workReport.productInfo.noStandardNum === ''
+                  ? ''
+                  : workReport.productInfo.noStandardNum *
+                    (infoData.productUnitWeight || 1))
             "
-            :min="0"
             clearable
-          ></el-input-number
+          ></el-input
         ></el-descriptions-item>
         <el-descriptions-item label="副产品重量(KG)"
-          ><el-input-number
+          ><el-input
             class="w100"
-            :controls="false"
             v-model="workReport.productInfo.byProductWeight"
-            :min="0"
+            @input="
+              (value) =>
+                (workReport.productInfo.byProductWeight = value
+                  ? parseInt(value)
+                  : value)
+            "
             clearable
-          ></el-input-number
+          ></el-input
         ></el-descriptions-item>
         <el-descriptions-item label="备注">
           <el-input v-model="workReport.remark"></el-input

src/views/produceOrder/components/report/Heating.vue

@@ -60,16 +60,19 @@
           <el-form-item
             label=""
             label-width="0"
+            required
             class="w100"
             prop="categoryMsg.number"
           >
-            <el-input-number
+            <el-input
               class="w100"
-              :controls="false"
               v-model="categoryMsg.number"
-              :min="0"
+              @input="
+                (value) =>
+                  (categoryMsg.number = value ? parseInt(value) : value)
+              "
               clearable
-            ></el-input-number>
+            ></el-input>
           </el-form-item>
         </el-descriptions-item>
         <el-descriptions-item label="">
@@ -84,9 +87,10 @@
               class="w100"
               :value="
                 (categoryMsg.totalWeight =
-                  categoryMsg.number * (infoData.productUnitWeight || 1))
+                  categoryMsg.number === ''
+                    ? ''
+                    : categoryMsg.number * (infoData.productUnitWeight || 1))
               "
-              :min="0"
               clearable
             ></el-input>
           </el-form-item>
@@ -119,16 +123,22 @@
           <span class="label-required after" slot="label">合格品数量(PCS)</span>
           <el-form-item
             label=""
+            required
+            ,
             label-width="0"
             class="w100"
             prop="productInfo.standardNum"
-            ><el-input-number
+            ><el-input
               class="w100"
-              :controls="false"
               v-model="workReport.productInfo.standardNum"
-              :min="0"
+              @input="
+                (value) =>
+                  (workReport.productInfo.standardNum = value
+                    ? parseInt(value)
+                    : value)
+              "
               clearable
-            ></el-input-number> </el-form-item
+            ></el-input> </el-form-item
         ></el-descriptions-item>
         <el-descriptions-item label=""
           ><span class="label-required after" slot="label">合格品重量(KG)</span>
@@ -137,50 +147,60 @@
             label-width="0"
             class="w100"
             prop="productInfo.standardWeight"
-            ><el-input-number
+            ><el-input
               readonly
               class="w100"
               :controls="false"
               :value="
                 (workReport.productInfo.standardWeight =
-                  workReport.productInfo.standardNum *
-                  (infoData.productUnitWeight || 1))
+                  workReport.productInfo.standardNum === ''
+                    ? ''
+                    : workReport.productInfo.standardNum *
+                      (infoData.productUnitWeight || 1))
               "
               :min="0"
               clearable
-            ></el-input-number> </el-form-item
+            ></el-input> </el-form-item
         ></el-descriptions-item>
         <el-descriptions-item label="不合格品数量(PCS)">
-          <el-input-number
+          <el-input
             class="w100"
-            :controls="false"
             v-model="workReport.productInfo.noStandardNum"
-            :min="0"
+            @input="
+              (value) =>
+                (workReport.productInfo.noStandardNum = value
+                  ? parseInt(value)
+                  : value)
+            "
             clearable
-          ></el-input-number>
+          ></el-input>
         </el-descriptions-item>
         <el-descriptions-item label="不合格品重量(KG)"
-          ><el-input-number
+          ><el-input
             class="w100"
             readonly
-            :controls="false"
             :value="
               (workReport.productInfo.noStandardWeight =
-                workReport.productInfo.noStandardNum *
-                (infoData.productUnitWeight || 1))
+                workReport.productInfo.noStandardNum === ''
+                  ? ''
+                  : workReport.productInfo.noStandardNum *
+                    (infoData.productUnitWeight || 1))
             "
-            :min="0"
             clearable
-          ></el-input-number
+          ></el-input
         ></el-descriptions-item>
         <el-descriptions-item label="副产品重量(KG)"
-          ><el-input-number
+          ><el-input
             class="w100"
-            :controls="false"
             v-model="workReport.productInfo.byProductWeight"
-            :min="0"
+            @input="
+              (value) =>
+                (workReport.productInfo.byProductWeight = value
+                  ? parseInt(value)
+                  : value)
+            "
             clearable
-          ></el-input-number
+          ></el-input
         ></el-descriptions-item>
         <el-descriptions-item label="备注">
           <el-input v-model="workReport.remark"></el-input

vue.config.js

@@ -31,9 +31,9 @@ module.exports = {
     proxy: {
       // 当我们的本地的请求 有/api的时候，就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
-        target: 'http://192.168.3.51:18086', // 测试
+        // target: 'http://192.168.3.51:18086', // 测试
 
-        // target: 'http://192.168.3.35:8080', // kang杨威
+        target: 'http://192.168.3.35:8080', // kang杨威
         // target: 'http://192.168.3.25:8080', // 黄峥嵘
         // target: 'http://192.168.3.41:8080', // 何江鹏
         // target: 'http://192.168.3.33:8080', // 谢一平