From 3613199fe48c4eea6d8317fadf877b0efaea9551 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Fri, 12 Aug 2022 16:05:32 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/UdiInfoRelevance.vue          | 103 +++++++++---------
 src/views/business/DialogcChangeNewOrder.vue  |   5 +
 .../business/stockOrderNewDistribution.vue    |   4 +-
 src/views/inventory/invPreInProducts.vue      |  10 +-
 4 files changed, 64 insertions(+), 58 deletions(-)

diff --git a/src/views/basic/UdiInfoRelevance.vue b/src/views/basic/UdiInfoRelevance.vue
index d2f3733..63fff08 100644
--- a/src/views/basic/UdiInfoRelevance.vue
+++ b/src/views/basic/UdiInfoRelevance.vue
@@ -19,56 +19,59 @@
 
         <el-card class="el-card" v-if="checked">
             <div>
-                <el-form :inline="true" :model="erpQuery" style="display: flex" size="mini">
-
-
-                    <el-form-item class="query-form-item">
-                        <el-input
-                            v-model="erpQuery.code"
-                            placeholder="产品编码/商品条码/医保编码"
-                            clearable="true"
-                            @keyup.enter.native="keyupErp_submit($event)"
-                        ></el-input>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <el-input v-model="erpQuery.name"
-                                  clearable="true"
-                                  placeholder="产品名称"></el-input>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <el-input v-model="erpQuery.registerNo"
-                                  clearable="true"
-                                  placeholder="注册/备案凭证号"></el-input>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <el-input v-model="erpQuery.manufactory"
-                                  clearable="true"
-                                  placeholder="生产厂家"></el-input>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <el-input
-                            v-model="erpQuery.spec"
-                            clearable="true"
-                            placeholder="规格型号"
-                        ></el-input>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <el-select v-model="thirdSysFk" placeholder="请选择第三方系统" disabled="true">
-                            <el-option
-                                v-for="item in thirdSys"
-                                :key="item.value"
-                                :label="item.thirdName"
-
-                                :value="item.thirdId">
-                                <span style="float: left">{{ item.thirdName }}</span>
-                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item style="display: flex">
-                        <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                        <el-button type="primary" icon="search" @click="searchErpList">查询</el-button>
-                    </el-form-item>
+                <el-form :inline="true" :model="erpQuery" size="mini">
+                    <el-row>
+                        <el-form-item class="query-form-item">
+                            <el-input
+                                v-model="erpQuery.code"
+                                placeholder="产品编码/商品条码/医保编码"
+                                clearable="true"
+                                @keyup.enter.native="keyupErp_submit($event)"
+                            ></el-input>
+                        </el-form-item>
+                        <el-form-item class="query-form-item">
+                            <el-input v-model="erpQuery.name"
+                                      clearable="true"
+                                      placeholder="产品名称"></el-input>
+                        </el-form-item>
+                        <el-form-item class="query-form-item">
+                            <el-input v-model="erpQuery.registerNo"
+                                      clearable="true"
+                                      placeholder="注册/备案凭证号"></el-input>
+                        </el-form-item>
+                        <el-form-item class="query-form-item">
+                            <el-input v-model="erpQuery.manufactory"
+                                      clearable="true"
+                                      placeholder="生产厂家"></el-input>
+                        </el-form-item>
+                    </el-row>
+
+                    <el-row>
+                        <el-form-item class="query-form-item">
+                            <el-input
+                                v-model="erpQuery.spec"
+                                clearable="true"
+                                placeholder="规格型号"
+                            ></el-input>
+                        </el-form-item>
+                        <el-form-item class="query-form-item">
+                            <el-select v-model="thirdSysFk" placeholder="请选择第三方系统" disabled="true">
+                                <el-option
+                                    v-for="item in thirdSys"
+                                    :key="item.value"
+                                    :label="item.thirdName"
+
+                                    :value="item.thirdId">
+                                    <span style="float: left">{{ item.thirdName }}</span>
+                                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item style="display: flex">
+                            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+                            <el-button type="primary" icon="search" @click="searchErpList">查询</el-button>
+                        </el-form-item>
+                    </el-row>
                 </el-form>
 
                 <el-table
diff --git a/src/views/business/DialogcChangeNewOrder.vue b/src/views/business/DialogcChangeNewOrder.vue
index 39783f9..5beb2bb 100644
--- a/src/views/business/DialogcChangeNewOrder.vue
+++ b/src/views/business/DialogcChangeNewOrder.vue
@@ -425,6 +425,7 @@ export default {
         storageChange(row) {
             this.formData.fromCorpId = row.code;
             this.formData.fromCorp = row.name;
+            this.formData.fromSubInvCode = null;
             this.findSubStorageMethod();
         },
 
@@ -435,6 +436,10 @@ export default {
         actionChange(item) {
             this.curAction = this.getActionItem(item);
             // this.formData.locStorageCode = this.curAction.storageCode;
+            //切换单据类型，清空仓库和分仓信息
+            this.formData.locStorageCode = null;
+            this.formData.invWarehouseCode = null;
+            this.formData.fromCorp = null;
             this.findMethod();
         },
         getActionItem(action) {
diff --git a/src/views/business/stockOrderNewDistribution.vue b/src/views/business/stockOrderNewDistribution.vue
index bd863ef..1b56468 100644
--- a/src/views/business/stockOrderNewDistribution.vue
+++ b/src/views/business/stockOrderNewDistribution.vue
@@ -62,7 +62,7 @@
                     </el-col>
                 </el-row>
 
-                <el-row :gutter="20" style="margin-top: -10px">
+                <el-row :gutter="20" style="margin-top: -5px">
                     <el-col :span="3">
                         <div class="ao-text">
                             <span>业务类型：</span>
@@ -164,7 +164,7 @@
                     </el-col>
 
                 </el-row>
-                <el-row :gutter="20" style="margin-top: -10px">
+                <el-row :gutter="20" style="margin-top: 0px">
                     <el-col :span="3">
                         <div class="ao-text">
                             <span>当前仓库：</span>
diff --git a/src/views/inventory/invPreInProducts.vue b/src/views/inventory/invPreInProducts.vue
index 6d2340d..2fb8981 100644
--- a/src/views/inventory/invPreInProducts.vue
+++ b/src/views/inventory/invPreInProducts.vue
@@ -26,11 +26,11 @@
                         >
                             <el-option
                                 v-for="item in fromOptions"
-                                :key="item.companyName"
-                                :label="item.companyName"
-                                :value="item.customerId"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.erpId"
                             >
-                                <span style="float: left">{{ item.companyName }}</span>
+                                <span style="float: left">{{ item.name }}</span>
                             </el-option>
                         </el-select>
                     </el-form-item>
@@ -307,12 +307,10 @@ export default {
                 });
         },
         findMethod(query) {
-            console.log(query);
             this.fromOptions = [];
             let cQuery = {
                 key: query,
                 customerName: query,
-
             };
             getBasicUnitMaintains(cQuery)
                 .then((response) => {