1.修复部分bug

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>

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-form-item v-if="showRole" label="角色">
-                        <el-checkbox-group v-model="formData.roles" :disabled="formData.id === 1">
+                        <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 (this.$store.getters.customerId === 110) {
-            if (index !== null) {
+                this.showRole = true;
-                this.index = index;
-                this.formName = "edit";
-                this.formRules = this.editRules;
             }
         },
         formSubmit() {

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>

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
+            <el-table-column label="登记说明" prop="remark"></el-table-column>
-                label="登记说明"
+            <el-table-column label="申请人" prop="applicant"></el-table-column>
-                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">

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;