Merge remote-tracking branch 'origin/master'

src/views/sync/SysUdimsConfig.vue

@@ -69,7 +69,6 @@
               label-positiom="right"
               label-width="200px"
               :inline="true"
-              disabled
             >
               <el-form-item label="数据上传时间间隔(单位:分钟):">
                 <el-input
@@ -80,15 +79,15 @@
                   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.delaySyncTime"-->
+              <!--                  splaceholder="请输入内容"-->
+              <!--                ></el-input>-->
+              <!--              </el-form-item>-->
               <el-form-item label="数据下载时间间隔(单位:分钟):">
                 <el-input
                   style="width: 100px"
@@ -246,7 +245,7 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="发票信息">
-                <el-select v-model="configQuery.orderInvoice" >
+                <el-select v-model="configQuery.orderInvoice">
                   <el-option :value="0" label="不同步"></el-option>
                   <el-option :value="1" label="由内向外"></el-option>
                   <el-option :value="2" label="由外向内"></el-option>
@@ -339,11 +338,11 @@
                     size="small"
                     type="number"
                     v-model="configQuery.orderToInSyncTime"
-                    :disabled="configQuery.downstreamEnable"
                     splaceholder="请输入内容"
                   ></el-input>
                 </div>
               </el-col>
+
             </el-row>
           </el-descriptions-item>
 
@@ -424,18 +423,18 @@
                     :disabled="configQuery.downstreamEnable"
                     splaceholder="请输入内容"
                   ></el-input>
+<!--                  <span style="margin-left: 30px"-->
+<!--                  >单据下载时间间隔(单位:分钟):&nbsp;</span-->
+<!--                  >-->
+<!--                  <el-input-->
+<!--                    style="width: 100px"-->
+<!--                    size="small"-->
+<!--                    type="number"-->
+<!--                    v-model="configQuery.orderSyncDlTime"-->
+<!--                    :disabled="configQuery.downstreamEnable"-->
+<!--                    splaceholder="请输入内容"-->
+<!--                  ></el-input>-->
 
-                  <span style="margin-left: 30px"
-                  >单据下载时间间隔(单位:分钟):&nbsp;</span
-                  >
-                  <el-input
-                    style="width: 100px"
-                    size="small"
-                    type="number"
-                    v-model="configQuery.orderSyncDlTime"
-                    :disabled="configQuery.downstreamEnable"
-                    splaceholder="请输入内容"
-                  ></el-input>
                 </div>
               </el-col>
             </el-row>
@@ -836,7 +835,7 @@ export default {
           if (response.code == 20000) {
             this.$message.success("连接成功");
           } else {
-            this.$message.error("连接失败！");
+            this.$message.error(response.message);
           }
         })
         .catch(() => {