UDI
/
udi-spms-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

Browse Source
ywj_dev
wangwei 3 years ago
parent 06e75285fd
commit 49e159b946
7 changed files with 53 additions and 43 deletions
Show Stats Download Patch File Download Diff File

4
src/views/inout/DialogCheck.vue
Unescape Escape View File

@ -117,7 +117,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="code"> <el-form-item prop="code">
<el-input v-model="inputQuery.reCount" auto-complete="off" :disabled="true"></el-input> <el-input v-model="inputQuery.scanCount" auto-complete="off" :disabled="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -299,6 +299,8 @@ export default {
// //
// }, // },
uploadHandleRemove(file, fileList) { uploadHandleRemove(file, fileList) {
this.inputQuery.filePath=null;
this.inputQuery.checkFileName=null;
console.log(file, fileList); console.log(file, fileList);
}, },
uploadHandlePreview(file) { uploadHandlePreview(file) {

15
src/views/inout/InvoiceRegistration.vue
Unescape Escape View File

@ -273,6 +273,7 @@
</el-tabs> </el-tabs>
<el-tabs type="border-card" style="margin: 15px"> <el-tabs type="border-card" style="margin: 15px">
<!--单据业务详情--> <!--单据业务详情-->
<el-tab-pane> <el-tab-pane>
@ -439,6 +440,8 @@ import {previewImage} from '@/api/purchase/supCompany'
import ElImageViewer from "element-ui/packages/image/src/image-viewer"; import ElImageViewer from "element-ui/packages/image/src/image-viewer";
const formJson = { const formJson = {
site_id: "", site_id: "",
site_name: "", site_name: "",
@ -528,7 +531,7 @@ export default {
billNo: "" billNo: ""
}, },
actDateRange: [], actDateRange: [],
auditDateRange: [], auditDateRange:[],
pickerOptions: { pickerOptions: {
shortcuts: [ shortcuts: [
{ {
@ -926,9 +929,13 @@ export default {
this.bizTotal = 0; this.bizTotal = 0;
}) })
}, },
BizDetail(row) {
this.bizQuery.page = 1; BizDetail(val){
this.getBizDetailList(row); debugger
this.bizQuery.page=1;
this.bizQuery.productName=val.coName;
this.bizQuery.batchNo=val.batchNo;
this.getBizDetailList();
}, },

16
src/views/inout/IoDeliveryAuditOrder.vue
Unescape Escape View File

@ -142,16 +142,16 @@
<el-table-column label="送货单位" prop="fromName" width="220"> <el-table-column label="送货单位" prop="fromName" width="220">
</el-table-column> </el-table-column>
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150"> <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150">
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
<i class="el-icon-time"></i> <!-- <i class="el-icon-time"></i>-->
<span>{{ scope.row.createTime }}</span> <!-- <span>{{ scope.row.createTime }}</span>-->
</template> <!--</template>-->
</el-table-column> </el-table-column>
<el-table-column label="审核时间" prop="auditTime" show-overflow-tooltip width="150"> <el-table-column label="审核时间" prop="auditTime" show-overflow-tooltip width="150">
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
<i class="el-icon-time"></i> <!-- <i class="el-icon-time"></i>-->
<span>{{ scope.row.createTime }}</span> <!-- <span>{{ scope.row.createTime }}</span>-->
</template> <!--</template>-->
</el-table-column> </el-table-column>
<el-table-column label="采购部门" prop="deptName" width="120"> <el-table-column label="采购部门" prop="deptName" width="120">

8
src/views/inout/IoSupSearchOrder.vue
Unescape Escape View File

@ -96,12 +96,6 @@
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group> <el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
<el-button
type="primary"
icon="el-icon-refresh"
@click="onReset"
>发票登记
</el-button>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
@ -568,6 +562,8 @@ export default {
endTime: null, endTime: null,
invCode: this.$store.getters.locInvCode, invCode: this.$store.getters.locInvCode,
}; };
this.actDateRange=[];
this.auditDateRange=[];
this.getList(); this.getList();
}, },
onSubmit() { onSubmit() {

48
src/views/system/role/index.vue
Unescape Escape View File

@ -28,7 +28,7 @@
<el-button-group> <el-button-group>
<el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button> <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd(0)">新增</el-button>
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
@ -133,7 +133,7 @@
<el-button-group> <el-button-group>
<el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button> <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd(1)">新增</el-button>
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
@ -235,21 +235,17 @@
<el-input-number v-model="form.roleSort" controls-position="right" :min="0"/> <el-input-number v-model="form.roleSort" controls-position="right" :min="0"/>
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status" >
<el-radio <el-radio label="0" >正常</el-radio>
v-for="dict in dict.type.sys_normal_disable" <el-radio label="1" >禁用</el-radio>
:key="dict.value"
:label="dict.value"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="供应商角色" prop="isCustomer">
<el-radio-group v-model="form.isCustomer">
<el-radio :label="0">否</el-radio>
<el-radio :label="1">是</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<!--<el-form-item label="供应商角色" prop="isCustomer">-->
<!-- <el-radio-group v-model="form.isCustomer">-->
<!-- <el-radio :label="0">否</el-radio>-->
<!-- <el-radio :label="1">是</el-radio>-->
<!-- </el-radio-group>-->
<!--</el-form-item>-->
<el-form-item label="菜单权限"> <el-form-item label="菜单权限">
<el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox> <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
<el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选 <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选
@ -341,6 +337,7 @@ export default {
dicts: ['sys_normal_disable'], dicts: ['sys_normal_disable'],
data() { data() {
return { return {
userStatus:null,
// 遮罩层 // 遮罩层
loading: true, loading: true,
Adminloading:true, Adminloading:true,
@ -621,7 +618,8 @@ export default {
} }
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd(val) {
this.userStatus=val;
this.reset(); this.reset();
this.getMenuTreeselect(); this.getMenuTreeselect();
this.open = true; this.open = true;
@ -676,12 +674,17 @@ export default {
this.$router.push("/system/role-auth/user/" + roleId); this.$router.push("/system/role-auth/user/" + roleId);
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function () { submitForm: function (val) {
if(this.form.isCustomer == null){ // if(this.form.isCustomer == null){
this.$message("请选择供应商角色") // this.$message("请选择供应商角色")
return // return
// }
debugger
if(this.userStatus == 0){
this.form.isCustomer=0;
}else{
this.form.isCustomer=1;
} }
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if (this.form.roleId != undefined) { if (this.form.roleId != undefined) {
@ -690,6 +693,7 @@ export default {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
this.getCustomerList();
}); });
} else { } else {
this.form.menuIds = this.getMenuAllCheckedKeys(); this.form.menuIds = this.getMenuAllCheckedKeys();
@ -697,6 +701,7 @@ export default {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
this.getCustomerList();
}); });
} }
} }
@ -720,6 +725,7 @@ export default {
return delRole(roleIds); return delRole(roleIds);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.getCustomerList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}).catch(() => { }).catch(() => {
}); });

3
src/views/system/user/authUser.vue
Unescape Escape View File

@ -167,7 +167,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11" type="flex"> <el-col :span="11" type="flex">
<el-form-item label="所属仓库" prop="depts"> <el-form-item label="所属仓库" prop="warehouse">
<el-select <el-select
v-model="formData.warehouseName" v-model="formData.warehouseName"
filterable filterable
@ -190,7 +190,6 @@
}}</span> }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>

Write Preview
Loading…
Cancel
Save