|
@@ -53,17 +53,17 @@
|
|
|
v-model="ruleForm.post_code"
|
|
|
maxlength="100"
|
|
|
/>
|
|
|
- </el-form-item>
|
|
|
+ </el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="16">
|
|
|
- <el-form-item label="备注" prop="remark">
|
|
|
+ <el-form-item label="备注" prop="remark">
|
|
|
<el-input
|
|
|
type="textarea"
|
|
|
placeholder="备注"
|
|
|
v-model="ruleForm.remark"
|
|
|
maxlength="100"
|
|
|
/>
|
|
|
- </el-form-item>
|
|
|
+ </el-form-item>
|
|
|
</el-col>
|
|
|
|
|
|
<el-col :span="8" style="text-align: right">
|
|
@@ -77,7 +77,12 @@
|
|
|
<script>
|
|
|
import asyncRequest from "@/apis/service/sellOut/sellOutOrder";
|
|
|
import resToken from "@/mixins/resToken";
|
|
|
-import { isnumber, isnumber2, isAlphanumeric } from "@/utils/validate";
|
|
|
+import {
|
|
|
+ isnumber,
|
|
|
+ isnumber2,
|
|
|
+ isAlphanumeric,
|
|
|
+ isChinese,
|
|
|
+} from "@/utils/validate";
|
|
|
export default {
|
|
|
name: "wsmInOrderAdd",
|
|
|
props: ["id", "sitem", "newTime"],
|
|
@@ -95,8 +100,8 @@ export default {
|
|
|
if (value === "") {
|
|
|
callback(new Error("不能为空!"));
|
|
|
} else {
|
|
|
- if (!isAlphanumeric(value)) {
|
|
|
- callback(new Error("仅支持字母和数字!"));
|
|
|
+ if (isChinese(value)) {
|
|
|
+ callback(new Error("仅支持字母和数字及特殊符号!"));
|
|
|
} else {
|
|
|
callback();
|
|
|
}
|
|
@@ -111,7 +116,7 @@ export default {
|
|
|
post_name: [],
|
|
|
post_code: "",
|
|
|
post_fee: "",
|
|
|
- remark:"",
|
|
|
+ remark: "",
|
|
|
// sendtime: "",
|
|
|
},
|
|
|
rules: {
|
|
@@ -131,11 +136,11 @@ export default {
|
|
|
validator: validate_num,
|
|
|
trigger: "blur",
|
|
|
},
|
|
|
- remark:{
|
|
|
+ remark: {
|
|
|
required: true,
|
|
|
validator: validate_num,
|
|
|
trigger: "blur",
|
|
|
- }
|
|
|
+ },
|
|
|
},
|
|
|
};
|
|
|
},
|
|
@@ -163,7 +168,7 @@ export default {
|
|
|
this.$refs.ruleForm.resetFields();
|
|
|
this.$refs.ruleForm.clearValidate();
|
|
|
|
|
|
- const { outCode, send_num, post_code, post_name, post_fee ,remark} =
|
|
|
+ const { outCode, send_num, post_code, post_name, post_fee, remark } =
|
|
|
this.sitem;
|
|
|
this.ruleForm = {
|
|
|
outCode: outCode || "",
|
|
@@ -171,7 +176,7 @@ export default {
|
|
|
post_name: post_name ? [post_name] : [],
|
|
|
post_code: post_code || "",
|
|
|
post_fee: post_fee || "",
|
|
|
- remark:remark || "",
|
|
|
+ remark: remark || "",
|
|
|
// sendtime: "",
|
|
|
};
|
|
|
}
|