Merge remote-tracking branch 'origin/master'

guoyuji

2023-12-25 1d9c769dbe1ad106289c98fd19b3fbc018ccdd9c

Merge remote-tracking branch 'origin/master'

 north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Create.vue

@@ -72,22 +72,6 @@

          </el-form-item>
        </el-col>
<!--        <el-col :span="6">
          <el-form-item class="item-style">
            <el-row :gutter="10">

              <el-col :span="6" :offset="6">
                <el-button type="primary" @click="onSubmit">保存</el-button>
              </el-col>
              <el-col :span="6" :offset="6">
                <el-button>返回订单查询</el-button>
              </el-col>


            </el-row>

          </el-form-item>
        </el-col>-->
        <el-col :span="6"></el-col>

      </el-row>
@@ -225,12 +209,12 @@
        'name': '退货',
        status:'primary',
        'code':'Return'
      },
      }/*,
      {
        'name': '返回查询',

        'code':'GoSelect'
      }],
      }*/],
    import: false,
    export: true,
    print: true,

 north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/PurchaseOrder.vue

@@ -6,15 +6,15 @@
<!--          <el-breadcrumb-item>采购与物资</el-breadcrumb-item>
          <el-breadcrumb-item>采购订单
          </el-breadcrumb-item>-->
          <el-breadcrumb-item :to="{path:'/main/purchaseOrder/SelectPurchaseOrder'}">查询订单
          <el-breadcrumb-item :to="{path:'/main/purchaseOrder/SelectPurchaseOrder'}">查询采购订单
          </el-breadcrumb-item>
          <el-breadcrumb-item :to="{path:'/main/purchaseOrder/CreatePurchaseOrder'}">创建订单
          <el-breadcrumb-item :to="{path:'/main/purchaseOrder/CreatePurchaseOrder'}">创建采购订单
          </el-breadcrumb-item>
          <el-breadcrumb-item :to="{path:'/main/purchaseOrder/StoragePurchaseOrder'}">订单入库
          <el-breadcrumb-item :to="{path:'/main/purchaseOrder/StoragePurchaseOrder'}">采购入库
          </el-breadcrumb-item>
          <el-breadcrumb-item :to="{path:'/main/purchaseOrder/ReturnPurchaseOrder'}">订单退货
          <el-breadcrumb-item :to="{path:'/main/purchaseOrder/ReturnPurchaseOrder'}">采购退货
          </el-breadcrumb-item>
          <el-breadcrumb-item :to="{path:'/main/purchaseOrder/PaymentPurchaseOrder'}">应付订单
          <el-breadcrumb-item :to="{path:'/main/purchaseOrder/PaymentPurchaseOrder'}">应付采购订单
          </el-breadcrumb-item>
          <el-breadcrumb-item style="display: none"></el-breadcrumb-item>
        </el-breadcrumb>

 north-glass-erp/northglass-erp/src/views/mm/purchaseOrder/Select.vue

@@ -269,7 +269,8 @@
    {field: '6', width: '10%',title: '备注', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true}
  ],//表头参数
  toolbarConfig: {
    buttons: [{type:'text'},{
    buttons: [/*{type:'text'},
      {
      'name': '创建订单',

      'code':'Add',
@@ -279,7 +280,8 @@
        'name': '无单新增',

        'code':'AddNo'
      }],
      }*/
      ],
    import: false,
    export: true,
    print: true,