From 409bde8023b2b1b4ceb52c13cf9c398880c14eb4 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Mon, 23 May 2022 09:47:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=AE=BE=E7=BD=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E5=8D=95=E6=8D=AE=E6=9D=83=E9=99=90=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E7=AD=89=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/config.json                       |   8 +-
 src/views/basic/BussinessTypeThird.vue   |   1 -
 src/views/basic/UdiInfoManage.vue        |  19 +-
 src/views/basic/UdiInfoManageSp.vue      |  11 ++
 src/views/business/stockOrder.vue        |  12 --
 src/views/home/index.vue                 |   4 +-
 src/views/inout/DialogSelectErpOrder.vue |   2 +-
 src/views/inout/IOAdditionalOrder.vue    |   4 +-
 src/views/inout/IOCheckErrorOrder.vue    |   4 +-
 src/views/inout/IOCheckWaitOrder.vue     |   3 -
 src/views/inout/IOFinishOrder.vue        |   4 +-
 src/views/inventory/InvProducts.vue      |   3 -
 src/views/inventory/InvStatistics.vue    |  11 +-
 src/views/inventory/invUdiTraceOrder.vue |   4 +-
 src/views/thrsys/SysUdimsConfig.vue      | 220 ++++++++++++++++++-----
 15 files changed, 214 insertions(+), 96 deletions(-)

diff --git a/public/config.json b/public/config.json
index 7ca6b5f..dc76ca6 100644
--- a/public/config.json
+++ b/public/config.json
@@ -1,6 +1,6 @@
 {
-    "UDI_SYNC_SERVER_IP": "http://192.168.0.109:9995/",
-    "BASE_URL":"http://192.168.0.109:9991/",
-    "SERVER_IP": "http://192.168.0.109:9991/",
-    "WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/"
+    "UDI_SYNC_SERVER_IP": "http://127.0.0.1:9995/",
+    "BASE_URL":"http://127.0.0.1:9991/",
+    "SERVER_IP": "http://127.0.0.1:9991/",
+    "WEBSOCKET_URL": "ws://127.0.0.1:9991/UDI_WMS_MC/api/websocket/"
 }
diff --git a/src/views/basic/BussinessTypeThird.vue b/src/views/basic/BussinessTypeThird.vue
index 74e1ac0..fb0600a 100644
--- a/src/views/basic/BussinessTypeThird.vue
+++ b/src/views/basic/BussinessTypeThird.vue
@@ -40,7 +40,6 @@
 
       <el-table v-loading="loading" :data="list" style="width: 100%">
         <el-table-column label="序号" type="index" width="55"></el-table-column>
-
         <el-table-column label="单据类型名称" prop="name"></el-table-column>
         <el-table-column label="单据类型代码" prop="action"></el-table-column>
         <el-table-column label="第三方系统" prop="thirdSys"></el-table-column>
diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue
index f1415ab..bac086b 100644
--- a/src/views/basic/UdiInfoManage.vue
+++ b/src/views/basic/UdiInfoManage.vue
@@ -86,11 +86,10 @@
             <el-table
                 v-loading="loading"
                 :data="list"
-                style="width: 100%"
+                style="width: 100%;"
                 key="1"
                 @selection-change="handleSelectionChange"
             >
-                <!--            <el-table-column type="selection" width="55"></el-table-column>-->
                 <el-table-column label="序号" type="index"></el-table-column>
                 <el-table-column
                     label="最小销售产品标识"
@@ -142,16 +141,6 @@
                     show-overflow-tooltip
                 ></el-table-column>
 
-                <!--            <el-table-column-->
-                <!--                v-if="isSpCombine"-->
-                <!--                label="审核状态"-->
-                <!--                prop="lockStatus"-->
-                <!--                show-overflow-tooltip-->
-                <!--            >-->
-                <!--                <template slot-scope="scope">-->
-                <!--                    {{ lockStatusMap[scope.row.lockStatus] }}-->
-                <!--                </template>-->
-                <!--            </el-table-column>-->
 
                 <el-table-column width="200" label="操作" fixed="right">
                     <template slot-scope="scope">
@@ -844,7 +833,7 @@ export default {
                 isUseDy: false,
                 isLock: null,
                 isAdavence: null,
-                allowNoBatch:null,
+                allowNoBatch: null,
             },
             defaultSys: null,
             isImport: false,
@@ -1375,4 +1364,8 @@ export default {
     border-radius: 4px;
     flex-wrap: wrap;
 }
+.el-table .cell.el-tooltip {
+    white-space: pre-wrap;
+}
+
 </style>
diff --git a/src/views/basic/UdiInfoManageSp.vue b/src/views/basic/UdiInfoManageSp.vue
index 31063d2..ddabe9a 100644
--- a/src/views/basic/UdiInfoManageSp.vue
+++ b/src/views/basic/UdiInfoManageSp.vue
@@ -1268,6 +1268,10 @@ export default {
                 });
         },
         selectProduct() {
+            if (this.$isBlank(this.filterQuery.unitFk)) {
+                this.$message.error("请先选择供应商！");
+                return;
+            }
             this.selectProductVisible = true;
         },
 
@@ -1294,6 +1298,13 @@ export default {
 ;
 </script>
 <style scoped>
+
+
+.el-table .cell.el-tooltip {
+    white-space: pre-wrap;
+}
+
+
 .itemTag {
     float: left;
     text-align: left;
diff --git a/src/views/business/stockOrder.vue b/src/views/business/stockOrder.vue
index a3cec90..b11731b 100644
--- a/src/views/business/stockOrder.vue
+++ b/src/views/business/stockOrder.vue
@@ -53,13 +53,6 @@
                         </el-date-picker>
                     </el-form-item>
 
-                    <!--<el-form-item class="query-form-item">-->
-                    <!--<el-select v-model="query.status" placeholder="配货状态">-->
-                    <!--&lt;!&ndash;                            <el-option label="未配货" value="201"></el-option>&ndash;&gt;-->
-                    <!--<el-option label="已配货" value="202"></el-option>-->
-                    <!--<el-option label="新增提交" value="502"></el-option>-->
-                    <!--</el-select>-->
-                    <!--</el-form-item>-->
 
                     <el-form-item>
                         <el-button-group>
@@ -491,11 +484,6 @@ export default {
             }
 
             this.getList();
-            if (this.query.status === "202" || this.query.status === "502") {
-                this.haveDistributionVisible = true;
-            } else {
-                this.haveDistributionVisible = false;
-            }
         },
         handleCurrentChange(val) {
             this.query.page = val;
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index c1df3bb..b0064f4 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -370,7 +370,9 @@ export default {
 
 <style type="text/scss" lang="scss">
 @import "../../styles/mixin";
-
+.el-table .cell {
+    white-space: pre-wrap;
+}
 .el-header {
     /*background-color: #eef1f6;*/
     color: #333;
diff --git a/src/views/inout/DialogSelectErpOrder.vue b/src/views/inout/DialogSelectErpOrder.vue
index ae2d461..2e3678b 100644
--- a/src/views/inout/DialogSelectErpOrder.vue
+++ b/src/views/inout/DialogSelectErpOrder.vue
@@ -264,7 +264,7 @@ export default {
     getList() {
       this.loading = true;
       this.filterQuery.locStorageCode = this.curLocInv;
-      getCloudErp(this.filterQuery)
+        stockListDetail(this.filterQuery)
           .then((response) => {
             this.loading = false;
             if (response.code == 20000) {
diff --git a/src/views/inout/IOAdditionalOrder.vue b/src/views/inout/IOAdditionalOrder.vue
index 86cb6d2..713a945 100644
--- a/src/views/inout/IOAdditionalOrder.vue
+++ b/src/views/inout/IOAdditionalOrder.vue
@@ -68,9 +68,7 @@
 
                 </el-table-column>
                 <el-table-column label="往来单位" prop="fromCorp" width="250">
-                    <template slot-scope="scope">
-                        {{ scope.row.fromCorp }}
-                    </template>
+
                 </el-table-column>
                 <el-table-column label="当前仓库" prop="locStorageCode" width="150">
                     <template slot-scope="scope">
diff --git a/src/views/inout/IOCheckErrorOrder.vue b/src/views/inout/IOCheckErrorOrder.vue
index 9811a9a..617a2c7 100644
--- a/src/views/inout/IOCheckErrorOrder.vue
+++ b/src/views/inout/IOCheckErrorOrder.vue
@@ -97,9 +97,7 @@
 
                 </el-table-column>
                 <el-table-column label="往来单位" prop="fromCorp" width="250">
-                    <template slot-scope="scope">
-                        {{ scope.row.fromCorp }}
-                    </template>
+
                 </el-table-column>
                 <el-table-column label="当前仓库" prop="locStorageCode" width="150">
                     <template slot-scope="scope">
diff --git a/src/views/inout/IOCheckWaitOrder.vue b/src/views/inout/IOCheckWaitOrder.vue
index d29ce4b..ebd79c5 100644
--- a/src/views/inout/IOCheckWaitOrder.vue
+++ b/src/views/inout/IOCheckWaitOrder.vue
@@ -101,9 +101,6 @@
                     </template>
                 </el-table-column>
                 <el-table-column label="往来单位" prop="fromCorp" width="250">
-                    <template slot-scope="scope">
-                        {{ scope.row.fromCorp }}
-                    </template>
                 </el-table-column>
                 <el-table-column label="当前仓库" prop="locStorageCode" width="150">
                     <template slot-scope="scope">
diff --git a/src/views/inout/IOFinishOrder.vue b/src/views/inout/IOFinishOrder.vue
index a4826a6..e829277 100644
--- a/src/views/inout/IOFinishOrder.vue
+++ b/src/views/inout/IOFinishOrder.vue
@@ -105,9 +105,7 @@
 
                 </el-table-column>
                 <el-table-column label="往来单位" prop="fromCorp" width="250">
-                    <template slot-scope="scope">
-                        {{ scope.row.fromCorp }}
-                    </template>
+
                 </el-table-column>
                 <el-table-column label="当前仓库" prop="locStorageCode" width="150">
                     <template slot-scope="scope">
diff --git a/src/views/inventory/InvProducts.vue b/src/views/inventory/InvProducts.vue
index 058829e..3c57a99 100644
--- a/src/views/inventory/InvProducts.vue
+++ b/src/views/inventory/InvProducts.vue
@@ -81,9 +81,6 @@
                 <el-table-column label="产品名称" prop="cpmctymc" width="180">
                 </el-table-column>
                 <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip>
-                    <template slot-scope="scope">
-                        <pre style="white-space: pre-wrap;" >{{scope.row.ggxh}}</pre>
-                    </template>
                 </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>
diff --git a/src/views/inventory/InvStatistics.vue b/src/views/inventory/InvStatistics.vue
index 12235d6..70700a8 100644
--- a/src/views/inventory/InvStatistics.vue
+++ b/src/views/inventory/InvStatistics.vue
@@ -85,9 +85,6 @@
                 <el-table-column label="产品名称" prop="cpmctymc" width="180">
                 </el-table-column>
                 <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip>
-                    <template slot-scope="scope">
-                        <pre style="white-space: pre-wrap;" >{{scope.row.ggxh}}</pre>
-                    </template>
                 </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>
@@ -204,6 +201,14 @@ export default {
         onSubmit() {
             //判断统计条件是否全部为空
             var param = this.filterQuery;
+            if (this.$isBlank(this.filterQuery.invStorageCode)) {
+                this.$message({
+                    message: '请先选择当前仓库',
+                    type: 'warning'
+                });
+                return;
+            }
+
             if (param.cpmctymc == null && param.ggxh == null && param.zczbhhzbapzbh == null && param.ylqxzcrbarmc == null
                 && param.invStorageCode == null && param.nameCode == null && param.batchNo == null && param.supId == null) {
                 this.$message({
diff --git a/src/views/inventory/invUdiTraceOrder.vue b/src/views/inventory/invUdiTraceOrder.vue
index 7ce7920..71246eb 100644
--- a/src/views/inventory/invUdiTraceOrder.vue
+++ b/src/views/inventory/invUdiTraceOrder.vue
@@ -87,9 +87,7 @@
 
                 </el-table-column>
                 <el-table-column label="往来单位" prop="fromCorp" width="250">
-                    <template slot-scope="scope">
-                        {{ scope.row.fromCorp }}
-                    </template>
+
                 </el-table-column>
                 <el-table-column
                     label="创建时间"
diff --git a/src/views/thrsys/SysUdimsConfig.vue b/src/views/thrsys/SysUdimsConfig.vue
index d9c704e..4a4f824 100644
--- a/src/views/thrsys/SysUdimsConfig.vue
+++ b/src/views/thrsys/SysUdimsConfig.vue
@@ -7,12 +7,33 @@
             </template>
             <el-descriptions-item>
                 <template slot="label">
-                    参数设置
+                    中继服务
                 </template>
                 <el-row :gutter="20" class="el-row" type="flex">
                     <el-col :span="4" class="el-col" style="margin-top: 6px">
-                        <el-checkbox v-model="configQuery.downstreamEnable">下游是否联通</el-checkbox>
+                        <el-checkbox v-model="configQuery.downstreamEnable">是否启用</el-checkbox>
+                    </el-col>
+                    <el-col :span="20" class="el-col">
+                        <div>
+                            <span style="margin-left: 30px;">服务地址:&nbsp;</span>
+                            <el-input
+                                style="width: 70%"
+                                size="small"
+                                v-model="configQuery.syncIp"
+                                splaceholder="请输入内容"
+                            ></el-input>
+                        </div>
                     </el-col>
+                </el-row>
+            </el-descriptions-item>
+
+            <el-descriptions-item>
+                <template slot="label">
+                    参数设置
+                </template>
+
+                <el-row :gutter="20" class="el-row" type="flex">
+
                     <el-col :span="20" class="el-col">
                         <div>
                             <span>数据上传时间间隔(单位:分钟):&nbsp;</span>
@@ -54,13 +75,17 @@
                 <el-checkbox v-model="configQuery.basicProducts">耗材字典</el-checkbox>
                 <el-checkbox v-model="configQuery.basicCorp">往来单位字典</el-checkbox>
                 <el-checkbox v-model="configQuery.basicInv">仓库字典</el-checkbox>
+            </el-descriptions-item>
+            <el-descriptions-item>
+                <template slot="label">
+                    第三方基础信息
+                </template>
                 <el-checkbox v-model="configQuery.basicThirdProducts">第三方产品信息</el-checkbox>
                 <el-checkbox v-model="configQuery.basicThirdCorp">第三方往来信息</el-checkbox>
                 <el-checkbox v-model="configQuery.basicThirdInv">第三方仓库信息</el-checkbox>
                 <el-checkbox v-model="configQuery.basicThirdBusOrder">第三方业务单据</el-checkbox>
             </el-descriptions-item>
 
-
             <el-descriptions-item>
                 <template slot="label">
                     国家库DI数据
@@ -72,18 +97,6 @@
         </el-descriptions>
 
         <el-descriptions class="margin-top" title="" :column="1" :size="100" style="margin-top: 30px" border>
-
-            <el-descriptions-item label="单据(单据类型)" label-style="width: 150px">
-                <el-checkbox-group v-model="checkedBusTypes" @change="handleCheckedChange" >
-                    <el-checkbox
-                        style="padding-top: 10px"
-                        v-for="busType in busTypes" :label="busType" :key="busType.action"
-                        :value="busType.action">{{ busType.name }}
-
-
-                    </el-checkbox>
-                </el-checkbox-group>
-            </el-descriptions-item>
             <el-descriptions-item>
                 <template slot="label">
                     单据(单据状态)
@@ -92,9 +105,96 @@
                 <el-checkbox v-model="configQuery.orderUnReceive">未验收单据</el-checkbox>
                 <el-checkbox v-model="configQuery.orderScanFinish">已完成单据</el-checkbox>
             </el-descriptions-item>
+            <el-descriptions-item label="单据(单据类型)" label-style="width: 150px">
+
+                <div style="float: right;margin-bottom: 10px;margin-right: 25px">
+                    <el-button type="primary" size="small" @click="addBusTypeDialog()">添加扫码单据类型</el-button>
+                </div>
+                <el-table
+                    :data="checkedBusTypes"
+                    border
+                    style="width: 100%"
+                >
+                    <el-table-column label="序号" type="index"></el-table-column>
+                    <el-table-column
+                        label="单据类型"
+                        prop="name"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="单据类型代码"
+                        prop="action"
+                        show-overflow-tooltip
+                    ></el-table-column>
+
+                    <el-table-column label="操作" fixed="right">
+                        <template slot-scope="scope">
+                            <el-button
+                                type="text"
+                                size="small"
+                                @click.native="remveBus(scope.$index, scope.row)"
+                            >移除
+                            </el-button
+                            >
+                        </template>
+                    </el-table-column>
+                </el-table>
+
+            </el-descriptions-item>
+
+
+            <!--      <el-descriptions-item label="单据(单据类型)" label-style="width: 150px">-->
+            <!--        <el-checkbox-group v-model="checkedBusTypes" @change="handleCheckedChange">-->
+            <!--          <el-checkbox-->
+            <!--              style="padding-top: 10px"-->
+            <!--              v-for="busType in busTypes" :label="busType" :key="busType.action"-->
+            <!--              :value="busType.action">{{ busType.name }}-->
+            <!--          </el-checkbox>-->
+            <!--        </el-checkbox-group>-->
+            <!--      </el-descriptions-item>-->
+
         </el-descriptions>
 
+        <el-dialog
+            title="添加扫码单据类型"
+            :visible.sync="addBusDialogVisible"
+            width="55%"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            v-if="addBusDialogVisible"
+        >
+
+            <div style="float: right;margin-bottom: 10px;margin-right: 25px">
+                <el-button type="primary" size="small" @click="addBusType()">选入</el-button>
+            </div>
+            <el-table
+                :data="busTypes"
+                border
+                style="width: 100%"
+                @selection-change="handleCheckedChange"
+            >
+                <el-table-column type="selection" width="55" :selectable="checkSelectable"></el-table-column>
+                <el-table-column label="序号" type="index"></el-table-column>
+                <el-table-column
+                    label="单据类型"
+                    prop="name"
+                    show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                    label="单据类型代码"
+                    prop="action"
+                    show-overflow-tooltip
+                ></el-table-column>
+            </el-table>
+
+            <el-pagination
+                :page-size="busQuery.limit"
+                @current-change="handleCurrentChange"
+                layout="prev, pager, next"
+                :total="total"
+            ></el-pagination>
 
+        </el-dialog>
     </el-card>
 </template>
 
@@ -122,6 +222,7 @@ export default {
                 orderScanFinish: null,
                 dbDiProducts: null,
                 downstreamEnable: null,
+                syncIp:null,
                 syncTime: null,
                 syncDownloadTime: null,
                 orderUnCheck: null,
@@ -129,7 +230,14 @@ export default {
                 busTypes: [],
             },
             checkedBusTypes: [],
+            busQuery: {
+                page: 1,
+                limit: 10,
+            },
             busTypes: [],
+            multipleSelection: [],
+            addBusDialogVisible: false,
+            total: 0,
         }
     },
     methods: {
@@ -137,22 +245,19 @@ export default {
             findConfig()
                 .then((response) => {
                     if (response.code == 20000) {
-                        // debugger
                         this.configQuery = response.data;
+                        this.checkedBusTypes = [];
                         if (this.configQuery.busTypes != null) {
                             for (let i = 0; i < this.configQuery.busTypes.length; i++) {
 
                                 for (let k = 0; k < this.busTypes.length; k++) {
                                     if (this.busTypes[k].action == this.configQuery.busTypes[i]) {
                                         this.checkedBusTypes.push(this.busTypes[k]);
+                                        this.busTypes[k].isSelect = true;
                                     }
                                 }
-
-
                             }
                         }
-
-                        console.log(this.checkedBusTypes);
                     } else {
                         this.$message.error(response.message);
                     }
@@ -164,44 +269,73 @@ export default {
                 });
         },
         saveConfig() {
-            if (this.checkedBusTypes != null) {
-                this.configQuery.busTypes = [];
-                for (let i = 0; i < this.checkedBusTypes.length; i++) {
-                    this.configQuery.busTypes.push(this.checkedBusTypes[i].action);
-                }
-            }
-
 
-            updateConfig(this.configQuery)
-                .then((response) => {
-                    this.loading = false;
-                    if (response.code == 20000) {
-                        this.$message.success("更新成功！");
-                        this.getConfig();
+            this.$confirm('是否确认修改?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+                center: true,
+            }).then(() => {
+                if (this.checkedBusTypes != null) {
+                    this.configQuery.busTypes = [];
+                    for (let i = 0; i < this.checkedBusTypes.length; i++) {
+                        this.configQuery.busTypes.push(this.checkedBusTypes[i].action);
                     }
-                })
-                .catch(() => {
-                    this.loading = false;
-                });
+                }
+                updateConfig(this.configQuery)
+                    .then((response) => {
+                        this.loading = false;
+                        if (response.code == 20000) {
+                            this.$message.success("更新成功！");
+                            this.getConfig();
+                        }
+                    })
+                    .catch(() => {
+                        this.loading = false;
+                    });
+            }).catch(() => {
+            });
         },
 
-        handleCheckedChange() {
-
+        handleCheckedChange(val) {
+            this.multipleSelection = val;
         },
 
         getBusType() {
-            let query = {
-                enabled: true,
-            };
-            getBussinessType(query)
+            getBussinessType(this.busQuery)
                 .then((response) => {
                     this.busTypes = response.data.list || [];
+                    this.total = response.data.total || 0;
                     this.getConfig();
                 })
                 .catch(() => {
                 });
         },
 
+        addBusTypeDialog() {
+            this.addBusDialogVisible = true;
+            this.multipleSelection = [];
+        },
+
+        addBusType(){
+            var selectData = this.multipleSelection;
+            selectData.forEach((obj) => {
+                this.checkedBusTypes.push(obj);
+            });
+            this.addBusDialogVisible = false;
+        },
+
+
+        remveBus(index,row){
+            this.checkedBusTypes.splice(index,1);
+        },
+        checkSelectable(row) {
+            return !row.isSelect;
+        },
+        handleCurrentChange(val) {
+            this.busQuery.page = val;
+            this.getBusType();
+        },
     },
     created() {
         this.headers = {