|
@@ -524,9 +524,9 @@
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
- <el-button @click="dialogVisible = false">取 消</el-button>
|
|
|
- <el-button type="primary" @click="importGoods" v-if="commodityData !== true">导入</el-button>
|
|
|
- <el-button type="primary" @click="importChoice" v-if="commodityData === true" :disabled="tableData.length !== 1">导入</el-button>
|
|
|
+ <el-button @click="dialogVisible = false" :loading="saveLoading">取 消</el-button>
|
|
|
+ <el-button type="primary" @click="importGoods" v-if="commodityData !== true" :loading="saveLoading">导入</el-button>
|
|
|
+ <el-button type="primary" @click="importChoice" v-if="commodityData === true" :loading="saveLoading" :disabled="tableData.length !== 1">导入</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
<el-dialog
|
|
@@ -2360,6 +2360,7 @@ export default {
|
|
|
},
|
|
|
//确认导入触发
|
|
|
async importGoods() {
|
|
|
+ this.saveLoading = true;
|
|
|
if (this.goodsListSave.length > 0) {
|
|
|
this.goodsListSaveHandle()
|
|
|
} else {
|
|
@@ -2433,6 +2434,7 @@ export default {
|
|
|
// this.$refs.crudContact.rowCell(this.goodsListSave[item], this.goodsListSave.length - 1)
|
|
|
})
|
|
|
}
|
|
|
+ this.saveLoading = false;
|
|
|
this.dialogVisible = false
|
|
|
},
|
|
|
tableDataHandle() {
|
|
@@ -2498,6 +2500,7 @@ export default {
|
|
|
// this.$refs.crudContact.rowCell(this.tableData[item], this.tableData.length - 1)
|
|
|
})
|
|
|
}
|
|
|
+ this.saveLoading = false;
|
|
|
this.dialogVisible = false
|
|
|
},
|
|
|
closeGoods() {
|
|
@@ -2600,6 +2603,7 @@ export default {
|
|
|
this.$set(list[item], 'price', list[item].specialOffer)
|
|
|
}
|
|
|
this.$set(list[item], 'inputMold', 1)
|
|
|
+ this.$set(list[item], 'goodType', 0)
|
|
|
} else {
|
|
|
if (!list[item].salePrice) {
|
|
|
getMarketPrice({code: list[item].code, isFreight: this.form.isFreight, isLabel: this.form.isLabel}).then(response => {
|
|
@@ -2957,7 +2961,7 @@ export default {
|
|
|
});
|
|
|
})
|
|
|
} else if (type == '采购') {
|
|
|
- this.$confirm("是否生成采购单?", {
|
|
|
+ this.$confirm(this.form.createPurchase == 1? "已经生成过采购单,是否继续生成?": "是否生成采购单?", {
|
|
|
confirmButtonText: "确定",
|
|
|
cancelButtonText: "取消",
|
|
|
type: "warning"
|