Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyuji

2024-05-17 04370d43785cb11a7ccf28d87bb126cf66fb63e1

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

 north-glass-erp/northglass-erp/src/views/mm/mainIngredient/CreateIngredients.vue

@@ -45,7 +45,6 @@

  if(res.code==200){
    titleSelectJson.value=deepClone(res.data)
    console.log(titleSelectJson.value)
  }else{
    ElMessage.warning(res.msg)
  }

 north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/SelectIngredientsStock.vue

@@ -77,7 +77,7 @@


let arr = [
  {type:'expand',fixed:"left",slots: { content:'content' },width: '60'},
  {type:'expand',fixed:"left",width: '60'},
  { type: 'checkbox',fixed:"left", title: '选择', width: '80' },
  { type: 'seq',fixed:"left", title: '自序', width: '80' },
  {field: 'inventoryOrganization', width:'150', title: '库存组织', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged },

 north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue

@@ -13,7 +13,6 @@
const { t } = useI18n()

const userStore = useUserInfoStore()
console.log(userStore.user.permissions)
const username = userStore.user.userName
const userid = userStore.user.userId
let router=useRouter()