111392f8ae1f27c4cde93bd7974a5f16c8188188..04be125365bfd254166072f75da87e406f633ba3
2025-01-09 cloudroam
Merge branch 'master' of http://47.96.225.205:8888/r/oper...
04be12 对比 | 目录
2025-01-09 cloudroam
add:发货
bf6b7a 对比 | 目录
已修改2个文件
32 ■■■■ 文件已修改
pages/order/list/_id.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/order/list/index.vue 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/order/list/_id.vue
@@ -413,7 +413,7 @@
            { label: '库区:', id: 'warehouseName', type: 'input' },
            { label: '库位:', id: 'warehouseLocationCode', type: 'input' },
            { label: '特殊需求:', id: 'specialNeedsStr', type: 'input' },
            { label: '快递单号:', id: 'deliveryNo', type: 'input' },
            { label: '快递号:', id: 'deliveryNo', type: 'input' },
            {
              label: '备注:',
              id: 'remarks',
pages/order/list/index.vue
@@ -108,6 +108,7 @@
            ),
            minWidth: 200,
          },
          { label: '快递号', prop: 'deliveryNo', minWidth: 120 },
        ],
        searchFormAttrs: {
          labelWidth: 'auto',
@@ -360,7 +361,7 @@
        ],
        extraButtons: [
          {
            text: '快递单号',
            text: '快递号',
            show: (row) => !row.partnerName && row.statusBackend === 'SEND',
            atClick: (row) => {
              this.$refs.crud.$refs.extraDialog[1].show(row)
@@ -404,6 +405,18 @@
            hiddenReverseItems: [],
            form: [
              {
                label: '物流公司:',
                id: 'logisticsCompanyCode',
                type: 'bus-select-dict',
                readonly: true,
                el: {
                  code: 'LOGISTICS_COMPANY_CODE',
                  style: 'width:100%',
                },
                str: true,
                rules: {required: true, message: '物流公司'},
              },
              {
                label: '快递号:',
                id: 'deliveryNo',
                type: 'text',
@@ -426,9 +439,20 @@
            },
          },
          {
            title: '快递单号录入',
            title: '快递号录入',
            hiddenReverseItems: [],
            form: [
              {
                label: '物流公司:',
                id: 'logisticsCompanyCode',
                type: 'bus-select-dict',
                el: {
                  code: 'LOGISTICS_COMPANY_CODE',
                  style: 'width:100%',
                },
                str: true,
                rules: {required: true, message: '物流公司'},
              },
              {
                label: '快递号:',
                id: 'deliveryNo',
@@ -446,7 +470,7 @@
                { method: 'post', data: val }
              )
              if (code === 0) {
                this.$message.success('快递单号录入成功')
                this.$message.success('快递号录入成功')
              }
            },
          },