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

chenlu

2024-08-01 654e9abc341299694c82a40b8a77416003ad85f5

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

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

@@ -64,6 +64,10 @@
        false:'No',
        computedSize:'Scientific counting',
        paste:'Paste',

        selected:'selected',
        partiallySelected:'partially selected',
        unchecked :'unchecked',
        msg:{
            max255:"The value contains a maximum of 255 characters",
            range99999Dec2:

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

@@ -64,6 +64,10 @@
        false:'否',
        computedSize:'科学计数',
        paste:'粘贴',

        selected:'选中',
        partiallySelected:'部分选中',
        unchecked :'未选中',
        msg:{
            max255:"最多输入255个字符",
            range99999Dec2:

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

@@ -125,6 +125,7 @@
      {field: 'orderType',width:120,  title: t('order.orderType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
      {field: 'salesman',width:120,  title: t('order.salesman'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
      {field: 'creator',width:120,  title: t('product.creator'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
      {field: 'verifier',width:120,  title: t('basicData.review'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
      {field: 'perimeter',width:120,  title: t('searchOrder.perimeter'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
      {field: 'deliveryDate',width:120,  title: t('order.deliveryDate'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
      {field: 'customerBatch',width:120,  title: t('order.customerBatch'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
@@ -543,10 +544,10 @@
        <template #num2_filter="{ column, $panel }">
          <div>
            <div v-for="(option, index) in column.filters" :key="index">
              <vxe-select v-model="option.data"  @change="changeFilterEvent($event, option, $panel)">
                <vxe-option value="0" label="未选中"></vxe-option>
                <vxe-option value="1" label="部分选中"></vxe-option>
                <vxe-option value="2" label="选中"></vxe-option>
              <vxe-select v-model="option.data"  @change="changeFilterEvent($event, option, $panel)" :placeholder="$t('processCard.pleaseSelect')">
                <vxe-option value="0" :label="$t('basicData.unchecked')"></vxe-option>
                <vxe-option value="1" :label="$t('basicData.partiallySelected')"></vxe-option>
                <vxe-option value="2" :label="$t('basicData.selected')"></vxe-option>
              </vxe-select>
            </div>
          </div>

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

@@ -367,8 +367,8 @@
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <vxe-select v-model="option.data" :placeholder="$t('processCard.pleaseSelect')"  @change="changeFilterEvent($event, option, $panel)">
              <vxe-option value="0" label="未选中"></vxe-option>
              <vxe-option value="1" label="选中"></vxe-option>
              <vxe-option value="0" :label="$t('basicData.unchecked')"></vxe-option>
              <vxe-option value="1" :label="$t('basicData.selected')"></vxe-option>
            </vxe-select>
          </div>
        </div>

 north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml

@@ -25,12 +25,11 @@

    <select id="selectMaxOrderIdByMonth">
        select
            ifnull(SUBSTR(order_id from 7),0)
            ifnull(SUBSTR(max(order_id) from 7),0)
        from
            `order` as a
        where
            date(a.create_time)  BETWEEN DATE_FORMAT(DATE(NOW()), '%Y-%m-01') AND DATE(NOW())
        order by id desc     limit  1
    </select>