新增发货主页审核跟出库状态筛选

廖井涛

2024-11-05 ab6e2f8fb15bf4ddb8e940ab6b979c111130df4d

新增发货主页审核跟出库状态筛选

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

@@ -96,7 +96,6 @@
request.post(`/delivery/getSelectShippingOrder/1/${total.pageSize}/${orderInfo.selectDeliveryDate}`,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

@@ -137,7 +136,6 @@
  request.post(`/delivery/getSelectShippingOrder/1/${total.pageSize}/${orderInfo.selectDeliveryDate}`,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
@@ -278,8 +276,8 @@
    {title: t('basicData.operate'), width: 150, slots: { default: 'button_slot' },fixed:"left"},
    {type: 'seq', title: t('basicData.Number'), width: 80},

    {field: 'deliveryState',title: t('basicData.review'), width: 40, slots: { default: 'state' }},
    {field: 'stockState',title: t('productStock.outbound'), width: 40, slots: { default: 'state' }},
    {field: 'deliveryState',title: t('basicData.review'), width: 40,filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
    {field: 'stockState',title: t('productStock.outbound'), width: 40, filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},

    {field: 'deliveryId',width:120,  title: t('delivery.deliveryNoteId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'creator',width:120,  title: t('delivery.shipper'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -419,6 +417,21 @@
          </div>
        </template>

        <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)"
                  :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>
        </template>

        <template #pager>
          <!--使用 pager 插槽-->
          <vxe-pager

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

@@ -300,6 +300,12 @@
            <if test="delivery.area != null and delivery.area != ''">
                and d.area regexp REGEXP_REPLACE(#{delivery.area},'\\.0+$','')
            </if>
            <if test="delivery.deliveryState != null ">
                and d.delivery_state = #{delivery.deliveryState}
            </if>
            <if test="delivery.stockState != null ">
                and d.stock_state = #{delivery.stockState}
            </if>

            </where>
        group by d.delivery_id
@@ -344,6 +350,12 @@
            <if test="delivery.area != null and delivery.area != ''">
                and d.area regexp REGEXP_REPLACE(#{delivery.area},'\\.0+$','')
            </if>
            <if test="delivery.deliveryState != null ">
                and d.delivery_state = #{delivery.deliveryState}
            </if>
            <if test="delivery.stockState != null ">
                and d.stock_state = #{delivery.stockState}
            </if>
        </where>
        limit #{offset},#{pageSize};
</select>