|
|
@@ -1,497 +1,148 @@
|
|
|
<template>
|
|
|
- <el-dialog
|
|
|
- v-loading="loading"
|
|
|
- :title="'添加咨询订单'"
|
|
|
- :center="true"
|
|
|
- align="left"
|
|
|
- top="5vh"
|
|
|
- width="1040px"
|
|
|
- :close-on-click-modal="false"
|
|
|
- :visible.sync="showModelThis"
|
|
|
- element-loading-text="拼命加载中"
|
|
|
- element-loading-spinner="el-icon-loading"
|
|
|
- element-loading-background="rgba(0, 0, 0, 0.8)"
|
|
|
- @close="closeModel"
|
|
|
+ <el-form
|
|
|
+ ref="ruleForm"
|
|
|
+ :model="ruleForm"
|
|
|
+ status-icon
|
|
|
+ :rules="rulesThis"
|
|
|
+ label-width="135px"
|
|
|
+ class="demo-ruleForm"
|
|
|
>
|
|
|
- <el-card style="margin-top: -20px">
|
|
|
- <el-form
|
|
|
- ref="ruleForm"
|
|
|
- :model="ruleForm"
|
|
|
- status-icon
|
|
|
- :rules="rulesThis"
|
|
|
- label-width="85px"
|
|
|
- class="demo-ruleForm"
|
|
|
- >
|
|
|
- <el-row>
|
|
|
- <el-col :span="12">
|
|
|
- <el-form-item label="商品分类" prop="class_cat">
|
|
|
- <el-input
|
|
|
- v-model="ruleForm.class_cat"
|
|
|
- placeholder="商品分类"
|
|
|
- disabled
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="12">
|
|
|
- <el-form-item label="商品名称" prop="goods_name">
|
|
|
- <el-input
|
|
|
- v-model="ruleForm.goods_name"
|
|
|
- placeholder="商品分类"
|
|
|
- disabled
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="12">
|
|
|
- <el-form-item label="销售方" prop="supplierNo">
|
|
|
- <search-supplier
|
|
|
- :value="ruleForm.supplierNo"
|
|
|
- :placeholder="'销售方公司'"
|
|
|
- :disabled="false"
|
|
|
- :isDetail="true"
|
|
|
- :names="supplierName"
|
|
|
- @searchChange="supplierChange"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="12">
|
|
|
- <el-form-item label="购买方" prop="customer_code">
|
|
|
- <el-input
|
|
|
- v-model="ruleForm.customer_name"
|
|
|
- placeholder="购买方公司"
|
|
|
- disabled
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="6">
|
|
|
- <el-form-item label="商品单价" prop="sale_fee">
|
|
|
- <el-input
|
|
|
- v-model="ruleForm.sale_fee"
|
|
|
- placeholder="商品单价"
|
|
|
- disabled
|
|
|
- ><template slot="append">元</template></el-input
|
|
|
- >
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="6">
|
|
|
- <el-form-item label="下单数量" prop="good_num">
|
|
|
- <el-input v-model="ruleForm.good_num" placeholder="下单数量" />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
-
|
|
|
- <el-col :span="6">
|
|
|
- <el-form-item label="商品类型" prop="goodtype">
|
|
|
- <el-select
|
|
|
- v-model="ruleForm.goodtype"
|
|
|
- style="width: 100%"
|
|
|
- placeholder="商品类型"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in goodtypeOptions"
|
|
|
- :key="item.value"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value"
|
|
|
- >
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="6">
|
|
|
- <el-form-item label="发货类型" prop="sendtype">
|
|
|
- <el-select
|
|
|
- v-model="ruleForm.sendtype"
|
|
|
- style="width: 100%"
|
|
|
- placeholder="发货类型"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in options"
|
|
|
- :key="item.value"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value"
|
|
|
- >
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
- </el-form>
|
|
|
- <div style="height: 40px" v-if="ruleForm.sendtype === '1'" class="tr">
|
|
|
- <download-addr />
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- size="mini"
|
|
|
- @click="addrmodel = true"
|
|
|
- style="margin: 0 0 0 10px"
|
|
|
- >导入收货地址</el-button
|
|
|
- >
|
|
|
- </div>
|
|
|
- <el-form
|
|
|
- v-if="ruleForm.sendtype === '1'"
|
|
|
- :model="addrForm"
|
|
|
- ref="addrForm"
|
|
|
- :size="'mini'"
|
|
|
- >
|
|
|
- <el-table
|
|
|
- :data="addrForm.addrlist"
|
|
|
- border
|
|
|
- :size="'mini'"
|
|
|
- style="width: 100%"
|
|
|
- row-key="key"
|
|
|
- >
|
|
|
- <el-table-column
|
|
|
- prop="receipt_quantity"
|
|
|
- label="收货总数"
|
|
|
- min-width="125"
|
|
|
+ <el-row>
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="客户是否接受工差" prop="is_act">
|
|
|
+ <el-select
|
|
|
+ v-model="ruleForm.is_act"
|
|
|
+ style="width: 100%"
|
|
|
+ :disabled="
|
|
|
+ !(status === '1' && powers.some((item) => item == '043'))
|
|
|
+ "
|
|
|
+ placeholder="客户是否接受工差"
|
|
|
>
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-form-item
|
|
|
- :prop="'addrlist.' + scope.$index + '.' + 'receipt_quantity'"
|
|
|
- :rules="addrRules.receipt_quantity"
|
|
|
- :size="'mini'"
|
|
|
- :style="{ marginBottom: scope.row.edit ? '13px' : '0' }"
|
|
|
- >
|
|
|
- <el-input
|
|
|
- v-model="scope.row.receipt_quantity"
|
|
|
- :disabled="!scope.row.edit"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
-
|
|
|
- <el-table-column prop="arrive_time" label="最晚收货日期" width="150">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-form-item
|
|
|
- :prop="'addrlist.' + scope.$index + '.' + 'arrive_time'"
|
|
|
- :rules="addrRules.arrive_time"
|
|
|
- :size="'mini'"
|
|
|
- :style="{ marginBottom: scope.row.edit ? '13px' : '0' }"
|
|
|
- >
|
|
|
- <el-date-picker
|
|
|
- :disabled="!scope.row.edit"
|
|
|
- v-model="scope.row.arrive_time"
|
|
|
- type="date"
|
|
|
- style="width: 100%"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- :picker-options="pickerOptions"
|
|
|
- >
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column prop="contactor" label="收件联系人" min-width="110">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-form-item
|
|
|
- :prop="'addrlist.' + scope.$index + '.' + 'contactor'"
|
|
|
- :rules="addrRules.contactor"
|
|
|
- :size="'mini'"
|
|
|
- :style="{ marginBottom: scope.row.edit ? '13px' : '0' }"
|
|
|
- >
|
|
|
- <el-input
|
|
|
- v-model="scope.row.contactor"
|
|
|
- :disabled="!scope.row.edit"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
-
|
|
|
- <el-table-column prop="mobile" label="收货联系电话" min-width="130">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-form-item
|
|
|
- :prop="'addrlist.' + scope.$index + '.' + 'mobile'"
|
|
|
- :rules="addrRules.mobile"
|
|
|
- :size="'mini'"
|
|
|
- :style="{ marginBottom: scope.row.edit ? '13px' : '0' }"
|
|
|
- >
|
|
|
- <el-input
|
|
|
- v-model="scope.row.mobile"
|
|
|
- :disabled="!scope.row.edit"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
-
|
|
|
- <el-table-column prop="addr_code" label="收货省市区" min-width="230">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-form-item
|
|
|
- :prop="'addrlist.' + scope.$index + '.' + 'addr_code'"
|
|
|
- :rules="addrRules.addr_code"
|
|
|
- :size="'mini'"
|
|
|
- :style="{ marginBottom: scope.row.edit ? '13px' : '0' }"
|
|
|
- >
|
|
|
- <select-area
|
|
|
- :value="scope.row.addr_code"
|
|
|
- :disabled="!scope.row.edit"
|
|
|
- :size="'mini'"
|
|
|
- @selectChange="select_area_change($event, scope.$index)"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column prop="addr" label="详细地址" min-width="170">
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-form-item
|
|
|
- :prop="'addrlist.' + scope.$index + '.' + 'addr'"
|
|
|
- :rules="addrRules.addr"
|
|
|
- :size="'mini'"
|
|
|
- :style="{ marginBottom: scope.row.edit ? '13px' : '0' }"
|
|
|
- >
|
|
|
- <el-input
|
|
|
- v-model="scope.row.addr"
|
|
|
- :disabled="!scope.row.edit"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
-
|
|
|
- <el-table-column fixed="right" width="80">
|
|
|
- <template slot="header" slot-scope="scope">
|
|
|
- <span>操作</span>
|
|
|
-
|
|
|
- <el-tooltip
|
|
|
- class="fr"
|
|
|
- style="margin: 3px 0 0 0"
|
|
|
- effect="dark"
|
|
|
- content="添加"
|
|
|
- placement="top"
|
|
|
- >
|
|
|
- <i
|
|
|
- class="el-icon-circle-plus-outline tb-icon"
|
|
|
- style="color: #63cbe7"
|
|
|
- @click="openHouseModal(-1)"
|
|
|
- ></i>
|
|
|
- </el-tooltip>
|
|
|
- </template>
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-tooltip
|
|
|
- effect="dark"
|
|
|
- content="编辑"
|
|
|
- v-if="!scope.row.edit"
|
|
|
- placement="top"
|
|
|
- >
|
|
|
- <i
|
|
|
- class="el-icon-edit tb-icon"
|
|
|
- @click="openHouseModal(scope.$index)"
|
|
|
- ></i>
|
|
|
- </el-tooltip>
|
|
|
-
|
|
|
- <el-tooltip
|
|
|
- effect="dark"
|
|
|
- content="保存"
|
|
|
- v-if="scope.row.edit"
|
|
|
- placement="top"
|
|
|
- >
|
|
|
- <i
|
|
|
- class="el-icon-circle-check tb-icon"
|
|
|
- @click="checkRow(scope.$index)"
|
|
|
- ></i>
|
|
|
- </el-tooltip>
|
|
|
-
|
|
|
- <el-tooltip effect="dark" content="删除" placement="top">
|
|
|
- <i
|
|
|
- class="el-icon-delete tb-icon"
|
|
|
- @click="deleteRow(scope.$index, addrForm.addrlist)"
|
|
|
- ></i>
|
|
|
- </el-tooltip>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- </el-table>
|
|
|
- </el-form>
|
|
|
- <in-addr-model
|
|
|
- :show-model="addrmodel"
|
|
|
- @cancel="addrmodel = false"
|
|
|
- @refresh="addrRefresh"
|
|
|
- />
|
|
|
- <div style="text-align: right">
|
|
|
+ <el-option
|
|
|
+ v-for="item in is_actOptions"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="12" v-if="ruleForm.is_act === '1'">
|
|
|
+ <el-form-item label="客户意愿" prop="customer_remark">
|
|
|
+ <el-select
|
|
|
+ v-model="ruleForm.customer_remark"
|
|
|
+ style="width: 100%"
|
|
|
+ :disabled="
|
|
|
+ !(status === '1' && powers.some((item) => item == '043'))
|
|
|
+ "
|
|
|
+ placeholder="客户意愿"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in options"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="24">
|
|
|
+ <el-form-item label="审核备注" prop="remark">
|
|
|
+ <el-input
|
|
|
+ type="textarea"
|
|
|
+ :rows="2"
|
|
|
+ :disabled="
|
|
|
+ !(status === '1' && powers.some((item) => item == '043'))
|
|
|
+ "
|
|
|
+ placeholder="业务审核备注"
|
|
|
+ maxlength="250"
|
|
|
+ v-model="ruleForm.remark"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="24" class="tr">
|
|
|
<el-button type="primary" :size="'mini'" @click="submitForm"
|
|
|
>保 存
|
|
|
</el-button>
|
|
|
- <el-button :size="'mini'" @click="showModelThis = false">{{
|
|
|
- isDetail ? "关 闭" : "取 消"
|
|
|
- }}</el-button>
|
|
|
- </div>
|
|
|
- </el-card>
|
|
|
- </el-dialog>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ </el-form>
|
|
|
</template>
|
|
|
<script>
|
|
|
-import asyncRequest from "@/apis/service/sheetOrder/zxSheet";
|
|
|
+import asyncRequest from "@/apis/service/sheetOrder/zxDiffOrder";
|
|
|
import resToken from "@/mixins/resToken";
|
|
|
-import { isnumber, isMobile } from "@/utils/validate";
|
|
|
-import inAddrModel from "@/components/in-addr-model";
|
|
|
+
|
|
|
export default {
|
|
|
name: "Account",
|
|
|
- props: ["showModel", "sitem"],
|
|
|
+ props: ["newTime", "sitem"],
|
|
|
mixins: [resToken],
|
|
|
- components: { inAddrModel },
|
|
|
- data() {
|
|
|
- const validateWeight = (rule, value, callback) => {
|
|
|
- if (value === "") {
|
|
|
- callback(new Error("不能为空!"));
|
|
|
+ computed: {
|
|
|
+ powers() {
|
|
|
+ let tran =
|
|
|
+ this.$store.getters.btnList.find(
|
|
|
+ (item) => item.menu_route == "zxDiffOrderDetail"
|
|
|
+ ) || {};
|
|
|
+ if (tran && tran.action && tran.action.length > 0) {
|
|
|
+ return tran.action;
|
|
|
} else {
|
|
|
- if (!isnumber(value)) {
|
|
|
- callback(new Error("仅支持整数!"));
|
|
|
- } else {
|
|
|
- callback();
|
|
|
- }
|
|
|
- }
|
|
|
- };
|
|
|
- const validatemobile = (rule, value, callback) => {
|
|
|
- if (value === "") {
|
|
|
- callback(new Error("手机号不能为空！"));
|
|
|
- } else {
|
|
|
- if (!isMobile(value)) {
|
|
|
- callback(new Error("手机号格式不正确！"));
|
|
|
- } else {
|
|
|
- callback();
|
|
|
- }
|
|
|
+ return [];
|
|
|
}
|
|
|
- };
|
|
|
+ },
|
|
|
+ },
|
|
|
+ data() {
|
|
|
return {
|
|
|
loading: false,
|
|
|
- showModelThis: this.showModel,
|
|
|
- addrmodel: false,
|
|
|
- supplierNo: "",
|
|
|
- supplierName:"",
|
|
|
+ status: "",
|
|
|
options: [
|
|
|
{
|
|
|
value: "1",
|
|
|
- label: "直接发货",
|
|
|
+ label: "咨询订单减工差",
|
|
|
},
|
|
|
{
|
|
|
value: "2",
|
|
|
- label: "延迟发货",
|
|
|
+ label: "咨询订单不减工差",
|
|
|
},
|
|
|
],
|
|
|
- goodtypeOptions: [
|
|
|
+ is_actOptions: [
|
|
|
{
|
|
|
value: "1",
|
|
|
- label: "普通商品",
|
|
|
+ label: "接受工差",
|
|
|
},
|
|
|
{
|
|
|
value: "2",
|
|
|
- label: "赠品",
|
|
|
- },
|
|
|
- {
|
|
|
- value: "3",
|
|
|
- label: "样品",
|
|
|
+ label: "不接受工差-退回重做",
|
|
|
},
|
|
|
],
|
|
|
- addrForm: {
|
|
|
- addrlist: [],
|
|
|
- },
|
|
|
+
|
|
|
ruleForm: {
|
|
|
- zxNo: "",
|
|
|
- customer_code: [],
|
|
|
- supplierNo: [],
|
|
|
- sendtype: "1",
|
|
|
- good_num: "",
|
|
|
- goodtype: "1",
|
|
|
- class_cat: "",
|
|
|
- goods_name: "",
|
|
|
- sale_fee: "",
|
|
|
+ id: "",
|
|
|
+ status: "",
|
|
|
+ is_act: "1",
|
|
|
+ customer_remark: "1",
|
|
|
+ remark: "",
|
|
|
},
|
|
|
rulesThis: this.rules,
|
|
|
rules: {
|
|
|
- zxNo: [
|
|
|
- {
|
|
|
- required: true,
|
|
|
- message: "咨询单号不能为空！",
|
|
|
- trigger: "blur",
|
|
|
- },
|
|
|
- ],
|
|
|
- customer_code: [
|
|
|
- {
|
|
|
- required: true,
|
|
|
- message: "请选择购买方公司",
|
|
|
- trigger: "change",
|
|
|
- },
|
|
|
- ],
|
|
|
- class_cat: [
|
|
|
- {
|
|
|
- required: true,
|
|
|
- message: "请选择商品分类",
|
|
|
- trigger: "change",
|
|
|
- },
|
|
|
- ],
|
|
|
- supplierNo: [
|
|
|
- {
|
|
|
- type: "array",
|
|
|
- required: true,
|
|
|
- message: "请选择销售方公司",
|
|
|
- trigger: "change",
|
|
|
- },
|
|
|
- ],
|
|
|
- sendtype: [
|
|
|
+ is_act: [
|
|
|
{
|
|
|
required: true,
|
|
|
- message: "请选择发货类型",
|
|
|
+ message: "请选择客户是否接受工差！",
|
|
|
trigger: "change",
|
|
|
},
|
|
|
],
|
|
|
-
|
|
|
- good_num: [
|
|
|
- {
|
|
|
- required: true,
|
|
|
- validator: validateWeight,
|
|
|
- trigger: "blur",
|
|
|
- },
|
|
|
- ],
|
|
|
- goodtype: [
|
|
|
+ customer_remark: [
|
|
|
{
|
|
|
required: true,
|
|
|
- message: "请选择商品类型",
|
|
|
+ message: "请选择客户意愿！",
|
|
|
trigger: "change",
|
|
|
},
|
|
|
],
|
|
|
- sale_fee: [
|
|
|
+ remark: [
|
|
|
{
|
|
|
required: true,
|
|
|
- message: "请输入商品单价",
|
|
|
- trigger: "blur",
|
|
|
- },
|
|
|
- ],
|
|
|
- },
|
|
|
- addrRules: {
|
|
|
- arrive_time: [
|
|
|
- {
|
|
|
- required: true,
|
|
|
- message: "最晚收货日期不能为空",
|
|
|
- trigger: "change",
|
|
|
- },
|
|
|
- ],
|
|
|
- receipt_quantity: [
|
|
|
- {
|
|
|
- required: true,
|
|
|
- validator: validateWeight,
|
|
|
- trigger: "blur",
|
|
|
- },
|
|
|
- ],
|
|
|
-
|
|
|
- contactor: [
|
|
|
- {
|
|
|
- required: true,
|
|
|
- trigger: "blur",
|
|
|
- message: "联系人不能为空",
|
|
|
- },
|
|
|
- ],
|
|
|
- mobile: [
|
|
|
- {
|
|
|
- required: true,
|
|
|
- validator: validatemobile,
|
|
|
- trigger: "blur",
|
|
|
- },
|
|
|
- ],
|
|
|
-
|
|
|
- addr_code: [
|
|
|
- {
|
|
|
- type: "array",
|
|
|
- required: true,
|
|
|
- message: "收货省市区不能为空",
|
|
|
- trigger: "change",
|
|
|
- },
|
|
|
- ],
|
|
|
- addr: [
|
|
|
- {
|
|
|
- required: true,
|
|
|
- message: "详细地址不能为空",
|
|
|
+ message: "审核备注不能为空！",
|
|
|
trigger: "blur",
|
|
|
},
|
|
|
],
|
|
|
@@ -499,8 +150,7 @@ export default {
|
|
|
};
|
|
|
},
|
|
|
watch: {
|
|
|
- showModel: function (val) {
|
|
|
- this.showModelThis = val;
|
|
|
+ newTime: function (val) {
|
|
|
if (val) {
|
|
|
this.initForm();
|
|
|
}
|
|
|
@@ -511,6 +161,9 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
},
|
|
|
+ mounted() {
|
|
|
+ this.initForm();
|
|
|
+ },
|
|
|
methods: {
|
|
|
closeModel() {
|
|
|
console.log("closeModel!!");
|
|
|
@@ -526,6 +179,7 @@ export default {
|
|
|
|
|
|
async initForm() {
|
|
|
this.loading = true;
|
|
|
+ this.status = "";
|
|
|
this.rulesThis = this.rules;
|
|
|
await this.resetForm();
|
|
|
this.loading = false;
|
|
|
@@ -537,20 +191,18 @@ export default {
|
|
|
if (this.$refs.ruleForm) {
|
|
|
this.$refs.ruleForm.resetFields();
|
|
|
this.$refs.ruleForm.clearValidate();
|
|
|
- const { zxNo, class_cat, khname, khNo, cpName, sale_fee } =
|
|
|
- this.sitem;
|
|
|
- console.log(this.sitem);
|
|
|
+ const { is_act, customer_remark, id, remark, status } = this.sitem;
|
|
|
+ this.status = status;
|
|
|
+ console.log(this.sitem);
|
|
|
this.ruleForm = {
|
|
|
- zxNo: zxNo || "",
|
|
|
- customer_code: khNo || "",
|
|
|
- customer_name: khname || "",
|
|
|
- class_cat: class_cat || "",
|
|
|
- goods_name: cpName || "",
|
|
|
- supplierNo: [],
|
|
|
- sendtype: "1", // 真实姓名
|
|
|
- good_num: "",
|
|
|
- sale_fee: sale_fee || "",
|
|
|
- goodtype: "1",
|
|
|
+ id: id || "",
|
|
|
+ status: "",
|
|
|
+ is_act: is_act === "1" || is_act === "2" ? is_act : "1",
|
|
|
+ customer_remark:
|
|
|
+ customer_remark === "1" || customer_remark === "2"
|
|
|
+ ? customer_remark
|
|
|
+ : "1",
|
|
|
+ remark: remark || "",
|
|
|
};
|
|
|
}
|
|
|
});
|
|
|
@@ -604,65 +256,13 @@ export default {
|
|
|
await this.$refs.ruleForm.validate(async (valid) => {
|
|
|
if (valid) {
|
|
|
this.loading = true;
|
|
|
- const {
|
|
|
- zxNo,
|
|
|
- customer_code,
|
|
|
- good_num,
|
|
|
- sendtype,
|
|
|
- supplierNo,
|
|
|
- goodtype,
|
|
|
- } = JSON.parse(JSON.stringify(this.ruleForm));
|
|
|
- const { addrlist } = JSON.parse(JSON.stringify(this.addrForm));
|
|
|
- console.log(goodtype);
|
|
|
- if (sendtype === "1") {
|
|
|
- let isok = true,
|
|
|
- addrT = 0;
|
|
|
- addrlist.forEach((v) => {
|
|
|
- addrT += parseInt(v.receipt_quantity);
|
|
|
- if (v.edit) {
|
|
|
- isok = false;
|
|
|
- }
|
|
|
- });
|
|
|
- if (!isok) {
|
|
|
- this.$message.warning("请保存地址信息！");
|
|
|
- this.loading = false;
|
|
|
- return;
|
|
|
- }
|
|
|
- if (parseInt(good_num) !== addrT) {
|
|
|
- this.$message.warning(
|
|
|
- "下单数量，与收货地址信息中的总数量不一致！"
|
|
|
- );
|
|
|
- this.loading = false;
|
|
|
- return;
|
|
|
- }
|
|
|
- }
|
|
|
- const model = {
|
|
|
- zxNo: zxNo || "",
|
|
|
- customer_code: customer_code || "",
|
|
|
- good_num: good_num || "",
|
|
|
- supplierNo: supplierNo.length > 0 ? supplierNo[0] : "",
|
|
|
- sendtype: sendtype | "",
|
|
|
- goodtype: goodtype || "",
|
|
|
- addrlist: [],
|
|
|
- };
|
|
|
- let list = [];
|
|
|
- addrlist.forEach((v) => {
|
|
|
- let xitem = {
|
|
|
- contactor: v.contactor,
|
|
|
- mobile: v.mobile,
|
|
|
- addr: v.addr,
|
|
|
- addr_code: v.addr_code,
|
|
|
- receipt_quantity: v.receipt_quantity,
|
|
|
- arrive_time: v.arrive_time,
|
|
|
- };
|
|
|
- list.push(xitem);
|
|
|
- });
|
|
|
- model.addrlist = sendtype === "1" ? list : [];
|
|
|
- let res = await asyncRequest.add(model);
|
|
|
+ const model = JSON.parse(JSON.stringify(this.ruleForm));
|
|
|
+ model.status = "2";
|
|
|
+ let res = await asyncRequest.status(model);
|
|
|
this.loading = false;
|
|
|
if (res && res.code === 0) {
|
|
|
this.$notify.success({
|
|
|
- title: "添加成功",
|
|
|
+ title: "提交成功！",
|
|
|
message: "",
|
|
|
});
|
|
|
this.showModelThis = false;
|
