|
|
@@ -93,7 +93,7 @@
|
|
|
<el-button
|
|
|
v-if="reservoirArea == 1"
|
|
|
:size="size"
|
|
|
- :disabled="!row.id || form.statusName == '已入库' || isEdit || isEdits"
|
|
|
+ :disabled="!row.id"
|
|
|
type="text"
|
|
|
@click="rowArea(row, index)"
|
|
|
>
|
|
|
@@ -143,6 +143,9 @@
|
|
|
<el-button v-if="reservoirArea == 1" type="success" size="small" @click="allClick('导入库区')" :disabled="disabled || isEdit"
|
|
|
>导入库区</el-button
|
|
|
>
|
|
|
+ <el-button v-if="reservoirArea == 1" type="success" size="small" @click="allClick('一键清空库区')" :disabled="disabled || isEdit"
|
|
|
+ >一键清空库区</el-button
|
|
|
+ >
|
|
|
</template>
|
|
|
</avue-crud>
|
|
|
</el-tab-pane>
|
|
|
@@ -970,7 +973,7 @@ export default {
|
|
|
row.historyList.push({
|
|
|
reservoirAreaId: this.fixForm.reservoirAreaId,
|
|
|
reservoirAreaName: this.fixForm.reservoirAreaName,
|
|
|
- balanceQuantity:this.fixForm.balanceQuantity,
|
|
|
+ balanceQuantity: this.fixForm.balanceQuantity,
|
|
|
quantity: row.goodsNum
|
|
|
});
|
|
|
row.sendNum = row.goodsNum;
|
|
|
@@ -981,9 +984,17 @@ export default {
|
|
|
});
|
|
|
}
|
|
|
if (name == "导入库区") {
|
|
|
+ for (let item of this.form.shipItemsList) {
|
|
|
+ if (item.historyList.length) {
|
|
|
+ return this.$message.error("请清空库区");
|
|
|
+ }
|
|
|
+ }
|
|
|
this.findObject(this.excelOption2.column, "excelFile").action = "/api/blade-sales-part/ship/importReservoirArea?id=" + this.form.id;
|
|
|
this.excelBox2 = true;
|
|
|
}
|
|
|
+ if (name == "一键清空库区") {
|
|
|
+
|
|
|
+ }
|
|
|
},
|
|
|
dicChange(name, row) {
|
|
|
if (name == "reservoirAreaName") {
|
|
|
@@ -1166,7 +1177,7 @@ export default {
|
|
|
if (valid) {
|
|
|
if (this.reservoirArea == 1) {
|
|
|
for (let item of this.form.shipItemsList) {
|
|
|
- if (!item.historyList.length) {
|
|
|
+ if (item.historyList.length == 0) {
|
|
|
return this.$message.error("请选择库区");
|
|
|
}
|
|
|
}
|