From fa59021fa614d37e65bc7255f468cf453efeb142 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Fri, 23 Sep 2022 17:58:51 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/UdiInfoManage.vue             |  2 +-
 src/views/userManage/admin/authAdmin.vue      | 25 +++++++++++--------
 .../userManage/param/systemPDFModule.vue      |  5 +++-
 src/views/userManage/phoneRegisterManage.vue  | 14 +++--------
 src/views/warehouse/ioNewOrder.vue            |  6 +++++
 5 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue
index 8992fc5..478ff84 100644
--- a/src/views/basic/UdiInfoManage.vue
+++ b/src/views/basic/UdiInfoManage.vue
@@ -666,7 +666,7 @@
                     </el-col>
                     <el-col :span="3" class="el-col">
                         <el-form-item prop="name">
-                            <el-checkbox :disabled="!checked" v-model="editQuery.disable" class="text item itemTag"
+                            <el-checkbox :disabled="!checked" v-model="editQuery.isDisable" class="text item itemTag"
                                          @change="diableChange"
                             >是否禁用
                             </el-checkbox>
diff --git a/src/views/userManage/admin/authAdmin.vue b/src/views/userManage/admin/authAdmin.vue
index 9605864..5920caa 100644
--- a/src/views/userManage/admin/authAdmin.vue
+++ b/src/views/userManage/admin/authAdmin.vue
@@ -165,10 +165,11 @@
                             <el-radio :label="1">正常</el-radio>
                         </el-radio-group>
                     </el-form-item>
-                    <el-form-item label="角色">
-                        <el-checkbox-group v-model="formData.roles" :disabled="formData.id === 1">
+                    <el-form-item v-if="showRole" label="角色">
+                        <el-checkbox-group v-model="formData.roles">
                             <el-checkbox
                                 v-for="item in roles"
+                                v-model="item.id"
                                 :key="item.id"
                                 :label="item.id"
                             >{{ item.name }}
@@ -343,13 +344,14 @@ export default {
             this.$nextTick(() => {
                 if (this.formName === "add") {
                     this.formData = {
+                        id: null,
                         userName: null,
                         employeeName: null,
                         passWord: null,
                         checkPassword: null,
                         comments: null,
                         userFlag: 1,
-                        roles: null
+                        roles: []
                     };
                 }
                 this.$refs["dataForm"].clearValidate();
@@ -366,8 +368,10 @@ export default {
         handleForm(index, row) {
             this.formVisible = true;
             this.resetForm();
-            this.formData = JSON.parse(JSON.stringify(formJson));
             if (row !== null) {
+                this.index = index;
+                this.formName = "edit";
+                this.formRules = this.editRules;
                 this.formData = {
                     id: row.id,
                     passWord: row.passWord,
@@ -379,13 +383,14 @@ export default {
                     roles: row.roles,
                     dept: row.dept,
                 };
+            } else {
+                this.formName = "add";
+                this.formRules = this.addRules;
+                this.formData.roles = [];
             }
-            this.formName = "add";
-            this.formRules = this.addRules;
-            if (index !== null) {
-                this.index = index;
-                this.formName = "edit";
-                this.formRules = this.editRules;
+
+            if (this.$store.getters.customerId === 110) {
+                this.showRole = true;
             }
         },
         formSubmit() {
diff --git a/src/views/userManage/param/systemPDFModule.vue b/src/views/userManage/param/systemPDFModule.vue
index 7d6b560..0863987 100644
--- a/src/views/userManage/param/systemPDFModule.vue
+++ b/src/views/userManage/param/systemPDFModule.vue
@@ -359,7 +359,10 @@
             title="字段说明"
             :visible.sync="centerDialogVisible"
             width="40%"
-            center>
+            center
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+        >
             <span style="white-space: pre-wrap;">{{ currentRow }}</span>
             <span slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
diff --git a/src/views/userManage/phoneRegisterManage.vue b/src/views/userManage/phoneRegisterManage.vue
index 0463223..77b963d 100644
--- a/src/views/userManage/phoneRegisterManage.vue
+++ b/src/views/userManage/phoneRegisterManage.vue
@@ -33,21 +33,15 @@
             <el-table-column label="序号" type="index"></el-table-column>
             <el-table-column label="企业名称" prop="companyName" width="230"></el-table-column>
             <el-table-column label="IMEI唯一识别码" prop="imei" width="230"></el-table-column>
-            <el-table-column
-                label="登记说明"
-                prop="remark"
-            ></el-table-column>
-
-            <el-table-column
-                label="申请人"
-                prop="applicant"
-            ></el-table-column>
-
+            <el-table-column label="登记说明" prop="remark"></el-table-column>
+            <el-table-column label="申请人" prop="applicant"></el-table-column>
             <el-table-column label="审核状态" prop="isCheck" width="120">
                 <template slot-scope="scope">
                     <span>{{ checkFlag[scope.row.isCheck] }}</span>
                 </template>
             </el-table-column>
+            <el-table-column label="注册时间" prop="date"></el-table-column>
+            <el-table-column label="审核时间" prop="auditTime"></el-table-column>
 
             <el-table-column label="操作" fixed="right">
                 <template slot-scope="scope">
diff --git a/src/views/warehouse/ioNewOrder.vue b/src/views/warehouse/ioNewOrder.vue
index ac22a35..3d7d9c1 100644
--- a/src/views/warehouse/ioNewOrder.vue
+++ b/src/views/warehouse/ioNewOrder.vue
@@ -298,6 +298,12 @@ export default {
             this.curIndex = row.id;
             this.dialogTableVisible = true;
             this.curOrderId = row.orderId;
+            this.unitquery = {
+                key: "",
+                page: 1,
+                limit: 10
+            }
+            this.getUnitList();
         },
         closeDetailDialog(val) {
             this.codeDetailVisible = false;