From 34f3c2b782f1206a6fbdf813c791bcd2f0a35fc6 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 16 Jun 2022 09:23:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=A0=A1=E9=AA=8C=EF=BC=8C?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugin/KeyScaner.js                    |   5 +-
 src/views/basic/BasicEntrutsReceModify.vue |  20 ++--
 src/views/thrsys/SysUdimsConfig.vue        | 131 +++++++++++----------
 src/views/warehouse/addHosOrder.vue        |   7 ++
 4 files changed, 90 insertions(+), 73 deletions(-)

diff --git a/src/plugin/KeyScaner.js b/src/plugin/KeyScaner.js
index 0b8024d..fa0a6eb 100644
--- a/src/plugin/KeyScaner.js
+++ b/src/plugin/KeyScaner.js
@@ -87,7 +87,10 @@ const KeyScaner = /** @class */ (function () {
         }
     };
     KeyScaner.prototype.completeInput = function () {
-        var text = this.keybufs.join("");
+        var text ="";//= this.keybufs.toString()
+        for(let i = 0;i<this.keybufs.length;i++){
+            text = text+this.keybufs[i];
+        }
         this.keybufs = [];
         if (this.onInput) {
             this.onInput.bind(this)(text);
diff --git a/src/views/basic/BasicEntrutsReceModify.vue b/src/views/basic/BasicEntrutsReceModify.vue
index 6ff18ef..f0aa326 100644
--- a/src/views/basic/BasicEntrutsReceModify.vue
+++ b/src/views/basic/BasicEntrutsReceModify.vue
@@ -208,19 +208,20 @@ export default {
                 .catch(() => {
                 });
         },
-        getOrderType() {
-            filterNoUseBusType().then((response) => {
+        getOrderType(code) {
+            let query = {
+                locInvCode: code
+            }
+            filterNoUseBusType(query).then((response) => {
                 this.busTypes = response.data || [];
             }).catch(() => {
 
             })
         },
         invChange(code) {
-            let query = {
-                code: code
-            }
-            this.$set(this.inputQuery, "entrustUser","");
-            this.$set(this.inputQuery, "entrustInv","");
+            this.getOrderType(code);
+            this.$set(this.inputQuery, "entrustUser", "");
+            this.$set(this.inputQuery, "entrustInv", "");
             this.getEntrustStorage();
         },
 
@@ -234,7 +235,7 @@ export default {
             this.$forceUpdate();
             //加载用户数据
             warehouseUserList(query).then((res) => {
-                this.entrustUserArray=[];
+                this.entrustUserArray = [];
                 this.entrustUserArray = res.data;
             }).catch((error) => {
                 this.$message.error("用户数据加载失败")
@@ -249,7 +250,6 @@ export default {
             });
 
 
-
         },
 
     },
@@ -261,7 +261,7 @@ export default {
 
 
     created() {
-        this.getOrderType();
+        this.getOrderType(null);
         this.getList();
         this.getStorage();
         this.getEntrustStorage();
diff --git a/src/views/thrsys/SysUdimsConfig.vue b/src/views/thrsys/SysUdimsConfig.vue
index f605de4..4f83e65 100644
--- a/src/views/thrsys/SysUdimsConfig.vue
+++ b/src/views/thrsys/SysUdimsConfig.vue
@@ -50,16 +50,16 @@
                             ></el-input>
                         </div>
                     </el-col>
-<!--                    <el-col :span="8" class="el-col">-->
-<!--                        <div>-->
-<!--                            <span>开始时间:&nbsp;</span>-->
-<!--                            <el-time-picker-->
-<!--                                :disabled="configQuery.downstreamEnable"-->
-<!--                                v-model="configQuery.basicSyncStart"-->
-<!--                                placeholder="开始时间">-->
-<!--                            </el-time-picker>-->
-<!--                        </div>-->
-<!--                    </el-col>-->
+                    <!--                    <el-col :span="8" class="el-col">-->
+                    <!--                        <div>-->
+                    <!--                            <span>开始时间:&nbsp;</span>-->
+                    <!--                            <el-time-picker-->
+                    <!--                                :disabled="configQuery.downstreamEnable"-->
+                    <!--                                v-model="configQuery.basicSyncStart"-->
+                    <!--                                placeholder="开始时间">-->
+                    <!--                            </el-time-picker>-->
+                    <!--                        </div>-->
+                    <!--                    </el-col>-->
                 </el-row>
             </el-descriptions-item>
 
@@ -67,7 +67,8 @@
                 <template slot="label">
                     运行参数
                 </template>
-                <el-checkbox v-model="configQuery.entrustAction" :disabled="configQuery.downstreamEnable">委托验收</el-checkbox>
+                <el-checkbox v-model="configQuery.entrustAction" :disabled="configQuery.downstreamEnable">委托验收
+                </el-checkbox>
             </el-descriptions-item>
 
             <el-descriptions-item>
@@ -135,16 +136,16 @@
                             ></el-input>
                         </div>
                     </el-col>
-<!--                    <el-col :span="8" class="el-col">-->
-<!--                        <div>-->
-<!--                            <span>开始时间:&nbsp;</span>-->
-<!--                            <el-time-picker-->
-<!--                                :disabled="configQuery.downstreamEnable"-->
-<!--                                v-model="configQuery.orderSyncStart"-->
-<!--                                placeholder="开始时间">-->
-<!--                            </el-time-picker>-->
-<!--                        </div>-->
-<!--                    </el-col>-->
+                    <!--                    <el-col :span="8" class="el-col">-->
+                    <!--                        <div>-->
+                    <!--                            <span>开始时间:&nbsp;</span>-->
+                    <!--                            <el-time-picker-->
+                    <!--                                :disabled="configQuery.downstreamEnable"-->
+                    <!--                                v-model="configQuery.orderSyncStart"-->
+                    <!--                                placeholder="开始时间">-->
+                    <!--                            </el-time-picker>-->
+                    <!--                        </div>-->
+                    <!--                    </el-col>-->
                 </el-row>
 
             </el-descriptions-item>
@@ -181,6 +182,11 @@
                         prop="action"
                         show-overflow-tooltip
                     ></el-table-column>
+                    <el-table-column width="180" label="允许缺量补单">
+                        <template slot-scope="scope">
+                            <el-checkbox v-model="scope.row.outChange">缺量补单</el-checkbox>
+                        </template>
+                    </el-table-column>
 
                     <el-table-column label="操作" fixed="right">
                         <template slot-scope="scope">
@@ -197,17 +203,6 @@
 
             </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
@@ -282,10 +277,10 @@ export default {
                 orderUnCheck: null,
                 orderUnReceive: null,
                 busTypes: [],
-                basicSyncStart:null,
-                orderSyncTime:null,
-                orderSyncStart:null,
-                entrustAction:null,
+                basicSyncStart: null,
+                orderSyncTime: null,
+                orderSyncStart: null,
+                entrustAction: null,
             },
             checkedBusTypes: [],
             busQuery: {
@@ -304,17 +299,17 @@ export default {
                 .then((response) => {
                     if (response.code == 20000) {
                         this.configQuery = response.data;
-                        this.checkedBusTypes = [];
+                        this.checkedBusTypes = this.configQuery.busTypes;
                         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;
-                                    }
-                                }
-                            }
+                            // 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;
+                            //         }
+                            //     }
+                            // }
                         }
                     } else {
                         this.$message.error(response.message);
@@ -327,23 +322,34 @@ 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);
+
+            this.$confirm('是否确认修改?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+                center: true,
+            }).then(() => {
+                if (this.checkedBusTypes != null) {
+                    this.configQuery.busTypes = this.checkedBusTypes;
+                    // for (let i = 0; i < this.checkedBusTypes.length; i++) {
+                    //     this.configQuery.busTypes.push(this.checkedBusTypes);
+                    // }
                 }
-            }
-            updateConfig(this.configQuery)
-                .then((response) => {
-                    this.loading = false;
-                    if (response.code == 20000) {
-                        this.$message.success("更新成功！");
-                        this.getConfig();
-                    }
-                })
-                .catch(() => {
-                    this.loading = false;
-                });
+                updateConfig(this.configQuery)
+                    .then((response) => {
+                        this.loading = false;
+                        if (response.code == 20000) {
+                            this.$message.success("修改成功！");
+                            this.getConfig();
+                        } else {
+                            this.$message.error(response.message);
+                        }
+                    })
+                    .catch(() => {
+                        this.loading = false;
+                    });
+            }).catch(() => {
+            });
         },
 
         handleCheckedChange(val) {
@@ -369,6 +375,7 @@ export default {
         addBusType() {
             var selectData = this.multipleSelection;
             selectData.forEach((obj) => {
+                obj.outChange = false;
                 this.checkedBusTypes.push(obj);
             });
             this.addBusDialogVisible = false;
diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue
index 5e4ba24..f337cdd 100644
--- a/src/views/warehouse/addHosOrder.vue
+++ b/src/views/warehouse/addHosOrder.vue
@@ -554,6 +554,7 @@ export default {
             }
         },
         enterKey(event) {
+            console.log("开始回车");
             this.checkSuccess = true;
             let tQuery = {
                 originCode: this.originCode,
@@ -608,6 +609,7 @@ export default {
             });
         },
         addCode(event) {
+            console.log("开始添加");
             this.originCode = "";
             this.sictomText = "";
             this.formData.corpOrderId = this.formData.corpOrderId.trim();
@@ -1025,7 +1027,12 @@ export default {
                 that.sictomText = that.sictomText + str;
                 that.formData.code = that.sictomText;
             } else {
+
                 that.formData.code = text;
+                console.log(" that.formData.code  = " + that.formData.code);
+                // setTimeout(function(){  that.formData.code = text; }, 3000);
+
+
             }
         };
         inputer.focus();