From 77ab482a996c346dbb2fe6d2f52e678148db107a Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 8 Dec 2021 14:52:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=EF=BC=8C?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/config.json                         |   6 +-
 src/views/basic/BussinessType.vue          | 295 ++++++++--------
 src/views/basic/CorpImportDetail.vue       |   4 +
 src/views/basic/UdiInfoImportDetail.vue    | 389 +++++++++++----------
 src/views/inventory/IncodeLogDetail.vue    |   4 +
 src/views/inventory/SelectInvProducts.vue  |   4 +
 src/views/inventory/selectBasicUdiInfo.vue |   4 +
 7 files changed, 368 insertions(+), 338 deletions(-)

diff --git a/public/config.json b/public/config.json
index f0af21c..fd8262c 100644
--- a/public/config.json
+++ b/public/config.json
@@ -1,7 +1,7 @@
 {
 
-    "BASE_URL":"http://139.159.187.130:8080/UDI_WMS_MC",
-    "SERVER_IP": "http://139.159.187.130:8080/",
-    "WEBSOCKET_URL": "ws://139.159.187.130:8080/UDI_WMS_MC/api/websocket/"
+    "BASE_URL":"http://127.0.0.1:9991",
+    "SERVER_IP": "http://127.0.0.1:9991/",
+    "BASE_URL2": "ws://127.0.0.1:9991/api/websocket/"
 
 }
diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue
index 783683e..20513c6 100644
--- a/src/views/basic/BussinessType.vue
+++ b/src/views/basic/BussinessType.vue
@@ -8,7 +8,13 @@
                     style="width: 400px"
                 ></el-input>
             </el-form-item>
-
+            <el-form-item class="query-form-item">
+                <el-select v-model="filterQuery.enable" placeholder="启用状态" clearable>
+                    <el-option label="全部" value=""></el-option>
+                    <el-option label="已启用" value="1"></el-option>
+                    <el-option label="未启用" value="0"></el-option>
+                </el-select>
+            </el-form-item>
             <el-form-item>
                 <el-button-group>
                     <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
@@ -97,159 +103,164 @@
     </div>
 </template>
 <script>
-    import {
-        getJoinBussinessType,
-        deleteBussinessType,
-        updateBussinessType,
-        insertBussinessType,
-    } from "../../api/basic/bussinessType";
-
-    import modifyDialog from "./BussinessTypeModify";
-
-    export default {
-        data() {
-            return {
-                filterQuery: {
-                    udiwmsType: "",
-                    thirdType: "",
-                    page: 1,
-                    limit: 20,
-                },
-                addDialogVisible: false,
-                modifyDialogVisible: false,
-                list: [],
-                inputQuery: {
-                    action: "",
-                    name: "",
-                    enable: "",
-                    remark: "",
-                    mainAction: "",
-                    thirdSysFk: "",
-                    id: "",
-                    localAction: null,
-                },
-                enableMap: {
-                    true: "是",
-                    false: "否",
-                },
-
-                total: 0,
-                multipleSelection: [],
-            };
-        },
+import {
+    getJoinBussinessType,
+    deleteBussinessType,
+    updateBussinessType,
+    insertBussinessType,
+} from "../../api/basic/bussinessType";
 
-        methods: {
-            onReset() {
-                this.$router.push({
-                    path: "",
-                });
-                this.filterQuery = {
-                    udiwmsType: "",
-                    thirdType: "",
-                    page: 1,
-                    limit: 20,
-                };
-                this.getList();
+import modifyDialog from "./BussinessTypeModify";
+
+export default {
+    data() {
+        return {
+            filterQuery: {
+                enable: "1",
+                udiwmsType: "",
+                thirdType: "",
+                page: 1,
+                limit: 20,
             },
-            cancelDialog() {
-                this.modifyDialogVisible = false;
-                this.addDialogVisible = false;
+            addDialogVisible: false,
+            modifyDialogVisible: false,
+            list: [],
+            inputQuery: {
+                action: "",
+                name: "",
+                enable: "",
+                remark: "",
+                mainAction: "",
+                thirdSysFk: "",
+                id: "",
+                localAction: null,
             },
-
-            getList() {
-                this.loading = true;
-                getJoinBussinessType(this.filterQuery)
-                    .then((response) => {
-                        this.loading = false;
-                        this.list = response.data.list || [];
-                        this.total = response.data.total || 0;
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                        this.total = 0;
-                    });
+            enableMap: {
+                true: "是",
+                false: "否",
             },
 
+            total: 0,
+            multipleSelection: [],
+        };
+    },
 
-            onAddSubmit() {
-                insertBussinessType(this.inputQuery)
-                    .then((response) => {
-                        this.loading = false;
-                        this.cancelDialog();
-                        this.getList();
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.cancelDialog();
-                    });
-            },
-
-            onModifySubmit() {
-                updateBussinessType(this.inputQuery)
-                    .then((response) => {
-                        this.loading = false;
-                        this.cancelDialog();
-                        this.getList();
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.cancelDialog();
-                    });
-            },
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                enable: null,
+                udiwmsType: "",
+                thirdType: "",
+                page: 1,
+                limit: 20,
+            };
+            this.getList();
+        },
+        cancelDialog() {
+            this.modifyDialogVisible = false;
+            this.addDialogVisible = false;
+        },
 
-            handleModifyClick(row) {
-                this.modifyDialogVisible = true;
-                this.inputQuery = {
-                    id: row.id,
-                    remark: row.remark,
-                    action: row.action,
-                    name: row.name,
-                    enable: row.enable,
-                    mainAction: row.mainAction,
-                    localAction:row.localAction,
-                    thirdSysFk: row.thirdSysFk,
-                };
-            },
+        getList() {
+            this.loading = true;
+            getJoinBussinessType(this.filterQuery)
+                .then((response) => {
+                    this.loading = false;
+                    this.list = response.data.list || [];
+                    this.total = response.data.total || 0;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        },
 
-            deleteDialog(rowId) {
-                this.$confirm("此操作将永久删除该业务类型信息, 是否继续?", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning",
+        onAddSubmit() {
+            insertBussinessType(this.inputQuery)
+                .then((response) => {
+                    this.loading = false;
+                    this.cancelDialog();
+                    this.getList();
                 })
-                    .then(() => {
-                        this.deleteOrders(rowId);
-                    })
-                    .catch(() => {
-                    });
-            },
+                .catch(() => {
+                    this.loading = false;
+                    this.cancelDialog();
+                });
+        },
 
-            deleteOrders(data) {
-                this.loading = true;
-                let tquery = {
-                    id: data.id + "",
-                };
-
-                deleteBussinessType(tquery)
-                    .then((response) => {
-                        this.getList();
-                        this.$message({
-                            type: "success",
-                            message: "删除成功！",
-                        });
-                    })
-                    .catch(() => {
-                    });
-            },
+        onModifySubmit() {
+            updateBussinessType(this.inputQuery)
+                .then((response) => {
+                    this.loading = false;
+                    this.cancelDialog();
+                    this.getList();
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.cancelDialog();
+                });
         },
-        components: {
-            modifyDialog,
+
+        handleModifyClick(row) {
+            this.modifyDialogVisible = true;
+            this.inputQuery = {
+                id: row.id,
+                remark: row.remark,
+                action: row.action,
+                name: row.name,
+                enable: row.enable,
+                mainAction: row.mainAction,
+                localAction: row.localAction,
+                thirdSysFk: row.thirdSysFk,
+            };
         },
-        mounted() {
+
+        deleteDialog(rowId) {
+            this.$confirm("此操作将永久删除该业务类型信息, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    this.deleteOrders(rowId);
+                })
+                .catch(() => {
+                });
         },
-        created() {
-            this.getList();
+
+        deleteOrders(data) {
+            this.loading = true;
+            let tquery = {
+                id: data.id + "",
+            };
+
+            deleteBussinessType(tquery)
+                .then((response) => {
+                    this.getList();
+                    this.$message({
+                        type: "success",
+                        message: "删除成功！",
+                    });
+                })
+                .catch(() => {
+                });
         },
-    };
+    },
+    components: {
+        modifyDialog,
+    },
+    mounted() {
+    },
+    created() {
+        this.getList();
+    },
+};
 </script>
diff --git a/src/views/basic/CorpImportDetail.vue b/src/views/basic/CorpImportDetail.vue
index 0be8f3c..56f9824 100644
--- a/src/views/basic/CorpImportDetail.vue
+++ b/src/views/basic/CorpImportDetail.vue
@@ -160,6 +160,10 @@
                 };
                 return statusMap[status];
             },
+            handleCurrentChange(val) {
+                this.filterQuery.page = val;
+                this.getList();
+            },
         },
         mounted() {
         },
diff --git a/src/views/basic/UdiInfoImportDetail.vue b/src/views/basic/UdiInfoImportDetail.vue
index 3fb7dad..6055e97 100644
--- a/src/views/basic/UdiInfoImportDetail.vue
+++ b/src/views/basic/UdiInfoImportDetail.vue
@@ -1,212 +1,215 @@
 <template>
-    <div>
-        <el-card>
-            <el-form :inline="true" :model="query"  size="mini">
-                <el-row>
-                    <el-form-item class="query-form-item">
-                        <el-input v-model="filterQuery.udiCode" placeholder="UDI编码"></el-input>
-                    </el-form-item>
-                    <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-select>
-                    </el-form-item>
-                    <el-form-item>
-                        <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-group>
-                    </el-form-item>
-                </el-row>
-            </el-form>
+  <div>
+    <el-card>
+      <el-form :inline="true" :model="query" size="mini">
+        <el-row>
+          <el-form-item class="query-form-item">
+            <el-input v-model="filterQuery.udiCode" placeholder="UDI编码"></el-input>
+          </el-form-item>
+          <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-select>
+          </el-form-item>
+          <el-form-item>
+            <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-group>
+          </el-form-item>
+        </el-row>
+      </el-form>
 
-            <el-table
-                v-loading="loading"
-                :data="list"
-                style="width: 100%"
-                @selection-change="handleSelectionChange"
-            >
-                <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column
-                    label="UDI编码"
-                    prop="udiCode"
-                    show-overflow-tooltip
-                ></el-table-column>
+      <el-table
+          v-loading="loading"
+          :data="list"
+          style="width: 100%"
+          @selection-change="handleSelectionChange"
+      >
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column
+            label="UDI编码"
+            prop="udiCode"
+            show-overflow-tooltip
+        ></el-table-column>
 
-                <el-table-column
-                    label="产品ID1"
-                    prop="thirdId"
-                    show-overflow-tooltip
-                ></el-table-column>
-                <el-table-column
-                    label="产品ID2"
-                    prop="thirdId1"
-                    show-overflow-tooltip
-                ></el-table-column>
-                <el-table-column
-                    label="产品ID3"
-                    prop="thirdId2"
-                    show-overflow-tooltip
-                ></el-table-column>
-                <el-table-column
-                    label="产品ID4"
-                    prop="thirdId3"
-                    show-overflow-tooltip
-                ></el-table-column>
-                <el-table-column
-                    label="产品ID5"
-                    prop="thirdId4"
-                    show-overflow-tooltip
-                ></el-table-column>
-                <el-table-column
-                    label="医保编码"
-                    width="100"
-                    prop="ybbm"
-                    show-overflow-tooltip
-                ></el-table-column>
-                <el-table-column
-                    label="商品条码"
-                    prop="sptm"
-                    show-overflow-tooltip
-                ></el-table-column>
+        <el-table-column
+            label="产品ID1"
+            prop="thirdId"
+            show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+            label="产品ID2"
+            prop="thirdId1"
+            show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+            label="产品ID3"
+            prop="thirdId2"
+            show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+            label="产品ID4"
+            prop="thirdId3"
+            show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+            label="产品ID5"
+            prop="thirdId4"
+            show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+            label="医保编码"
+            width="100"
+            prop="ybbm"
+            show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+            label="商品条码"
+            prop="sptm"
+            show-overflow-tooltip
+        ></el-table-column>
 
-                <el-table-column
-                    label="状态"
-                    prop="status"
-                    show-overflow-tooltip
-                >
-                    <template slot-scope="scope">
-                        <el-tag
-                            :type="statusFilterType(scope.row.status)"
-                        >{{ status[scope.row.status] }}
-                        </el-tag
-                        >
-                    </template>
-                </el-table-column>
-                <el-table-column
-                    label="备注"
-                    prop="remark"
-                    show-overflow-tooltip
-                ></el-table-column>
-            </el-table>
-            <el-pagination
-                :page-size="filterQuery.limit"
-                @current-change="handleCurrentChange"
-                layout="prev, pager, next"
-                :total="total"
-            ></el-pagination>
+        <el-table-column
+            label="状态"
+            prop="status"
+            show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <el-tag
+                :type="statusFilterType(scope.row.status)"
+            >{{ status[scope.row.status] }}
+            </el-tag
+            >
+          </template>
+        </el-table-column>
+        <el-table-column
+            label="备注"
+            prop="remark"
+            show-overflow-tooltip
+        ></el-table-column>
+      </el-table>
+      <el-pagination
+          :page-size="filterQuery.limit"
+          @current-change="handleCurrentChange"
+          layout="prev, pager, next"
+          :total="total"
+      ></el-pagination>
 
-        </el-card>
-    </div>
+    </el-card>
+  </div>
 </template>
 
 <script>
-    import {
-        filterDetail,
-    } from "../../api/basic/udiinfolog";
+import {
+  filterDetail,
+} from "../../api/basic/udiinfolog";
 
-    export default {
-        name: "udiImportDetail",
-        props: {
-            currentRow: {
-                type: Object,
-                required: true,
-            },
+export default {
+  name: "udiImportDetail",
+  props: {
+    currentRow: {
+      type: Object,
+      required: true,
+    },
 
-        },
-        data() {
-            return {
-                filterQuery: {
-                    genKey: null,
-                    udiCode:null,
-                    status:null,
-                    page: 1,
-                    limit: 10,
-                },
-                list: [],
-                detailList: [],
-                total: 0,
-                status: {
-                    0: "未处理",
-                    1: "处理失败",
-                    2: "处理成功"
-                },
-            };
-        },
+  },
+  data() {
+    return {
+      filterQuery: {
+        genKey: null,
+        udiCode: null,
+        status: null,
+        page: 1,
+        limit: 10,
+      },
+      list: [],
+      detailList: [],
+      total: 0,
+      status: {
+        0: "未处理",
+        1: "处理失败",
+        2: "处理成功"
+      },
+    };
+  },
 
-        methods: {
-            onReset() {
-                this.$router.push({
-                    path: "",
-                });
-                this.filterQuery = {
-                    genKey: null,
-                    udiCode:null,
-                    status:null,
-                    page: 1,
-                    limit: 10,
-                };
-                this.getList();
-            },
-            getList() {
-                this.loading = true;
-                console.log(" this.genKey = "+ this.currentRow.genKey)
-                this.filterQuery.genKey = this.currentRow.genKey;
-                filterDetail(this.filterQuery)
-                    .then((response) => {
-                        this.loading = false;
-                        this.list = response.data.list || [];
-                        this.total = response.data.total || 0;
-                    })
-                    .catch(() => {
-                        this.loading = false;
-                        this.list = [];
-                        this.total = 0;
-                    });
-            },
-            statusFilterType(status) {
-                const statusMap = {
-                    0: "warning",
-                    1: "danger",
-                    2: "success",
-                };
-                return statusMap[status];
-            },
-        },
-        mounted() {
-        },
-        created() {
-            this.getList();
-        },
-        filters: {
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        genKey: null,
+        udiCode: null,
+        status: null,
+        page: 1,
+        limit: 10,
+      };
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      console.log(" this.genKey = " + this.currentRow.genKey)
+      this.filterQuery.genKey = this.currentRow.genKey;
+      filterDetail(this.filterQuery)
+          .then((response) => {
+            this.loading = false;
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
+    },
+    statusFilterType(status) {
+      const statusMap = {
+        0: "warning",
+        1: "danger",
+        2: "success",
+      };
+      return statusMap[status];
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val;
+      this.getList();
+    },
 
-        },
-    };
+  },
+  mounted() {
+  },
+  created() {
+    this.getList();
+  },
+  filters: {},
+};
 </script>
 <style>
-    .itemTag {
-        float: left;
-        text-align: left;
-        margin-top: 10px;
-        width: 100px;
-    }
+.itemTag {
+  float: left;
+  text-align: left;
+  margin-top: 10px;
+  width: 100px;
+}
 
-    .text {
-        font-size: 13px;
-        font-family: "Microsoft YaHei";
-    }
+.text {
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
+}
 
-    .el-row {
-        display: flex;
-        flex-wrap: wrap;
+.el-row {
+  display: flex;
+  flex-wrap: wrap;
 
-    }
+}
 
-    .el-col {
-        border-radius: 4px;
-        flex-wrap: wrap;
-    }
+.el-col {
+  border-radius: 4px;
+  flex-wrap: wrap;
+}
 </style>
diff --git a/src/views/inventory/IncodeLogDetail.vue b/src/views/inventory/IncodeLogDetail.vue
index cf3ec5c..8b9630e 100644
--- a/src/views/inventory/IncodeLogDetail.vue
+++ b/src/views/inventory/IncodeLogDetail.vue
@@ -148,6 +148,10 @@
                         this.total = 0;
                     });
             },
+            handleCurrentChange(val) {
+                this.filterQuery.page = val;
+                this.getList();
+            },
         },
         mounted() {
         },
diff --git a/src/views/inventory/SelectInvProducts.vue b/src/views/inventory/SelectInvProducts.vue
index c3e0aaf..3999c24 100644
--- a/src/views/inventory/SelectInvProducts.vue
+++ b/src/views/inventory/SelectInvProducts.vue
@@ -158,6 +158,10 @@
                 console.log("----" + val);
                 this.multipleSelection = val;
             },
+            handleCurrentChange(val) {
+                this.filterQuery.page = val;
+                this.getList();
+            },
         }
     }
 
diff --git a/src/views/inventory/selectBasicUdiInfo.vue b/src/views/inventory/selectBasicUdiInfo.vue
index 0fbc130..cf3a247 100644
--- a/src/views/inventory/selectBasicUdiInfo.vue
+++ b/src/views/inventory/selectBasicUdiInfo.vue
@@ -196,6 +196,10 @@
                 console.log("----" + val);
                 this.multipleSelection = val;
             },
+            handleCurrentChange(val) {
+                this.filterQuery.page = val;
+                this.getList();
+            },
         }
     }