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

src/views/material/label/label-auto-bind-dialog.vue

@@ -13,7 +13,7 @@ export default {
   methods: {
     async fetchItem(prop) {
       this.dialogFormVisible = true;
-      this.form = { ...this.form, ...prop };
+      this.form = { ...this.form, labelId: prop.id };
     },
 
     async fetchClassifyTree() {
@@ -36,7 +36,10 @@ export default {
         if (valid) {
           let p = {
             ...this.form,
-            labelId: this.form.id,
+
+            classifyId: Array.isArray(this.form.classifyId)
+              ? this.form.classifyId[this.form.classifyId.length - 1]
+              : "",
           };
           this.loading = true;
           autoBind(p)

src/views/material/label/label-bind-dialog.vue

@@ -5,7 +5,6 @@ import {
   removeBind,
   removeAllBind,
   classifyTree,
-  autoBind,
 } from "@/api/material/label";
 export default {
   name: "BindDialog",
@@ -34,14 +33,14 @@ export default {
       },
       {
         type: "text",
-        prop: "materialClassifyName",
+        prop: "materialClassifyId",
         label: "物料分类",
         required: false,
         showOverflowTooltip: true,
       },
       {
         type: "text",
-        prop: "materialStatues",
+        prop: "materialState",
         label: "物料状态",
         required: false,
         showOverflowTooltip: true,
@@ -84,9 +83,10 @@ export default {
   methods: {
     async fetchList(prop) {
       this.loading = true;
-      await bindList(prop)
+      let { pageNum, pageSize } = this.page;
+      await bindList({ ...prop, pageNum, pageSize })
         .then((res) => {
-          this.tableData = res;
+          this.tableData = res.rows;
         })
         .finally(() => {
           this.loading = false;
@@ -94,6 +94,8 @@ export default {
     },
 
     async fetchItem(prop) {
+      // console.log(prop);
+      // return;
       this.dialogFormVisible = true;
       this.form = { ...this.form, ...prop };
       await this.fetchList({ labelId: this.form.id });
@@ -117,7 +119,7 @@ export default {
     },
 
     async onUnbind(prop) {
-      const { id } = prop;
+      const { materialId: id } = prop;
       await removeBind({ id });
       await this.fetchList({ labelId: this.form.id });
     },

src/views/material/label/label-hand-bind-dialog.vue

@@ -112,7 +112,7 @@ export default {
     onSearch(prop) {
       const classifyid = prop.classifyid || "";
       const code = prop.code ? prop.code[prop.code.length - 1] : "";
-      this.fetchList({ code: "408-01-01-000001", classifyid: "43" });
+      this.fetchList({ code, classifyid });
     },
 
     onClose() {
@@ -126,7 +126,10 @@ export default {
         if (valid) {
           this.loading = true;
           const labelId = this.form.id;
-          const material = this.multipleSelection;
+          const material = this.multipleSelection.map((item) => ({
+            ...item,
+            materialId: item.id,
+          }));
           manualBindOK({ labelId, material })
             .then((res) => {
               let { code } = res;

vue.config.js

@@ -1,15 +1,15 @@
-'use strict'
-const path = require('path')
+"use strict";
+const path = require("path");
 
 function resolve(dir) {
-  return path.join(__dirname, dir)
+  return path.join(__dirname, dir);
 }
 
-const CompressionPlugin = require('compression-webpack-plugin')
+const CompressionPlugin = require("compression-webpack-plugin");
 
-const name = process.env.VUE_APP_TITLE || '德荣医疗DRP系统' // 网页标题
+const name = process.env.VUE_APP_TITLE || "德荣医疗DRP系统"; // 网页标题
 
-const port = process.env.port || process.env.npm_config_port || 80 // 端口
+const port = process.env.port || process.env.npm_config_port || 80; // 端口
 
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
@@ -21,16 +21,16 @@ module.exports = {
   // publicPath: process.env.NODE_ENV === "production" ? "./" : "./",
   publicPath: process.env.VUE_APP_CONTEXT_PATH,
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
-  outputDir: 'dist',
+  outputDir: "dist",
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
-  assetsDir: 'static',
+  assetsDir: "static",
   // 是否开启eslint保存检测，有效值：ture | false | 'error'
-  lintOnSave: process.env.NODE_ENV === 'development',
+  lintOnSave: process.env.NODE_ENV === "development",
   // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
   productionSourceMap: false,
   // webpack-dev-server 相关配置
   devServer: {
-    host: '0.0.0.0',
+    host: "0.0.0.0",
     port: port,
     open: true,
     proxy: {
@@ -46,99 +46,94 @@ module.exports = {
         // target: `http://172.16.13.113:8000/drp-admin`, //DWT本地
         changeOrigin: true,
         pathRewrite: {
-          ['^' + process.env.VUE_APP_BASE_API]: ''
-        }
-      }
+          ["^" + process.env.VUE_APP_BASE_API]: "",
+        },
+      },
     },
-    disableHostCheck: true
+    disableHostCheck: true,
   },
   css: {
     loaderOptions: {
       sass: {
-        sassOptions: { outputStyle: "expanded" }
-      }
-    }
+        sassOptions: { outputStyle: "expanded" },
+      },
+    },
   },
   configureWebpack: {
     name: name,
     resolve: {
       alias: {
-        '@': resolve('src')
-      }
+        "@": resolve("src"),
+      },
     },
     plugins: [
       // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件
       new CompressionPlugin({
-        cache: false,                   // 不启用文件缓存
-        test: /\.(js|css|html)?$/i,     // 压缩文件格式
-        filename: '[path].gz[query]',   // 压缩后的文件名
-        algorithm: 'gzip',              // 使用gzip压缩
-        minRatio: 0.8                   // 压缩率小于1才会压缩
-      })
+        cache: false, // 不启用文件缓存
+        test: /\.(js|css|html)?$/i, // 压缩文件格式
+        filename: "[path].gz[query]", // 压缩后的文件名
+        algorithm: "gzip", // 使用gzip压缩
+        minRatio: 0.8, // 压缩率小于1才会压缩
+      }),
     ],
   },
   chainWebpack(config) {
-    config.plugins.delete('preload') // TODO: need test
-    config.plugins.delete('prefetch') // TODO: need test
+    config.plugins.delete("preload"); // TODO: need test
+    config.plugins.delete("prefetch"); // TODO: need test
 
     // set svg-sprite-loader
+    config.module.rule("svg").exclude.add(resolve("src/assets/icons")).end();
     config.module
-      .rule('svg')
-      .exclude.add(resolve('src/assets/icons'))
-      .end()
-    config.module
-      .rule('icons')
+      .rule("icons")
       .test(/\.svg$/)
-      .include.add(resolve('src/assets/icons'))
+      .include.add(resolve("src/assets/icons"))
       .end()
-      .use('svg-sprite-loader')
-      .loader('svg-sprite-loader')
+      .use("svg-sprite-loader")
+      .loader("svg-sprite-loader")
       .options({
-        symbolId: 'icon-[name]'
+        symbolId: "icon-[name]",
       })
-      .end()
+      .end();
 
-    config
-      .when(process.env.NODE_ENV !== 'development',
-        config => {
-          config
-            .plugin('ScriptExtHtmlWebpackPlugin')
-            .after('html')
-            .use('script-ext-html-webpack-plugin', [{
-              // `runtime` must same as runtimeChunk name. default is `runtime`
-              inline: /runtime\..*\.js$/
-            }])
-            .end()
-          config
-            .optimization.splitChunks({
-              chunks: 'all',
-              cacheGroups: {
-                libs: {
-                  name: 'chunk-libs',
-                  test: /[\\/]node_modules[\\/]/,
-                  priority: 10,
-                  chunks: 'initial' // only package third parties that are initially dependent
-                },
-                elementUI: {
-                  name: 'chunk-elementUI', // split elementUI into a single package
-                  priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
-                  test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
-                },
-                commons: {
-                  name: 'chunk-commons',
-                  test: resolve('src/components'), // can customize your rules
-                  minChunks: 3, //  minimum common number
-                  priority: 5,
-                  reuseExistingChunk: true
-                }
-              }
-            })
-          config.optimization.runtimeChunk('single'),
+    config.when(process.env.NODE_ENV !== "development", (config) => {
+      config
+        .plugin("ScriptExtHtmlWebpackPlugin")
+        .after("html")
+        .use("script-ext-html-webpack-plugin", [
           {
-            from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
-            to: './' //到根目录下
-          }
-        }
-      )
-  }
-}
+            // `runtime` must same as runtimeChunk name. default is `runtime`
+            inline: /runtime\..*\.js$/,
+          },
+        ])
+        .end();
+      config.optimization.splitChunks({
+        chunks: "all",
+        cacheGroups: {
+          libs: {
+            name: "chunk-libs",
+            test: /[\\/]node_modules[\\/]/,
+            priority: 10,
+            chunks: "initial", // only package third parties that are initially dependent
+          },
+          elementUI: {
+            name: "chunk-elementUI", // split elementUI into a single package
+            priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
+            test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm
+          },
+          commons: {
+            name: "chunk-commons",
+            test: resolve("src/components"), // can customize your rules
+            minChunks: 3, //  minimum common number
+            priority: 5,
+            reuseExistingChunk: true,
+          },
+        },
+      });
+      config.optimization.runtimeChunk("single"),
+        {
+          from: path.resolve(__dirname, "./public/robots.txt"), //防爬虫文件
+          to: "./", //到根目录下
+        };
+    });
+  },
+};