From ad1d03df9261a3274b71cb76576584c5e3f46445 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 19 Apr 2023 17:42:58 +0800
Subject: [PATCH 01/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/InvoiceRegistration.vue   | 1 -
 src/views/inventory/InvSupPreProducts.vue | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index 8b6a791..3b9b1ce 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -690,7 +690,6 @@ export default {
       }
 
       this.filterQuery.page = 1;
-      this.filterQuery.supInoivceSearch=null;
       this.getList();
     },
     hideSearch() {
diff --git a/src/views/inventory/InvSupPreProducts.vue b/src/views/inventory/InvSupPreProducts.vue
index dae6671..83f6298 100644
--- a/src/views/inventory/InvSupPreProducts.vue
+++ b/src/views/inventory/InvSupPreProducts.vue
@@ -266,7 +266,7 @@ export default {
     },
     getInvList() {
       let query = {
-        advanceType: true,
+        advanceType: 2,
       };
       getInvListByUser(query)
         .then((response) => {

From 36dca1d91e59019c36d916a397bd07d53550ca17 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 19 Apr 2023 20:58:14 +0800
Subject: [PATCH 02/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/locUdi/UdiSupplement.vue | 2 +-
 src/views/inout/InvoiceRegistration.vue  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/basic/locUdi/UdiSupplement.vue b/src/views/basic/locUdi/UdiSupplement.vue
index 9d2fc44..86a57ee 100644
--- a/src/views/basic/locUdi/UdiSupplement.vue
+++ b/src/views/basic/locUdi/UdiSupplement.vue
@@ -331,7 +331,7 @@ export default {
       return !row.check;
     },
     handleCurrentChange(val) {
-      this.unionQuery.page = val;
+      this.unionQuery.page = val.page;
       this.getList();
     },
     tableRowClassName({row, rowIndex}) {
diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index 3b9b1ce..61e2e77 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -737,7 +737,7 @@ export default {
     getBusType() {
       let query = {
         code: this.filterQuery.invCode,
-        enabled: true,
+        enable: true,
         vueType: "supInvoice",
       };
       getLocalJoinByUser(query)

From 9f2dfa497f5aef5e534055a657380773b075ae86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Wed, 19 Apr 2023 22:51:16 +0800
Subject: [PATCH 03/20] =?UTF-8?q?=E5=86=85=E9=83=A8=E7=A0=81=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/inout/order.js                        |   8 +
 src/views/basic/business/stockOrderPrint.vue  | 546 ++++++++++++++++++
 src/views/inventory/inner/innerCodeDetail.vue |   7 +-
 src/views/inventory/inner/innerOrder.vue      |   6 +-
 .../inventory/inner/innerOrderEditDialog.vue  |  34 +-
 .../inner/innerOrderSelectProduct.vue         |   6 +-
 6 files changed, 597 insertions(+), 10 deletions(-)
 create mode 100644 src/views/basic/business/stockOrderPrint.vue

diff --git a/src/api/inout/order.js b/src/api/inout/order.js
index a32fa73..031b8d6 100644
--- a/src/api/inout/order.js
+++ b/src/api/inout/order.js
@@ -505,3 +505,11 @@ export function updateOrderDetailBiz(params) {
   });
 }
 
+
+export function orderDetailAdd(params) {
+  return axios({
+    url: "/inv/inner/order/orderDetailAdd",
+    method: "post",
+    data: params
+  });
+}
diff --git a/src/views/basic/business/stockOrderPrint.vue b/src/views/basic/business/stockOrderPrint.vue
new file mode 100644
index 0000000..268cf10
--- /dev/null
+++ b/src/views/basic/business/stockOrderPrint.vue
@@ -0,0 +1,546 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="query" label-width="100px" v-show="showSearch">
+        <el-row style="width: 100%">
+          <el-col :span="8">
+            <el-form-item label="单号:">
+              <el-input v-model="query.billNo" style="width: 90%" placeholder="请输入单号" clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="打印状态：" prop="inCodeStatus" clearable>
+              <el-select v-model="query.inCodeStatus" style="width: 90%">
+                <el-option label="未打印" :value="0"></el-option>
+                <el-option label="已打印" :value="1"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <!--          <el-col :span="8">-->
+          <!--            <el-form-item label="送货单位:">-->
+          <!--              <el-input v-model="query.corpName" style="width: 90%" placeholder="请输入送货单位" clearable></el-input>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="单据类型:">
+              <el-select v-model="query.action" placeholder="请选择单据类型"
+                         style="width: 90%"
+                         clearable>
+                <el-option
+                  v-for="item in busTypes"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.action">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="单据状态:">
+              <el-select v-model="query.status" placeholder="请选择单据状态" style="width: 90%">
+                <el-option label="草稿" :value=1>草稿</el-option>
+                <el-option label="待校验" :value=3>待校验</el-option>
+                <el-option label="待核对" :value=5>待核对</el-option>
+                <el-option label="待审核" :value=10>待审核</el-option>
+                <el-option label="已审核" :value=7>已审核</el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="8">
+            <el-form-item label="创建时间:">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                style="width: 90%"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+      </el-form>
+
+
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="combine">选入</el-button>
+        </el-button-group>
+      </div>
+
+      <el-divider style="margin: 15px"></el-divider>
+
+
+      <el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row
+                @row-click="getStockOrderDetailList" ref="multipleTable">
+        <el-table-column type="index" label="序号" width="50"></el-table-column>
+        <el-table-column label="单据号" prop="billNo" width="140" show-overflow-tooltip></el-table-column>
+        <el-table-column label="单据类型" prop="billTypeName" width="120">
+        </el-table-column>
+        <el-table-column label="创建时间" prop="createTime" width="150"></el-table-column>
+        <el-table-column label="打印状态" width="100" prop="inCodeStatus">
+          <template slot-scope="scope">
+            <span>{{ enableMap[scope.row.inCodeStatus] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="采购部门" prop="deptName" width="120">
+        </el-table-column>
+        <el-table-column label="收货仓库" prop="invName" width="150">
+        </el-table-column>
+        <el-table-column label="单据来源" prop="fromType" width="120">
+          <template slot-scope="scope">
+            <span>{{ sourceMap[scope.row.fromType] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="query.limit"
+        :page.sync="query.page"
+        @pagination="handleCurrentChange"
+      ></pagination>
+
+    </el-card>
+
+    <el-card class="el-card">
+      <el-table v-loading="detailLoading" :data="detailList" style="width: 100%" border>
+        <el-table-column type="index" label="序号" width="50"></el-table-column>
+        <el-table-column label="物资名称" prop="coName"></el-table-column>
+        <el-table-column label="规格型号" prop="spec"></el-table-column>
+        <el-table-column label="批次号" prop="batchNo"></el-table-column>
+        <el-table-column label="单据数量" prop="count"></el-table-column>
+        <!--        <el-table-column label="实际数量" prop="scanCount"></el-table-column>-->
+        <el-table-column label="生产日期" prop="productDate">
+          <template slot-scope="scope">
+            <span>{{ convertDateFun(scope.row.productDate) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="失效日期" prop="expireDate">
+          <template slot-scope="scope">
+            <span>{{ convertDateFun(scope.row.expireDate) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="价格" prop="price"></el-table-column>
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="detailTotal>0"
+        :total="detailTotal"
+        :limit.sync="detailQuery.limit"
+        :page.sync="detailQuery.page"
+        @pagination="detailHandleCurrentChange"
+      ></pagination>
+    </el-card>
+
+<!--    <el-dialog-->
+<!--      title="内部码管理"-->
+<!--      :visible.sync="qrcodeDetailVisible"-->
+<!--      :close-on-click-modal="false"-->
+<!--      :close-on-press-escape="false"-->
+<!--      width="70%"-->
+<!--      append-to-body-->
+<!--      v-if="qrcodeDetailVisible"-->
+<!--      @close='closeQRCodeDetailDialog'-->
+<!--    >-->
+<!--      <stockOrderQRCodeDetail-->
+<!--        :closeDialog="closeQRCodeDetailDialog"-->
+<!--        :idQuery="idQuery"-->
+<!--      ></stockOrderQRCodeDetail>-->
+<!--    </el-dialog>-->
+
+  </div>
+</template>
+
+<script>
+import {
+  stockorderQuery, stockOrderDetail, deleteStockOrderById, deleteStockOrderDetailById,
+  copyStockOrderDetail, submitStockOrder,
+  uploadStockOrderDetail, uploadStockOrderDetailCount,
+  generateStockOrderQRCodeText
+} from "@/api/inout/stockOrder";
+import stockOrderDistribution from "./stockOrderDistribution";
+import stockOrderQRCodeDetail from "./stockOrderQRCodeDetail";
+import stockQRCodeExport from "./stockQRCodeExport";
+import draggable from "vuedraggable";
+import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "@/api/itextpdf/itextpdf";
+import store from "@/store";
+import {getLocalJoinBusType} from "@/api/basic/busLocalType";
+import {filterAll, filterAllByUser} from "@/api/system/invWarehouse";
+import {filterSubByInv, findInvByUser} from '@/api/system/invSubWarehouse'
+import {convertDate} from "@/utils/date"
+import { filterOrder, orderDetailAdd } from '@/api/inout/order'
+import {getLocalJoinByUser} from "@/api/basic/busType";
+
+export default {
+  name: "stockOrder",
+  props: {
+    data: {
+      type: Object,
+      required: true,
+    },
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    purType: {
+      type: Object,
+      required: true,
+    },
+    pId: {
+      type: Object,
+      required: true,
+    },
+    billNo: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      showSearch: true,
+      convertDateFun: convertDate,
+      query: {
+        billType: null,
+        corpName: null,
+        locStorageCode: this.$store.getters.locInvCode,
+        invWarehouseCode: this.$store.getters.locSubInvCode,
+        billNo: "",
+        status: "",
+        action: null,
+        statusType: "supInCode",
+        page: 1,
+        limit: 10,
+        startTime: "",
+        endTime: "",
+        inCodeStatus: 1,
+      },
+      detailQuery: {
+        orderIdFk: "",
+        page: 1,
+        limit: 20
+      },
+      isSp: store.getters.customerId,
+      storageList: [],
+      subInvList: [],
+      busTypes: [],
+      list: [],
+      orderQuery:[],
+      detailList: [],
+      total: 0,
+      detailTotal: 0,
+      loading: false,
+      detailLoading: false,
+      enableMap: {
+        1: "已打印",
+        0: "未打印",
+      },
+      sourceMap: {
+        "1": "UDIMS平台",
+        "2": "网页新增",
+        "3": "pda已校验",
+        "4": "pda未校验",
+        "5": "pc端扫码精灵",
+        "6": "单据流转",
+        "7": "供应商平台",
+        "8": "平衡补单",
+        "9": "单据验收直接补单",
+        "10": "单据复制",
+        "11": "盘点单据转单",
+        "12": "申购计划转单",
+        "13": "领用单据转单",
+        "14": "第三方单据转单",
+
+      },
+      idQuery: {
+        id: "",
+        filterUDIType: null,
+      },
+      distributionVisible: false,
+      detailFormRules: {
+        batchNo: [
+          {required: true, message: "请输入批次号", trigger: "blur"}
+        ],
+        productDate: [
+          {required: true, message: "请输入生产日期", trigger: "blur"}
+        ],
+        expireDate: [
+          {required: true, message: "请输入失效日期", trigger: "blur"}
+        ],
+        sweepCount: [
+          {required: true, message: "请输入扫码数量", trigger: "blur"}
+        ]
+      },
+      detailFormVisible: false,
+      detailFormData: {},
+      detailFormLoading: false,
+      haveDistributionVisible: true,
+      qrcodeDetailVisible: false,
+      qrcodeExportVisible: false,
+      filterUDIType: true,
+      actDateRange: [],
+      auditDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+    }
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: ""
+      });
+      this.query = {
+        billType: null,
+        corpName: null,
+        locStorageCode: this.$store.getters.locInvCode,
+        invWarehouseCode: this.$store.getters.locSubInvCode,
+        billNo: "",
+        status: "",
+        action: null,
+        statusType: "supInCode",
+        page: 1,
+        limit: 10,
+        startTime: "",
+        endTime: "",
+        inCodeStatus: 1,
+      };
+      this.getList();
+
+      this.haveDistributionVisible = true;
+      this.actDateRange = [];
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    onSubmit() {
+      this.query.page = 1;
+      if (this.actDateRange !== null) {
+        this.query.startTime = this.actDateRange[0];
+        this.query.endTime = this.actDateRange[1];
+      } else {
+        this.query.startTime = null;
+        this.query.endTime = null;
+      }
+
+      if (this.auditDateRange !== null) {
+        this.query.startAduditTime = this.auditDateRange[0];
+        this.query.endAduditTime = this.auditDateRange[1];
+      } else {
+        this.query.startAduditTime = null;
+        this.query.endAduditTime = null;
+      }
+      this.getList();
+      this.haveDistributionVisible = true;
+    },
+    handleCurrentChange(val) {
+      this.query.page = val.page;
+      this.getList();
+    },
+    detailHandleCurrentChange(val) {
+      this.detailQuery.page = val.page;
+      this.getStockOrderDetailList();
+    },
+    // 刷新表单
+    resetForm() {
+      if (this.$refs["dataForm"]) {
+        // 清空验证信息表单
+        this.$refs["dataForm"].clearValidate();
+        // 刷新表单
+        this.$refs["dataForm"].resetFields();
+        this.getList();
+      }
+    },
+    getList() {
+      this.loading = true;
+      this.orderQuery=[];
+      this.query.corpId = store.getters.customerId;
+      if (this.actDateRange !== null) {
+        this.query.startTime = this.actDateRange[0];
+        this.query.endTime = this.actDateRange[1];
+      } else {
+        this.query.startTime = null;
+        this.query.endTime = null;
+      }
+      this.query.vueType = "supDelivery";
+      filterOrder(this.query)
+        .then(response => {
+          this.loading = false;
+          if (response.code == 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+            this.detailList = [];
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.detailList = [];
+          this.total = 0;
+        });
+    },
+
+    combine(){
+      if(this.orderQuery==null && this.orderQuery.length==0){
+        this.$message.error("请先选择单据！")
+        return;
+      }
+      var query={
+        orderIdFk:this.billNo,
+        billNo:this.orderQuery.billNo
+      }
+      orderDetailAdd(query).then(response =>{
+          if (response.code == 20000) {
+            this.closeDialog();
+          }
+      })
+    },
+
+    qrcodeDetail(row) {
+      this.idQuery.id = '';
+      if (this.$isNotBlank(row.id)) {
+        this.idQuery.id = row.id;
+        this.idQuery.formData = row;
+        this.idQuery.filterUDIType = this.filterUDIType;
+        this.qrcodeDetailVisible = true;
+      }
+    },
+    closeQRCodeDetailDialog() {
+      this.qrcodeDetailVisible = false;
+      this.getList();
+    },
+    getStockOrderDetailList(row) {
+      if (this.$isNotBlank(row)) {
+        this.detailQuery.orderIdFk = row.billNo;
+        this.orderQuery=row;
+      }
+      this.detailLoading = true;
+      stockOrderDetail(this.detailQuery)
+        .then((response) => {
+          this.detailLoading = false;
+          this.detailList = response.data.list || [];
+          this.detailTotal = response.data.total;
+        })
+        .catch(() => {
+          this.detailLoading = false;
+          this.detailList = [];
+        });
+    },
+    getBusType() {
+      let query = {
+        enabled: true,
+        vueType: "supDelivery",
+      };
+      getLocalJoinByUser(query)
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+          this.filterQuery.action = this.busTypes[0].action;
+          // this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    getSubInvList() {
+      findInvByUser()
+        .then((response) => {
+          this.subInvList = response.data || [];
+        })
+        .catch(() => {
+        });
+    },
+
+    subInvChange() {
+      this.getBusType();
+    },
+  },
+  components: {
+    draggable,
+    stockOrderDistribution,
+    stockOrderQRCodeDetail,
+    stockQRCodeExport,
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        0: "gray",
+        1: "success"
+      };
+      return statusMap[status];
+    },
+    statusFilterName(status) {
+      const statusMap = {
+        "1": "草稿",
+        "2": "未配货",
+        "3": "待校验",
+      };
+      return statusMap[status];
+    },
+    typeFilterName(type) {
+      const typeMap = {
+        1: "预入库",
+        2: "普通采购",
+      };
+      return typeMap[type];
+    }
+  },
+  created() {
+    // 加载表格数据
+    this.getSubInvList();
+    this.getBusType();
+    this.getList();
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/inventory/inner/innerCodeDetail.vue b/src/views/inventory/inner/innerCodeDetail.vue
index 166ac7c..51a311b 100644
--- a/src/views/inventory/inner/innerCodeDetail.vue
+++ b/src/views/inventory/inner/innerCodeDetail.vue
@@ -273,7 +273,7 @@ export default {
 
     getOrderQRCodeTextList() {
       this.loading = true;
-      filterPrint({sOrderId :this.query.orderIdFk}) //查找该单号下的所有条码
+      filterPrint({sOrderId :this.query.sOrderId}) //查找该单号下的所有条码
         .then((response) => {
           console.log(response)
           this.codeArray = response.data.list || [];
@@ -378,7 +378,7 @@ export default {
         type: "warning",
       }).then(() => {
         this.loading = true;
-        generateInnerQRCodeText({orderIdFk: this.formData.id})
+        generateInnerQRCodeText({orderIdFk: this.formData.recordKey})
           .then(response => {
             this.loading = false;
             if (response.code === 20000) {
@@ -427,8 +427,9 @@ export default {
     if (this.$isNotBlank(this.inQuery.id)) {
       this.formData = this.inQuery.formData;
       this.query.orderId = this.inQuery.id;
-      this.query.orderIdFk = this.formData.id;
+      this.query.orderIdFk = this.formData.recordKey;
       this.query.sOrderId = this.inQuery.id;
+      console.log(this.query)
       this.getOrderQRCodeTextList();
     }
   },
diff --git a/src/views/inventory/inner/innerOrder.vue b/src/views/inventory/inner/innerOrder.vue
index e080ee3..c0a3a41 100644
--- a/src/views/inventory/inner/innerOrder.vue
+++ b/src/views/inventory/inner/innerOrder.vue
@@ -45,8 +45,8 @@
         <el-table-column label="备注说明" prop="remark"></el-table-column>
         <el-table-column label="打印状态" prop="printStatus">
           <template slot-scope="scope">
-            <el-tag :type="(scope.row.status) | statusFilterType">
-              {{ statusPrintMap[scope.row.status] }}
+            <el-tag :type="(scope.row.genStatus) | statusFilterType">
+              {{ statusPrintMap[scope.row.genStatus] }}
             </el-tag>
           </template>
         </el-table-column>
@@ -239,7 +239,7 @@ export default {
         });
     },
     handleDetail(row) {
-      let query = {orderIdFk: row.id};
+      let query = {orderIdFk: row.recordKey};
       this.loading = true;
       listInnerOrderDetail(query) //查找该单号下的所有条码
         .then((response) => {
diff --git a/src/views/inventory/inner/innerOrderEditDialog.vue b/src/views/inventory/inner/innerOrderEditDialog.vue
index d1fa892..b4b6dab 100644
--- a/src/views/inventory/inner/innerOrderEditDialog.vue
+++ b/src/views/inventory/inner/innerOrderEditDialog.vue
@@ -108,6 +108,7 @@
                 :closeDialog="closeDialogC2"
                 :data="thisData"
                 :pId="pId"
+                :billNo="billNo"
                 :filterType="2"
             ></stockOrderNewSelectProduct>
         </el-dialog>
@@ -123,6 +124,11 @@
         :append-to-body='true'
       >
         <stockOrder
+          :closeDialog="closeDialogC2"
+          :data="thisData"
+          :pId="pId"
+          :billNo="billNo"
+          :filterType="2"
         ></stockOrder>
       </el-dialog>
     </div>
@@ -131,7 +137,7 @@
 <script>
 import draggable from "vuedraggable";
 import stockOrderNewSelectProduct from "@/views/inventory/inner/innerOrderSelectProduct";
-import stockOrder from "@/views/basic/business/stockOrder";
+import stockOrder from "@/views/basic/business/stockOrderPrint";
 import {
   inserThrOrderWeb,
   delInnerOrderDetail,
@@ -173,6 +179,7 @@ export default {
             codeArray: [],
             total: 0,
             pId:null,
+            billNo:null,
             loading: false,
             index: null,
             formLoading: false,
@@ -278,6 +285,24 @@ export default {
           this.selectedIndex = "";
         },
       stockOrderList(){
+        if(this.query.id==null) {
+          inserThrOrderWeb({innerOrderEntity: this.formData,editStatus:1})
+            .then(response => {
+              this.loading = false;
+              if (response.code === 20000) {
+                this.pId=response.data.id;
+                this.billNo=response.data.recordKey;
+                this.formData.billNo=response.data.recordKey;
+                this.formData.id=this.pId
+              } else {
+
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+            })
+        }
+
         this.haveDistributionVisible = true;
       },
         selectProductFunction() {
@@ -286,7 +311,9 @@ export default {
               .then(response => {
                 this.loading = false;
                 if (response.code === 20000) {
-                  this.pId=response.data;
+                  this.pId=response.data.id;
+                  this.billNo=response.data.recordKey;
+                  this.formData.billNo=response.data.recordKey;
                   this.formData.id=this.pId
                 } else {
 
@@ -301,6 +328,7 @@ export default {
         },
         closeDialogC2(rData) {
             this.selectProductVisible = false;
+            this.haveDistributionVisible = false;
             this.getStockOrderDetailList();
         },
         rowChange(val) {
@@ -366,7 +394,7 @@ export default {
         },
         getStockOrderDetailList() {
             this.loading = true;
-            listInnerOrderDetail({orderIdFk:this.formData.id}) //查找该单号下的所有条码
+            listInnerOrderDetail({orderIdFk:this.formData.billNo}) //查找该单号下的所有条码
                 .then((response) => {
                     this.codeArray = response.data.list || [];
                     this.total = response.data.total || 0;
diff --git a/src/views/inventory/inner/innerOrderSelectProduct.vue b/src/views/inventory/inner/innerOrderSelectProduct.vue
index 6e15052..7889a78 100644
--- a/src/views/inventory/inner/innerOrderSelectProduct.vue
+++ b/src/views/inventory/inner/innerOrderSelectProduct.vue
@@ -148,6 +148,10 @@ export default {
       type: Object,
       required: true,
     },
+    billNo: {
+      type: Object,
+      required: true,
+    },
   },
 
   data() {
@@ -335,7 +339,7 @@ export default {
         productId: this.multipleSelection.rlId,
         productName: this.multipleSelection.cpmctymc,
         count: 1,
-        orderIdFk: this.pId,
+        orderIdFk: this.billNo,
         supId: this.multipleSelection.customerId,
         zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh
       };

From ef1c22f0a1e60efc95bcbff0ac196b5a5131f075 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 20 Apr 2023 09:08:10 +0800
Subject: [PATCH 04/20] =?UTF-8?q?=E9=A2=84=E9=AA=8C=E6=94=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=84=E5=94=AE=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=EF=BC=8C?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=BB=BA=E5=87=BA=E5=85=A5=E5=BA=93=E5=8D=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                             | 14 +++++--
 src/views/inout/IoDeliverySearchOrder.vue   | 43 +++++++++++++--------
 src/views/inout/IoSupSearchOrder.vue        | 33 +++++++++++++---
 src/views/inventory/InvPreProducts.vue      |  8 ++--
 src/views/inventory/InvSupPreInProducts.vue |  4 +-
 src/views/inventory/InvSupPreProducts.vue   |  2 +-
 src/views/system/dept/invWarehouse.vue      |  8 ++--
 src/views/system/param/busTypePre.vue       | 23 +++++++++--
 src/views/system/param/busTypePreModify.vue |  3 +-
 9 files changed, 97 insertions(+), 41 deletions(-)

diff --git a/.env.production b/.env.production
index 51a50f6..0fe478f 100644
--- a/.env.production
+++ b/.env.production
@@ -7,15 +7,23 @@ ENV = 'production'
 
 #林纪裕
 # VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_SPMS_SERVER/'
-# VUE_APP_BASE_API =  'http://r.jiyuudims.cloud:5004/UDI_SPMS_SERVER/'
+VUE_APP_BASE_API =  'http://r.jiyuudims.cloud:5004/UDI_SPMS_SERVER/'
 # 吴总测试服务器
 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/'
 
 # 平潭
 # VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
 
-# 文明点
-VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/'
+# 文明东
+# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/'
+
+# 实施测试服务器 ljy
+# VUE_APP_BASE_API = 'http://192.168.0.66:8504/UDI_SPMS_SERVER/'
+
+# 实施测试服务器 wqq
+# VUE_APP_BASE_API = 'http://192.168.0.66:9160/UDI_SPMS_SERVER/'
+
+
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'
 
diff --git a/src/views/inout/IoDeliverySearchOrder.vue b/src/views/inout/IoDeliverySearchOrder.vue
index 309977f..19469ff 100644
--- a/src/views/inout/IoDeliverySearchOrder.vue
+++ b/src/views/inout/IoDeliverySearchOrder.vue
@@ -3,7 +3,7 @@
     <el-card class="el-card">
       <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
         <el-row>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="送货单号:">
               <el-input v-model="filterQuery.billNo" placeholder="请输入送货单号"
                         style="width: 90%"
@@ -11,17 +11,8 @@
             </el-form-item>
           </el-col>
 
-          <!--          <el-col :span="6">-->
-          <!--            <el-form-item class="query-form-item" label="出入库类型:">-->
-          <!--              <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">-->
-          <!--                <el-option label="全部" value=""></el-option>-->
-          <!--                <el-option label="入库" value="WareHouseIn"></el-option>-->
-          <!--                <el-option label="出库" value="WareHouseOut"></el-option>-->
-          <!--              </el-select>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
 
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="收货仓库:">
               <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"
                          style="width: 90%"
@@ -37,9 +28,17 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="出入库类型:">
+              <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
+                <el-option label="全部" value=""></el-option>
+                <el-option label="入库" value="WareHouseIn"></el-option>
+                <el-option label="出库" value="WareHouseOut"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
-
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="单据类型:">
               <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
                          style="width: 90%"
@@ -56,8 +55,16 @@
           </el-col>
         </el-row>
         <el-row>
-
-          <el-col :span="8">
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="单据来源:">
+              <el-select v-model="filterQuery.sourceLocalType" placeholder="请选择单据来源" style="width: 90%">
+                <el-option label="全部" value=""></el-option>
+                <el-option label="手工建单" value="1"></el-option>
+                <el-option label="自动建单" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="往来单位:">
               <el-select
                 v-model="filterQuery.fromCorp"
@@ -92,7 +99,7 @@
           <!--            </el-form-item>-->
           <!--          </el-col>-->
 
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="创建时间:">
               <el-date-picker
                 :picker-options="pickerOptions"
@@ -109,7 +116,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="审核时间:">
               <el-date-picker
                 :picker-options="pickerOptions"
@@ -564,6 +571,7 @@ export default {
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
+        sourceLocalType: "1",
       },
 
       corpLoading: false,
@@ -700,6 +708,7 @@ export default {
         status: null,
         limit: 10,
         startTime: null,
+        sourceLocalType: "1",
         endTime: null,
         invCode: this.$store.getters.locInvCode,
       };
diff --git a/src/views/inout/IoSupSearchOrder.vue b/src/views/inout/IoSupSearchOrder.vue
index 1398649..6cb3c76 100644
--- a/src/views/inout/IoSupSearchOrder.vue
+++ b/src/views/inout/IoSupSearchOrder.vue
@@ -41,7 +41,16 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="出入库类型:">
+              <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
+                <el-option label="全部" value=""></el-option>
+                <el-option label="入库" value="WareHouseIn"></el-option>
+                <el-option label="出库" value="WareHouseOut"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="单据类型:">
               <el-select v-model="filterQuery.action" placeholder="请选择单据类型"
                          style="width: 90%"
@@ -58,7 +67,16 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="8">
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="单据来源:">
+              <el-select v-model="filterQuery.sourceLocalType" placeholder="请选择单据来源" style="width: 90%">
+                <el-option label="全部" value=""></el-option>
+                <el-option label="手工建单" value="1"></el-option>
+                <el-option label="自动建单" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="创建时间:">
               <el-date-picker
                 :picker-options="pickerOptions"
@@ -74,7 +92,7 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="审核时间:">
               <el-date-picker
                 :picker-options="pickerOptions"
@@ -430,6 +448,7 @@ export default {
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
+        sourceLocalType: "1",
       },
 
       reviceStatus: {
@@ -561,9 +580,11 @@ export default {
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
+        sourceLocalType: "1",
+
       };
-      this.actDateRange=[];
-      this.auditDateRange=[];
+      this.actDateRange = [];
+      this.auditDateRange = [];
       this.getList();
     },
     onSubmit() {
@@ -603,7 +624,7 @@ export default {
         });
     },
     handleSelectionChange(val) {
-      this.currentRow.billNo=val.billNo;
+      this.currentRow.billNo = val.billNo;
       this.getOrderDetails();
     },
     // 获取单据 业务详情、扫码详情、扫码明细
diff --git a/src/views/inventory/InvPreProducts.vue b/src/views/inventory/InvPreProducts.vue
index 3f93b94..10002cb 100644
--- a/src/views/inventory/InvPreProducts.vue
+++ b/src/views/inventory/InvPreProducts.vue
@@ -142,10 +142,10 @@
         <el-table-column label="物资名称" prop="cpmctymc" width="180"></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
         <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
-        <!--        <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>-->
-        <!--        <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>-->
-        <!--        <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>-->
-        <!--        <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>-->
+        <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
+        <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
+        <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
         <el-table-column label="库存数量" prop="reCount" width="120"></el-table-column>
         <el-table-column label="生产企业" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
                          width="180"></el-table-column>
diff --git a/src/views/inventory/InvSupPreInProducts.vue b/src/views/inventory/InvSupPreInProducts.vue
index e7ffcd9..d4907e6 100644
--- a/src/views/inventory/InvSupPreInProducts.vue
+++ b/src/views/inventory/InvSupPreInProducts.vue
@@ -246,7 +246,7 @@ export default {
 
     getList() {
       this.loading = true;
-      this.filterQuery.supId = this.$store.getters.customerId;
+      // this.filterQuery.supId = this.$store.getters.customerId;
       getInvPreInProduct(this.filterQuery).then((res) => {
         this.loading = false;
         if (res.code === 20000) {
@@ -266,7 +266,7 @@ export default {
     },
     getInvList() {
       let query = {
-        advanceType: true,
+        advanceType: 2,
       };
       getInvListByUser(query)
         .then((response) => {
diff --git a/src/views/inventory/InvSupPreProducts.vue b/src/views/inventory/InvSupPreProducts.vue
index 83f6298..65984a3 100644
--- a/src/views/inventory/InvSupPreProducts.vue
+++ b/src/views/inventory/InvSupPreProducts.vue
@@ -266,7 +266,7 @@ export default {
     },
     getInvList() {
       let query = {
-        advanceType: 2,
+        advanceType: 3, //获取寄售库1：入账，2：预验收，3：寄售
       };
       getInvListByUser(query)
         .then((response) => {
diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue
index eeb977d..6ad7fd8 100644
--- a/src/views/system/dept/invWarehouse.vue
+++ b/src/views/system/dept/invWarehouse.vue
@@ -19,8 +19,8 @@
         <el-form-item label="仓库类型" prop="advanceType">
           <el-select v-model="subData.advanceType" placeholder="请选择仓库类型" style="width: 80%">
             <el-option label="入账库" :value="1"/>
-            <el-option label="寄售库" :value="2"/>
-            <el-option label="预验收库" :value="3"/>
+            <el-option label="预验收库" :value="2"/>
+            <el-option label="寄售库" :value="3"/>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -200,8 +200,8 @@
                 <el-select v-model="subData.advanceType" :disabled="invWouse != null" placeholder="请选择仓库类型"
                            style="width: 80%">
                   <el-option label="入账库" value="1"/>
-                  <el-option label="寄售库" value="2"/>
-                  <el-option label="预验收库" value="3"/>
+                  <el-option label="预验收库" value="2"/>
+                  <el-option label="寄售库" value="3"/>
                 </el-select>
               </el-form-item>
 
diff --git a/src/views/system/param/busTypePre.vue b/src/views/system/param/busTypePre.vue
index a0030e9..227b1b9 100644
--- a/src/views/system/param/busTypePre.vue
+++ b/src/views/system/param/busTypePre.vue
@@ -55,7 +55,13 @@
             <span>{{ enableMap[scope.row.supplementAll] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="说明" prop="intro"></el-table-column>
+        <el-table-column label="创建单据模式" prop="createType">
+
+          <template slot-scope="scope">
+            <span>{{ createTypeMap[scope.row.createType] }}</span>
+          </template>
+
+        </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button
@@ -137,11 +143,12 @@ export default {
         defaultInvCode: null,
         beforeTime: 0,
         busBeforeTime: 0,
-        supplementAll: null,
+        supplementAll: true,
         intro: null,
         remark: null,
         auditStatus: null,
         busAuditStatus: null,
+        createType: null,
       },
       enableMap: {
         true: "全量补单",
@@ -153,6 +160,14 @@ export default {
         2: "待审核",
         3: "已审核"
       },
+
+      createTypeMap: {
+        1: "送货至入库补单",
+        2: "向上级仓库补单",
+        3: "预验收转入库补单",
+        4: "寄售转入库补单",
+      },
+
       total: 0,
       loading: false,
       formMap: {
@@ -273,11 +288,13 @@ export default {
         defaultInvCode: null,
         beforeTime: 0,
         busBeforeTime: 0,
-        supplementAll: null,
+        supplementAll: true,
         intro: null,
         remark: null,
         auditStatus: null,
         busAuditStatus: null,
+        createType: null,
+
       };
       this.modifyDialogVisible = true;
     },
diff --git a/src/views/system/param/busTypePreModify.vue b/src/views/system/param/busTypePreModify.vue
index 72fc7f0..e19e04f 100644
--- a/src/views/system/param/busTypePreModify.vue
+++ b/src/views/system/param/busTypePreModify.vue
@@ -97,7 +97,8 @@
                        style="width: 90%">
               <el-option label="送货至入库补单" :value="1"></el-option>
               <el-option label="向上级仓库补单" :value="2"></el-option>
-              <el-option label="寄售/预验收转入库补单" :value="3"></el-option>
+              <el-option label="预验收转入库补单" :value="3"></el-option>
+              <el-option label="寄售转入库补单" :value="4"></el-option>
             </el-select>
           </el-form-item>
         </el-col>

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

---
 src/views/basic/locUdi/UdiSupplement.vue | 6 ++++++
 src/views/inventory/inner/innerOrder.vue | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/basic/locUdi/UdiSupplement.vue b/src/views/basic/locUdi/UdiSupplement.vue
index 86a57ee..5079951 100644
--- a/src/views/basic/locUdi/UdiSupplement.vue
+++ b/src/views/basic/locUdi/UdiSupplement.vue
@@ -113,6 +113,12 @@
             width="120"
             show-overflow-tooltip
           ></el-table-column>
+          <el-table-column
+            label="创建时间"
+            prop="createTime"
+            width="120"
+            show-overflow-tooltip
+          ></el-table-column>
           <el-table-column
             label="生产日期"
             prop="produceDate"
diff --git a/src/views/inventory/inner/innerOrder.vue b/src/views/inventory/inner/innerOrder.vue
index c0a3a41..c23999d 100644
--- a/src/views/inventory/inner/innerOrder.vue
+++ b/src/views/inventory/inner/innerOrder.vue
@@ -41,7 +41,7 @@
             <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="创建人" prop="createUser"></el-table-column>
+        <el-table-column label="创建人" prop="createByName"></el-table-column>
         <el-table-column label="备注说明" prop="remark"></el-table-column>
         <el-table-column label="打印状态" prop="printStatus">
           <template slot-scope="scope">

From 8a9909bef084a16cab9e2e2ebf445c454d1318e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Thu, 20 Apr 2023 10:28:16 +0800
Subject: [PATCH 06/20] =?UTF-8?q?=E5=86=85=E9=83=A8=E7=A0=81=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/inner/innerOrderEditDialog.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/inventory/inner/innerOrderEditDialog.vue b/src/views/inventory/inner/innerOrderEditDialog.vue
index b4b6dab..7eb7493 100644
--- a/src/views/inventory/inner/innerOrderEditDialog.vue
+++ b/src/views/inventory/inner/innerOrderEditDialog.vue
@@ -285,6 +285,7 @@ export default {
           this.selectedIndex = "";
         },
       stockOrderList(){
+          debugger
         if(this.query.id==null) {
           inserThrOrderWeb({innerOrderEntity: this.formData,editStatus:1})
             .then(response => {
@@ -293,6 +294,7 @@ export default {
                 this.pId=response.data.id;
                 this.billNo=response.data.recordKey;
                 this.formData.billNo=response.data.recordKey;
+                this.formData.recordKey=response.data.recordKey;
                 this.formData.id=this.pId
               } else {
 
@@ -306,6 +308,7 @@ export default {
         this.haveDistributionVisible = true;
       },
         selectProductFunction() {
+          debugger
           if(this.query.id==null) {
             inserThrOrderWeb({innerOrderEntity: this.formData,editStatus:1})
               .then(response => {
@@ -314,6 +317,7 @@ export default {
                   this.pId=response.data.id;
                   this.billNo=response.data.recordKey;
                   this.formData.billNo=response.data.recordKey;
+                  this.formData.recordKey=response.data.recordKey;
                   this.formData.id=this.pId
                 } else {
 

From 6933a43dad471b74c523cdfdaae2edb15cfb7c65 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 20 Apr 2023 11:06:17 +0800
Subject: [PATCH 07/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/inner/innerOrder.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/inventory/inner/innerOrder.vue b/src/views/inventory/inner/innerOrder.vue
index c23999d..b89ef05 100644
--- a/src/views/inventory/inner/innerOrder.vue
+++ b/src/views/inventory/inner/innerOrder.vue
@@ -53,7 +53,7 @@
 
         <el-table-column label="操作">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)">编辑
+            <el-button type="text" size="small" @click.native.stop="newDistributionForm(scope.$index, scope.row)">编辑
             </el-button>
             <el-button type="text" size="small" @click.native="printQRCodeText(scope.row)">打印</el-button>
             <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button>

From 6247b8d7cb8e8317a2f7ec4a5979e62ca1a3f90c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Thu, 20 Apr 2023 15:05:29 +0800
Subject: [PATCH 08/20] =?UTF-8?q?=E7=89=A9=E8=B4=A8=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basic/basicHospType.js                |  9 +++++
 src/views/basic/product/productEdit.vue       | 17 +++++----
 src/views/basic/product/productUdiType.vue    | 35 ++++++++++++-------
 .../thirdSys/product/thrProductsExport.vue    |  7 ++--
 4 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/src/api/basic/basicHospType.js b/src/api/basic/basicHospType.js
index 766b347..b7a7d02 100644
--- a/src/api/basic/basicHospType.js
+++ b/src/api/basic/basicHospType.js
@@ -13,12 +13,21 @@ export function getBasicHospType(query) {
 export function getListMenu(query) {
   return axios({
     url: "/udiwms/basic/hosp/type/menuList",
+    method: "post",
+    data: query
+  });
+}
+
+export function getOneName(query) {
+  return axios({
+    url: "/udiwms/basic/hosp/type/getOneName",
     method: "get",
     params: query
   });
 }
 
 
+
 export function saveBasicHospType(query) {
   return axios({
     url: "/udiwms/basic/hosp/type/save",
diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index ae69725..0553ef8 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -578,7 +578,7 @@ import ProductSingleEdit from "@/views/basic/product/productSingleEdit";
 import selectErp from "./udiInfoselectErpUdi";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Treeselect from "@riophae/vue-treeselect";
-import {getListMenu} from "@/api/basic/basicHospType";
+import { getListMenu, getOneName } from '@/api/basic/basicHospType'
 
 
 export default {
@@ -849,12 +849,15 @@ export default {
       }
     },
     getTreeselect() {
-      getListMenu().then(response => {
-        this.fromDeptOptions = [];
-        const menu = {id: 0, name: '主类目', children: []};
-        menu.children = this.handleTree(response.data, "code", "parentCode");
-        this.fromDeptOptions.push(menu);
-      });
+      getOneName().then(res =>{
+        const menu = {id: res.data.id,code:res.data.code, name: res.data.name, children: []};
+        getListMenu({}).then(response => {
+          this.fromDeptOptions = [];
+          menu.children = this.handleTree(response.data,"code", "parentCode");
+          console.log(menu)
+          this.fromDeptOptions.push(menu);
+        });
+      })
     },
     /** 转换菜单数据结构 */
     normalizer(node) {
diff --git a/src/views/basic/product/productUdiType.vue b/src/views/basic/product/productUdiType.vue
index fb186aa..1dc4bdd 100644
--- a/src/views/basic/product/productUdiType.vue
+++ b/src/views/basic/product/productUdiType.vue
@@ -32,7 +32,7 @@
         <el-table-column label="操作" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button type="text"  @click="handleSubForm( scope.row, 'add')">新增</el-button>
-            <el-button type="text" v-if="scope.row.code!=10000" @click.native.stop="handleSubForm( scope.row, 'edit')">编辑</el-button>
+            <el-button type="text"  @click.native.stop="handleSubForm( scope.row, 'edit')">编辑</el-button>
             <el-button type="text" v-if="scope.row.code!=10000" @click.native.stop="handleDelInv(scope.row)">删除</el-button>
             <el-button type="text" v-if="scope.row.code!=10000"  @click.native.stop="addHospProduct( scope.row)">绑定</el-button>
             <el-button type="text" v-if="scope.row.code!=10000"   @click.native.stop="removeHospProduct(scope.row)">解绑</el-button>
@@ -54,10 +54,11 @@
             <el-col :span="12" class="el-col">
               <el-form-item label="上级菜单" prop="parentCode">
                 <treeselect
-                  :disabled="formName=='add'"
+                  :disabled="formName=='add' || subData.code==10000"
                   v-model="subData.parentCode"
                   :options="fromDeptOptions"
                   :normalizer="normalizer"
+                  :clearable = "false"
                   :show-count="true"
                   placeholder="选择上级菜单"
                 />
@@ -133,7 +134,7 @@
 <script>
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Treeselect from "@riophae/vue-treeselect";
-import {getBasicHospType, getListMenu, saveBasicHospType,uodateBasicHospType,deleteBasicHospType} from "@/api/basic/basicHospType";
+import {getBasicHospType, getListMenu, saveBasicHospType,uodateBasicHospType,deleteBasicHospType,getOneName} from "@/api/basic/basicHospType";
 
 import selectHospProduct from "@/views/basic/product/bindHospProduct";
 import selectUnBindHospProduct from "@/views/basic/product/unbindHospProduct";
@@ -226,7 +227,7 @@ export default {
           parentCode:JSON.parse(JSON.stringify(data)).code
         };
       }
-      this.getTreeselect();
+      this.getTreeselect(data);
       this.subFormVisible = true;
     },
 
@@ -248,7 +249,7 @@ export default {
     },
     forInvSubmit() {    // 新增，编辑---提交
 
-      if(this.subData.parentCode==null){
+      if(this.subData.code!=10000 && this.subData.parentCode==null){
         this.$message.error("上级菜单不能为空");
         return
       }
@@ -282,13 +283,23 @@ export default {
     },
 
     /** 查询菜单下拉树结构 */
-    getTreeselect() {
-      getListMenu().then(response => {
-        this.fromDeptOptions = [];
-        const menu = {id: 0, name: '主类目', children: []};
-        menu.children = this.handleTree(response.data,"code", "parentCode");
-        this.fromDeptOptions.push(menu);
-      });
+    getTreeselect(row) {
+      debugger
+      if(row!=null){
+        var data={
+          code:row.code,
+          type:1
+        }
+      }
+      getOneName().then(res =>{
+        const menu = {id: res.data.id,code:res.data.code, name: res.data.name, children: []};
+        getListMenu(data).then(response => {
+          this.fromDeptOptions = [];
+          menu.children = this.handleTree(response.data,"code", "parentCode");
+          console.log(menu)
+          this.fromDeptOptions.push(menu);
+        });
+      })
     },
     /** 转换菜单数据结构 */
     normalizer(node) {
diff --git a/src/views/thirdSys/product/thrProductsExport.vue b/src/views/thirdSys/product/thrProductsExport.vue
index cc9d415..bcf1ca7 100644
--- a/src/views/thirdSys/product/thrProductsExport.vue
+++ b/src/views/thirdSys/product/thrProductsExport.vue
@@ -78,6 +78,7 @@ import {formatDate} from "../../../utils/date";
 export default {
   data() {
     return {
+      BASE_URL: process.env.VUE_APP_BASE_API,
       showSearch: true,
       filterQuery: {
         genKey: null,
@@ -158,8 +159,8 @@ export default {
       this.thrProductsSelectVisible = true;
     },
     downloadExcel(row) {
-      axios.get("./config.json").then(res => {
-        let baseUrl = res.data.BASE_URL;
+      debugger
+        let baseUrl = this.BASE_URL;
         let href = baseUrl + "/udiwms/thrProducts/exportLog/download" + "?genKey=" + row.genKey;
         let a = document.createElement("a");
         var timestamp = formatDate(new Date(), "yyyyMMddhhmmss")
@@ -173,8 +174,6 @@ export default {
             a.click();
             this.getList();
           });
-      });
-
     },
 
     cancelDialog(val) {

From eb111d4a86e77aa8d61998d5bc5bea48435c6306 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 20 Apr 2023 15:06:32 +0800
Subject: [PATCH 09/20] =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=20=E5=86=85?=
 =?UTF-8?q?=E9=83=A8=E7=A0=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue
index 2f8f704..7fc3c66 100644
--- a/src/views/basic/business/stockOrder.vue
+++ b/src/views/basic/business/stockOrder.vue
@@ -152,7 +152,7 @@
         </el-table-column>
         <el-table-column label="价格" prop="price"></el-table-column>
         <el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
-        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
+        <el-table-column label="注册/备案号" prop="certCode"></el-table-column>
       </el-table>
 
       <pagination

From 29321708a60c6609e3c7089a97a991c07b010d7e Mon Sep 17 00:00:00 2001
From: wj <1285151836@qq.com>
Date: Thu, 20 Apr 2023 15:18:19 +0800
Subject: [PATCH 10/20] =?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

---
 .env.development                |   2 +-
 package.json                    |   4 +-
 src/api/sync/spsSyncStatus.js   |   9 +
 src/utils/request.js            |   2 +-
 src/views/sync/SysUdimsData.vue | 751 +++++++++++++++-----------------
 vue.config.js                   |   2 +-
 6 files changed, 371 insertions(+), 399 deletions(-)

diff --git a/.env.development b/.env.development
index 3d5a50f..a8d313a 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VUE_APP_TITLE = 供应商自助管理系统
 ENV = 'development'
 
 # 若依管理系统/开发环境
-VUE_APP_BASE_API = '/dev-api'
+VUE_APP_BASE_API = 'http://localhost:9993/dev-api/'
 
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/'
diff --git a/package.json b/package.json
index 57441c3..c77df60 100644
--- a/package.json
+++ b/package.json
@@ -5,8 +5,8 @@
   "author": "LionLi",
   "license": "MIT",
   "scripts": {
-    "dev": "vue-cli-service serve",
-    "build:prod": "vue-cli-service build",
+    "dev": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --mode development",
+    "build:prod": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build  --mode production",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src"
   },
diff --git a/src/api/sync/spsSyncStatus.js b/src/api/sync/spsSyncStatus.js
index d3425b4..091be2f 100644
--- a/src/api/sync/spsSyncStatus.js
+++ b/src/api/sync/spsSyncStatus.js
@@ -43,3 +43,12 @@ export function updateConfig(query) {
   });
 }
 
+export function infoByStatus(query) {
+  return axios({
+    url: "/spssync/basic/udiinfo/infoByStatus",
+    method: "post",
+    data: query,
+    responseType: 'blob'
+  });
+}
+
diff --git a/src/utils/request.js b/src/utils/request.js
index b02dfd7..86a9ce2 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -86,7 +86,7 @@ service.interceptors.response.use(res => {
     if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
       return res.data
     }
-    if (code === 401) {
+    if (code === 2) {
       if (!isRelogin.show) {
         isRelogin.show = true;
         MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
diff --git a/src/views/sync/SysUdimsData.vue b/src/views/sync/SysUdimsData.vue
index b12356e..b457e49 100644
--- a/src/views/sync/SysUdimsData.vue
+++ b/src/views/sync/SysUdimsData.vue
@@ -12,19 +12,16 @@
           <el-form-item class="query-form-item">
             <el-select v-model="filterQuery.status" 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="2"></el-option>
+              <el-option label="任务待触发" value="1"></el-option>
+              <el-option label="文件待生成" value="2"></el-option>
+              <el-option label="文件待同步" value="3"></el-option>
+              <el-option label="任务完成" value="4"></el-option>
             </el-select>
           </el-form-item>
 
           <el-form-item class="query-form-item">
-            <el-date-picker
-              v-model="syncTime"
-              type="datetime"
-              format="yyyy-MM-dd HH:mm:ss"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              placeholder="请选择同步时间">
+            <el-date-picker v-model="syncTime" type="datetime" format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择同步时间">
             </el-date-picker>
           </el-form-item>
 
@@ -32,135 +29,74 @@
             <el-button-group style="display:flex;">
               <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
               <el-button type="primary" icon="search" @click="getList">查询</el-button>
-              <el-button type="primary" icon="search" @click="createScheduleDialog(1)"
-
-              >同步单据
+              <el-button type="primary" icon="search" @click="createScheduleDialog(1)">同步单据
               </el-button>
-<!--               :disabled="!configParms.orderScanFinish&& !configParms.orderUnReceive&& !configParms.orderUnCheck"-->
+              <!--               :disabled="!configParms.orderScanFinish&& !configParms.orderUnReceive&& !configParms.orderUnCheck"-->
               <el-button type="primary" icon="search" @click="createScheduleDialog(2)"
-                         :disabled="!configParms.typeBus&& !configParms.typeScan&& !configParms.typeThird">
+                v-if="!configParms.typeBus&& !configParms.typeScan&& !configParms.typeThird">
                 同步单据类型
               </el-button>
-              <el-button type="primary" icon="search" @click="createScheduleDialog(3)"
-
-                         :disabled="!configParms.basicProducts&& !configParms.basicCorp&&
+              <el-button type="primary" icon="search" @click="createScheduleDialog(3)" v-if="!configParms.basicProducts&& !configParms.basicCorp&&
                                         !configParms.basicInv&&!configParms.basicThirdProducts&& !configParms.basicThirdCorp&& !configParms.basicThirdInv
-                                && !configParms.basicThirdBusOrder&& !configParms.sysUser"
-              >同步基础信息
+                                && !configParms.basicThirdBusOrder&& !configParms.sysUser">同步基础信息
               </el-button>
               <el-button type="primary" icon="search" @click="createScheduleDialog(4)"
-                         :disabled="!configParms.dbDiProducts">同步国家库DI数据
+                v-if="configParms.dbDiProducts==2">同步国家库DI数据
               </el-button>
             </el-button-group>
           </el-form-item>
         </el-row>
       </el-form>
 
-      <el-table
-        v-loading="loading"
-        :data="list"
-        style="width: 100%"
-      >
+      <el-table v-loading="loading" :data="list" style="width: 100%">
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column
-          label="任务ID"
-          prop="id"
-          width="140"
-          show-overflow-tooltip
-        ></el-table-column>
-
-        <el-table-column
-          label="任务类型"
-          prop="type"
-          width="140"
-          show-overflow-tooltip
-        >
+        <el-table-column label="任务ID" prop="id" width="140" show-overflow-tooltip></el-table-column>
+
+        <el-table-column label="任务类型" prop="type" width="140" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column
-          label="中继服务状态"
-          prop="status"
-          width="140"
-          show-overflow-tooltip
-        >
+        <el-table-column label="中继服务状态" prop="status" width="140" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-tag
-              :type="statusFilterType(scope.row.status)"
-            >{{ status[scope.row.status] }}
-            </el-tag
-            >
+            <el-tag :type="statusFilterType(scope.row.status)">{{ status[scope.row.status] }}
+            </el-tag>
           </template>
         </el-table-column>
-        <el-table-column
-          label="管理系统状态"
-          prop="receiveStatus"
-          width="140"
-          show-overflow-tooltip
-        >
+        <el-table-column label="管理系统状态" prop="receiveStatus" width="140" show-overflow-tooltip>
 
           <template slot-scope="scope">
-            <el-tag
-              :type="wmsFilterType(scope.row.receiveStatus)"
-            >{{ wmsstatus[scope.row.receiveStatus] }}
-            </el-tag
-            >
+            <el-tag :type="wmsFilterType(scope.row.receiveStatus)">{{ wmsstatus[scope.row.receiveStatus] }}
+            </el-tag>
           </template>
 
 
         </el-table-column>
-        <el-table-column
-          label="开始时间"
-          width="180"
-          prop="startTime"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          label="结束时间"
-          width="180"
-          prop="endTime"
-          show-overflow-tooltip
-        ></el-table-column>
-
-        <el-table-column
-          label="同步信息"
-          prop="cacheFilePath"
-          show-overflow-tooltip
-        ></el-table-column>
+        <el-table-column label="开始时间" width="180" prop="startTime" show-overflow-tooltip></el-table-column>
+        <el-table-column label="结束时间" width="180" prop="endTime" show-overflow-tooltip></el-table-column>
+
+        <el-table-column label="备注" prop="remark" show-overflow-tooltip></el-table-column>
+
+        <el-table-column label="同步信息" prop="cacheFilePath" show-overflow-tooltip></el-table-column>
 
         <el-table-column label="操作" fixed="right" width="160">
           <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              @click.native.stop="detailDialog(scope.row.id)"
-            >详情
-            </el-button
-            >
-            <el-button
-              type="text"
-              size="small"
-              @click.native.stop="deleteDialog(scope.row.id)"
-            >删除
-            </el-button
-            >
+            <el-popconfirm @confirm="downFile(scope.row)" confirm-button-text='下载' cancel-button-text='不用了' class="mr10"
+              icon="el-icon-info" icon-color="blck" title="是否确认要下载文件？" v-if="scope.row.cacheFilePath">
+              <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='不用了'
+              icon="el-icon-info" icon-color="red" title="是否确认要删除这条数据？">
+              <el-button type="text" size="small" slot="reference">删除
+              </el-button>
+            </el-popconfirm>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        :page-size="filterQuery.limit"
-        @current-change="handleCurrentChange"
-        layout="prev, pager, next"
-        :total="total"
-        :current-page="filterQuery.page"
-      ></el-pagination>
+      <el-pagination :page-size="filterQuery.limit" @current-change="handleCurrentChange" layout="prev, pager, next"
+        :total="total" :current-page="filterQuery.page"></el-pagination>
     </el-card>
 
-    <el-dialog
-      title="同步信息"
-      width="25%"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :visible.sync="syncVisible"
-    >
+    <el-dialog title="同步信息" width="25%" :close-on-click-modal="false" :close-on-press-escape="false"
+      :visible.sync="syncVisible">
       <span v-text="syncInfo" style="white-space:pre-line;" class="syncInfo"></span>
     </el-dialog>
 
@@ -168,319 +104,346 @@
 </template>
 
 <script>
-import {filterLog, deleteLog, createSchedule, findConfig, updateConfig} from "../../api/sync/spsSyncStatus";
-import store from "@/store";
-
-export default {
-  data() {
-    return {
-      filterQuery: {
-        id: null,
-        status: "0",
-        page: 1,
-        limit: 10,
+  import {
+    filterLog,
+    deleteLog,
+    createSchedule,
+    findConfig,
+    updateConfig,
+    infoByStatus
+  } from "../../api/sync/spsSyncStatus";
+  import store from "@/store";
+
+  export default {
+    data() {
+      return {
+        filterQuery: {
+          id: null,
+          status: "1",
+          page: 1,
+          limit: 10,
+          syncTime: null,
+        },
+        list: [],
+        headers: {},
+        detailList: [],
+        thirdSys: [],
+        thirdSysDetail: null,
+        total: 0,
+        currentRow: null,
+        editQuery: null,
+        type: {
+          "AutoDownloadOrder": "扫码单据",
+          "AutoDownloadBusType": "单据类型",
+          "AutoDownloadAllData": "基础信息",
+          "AutoDownloadDiProducts": "国家库DI数据"
+        },
+        status: {
+          1: "任务待触发",
+          2: "文件待生成",
+          3: "文件待同步",
+          4: "任务完成",
+        },
+
+        wmsstatus: {
+          "1": "处理成功",
+          "": "未处理",
+          null: "未处理",
+        },
+
+
+        configQuery: {
+          id: null,
+          typeBus: null,
+          typeScan: null,
+          typeThird: null,
+          basicProducts: null,
+          basicCorp: null,
+          basicInv: null,
+          basicThirdProducts: null,
+          basicThirdCorp: null,
+          basicThirdInv: null,
+          basicThirdBusOrder: null,
+          orderScanFinish: null,
+          dbDiProducts: null,
+          downstreamEnable: null,
+
+        },
+        uploadFileUrl: null,
+        uploadData: {
+          thirdSys: "thirdId",
+        },
+        templateDlUrl: null,
+        checked: false,
         syncTime: null,
+        configParms: {},
+        syncInfo: null,
+        syncVisible: false
+      };
+    },
+
+    methods: {
+      onReset() {
+        this.$router.push({
+          path: "",
+        });
+        this.filterQuery = {
+          id: null,
+          status: null,
+          page: 1,
+          limit: 20,
+
+        };
+        this.syncTime = null;
+        this.getList();
       },
-      list: [],
-      headers: {},
-      detailList: [],
-      thirdSys: [],
-      thirdSysDetail: null,
-      total: 0,
-      currentRow: null,
-      editQuery: null,
-      type: {
-        "AutoDownloadOrder": "扫码单据",
-        "AutoDownloadBusType": "单据类型",
-        "AutoDownloadAllData": "基础信息",
-        "AutoDownloadDiProducts": "国家库DI数据"
-      },
-      status: {
-        0: "等待处理",
-        1: "处理完成",
-        2: "处理异常",
+      getList() {
+        this.loading = true;
+        this.filterQuery.syncTime = this.syncTime;
+        filterLog(this.filterQuery)
+          .then((response) => {
+            this.loading = false;
+            if (response.code == 20000) {
+              this.list = response.data.list || [];
+              this.total = response.data.total || 0;
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
       },
 
-      wmsstatus: {
-        "处理成功": "处理成功",
-        "": "未处理",
-        null: "未处理",
+      getConfig() {
+        findConfig()
+          .then((response) => {
+            if (response.code == 20000) {
+              this.configQuery = response.data;
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
+      },
+      saveConfig() {
+
+        updateConfig(this.configQuery)
+          .then((response) => {
+            this.loading = false;
+            if (response.code == 20000) {
+              this.$message.success("更新成功！");
+              this.getConfig();
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          });
       },
 
 
-      configQuery: {
-        id: null,
-        typeBus: null,
-        typeScan: null,
-        typeThird: null,
-        basicProducts: null,
-        basicCorp: null,
-        basicInv: null,
-        basicThirdProducts: null,
-        basicThirdCorp: null,
-        basicThirdInv: null,
-        basicThirdBusOrder: null,
-        orderScanFinish: null,
-        dbDiProducts: null,
-        downstreamEnable: null,
-
+      cancelDialog(val) {
+        this.udiImportDetailVisible = false;
+        this.thrCorpSelectVisible = false;
+        if (val) {
+          this.getList();
+        }
       },
-      uploadFileUrl: null,
-      uploadData: {
-        thirdSys: "thirdId",
+      handleCurrentChange(val) {
+        this.filterQuery.page = val;
+        this.getList();
       },
-      templateDlUrl: null,
-      checked: false,
-      syncTime: null,
-      configParms: {},
-      syncInfo: null,
-      syncVisible: false
-    };
-  },
-
-  methods: {
-    onReset() {
-      this.$router.push({
-        path: "",
-      });
-      this.filterQuery = {
-        id: null,
-        status: null,
-        page: 1,
-        limit: 20,
 
-      };
-      this.syncTime = null;
-      this.getList();
-    },
-    getList() {
-      this.loading = true;
-      this.filterQuery.syncTime = this.syncTime;
-      filterLog(this.filterQuery)
-        .then((response) => {
-          this.loading = false;
-          if (response.code == 20000) {
-            this.list = response.data.list || [];
-            this.total = response.data.total || 0;
-          } else {
-            this.$message.error(response.message);
-          }
-        })
-        .catch(() => {
-          this.loading = false;
-          this.list = [];
-          this.total = 0;
-        });
-    },
+      createScheduleDialog(type) {
+        if (this.$isNotBlank(this.syncTime)) {
+          this.$confirm("此操作将从" + this.syncTime + "开始同步最新数据，是否继续", "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning",
+            })
+            .then(() => {
+              this.createSchedule(type);
+            })
+            .catch(() => {});
+        } else {
+          this.createSchedule(type);
+        }
 
-    getConfig() {
-      findConfig()
-        .then((response) => {
-          if (response.code == 20000) {
-            this.configQuery = response.data;
-          } else {
-            this.$message.error(response.message);
-          }
-        })
-        .catch(() => {
-          this.loading = false;
-          this.list = [];
-          this.total = 0;
-        });
-    },
-    saveConfig() {
-
-      updateConfig(this.configQuery)
-        .then((response) => {
-          this.loading = false;
-          if (response.code == 20000) {
-            this.$message.success("更新成功！");
-            this.getConfig();
-          }
-        })
-        .catch(() => {
-          this.loading = false;
-        });
-    },
+      },
 
+      createSchedule(type) {
+        let query = {
+          createType: type,
+          syncTime: this.syncTime,
+        }
 
-    cancelDialog(val) {
-      this.udiImportDetailVisible = false;
-      this.thrCorpSelectVisible = false;
-      if (val) {
-        this.getList();
-      }
-    }
-    ,
-    handleCurrentChange(val) {
-      this.filterQuery.page = val;
-      this.getList();
-    }
-    ,
-
-    createScheduleDialog(type) {
-      if (this.$isNotBlank(this.syncTime)) {
-        this.$confirm("此操作将从" + this.syncTime + "开始同步最新数据，是否继续", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.createSchedule(type);
+        createSchedule(query)
+          .then((response) => {
+            this.loading = false;
+            if (response.code == 20000) {
+              this.$message.success("创建成功！");
+            } else if (response.code == 501) {
+
+              this.$alert(response.message, '提示', {
+                confirmButtonText: '确定',
+                type: "warning",
+                callback: action => {}
+              });
+
+            } else {
+              this.$message.error(response.message);
+            }
+            this.getList();
           })
           .catch(() => {
+            this.loading = false;
           });
-      } else {
-        this.createSchedule(type);
-      }
-
-    },
-
-    createSchedule(type) {
-      let query = {
-        createType: type,
-        syncTime: this.syncTime,
-      }
-
-      createSchedule(query)
-        .then((response) => {
-          this.loading = false;
-          if (response.code == 20000) {
-            this.$message.success("创建成功！");
-          } else if (response.code == 501) {
+      },
+      deleteDialog(rowId) {
+        this.$confirm("此操作将删除该任务信息, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+          .then(() => {
+            let dQuery = {
+              id: rowId,
+            };
+            deleteLog(dQuery)
+              .then((response) => {
+                this.loading = false;
+                if (response.code == 20000) {
+                  this.$message.success("删除成功");
+                } else {
+                  this.$message.error(response.message);
+                }
+                this.getList();
+              })
+              .catch(() => {
+                this.loading = false;
+              });
+          })
+          .catch(() => {});
+      },
+      handleChange(response, files, fileList) {
+        if (response.code != 20000) {
+          this.$message.error(response.message);
+          this.getList();
+        } else {
+          this.$message.success(response.data);
+          this.getList();
+        }
+      },
+      statusFilterType(status) {
+        const statusMap = {
+          0: "warning",
+          1: "success",
+          2: "danger",
+        };
+        return statusMap[status];
+      },
+      wmsFilterType(status) {
+        const statusMap = {
+          "未处理": "warning",
+          "处理成功": "success",
+        };
+        return statusMap[status];
+      },
 
-            this.$alert(response.message, '提示', {
-              confirmButtonText: '确定',
-              type: "warning",
-              callback: action => {
-              }
-            });
 
-          } else {
-            this.$message.error(response.message);
+      getSyncConfig() {
+        findConfig()
+          .then((response) => {
+            if (response.code == 20000) {
+              this.configParms = response.data;
+            }
+          })
+          .catch(() => {});
+      },
+      detailDialog(id) {
+        this.syncVisible = true;
+        this.list.forEach(item => {
+          if (id === item.id) {
+            this.syncInfo = item.remark;
           }
-          this.getList();
         })
-        .catch(() => {
-          this.loading = false;
-        });
-    },
-    deleteDialog(rowId) {
-      this.$confirm("此操作将删除该任务信息, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          let dQuery = {
-            id: rowId,
-          };
-          deleteLog(dQuery)
-            .then((response) => {
-              this.loading = false;
-              if (response.code == 20000) {
-                this.$message.success("删除成功");
-              } else {
-                this.$message.error(response.message);
-              }
-              this.getList();
-            })
-            .catch(() => {
-              this.loading = false;
-            });
+      },
+      downFile(rows) {
+        infoByStatus({
+          'id': rows.id
+        }).then(res => {
+          let blob = new Blob([res])
+          let fileName = rows.cacheFilePath.substring(rows.cacheFilePath.lastIndexOf('/'))
+          let link = document.createElement("a")
+          link.href = window.URL.createObjectURL(blob)
+          link.download = fileName
+          link.style.display = 'none'
+          document.body.appendChild(link)
+          link.click()
+          window.URL.revokeObjectURL(link.href)
+          document.body.removeChild(link)
         })
-        .catch(() => {
-        });
-    }
-    ,
-    handleChange(response, files, fileList) {
-      if (response.code != 20000) {
-        this.$message.error(response.message);
-        this.getList();
-      } else {
-        this.$message.success(response.data);
-        this.getList();
+      },
+      deleteData(id) {
+        deleteLog({id}).then((response) => {
+            if (response.code == 20000) {
+              this.filterQuery.page = 1
+              this.$message.success("删除成功");
+            } else {
+              this.$message.error(response.message);
+            }
+            this.getList();
+          })
+          .catch(() => {});
       }
-    }
-    ,
-    statusFilterType(status) {
-      const statusMap = {
-        0: "warning",
-        1: "success",
-        2: "danger",
-      };
-      return statusMap[status];
-    },
-    wmsFilterType(status) {
-      const statusMap = {
-        "未处理": "warning",
-        "处理成功": "success",
-      };
-      return statusMap[status];
     },
 
-
-    getSyncConfig() {
-      findConfig()
-        .then((response) => {
-          if (response.code == 20000) {
-            this.configParms = response.data;
-          }
-        })
-        .catch(() => {
-        });
+    mounted() {},
+    components: {},
+    created() {
+      this.headers = {
+        ADMIN_ID: store.getters.adminId,
+        ADMIN_TOKEN: store.getters.token,
+      };
+      this.getSyncConfig();
+      this.getList();
+      this.getConfig();
     },
-    detailDialog(id) {
-      this.syncVisible = true;
-      this.list.forEach(item => {
-        if (id === item.id) {
-          this.syncInfo = item.remark;
-        }
-      })
-    }
-  },
-
-  mounted() {
-  },
-  components: {},
-  created() {
-    this.headers = {
-      ADMIN_ID: store.getters.adminId,
-      ADMIN_TOKEN: store.getters.token,
-    };
-    this.getSyncConfig();
-    this.getList();
-    this.getConfig();
-  },
-};
+  };
 </script>
 <style>
-.itemTag {
-  float: left;
-  text-align: left;
-  margin-top: 10px;
-  width: 100px;
-}
-
-.text {
-  font-size: 13px;
-  font-family: "Microsoft YaHei";
-}
-
-.el-row {
-  display: flex;
-  flex-wrap: wrap;
-
-}
-
-.el-col {
-  border-radius: 4px;
-  flex-wrap: wrap;
-}
-
-.syncInfo {
-  font-size: medium;
-  font-family: "Microsoft YaHei";
-  line-height: 25px;
-}
+  .itemTag {
+    float: left;
+    text-align: left;
+    margin-top: 10px;
+    width: 100px;
+  }
+
+  .text {
+    font-size: 13px;
+    font-family: "Microsoft YaHei";
+  }
+
+  .el-row {
+    display: flex;
+    flex-wrap: wrap;
+
+  }
+
+  .el-col {
+    border-radius: 4px;
+    flex-wrap: wrap;
+  }
+
+  .syncInfo {
+    font-size: medium;
+    font-family: "Microsoft YaHei";
+    line-height: 25px;
+  }
 </style>
diff --git a/vue.config.js b/vue.config.js
index d246608..2eee3de 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.0.43:9993/`,
+        target: process.env.VUE_APP_BASE_API,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''

From f6f1d3c0c5738bd823e02272629711d0ee2eb32d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Thu, 20 Apr 2023 15:20:22 +0800
Subject: [PATCH 11/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dept/authDept.vue                      | 1 -
 src/views/thirdSys/corps/thrCorpsExport.vue             | 5 ++---
 src/views/thirdSys/corps/thrCorpsExportSmp.vue          | 5 ++---
 src/views/thirdSys/invProducts/thrInvProductsExport.vue | 9 +++------
 src/views/thirdSys/order/thrOrderExport.vue             | 5 ++---
 src/views/thirdSys/product/thrProductsExport.vue        | 1 -
 6 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/views/system/dept/authDept.vue b/src/views/system/dept/authDept.vue
index 46f51c6..2eab3b8 100644
--- a/src/views/system/dept/authDept.vue
+++ b/src/views/system/dept/authDept.vue
@@ -601,7 +601,6 @@ export default {
         });
     },
     cancelDialog() {
-      tQuer;
       this.formVisible = false;
       // 刷新表单
       this.$refs["dataForm"].resetFields();
diff --git a/src/views/thirdSys/corps/thrCorpsExport.vue b/src/views/thirdSys/corps/thrCorpsExport.vue
index 421f914..e5c3e24 100644
--- a/src/views/thirdSys/corps/thrCorpsExport.vue
+++ b/src/views/thirdSys/corps/thrCorpsExport.vue
@@ -71,6 +71,7 @@ import {formatDate} from "@/utils/date";
 export default {
   data() {
     return {
+      BASE_URL: process.env.VUE_APP_BASE_API,
       showSearch: true,
       filterQuery: {
         genKey: null,
@@ -154,8 +155,7 @@ export default {
       this.thrCorpSelectVisible = true;
     },
     downloadExcel(row) {
-      axios.get("./config.json").then(res => {
-        let baseUrl = res.data.BASE_URL;
+        let baseUrl = this.BASE_URL
         let href = baseUrl + "/udiwms/thrCorp/exportLog/download" +
           "?genKey=" + row.genKey;
         let a = document.createElement("a");
@@ -170,7 +170,6 @@ export default {
             a.click();
             this.getList();
           });
-      });
     },
 
     cancelDialog(val) {
diff --git a/src/views/thirdSys/corps/thrCorpsExportSmp.vue b/src/views/thirdSys/corps/thrCorpsExportSmp.vue
index 02398d7..69950a0 100644
--- a/src/views/thirdSys/corps/thrCorpsExportSmp.vue
+++ b/src/views/thirdSys/corps/thrCorpsExportSmp.vue
@@ -68,6 +68,7 @@ import axios from "axios";
 export default {
   data() {
     return {
+      BASE_URL: process.env.VUE_APP_BASE_API,
       showSearch: true,
       filterQuery: {
         genKey: null,
@@ -153,8 +154,7 @@ export default {
       this.thrCorpSelectVisible = true;
     },
     downloadExcel(row) {
-      axios.get("./config.json").then(res => {
-        let baseUrl = res.data.BASE_URL;
+        let baseUrl = this.BASE_URL;
         let href = baseUrl + "/udiwms/thrCorp/exportLog/download" +
           "?genKey=" + row.genKey;
         let a = document.createElement("a");
@@ -171,7 +171,6 @@ export default {
             a.click();
             this.getList();
           });
-      });
     },
 
     cancelDialog(val) {
diff --git a/src/views/thirdSys/invProducts/thrInvProductsExport.vue b/src/views/thirdSys/invProducts/thrInvProductsExport.vue
index 8958620..4d5d91f 100644
--- a/src/views/thirdSys/invProducts/thrInvProductsExport.vue
+++ b/src/views/thirdSys/invProducts/thrInvProductsExport.vue
@@ -108,6 +108,7 @@ import axios from "axios";
 export default {
   data() {
     return {
+      BASE_URL: process.env.VUE_APP_BASE_API,
       showSearch: true,
       filterQuery: {
         genKey: null,
@@ -191,8 +192,8 @@ export default {
       this.thrInvProductsSelectVisible = true;
     },
     downloadExcel(row) {
-      axios.get("./config.json").then(res => {
-        let baseUrl = res.data.BASE_URL;
+
+        let baseUrl = this.BASE_URL;
         let href = baseUrl + "/udiwms/invProducts/exportLog/download" + "?genKey=" + row.genKey;
         let a = document.createElement("a");
         fetch(href)
@@ -208,10 +209,6 @@ export default {
             a.click();
             this.getList();
           });
-
-      });
-
-
     },
 
     cancelDialog(val) {
diff --git a/src/views/thirdSys/order/thrOrderExport.vue b/src/views/thirdSys/order/thrOrderExport.vue
index 24b01ed..68f266c 100644
--- a/src/views/thirdSys/order/thrOrderExport.vue
+++ b/src/views/thirdSys/order/thrOrderExport.vue
@@ -75,6 +75,7 @@ import {formatDate} from "@/utils/date";
 export default {
   data() {
     return {
+      BASE_URL: process.env.VUE_APP_BASE_API,
       showSearch: true,
       filterQuery: {
         type: 1,
@@ -158,8 +159,7 @@ export default {
       this.thrOrderSelectVisible = true;
     },
     downloadExcel(row) {
-      axios.get("./config.json").then(res => {
-        let baseUrl = res.data.BASE_URL;
+        let baseUrl = this.BASE_URL
         let href = baseUrl + "/udiwms/thrOrder/exportLog/download" + "?genKey=" + row.genKey;
         let a = document.createElement("a");
         var timestamp = formatDate(new Date(), "yyyyMMddhhmmss")
@@ -173,7 +173,6 @@ export default {
             a.click();
             this.getList();
           });
-      });
     },
 
     cancelDialog(val) {
diff --git a/src/views/thirdSys/product/thrProductsExport.vue b/src/views/thirdSys/product/thrProductsExport.vue
index bcf1ca7..5d0be0c 100644
--- a/src/views/thirdSys/product/thrProductsExport.vue
+++ b/src/views/thirdSys/product/thrProductsExport.vue
@@ -159,7 +159,6 @@ export default {
       this.thrProductsSelectVisible = true;
     },
     downloadExcel(row) {
-      debugger
         let baseUrl = this.BASE_URL;
         let href = baseUrl + "/udiwms/thrProducts/exportLog/download" + "?genKey=" + row.genKey;
         let a = document.createElement("a");

From ec7ea1c4520dc4e234784797d01e05db0d2ab102 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Thu, 20 Apr 2023 17:16:23 +0800
Subject: [PATCH 12/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E8=B5=84?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index bf9ceed..7e6892d 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -140,7 +140,7 @@
             <el-table-column label="物资名称" prop="cpmctymc" width="160" show-overflow-tooltip></el-table-column>
             <el-table-column label="规格型号" prop="ggxh" width="160" show-overflow-tooltip></el-table-column>
             <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column label="生产企业" prop="ylqxzcrbarmc" width="180" show-overflow-tooltip></el-table-column>
+            <el-table-column label="注册/备案人" prop="ylqxzcrbarmc" width="180" show-overflow-tooltip></el-table-column>
             <el-table-column label="集采状态" prop="groupBuy" width="120" show-overflow-tooltip>
               <template slot-scope="scope">
               <el-tag :type="(scope.row.groupBuy) | statusFilterType">

From 116f50f812c6fba2b12bf79daf5761a172df3551 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E6=99=A8=E6=99=A8?= <ccc2020712@163.com>
Date: Thu, 20 Apr 2023 17:24:57 +0800
Subject: [PATCH 13/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=90=E8=A1=8C?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=AE=BE=E7=BD=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/param/systemParamConfig.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/system/param/systemParamConfig.vue b/src/views/system/param/systemParamConfig.vue
index 4dd7462..73d05ee 100644
--- a/src/views/system/param/systemParamConfig.vue
+++ b/src/views/system/param/systemParamConfig.vue
@@ -186,6 +186,8 @@ export default {
         } else {
           callback();
         }
+      }else{
+        callback();
       }
     };
     return {

From f25276f6393e2957a7a2763881fae013d1187fec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E6=99=A8=E6=99=A8?= <ccc2020712@163.com>
Date: Thu, 20 Apr 2023 17:43:18 +0800
Subject: [PATCH 14/20] =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=88=9D=E7=89=88=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dept/authDept.vue | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/views/system/dept/authDept.vue b/src/views/system/dept/authDept.vue
index cf735d9..56b7155 100644
--- a/src/views/system/dept/authDept.vue
+++ b/src/views/system/dept/authDept.vue
@@ -57,6 +57,7 @@
         style="width: 100%"
         highlight-current-row
         border
+        ref="deptTableRef"
         v-if="refreshTable"
         row-key="id"
         @current-change="handleDeptChange"
@@ -358,6 +359,7 @@ import { filterSubAll } from "@/api/system/invSubWarehouse";
 export default {
   data() {
     return {
+      checkdefault: null,
       filterQuery: {
         status: 1,
         companyName: "",
@@ -577,15 +579,27 @@ export default {
         let depList = response.data.list || [];
         this.deptOptions = this.handleTree(depList, "code", "pcode");
       });
+      console.log(JSON.parse(JSON.stringify(row)));
+      this.checkdefault = JSON.parse(JSON.stringify(row));
     },
     /* 获取列表 */
     getList() {
+      let qwe = this.checkdefault;
       this.loading = true;
       filterList(this.filterQuery)
         .then((response) => {
           this.loading = false;
           let depList = response.data.list || [];
           this.list = this.handleTree(depList, "code", "pcode");
+          console.log(qwe);
+          this.$nextTick(() => {
+            console.log(qwe);
+            if (qwe === null) {
+              this.$refs.deptTableRef.setCurrentRow(depList[0]);
+            } else {
+              this.$refs.deptTableRef.setCurrentRow(qwe);
+            }
+          });
         })
         .catch(() => {
           this.loading = false;

From de52881cca5c83f42f938bd21f247bb8e54d3ae5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E6=99=A8=E6=99=A8?= <ccc2020712@163.com>
Date: Thu, 20 Apr 2023 17:46:33 +0800
Subject: [PATCH 15/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/system/dept/authDept.vue b/src/views/system/dept/authDept.vue
index 56b7155..2f10e04 100644
--- a/src/views/system/dept/authDept.vue
+++ b/src/views/system/dept/authDept.vue
@@ -52,7 +52,6 @@
       </el-form>
       <el-table
         v-loading="loading"
-        ref="list"
         :data="list"
         style="width: 100%"
         highlight-current-row
@@ -591,7 +590,6 @@ export default {
           this.loading = false;
           let depList = response.data.list || [];
           this.list = this.handleTree(depList, "code", "pcode");
-          console.log(qwe);
           this.$nextTick(() => {
             console.log(qwe);
             if (qwe === null) {

From 520cd925eb46b4be8cd26b5bdb746162d171a8d5 Mon Sep 17 00:00:00 2001
From: CTP <630182278@qq.com>
Date: Thu, 20 Apr 2023 17:47:39 +0800
Subject: [PATCH 16/20] =?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=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 9d4b221b76de64c1513ed4853adb873a98e6d1fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E6=99=A8=E6=99=A8?= <ccc2020712@163.com>
Date: Thu, 20 Apr 2023 18:05:57 +0800
Subject: [PATCH 17/20] ce

---
 .env.development | 2 +-
 package.json     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.development b/.env.development
index a8d313a..d3b24f6 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VUE_APP_TITLE = 供应商自助管理系统
 ENV = 'development'
 
 # 若依管理系统/开发环境
-VUE_APP_BASE_API = 'http://localhost:9993/dev-api/'
+VUE_APP_BASE_API = 'http://localhost:9993/'
 
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/'
diff --git a/package.json b/package.json
index c77df60..b20deae 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "author": "LionLi",
   "license": "MIT",
   "scripts": {
-    "dev": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --mode development",
+    "dev": "vue-cli-service serve --mode development",
     "build:prod": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build  --mode production",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src"

From de8454949063d5e6bf4424470214e476869f0e0e Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 20 Apr 2023 18:59:14 +0800
Subject: [PATCH 18/20] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                               |   7 +-
 src/views/inout/IoSupSearchOrder.vue          |   4 +-
 .../inventory/InvPreInProductsDetail.vue      |   2 +-
 src/views/inventory/InvPreProductsDetail.vue  |   2 +-
 src/views/inventory/InvSupPreInProducts.vue   |  34 +-
 src/views/inventory/InvSupPreProducts.vue     |  31 +-
 src/views/inventory/InvSupProuducts.vue       |   2 +-
 src/views/sync/SysUdimsData.vue               | 644 +++++++++---------
 src/views/system/dept/authDept.vue            |  58 +-
 src/views/system/dept/invWarehouse.vue        |   4 +-
 10 files changed, 425 insertions(+), 363 deletions(-)

diff --git a/.env.production b/.env.production
index 0fe478f..6350e01 100644
--- a/.env.production
+++ b/.env.production
@@ -7,9 +7,9 @@ ENV = 'production'
 
 #林纪裕
 # VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_SPMS_SERVER/'
-VUE_APP_BASE_API =  'http://r.jiyuudims.cloud:5004/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API =  'http://r.jiyuudims.cloud:5004/UDI_SPMS_SERVER/'
 # 吴总测试服务器
-# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/'
+VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/'
 
 # 平潭
 # VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
@@ -23,6 +23,9 @@ VUE_APP_BASE_API =  'http://r.jiyuudims.cloud:5004/UDI_SPMS_SERVER/'
 # 实施测试服务器 wqq
 # VUE_APP_BASE_API = 'http://192.168.0.66:9160/UDI_SPMS_SERVER/'
 
+# 平潭内网
+# VUE_APP_BASE_API = 'http://10.200.200.253:9160/UDI_SPMS_SERVER/'
+
 
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'
diff --git a/src/views/inout/IoSupSearchOrder.vue b/src/views/inout/IoSupSearchOrder.vue
index 6cb3c76..268436e 100644
--- a/src/views/inout/IoSupSearchOrder.vue
+++ b/src/views/inout/IoSupSearchOrder.vue
@@ -3,7 +3,7 @@
     <el-card class="el-card">
       <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
         <el-row>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="单号:">
               <el-input v-model="filterQuery.billNo" placeholder="单号"
                         style="width: 90%"
@@ -25,7 +25,7 @@
           <!--              </el-select>-->
           <!--            </el-form-item>-->
           <!--          </el-col>-->
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="收货仓库:">
               <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"
                          style="width: 90%"
diff --git a/src/views/inventory/InvPreInProductsDetail.vue b/src/views/inventory/InvPreInProductsDetail.vue
index 708b6a3..07e9e83 100644
--- a/src/views/inventory/InvPreInProductsDetail.vue
+++ b/src/views/inventory/InvPreInProductsDetail.vue
@@ -58,7 +58,7 @@
         </el-button-group>
       </el-form-item>
     </el-form>
-    <el-table v-loading="loading" :data="list" style="width: 100%">
+    <el-table v-loading="loading" :data="list" style="width: 100%" border>
       <el-table-column label="序号" type="index"></el-table-column>
       <el-table-column
         label="UDI码"
diff --git a/src/views/inventory/InvPreProductsDetail.vue b/src/views/inventory/InvPreProductsDetail.vue
index 6de2539..63e4b4b 100644
--- a/src/views/inventory/InvPreProductsDetail.vue
+++ b/src/views/inventory/InvPreProductsDetail.vue
@@ -40,7 +40,7 @@
       </el-descriptions-item>
     </el-descriptions>
 
-    <el-form :inline="true" :model="invPreProductDetailQuery" style="margin-top: 10px;" size="mini">
+    <el-form :inline="true" :model="invPreProductDetailQuery" style="margin-top: 10px;" size="mini" border>
       <el-form-item class="query-form-item" label="UDI码:">
         <el-input v-model="invPreProductDetailQuery.code"
                   placeholder="请输入UDI码查询"
diff --git a/src/views/inventory/InvSupPreInProducts.vue b/src/views/inventory/InvSupPreInProducts.vue
index d4907e6..1c33e53 100644
--- a/src/views/inventory/InvSupPreInProducts.vue
+++ b/src/views/inventory/InvSupPreInProducts.vue
@@ -73,6 +73,34 @@
               </el-select>
             </el-form-item>
           </el-col>
+
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="供应商名称:" v-if="showSup">
+              <el-select
+                v-model="filterQuery.supId"
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="请选择供应商名称"
+                :remote-method="findMethod"
+                size="mini"
+                :loading="corpLoading"
+                @change="corpChange"
+                style="width: 90%"
+              >
+                <el-option
+                  v-for="item in fromOptions"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.erpId"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
         </el-row>
       </el-form>
       <div class="top-right-btn">
@@ -158,7 +186,7 @@ import {getInvListByUser} from "@/api/system/invWarehouse";
 import {getInvPreInProduct, deleteInvPreInProduct} from "@/api/inventory/invPreInSearch";
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 import {isBlank} from "@/utils/strUtil";
-import invPreProductsDetail from "@/views/inventory/InvPreProductsDetail.vue";
+import invPreProductsDetail from "@/views/inventory/InvPreInProductsDetail.vue";
 
 export default {
   name: "InvPreProducts",
@@ -173,7 +201,7 @@ export default {
         supId: null,
         zczbhhzbapzbh: null,
         ylqxzcrbarmc: null,
-        invCode: this.$store.getters.locInvCode,
+        invCode: null,
         page: 1,
         limit: 10,
       },
@@ -217,9 +245,9 @@ export default {
         supId: null,
         zczbhhzbapzbh: null,
         ylqxzcrbarmc: null,
-        invCode: this.$store.getters.locInvCode,
         page: 1,
         limit: 10,
+        invCode: null,
       };
       this.getList();
     },
diff --git a/src/views/inventory/InvSupPreProducts.vue b/src/views/inventory/InvSupPreProducts.vue
index 65984a3..9d25ca0 100644
--- a/src/views/inventory/InvSupPreProducts.vue
+++ b/src/views/inventory/InvSupPreProducts.vue
@@ -73,6 +73,33 @@
               </el-select>
             </el-form-item>
           </el-col>
+
+          <el-col :span="6" >
+            <el-form-item class="query-form-item" label="供应商名称:" v-if="showSup">
+              <el-select
+                v-model="filterQuery.supId"
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="请选择供应商名称"
+                :remote-method="findMethod"
+                size="mini"
+                :loading="corpLoading"
+                @change="corpChange"
+                style="width: 90%"
+              >
+                <el-option
+                  v-for="item in fromOptions"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.erpId"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div class="top-right-btn">
@@ -217,7 +244,7 @@ export default {
         supId: null,
         zczbhhzbapzbh: null,
         ylqxzcrbarmc: null,
-        invCode: this.$store.getters.locInvCode,
+        invCode: null,
         page: 1,
         limit: 10,
       };
@@ -246,7 +273,7 @@ export default {
 
     getList() {
       this.loading = true;
-      this.filterQuery.supId = this.$store.getters.customerId;
+      // this.filterQuery.supId = this.$store.getters.customerId;
       getInvPreProduct(this.filterQuery).then((res) => {
         this.loading = false;
         if (res.code === 20000) {
diff --git a/src/views/inventory/InvSupProuducts.vue b/src/views/inventory/InvSupProuducts.vue
index 9dd109a..70b6026 100644
--- a/src/views/inventory/InvSupProuducts.vue
+++ b/src/views/inventory/InvSupProuducts.vue
@@ -74,7 +74,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="供应商名称:">
+            <el-form-item class="query-form-item" label="供应商名称:" v-if="showSup">
               <el-select
                 v-model="filterQuery.supId"
                 filterable
diff --git a/src/views/sync/SysUdimsData.vue b/src/views/sync/SysUdimsData.vue
index b457e49..fb6773f 100644
--- a/src/views/sync/SysUdimsData.vue
+++ b/src/views/sync/SysUdimsData.vue
@@ -21,7 +21,7 @@
 
           <el-form-item class="query-form-item">
             <el-date-picker v-model="syncTime" type="datetime" format="yyyy-MM-dd HH:mm:ss"
-              value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择同步时间">
+                            value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择同步时间">
             </el-date-picker>
           </el-form-item>
 
@@ -33,7 +33,7 @@
               </el-button>
               <!--               :disabled="!configParms.orderScanFinish&& !configParms.orderUnReceive&& !configParms.orderUnCheck"-->
               <el-button type="primary" icon="search" @click="createScheduleDialog(2)"
-                v-if="!configParms.typeBus&& !configParms.typeScan&& !configParms.typeThird">
+                         v-if="!configParms.typeBus&& !configParms.typeScan&& !configParms.typeThird">
                 同步单据类型
               </el-button>
               <el-button type="primary" icon="search" @click="createScheduleDialog(3)" v-if="!configParms.basicProducts&& !configParms.basicCorp&&
@@ -41,7 +41,7 @@
                                 && !configParms.basicThirdBusOrder&& !configParms.sysUser">同步基础信息
               </el-button>
               <el-button type="primary" icon="search" @click="createScheduleDialog(4)"
-                v-if="configParms.dbDiProducts==2">同步国家库DI数据
+                         v-if="configParms.dbDiProducts==2">同步国家库DI数据
               </el-button>
             </el-button-group>
           </el-form-item>
@@ -79,12 +79,12 @@
         <el-table-column label="操作" fixed="right" width="160">
           <template slot-scope="scope">
             <el-popconfirm @confirm="downFile(scope.row)" confirm-button-text='下载' cancel-button-text='不用了' class="mr10"
-              icon="el-icon-info" icon-color="blck" title="是否确认要下载文件？" v-if="scope.row.cacheFilePath">
+                           icon="el-icon-info" icon-color="blck" title="是否确认要下载文件？" v-if="scope.row.cacheFilePath">
               <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='不用了'
-              icon="el-icon-info" icon-color="red" title="是否确认要删除这条数据？">
+                           icon="el-icon-info" icon-color="red" title="是否确认要删除这条数据？">
               <el-button type="text" size="small" slot="reference">删除
               </el-button>
             </el-popconfirm>
@@ -92,11 +92,11 @@
         </el-table-column>
       </el-table>
       <el-pagination :page-size="filterQuery.limit" @current-change="handleCurrentChange" layout="prev, pager, next"
-        :total="total" :current-page="filterQuery.page"></el-pagination>
+                     :total="total" :current-page="filterQuery.page"></el-pagination>
     </el-card>
 
     <el-dialog title="同步信息" width="25%" :close-on-click-modal="false" :close-on-press-escape="false"
-      :visible.sync="syncVisible">
+               :visible.sync="syncVisible">
       <span v-text="syncInfo" style="white-space:pre-line;" class="syncInfo"></span>
     </el-dialog>
 
@@ -104,346 +104,346 @@
 </template>
 
 <script>
-  import {
-    filterLog,
-    deleteLog,
-    createSchedule,
-    findConfig,
-    updateConfig,
-    infoByStatus
-  } from "../../api/sync/spsSyncStatus";
-  import store from "@/store";
-
-  export default {
-    data() {
-      return {
-        filterQuery: {
-          id: null,
-          status: "1",
-          page: 1,
-          limit: 10,
-          syncTime: null,
-        },
-        list: [],
-        headers: {},
-        detailList: [],
-        thirdSys: [],
-        thirdSysDetail: null,
-        total: 0,
-        currentRow: null,
-        editQuery: null,
-        type: {
-          "AutoDownloadOrder": "扫码单据",
-          "AutoDownloadBusType": "单据类型",
-          "AutoDownloadAllData": "基础信息",
-          "AutoDownloadDiProducts": "国家库DI数据"
-        },
-        status: {
-          1: "任务待触发",
-          2: "文件待生成",
-          3: "文件待同步",
-          4: "任务完成",
-        },
-
-        wmsstatus: {
-          "1": "处理成功",
-          "": "未处理",
-          null: "未处理",
-        },
-
-
-        configQuery: {
-          id: null,
-          typeBus: null,
-          typeScan: null,
-          typeThird: null,
-          basicProducts: null,
-          basicCorp: null,
-          basicInv: null,
-          basicThirdProducts: null,
-          basicThirdCorp: null,
-          basicThirdInv: null,
-          basicThirdBusOrder: null,
-          orderScanFinish: null,
-          dbDiProducts: null,
-          downstreamEnable: null,
-
-        },
-        uploadFileUrl: null,
-        uploadData: {
-          thirdSys: "thirdId",
-        },
-        templateDlUrl: null,
-        checked: false,
+import {
+  filterLog,
+  deleteLog,
+  createSchedule,
+  findConfig,
+  updateConfig,
+  infoByStatus
+} from "../../api/sync/spsSyncStatus";
+import store from "@/store";
+
+export default {
+  data() {
+    return {
+      filterQuery: {
+        id: null,
+        status: "1",
+        page: 1,
+        limit: 10,
         syncTime: null,
-        configParms: {},
-        syncInfo: null,
-        syncVisible: false
-      };
-    },
-
-    methods: {
-      onReset() {
-        this.$router.push({
-          path: "",
-        });
-        this.filterQuery = {
-          id: null,
-          status: null,
-          page: 1,
-          limit: 20,
-
-        };
-        this.syncTime = null;
-        this.getList();
       },
-      getList() {
-        this.loading = true;
-        this.filterQuery.syncTime = this.syncTime;
-        filterLog(this.filterQuery)
-          .then((response) => {
-            this.loading = false;
-            if (response.code == 20000) {
-              this.list = response.data.list || [];
-              this.total = response.data.total || 0;
-            } else {
-              this.$message.error(response.message);
-            }
-          })
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-            this.total = 0;
-          });
+      list: [],
+      headers: {},
+      detailList: [],
+      thirdSys: [],
+      thirdSysDetail: null,
+      total: 0,
+      currentRow: null,
+      editQuery: null,
+      type: {
+        "AutoDownloadOrder": "扫码单据",
+        "AutoDownloadBusType": "单据类型",
+        "AutoDownloadAllData": "基础信息",
+        "AutoDownloadDiProducts": "国家库DI数据"
       },
-
-      getConfig() {
-        findConfig()
-          .then((response) => {
-            if (response.code == 20000) {
-              this.configQuery = response.data;
-            } else {
-              this.$message.error(response.message);
-            }
-          })
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-            this.total = 0;
-          });
+      status: {
+        1: "任务待触发",
+        2: "文件待生成",
+        3: "文件待同步",
+        4: "任务完成",
       },
-      saveConfig() {
-
-        updateConfig(this.configQuery)
-          .then((response) => {
-            this.loading = false;
-            if (response.code == 20000) {
-              this.$message.success("更新成功！");
-              this.getConfig();
-            }
-          })
-          .catch(() => {
-            this.loading = false;
-          });
+
+      wmsstatus: {
+        "1": "处理成功",
+        "": "未处理",
+        null: "未处理",
       },
 
 
-      cancelDialog(val) {
-        this.udiImportDetailVisible = false;
-        this.thrCorpSelectVisible = false;
-        if (val) {
-          this.getList();
-        }
+      configQuery: {
+        id: null,
+        typeBus: null,
+        typeScan: null,
+        typeThird: null,
+        basicProducts: null,
+        basicCorp: null,
+        basicInv: null,
+        basicThirdProducts: null,
+        basicThirdCorp: null,
+        basicThirdInv: null,
+        basicThirdBusOrder: null,
+        orderScanFinish: null,
+        dbDiProducts: null,
+        downstreamEnable: null,
+
       },
-      handleCurrentChange(val) {
-        this.filterQuery.page = val;
-        this.getList();
+      uploadFileUrl: null,
+      uploadData: {
+        thirdSys: "thirdId",
       },
+      templateDlUrl: null,
+      checked: false,
+      syncTime: null,
+      configParms: {},
+      syncInfo: null,
+      syncVisible: false
+    };
+  },
+
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        id: null,
+        status: null,
+        page: 1,
+        limit: 20,
 
-      createScheduleDialog(type) {
-        if (this.$isNotBlank(this.syncTime)) {
-          this.$confirm("此操作将从" + this.syncTime + "开始同步最新数据，是否继续", "提示", {
-              confirmButtonText: "确定",
-              cancelButtonText: "取消",
-              type: "warning",
-            })
-            .then(() => {
-              this.createSchedule(type);
-            })
-            .catch(() => {});
-        } else {
-          this.createSchedule(type);
-        }
+      };
+      this.syncTime = null;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      this.filterQuery.syncTime = this.syncTime;
+      filterLog(this.filterQuery)
+        .then((response) => {
+          this.loading = false;
+          if (response.code == 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
 
-      },
+    getConfig() {
+      findConfig()
+        .then((response) => {
+          if (response.code == 20000) {
+            this.configQuery = response.data;
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    saveConfig() {
+
+      updateConfig(this.configQuery)
+        .then((response) => {
+          this.loading = false;
+          if (response.code == 20000) {
+            this.$message.success("更新成功！");
+            this.getConfig();
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
 
-      createSchedule(type) {
-        let query = {
-          createType: type,
-          syncTime: this.syncTime,
-        }
 
-        createSchedule(query)
-          .then((response) => {
-            this.loading = false;
-            if (response.code == 20000) {
-              this.$message.success("创建成功！");
-            } else if (response.code == 501) {
-
-              this.$alert(response.message, '提示', {
-                confirmButtonText: '确定',
-                type: "warning",
-                callback: action => {}
-              });
-
-            } else {
-              this.$message.error(response.message);
-            }
-            this.getList();
-          })
-          .catch(() => {
-            this.loading = false;
-          });
-      },
-      deleteDialog(rowId) {
-        this.$confirm("此操作将删除该任务信息, 是否继续?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          })
+    cancelDialog(val) {
+      this.udiImportDetailVisible = false;
+      this.thrCorpSelectVisible = false;
+      if (val) {
+        this.getList();
+      }
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val;
+      this.getList();
+    },
+
+    createScheduleDialog(type) {
+      if (this.$isNotBlank(this.syncTime)) {
+        this.$confirm("此操作将从" + this.syncTime + "开始同步最新数据，是否继续", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
           .then(() => {
-            let dQuery = {
-              id: rowId,
-            };
-            deleteLog(dQuery)
-              .then((response) => {
-                this.loading = false;
-                if (response.code == 20000) {
-                  this.$message.success("删除成功");
-                } else {
-                  this.$message.error(response.message);
-                }
-                this.getList();
-              })
-              .catch(() => {
-                this.loading = false;
-              });
+            this.createSchedule(type);
           })
           .catch(() => {});
-      },
-      handleChange(response, files, fileList) {
-        if (response.code != 20000) {
-          this.$message.error(response.message);
-          this.getList();
-        } else {
-          this.$message.success(response.data);
-          this.getList();
-        }
-      },
-      statusFilterType(status) {
-        const statusMap = {
-          0: "warning",
-          1: "success",
-          2: "danger",
-        };
-        return statusMap[status];
-      },
-      wmsFilterType(status) {
-        const statusMap = {
-          "未处理": "warning",
-          "处理成功": "success",
-        };
-        return statusMap[status];
-      },
+      } else {
+        this.createSchedule(type);
+      }
 
+    },
 
-      getSyncConfig() {
-        findConfig()
-          .then((response) => {
-            if (response.code == 20000) {
-              this.configParms = response.data;
-            }
-          })
-          .catch(() => {});
-      },
-      detailDialog(id) {
-        this.syncVisible = true;
-        this.list.forEach(item => {
-          if (id === item.id) {
-            this.syncInfo = item.remark;
+    createSchedule(type) {
+      let query = {
+        createType: type,
+        syncTime: this.syncTime,
+      }
+
+      createSchedule(query)
+        .then((response) => {
+          this.loading = false;
+          if (response.code == 20000) {
+            this.$message.success("创建成功！");
+          } else if (response.code == 501) {
+
+            this.$alert(response.message, '提示', {
+              confirmButtonText: '确定',
+              type: "warning",
+              callback: action => {}
+            });
+
+          } else {
+            this.$message.error(response.message);
           }
+          this.getList();
         })
-      },
-      downFile(rows) {
-        infoByStatus({
-          'id': rows.id
-        }).then(res => {
-          let blob = new Blob([res])
-          let fileName = rows.cacheFilePath.substring(rows.cacheFilePath.lastIndexOf('/'))
-          let link = document.createElement("a")
-          link.href = window.URL.createObjectURL(blob)
-          link.download = fileName
-          link.style.display = 'none'
-          document.body.appendChild(link)
-          link.click()
-          window.URL.revokeObjectURL(link.href)
-          document.body.removeChild(link)
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    deleteDialog(rowId) {
+      this.$confirm("此操作将删除该任务信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let dQuery = {
+            id: rowId,
+          };
+          deleteLog(dQuery)
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.$message.success("删除成功");
+              } else {
+                this.$message.error(response.message);
+              }
+              this.getList();
+            })
+            .catch(() => {
+              this.loading = false;
+            });
         })
-      },
-      deleteData(id) {
-        deleteLog({id}).then((response) => {
-            if (response.code == 20000) {
-              this.filterQuery.page = 1
-              this.$message.success("删除成功");
-            } else {
-              this.$message.error(response.message);
-            }
-            this.getList();
-          })
-          .catch(() => {});
+        .catch(() => {});
+    },
+    handleChange(response, files, fileList) {
+      if (response.code != 20000) {
+        this.$message.error(response.message);
+        this.getList();
+      } else {
+        this.$message.success(response.data);
+        this.getList();
       }
     },
-
-    mounted() {},
-    components: {},
-    created() {
-      this.headers = {
-        ADMIN_ID: store.getters.adminId,
-        ADMIN_TOKEN: store.getters.token,
+    statusFilterType(status) {
+      const statusMap = {
+        0: "warning",
+        1: "success",
+        2: "danger",
       };
-      this.getSyncConfig();
-      this.getList();
-      this.getConfig();
+      return statusMap[status];
     },
-  };
+    wmsFilterType(status) {
+      const statusMap = {
+        "未处理": "warning",
+        "处理成功": "success",
+      };
+      return statusMap[status];
+    },
+
+
+    getSyncConfig() {
+      findConfig()
+        .then((response) => {
+          if (response.code == 20000) {
+            this.configParms = response.data;
+          }
+        })
+        .catch(() => {});
+    },
+    detailDialog(id) {
+      this.syncVisible = true;
+      this.list.forEach(item => {
+        if (id === item.id) {
+          this.syncInfo = item.remark;
+        }
+      })
+    },
+    downFile(rows) {
+      infoByStatus({
+        'id': rows.id
+      }).then(res => {
+        let blob = new Blob([res])
+        let fileName = rows.cacheFilePath.substring(rows.cacheFilePath.lastIndexOf('/'))
+        let link = document.createElement("a")
+        link.href = window.URL.createObjectURL(blob)
+        link.download = fileName
+        link.style.display = 'none'
+        document.body.appendChild(link)
+        link.click()
+        window.URL.revokeObjectURL(link.href)
+        document.body.removeChild(link)
+      })
+    },
+    deleteData(id) {
+      deleteLog({id}).then((response) => {
+        if (response.code == 20000) {
+          this.filterQuery.page = 1
+          this.$message.success("删除成功");
+        } else {
+          this.$message.error(response.message);
+        }
+        this.getList();
+      })
+        .catch(() => {});
+    }
+  },
+
+  mounted() {},
+  components: {},
+  created() {
+    this.headers = {
+      ADMIN_ID: store.getters.adminId,
+      ADMIN_TOKEN: store.getters.token,
+    };
+    this.getSyncConfig();
+    this.getList();
+    this.getConfig();
+  },
+};
 </script>
 <style>
-  .itemTag {
-    float: left;
-    text-align: left;
-    margin-top: 10px;
-    width: 100px;
-  }
-
-  .text {
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
-  }
-
-  .el-row {
-    display: flex;
-    flex-wrap: wrap;
-
-  }
-
-  .el-col {
-    border-radius: 4px;
-    flex-wrap: wrap;
-  }
-
-  .syncInfo {
-    font-size: medium;
-    font-family: "Microsoft YaHei";
-    line-height: 25px;
-  }
+.itemTag {
+  float: left;
+  text-align: left;
+  margin-top: 10px;
+  width: 100px;
+}
+
+.text {
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
+}
+
+.el-row {
+  display: flex;
+  flex-wrap: wrap;
+
+}
+
+.el-col {
+  border-radius: 4px;
+  flex-wrap: wrap;
+}
+
+.syncInfo {
+  font-size: medium;
+  font-family: "Microsoft YaHei";
+  line-height: 25px;
+}
 </style>
diff --git a/src/views/system/dept/authDept.vue b/src/views/system/dept/authDept.vue
index a77ae0c..7cb543f 100644
--- a/src/views/system/dept/authDept.vue
+++ b/src/views/system/dept/authDept.vue
@@ -30,10 +30,11 @@
           <el-form-item>
             <el-button-group>
               <el-button type="primary" icon="el-icon-refresh" @click="onReset"
-                >重置</el-button
+              >重置
+              </el-button
               >
               <el-button type="primary" @click="onSubmit" icon="el-icon-search"
-                >查询
+              >查询
               </el-button>
               <!--              <el-button type="primary" @click="addDeptDialog"-->
               <!--                         icon="el-icon-plus"-->
@@ -44,7 +45,7 @@
                 type="primary"
                 icon="el-icon-sort"
                 @click="toggleExpandAll"
-                >展开/折叠
+              >展开/折叠
               </el-button>
             </el-button-group>
           </el-form-item>
@@ -71,29 +72,29 @@
         <el-table-column label="状态" prop="status">
           <template slot-scope="scope">
             <el-tag :type="scope.row.status | statusFilterType"
-              >{{ scope.row.status | statusFilterName }}
+            >{{ scope.row.status | statusFilterName }}
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="备注" prop="remark"> </el-table-column>
+        <el-table-column label="备注" prop="remark"></el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button
               type="text"
               :disabled="scope.row.status == 0"
               @click.native="subAddDeptDialog(scope.row)"
-              >新增
+            >新增
             </el-button>
 
             <el-button type="text" @click.native="updateDeptDialog(scope.row)"
-              >编辑
+            >编辑
             </el-button>
 
             <el-button
               type="text"
               :disabled="scope.row.id === 1"
               @click.native.stop="deleteDialog(scope.row)"
-              >删除
+            >删除
             </el-button>
           </template>
         </el-table-column>
@@ -124,7 +125,7 @@
             <el-form-item label="部门名称:" prop="name">
               <el-input
                 v-model="formData.name"
-                style="width: 90%"
+                style="width: 80%"
                 clearable
                 size="small"
               ></el-input>
@@ -183,7 +184,7 @@
 
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" size="small" @click.native="formSubmit()"
-            >提交
+          >提交
           </el-button>
           <el-button @click.native="cancelDialog" size="small">取消</el-button>
         </div>
@@ -213,13 +214,13 @@
                 type="primary"
                 icon="el-icon-refresh"
                 @click="onUserReset"
-                >重置
+              >重置
               </el-button>
               <el-button
                 type="primary"
                 @click="onUserSubmit"
                 icon="el-icon-search"
-                >查询
+              >查询
               </el-button>
               <el-tooltip
                 content="请移步至权限管理-用户管理-编辑界面选择所属部门信息"
@@ -244,13 +245,13 @@
             prop="employeeName"
           ></el-table-column>
           <el-table-column label="用户账号" prop="userName"></el-table-column>
-          <el-table-column label="备注" prop="comments"> </el-table-column>
+          <el-table-column label="备注" prop="comments"></el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
               <el-button
                 type="text"
                 @click.native.stop="removeUserDialog(scope.row)"
-                >移除
+              >移除
               </el-button>
             </template>
           </el-table-column>
@@ -287,13 +288,13 @@
                 type="primary"
                 icon="el-icon-refresh"
                 @click="onInvReset"
-                >重置
+              >重置
               </el-button>
               <el-button
                 type="primary"
                 @click="onInvSubmit"
                 icon="el-icon-search"
-                >查询
+              >查询
               </el-button>
               <el-tooltip
                 content="请移步至系统管理-组织管理-仓库信息管理界面绑定仓库信息"
@@ -315,7 +316,7 @@
           <el-table-column label="序号" type="index"></el-table-column>
           <el-table-column label="仓库名称" prop="name"></el-table-column>
           <el-table-column label="仓库编码" prop="code"></el-table-column>
-          <el-table-column label="备注" prop="remark"> </el-table-column>
+          <el-table-column label="备注" prop="remark"></el-table-column>
           <!--          <el-table-column label="操作">-->
           <!--            <template slot-scope="scope">-->
           <!--              <el-button-->
@@ -347,11 +348,11 @@ import {
   saveWarehouse,
 } from "@/api/system/invWarehouse";
 
-import { treeList, treeSelectedList } from "@/api/system/dataStatus";
+import {treeList, treeSelectedList} from "@/api/system/dataStatus";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import { listDeptUser, removeUser } from "@/api/system/deptUser";
-import { filterSubAll } from "@/api/system/invSubWarehouse";
+import {listDeptUser, removeUser} from "@/api/system/deptUser";
+import {filterSubAll} from "@/api/system/invSubWarehouse";
 
 export default {
   data() {
@@ -382,9 +383,9 @@ export default {
       deptOptions: [],
       rules: {
         name: [
-          { required: true, message: "部门名称不能为空", trigger: "blur" },
+          {required: true, message: "部门名称不能为空", trigger: "blur"},
         ],
-        status: [{ required: true, message: "状态不能为空", trigger: "blur" }],
+        status: [{required: true, message: "状态不能为空", trigger: "blur"}],
       },
       menuExpand: false,
       menuNodeAll: false,
@@ -628,7 +629,8 @@ export default {
             }
           });
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
     toggleExpandAll() {
       this.refreshTable = false;
@@ -666,7 +668,7 @@ export default {
       });
     },
     getDeptStatusMenuTreeselect(deptId) {
-      let query = { deptId: deptId };
+      let query = {deptId: deptId};
       return treeSelectedList(query).then((response) => {
         this.menuOptions = response.data.menus;
         return response;
@@ -749,7 +751,8 @@ export default {
             }
           });
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
 
     //仓库相关
@@ -770,8 +773,9 @@ export default {
       this.getInvList();
     },
   },
-  components: { Treeselect },
-  mounted() {},
+  components: {Treeselect},
+  mounted() {
+  },
   created() {
     this.getList();
   },
diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue
index 6ad7fd8..186799f 100644
--- a/src/views/system/dept/invWarehouse.vue
+++ b/src/views/system/dept/invWarehouse.vue
@@ -432,8 +432,8 @@ export default {
       total: 0,
       advanceTypeTypeMap: {
         1: "入账库",
-        2: "寄售库",
-        3: "预验收库",
+        3: "寄售库",
+        2: "预验收库",
       },
       formMap: {
         add: "仓库信息-新增",

From cd73415433af8760ff64d8791e67615504fb533d Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 20 Apr 2023 18:59:43 +0800
Subject: [PATCH 19/20] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/InvSupPreProducts.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/inventory/InvSupPreProducts.vue b/src/views/inventory/InvSupPreProducts.vue
index 9d25ca0..82c7856 100644
--- a/src/views/inventory/InvSupPreProducts.vue
+++ b/src/views/inventory/InvSupPreProducts.vue
@@ -74,7 +74,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="6" >
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="供应商名称:" v-if="showSup">
               <el-select
                 v-model="filterQuery.supId"

From a0767fda379ceb762b00b1ea97724f4a191b7d65 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 20 Apr 2023 21:39:52 +0800
Subject: [PATCH 20/20] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sync/SysUdimsConfig.vue | 70 +++++++++++++++++--------------
 1 file changed, 39 insertions(+), 31 deletions(-)

diff --git a/src/views/sync/SysUdimsConfig.vue b/src/views/sync/SysUdimsConfig.vue
index 28d7d8a..c1714bb 100644
--- a/src/views/sync/SysUdimsConfig.vue
+++ b/src/views/sync/SysUdimsConfig.vue
@@ -6,11 +6,12 @@
         <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>
+            <template slot="label"> 同步服务</template>
             <el-row :gutter="20" class="el-row" type="flex">
               <el-col :span="6" class="el-col">
                 <el-switch
@@ -22,7 +23,7 @@
               <el-col :span="14" class="el-col">
                 <div>
                   <span style="color: red"
-                    >说明:&nbsp;修改同步参数时,请关闭数据同步服务
+                  >说明:&nbsp;修改同步参数时,请关闭数据同步服务
                   </span>
                 </div>
               </el-col>
@@ -30,7 +31,7 @@
           </el-descriptions-item>
 
           <el-descriptions-item>
-            <template slot="label"> 地址设置 </template>
+            <template slot="label"> 地址设置</template>
 
             <el-row :gutter="20" class="el-row" type="flex">
               <el-col :span="20" class="el-col">
@@ -50,7 +51,7 @@
                     style="margin-left: 20px"
                     :disabled="configQuery.downstreamEnable"
                     :loading="testLoading"
-                    >测试连通
+                  >测试连通
                   </el-button>
                 </div>
               </el-col>
@@ -63,7 +64,7 @@
         <el-descriptions class="margin-top" :column="1" :size="100" border>
           <!-- 参数设置 -->
           <el-descriptions-item>
-            <template slot="label"> 参数设置 </template>
+            <template slot="label"> 参数设置</template>
             <el-row :gutter="20" class="el-row" type="flex">
               <el-col :span="20" class="el-col">
                 <div>
@@ -77,7 +78,7 @@
                     splaceholder="请输入内容"
                   ></el-input>
                   <span style="margin-left: 30px"
-                    >延时上传(单位:分钟):&nbsp;</span
+                  >延时上传(单位:分钟):&nbsp;</span
                   >
                   <el-input
                     style="width: 100px"
@@ -89,7 +90,7 @@
                   ></el-input>
 
                   <span style="margin-left: 30px"
-                    >数据下载时间间隔(单位:分钟):&nbsp;</span
+                  >数据下载时间间隔(单位:分钟):&nbsp;</span
                   >
                   <el-input
                     style="width: 100px"
@@ -105,7 +106,7 @@
           </el-descriptions-item>
           <!-- 系统设置信息 -->
           <el-descriptions-item>
-            <template slot="label"> 系统设置信息 </template>
+            <template slot="label"> 系统设置信息</template>
             <el-form label-positiom="right" label-width="200px" :inline="true">
               <el-form-item label="系统运行参数">
                 <el-select v-model="configQuery.systemConfig">
@@ -151,7 +152,7 @@
           </el-descriptions-item>
           <!-- 单据类型 -->
           <el-descriptions-item>
-            <template slot="label"> 单据类型 </template>
+            <template slot="label"> 单据类型</template>
             <el-form label-positiom="right" label-width="200px" :inline="true">
               <el-form-item label="业务单据类型">
                 <el-select v-model="configQuery.typeBus">
@@ -178,7 +179,7 @@
           </el-descriptions-item>
           <!-- 用户信息 -->
           <el-descriptions-item>
-            <template slot="label"> 用户信息 </template>
+            <template slot="label"> 用户信息</template>
             <el-form label-positiom="right" label-width="200px" :inline="true">
               <el-form-item label="部门信息">
                 <el-select v-model="configQuery.basicDept">
@@ -205,7 +206,7 @@
           </el-descriptions-item>
           <!-- 基础数据 -->
           <el-descriptions-item>
-            <template slot="label"> 基础数据 </template>
+            <template slot="label"> 基础数据</template>
             <el-form label-positiom="right" label-width="200px" :inline="true">
               <el-form-item label="耗材字典">
                 <el-select v-model="configQuery.basicProducts">
@@ -232,7 +233,7 @@
           </el-descriptions-item>
           <!-- 第三方基础信息 -->
           <el-descriptions-item>
-            <template slot="label"> 第三方基础信息 </template>
+            <template slot="label"> 第三方基础信息</template>
             <el-form label-positiom="right" label-width="200px" :inline="true">
               <el-form-item label="第三方产品信息">
                 <el-select v-model="configQuery.basicThirdProducts">
@@ -268,7 +269,7 @@
           </el-descriptions-item>
           <!-- 国家库DI数据 -->
           <el-descriptions-item>
-            <template slot="label"> 国家库DI数据 </template>
+            <template slot="label"> 国家库DI数据</template>
             <el-form label-positiom="right" label-width="200px" :inline="true">
               <el-form-item label="DI产品信息">
                 <el-select v-model="configQuery.dbDiProducts">
@@ -278,7 +279,7 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="医疗器械注册人">
-                <el-select v-model="configQuery.dbDiProducts">
+                <el-select v-model="configQuery.dbDiCompany">
                   <el-option :value="0" label="不同步"></el-option>
                   <el-option :value="1" label="由内向外"></el-option>
                   <el-option :value="2" label="由外向内"></el-option>
@@ -303,7 +304,7 @@
           border
         >
           <el-descriptions-item>
-            <template slot="label"> 参数设置 </template>
+            <template slot="label"> 参数设置</template>
 
             <el-row :gutter="20" class="el-row" type="flex">
               <el-col :span="20" class="el-col">
@@ -332,7 +333,7 @@
                 size="small"
                 :disabled="configQuery.downstreamEnable"
                 @click="addToInBusTypeDialog()"
-                >添加扫码单据类型
+              >添加扫码单据类型
               </el-button>
             </div>
             <el-table :data="checkedToInBusTypes" border style="width: 100%">
@@ -367,7 +368,7 @@
                     size="small"
                     :disabled="configQuery.downstreamEnable"
                     @click.native="removeToInBus(scope.$index, scope.row)"
-                    >移除
+                  >移除
                   </el-button>
                 </template>
               </el-table-column>
@@ -385,7 +386,7 @@
           border
         >
           <el-descriptions-item>
-            <template slot="label"> 参数设置 </template>
+            <template slot="label"> 参数设置</template>
 
             <el-row :gutter="20" class="el-row" type="flex">
               <el-col :span="20" class="el-col">
@@ -401,7 +402,7 @@
                   ></el-input>
 
                   <span style="margin-left: 30px"
-                    >单据下载时间间隔(单位:分钟):&nbsp;</span
+                  >单据下载时间间隔(单位:分钟):&nbsp;</span
                   >
                   <el-input
                     style="width: 100px"
@@ -426,7 +427,7 @@
                 size="small"
                 :disabled="configQuery.downstreamEnable"
                 @click="addBusTypeDialog()"
-                >添加扫码单据类型
+              >添加扫码单据类型
               </el-button>
             </div>
             <el-table :data="checkedBusTypes" border style="width: 100%">
@@ -461,7 +462,7 @@
                     size="small"
                     :disabled="configQuery.downstreamEnable"
                     @click.native="remveBus(scope.$index, scope.row)"
-                    >移除
+                  >移除
                   </el-button>
                 </template>
               </el-table-column>
@@ -488,7 +489,7 @@
                 size="small"
                 :disabled="configQuery.downstreamEnable"
                 @click="addChangeBusTypeDialog()"
-                >添加业务单据类型
+              >添加业务单据类型
               </el-button>
             </div>
             <el-table :data="checkedChangeBusTypes" border style="width: 100%">
@@ -522,7 +523,7 @@
                     size="small"
                     :disabled="configQuery.downstreamEnable"
                     @click.native="removeChangeBus(scope.$index, scope.row)"
-                    >移除
+                  >移除
                   </el-button>
                 </template>
               </el-table-column>
@@ -540,7 +541,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
@@ -585,7 +587,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
@@ -631,7 +634,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
@@ -677,8 +681,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",
@@ -723,6 +727,7 @@ export default {
         printConfig: null,
         scanChangeConfig: null,
         busChangeConfig: null,
+        dbDiCompany: null,
       },
       checkedBusTypes: [],
       checkedToInBusTypes: [],
@@ -793,7 +798,8 @@ export default {
               this.loading = false;
             });
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
 
     testConnect() {
@@ -826,7 +832,8 @@ export default {
           this.busTypes = response.data.list || [];
           this.total = response.data.total || 0;
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
 
     addBusTypeDialog() {
@@ -952,6 +959,7 @@ export default {
 /deep/ .el-select {
   width: 100px;
 }
+
 /deep/ .el-collapse-item__header {
   font-size: 18px;
   font-weight: bold;