rev:发货单、调拨单EXCEL修改；返检出库删除包装关系BUG修改

lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue

@@ -84,6 +84,24 @@
       <el-form-item label="业务日期" prop="biz_date">
         <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="true" />
       </el-form-item>
+      <el-form-item label="移入仓库" prop="out_stor_id" v-if="form.bill_type === '1004'">
+        <label slot="label">移入仓库:</label>
+        <el-select
+          v-model="form.out_stor_id"
+          clearable
+          placeholder="仓库"
+          class="filter-item"
+          style="width: 210px"
+          :disabled="true"
+        >
+          <el-option
+            v-for="item in storlist"
+            :key="item.stor_id"
+            :label="item.stor_name"
+            :value="item.stor_id"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="备注" prop="remark">
         <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
         <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="true" />

lms/nladmin-ui/src/views/wms/stat/outbillquery/index.vue

@@ -104,6 +104,7 @@
         style="width: 100%;"
       >
         <el-table-column show-overflow-tooltip prop="stor_name" label="仓库" :min-width="flexWidth('stor_name',crud.data,'仓库')" />
+        <el-table-column v-if="query.bill_type === '1004'" show-overflow-tooltip prop="in_stor_name" label="移入仓库" :min-width="flexWidth('in_stor_name',crud.data,'仓库')" />
         <el-table-column show-overflow-tooltip prop="sect_name" label="库区" :min-width="flexWidth('sect_name',crud.data,'库区')" />
         <el-table-column show-overflow-tooltip prop="bill_type" :formatter="bill_typeFormat" label="业务类型" :min-width="flexWidth('bill_type',crud.data,'业务类型')" />
         <el-table-column show-overflow-tooltip prop="vbeln" label="交货单号" :min-width="flexWidth('vbeln',crud.data,'交货单号')" />