From dfeb0b354f13bbce5a5576844bc31fc661bfb369 Mon Sep 17 00:00:00 2001
From: CTP <630182278@qq.com>
Date: Thu, 20 Apr 2023 17:46:44 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=BF=A1=E6=81=AF=20?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=96=B0=E5=A2=9E=20=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=20=20=E9=80=89=E4=B8=AD=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dept/authDept.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/views/system/dept/authDept.vue b/src/views/system/dept/authDept.vue
index cf735d9..bcc2c5d 100644
--- a/src/views/system/dept/authDept.vue
+++ b/src/views/system/dept/authDept.vue
@@ -81,13 +81,11 @@
             <el-button
               type="text"
               :disabled="scope.row.status == 0"
-              @click.native.stop="subAddDeptDialog(scope.row)"
+              @click.native="subAddDeptDialog(scope.row)"
               >新增
             </el-button>
 
-            <el-button
-              type="text"
-              @click.native.stop="updateDeptDialog(scope.row)"
+            <el-button type="text" @click.native="updateDeptDialog(scope.row)"
               >编辑
             </el-button>
 

From c6923e7bf5deb54df2a7680cdb59a0338fd48840 Mon Sep 17 00:00:00 2001
From: CTP <630182278@qq.com>
Date: Fri, 21 Apr 2023 14:02:54 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=AE=BE=E7=BD=AE=20?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E7=A6=81=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sync/SysUdimsConfig.vue  | 139 +++++++++++++++++++++--------
 src/views/system/dept/authDept.vue |   1 +
 2 files changed, 102 insertions(+), 38 deletions(-)

diff --git a/src/views/sync/SysUdimsConfig.vue b/src/views/sync/SysUdimsConfig.vue
index c1714bb..8ff2646 100644
--- a/src/views/sync/SysUdimsConfig.vue
+++ b/src/views/sync/SysUdimsConfig.vue
@@ -6,9 +6,8 @@
         <el-descriptions class="margin-top" :column="1" :size="100" border>
           <template slot="extra">
             <el-button type="primary" size="small" @click="saveConfig()"
-            >保存
-            </el-button
-            >
+              >保存
+            </el-button>
           </template>
           <el-descriptions-item>
             <template slot="label"> 同步服务</template>
@@ -23,7 +22,7 @@
               <el-col :span="14" class="el-col">
                 <div>
                   <span style="color: red"
-                  >说明:&nbsp;修改同步参数时,请关闭数据同步服务
+                    >说明:&nbsp;修改同步参数时,请关闭数据同步服务
                   </span>
                 </div>
               </el-col>
@@ -51,7 +50,7 @@
                     style="margin-left: 20px"
                     :disabled="configQuery.downstreamEnable"
                     :loading="testLoading"
-                  >测试连通
+                    >测试连通
                   </el-button>
                 </div>
               </el-col>
@@ -65,7 +64,7 @@
           <!-- 参数设置 -->
           <el-descriptions-item>
             <template slot="label"> 参数设置</template>
-            <el-row :gutter="20" class="el-row" type="flex">
+            <!-- <el-row :gutter="20" class="el-row" type="flex">
               <el-col :span="20" class="el-col">
                 <div>
                   <span>数据上传时间间隔(单位:分钟):&nbsp;</span>
@@ -78,7 +77,7 @@
                     splaceholder="请输入内容"
                   ></el-input>
                   <span style="margin-left: 30px"
-                  >延时上传(单位:分钟):&nbsp;</span
+                    >延时上传(单位:分钟):&nbsp;</span
                   >
                   <el-input
                     style="width: 100px"
@@ -90,7 +89,7 @@
                   ></el-input>
 
                   <span style="margin-left: 30px"
-                  >数据下载时间间隔(单位:分钟):&nbsp;</span
+                    >数据下载时间间隔(单位:分钟):&nbsp;</span
                   >
                   <el-input
                     style="width: 100px"
@@ -102,12 +101,51 @@
                   ></el-input>
                 </div>
               </el-col>
-            </el-row>
+            </el-row> -->
+            <el-form
+              label-positiom="right"
+              label-width="200px"
+              :inline="true"
+              disabled
+            >
+              <el-form-item label="数据上传时间间隔(单位:分钟):">
+                <el-input
+                  style="width: 100px"
+                  size="small"
+                  type="number"
+                  v-model="configQuery.syncTime"
+                  splaceholder="请输入内容"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="延时上传(单位:分钟):">
+                <el-input
+                  style="width: 100px"
+                  size="small"
+                  type="number"
+                  v-model="configQuery.delaySyncTime"
+                  splaceholder="请输入内容"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="数据下载时间间隔(单位:分钟):">
+                <el-input
+                  style="width: 100px"
+                  size="small"
+                  type="number"
+                  v-model="configQuery.syncDownloadTime"
+                  splaceholder="请输入内容"
+                ></el-input>
+              </el-form-item>
+            </el-form>
           </el-descriptions-item>
           <!-- 系统设置信息 -->
           <el-descriptions-item>
             <template slot="label"> 系统设置信息</template>
-            <el-form label-positiom="right" label-width="200px" :inline="true">
+            <el-form
+              label-positiom="right"
+              label-width="200px"
+              :inline="true"
+              disabled
+            >
               <el-form-item label="系统运行参数">
                 <el-select v-model="configQuery.systemConfig">
                   <el-option :value="0" label="不同步"></el-option>
@@ -132,7 +170,12 @@
                 </el-select>
               </el-form-item>
             </el-form>
-            <el-form label-positiom="right" label-width="200px" :inline="true">
+            <el-form
+              label-positiom="right"
+              label-width="200px"
+              :inline="true"
+              disabled
+            >
               <el-form-item label="自动建出入库单设置">
                 <el-select v-model="configQuery.scanChangeConfig">
                   <el-option :value="0" label="不同步"></el-option>
@@ -153,7 +196,12 @@
           <!-- 单据类型 -->
           <el-descriptions-item>
             <template slot="label"> 单据类型</template>
-            <el-form label-positiom="right" label-width="200px" :inline="true">
+            <el-form
+              label-positiom="right"
+              label-width="200px"
+              :inline="true"
+              disabled
+            >
               <el-form-item label="业务单据类型">
                 <el-select v-model="configQuery.typeBus">
                   <el-option :value="0" label="不同步"></el-option>
@@ -180,7 +228,12 @@
           <!-- 用户信息 -->
           <el-descriptions-item>
             <template slot="label"> 用户信息</template>
-            <el-form label-positiom="right" label-width="200px" :inline="true">
+            <el-form
+              label-positiom="right"
+              label-width="200px"
+              :inline="true"
+              disabled
+            >
               <el-form-item label="部门信息">
                 <el-select v-model="configQuery.basicDept">
                   <el-option :value="0" label="不同步"></el-option>
@@ -207,7 +260,12 @@
           <!-- 基础数据 -->
           <el-descriptions-item>
             <template slot="label"> 基础数据</template>
-            <el-form label-positiom="right" label-width="200px" :inline="true">
+            <el-form
+              label-positiom="right"
+              label-width="200px"
+              :inline="true"
+              disabled
+            >
               <el-form-item label="耗材字典">
                 <el-select v-model="configQuery.basicProducts">
                   <el-option :value="0" label="不同步"></el-option>
@@ -234,7 +292,12 @@
           <!-- 第三方基础信息 -->
           <el-descriptions-item>
             <template slot="label"> 第三方基础信息</template>
-            <el-form label-positiom="right" label-width="200px" :inline="true">
+            <el-form
+              label-positiom="right"
+              label-width="200px"
+              :inline="true"
+              disabled
+            >
               <el-form-item label="第三方产品信息">
                 <el-select v-model="configQuery.basicThirdProducts">
                   <el-option :value="0" label="不同步"></el-option>
@@ -270,7 +333,12 @@
           <!-- 国家库DI数据 -->
           <el-descriptions-item>
             <template slot="label"> 国家库DI数据</template>
-            <el-form label-positiom="right" label-width="200px" :inline="true">
+            <el-form
+              label-positiom="right"
+              label-width="200px"
+              :inline="true"
+              disabled
+            >
               <el-form-item label="DI产品信息">
                 <el-select v-model="configQuery.dbDiProducts">
                   <el-option :value="0" label="不同步"></el-option>
@@ -333,7 +401,7 @@
                 size="small"
                 :disabled="configQuery.downstreamEnable"
                 @click="addToInBusTypeDialog()"
-              >添加扫码单据类型
+                >添加扫码单据类型
               </el-button>
             </div>
             <el-table :data="checkedToInBusTypes" border style="width: 100%">
@@ -368,7 +436,7 @@
                     size="small"
                     :disabled="configQuery.downstreamEnable"
                     @click.native="removeToInBus(scope.$index, scope.row)"
-                  >移除
+                    >移除
                   </el-button>
                 </template>
               </el-table-column>
@@ -402,7 +470,7 @@
                   ></el-input>
 
                   <span style="margin-left: 30px"
-                  >单据下载时间间隔(单位:分钟):&nbsp;</span
+                    >单据下载时间间隔(单位:分钟):&nbsp;</span
                   >
                   <el-input
                     style="width: 100px"
@@ -427,7 +495,7 @@
                 size="small"
                 :disabled="configQuery.downstreamEnable"
                 @click="addBusTypeDialog()"
-              >添加扫码单据类型
+                >添加扫码单据类型
               </el-button>
             </div>
             <el-table :data="checkedBusTypes" border style="width: 100%">
@@ -462,7 +530,7 @@
                     size="small"
                     :disabled="configQuery.downstreamEnable"
                     @click.native="remveBus(scope.$index, scope.row)"
-                  >移除
+                    >移除
                   </el-button>
                 </template>
               </el-table-column>
@@ -489,7 +557,7 @@
                 size="small"
                 :disabled="configQuery.downstreamEnable"
                 @click="addChangeBusTypeDialog()"
-              >添加业务单据类型
+                >添加业务单据类型
               </el-button>
             </div>
             <el-table :data="checkedChangeBusTypes" border style="width: 100%">
@@ -523,7 +591,7 @@
                     size="small"
                     :disabled="configQuery.downstreamEnable"
                     @click.native="removeChangeBus(scope.$index, scope.row)"
-                  >移除
+                    >移除
                   </el-button>
                 </template>
               </el-table-column>
@@ -541,9 +609,8 @@
       >
         <div style="float: right; margin-bottom: 10px; margin-right: 25px">
           <el-button type="primary" size="small" @click="addToInBusType()"
-          >选入
-          </el-button
-          >
+            >选入
+          </el-button>
         </div>
         <el-table
           :data="busTypes"
@@ -587,9 +654,8 @@
       >
         <div style="float: right; margin-bottom: 10px; margin-right: 25px">
           <el-button type="primary" size="small" @click="addBusType()"
-          >选入
-          </el-button
-          >
+            >选入
+          </el-button>
         </div>
         <el-table
           :data="busTypes"
@@ -634,9 +700,8 @@
       >
         <div style="float: right; margin-bottom: 10px; margin-right: 25px">
           <el-button type="primary" size="small" @click="addChangeBusType()"
-          >选入
-          </el-button
-          >
+            >选入
+          </el-button>
         </div>
         <el-table
           :data="changeBusTypes"
@@ -681,8 +746,8 @@ import {
   updateConfig,
 } from "@/api/sync/spsSyncStatus";
 import store from "@/store";
-import {getBussinessType} from "@/api/basic/bussinessType";
-import {getBusTypeChangeList} from "@/api/basic/busTypeChange";
+import { getBussinessType } from "@/api/basic/bussinessType";
+import { getBusTypeChangeList } from "@/api/basic/busTypeChange";
 
 export default {
   name: "SysUdimsConfig",
@@ -798,8 +863,7 @@ export default {
               this.loading = false;
             });
         })
-        .catch(() => {
-        });
+        .catch(() => {});
     },
 
     testConnect() {
@@ -832,8 +896,7 @@ export default {
           this.busTypes = response.data.list || [];
           this.total = response.data.total || 0;
         })
-        .catch(() => {
-        });
+        .catch(() => {});
     },
 
     addBusTypeDialog() {
diff --git a/src/views/system/dept/authDept.vue b/src/views/system/dept/authDept.vue
index 2df912a..72bc695 100644
--- a/src/views/system/dept/authDept.vue
+++ b/src/views/system/dept/authDept.vue
@@ -588,6 +588,7 @@ export default {
           this.loading = false;
           let depList = response.data.list || [];
           this.list = this.handleTree(depList, "code", "pcode");
+          //默认选中第一行列表
           this.$nextTick(() => {
             console.log(qwe);
             if (qwe === null) {

From c167ed3283b6741d7732b3078018c57715648c59 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 21 Apr 2023 17:22:24 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/busType/bussinessTypeModify.vue | 2 +-
 src/views/system/param/systemParamConfig.vue    | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue
index 9f95976..dfd01a8 100644
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/src/views/basic/busType/bussinessTypeModify.vue
@@ -906,7 +906,7 @@
             </el-row>
           </div>
         </el-collapse-item>
-        <el-collapse-item title="是否人工审核据设置(二次审核)">
+        <el-collapse-item title="是否人工审核单据设置(二次审核)">
           <div>
             <div style="width: 100%;margin: 0 auto;margin-top: 20px">
               <el-row style="margin-bottom: 15px">
diff --git a/src/views/system/param/systemParamConfig.vue b/src/views/system/param/systemParamConfig.vue
index 73d05ee..876e97b 100644
--- a/src/views/system/param/systemParamConfig.vue
+++ b/src/views/system/param/systemParamConfig.vue
@@ -98,7 +98,7 @@
           <el-row>
             <el-form-item label="参数值" prop="paramValue" label-width="100px">
               <el-input
-                type=""
+                type="number"
                 v-model="formData.paramValue"
                 auto-complete="off"
                 style="width: 90%"
@@ -294,10 +294,6 @@ export default {
       }
     },
     formSubmit() {
-      // if (!Number.isInteger(parseInt(this.formData.paramValue))) {
-      //     this.$message.warning("参数值必须为数字");
-      //     return;
-      // }
       this.$refs["dataForm"].validate((valid) => {
         if (valid) {
           this.formLoading = true;