|
|
@@ -39,17 +39,12 @@
|
|
|
)
|
|
|
"
|
|
|
:placeholder="'商品分类'"
|
|
|
- /> -->
|
|
|
+ />-->
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="商品名称" prop="good_code">
|
|
|
- <el-input
|
|
|
- v-model="ruleForm.good_name"
|
|
|
- readonly
|
|
|
- maxlength="200"
|
|
|
- @focus="hand"
|
|
|
- />
|
|
|
+ <el-input v-model="ruleForm.good_name" readonly maxlength="200" @focus="hand" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
@@ -102,6 +97,7 @@
|
|
|
label="发货公司名称"
|
|
|
min-width="145"
|
|
|
/>
|
|
|
+
|
|
|
<el-table-column prop="wsm_code" label="发货仓库编码" width="180" />
|
|
|
<el-table-column
|
|
|
show-overflow-tooltip
|
|
|
@@ -119,11 +115,7 @@
|
|
|
:size="'mini'"
|
|
|
style="margin-bottom: 0"
|
|
|
>
|
|
|
- <el-input
|
|
|
- v-model="scope.row.num"
|
|
|
- maxlength="10"
|
|
|
- :disabled="!scope.row.edit"
|
|
|
- />
|
|
|
+ <el-input v-model="scope.row.num" maxlength="10" :disabled="!scope.row.edit" />
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -131,25 +123,12 @@
|
|
|
|
|
|
<el-table-column fixed="right" width="80" label="操作">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-tooltip
|
|
|
- v-if="!scope.row.edit"
|
|
|
- effect="dark"
|
|
|
- content="编辑"
|
|
|
- placement="top"
|
|
|
- >
|
|
|
+ <el-tooltip v-if="!scope.row.edit" effect="dark" content="编辑" placement="top">
|
|
|
<i class="el-icon-edit tb-icon" @click="editRow(scope.$index)" />
|
|
|
</el-tooltip>
|
|
|
|
|
|
- <el-tooltip
|
|
|
- v-if="scope.row.edit"
|
|
|
- effect="dark"
|
|
|
- content="保存"
|
|
|
- placement="top"
|
|
|
- >
|
|
|
- <i
|
|
|
- class="el-icon-circle-check tb-icon"
|
|
|
- @click="checkStockRow(scope.$index)"
|
|
|
- />
|
|
|
+ <el-tooltip v-if="scope.row.edit" effect="dark" content="保存" placement="top">
|
|
|
+ <i class="el-icon-circle-check tb-icon" @click="checkStockRow(scope.$index)" />
|
|
|
</el-tooltip>
|
|
|
|
|
|
<el-tooltip effect="dark" content="删除" placement="top">
|
|
|
@@ -182,12 +161,9 @@
|
|
|
row-key="key"
|
|
|
>
|
|
|
<el-table-column prop="receipt_quantity" label="收货总数" min-width="125" />
|
|
|
-
|
|
|
<el-table-column prop="arrive_time" label="最晚收货日期" width="150" />
|
|
|
<el-table-column prop="contactor" label="收件联系人" min-width="110" />
|
|
|
-
|
|
|
<el-table-column prop="mobile" label="收货联系电话" min-width="130" />
|
|
|
-
|
|
|
<el-table-column prop="addr_code" label="收货省市区" min-width="230" />
|
|
|
<el-table-column prop="addr" label="详细地址" min-width="170" />
|
|
|
<el-table-column fixed="right" width="80">
|
|
|
@@ -208,16 +184,8 @@
|
|
|
</el-tooltip>
|
|
|
</template>
|
|
|
<template slot-scope="scope">
|
|
|
- <el-tooltip
|
|
|
- v-if="!scope.row.edit"
|
|
|
- effect="dark"
|
|
|
- content="编辑"
|
|
|
- placement="top"
|
|
|
- >
|
|
|
- <i
|
|
|
- class="el-icon-edit tb-icon"
|
|
|
- @click="openHouseModal(scope.$index)"
|
|
|
- />
|
|
|
+ <el-tooltip v-if="!scope.row.edit" effect="dark" content="编辑" placement="top">
|
|
|
+ <i class="el-icon-edit tb-icon" @click="openHouseModal(scope.$index)" />
|
|
|
</el-tooltip>
|
|
|
<el-tooltip effect="dark" content="删除" placement="top">
|
|
|
<i
|
|
|
@@ -246,102 +214,102 @@
|
|
|
/>
|
|
|
</el-col>
|
|
|
<el-col :span="24" style="text-align: right">
|
|
|
- <el-button :size="'mini'" type="primary" @click="submitForm">保 存 </el-button>
|
|
|
+ <el-button :size="'mini'" type="primary" @click="submitForm">保 存</el-button>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</el-card>
|
|
|
</el-dialog>
|
|
|
</template>
|
|
|
<script>
|
|
|
-import resToken from '@/mixins/resToken'
|
|
|
-import asyncRequest from '@/apis/service/sellOut/salesOrder/detail'
|
|
|
-import searchStockGoodModal from '@/components/search-stock-good-modal'
|
|
|
+import resToken from "@/mixins/resToken";
|
|
|
+import asyncRequest from "@/apis/service/sellOut/salesOrder/detail";
|
|
|
+import searchStockGoodModal from "@/components/search-stock-good-modal";
|
|
|
import {
|
|
|
- isnumber,
|
|
|
- isMobile,
|
|
|
- isChinese,
|
|
|
- isEmoticon,
|
|
|
isSpecialSymbol,
|
|
|
+ isEmoticon,
|
|
|
+ isChinese,
|
|
|
hasSpace,
|
|
|
+ isMobile,
|
|
|
+ isnumber,
|
|
|
isAddr
|
|
|
-} from '@/utils/validate'
|
|
|
-import inAddrModel from '@/components/in-addr-model'
|
|
|
-import AddrAddEditModal from '@/components/addr-add-edit-modal'
|
|
|
+} from "@/utils/validate";
|
|
|
+import inAddrModel from "@/components/in-addr-model";
|
|
|
+import AddrAddEditModal from "@/components/addr-add-edit-modal";
|
|
|
export default {
|
|
|
- name: 'Allot',
|
|
|
+ name: "Allot",
|
|
|
components: { searchStockGoodModal, inAddrModel, AddrAddEditModal },
|
|
|
mixins: [resToken],
|
|
|
- props: ['showModel', 'id'],
|
|
|
+ props: ["showModel", "id"],
|
|
|
data() {
|
|
|
const validatemobile = (rule, value, callback) => {
|
|
|
- if (value === '') {
|
|
|
- callback(new Error('手机号不能为空！'))
|
|
|
+ if (value === "") {
|
|
|
+ callback(new Error("手机号不能为空！"));
|
|
|
} else {
|
|
|
if (!isMobile(value)) {
|
|
|
- callback(new Error('手机号格式不正确！'))
|
|
|
+ callback(new Error("手机号格式不正确！"));
|
|
|
} else {
|
|
|
- callback()
|
|
|
+ callback();
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
+ };
|
|
|
const validateWeight = (rule, value, callback) => {
|
|
|
- if (value === '') {
|
|
|
- callback(new Error('收货总数不能为空!'))
|
|
|
+ if (value === "") {
|
|
|
+ callback(new Error("收货总数不能为空!"));
|
|
|
} else {
|
|
|
if (!isnumber(value)) {
|
|
|
- callback(new Error('收货总数仅支持整数!'))
|
|
|
+ callback(new Error("收货总数仅支持整数!"));
|
|
|
} else {
|
|
|
- callback()
|
|
|
+ callback();
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
+ };
|
|
|
const validatecontactor = (rule, value, callback) => {
|
|
|
- if (value === '') {
|
|
|
- callback(new Error('联系人不能为空！'))
|
|
|
+ if (value === "") {
|
|
|
+ callback(new Error("联系人不能为空！"));
|
|
|
} else {
|
|
|
if (value.length < 2 || value.length > 10) {
|
|
|
- callback(new Error('联系人规则为2~10位汉字！'))
|
|
|
+ callback(new Error("联系人规则为2~10位汉字！"));
|
|
|
} else {
|
|
|
if (!isChinese(value)) {
|
|
|
- callback(new Error('联系人规则为2~10位汉字！'))
|
|
|
+ callback(new Error("联系人规则为2~10位汉字！"));
|
|
|
} else if (isEmoticon(value)) {
|
|
|
- callback(new Error('联系人规则为2~10位汉字！'))
|
|
|
+ callback(new Error("联系人规则为2~10位汉字！"));
|
|
|
} else {
|
|
|
- callback()
|
|
|
+ callback();
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
+ };
|
|
|
const validateAddr = (rule, value, callback) => {
|
|
|
- if (value === '') {
|
|
|
- callback(new Error('详细地址不能为空！'))
|
|
|
+ if (value === "") {
|
|
|
+ callback(new Error("详细地址不能为空！"));
|
|
|
} else {
|
|
|
if (hasSpace(value)) {
|
|
|
- callback(new Error('不能出现/回车/换行符！'))
|
|
|
+ callback(new Error("不能出现/回车/换行符！"));
|
|
|
} else if (isSpecialSymbol(value)) {
|
|
|
- callback(new Error('不能使用英文特殊字符！'))
|
|
|
+ callback(new Error("不能使用英文特殊字符！"));
|
|
|
} else if (isAddr(value)) {
|
|
|
- callback()
|
|
|
+ callback();
|
|
|
} else {
|
|
|
- callback(new Error('详细地址填写不规范！'))
|
|
|
+ callback(new Error("详细地址填写不规范！"));
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
+ };
|
|
|
return {
|
|
|
showAddrAddEditModal: false,
|
|
|
AddrAddEditModalIndex: -1,
|
|
|
AddrAddEditModalSitem: {},
|
|
|
loading: false,
|
|
|
addrmodel: false,
|
|
|
- title: '新建销售订单',
|
|
|
+ title: "新建销售订单",
|
|
|
showModelThis: this.showModel,
|
|
|
showGoodsModel: false,
|
|
|
- stock_code: '',
|
|
|
- cat_id: '',
|
|
|
+ stock_code: "",
|
|
|
+ cat_id: "",
|
|
|
ruleForm: {
|
|
|
goods_class: [],
|
|
|
- good_name: '',
|
|
|
- good_code: '', // 商品选择
|
|
|
+ good_name: "",
|
|
|
+ good_code: "", // 商品选择
|
|
|
customer_code: [], // 企业客户选择
|
|
|
sell_code: [] // 销售方选择
|
|
|
},
|
|
|
@@ -349,33 +317,33 @@ export default {
|
|
|
rules: {
|
|
|
goods_class: [
|
|
|
{
|
|
|
- type: 'array',
|
|
|
+ type: "array",
|
|
|
required: true,
|
|
|
- message: '请选择商品分类',
|
|
|
- trigger: 'change'
|
|
|
+ message: "请选择商品分类",
|
|
|
+ trigger: "change"
|
|
|
}
|
|
|
],
|
|
|
good_code: [
|
|
|
{
|
|
|
required: true,
|
|
|
- message: '请选择商品',
|
|
|
- trigger: 'blur'
|
|
|
+ message: "请选择商品",
|
|
|
+ trigger: "blur"
|
|
|
}
|
|
|
],
|
|
|
customer_code: [
|
|
|
{
|
|
|
- type: 'array',
|
|
|
+ type: "array",
|
|
|
required: true,
|
|
|
- message: '请选择企业客户',
|
|
|
- trigger: 'change'
|
|
|
+ message: "请选择企业客户",
|
|
|
+ trigger: "change"
|
|
|
}
|
|
|
],
|
|
|
sell_code: [
|
|
|
{
|
|
|
- type: 'array',
|
|
|
+ type: "array",
|
|
|
required: true,
|
|
|
- message: '请选择供应商公司',
|
|
|
- trigger: 'change'
|
|
|
+ message: "请选择供应商公司",
|
|
|
+ trigger: "change"
|
|
|
}
|
|
|
]
|
|
|
},
|
|
|
@@ -386,22 +354,22 @@ export default {
|
|
|
arrive_time: [
|
|
|
{
|
|
|
required: true,
|
|
|
- message: '最晚收货日期不能为空',
|
|
|
- trigger: 'change'
|
|
|
+ message: "最晚收货日期不能为空",
|
|
|
+ trigger: "change"
|
|
|
}
|
|
|
],
|
|
|
receipt_quantity: [
|
|
|
{
|
|
|
required: true,
|
|
|
validator: validateWeight,
|
|
|
- trigger: 'blur'
|
|
|
+ trigger: "blur"
|
|
|
}
|
|
|
],
|
|
|
|
|
|
contactor: [
|
|
|
{
|
|
|
required: true,
|
|
|
- trigger: 'blur',
|
|
|
+ trigger: "blur",
|
|
|
validator: validatecontactor
|
|
|
}
|
|
|
],
|
|
|
@@ -409,23 +377,23 @@ export default {
|
|
|
{
|
|
|
required: true,
|
|
|
validator: validatemobile,
|
|
|
- trigger: 'blur'
|
|
|
+ trigger: "blur"
|
|
|
}
|
|
|
],
|
|
|
|
|
|
addr_code: [
|
|
|
{
|
|
|
- type: 'array',
|
|
|
+ type: "array",
|
|
|
required: true,
|
|
|
- message: '收货省市区不能为空',
|
|
|
- trigger: 'change'
|
|
|
+ message: "收货省市区不能为空",
|
|
|
+ trigger: "change"
|
|
|
}
|
|
|
],
|
|
|
addr: [
|
|
|
{
|
|
|
required: true,
|
|
|
validator: validateAddr,
|
|
|
- trigger: 'blur'
|
|
|
+ trigger: "blur"
|
|
|
}
|
|
|
]
|
|
|
},
|
|
|
@@ -433,75 +401,75 @@ export default {
|
|
|
good_stock: [] // 出货仓库
|
|
|
},
|
|
|
loading: false,
|
|
|
- id: ''
|
|
|
- }
|
|
|
+ id: ""
|
|
|
+ };
|
|
|
},
|
|
|
watch: {
|
|
|
showModel: function(val) {
|
|
|
- this.showModelThis = val
|
|
|
+ this.showModelThis = val;
|
|
|
if (val) {
|
|
|
- this.rulesThis = this.rules
|
|
|
- this.resetForm()
|
|
|
+ this.rulesThis = this.rules;
|
|
|
+ this.resetForm();
|
|
|
}
|
|
|
},
|
|
|
showModelThis(val) {
|
|
|
if (!val) {
|
|
|
- this.$emit('cancel')
|
|
|
+ this.$emit("cancel");
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
closeModel() {
|
|
|
- console.log('closeModel!!')
|
|
|
- this.showModelThis = false
|
|
|
+ console.log("closeModel!!");
|
|
|
+ this.showModelThis = false;
|
|
|
},
|
|
|
hand() {
|
|
|
if (this.ruleForm.goods_class.length === 0) {
|
|
|
- this.$message.warning('请选择商品分类！')
|
|
|
- return
|
|
|
+ this.$message.warning("请选择商品分类！");
|
|
|
+ return;
|
|
|
}
|
|
|
- this.showGoodsModel = true
|
|
|
+ this.showGoodsModel = true;
|
|
|
},
|
|
|
addrRefresh(e) {
|
|
|
- const { list } = e
|
|
|
- this.addrForm.order_addr.push(...list)
|
|
|
+ const { list } = e;
|
|
|
+ this.addrForm.order_addr.push(...list);
|
|
|
},
|
|
|
|
|
|
goods_class_change(e) {
|
|
|
- this.ruleForm.goods_class = e
|
|
|
- this.cat_id = e.length > 0 ? e[e.length - 1] : ''
|
|
|
- this.$refs.ruleForm.validateField('goods_class')
|
|
|
- this.ruleForm.good_code = ''
|
|
|
- this.ruleForm.good_name = ''
|
|
|
- this.$refs.ruleForm.validateField('good_code')
|
|
|
+ this.ruleForm.goods_class = e;
|
|
|
+ this.cat_id = e.length > 0 ? e[e.length - 1] : "";
|
|
|
+ this.$refs.ruleForm.validateField("goods_class");
|
|
|
+ this.ruleForm.good_code = "";
|
|
|
+ this.ruleForm.good_name = "";
|
|
|
+ this.$refs.ruleForm.validateField("good_code");
|
|
|
},
|
|
|
refresh(e) {
|
|
|
- this.showModelThis = e
|
|
|
- this.$emit('refresh', true)
|
|
|
+ this.showModelThis = e;
|
|
|
+ this.$emit("refresh", true);
|
|
|
},
|
|
|
async getstock(code) {
|
|
|
- this.loading = true
|
|
|
+ this.loading = true;
|
|
|
const model = {
|
|
|
- wsm_code: '',
|
|
|
+ wsm_code: "",
|
|
|
page: 1,
|
|
|
size: 100,
|
|
|
type_code: code,
|
|
|
- good_code: '',
|
|
|
- good_name: '',
|
|
|
- supplierNo: '',
|
|
|
- stock_low: '',
|
|
|
- stock_up: '',
|
|
|
- warn_low: '',
|
|
|
- warn_up: '',
|
|
|
- stock_max: '1'
|
|
|
- }
|
|
|
- const res = await asyncRequest.getGoodStock(model)
|
|
|
+ good_code: "",
|
|
|
+ good_name: "",
|
|
|
+ supplierNo: "",
|
|
|
+ stock_low: "",
|
|
|
+ stock_up: "",
|
|
|
+ warn_low: "",
|
|
|
+ warn_up: "",
|
|
|
+ stock_max: "1"
|
|
|
+ };
|
|
|
+ const res = await asyncRequest.getGoodStock(model);
|
|
|
if (res && res.code === 0 && res.data) {
|
|
|
this.stockForm = {
|
|
|
good_stock: [] // 出货仓库
|
|
|
- }
|
|
|
- const { list } = res.data
|
|
|
- list.forEach((v) => {
|
|
|
+ };
|
|
|
+ const { list } = res.data;
|
|
|
+ list.forEach(v => {
|
|
|
const model = {
|
|
|
num: v.usable_stock,
|
|
|
usable_stock: v.usable_stock,
|
|
|
@@ -511,56 +479,56 @@ export default {
|
|
|
wsm_code: v.wsm_code,
|
|
|
original_price: v.original_price,
|
|
|
edit: false
|
|
|
- }
|
|
|
- this.stockForm.good_stock.push(model)
|
|
|
- })
|
|
|
+ };
|
|
|
+ this.stockForm.good_stock.push(model);
|
|
|
+ });
|
|
|
} else if (res && res.code >= 100 && res.code <= 104) {
|
|
|
- await this.logout()
|
|
|
+ await this.logout();
|
|
|
} else {
|
|
|
- this.$message.warning(res.message)
|
|
|
+ this.$message.warning(res.message);
|
|
|
}
|
|
|
- this.loading = false
|
|
|
+ this.loading = false;
|
|
|
},
|
|
|
|
|
|
getNewTime() {
|
|
|
- this.newTime = new Date().valueOf()
|
|
|
+ this.newTime = new Date().valueOf();
|
|
|
},
|
|
|
async resetForm() {
|
|
|
// 重置
|
|
|
await this.$nextTick(() => {
|
|
|
if (this.$refs.ruleForm) {
|
|
|
- this.$refs.ruleForm.resetFields()
|
|
|
- this.$refs.ruleForm.clearValidate()
|
|
|
- this.cat_id = ''
|
|
|
+ this.$refs.ruleForm.resetFields();
|
|
|
+ this.$refs.ruleForm.clearValidate();
|
|
|
+ this.cat_id = "";
|
|
|
this.ruleForm = {
|
|
|
goods_class: [],
|
|
|
- good_code: '', // 商品选择
|
|
|
+ good_code: "", // 商品选择
|
|
|
customer_code: [], // 企业客户选择
|
|
|
sell_code: [] // 销售方公司
|
|
|
- }
|
|
|
+ };
|
|
|
}
|
|
|
if (this.$refs.stockForm) {
|
|
|
- this.$refs.stockForm.resetFields()
|
|
|
- this.$refs.stockForm.clearValidate()
|
|
|
+ this.$refs.stockForm.resetFields();
|
|
|
+ this.$refs.stockForm.clearValidate();
|
|
|
|
|
|
this.stockForm = {
|
|
|
good_stock: [] // 出货仓库
|
|
|
- }
|
|
|
+ };
|
|
|
}
|
|
|
if (this.$refs.addrForm) {
|
|
|
- this.$refs.addrForm.resetFields()
|
|
|
- this.$refs.addrForm.clearValidate()
|
|
|
+ this.$refs.addrForm.resetFields();
|
|
|
+ this.$refs.addrForm.clearValidate();
|
|
|
this.addrForm = {
|
|
|
order_addr: []
|
|
|
- }
|
|
|
+ };
|
|
|
}
|
|
|
- })
|
|
|
+ });
|
|
|
},
|
|
|
showAddrAddEditModalRefresh(e) {
|
|
|
- const { index, item } = e
|
|
|
+ const { index, item } = e;
|
|
|
|
|
|
if (index === -1) {
|
|
|
- this.addrForm.order_addr.push(JSON.parse(JSON.stringify(item)))
|
|
|
+ this.addrForm.order_addr.push(JSON.parse(JSON.stringify(item)));
|
|
|
} else {
|
|
|
const {
|
|
|
arrive_time,
|
|
|
@@ -571,91 +539,91 @@ export default {
|
|
|
addr_code_name,
|
|
|
addr,
|
|
|
id
|
|
|
- } = JSON.parse(JSON.stringify(item))
|
|
|
- this.addrForm.order_addr[index].receipt_quantity = receipt_quantity
|
|
|
- this.addrForm.order_addr[index].arrive_time = arrive_time
|
|
|
- this.addrForm.order_addr[index].contactor = contactor
|
|
|
- this.addrForm.order_addr[index].mobile = mobile
|
|
|
- this.addrForm.order_addr[index].addr_code = addr_code
|
|
|
- this.addrForm.order_addr[index].addr_code_name = addr_code_name
|
|
|
- this.addrForm.order_addr[index].addr = addr
|
|
|
- this.addrForm.order_addr[index].id = id
|
|
|
+ } = JSON.parse(JSON.stringify(item));
|
|
|
+ this.addrForm.order_addr[index].receipt_quantity = receipt_quantity;
|
|
|
+ this.addrForm.order_addr[index].arrive_time = arrive_time;
|
|
|
+ this.addrForm.order_addr[index].contactor = contactor;
|
|
|
+ this.addrForm.order_addr[index].mobile = mobile;
|
|
|
+ this.addrForm.order_addr[index].addr_code = addr_code;
|
|
|
+ this.addrForm.order_addr[index].addr_code_name = addr_code_name;
|
|
|
+ this.addrForm.order_addr[index].addr = addr;
|
|
|
+ this.addrForm.order_addr[index].id = id;
|
|
|
}
|
|
|
- this.$refs.addrForm.validateField('addrlist')
|
|
|
+ this.$refs.addrForm.validateField("addrlist");
|
|
|
},
|
|
|
async addGoodsRes(e) {
|
|
|
if (e && e.length === 1) {
|
|
|
- this.ruleForm.good_name = e[0].good_name
|
|
|
- this.ruleForm.good_code = e[0].type_code
|
|
|
+ this.ruleForm.good_name = e[0].good_name;
|
|
|
+ this.ruleForm.good_code = e[0].type_code;
|
|
|
} else {
|
|
|
- this.ruleForm.good_name = ''
|
|
|
- this.ruleForm.good_code = ''
|
|
|
+ this.ruleForm.good_name = "";
|
|
|
+ this.ruleForm.good_code = "";
|
|
|
}
|
|
|
- this.$refs.ruleForm.validateField('good_code')
|
|
|
- if (this.ruleForm.good_code !== '' && this.id === 'add') {
|
|
|
- await this.getstock(this.ruleForm.good_code)
|
|
|
+ this.$refs.ruleForm.validateField("good_code");
|
|
|
+ if (this.ruleForm.good_code !== "" && this.id === "add") {
|
|
|
+ await this.getstock(this.ruleForm.good_code);
|
|
|
} else {
|
|
|
this.stockForm = {
|
|
|
good_stock: [] // 出货仓库
|
|
|
- }
|
|
|
+ };
|
|
|
}
|
|
|
},
|
|
|
editRow(index) {
|
|
|
- const findex = this.stockForm.good_stock.findIndex((v) => v.edit === true)
|
|
|
+ const findex = this.stockForm.good_stock.findIndex(v => v.edit === true);
|
|
|
if (findex !== -1) {
|
|
|
- this.$message.warning('当前已有发货仓库信息在编辑，请保存后再试！')
|
|
|
- return
|
|
|
+ this.$message.warning("当前已有发货仓库信息在编辑，请保存后再试！");
|
|
|
+ return;
|
|
|
} else {
|
|
|
- this.stockForm.good_stock[index].edit = true
|
|
|
+ this.stockForm.good_stock[index].edit = true;
|
|
|
}
|
|
|
},
|
|
|
checkStockRow(index) {
|
|
|
- const total = parseInt(this.stockForm.good_stock[index].usable_stock)
|
|
|
- const num = parseInt(this.stockForm.good_stock[index].num)
|
|
|
+ const total = parseInt(this.stockForm.good_stock[index].usable_stock);
|
|
|
+ const num = parseInt(this.stockForm.good_stock[index].num);
|
|
|
if (total === 0) {
|
|
|
- this.$message.warning('该仓库已无该商品库存！不能销售！')
|
|
|
- return
|
|
|
+ this.$message.warning("该仓库已无该商品库存！不能销售！");
|
|
|
+ return;
|
|
|
} else {
|
|
|
if (num > total) {
|
|
|
- this.$message.warning('销售数量不能大于可用库存！')
|
|
|
- return
|
|
|
+ this.$message.warning("销售数量不能大于可用库存！");
|
|
|
+ return;
|
|
|
} else {
|
|
|
- this.stockForm.good_stock[index].edit = false
|
|
|
+ this.stockForm.good_stock[index].edit = false;
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
customer_code_change(e) {
|
|
|
if (e && e.code) {
|
|
|
- this.ruleForm.customer_code = [e.code]
|
|
|
+ this.ruleForm.customer_code = [e.code];
|
|
|
} else {
|
|
|
- this.ruleForm.customer_code = []
|
|
|
+ this.ruleForm.customer_code = [];
|
|
|
}
|
|
|
- this.$refs.ruleForm.validateField('customer_code')
|
|
|
+ this.$refs.ruleForm.validateField("customer_code");
|
|
|
},
|
|
|
supplierChange(e) {
|
|
|
if (e && e.id) {
|
|
|
- this.ruleForm.sell_code = [e.code]
|
|
|
+ this.ruleForm.sell_code = [e.code];
|
|
|
// this.wsm_supplierNo = [e.code];
|
|
|
} else {
|
|
|
- this.ruleForm.sell_code = []
|
|
|
+ this.ruleForm.sell_code = [];
|
|
|
// this.wsm_supplierNo = [];
|
|
|
}
|
|
|
// this.parmValue.wsm_code = "";
|
|
|
// this.wsm_code = [];
|
|
|
// this.parmValue.page = 1;
|
|
|
// this.pageInfo.curr = 1;
|
|
|
- this.$refs.ruleForm.validateField('sell_code')
|
|
|
+ this.$refs.ruleForm.validateField("sell_code");
|
|
|
},
|
|
|
openHouseModal(index) {
|
|
|
- this.AddrAddEditModalIndex = index
|
|
|
+ this.AddrAddEditModalIndex = index;
|
|
|
if (index === -1) {
|
|
|
- this.AddrAddEditModalSitem = {}
|
|
|
+ this.AddrAddEditModalSitem = {};
|
|
|
} else {
|
|
|
this.AddrAddEditModalSitem = JSON.parse(
|
|
|
JSON.stringify(this.addrForm.order_addr[index])
|
|
|
- )
|
|
|
+ );
|
|
|
}
|
|
|
- this.showAddrAddEditModal = true
|
|
|
+ this.showAddrAddEditModal = true;
|
|
|
// let findex = this.addrForm.order_addr.findIndex((v) => v.edit === true);
|
|
|
// if (findex !== -1) {
|
|
|
// this.$message.warning("当前已有地址在编辑，请保存后再试！");
|
|
|
@@ -678,66 +646,66 @@ export default {
|
|
|
},
|
|
|
// 省市区选择
|
|
|
select_area_change(e, index) {
|
|
|
- this.addrForm.order_addr[index].addr_code = e
|
|
|
+ this.addrForm.order_addr[index].addr_code = e;
|
|
|
},
|
|
|
// 省市区保存某一行
|
|
|
checkRow(rowIndex) {
|
|
|
- this.$refs.addrForm.validate((valid) => {
|
|
|
+ this.$refs.addrForm.validate(valid => {
|
|
|
if (valid) {
|
|
|
- this.addrForm.order_addr[rowIndex].edit = false
|
|
|
+ this.addrForm.order_addr[rowIndex].edit = false;
|
|
|
} else {
|
|
|
- console.log('error submit!!')
|
|
|
- return false
|
|
|
+ console.log("error submit!!");
|
|
|
+ return false;
|
|
|
}
|
|
|
- })
|
|
|
+ });
|
|
|
},
|
|
|
// 省市区删除行操作
|
|
|
deleteRow(index, rows) {
|
|
|
- rows.splice(index, 1)
|
|
|
+ rows.splice(index, 1);
|
|
|
},
|
|
|
async submitForm() {
|
|
|
- await this.$refs.ruleForm.validate(async(valid) => {
|
|
|
+ await this.$refs.ruleForm.validate(async valid => {
|
|
|
if (valid) {
|
|
|
if (this.loading) {
|
|
|
- return
|
|
|
+ return;
|
|
|
}
|
|
|
- this.loading = true
|
|
|
+ this.loading = true;
|
|
|
const { good_code, customer_code, sell_code } = JSON.parse(
|
|
|
JSON.stringify(this.ruleForm)
|
|
|
- )
|
|
|
- const { good_stock } = JSON.parse(JSON.stringify(this.stockForm))
|
|
|
- const { order_addr } = JSON.parse(JSON.stringify(this.addrForm))
|
|
|
+ );
|
|
|
+ const { good_stock } = JSON.parse(JSON.stringify(this.stockForm));
|
|
|
+ const { order_addr } = JSON.parse(JSON.stringify(this.addrForm));
|
|
|
const model = {
|
|
|
good_code,
|
|
|
- supplierNo: sell_code.join(','),
|
|
|
- customer_code: customer_code.join(','), // 账号
|
|
|
+ supplierNo: sell_code.join(","),
|
|
|
+ customer_code: customer_code.join(","), // 账号
|
|
|
order_addr: [],
|
|
|
good_stock: []
|
|
|
- }
|
|
|
- let stockT = 0
|
|
|
- let addrT = 0
|
|
|
- let isStockOk = true
|
|
|
- let isSEdit = false
|
|
|
- let isAEdit = false
|
|
|
- good_stock.forEach((v1) => {
|
|
|
+ };
|
|
|
+ let stockT = 0;
|
|
|
+ let addrT = 0;
|
|
|
+ let isStockOk = true;
|
|
|
+ let isSEdit = false;
|
|
|
+ let isAEdit = false;
|
|
|
+ good_stock.forEach(v1 => {
|
|
|
if (v1.edit) {
|
|
|
- isSEdit = true
|
|
|
+ isSEdit = true;
|
|
|
}
|
|
|
if (parseInt(v1.usable_stock) < parseInt(v1.num)) {
|
|
|
- isStockOk = false
|
|
|
+ isStockOk = false;
|
|
|
}
|
|
|
- stockT += parseInt(v1.num)
|
|
|
+ stockT += parseInt(v1.num);
|
|
|
const model1 = {
|
|
|
num: v1.num,
|
|
|
wsm_code: v1.wsm_code
|
|
|
- }
|
|
|
- model.good_stock.push(model1)
|
|
|
- })
|
|
|
- order_addr.forEach((v2) => {
|
|
|
+ };
|
|
|
+ model.good_stock.push(model1);
|
|
|
+ });
|
|
|
+ order_addr.forEach(v2 => {
|
|
|
if (v2.edit) {
|
|
|
- isAEdit = true
|
|
|
+ isAEdit = true;
|
|
|
}
|
|
|
- addrT += parseInt(v2.receipt_quantity)
|
|
|
+ addrT += parseInt(v2.receipt_quantity);
|
|
|
const model2 = {
|
|
|
contactor: v2.contactor,
|
|
|
mobile: v2.mobile,
|
|
|
@@ -745,54 +713,56 @@ export default {
|
|
|
addr: v2.addr,
|
|
|
receipt_quantity: v2.receipt_quantity,
|
|
|
addr_code: v2.addr_code
|
|
|
- }
|
|
|
- model.order_addr.push(model2)
|
|
|
- })
|
|
|
+ };
|
|
|
+ model.order_addr.push(model2);
|
|
|
+ });
|
|
|
if (isSEdit) {
|
|
|
- this.$message.warning('请保存仓库信息！')
|
|
|
- this.loading = false
|
|
|
- return
|
|
|
+ this.$message.warning("请保存仓库信息！");
|
|
|
+ this.loading = false;
|
|
|
+ return;
|
|
|
}
|
|
|
if (isAEdit) {
|
|
|
- this.$message.warning('请保存地址信息！')
|
|
|
- this.loading = false
|
|
|
- return
|
|
|
+ this.$message.warning("请保存地址信息！");
|
|
|
+ this.loading = false;
|
|
|
+ return;
|
|
|
}
|
|
|
if (!isStockOk) {
|
|
|
- this.$message.warning('部分仓库销售数量已大于可用数量！')
|
|
|
- this.loading = false
|
|
|
- return
|
|
|
+ this.$message.warning("部分仓库销售数量已大于可用数量！");
|
|
|
+ this.loading = false;
|
|
|
+ return;
|
|
|
}
|
|
|
if (stockT !== addrT) {
|
|
|
- this.$message.warning('库存出库总数量，与收货地址信息中的总数量不一致！')
|
|
|
- this.loading = false
|
|
|
- return
|
|
|
+ this.$message.warning(
|
|
|
+ "库存出库总数量，与收货地址信息中的总数量不一致！"
|
|
|
+ );
|
|
|
+ this.loading = false;
|
|
|
+ return;
|
|
|
}
|
|
|
|
|
|
- const res = await asyncRequest.add(model)
|
|
|
+ const res = await asyncRequest.add(model);
|
|
|
|
|
|
- this.loading = false
|
|
|
+ this.loading = false;
|
|
|
if (res && res.code === 0) {
|
|
|
this.$notify.success({
|
|
|
- title: '添加成功',
|
|
|
- message: ''
|
|
|
- })
|
|
|
- this.showModelThis = false
|
|
|
+ title: "添加成功",
|
|
|
+ message: ""
|
|
|
+ });
|
|
|
+ this.showModelThis = false;
|
|
|
// 刷新
|
|
|
- this.$emit('refresh')
|
|
|
+ this.$emit("refresh");
|
|
|
} else if (res && res.code >= 100 && res.code <= 104) {
|
|
|
- await this.logout()
|
|
|
+ await this.logout();
|
|
|
} else {
|
|
|
- this.$message.warning(res.message)
|
|
|
+ this.$message.warning(res.message);
|
|
|
}
|
|
|
} else {
|
|
|
- console.log('error submit!!')
|
|
|
- return false
|
|
|
+ console.log("error submit!!");
|
|
|
+ return false;
|
|
|
}
|
|
|
- })
|
|
|
+ });
|
|
|
}
|
|
|
}
|
|
|
-}
|
|
|
+};
|
|
|
</script>
|
|
|
|
|
|
<style lang="scss" scoped>
|
