From 169f4fa53857bfc8bc61ffd762915a6801009eda Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Sat, 21 May 2022 12:00:59 +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=E8=A7=84=E6=A0=BC=E5=9E=8B=E5=8F=B7=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=88=E6=9C=AA=E8=A7=A3=E5=86=B3)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/config.json                       |   4 +-
 src/views/home/index.vue                 |   2 +-
 src/views/inventory/invUdiTraceOrder.vue |   3 -
 src/views/thrsys/SysUdimsConfig.vue      | 469 ++++++++++++++---------
 src/views/warehouse/AdditionalOrder.vue  |   3 -
 src/views/warehouse/IOCheckErrOrder.vue  |   3 -
 src/views/warehouse/IONewOrder.vue       |   4 +-
 src/views/warehouse/IOSearchOrder.vue    |   8 -
 src/views/warehouse/IOWaitOrder.vue      |   3 -
 9 files changed, 290 insertions(+), 209 deletions(-)

diff --git a/public/config.json b/public/config.json
index 61112ea..5a4ba54 100644
--- a/public/config.json
+++ b/public/config.json
@@ -1,5 +1,5 @@
 {
-    "BASE_URL": "http://192.168.0.109:9996",
-    "SERVER_IP": "http://192.168.0.109:9996",
+    "BASE_URL": "http://127.0.0.1:9996",
+    "SERVER_IP": "http://127.0.0.1:9996",
     "hosp_name": "诏安县总医院（测试）"
 }
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 57ecf96..1003af5 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -390,7 +390,7 @@
 
 <style type="text/scss" lang="scss">
     @import "../../styles/mixin";
-    .el-table .cell.el-tooltip {
+    .el-table .cell {
         white-space: pre-wrap;
     }
     .el-header {
diff --git a/src/views/inventory/invUdiTraceOrder.vue b/src/views/inventory/invUdiTraceOrder.vue
index 675ad35..65368fc 100644
--- a/src/views/inventory/invUdiTraceOrder.vue
+++ b/src/views/inventory/invUdiTraceOrder.vue
@@ -87,9 +87,6 @@
 
                 </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 c9ecd42..ece3181 100644
--- a/src/views/thrsys/SysUdimsConfig.vue
+++ b/src/views/thrsys/SysUdimsConfig.vue
@@ -1,92 +1,171 @@
 <template>
-    <el-card>
+  <el-card>
 
-        <el-descriptions class="margin-top" title="数据同步设置" :column="1" :size="100" border>
-            <template slot="extra">
-                <el-button type="primary" size="small" @click="saveConfig()">保存</el-button>
+    <el-descriptions class="margin-top" title="数据同步设置" :column="1" :size="100" border>
+      <template slot="extra">
+        <el-button type="primary" size="small" @click="saveConfig()">保存</el-button>
+      </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-col>
+          <el-col :span="20" class="el-col">
+            <div>
+              <span>数据同步轮询时间(单位:分钟):&nbsp;</span>
+              <el-input
+                  style="width: 100px"
+                  size="small"
+                  type="number"
+                  v-model="configQuery.syncTime"
+                  splaceholder="请输入内容"
+              ></el-input>
+            </div>
+          </el-col>
+        </el-row>
+
+      </el-descriptions-item>
+
+      <el-descriptions-item>
+        <template slot="label">
+          单据类型
+        </template>
+        <el-checkbox v-model="configQuery.typeBus">业务单据类型</el-checkbox>
+        <el-checkbox v-model="configQuery.typeScan">扫码单据类型</el-checkbox>
+        <el-checkbox v-model="configQuery.typeThird">第三方单据类型</el-checkbox>
+      </el-descriptions-item>
+
+      <el-descriptions-item>
+        <template slot="label">
+          基础信息
+        </template>
+        <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数据
+        </template>
+        <el-checkbox v-model="configQuery.dbDiProducts">DI产品信息</el-checkbox>
+      </el-descriptions-item>
+
+
+    </el-descriptions>
+
+    <el-descriptions class="margin-top" title="" :column="1" :size="100" style="margin-top: 30px" border>
+      <el-descriptions-item>
+        <template slot="label">
+          单据(单据状态)
+        </template>
+        <el-checkbox v-model="configQuery.orderUnCheck">待校验单据</el-checkbox>
+        <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-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-col>
-                    <el-col :span="20" class="el-col">
-                        <div>
-                            <span>数据同步轮询时间(单位:分钟):&nbsp;</span>
-                            <el-input
-                                style="width: 100px"
-                                size="small"
-                                type="number"
-                                v-model="configQuery.syncTime"
-                                splaceholder="请输入内容"
-                            ></el-input>
-                        </div>
-                    </el-col>
-                </el-row>
-
-            </el-descriptions-item>
-
-            <el-descriptions-item>
-                <template slot="label">
-                    单据类型
-                </template>
-                <el-checkbox v-model="configQuery.typeBus">业务单据类型</el-checkbox>
-                <el-checkbox v-model="configQuery.typeScan">扫码单据类型</el-checkbox>
-                <el-checkbox v-model="configQuery.typeThird">第三方单据类型</el-checkbox>
-            </el-descriptions-item>
-
-            <el-descriptions-item>
-                <template slot="label">
-                    基础信息
-                </template>
-                <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-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数据
-                </template>
-                <el-checkbox v-model="configQuery.dbDiProducts">DI产品信息</el-checkbox>
-            </el-descriptions-item>
-
-
-        </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">
-                    单据(单据状态)
-                </template>
-                <el-checkbox v-model="configQuery.orderUnCheck">待校验单据</el-checkbox>
-                <el-checkbox v-model="configQuery.orderUnReceive">未验收单据</el-checkbox>
-                <el-checkbox v-model="configQuery.orderScanFinish">已完成单据</el-checkbox>
-            </el-descriptions-item>
-        </el-descriptions>
-
-
-    </el-card>
+          </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>
 
 <script>
@@ -95,112 +174,136 @@ import store from "@/store";
 import {getBussinessType} from "@/api/basic/bussinessType";
 
 export default {
-    name: "SysUdimsConfig",
-    data() {
-        return {
-            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,
-                syncTime: null,
-                orderUnCheck: null,
-                orderUnReceive: null,
-                busTypes: [],
-            },
-            checkedBusTypes: [],
-            busTypes: [],
-        }
-    },
-    methods: {
-        getConfig() {
-            findConfig()
-                .then((response) => {
-                    if (response.code == 20000) {
-                        // debugger
-                        this.configQuery = response.data;
-                        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]);
-                                    }
-                                }
-
-
-                            }
-                        }
-
-                        console.log(this.checkedBusTypes);
-                    } else {
-                        this.$message.error(response.message);
+  name: "SysUdimsConfig",
+  data() {
+    return {
+      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,
+        syncTime: null,
+        orderUnCheck: null,
+        orderUnReceive: null,
+        busTypes: [],
+      },
+      checkedBusTypes: [],
+      busQuery: {
+        page: 1,
+        limit: 10,
+      },
+      busTypes: [],
+      multipleSelection: [],
+      addBusDialogVisible: false,
+      total: 0,
+    }
+  },
+  methods: {
+    getConfig() {
+      findConfig()
+          .then((response) => {
+            if (response.code == 20000) {
+              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;
                     }
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
-        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);
+                  }
                 }
+              }
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
+    },
+    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();
             }
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+    },
+
+    handleCheckedChange(val) {
+      this.multipleSelection = val;
+    },
 
+    getBusType() {
+      getBussinessType(this.busQuery)
+          .then((response) => {
+            this.busTypes = response.data.list || [];
+            this.total = response.data.total || 0;
+            this.getConfig();
+          })
+          .catch(() => {
+          });
+    },
 
-            updateConfig(this.configQuery)
-                .then((response) => {
-                    this.loading = false;
-                    if (response.code == 20000) {
-                        this.$message.success("更新成功！");
-                        this.getConfig();
-                    }
-                })
-                .catch(() => {
-                    this.loading = false;
-                });
-        },
-
-        handleCheckedChange() {
-
-        },
-
-        getBusType() {
-            let query = {
-                enabled: true,
-            };
-            getBussinessType(query)
-                .then((response) => {
-                    this.busTypes = response.data.list || [];
-                    this.getConfig();
-                })
-                .catch(() => {
-                });
-        },
+    addBusTypeDialog() {
+      this.addBusDialogVisible = true;
+      this.multipleSelection = [];
+    },
 
+    addBusType(){
+      var selectData = this.multipleSelection;
+      selectData.forEach((obj) => {
+        this.checkedBusTypes.push(obj);
+      });
+      this.addBusDialogVisible = false;
     },
-    created() {
-        this.headers = {
-            ADMIN_ID: store.getters.adminId,
-            ADMIN_TOKEN: store.getters.token,
-        };
 
-        this.getBusType();
+
+    remveBus(index,row){
+      this.checkedBusTypes.splice(index,1);
+    },
+    checkSelectable(row) {
+      return !row.isSelect;
     },
+    handleCurrentChange(val) {
+      this.busQuery.page = val;
+      this.getBusType();
+    },
+  },
+  created() {
+    this.headers = {
+      ADMIN_ID: store.getters.adminId,
+      ADMIN_TOKEN: store.getters.token,
+    };
+
+    this.getBusType();
+  },
 }
 </script>
 
diff --git a/src/views/warehouse/AdditionalOrder.vue b/src/views/warehouse/AdditionalOrder.vue
index 2d87a2c..63c685a 100644
--- a/src/views/warehouse/AdditionalOrder.vue
+++ b/src/views/warehouse/AdditionalOrder.vue
@@ -68,9 +68,6 @@
 
                 </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/warehouse/IOCheckErrOrder.vue b/src/views/warehouse/IOCheckErrOrder.vue
index 634d2d7..1332538 100644
--- a/src/views/warehouse/IOCheckErrOrder.vue
+++ b/src/views/warehouse/IOCheckErrOrder.vue
@@ -115,9 +115,6 @@
 
                 </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/warehouse/IONewOrder.vue b/src/views/warehouse/IONewOrder.vue
index c32def8..3ab9c93 100644
--- a/src/views/warehouse/IONewOrder.vue
+++ b/src/views/warehouse/IONewOrder.vue
@@ -78,9 +78,7 @@
 
                 </el-table-column>
                 <el-table-column label="往来单位" prop="fromCorp" width="220">
-                    <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/warehouse/IOSearchOrder.vue b/src/views/warehouse/IOSearchOrder.vue
index c82d559..034032b 100644
--- a/src/views/warehouse/IOSearchOrder.vue
+++ b/src/views/warehouse/IOSearchOrder.vue
@@ -91,11 +91,6 @@
                     prop="id"
                     show-overflow-tooltip="true"
                 ></el-table-column>
-                <!-- <el-table-column
-                  label="来源订单号"
-                  prop="corpOrderId"
-                  :show-overflow-tooltip="true"
-                ></el-table-column> -->
                 <el-table-column label="来源" prop="fromType">
 
                     <template slot-scope="scope">
@@ -105,9 +100,6 @@
 
                 </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/warehouse/IOWaitOrder.vue b/src/views/warehouse/IOWaitOrder.vue
index 76e0733..3c89309 100644
--- a/src/views/warehouse/IOWaitOrder.vue
+++ b/src/views/warehouse/IOWaitOrder.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">