From efb28146154b4c7f2f18375d0da54cb5f324f9a7 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Fri, 18 Mar 2022 21:39:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=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 +-
 .../business/stockOrderNewDistribution.vue    |  35 +-
 .../business/stockOrderNewSelectProduct.vue   | 631 +++++++++---------
 3 files changed, 338 insertions(+), 336 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/business/stockOrderNewDistribution.vue b/src/views/business/stockOrderNewDistribution.vue
index 79acff8..f1d5c68 100644
--- a/src/views/business/stockOrderNewDistribution.vue
+++ b/src/views/business/stockOrderNewDistribution.vue
@@ -64,20 +64,19 @@
                 <el-row :gutter="20" style="margin-top: -10px">
                     <el-col :span="3">
                         <div class="ao-text">
-                            <span>当前仓库：</span>
+                            <span>业务类型：</span>
                         </div>
                     </el-col>
-
                     <el-col :span="7">
-                        <el-form-item prop="locStorageCode">
-                            <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locInChange"
+                        <el-form-item prop="billType">
+                            <el-select v-model="formData.billType" placeholder="请选择业务类型" @change="actionChange"
                                        clearable>
                                 <el-option
-                                    v-for="item in storageList"
-                                    :key="item.name"
-                                    :label="item.name"
-                                    :value="item.code">
-                                    <span style="float: left">{{ item.name }}</span>
+                                    v-for="item in busTypes"
+                                    :key="item.localAction"
+                                    :label="item.localName"
+                                    :value="item.localAction">
+                                    <span style="float: left">{{ item.localName }}</span>
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -146,22 +145,22 @@
 
                 </el-row>
                 <el-row :gutter="20" style="margin-top: -10px">
-
                     <el-col :span="3">
                         <div class="ao-text">
-                            <span>业务类型：</span>
+                            <span>当前仓库：</span>
                         </div>
                     </el-col>
+
                     <el-col :span="7">
-                        <el-form-item prop="billType">
-                            <el-select v-model="formData.billType" placeholder="请选择业务类型" @change="actionChange"
+                        <el-form-item prop="locStorageCode">
+                            <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locInChange"
                                        clearable>
                                 <el-option
-                                    v-for="item in busTypes"
-                                    :key="item.localAction"
-                                    :label="item.localName"
-                                    :value="item.localAction">
-                                    <span style="float: left">{{ item.localName }}</span>
+                                    v-for="item in storageList"
+                                    :key="item.name"
+                                    :label="item.name"
+                                    :value="item.code">
+                                    <span style="float: left">{{ item.name }}</span>
                                 </el-option>
                             </el-select>
                         </el-form-item>
diff --git a/src/views/business/stockOrderNewSelectProduct.vue b/src/views/business/stockOrderNewSelectProduct.vue
index 0171990..7f540af 100644
--- a/src/views/business/stockOrderNewSelectProduct.vue
+++ b/src/views/business/stockOrderNewSelectProduct.vue
@@ -1,352 +1,355 @@
 <template>
-    <div>
-        <el-card class="el-card">
-            <div>
-                <el-form :inline="true" :model="listQuery" size="mini">
-                    <el-row style="margin-top: 15px;width: 1000px">
-                        <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.udiCode"
-                                      style="width: 600px"
-                                      placeholder="请扫描或输入UDI码"
-                                      clearable="true"
-                                      @keyup.enter.native="keyup_submit($event)"></el-input>
-                        </el-form-item>
-                    </el-row>
+  <div>
+    <el-card class="el-card">
+      <div>
+        <el-form :inline="true" :model="listQuery" size="mini">
+          <el-row style="margin-top: 15px;width: 1000px">
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.udiCode"
+                        style="width: 600px"
+                        placeholder="请扫描或输入UDI码"
+                        clearable="true"
+                        @keyup.enter.native="keyup_submit($event)"></el-input>
+            </el-form-item>
+          </el-row>
 
-                    <el-row>
-                        <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.unionCode" placeholder="DI/医保编码/商品条码"
-                                      clearable="true"></el-input>
-                        </el-form-item>
-                        <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.cpmctymc" placeholder="产品通用名" clearable="true"></el-input>
-                        </el-form-item>
-                        <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.ggxh" placeholder="规格型号" clearable="true"></el-input>
-                        </el-form-item>
-                    </el-row>
+          <el-row>
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.unionCode" placeholder="DI/医保编码/商品条码"
+                        clearable="true"></el-input>
+            </el-form-item>
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.cpmctymc" placeholder="产品通用名" clearable="true"></el-input>
+            </el-form-item>
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.ggxh" placeholder="规格型号" clearable="true"></el-input>
+            </el-form-item>
+          </el-row>
 
-                    <el-row>
-                        <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.ylqxzcrbarmc" placeholder="生产企业/注册备案人"
-                                      clearable="true"></el-input>
-                        </el-form-item>
-                        <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.thrPiId" placeholder="第三方产品编码" clearable="true"></el-input>
-                        </el-form-item>
+          <el-row>
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.ylqxzcrbarmc" placeholder="生产企业/注册备案人"
+                        clearable="true"></el-input>
+            </el-form-item>
+            <el-form-item class="query-form-item">
+              <el-input v-model="listQuery.thrPiId" placeholder="第三方产品编码" clearable="true"></el-input>
+            </el-form-item>
 
-                        <el-form-item>
-                            <el-button-group>
-                                <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="combine">确定</el-button>
-                            </el-button-group>
-                        </el-form-item>
-                    </el-row>
-                </el-form>
+            <el-form-item>
+              <el-button-group>
+                <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="combine">确定</el-button>
+              </el-button-group>
+            </el-form-item>
+          </el-row>
+        </el-form>
 
-                <el-table
-                    :data="dataList"
-                    style="width: 100%"
-                    highlight-current-row="false"
-                    v-loading="loading"
-                    :row-class-name="tableRowClassName"
-                    @current-change="handleChange"
-                    ref="multipleTable"
-                >
-                    <el-table-column
-                        type="selection"
-                        width="55">
-                    </el-table-column>
-                    <el-table-column label="序号" type="index"></el-table-column>
-                    <el-table-column
-                        label="最小销售产品标识"
-                        prop="nameCode"
-                        width="140"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column
-                        label="产品编码"
-                        prop="thirdId"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column
-                        label="生产企业"
-                        prop="ylqxzcrbarmc"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column
-                        label="产品通用名"
-                        prop="cpmctymc"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column
-                        label="规格型号"
-                        prop="ggxh"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column
-                        label="注册/备案凭证"
-                        prop="zczbhhzbapzbh"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                    <el-table-column
-                        label="器械类别"
-                        prop="qxlb"
-                        show-overflow-tooltip
-                    ></el-table-column>
-                </el-table>
-                <el-pagination
-                    :page-size="listQuery.limit"
-                    @current-change="handleErpPageChange"
-                    layout="prev, pager, next"
-                    :total="pageTotal"
-                ></el-pagination>
-            </div>
-        </el-card>
+        <el-table
+            :data="dataList"
+            style="width: 100%"
+            highlight-current-row="false"
+            v-loading="loading"
+            :row-class-name="tableRowClassName"
+            @current-change="handleChange"
+            ref="multipleTable"
+        >
+          <el-table-column
+              type="selection"
+              width="55">
+          </el-table-column>
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+              label="最小销售产品标识"
+              prop="nameCode"
+              width="140"
+              show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+              label="产品编码"
+              prop="thirdId"
+              show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+              label="生产企业"
+              prop="ylqxzcrbarmc"
+              show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+              label="产品通用名"
+              prop="cpmctymc"
+              show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+              label="规格型号"
+              prop="ggxh"
+              show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+              label="注册/备案凭证"
+              prop="zczbhhzbapzbh"
+              show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+              label="器械类别"
+              prop="qxlb"
+              show-overflow-tooltip
+          ></el-table-column>
+        </el-table>
+        <el-pagination
+            :page-size="listQuery.limit"
+            @current-change="handleErpPageChange"
+            layout="prev, pager, next"
+            :total="pageTotal"
+        ></el-pagination>
+      </div>
+    </el-card>
 
-    </div>
+  </div>
 </template>
 
 <script>
 import {
-    getStockOrderDetailInstrumentById,
-    stockOrderDetailFilterProduct
+  getStockOrderDetailInstrumentById,
+  stockOrderDetailFilterProduct
 } from "../../api/inout/stockOrder";
 import store from "../../store";
 
 export default {
-    name: "closeDialog",
-    props: {
-        data: {
-            type: Object,
-            required: true,
-        },
-        closeDialog: {
-            type: Function,
-            required: true,
-        },
+  name: "closeDialog",
+  props: {
+    data: {
+      type: Object,
+      required: true,
     },
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+  },
 
-    data() {
-        return {
-            listQuery: {
-                billNo: "",
-                page: 1,
-                limit: 10,
+  data() {
+    return {
+      listQuery: {
+        billNo: "",
+        page: 1,
+        limit: 10,
+      },
+      combineQuery: {
+        thirdId: "",
+        relId: "",
+        erpName: "",
+        keys: [],
+      },
+      dataList: [],
+      pageTotal: 1,
+      total: 1,
+      currentRow: null,
+      loading: false,
+      multipleUdiSelection: [],
+      thirdSys: [],
+      thirdSysFk: null,
+      busTypes: [],
+      actDateRange: [],
+      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]);
             },
-            combineQuery: {
-                thirdId: "",
-                relId: "",
-                erpName: "",
-                keys: [],
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
             },
-            dataList: [],
-            pageTotal: 1,
-            total: 1,
-            currentRow: null,
-            loading: false,
-            multipleUdiSelection: [],
-            thirdSys: [],
-            thirdSysFk: null,
-            busTypes: [],
-            actDateRange: [],
-            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]);
-                        },
-                    },
-                ],
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
             },
-            orderEditor: false,
-            orderId: "",
-        };
+          },
+        ],
+      },
+      orderEditor: false,
+      orderId: "",
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.listQuery = {
+        unionCode: null,
+        udiCode: null,
+        ylqxzcrbarmc: "",
+        cpmctymc: "",
+        thrPiId: null,
+        nameCode: "",
+        ggxh: null,
+        page: 1,
+        limit: 20,
+        addType: 1,
+        billType: this.data.formData.billType,
+        corpId: this.data.formData.corpId,
+      };
+      this.getList();
+    },
+    tableRowClassName({row}) {
+      if (row.checked) return "warning-row";
+      return "";
+    },
+    checkSelectable(row) {
+      return !row.check;
+    },
+    handleCurrentChange(val) {
+      this.unionQuery.page = val;
+      this.getList();
+    },
+    handleChange(val) {
+      console.log(val);
+      this.currentRow = val;
+    },
+    handleErpPageChange(val) {
+      this.listQuery.page = val;
+      this.getList();
     },
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.listQuery = {
-                unionCode: null,
-                udiCode: null,
-                ylqxzcrbarmc: "",
-                cpmctymc: "", thrPiId: null,
-                nameCode: "",
-                ggxh: null,
-                page: 1,
-                limit: 20,
-                addType: 1,
-            };
-            this.getList();
-        },
-        tableRowClassName({row}) {
-            if (row.checked) return "warning-row";
-            return "";
-        },
-        checkSelectable(row) {
-            return !row.check;
-        },
-        handleCurrentChange(val) {
-            this.unionQuery.page = val;
-            this.getList();
-        },
-        handleChange(val) {
-            console.log(val);
-            this.currentRow = val;
-        },
-        handleErpPageChange(val) {
-            this.listQuery.page = val;
-            this.getList();
-        },
-        keyup_submit(event) {
-            this.listQuery.page = 1;
-            this.getList();
-            event.target.select();
-        },
-        getList() {
-            this.loading = true;
-            this.listQuery.customerId = store.getters.customerId;
-            stockOrderDetailFilterProduct(this.listQuery)
-                .then((response) => {
-                    console.log(response)
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.dataList = response.data.list || [];
-                        this.pageTotal = response.data.total || 0;
-                    } else {
-                        this.$message.error(response.message);
-                        this.dataList = [];
-                        this.pageTotal = 0;
-                    }
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.dataList = [];
-                    this.pageTotal = 0;
-                });
-        },
-        intentBack() {
-            this.closeDialog();
-        },
-        combine() {//012693548470801311200226172302271020022632100025
-            // if (this.$isBlank(this.currentRow.id)) {
-            //     return;
-            // }
-            let selection = this.$refs.multipleTable.selection;
-            if (selection.length < 1) {
-                this.$message.error('未选择产品');
-                return;
+    keyup_submit(event) {
+      this.listQuery.page = 1;
+      this.getList();
+      event.target.select();
+    },
+    getList() {
+      this.loading = true;
+      this.listQuery.customerId = store.getters.customerId;
+      stockOrderDetailFilterProduct(this.listQuery)
+          .then((response) => {
+            console.log(response)
+            this.loading = false;
+            if (response.code === 20000) {
+              this.dataList = response.data.list || [];
+              this.pageTotal = response.data.total || 0;
+            } else {
+              this.$message.error(response.message);
+              this.dataList = [];
+              this.pageTotal = 0;
             }
-            let ids = [];
+          })
+          .catch(() => {
+            this.loading = false;
+            this.dataList = [];
+            this.pageTotal = 0;
+          });
+    },
+    intentBack() {
+      this.closeDialog();
+    },
+    combine() {//012693548470801311200226172302271020022632100025
+      // if (this.$isBlank(this.currentRow.id)) {
+      //     return;
+      // }
+      let selection = this.$refs.multipleTable.selection;
+      if (selection.length < 1) {
+        this.$message.error('未选择产品');
+        return;
+      }
+      let ids = [];
 
-            selection.forEach((obj, index) => {
-                console.log("obj:===" + obj + "==" + obj.relIdFk)
-                let data = {
-                    relId: obj.rlId,
-                }
-                ids.push(data);
-            });
-            this.loading = true;
-            let tQuery = {
-                datas: ids,
-                stockOrderLists: this.data.stockOrderLists,
-            };
-            getStockOrderDetailInstrumentById(tQuery).then((response) => {
-                this.loading = false;
-                if (response.code === 20000) {
-                    this.closeDialog(response.data);
-                } else {
-                    this.$message.error(response.message);
-                }
-            }).catch(() => {
-                this.loading = false;
-            });
+      selection.forEach((obj, index) => {
+        console.log("obj:===" + obj + "==" + obj.relIdFk)
+        let data = {
+          relId: obj.rlId,
+        }
+        ids.push(data);
+      });
+      this.loading = true;
+      let tQuery = {
+        datas: ids,
+        stockOrderLists: this.data.stockOrderLists,
+      };
+      getStockOrderDetailInstrumentById(tQuery).then((response) => {
+        this.loading = false;
+        if (response.code === 20000) {
+          this.closeDialog(response.data);
+        } else {
+          this.$message.error(response.message);
+        }
+      }).catch(() => {
+        this.loading = false;
+      });
 
-            // let tQuery = {
-            //     id: this.currentRow.id
-            // };
-            // if (this.orderEditor) {
-            //     tQuery.orderId = this.orderId;
-            //     console.log(tQuery)
-            //     addStockOrderDetailFromCodeById(tQuery).then((response) => {
-            //         this.loading = false;
-            //         if (response.code === 20000) {
-            //             this.closeDialog(response);
-            //         } else {
-            //             this.$message.error(response.message);
-            //         }
-            //     }).catch(() => {
-            //         this.loading = false;
-            //     });
-            // } else {
-            //     getStockOrderDetailInstrumentById(tQuery).then((response) => {
-            //         this.loading = false;
-            //         if (response.code === 20000) {
-            //             this.closeDialog(response.data);
-            //         } else {
-            //             this.$message.error(response.message);
-            //         }
-            //     }).catch(() => {
-            //         this.loading = false;
-            //     });
-            // }
-        },
-        handleSelectionUdiChange(val) {
-            console.log("----" + val);
-            this.multipleUdiSelection = val;
-        },
+      // let tQuery = {
+      //     id: this.currentRow.id
+      // };
+      // if (this.orderEditor) {
+      //     tQuery.orderId = this.orderId;
+      //     console.log(tQuery)
+      //     addStockOrderDetailFromCodeById(tQuery).then((response) => {
+      //         this.loading = false;
+      //         if (response.code === 20000) {
+      //             this.closeDialog(response);
+      //         } else {
+      //             this.$message.error(response.message);
+      //         }
+      //     }).catch(() => {
+      //         this.loading = false;
+      //     });
+      // } else {
+      //     getStockOrderDetailInstrumentById(tQuery).then((response) => {
+      //         this.loading = false;
+      //         if (response.code === 20000) {
+      //             this.closeDialog(response.data);
+      //         } else {
+      //             this.$message.error(response.message);
+      //         }
+      //     }).catch(() => {
+      //         this.loading = false;
+      //     });
+      // }
     },
-    created() {
-        if (this.$isNotBlank(this.data)) {
-            console.log(this.data.stockOrderLists);
-            this.listQuery.nameCode = this.data.udi;
-            this.listQuery.billType = this.data.formData.billType;
-            this.listQuery.corpId = this.data.formData.corpId;
-            this.orderEditor = this.data.orderEditor;
-            this.orderId = this.data.orderId;
-            this.getList();
-        }
+    handleSelectionUdiChange(val) {
+      console.log("----" + val);
+      this.multipleUdiSelection = val;
     },
+  },
+  created() {
+    if (this.$isNotBlank(this.data)) {
+      console.log(this.data.stockOrderLists);
+      this.listQuery.nameCode = this.data.udi;
+      this.listQuery.billType = this.data.formData.billType;
+      this.listQuery.corpId = this.data.formData.corpId;
+      this.orderEditor = this.data.orderEditor;
+      this.orderId = this.data.orderId;
+      this.getList();
+    }
+  },
 };
 </script>
 
 <style scoped>
 .query-form-item {
-    display: block !important;
-    margin-right: 10px;
-    margin-bottom: 5px;
+  display: block !important;
+  margin-right: 10px;
+  margin-bottom: 5px;
 }
 
 div /deep/ .el-table .warning-row {
-    background: #bebebe;
+  background: #bebebe;
 }
 
 div /deep/ .el-table .success-row {
-    background: #ffffff;
+  background: #ffffff;
 }
 </style>