Merge remote-tracking branch 'origin/master'

guoyuji

2023-12-25 1d9c769dbe1ad106289c98fd19b3fbc018ccdd9c

 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,