Browse Source

完善问题

master
guoxing 10 months ago
parent
commit
6eeb0e5e63
  1. 1
      src/views/purchase/purchaseOrder/purchaseOrderAdd.vue
  2. 23
      src/views/system/menuManage/menuManage.vue
  3. 2
      src/views/system/userManage/userManageList.vue

1
src/views/purchase/purchaseOrder/purchaseOrderAdd.vue

@ -799,6 +799,7 @@
this.formobj.purchaseBillDetailList.push({ this.formobj.purchaseBillDetailList.push({
"sid": value[i].sid != null ? value[i].sid : '', "sid": value[i].sid != null ? value[i].sid : '',
"goodsSkuSid": value[i].sid != null ? value[i].sid : '',
"goodsSkuCode": value[i].goodsSkuCode != null ? value[i].goodsSkuCode : '', "goodsSkuCode": value[i].goodsSkuCode != null ? value[i].goodsSkuCode : '',
"goodsSkuTitle": value[i].goodsName != null ? value[i].goodsName : '', "goodsSkuTitle": value[i].goodsName != null ? value[i].goodsName : '',
"goodsSN": value[i].barCode != null ? value[i].barCode : '', "goodsSN": value[i].barCode != null ? value[i].barCode : '',

23
src/views/system/menuManage/menuManage.vue

@ -142,12 +142,6 @@
<el-input v-model="form.pageName" /> <el-input v-model="form.pageName" />
</td> </td>
</tr> </tr>
<tr v-show="editMenuType=='2'">
<td>按钮Key</td>
<td>
<el-input v-model="form.btnKey" style="width:300px" />
</td>
</tr>
<tr v-show="editMenuType=='2'"> <tr v-show="editMenuType=='2'">
<td>权限标识</td> <td>权限标识</td>
<td> <td>
@ -264,12 +258,6 @@
<el-input v-model="form.pageName" style="width:300px" /> <el-input v-model="form.pageName" style="width:300px" />
</td> </td>
</tr> </tr>
<tr v-show="addMenuType=='2'">
<td>按钮Key</td>
<td>
<el-input v-model="form.btnKey" style="width:300px" />
</td>
</tr>
<tr v-show="addMenuType=='2'"> <tr v-show="addMenuType=='2'">
<td>权限标识</td> <td>权限标识</td>
<td> <td>
@ -348,7 +336,6 @@
remarks: '', remarks: '',
sortNo: 0, sortNo: 0,
cid: '', cid: '',
btnKey: "",
sourceName: 'wms', sourceName: 'wms',
phoneFunction: "0", phoneFunction: "0",
sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa44' sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa44'
@ -427,16 +414,10 @@
menuTypeChangeRadio(val) { menuTypeChangeRadio(val) {
console.log('menuTypeChangeRadio', val) console.log('menuTypeChangeRadio', val)
if (val != '2') {
this.form.btnKey = ""
}
this.form.menuType = val this.form.menuType = val
}, },
menuTypeChangeRadio2(val) { menuTypeChangeRadio2(val) {
console.log('menuTypeChangeRadio2', val) console.log('menuTypeChangeRadio2', val)
if (val != '2') {
this.form.btnKey = ""
}
this.form.menuType = val this.form.menuType = val
}, },
changeRadio(val) { changeRadio(val) {
@ -553,9 +534,9 @@
if (this.form.menuType == '2') { if (this.form.menuType == '2') {
if (this.form.btnKey == '') { if (this.form.cid == '') {
this.$message({ this.$message({
message: '按钮Key不能为空', message: '权限标识不能为空',
type: 'warning' type: 'warning'
}) })
return return

2
src/views/system/userManage/userManageList.vue

@ -434,7 +434,7 @@
this.roleForm.roleSid = [] this.roleForm.roleSid = []
this.roleDialog = true this.roleDialog = true
this.roleForm.sid = row.sid this.roleForm.sid = row.sid
this.roleForm.userSid = row.sid this.roleForm.userSid = window.sessionStorage.getItem('userSid')
this.roleForm.orgsid = window.sessionStorage.getItem('orgSid') this.roleForm.orgsid = window.sessionStorage.getItem('orgSid')
setRole(this.roleForm).then(res => { setRole(this.roleForm).then(res => {
this.roleList = res.data this.roleList = res.data

Loading…
Cancel
Save