bug修改

src/views/basic/BussinessTypeLoclModify.vue

@@ -242,6 +242,19 @@
                         ></el-input>
                     </div>
                 </el-col>
+                <el-col :span="10" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>备注:&nbsp;</span>
+                        </div>
+                        <el-input
+                            style="width: 200px"
+                            size="small"
+                            splaceholder="请输入内容"
+                            v-model="editQuery.remark"
+                        ></el-input>
+                    </div>
+                </el-col>
             </el-row>
             <div slot="footer" class="dialog-footer">
                 <el-button @click.native="hideForm" size="small">取消</el-button>

src/views/basic/BussinessTypeThird.vue

@@ -287,10 +287,25 @@ export default {
         },
 
         onModifySubmit() {
+            if (this.$isBlank(this.inputQuery.name)) {
+                this.$message.error("单据类型名称不能为空！");
+                return;
+            }
             if (this.$isBlank(this.inputQuery.action)) {
                 this.$message.error("单据类型代码不能为空！");
                 return;
             }
+            if (this.$isBlank(this.inputQuery.thirdSys)) {
+                this.$message.error("所属系统不不能为空！");
+                return;
+            }
+            let numRegExp = '^[0-9]*$';
+            let numReg = new RegExp(numRegExp);
+            if (numReg.test(this.inputQuery.name)) {
+                this.$message.error("单据类型名称不得为纯数字类型！");
+                return;
+            }
+
             updateBussinessType(this.inputQuery)
                 .then((response) => {
                     this.loading = false;

src/views/userManage/admin/authAdmin.vue

@@ -19,27 +19,31 @@
                         @click="onReset"
                     ></el-button>
                     <el-button type="primary" icon="search" @click="onSubmit"
-            >查询</el-button
+                    >查询
+                    </el-button
                     >
                     <el-button type="primary" @click.native="handleForm(null, null)"
                                :disabled="!configParms.sysUser"
-            >新增</el-button
+                    >新增
+                    </el-button
                     >
                 </el-button-group>
             </el-form-item>
         </el-form>
         <el-table v-loading="loading" :data="list" style="width: 100%">
-      <el-table-column label="用户账号" prop="userName" fixed> </el-table-column>
+            <el-table-column label="序号" type="index" fixed></el-table-column>
+            <el-table-column label="用户账号" prop="userName" fixed></el-table-column>
             <el-table-column label="用户名称" prop="employeeName" fixed>
             </el-table-column>
             <el-table-column label="状态" fixed="">
                 <template slot-scope="scope">
                     <el-tag :type="scope.row.userFlag | statusFilterType">{{
                             scope.row.userFlag | statusFilterName
-          }}</el-tag>
+                        }}
+                    </el-tag>
                 </template>
             </el-table-column>
-      <el-table-column label="备注" prop="comments" fixed> </el-table-column>
+            <el-table-column label="备注" prop="comments" fixed></el-table-column>
             <el-table-column
                 label="登录时间"
                 with="300"
@@ -137,6 +141,18 @@
                     </el-col>
                 </el-row>
 
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="10" class="el-col" type="flex">
+                        <div class="text item">
+                            <el-form-item label="备注" prop="comments">
+                                <el-input v-model="formData.comments" size="small"></el-input>
+                            </el-form-item>
+                        </div>
+
+
+                    </el-col>
+                </el-row>
+
                 <el-form-item label="状态" prop="userFlag">
                     <el-radio-group v-model="formData.userFlag">
                         <el-radio :label="0">禁用</el-radio>
@@ -149,7 +165,8 @@
                             v-for="item in roles"
                             :key="item.id"
                             :label="item.id"
-              >{{ item.name }}</el-checkbox
+                        >{{ item.name }}
+                        </el-checkbox
                         >
                     </el-checkbox-group>
                 </el-form-item>
@@ -161,7 +178,8 @@
                     size="small"
                     @click.native="formSubmit()"
                     :loading="formLoading"
-          >提交</el-button
+                >提交
+                </el-button
                 >
             </div>
         </el-dialog>
@@ -185,6 +203,7 @@ const formJson = {
     checkPassword: "",
     employeeName: "",
     userFlag: 1,
+    comments: '',
     roles: []
 };
 export default {
@@ -211,7 +230,7 @@ export default {
                 userName: "",
                 userFlag: "",
                 page: 1,
-                limit: 20,
+                limit: 10,
                 roleId: ""
             },
             list: [],
@@ -230,11 +249,11 @@ export default {
             formRules: {},
             addRules: {
                 userName: [
-                    { required: true, message: "请输入姓名", trigger: "blur" }
+                    {required: true, message: "请输入姓名", trigger: "blur"}
                 ],
                 passWord: [
-                    { required: true, message: "请输入密码", trigger: "blur" },
-                    { validator: validatePass, trigger: "blur" }
+                    {required: true, message: "请输入密码", trigger: "blur"},
+                    {validator: validatePass, trigger: "blur"}
                 ],
                 checkPassword: [
                     {
@@ -242,18 +261,18 @@ export default {
                         message: "请再次输入密码",
                         trigger: "blur"
                     },
-                    { validator: validatePass2, trigger: "blur" }
+                    {validator: validatePass2, trigger: "blur"}
                 ],
                 userFlag: [
-                    { required: true, message: "请选择状态", trigger: "change" }
+                    {required: true, message: "请选择状态", trigger: "change"}
                 ]
             },
             editRules: {
                 userName: [
-                    { required: true, message: "请输入姓名", trigger: "blur" }
+                    {required: true, message: "请输入姓名", trigger: "blur"}
                 ],
                 userFlag: [
-                    { required: true, message: "请选择状态", trigger: "change" }
+                    {required: true, message: "请选择状态", trigger: "change"}
                 ]
             },
             deleteLoading: false
@@ -268,7 +287,7 @@ export default {
                 userName: "",
                 userFlag: "",
                 page: 1,
-                limit: 20,
+                limit: 10,
                 roleId: ""
             };
             this.getList();
@@ -330,7 +349,16 @@ export default {
             this.formVisible = true;
             this.formData = JSON.parse(JSON.stringify(formJson));
             if (row !== null) {
-                this.formData = Object.assign({}, row);
+                this.formData = {
+                    id: row.id,
+                    passWord: row.passWord,
+                    userName: row.userName,
+                    checkPassword: "",
+                    employeeName: row.employeeName,
+                    userFlag: 1,
+                    comments: row.comments,
+                    roles: row.roles
+                };
             }
             this.formName = "add";
             this.formRules = this.addRules;
@@ -347,7 +375,7 @@ export default {
             } else if (isBlank(this.formData.passWord)) {
                 this.$message.error("密码不能为空")
                 return;
-            }else if (isBlank(this.formData.employeeName)) {
+            } else if (isBlank(this.formData.employeeName)) {
                 this.$message.error("用户名称不能为空");
                 return;
             } else if (this.formData.roles.length === 0) {
@@ -392,7 +420,7 @@ export default {
                     type: "warning"
                 })
                     .then(() => {
-                        let para = { id: row.id };
+                        let para = {id: row.id};
                         this.deleteLoading = true;
                         authAdminDelete(para)
                             .then(response => {
@@ -443,7 +471,8 @@ export default {
             return statusMap[status];
         }
     },
-    mounted() {},
+    mounted() {
+    },
     created() {
         // 将参数拷贝进查询对象
         let query = this.$route.query;

src/views/userManage/param/phoneRegisterManage.vue

@@ -302,7 +302,7 @@ export default {
                             type: "success",
                             message: "更新成功！",
                         });
-                        this.editDialogVisible = false;
+
                     } else {
                         this.$message.warning("更新失败");
                         this.loading = false;

src/views/userManage/param/systemPDFModule.vue

@@ -490,7 +490,7 @@ export default {
             this.$router.push({
                 path: ""
             });
-            this.query = {
+            this.moduleQuery = {
                 templateType: null,
                 moduleId: null,
                 name: "",

src/views/userManage/param/systemPDFTemplate.vue

@@ -421,6 +421,7 @@ export default {
             });
             this.query = {
                 name: "",
+                module: null,
                 page: 1,
                 limit: 20
             };
@@ -739,19 +740,7 @@ export default {
                             }
                             this.$message.success("操作成功");
                             this.formVisible = false;
-                            // if (this.formName === "add") {
-                            //     // 向头部添加数据
-                            //     if (response.data && response.data.id) {
-                            //         data.id = response.data.id;
-                            //         this.list.unshift(data);
-                            //     }
-                            // } else {
-                            //     this.list.splice(this.index, 1, data);
-                            // }
-                            // // 刷新表单
-                            // this.resetForm();
-                            // this.getList();
-                            // this.getModuleList();
+                            this.getList();
                         })
                         .catch(() => {
                             this.formLoading = false;