From 1c4b8cd1e51746b9c8a156d44a8dda6b892f24b9 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Wed, 26 Apr 2023 10:40:49 +0800
Subject: [PATCH 1/7] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/supInoutSearchOrder.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/inventory/supInoutSearchOrder.vue b/src/views/inventory/supInoutSearchOrder.vue
index 3f45e71..d1368f6 100644
--- a/src/views/inventory/supInoutSearchOrder.vue
+++ b/src/views/inventory/supInoutSearchOrder.vue
@@ -113,6 +113,7 @@
 
 <script>
 import {getResultDetailList, getResultOrderList} from '@/api/inout/orderDetailResult'
+import {isBlank} from "@/utils/strUtil";
 
 export default {
   name: "supInoutSearchOrder",
@@ -190,7 +191,7 @@ export default {
         limit: 10,
         startAduditTime: null,
         endAduditTime: null,
-        actionType: "norDetail",
+        actionType: this.actionType,
       };
       this.actDateRange = [];
       this.getList();
@@ -216,6 +217,9 @@ export default {
     getList() {
       this.loading = true;
       this.filterQuery.actionType = this.actionType;
+      if (isBlank(this.filterQuery.actionType)) {
+        this.filterQuery.actionType = "norDetail";
+      }
       getResultOrderList(this.filterQuery)
         .then((response) => {
           if (response.code === 20000) {

From fc365599d0ec1ef39f99bb3204461855fb986b02 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Wed, 26 Apr 2023 10:43:01 +0800
Subject: [PATCH 2/7] =?UTF-8?q?1.=E6=81=A2=E5=A4=8D=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue.config.js | 131 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 131 insertions(+)
 create mode 100644 vue.config.js

diff --git a/vue.config.js b/vue.config.js
new file mode 100644
index 0000000..7d5fee7
--- /dev/null
+++ b/vue.config.js
@@ -0,0 +1,131 @@
+"use strict";
+const path = require("path");
+/* 忽略忽略 */
+function resolve(dir) {
+  return path.join(__dirname, dir);
+}
+
+const CompressionPlugin = require("compression-webpack-plugin");
+
+const name = process.env.VUE_APP_TITLE || "UDI自助平台"; // 网页标题
+
+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
+// 这里只列一部分，具体配置参考文档
+module.exports = {
+  // 部署生产环境和开发环境下的URL。
+  // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
+  // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
+  publicPath: process.env.VUE_APP_CONTEXT_PATH,
+  // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
+  outputDir: "UDI_SPMS_CLIENT",
+  // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
+  assetsDir: "static",
+  // 是否开启eslint保存检测，有效值：ture | false | 'error'
+  lintOnSave: process.env.NODE_ENV === "development",
+  // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
+  productionSourceMap: false,
+  // webpack-dev-server 相关配置
+  devServer: {
+    host: "0.0.0.0",
+    port: port,
+    open: false,
+    proxy: {
+      // detail: https://cli.vuejs.org/config/#devserver-proxy
+      [process.env.VUE_APP_BASE_API]: {
+        target: `process.env.VUE_APP_BASE_API`,
+        changeOrigin: true,
+        pathRewrite: {
+          ["^" + process.env.VUE_APP_BASE_API]: "",
+        },
+      },
+    },
+    disableHostCheck: true,
+  },
+  css: {
+    loaderOptions: {
+      sass: {
+        sassOptions: { outputStyle: "expanded" },
+      },
+    },
+  },
+  configureWebpack: {
+    name: name,
+    resolve: {
+      alias: {
+        "@": 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才会压缩
+      }),
+    ],
+  },
+  chainWebpack(config) {
+    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("icons")
+      .test(/\.svg$/)
+      .include.add(resolve("src/assets/icons"))
+      .end()
+      .use("svg-sprite-loader")
+      .loader("svg-sprite-loader")
+      .options({
+        symbolId: "icon-[name]",
+      })
+      .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"),
+        {
+          from: path.resolve(__dirname, "./public/robots.txt"), //防爬虫文件
+          to: "./", //到根目录下
+        };
+    });
+  },
+};

From 4c598205d960604e4e125a4422a50e98c91cb894 Mon Sep 17 00:00:00 2001
From: wj <1285151836@qq.com>
Date: Wed, 26 Apr 2023 10:46:24 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sync/SysUdimsData.vue | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/views/sync/SysUdimsData.vue b/src/views/sync/SysUdimsData.vue
index fb6773f..7d461d9 100644
--- a/src/views/sync/SysUdimsData.vue
+++ b/src/views/sync/SysUdimsData.vue
@@ -83,7 +83,7 @@
               <el-button type="text" size="small" slot="reference">下载
               </el-button>
             </el-popconfirm>
-            <el-popconfirm @confirm="deleteData(scope.row.id)" confirm-button-text='删除' cancel-button-text='不用了'
+            <el-popconfirm v-if="scope.row.status==4" @confirm="deleteData(scope.row.id)" confirm-button-text='删除' cancel-button-text='不用了'
                            icon="el-icon-info" icon-color="red" title="是否确认要删除这条数据？">
               <el-button type="text" size="small" slot="reference">删除
               </el-button>
@@ -342,18 +342,15 @@ export default {
     },
     statusFilterType(status) {
       const statusMap = {
-        0: "warning",
-        1: "success",
+        1: "danger",
         2: "danger",
+        3: "danger",
+        4: "success",
       };
       return statusMap[status];
     },
     wmsFilterType(status) {
-      const statusMap = {
-        "未处理": "warning",
-        "处理成功": "success",
-      };
-      return statusMap[status];
+      return status?'success':'warning';
     },
 
 

From be9a62eb143bd9b83e9a6809d788c308d439435a Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 26 Apr 2023 11:14:03 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E8=B5=84=E8=B4=A8?=
 =?UTF-8?q?=E9=A2=84=E8=AD=A6=E4=BF=A1=E6=81=AF=E6=90=9C=E7=B4=A2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/remind/supCertRemindMsg.vue | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/views/remind/supCertRemindMsg.vue b/src/views/remind/supCertRemindMsg.vue
index cf48fad..e2d0d60 100644
--- a/src/views/remind/supCertRemindMsg.vue
+++ b/src/views/remind/supCertRemindMsg.vue
@@ -3,9 +3,17 @@
     <el-card class="el-card">
       <el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
         <el-row>
+          <el-col :span="6" v-if="this.ckeck">
+            <el-form-item class="query-form-item" label="配送企业名称:">
+              <el-input v-model="filterQuery.name" placeholder="配送企业名称"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="名称:">
-              <el-input v-model="filterQuery.name" placeholder="名称"
+            <el-form-item class="query-form-item" label="证书名称:">
+              <el-input v-model="filterQuery.certName" placeholder="证书名称"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
@@ -52,6 +60,7 @@
               </el-select>
             </el-form-item>
           </el-col>
+
         </el-row>
 
       </el-form>
@@ -217,11 +226,13 @@ export default {
         type: 1,
         page: 1,
         limit: 20,
+        certName:null
       },
       list: [],
       total: 0,
       loading: true,
       index: null,
+      ckeck:null,
       statusMap: {
         1: "未确认",
         2: "已确认"
@@ -342,6 +353,9 @@ export default {
   created() {
     // 加载表格数据
     this.getList();
+    if(this.$store.getters.customerId == 110){
+      this.ckeck=true;
+    }
   },
 };
 </script>

From bae65e478fad499a3cca9241e37c70f9764039c7 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 26 Apr 2023 11:56:21 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=20=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/corpMaintain/corpImport.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/basic/corpMaintain/corpImport.vue b/src/views/basic/corpMaintain/corpImport.vue
index 136d80a..60a6549 100644
--- a/src/views/basic/corpMaintain/corpImport.vue
+++ b/src/views/basic/corpMaintain/corpImport.vue
@@ -13,7 +13,7 @@
               <el-select v-model="filterQuery.status" style="width: 90%" placeholder="请选择处理状态">
                 <el-option label="全部" value=""></el-option>
                 <el-option label="处理中" value="0"></el-option>
-                <el-option label="已处理" value="1"></el-option>
+                <el-option label="已处理" value="3"></el-option>
                 <el-option label="异常" value="2"></el-option>
               </el-select>
             </el-form-item>

From fb0eea653799211fc08519023a697f01fb5387c6 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 26 Apr 2023 12:01:02 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86=E7=89=A9=E8=B5=84=E5=AD=97=E5=85=B8=20=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=20=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/udiInfoManageSp.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/basic/product/udiInfoManageSp.vue b/src/views/basic/product/udiInfoManageSp.vue
index 935734e..a10e42e 100644
--- a/src/views/basic/product/udiInfoManageSp.vue
+++ b/src/views/basic/product/udiInfoManageSp.vue
@@ -647,7 +647,7 @@ export default {
   }
   ,
   created() {
-    // this.getList();
+     this.getList();
     this.selectSysParam();
     this.getSysFilter();
     this.findMethod();

From 79cfe143335494aeb6520f86fd86f775aa6aa719 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 26 Apr 2023 14:07:18 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=85=E9=83=A8?=
 =?UTF-8?q?=E7=A0=81=20=E6=9F=A5=E8=AF=A2=E7=9A=84=E6=97=B6=E5=80=99=20?=
 =?UTF-8?q?=E5=AD=90=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=9C=AA=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/inner/innerOrder.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/inventory/inner/innerOrder.vue b/src/views/inventory/inner/innerOrder.vue
index b89ef05..932c7b9 100644
--- a/src/views/inventory/inner/innerOrder.vue
+++ b/src/views/inventory/inner/innerOrder.vue
@@ -211,6 +211,8 @@ export default {
     onSubmitFind() {
       this.filterQuery.page = 1;
       this.getList();
+      this.detailList=[];
+
     },
 
     getList() {
@@ -355,10 +357,10 @@ export default {
   }
   ,
   created() {
-    let end = new Date();
-    let start = new Date();
-    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-    this.actDateRange = [start, end];
+    // let end = new Date();
+    // let start = new Date();
+    // start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+    // this.actDateRange = [start, end];
     this.getList();
   }
   ,