From 17551dc527456e03c19d504d77d719cea2806da8 Mon Sep 17 00:00:00 2001
From: xs <xins@mesnac.com>
Date: Thu, 29 May 2025 14:22:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?4.0.13=20=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hw-ui/src/layout/components/Navbar.vue  |  3 +-
 hw-ui/src/views/system/config/index.vue | 18 ++++-----
 hw-ui/src/views/system/dict/data.vue    | 50 ++++++++++++------------
 hw-ui/src/views/system/dict/index.vue   | 52 ++++++++++++-------------
 4 files changed, 62 insertions(+), 61 deletions(-)

diff --git a/hw-ui/src/layout/components/Navbar.vue b/hw-ui/src/layout/components/Navbar.vue
index 44a5d5ec..e58a7322 100644
--- a/hw-ui/src/layout/components/Navbar.vue
+++ b/hw-ui/src/layout/components/Navbar.vue
@@ -81,6 +81,7 @@
             <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="路由地址" align="center" prop="routerAddress" />
         <el-table-column align="center" class-name="small-padding fixed-width" label="操作" width="100">
           <template slot-scope="scope">
             <el-button
@@ -208,7 +209,7 @@ export default {
     /** 跳转处理 */
     jumpProcessing(row) {
       let params = {};
-      if (row.routerAddressDetail != null){
+      if (row.routerAddressDetail != null && row.routerAddressDetail !==''){
         params =  JSON.parse(row.routerAddressDetail)
 
       }
diff --git a/hw-ui/src/views/system/config/index.vue b/hw-ui/src/views/system/config/index.vue
index 8f66f5a3..40840cfc 100644
--- a/hw-ui/src/views/system/config/index.vue
+++ b/hw-ui/src/views/system/config/index.vue
@@ -47,7 +47,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!--el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -56,7 +56,7 @@
           @click="handleAdd"
           v-hasPermi="['system:config:add']"
         >新增</el-button>
-      </el-col>
+      </el-col-->
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -68,7 +68,7 @@
           v-hasPermi="['system:config:edit']"
         >修改</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!--el-col :span="1.5">
         <el-button
           type="danger"
           plain
@@ -78,7 +78,7 @@
           @click="handleDelete"
           v-hasPermi="['system:config:remove']"
         >删除</el-button>
-      </el-col>
+      </el-col-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -128,13 +128,13 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:config:edit']"
           >修改</el-button>
-          <el-button
+          <!--el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:config:remove']"
-          >删除</el-button>
+          >删除</el-button-->
         </template>
       </el-table-column>
     </el-table>
@@ -154,13 +154,13 @@
           <el-input v-model="form.configName" placeholder="请输入参数名称" />
         </el-form-item>
         <el-form-item label="参数键名" prop="configKey">
-          <el-input v-model="form.configKey" placeholder="请输入参数键名" />
+          <el-input v-model="form.configKey" placeholder="请输入参数键名" disabled/>
         </el-form-item>
         <el-form-item label="参数键值" prop="configValue">
           <el-input v-model="form.configValue" placeholder="请输入参数键值" />
         </el-form-item>
         <el-form-item label="系统内置" prop="configType">
-          <el-radio-group v-model="form.configType">
+          <el-radio-group v-model="form.configType" disabled>
             <el-radio
               v-for="dict in dict.type.sys_yes_no"
               :key="dict.value"
@@ -340,4 +340,4 @@ export default {
     }
   }
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/hw-ui/src/views/system/dict/data.vue b/hw-ui/src/views/system/dict/data.vue
index 3befe4a6..8dc5527d 100644
--- a/hw-ui/src/views/system/dict/data.vue
+++ b/hw-ui/src/views/system/dict/data.vue
@@ -36,16 +36,16 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:dict:add']"
-        >新增</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['system:dict:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -57,17 +57,17 @@
           v-hasPermi="['system:dict:edit']"
         >修改</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:dict:remove']"
-        >删除</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['system:dict:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -112,7 +112,7 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <!--el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -129,7 +129,7 @@
             v-hasPermi="['system:dict:remove']"
           >删除</el-button>
         </template>
-      </el-table-column>
+      </el-table-column-->
     </el-table>
 
     <pagination
@@ -150,7 +150,7 @@
           <el-input v-model="form.dictLabel" placeholder="请输入数据标签" />
         </el-form-item>
         <el-form-item label="数据键值" prop="dictValue">
-          <el-input v-model="form.dictValue" placeholder="请输入数据键值" />
+          <el-input v-model="form.dictValue" placeholder="请输入数据键值" disabled/>
         </el-form-item>
         <el-form-item label="样式属性" prop="cssClass">
           <el-input v-model="form.cssClass" placeholder="请输入样式属性" />
@@ -399,4 +399,4 @@ export default {
     }
   }
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/hw-ui/src/views/system/dict/index.vue b/hw-ui/src/views/system/dict/index.vue
index 6ca54571..7a31d1c1 100644
--- a/hw-ui/src/views/system/dict/index.vue
+++ b/hw-ui/src/views/system/dict/index.vue
@@ -52,16 +52,16 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:dict:add']"
-        >新增</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['system:dict:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -73,17 +73,17 @@
           v-hasPermi="['system:dict:edit']"
         >修改</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:dict:remove']"
-        >删除</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['system:dict:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -129,7 +129,7 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <!--el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -146,7 +146,7 @@
             v-hasPermi="['system:dict:remove']"
           >删除</el-button>
         </template>
-      </el-table-column>
+      </el-table-column-->
     </el-table>
 
     <pagination
@@ -164,10 +164,10 @@
           <el-input v-model="form.dictName" placeholder="请输入字典名称" />
         </el-form-item>
         <el-form-item label="字典类型" prop="dictType">
-          <el-input v-model="form.dictType" placeholder="请输入字典类型" />
+          <el-input v-model="form.dictType" placeholder="请输入字典类型" disabled/>
         </el-form-item>
         <el-form-item label="状态" prop="status">
-          <el-radio-group v-model="form.status">
+          <el-radio-group v-model="form.status" disabled>
             <el-radio
               v-for="dict in dict.type.sys_normal_disable"
               :key="dict.value"
@@ -344,4 +344,4 @@ export default {
     }
   }
 };
-</script>
\ No newline at end of file
+</script>

From 0c658200708afa9e3edb765c6c22d099fc4a0be3 Mon Sep 17 00:00:00 2001
From: xs <xins@mesnac.com>
Date: Wed, 11 Jun 2025 17:00:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?4.0.14=20=E8=BD=A6=E9=97=B4=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E9=A2=86=E6=96=99=E5=88=86=E9=A1=B5=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=EF=BC=8C=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=85=A5title=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/board/common/applyRawOutstock.vue   | 19 +++++++++++++++----
 hw-ui/src/views/mes/saleOrder/index.vue       |  2 +-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/hw-ui/src/views/board/common/applyRawOutstock.vue b/hw-ui/src/views/board/common/applyRawOutstock.vue
index b8de3834..a063c6eb 100644
--- a/hw-ui/src/views/board/common/applyRawOutstock.vue
+++ b/hw-ui/src/views/board/common/applyRawOutstock.vue
@@ -42,8 +42,8 @@
 <!--      </el-form-item>-->
 
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="searchMaterial('1')">BOM内物料搜索</el-button>
-        <el-button type="warning" icon="el-icon-search" size="mini" @click="searchMaterial('0')">非BOM内物料搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="searchBomMaterial">BOM内物料搜索</el-button>
+        <el-button type="warning" icon="el-icon-search" size="mini" @click="searchNoneBomMaterial()">非BOM内物料搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -210,6 +210,7 @@ export default {
         YES: '1',//是
       },
       wmsRawOutstockDetailList:[],
+      bomFlag:undefined,
     };
   },
   created() {
@@ -280,8 +281,18 @@ export default {
       this.searchMaterial();
     },
 
+    searchBomMaterial(){
+      this.bomFlag = "1";
+      this.searchMaterial()
+    },
+
+    searchNoneBomMaterial(){
+      this.bomFlag = "0";
+      this.searchMaterial();
+    },
+
     // 物料搜索
-    searchMaterial(bomFlag) {
+    searchMaterial() {
       this.loading = true;
       if (this.form.warehouseId === null || this.form.warehouseId === undefined
         || this.form.warehouseId === "") {
@@ -293,7 +304,7 @@ export default {
       this.queryParams.planDetailCode = this.form.planDetailCode;
       this.queryParams.productId = this.form.productId;
       this.queryParams.materialBomId = this.form.materialBomId;
-      this.queryParams.accessoriesFlag = bomFlag;
+      this.queryParams.accessoriesFlag = this.bomFlag;
       getStockTotal(this.queryParams).then(e => {
         this.total = e.total;
         // e.rows.forEach(ee =>{
diff --git a/hw-ui/src/views/mes/saleOrder/index.vue b/hw-ui/src/views/mes/saleOrder/index.vue
index 8bf52ed3..8ba8ec55 100644
--- a/hw-ui/src/views/mes/saleOrder/index.vue
+++ b/hw-ui/src/views/mes/saleOrder/index.vue
@@ -783,7 +783,7 @@ export default {
 
     /** 导入按钮操作 */
     handleImport() {
-      this.upload.title = "提资单导入";
+      this.upload.title = "销售订单导入";
       this.upload.open = true;
       this.submitLoading = false;
     },