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

chenlu

2024-06-27 4228413fb94652826d623f991775d78e3cf0eb29

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

 north-glass-erp/northglass-erp/src/hook/index.js

@@ -12,7 +12,6 @@

        if(column.field.indexOf('.')>-1){
            let  array = column.field.split('.')
            console.log(row[array[0]][array[1]])
            if (row[array[0]][array[1]]==null){
                return ''.indexOf(option.data) > -1
            }else {

 north-glass-erp/northglass-erp/src/lang/ru.js

@@ -91,6 +91,8 @@
        typeName:'Категория',
        query:'Быстрый запрос',
        creator:'Создатель',

        usingAbbreviations:'Использование сокращений',
        msg:{
            productLength:'Пожалуйста, добавьте подробную информацию о продукте',
            lastGlass:'Последней деталью продукта является не стекло. Пожалуйста, закончите.',

 north-glass-erp/northglass-erp/src/lang/zh.js

@@ -91,6 +91,8 @@
        typeName:'所属类别',
        query:'快速查询',
        creator:'创建人',

        usingAbbreviations:'使用简称',
       msg:{
           productLength:'请添加产品详情',
           lastGlass:'产品详情最后一条不是玻璃，请完善',

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

@@ -504,7 +504,6 @@
          filters:[{ data: '' }],
          slots: { filter: 'num1_filter' },
          filterMethod:filterChanged}
        console.log(column)
        gridOption.columns.push(column)

      }

 north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue

@@ -135,13 +135,11 @@

const emit =  defineEmits(['gaveParent'])
const saveBasicData =  () =>{
  console.log(basic.value.basicType[1])
  if(basic.value.basicType[1]==="hollowThickness"||basic.value.basicType[1]==="stuffThickness"||basic.value.basicType[1]==="InterlayerThickness"){
    if(!basic.value.input.includes("mm")){
      basic.value.input=basic.value.input+"mm"
    }
  }
  console.log(basic.value.input)
  request.post(`/basicData/addBasicData`, basic.value).then(res => {
    if (res.data) {
      ElMessage.success(t('basicData.msg.saveSuccess'))

 north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue

@@ -233,12 +233,20 @@
}

const handleChange = () => {
  console.log(basic.value.basicType[1])
  request.get(`/basicData/BasicDataByType/${basic.value.basicType[0]}/${basic.value.basicType[1]}`).then(res => {
    if(res.code==='200'){
      xGrid.value.reloadData(res.data)
    }
  })
  if(basic.value.basicType==null){
    request.get('/basicData/getBasicData').then(res => {
      if(res.code==='200'){
        xGrid.value.reloadData(res.data)
      }
    })
  }else{
    request.get(`/basicData/BasicDataByType/${basic.value.basicType[0]}/${basic.value.basicType[1]}`).then(res => {
      if(res.code==='200'){
        xGrid.value.reloadData(res.data)
      }
    })
  }


}


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

@@ -35,7 +35,6 @@
  const str = route.query.id
  if (typeof str != 'undefined' && str != null && str !== '' && str !== '\n' && str !== '\r'){
    ruleForm.value.id = Number(str)
    console.log(ruleForm.value)
    request.post(`/customer/getSelectCustomer/1/100`,ruleForm.value).then((res) => {
      if(res.code==200){
        console.log(res.data.data[0])
@@ -70,7 +69,7 @@
    ElMessage.error(t('customer.pleaseEnterTheAmountOfFunds'))
    return
  }*/
  const address = ruleForm.value.address
  /*const address = ruleForm.value.address
  if(address === null || address === undefined || address === ''){
    ElMessage.error(t('customer.pleaseEnterTheContactAddress'))
    return
@@ -84,12 +83,11 @@
  if(phone === null || phone === undefined || phone === ''){
    ElMessage.error(t('customer.pleaseEnterTheContactPhoneNumber'))
    return
  }
  }*/

  let flowData = ref({
    customer: ruleForm
  })
  console.log()
  request.post("/customer/insertCustomer", flowData.value).then((res) => {
    if(res.code==200 && res.data===true){
      resetForm()

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

@@ -1,10 +1,12 @@
<script setup>
import {ArrowLeftBold, ArrowRight, Search} from "@element-plus/icons-vue"
import {useRouter} from "vue-router";
import {useRoute, useRouter} from "vue-router";
import { useI18n } from 'vue-i18n'

//语言获取
const { t } = useI18n()
const router = useRouter()
const route = useRoute()
let indexFlag=$ref(1)
function changeRouter(index){
  indexFlag=index

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

@@ -91,7 +91,6 @@
request.post(`/customer/getSelectCustomer/1/${total.pageSize}`,filterData.value).then((res) => {

  if(res.code==200){
    console.log(res.data.data)
    total.dataTotal = res.data.total.total*1
    total.pageTotal= res.data.total.pageTotal
    pageNum.value=1

 north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue

@@ -34,7 +34,6 @@

const hasDecimalhtml=(item,row)=>{
  let aa=item.split('.').length
  console.log(item)
  if (aa===2){

    return row[item.split('.')[0]][item.split('.')[1]]

 north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue

@@ -195,7 +195,6 @@
            ElMessage.warning(t('searchOrder.msgList.checkOrder'))
            return
          }
          console.log(rowClickIndex.value.deliveryId)
          dialogTableVisible.value = true
          sheetIndex.value=1
          break

 north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue

@@ -604,19 +604,23 @@
  }
}
//获取子页面产品方法
const getProductRow = (row) => {
const getProductRow = (row,type) => {
  if(row.state!=1){
    ElMessage.warning(t('order.msg.productStateCheck'))
    return
  }

  rowIndex.productName = row.productName
  if(type==1){
    rowIndex.productName = row.productName
  }else{
    rowIndex.productName = row.productAbbreviation
  }
  rowIndex.productId = row.id
  productVisible.value = false
}




//初始化判断是否有id传入
onMounted(()=>{
  //启用表格拖动选中

 north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue

@@ -327,7 +327,6 @@
  }
  request.post(`/order/getOrderCraftById/${str}`).then((res) => {
    if(res.code==200){
      console.log(res.data)
      titleUploadData.value = res.data.order

      //取消审核按钮禁用

 north-glass-erp/northglass-erp/src/views/sd/product/CreateProduct.vue

@@ -107,7 +107,6 @@
})

const saveProduct = () => {
  console.log(productGlassTypeStore.GlassType);
  if(productDetailList.value.length===0){
    ElMessage.warning(t('product.msg.productLength'))
    return
@@ -697,7 +696,7 @@
              <el-input v-model="productTotal.remarks"  size="small"   />
            </div>
          </el-col>
          <el-col :span="8">
          <el-col :span="12">
            <div class="grid-content ep-bg-purple" >
              <el-text class="mx-1"
                       style="margin-left: 0.5rem;text-align: center">
@@ -725,7 +724,7 @@
          </el-col>
          <el-col :span="20">
            <div class="grid-content ep-bg-purple" >
              <el-input :value="productName" size="large"   />
              <el-input :value="productName" size="large" disabled  />
            </div>
          </el-col>
        </el-row>

 north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue

@@ -208,7 +208,7 @@
  },
  columns:[
    {type:'expand',fixed:"left",slots: { content:'content' },width: 60},
    {title: t('basicData.operate'), width: 110, slots: { default: 'button_slot' },fixed:"left"},
    {title: t('basicData.operate'), width: 120, slots: { default: 'button_slot' },fixed:"left"},
    {field:'state',title: t('basicData.review'), width: 40, slots: { default: 'state' }},
    {type: 'seq',fixed:"left", title: t('basicData.Number'), width: 80 },
    {field: 'id', title: t('basicData.number'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: false},
@@ -280,9 +280,10 @@
    'getProductRow'
])

const emitParent = (row) => {
  emit('getProductRow', row)
const emitParent = (row,type) => {
    emit('getProductRow', row,type)
}



/*后端返回结果多层嵌套展示*/
@@ -356,7 +357,8 @@
        </el-popconfirm>
      </template>
      <template #button_slot="{ row }" v-else>
        <el-button @click="emitParent(row)" link type="primary" size="small">{{ $t('basicData.add') }}</el-button>
        <el-button @click="emitParent(row,1)" link type="primary" size="small">{{ $t('basicData.add') }}</el-button>
        <el-button @click="emitParent(row,2)" link type="primary" size="small">{{ $t('product.usingAbbreviations') }}</el-button>
      </template>

      <template #num1_filter="{ column, $panel }">

 north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserController.java

@@ -30,7 +30,6 @@

    @GetMapping
    public List<User> getUser(){
        System.out.println(cacheUtil.getCacheData("admin"));
        return userMapper.findAll();
    }
    @ApiOperation("登录")