From b5b305230a208301beaccb151104d436d07c7fdd Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 12 Jun 2023 15:59:30 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogCreateOrder.vue         |  1 -
 src/views/inout/IoCreateBusOrder.vue          |  2 ++
 src/views/inout/IoCreateOrder.vue             |  5 +++++
 src/views/inout/IoSupSecAuditOrder.vue        |  4 ++++
 src/views/inout/PanelCreateOrderBizDetail.vue |  2 +-
 src/views/userManage/registerManage.vue       | 16 ++++++++++------
 6 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index ceeae63..54294df 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -405,7 +405,6 @@ export default {
     },
 
     initBusType() {
-      debugger
       let query = {
         code: this.orderFormData.invCode,
       };
diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue
index bba95b3..63d7201 100644
--- a/src/views/inout/IoCreateBusOrder.vue
+++ b/src/views/inout/IoCreateBusOrder.vue
@@ -299,6 +299,8 @@ export default {
         "12": "采购计划",
         "13": "领用单据",
         "14": "第三方系统单据",
+        "15": "采购计划转单",
+        "17": "出库转退货单"
       },
       deleteData: {
         billNo: "",
diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue
index dd39b46..82ddace 100644
--- a/src/views/inout/IoCreateOrder.vue
+++ b/src/views/inout/IoCreateOrder.vue
@@ -339,6 +339,7 @@ export default {
       this.$router.push({
         path: "",
       });
+      let invCode = this.filterQuery.invCode
       this.filterQuery = {
         id: "",
         billNo: null,
@@ -351,6 +352,10 @@ export default {
         endTime: null,
         invCode: this.$store.getters.locInvCode,
       };
+      if(invCode!=this.$store.getters.locInvCode){
+        this.getBusType();
+      }
+
       this.actDateRange = [];
       this.getList();
     },
diff --git a/src/views/inout/IoSupSecAuditOrder.vue b/src/views/inout/IoSupSecAuditOrder.vue
index 3ad10ef..7ac8192 100644
--- a/src/views/inout/IoSupSecAuditOrder.vue
+++ b/src/views/inout/IoSupSecAuditOrder.vue
@@ -634,6 +634,7 @@ export default {
       this.$router.push({
         path: "",
       });
+      let invCode = this.filterQuery.invCode
       this.filterQuery = {
         id: "",
         billNo: null,
@@ -646,6 +647,9 @@ export default {
         endTime: null,
         invCode: this.$store.getters.locInvCode,
       };
+      if(invCode!=this.$store.getters.locInvCode){
+        this.getBusType();
+      }
       this.actDateRange = [];
       this.getList();
     },
diff --git a/src/views/inout/PanelCreateOrderBizDetail.vue b/src/views/inout/PanelCreateOrderBizDetail.vue
index 6d60f75..a8df564 100644
--- a/src/views/inout/PanelCreateOrderBizDetail.vue
+++ b/src/views/inout/PanelCreateOrderBizDetail.vue
@@ -88,7 +88,7 @@
       </el-table-column>
       <el-table-column width="100" label="计量单位" prop="measname">
       </el-table-column>
-      <el-table-column width="100" label="订单数量" prop="purCount">
+      <el-table-column width="100" label="订单数量" prop="count">
       </el-table-column>
 
 
diff --git a/src/views/userManage/registerManage.vue b/src/views/userManage/registerManage.vue
index 4afa4f0..0d53bad 100644
--- a/src/views/userManage/registerManage.vue
+++ b/src/views/userManage/registerManage.vue
@@ -248,12 +248,16 @@
 
             <el-col :span="11" type="flex">
                 <el-form-item label="分配角色:"  prop="check">
-                  <el-radio-group v-model="check" @change="handleCheckedChange"  >
-                    <el-radio v-for="item in roles" :key="item.roleId" :label="item.roleId">{{
-                        item.roleName
-                      }}
-                    </el-radio>
-                  </el-radio-group>
+                  <el-select v-model="check"  @change="handleCheckedChange">
+                    <el-option
+                      v-for="item in roles"
+                      :key="item.roleName"
+                      :label="item.roleName"
+                      :value="item.roleId">
+                      <span style="float: left">{{ item.roleName }}</span>
+                    </el-option>
+                  </el-select>
+
                 </el-form-item>
             </el-col>
           </el-row>