diff --git a/.env.production b/.env.production index d87d2be2..c7a22f1e 100644 --- a/.env.production +++ b/.env.production @@ -3,7 +3,8 @@ VUE_APP_TITLE = UDI管理系统 # 生产环境配置 ENV = 'production' -VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/' +VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/' # 应用访问路径 例如使用前缀 /admin/ VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/' diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index a00cbf52..f7ff9743 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -571,7 +571,7 @@ export default { /** 删除按钮操作 */ handleDelete(row) { const roleIds = row.roleId || this.ids; - this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项?').then(function () { + this.$modal.confirm('是否确认删除该角色?').then(function () { return delRole(roleIds); }).then(() => { this.getList(); diff --git a/src/views/system/user/authUser.vue b/src/views/system/user/authUser.vue index 4bd5ae9f..8d64df2e 100644 --- a/src/views/system/user/authUser.vue +++ b/src/views/system/user/authUser.vue @@ -137,7 +137,7 @@ <el-row type="flex"> <el-col :span="11" type="flex"> - <el-form-item label="所属部门" prop="userFlag"> + <el-form-item label="所属部门" prop="depts"> <el-select v-model="selectDeptList" filterable @@ -208,7 +208,6 @@ type="primary" size="small" @click.native="formSubmit()" - :loading="formLoading" >提交 </el-button > @@ -308,7 +307,10 @@ export default { ], userFlag: [ {required: true, message: "请选择状态", trigger: "change"} - ] + ], + depts: [ + {required: true, message: "请选择所属部门", trigger: "change"} + ], }, editRules: { userName: [ @@ -416,6 +418,8 @@ export default { dept: row.dept, }; this.selectDeptList = row.depts; + }else { + this.selectDeptList = []; } this.formName = "add"; this.formRules = this.addRules; @@ -439,10 +443,10 @@ export default { this.$message.error("未指定角色!") return; } + this.formData.depts = this.selectDeptList; this.$refs["dataForm"].validate(valid => { if (valid) { this.formLoading = true; - this.formData.depts = this.selectDeptList; let data = Object.assign({}, this.formData); authAdminSave(data, this.formName).then(response => { this.formLoading = false; diff --git a/src/views/thirdSys/inv/index.vue b/src/views/thirdSys/inv/index.vue index 04e5ad10..e974d1ee 100644 --- a/src/views/thirdSys/inv/index.vue +++ b/src/views/thirdSys/inv/index.vue @@ -112,56 +112,56 @@ :limit.sync="query.limit" @pagination="getList" /> - <el-table - :data="subList" - border - highlight-current-row - style="width: 100%;margin-top: 35px"> - <el-table-column type="index" label="序号" width="50"></el-table-column> - <el-table-column - prop="code" - label="分库编码" - > - </el-table-column> - <el-table-column - prop="name" - label="分库名称" - > - </el-table-column> - <el-table-column - prop="parentName" - label="所属仓库" - > - </el-table-column> - <el-table-column label="操作"> - <template slot-scope="scope"> - <el-button - type="text" - size="small" - :disabled="!configParms.basicThirdInv" - @click.native.stop="handleSubForm( scope.row, 'edit')" - >编辑 - </el-button - > - <el-button - type="text" - size="small" - :disabled="!configParms.basicThirdInv" - @click.native.stop="handleSubDel(scope.row)" - >删除 - </el-button - > - </template> +<!-- <el-table--> +<!-- :data="subList"--> +<!-- border--> +<!-- highlight-current-row--> +<!-- style="width: 100%;margin-top: 35px">--> +<!-- <el-table-column type="index" label="序号" width="50"></el-table-column>--> +<!-- <el-table-column--> +<!-- prop="code"--> +<!-- label="分库编码"--> +<!-- >--> +<!-- </el-table-column>--> +<!-- <el-table-column--> +<!-- prop="name"--> +<!-- label="分库名称"--> +<!-- >--> +<!-- </el-table-column>--> +<!-- <el-table-column--> +<!-- prop="parentName"--> +<!-- label="所属仓库"--> +<!-- >--> +<!-- </el-table-column>--> +<!-- <el-table-column label="操作">--> +<!-- <template slot-scope="scope">--> +<!-- <el-button--> +<!-- type="text"--> +<!-- size="small"--> +<!-- :disabled="!configParms.basicThirdInv"--> +<!-- @click.native.stop="handleSubForm( scope.row, 'edit')"--> +<!-- >编辑--> +<!-- </el-button--> +<!-- >--> +<!-- <el-button--> +<!-- type="text"--> +<!-- size="small"--> +<!-- :disabled="!configParms.basicThirdInv"--> +<!-- @click.native.stop="handleSubDel(scope.row)"--> +<!-- >删除--> +<!-- </el-button--> +<!-- >--> +<!-- </template>--> - </el-table-column> - </el-table> - <pagination - v-show="subTotal>0" - :total="subTotal" - :page.sync="subQuery.page" - :limit.sync="subQuery.limit" - @pagination="getSubList" - /> +<!-- </el-table-column>--> +<!-- </el-table>--> +<!-- <pagination--> +<!-- v-show="subTotal>0"--> +<!-- :total="subTotal"--> +<!-- :page.sync="subQuery.page"--> +<!-- :limit.sync="subQuery.limit"--> +<!-- @pagination="getSubList"--> +<!-- />--> </el-card> <!--仓库弹窗编辑页面--> <el-dialog