Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxia...

pan

10 天以前 abd3f4ab0f1331d6e8ae7dcd07ff0c6b7a7b11d8

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue

@@ -24,6 +24,7 @@
              <el-link
                type="primary"
                size="small"
                    v-if="isBatch === 0"
                style="float: right; height: 20px"
                @click="handleOpenPicking"
                >拣选</el-link>
@@ -31,11 +32,13 @@
                type="primary"
                size="small"
                style="float: right; height: 20px; margin-right: 10px"
                  v-if="isBatch === 1"
                @click="handleOpenBatchPicking"
                >分批拣选</el-link>
              <el-link
                type="primary"
                size="small"
                   v-if="isBatch === 0"
                style="float: right; height: 20px; margin-right: 10px"
                @click="outbound"
                >直接出库</el-link
@@ -43,6 +46,7 @@
               <el-link
                type="primary"
                size="small"
                 v-if="isBatch === 1"
                style="float: right; height: 20px; margin-right: 10px"
                @click="outboundbatch"
                >分批出库</el-link
@@ -133,6 +137,7 @@
  data() {
    return {
      row: null,
      isBatch :0,
      showDetialBox: false,
      flag: false,
      currentRow: null,
@@ -196,6 +201,12 @@
          width: 90,
        },
        {
          prop: "overOutQuantity",
          title: "挪料数量",
          type: "string",
          width: 90,
        },
        {
          prop: "unit",
          title: "单位",
          type: "string",
@@ -213,14 +224,8 @@
          title: "指定库存",
          type: "icon",
          width: 90,
          hidden:true,
          icon: "el-icon-s-grid",
        },
        {
          prop: "NoStockOut",
          title: "无库存出库",
          type: "icon",
          width: 100,
          icon: "el-icon-setting",
        },
        {
          prop: "viewDetail",
@@ -306,6 +311,8 @@
    open(row) {
      this.row = row;
      this.showDetialBox = true;
      console.log(this.row);  
      this.isBatch = row.isBatch;
      this.getDictionaryData();
      this.getData();
    },