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

guoyuji

2024-06-25 1ba2e84b5f4c76cf24e27a4d6f284aea3ea63233

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

 north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue

@@ -16,18 +16,18 @@
  {column:'height',title:null}
])
const order = ref({
  orderId:'order',
  project:'order',
  orderType:'order',
  customers:'order',
  icon:'order',
  orderClassify:'order',
  packType:'order',
  deliveryDate:'order',
  batch:'order',
  salesman:'order',
  alType:'order',
  money:'order',
  orderId:'order.orderId',
  project:'order.project',
  orderType:'order.orderType',
  customerName:'order.customers',
  icon:'order.icon',
  orderClassify:'order.orderClassify',
  packType:'order.packType',
  deliveryDate:'order.deliveryDate',
  batch:'order.batch',
  salesman:'order.salesman',
  alType:'order.alType',
  money:'order.money',
  contractId:'order',
  customerBatch:'order',
  contacts:'order',
@@ -183,7 +183,7 @@
            <el-select :placeholder="$t('components.orderHeader')">
              <el-option @click="addList(keys,item)"
                         v-for="(item,keys,index) in order"
                         :label="$t(item+'.'+keys)" :value="keys"/>
                         :label="$t(item)" :value="keys"/>

            </el-select>