From e46c87c68280c64b3f394e0081de066dec028c04 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 14 Jul 2022 14:37:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E9=85=8D=E8=B4=A7=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=BA=93=E5=AD=98=E4=BA=A7=E5=93=81=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouse/stockOrderEditDistribution.vue  | 163 ++++--------------
 src/views/warehouse/stockOrderEditor.vue      |   6 -
 2 files changed, 31 insertions(+), 138 deletions(-)

diff --git a/src/views/warehouse/stockOrderEditDistribution.vue b/src/views/warehouse/stockOrderEditDistribution.vue
index ff2f64f..8b256b6 100644
--- a/src/views/warehouse/stockOrderEditDistribution.vue
+++ b/src/views/warehouse/stockOrderEditDistribution.vue
@@ -63,6 +63,8 @@
                     <el-col :span="7">
                         <el-form-item prop="corpName">
                             <el-input v-model="formData.corpName" auto-complete="off" :disabled="true"></el-input>
+                            <el-input v-if="formData.fromSubInvName !=null" v-model="formData.fromSubInvName"
+                                      auto-complete="off" :disabled="true"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="3">
@@ -148,54 +150,9 @@
                     >
                 </el-button-group>
 
-                <!--                <el-row :gutter="20">-->
-                <!--                    <el-col :span="3">-->
-                <!--                        <div class="ao-text">-->
-                <!--                            <span>扫码录入：</span>-->
-                <!--                        </div>-->
-                <!--                    </el-col>-->
-                <!--                    <el-col :span="10">-->
-                <!--                        <el-form-item prop="code">-->
-
-                <!--                            &lt;!&ndash;                            @keyup.native.enter="focusNext('iCount')"   @focus="getInputFocus($event)"-->
-                <!--                               @keypress.enter.native="selectProductFunction($event)"-->
-                <!--                            &ndash;&gt;-->
-                <!--                            <el-input-->
-
-                <!--                                @keyup.enter.native="selectProductFunction($event)"-->
-                <!--                                v-model="code"-->
-                <!--                                auto-complete="off"-->
-                <!--                                ref='inputRef'-->
-                <!--                                @focus="getInputFocus($event)"-->
-                <!--                            ></el-input>-->
-                <!--                        </el-form-item>-->
-                <!--                    </el-col>-->
-                <!--                    &lt;!&ndash;                    <el-col :span="3">&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                        <div class="ao-text">&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                            <span>数量：</span>&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                        </div>&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                    </el-col>&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                    <el-col :span="4">&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                        <el-form-item prop="iCount">&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                            &lt;!&ndash;                            @keypress.enter.native="addCode()"&ndash;&gt;&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                            <el-input v-model="iCount" auto-complete="off" ref="iCount"&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                                      @keypress.enter.native="iCountEnterFunction()"&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                                      @focus="getInputFocus($event)"&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                                      @input="iCountChange"&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                                      oninput="value=value.replace(/[^\d]/g,'')"></el-input>&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                        </el-form-item>&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                    </el-col>&ndash;&gt;-->
-                <!--                </el-row>-->
-
-                <!--                highlight-current-row-->
-                <!--                @current-change="rowChange"-->
                 <el-table v-loading="loading" :data="codeArray" style="width: 100%;"
                           :row-class-name="tableRowClassName"
                           max-height="300" height="300" ref="multipleTable">
-                    <!--                    <el-table-column-->
-                    <!--                        type="selection"-->
-                    <!--                        width="55">-->
-                    <!--                    </el-table-column>-->
                     <el-table-column label="序号" type="index" width="50"></el-table-column>
                     <el-table-column width="150"
                                      label="产品通用名"
@@ -207,26 +164,6 @@
                                      prop="spec"
                                      show-overflow-tooltip
                     ></el-table-column>
-                    <!--                    <el-table-column-->
-                    <!--                        label="批次号"-->
-                    <!--                        prop="batchNo"-->
-                    <!--                        show-overflow-tooltip-->
-                    <!--                    ></el-table-column>-->
-                    <!--                    <el-table-column-->
-                    <!--                        label="生产日期"-->
-                    <!--                        prop="productDate"-->
-                    <!--                        show-overflow-tooltip-->
-                    <!--                    ></el-table-column>-->
-                    <!--                    <el-table-column-->
-                    <!--                        label="失效日期"-->
-                    <!--                        prop="expireDate"-->
-                    <!--                        show-overflow-tooltip-->
-                    <!--                    ></el-table-column>-->
-                    <!--                    <el-table-column-->
-                    <!--                        label="数量"-->
-                    <!--                        prop="count"-->
-                    <!--                        show-overflow-tooltip-->
-                    <!--                    ></el-table-column>-->
                     <el-table-column width="150" label="批次号">
                         <template slot-scope="scope">
                             <el-input size="small" v-model="scope.row.batchNo"
@@ -238,15 +175,6 @@
                     </el-table-column>
                     <el-table-column width="180" label="生产日期">
                         <template slot-scope="scope">
-                            <!--                            <el-date-picker-->
-                            <!--                                type="date"-->
-                            <!--                                size="small" v-model="scope.row.productDate"-->
-                            <!--                                :disabled="scope.row.index !== selectedIndex"-->
-                            <!--                                placeholder="请选择生产日期" style="width: 80%"-->
-                            <!--                                value-format="yyMMdd"-->
-                            <!--                                format="yyyy-MM-dd"-->
-                            <!--                            >-->
-                            <!--                            </el-date-picker>-->
                             <el-input v-model="scope.row.productDate" auto-complete="off"
                                       oninput="if(value.length>6)value=value.slice(0,6)"
                                       :disabled="scope.row.index !== selectedIndex"
@@ -256,15 +184,6 @@
                     </el-table-column>
                     <el-table-column width="180" label="失效日期">
                         <template slot-scope="scope">
-                            <!--                            <el-date-picker-->
-                            <!--                                type="date"-->
-                            <!--                                size="small" v-model="scope.row.expireDate"-->
-                            <!--                                :disabled="scope.row.index !== selectedIndex"-->
-                            <!--                                placeholder="请选择失效日期" style="width: 80%"-->
-                            <!--                                value-format="yyMMdd"-->
-                            <!--                                format="yyyy-MM-dd"-->
-                            <!--                            >-->
-                            <!--                            </el-date-picker>-->
                             <el-input v-model="scope.row.expireDate" auto-complete="off"
                                       oninput="if(value.length>6)value=value.slice(0,6)"
                                       :disabled="scope.row.index !== selectedIndex"
@@ -291,11 +210,6 @@
                             ></el-input>
                         </template>
                     </el-table-column>
-                    <!--                    <el-table-column width="150"-->
-                    <!--                                     label="单据数量"-->
-                    <!--                                     prop="count"-->
-                    <!--                                     show-overflow-tooltip-->
-                    <!--                    ></el-table-column>-->
                     <el-table-column width="150" label="单据数量">
                         <template slot-scope="scope">
                             <el-input size="small" v-model="scope.row.count"
@@ -330,16 +244,6 @@
                             >编辑
                             </el-button
                             >
-                            <!--                            <el-button-->
-                            <!--                                type="text"-->
-                            <!--                                size="small"-->
-                            <!--                                v-if="orderEditor && scope.row.index === selectedIndex"-->
-                            <!--                                :disabled="scope.row.index !== selectedIndex"-->
-                            <!--                                @click.stop="true"-->
-                            <!--                                @click.native="saveCodeArray(scope.$index, scope.row)"-->
-                            <!--                            >保存-->
-                            <!--                            </el-button-->
-                            <!--                            >-->
                             <el-button
                                 type="text"
                                 size="small"
@@ -414,6 +318,7 @@
             <dialogInvProduct
                 :closeDialog="closeDialogC2"
                 :data="thisData"
+                :invQueryData="invQueryData"
             ></dialogInvProduct>
         </el-dialog>
     </div>
@@ -438,6 +343,7 @@ import {getBasicUnitMaintains2} from "../../api/basic/basicUnitMaintain";
 import {getLocalJoinBusType} from "../../api/basic/busLocalType";
 import {filterAllByUser} from "@/api/basic/invWarehouse";
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
+import dialogInvProduct from "@/views/inventory/DialogInvProduct";
 
 export default {
     name: "idQuery",
@@ -519,11 +425,16 @@ export default {
             thisData: {},
             storageList: [],
             subInvList: [],
+            curAction: {
+                corpType: 0,
+                genUnit: false,
+            },
+            invQueryData: {},
         };
     },
     components: {
         draggable,
-        stockOrderNewSelectProduct,
+        stockOrderNewSelectProduct, dialogInvProduct,
     },
     methods: {
         saveOrder(status) {
@@ -645,6 +556,11 @@ export default {
                 event.target.select();
             }
             if (this.$isBlank(event)) {
+
+                if (this.$isBlank(this.formData.corpName) || this.$isBlank(this.formData.billType)) {
+                    this.$message.error("往来信息和单据类型不能为空！")
+                    return;
+                }
                 this.code = "";
                 this.$refs.multipleTable.setCurrentRow();
                 this.currentRow = {};
@@ -658,15 +574,24 @@ export default {
                 }
                 this.thisData.stockOrderLists = this.codeArray;
                 this.thisData.formData = this.formData;
-                this.selectProductVisible = true;
                 let item = this.getActionItem(this.formData.billType);
-                if (item.mainAction == 'WareHouseOut' && this.formData.noInvOut != true)//内部单
-                {
+                debugger
+                if (item.mainAction == 'WareHouseOut' && this.formData.noInvOut != true) {
+                    this.invQueryData = {
+                        locStorageCode: this.formData.locStorageCode,
+                    };
+                    this.selectInvProductVisible = true;
+                } else if (item.mainAction == "WareHouseIn" && this.curAction.corpType == 1 && this.formData.noInvOut != true) {
+
+                    this.invQueryData = {
+                        locStorageCode: this.formData.corpId,
+                    };
                     this.selectInvProductVisible = true;
                 } else {
                     this.selectProductVisible = true;
                 }
 
+
                 return;
             }
             this.code = this.code.trim();
@@ -707,35 +632,6 @@ export default {
                         }).catch(() => {
                             this.loading = false;
                         });
-
-                        // let tQuery2 = {
-                        //     id: response.data.getId
-                        // };
-                        // if (this.orderEditor) {
-                        //     tQuery2.orderId = this.formData.id;
-                        //     console.log(tQuery2)
-                        //     addStockOrderDetailFromCodeById(tQuery2).then((response) => {
-                        //         this.loading = false;
-                        //         if (response.code === 20000) {
-                        //             this.closeDialogC2(response);
-                        //         } else {
-                        //             this.$message.error(response.message);
-                        //         }
-                        //     }).catch(() => {
-                        //         this.loading = false;
-                        //     });
-                        // } else {
-                        //     getStockOrderDetailInstrumentById(tQuery2).then((response) => {
-                        //         this.loading = false;
-                        //         if (response.code === 20000) {
-                        //             this.closeDialogC2(response.data);
-                        //         } else {
-                        //             this.$message.error(response.message);
-                        //         }
-                        //     }).catch(() => {
-                        //         this.loading = false;
-                        //     });
-                        // }
                     } else {
                         this.thisData = response.data;
                         this.thisData.code = this.code;
@@ -744,6 +640,7 @@ export default {
                         if (this.orderEditor) {
                             this.thisData.orderId = this.formData.id
                         }
+                        this.thisData.stockOrderLists = this.codeArray;
                         this.selectProductVisible = true;
                     }
                 } else {
@@ -757,7 +654,6 @@ export default {
                 }
             });
 
-
         },
         closeDialogC2(rData) {//012693548470801311200226172302271020022632100025
             this.selectProductVisible = false;
@@ -1075,6 +971,9 @@ export default {
             getLocalJoinBusType(query)
                 .then((response) => {
                     this.busTypes = response.data.list || [];
+                    this.curAction = this.getActionItem(this.formData.billType);
+                    if (this.curAction != null) {
+                    }
                 })
                 .catch(() => {
                 });
diff --git a/src/views/warehouse/stockOrderEditor.vue b/src/views/warehouse/stockOrderEditor.vue
index 0d1d2c8..242627b 100644
--- a/src/views/warehouse/stockOrderEditor.vue
+++ b/src/views/warehouse/stockOrderEditor.vue
@@ -105,11 +105,6 @@
                 </el-table-column>
                 <el-table-column label="当前分库" prop="subInvName" width="120">
                 </el-table-column>
-                <!--                <el-table-column label="采购类型">-->
-                <!--                    <template slot-scope="scope">-->
-                <!--                        {{ scope.row.type | typeFilterName }}-->
-                <!--                    </template>-->
-                <!--                </el-table-column>-->
                 <el-table-column label="操作" fixed="right" width="250">
                     <template slot-scope="scope">
                         <el-button
@@ -308,7 +303,6 @@
                                     :label="item.localName"
                                     :value="item.localAction">
                                     <span style="float: left">{{ item.localName }}</span>
-                                    <!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>-->
                                 </el-option>
                             </el-select>
                         </el-form-item>