pull/1/head
xiaozhiyong 2 years ago
parent 07be5d5e0d
commit 9c58fb5f1f
  1. 34
      src/utils/directive.js
  2. 18
      src/views/product/components/add.vue
  3. 6
      src/views/product/components/adjust.vue
  4. 8
      src/views/product/components/batch.vue
  5. 6
      src/views/product/components/create.vue
  6. 4
      src/views/product/index.vue
  7. 6
      src/views/refineryAccount/components/add.vue
  8. 12
      src/views/refineryInfo/components/add.vue

@ -1,18 +1,28 @@
import Vue from "vue"; import Vue from "vue";
const handle = (e, vNode) => {
let val = e.target.value;
let qualifiedNum = val
.replace(/[^\d.]/g, "")
.replace(/^\./g, "")
.replace(/\.{2,}/g, ".")
.replace(/^0{2,}/g, "0")
.replace(".", "$#$")
.replace(/\./g, "")
.replace("$#$", ".");
vNode.componentInstance.$emit("input", qualifiedNum);
};
Vue.directive("checkNum", { Vue.directive("checkNum", {
update(el, binding, vNode) { bind(el, binding, vNode) {
if (el.children.length) { if (!el.children.length) {
let val = el.children[0].value; return;
let qualifiedNum = val
.replace(/[^\d.]/g, "")
.replace(/^\./g, "")
.replace(/\.{2,}/g, ".")
.replace(/^0{2,}/g, "0")
.replace(".", "$#$")
.replace(/\./g, "")
.replace("$#$", ".");
vNode.componentInstance.$emit("input", qualifiedNum);
} }
el.children[0].addEventListener("keyup", (e) => {
handle(e, vNode);
});
},
unbind(el) {
el.children[0].removeEventListener("keyup");
}, },
}); });

@ -120,28 +120,28 @@ export default {
{ required: true, message: "请输入产品名称", trigger: "blur" }, { required: true, message: "请输入产品名称", trigger: "blur" },
], ],
productType: [ productType: [
{ required: true, message: "请选择产品类型", trigger: "blur" }, { required: true, message: "请选择产品类型", trigger: "change" },
], ],
refineryId: [ refineryId: [
{ required: true, message: "请选择炼厂", trigger: "blur" }, { required: true, message: "请选择炼厂", trigger: "change" },
], ],
belongLibrary: [ belongLibrary: [
{ required: true, message: "请输入所属炼厂库名", trigger: "blur" }, { required: true, message: "请输入所属炼厂库名", trigger: "blur" },
], ],
floorPrice: [ floorPrice: [
{ required: true, message: "请输入所属炼厂库名", trigger: "blur" }, { required: true, message: "请输入成本价", trigger: "blur" },
], ],
salePrice2company: [ salePrice2company: [
{ required: true, message: "请输入所属炼厂库名", trigger: "blur" }, { required: true, message: "请输入企业销售价", trigger: "blur" },
], ],
salePrice2personal: [ salePrice2personal: [
{ required: true, message: "请输入所属炼厂库名", trigger: "blur" }, { required: true, message: "请输入个人销售价", trigger: "blur" },
], ],
measurement: [ measurement: [
{ required: true, message: "请输入计量单位", trigger: "blur" }, { required: true, message: "请输入计量单位", trigger: "blur" },
], ],
enableMark: [ enableMark: [
{ required: true, message: "请选择启用状态", trigger: "blur" }, { required: true, message: "请选择启用状态", trigger: "change" },
], ],
}, },
}; };
@ -183,10 +183,12 @@ export default {
}, },
closeWindow() { closeWindow() {
this.$emit("closeWindow"); this.$emit("closeWindow");
this.$refs.form.clearValidate();
this.form = {}; this.form = {};
this.controlWindows.addInfo = {}; this.controlWindows.addInfo = {};
this.controlWindows.add = false; this.$nextTick(() => {
this.$refs.form.clearValidate();
this.controlWindows.add = false;
});
}, },
}, },
}; };

@ -69,8 +69,10 @@ export default {
closeWindow() { closeWindow() {
this.form = {}; this.form = {};
this.$emit("closeWindow"); this.$emit("closeWindow");
this.$refs.form.clearValidate(); this.$nextTick(() => {
this.controlWindows.adjust = false; this.$refs.form.clearValidate();
this.controlWindows.adjust = false;
});
}, },
}, },
}; };

@ -42,7 +42,7 @@ export default {
form: {}, form: {},
rules: { rules: {
enableMark: [ enableMark: [
{ required: true, message: "请选择修改状态", trigger: "blur" }, { required: true, message: "请选择修改状态", trigger: "change" },
], ],
}, },
}; };
@ -68,8 +68,10 @@ export default {
this.list = []; this.list = [];
this.form = {}; this.form = {};
this.$emit("closeWindow"); this.$emit("closeWindow");
this.$refs.form.clearValidate(); this.$nextTick(() => {
this.controlWindows.batch = false; this.$refs.form.clearValidate();
this.controlWindows.batch = false;
});
}, },
}, },
}; };

@ -103,13 +103,13 @@ export default {
{ required: true, message: "请输入产品名称", trigger: "blur" }, { required: true, message: "请输入产品名称", trigger: "blur" },
], ],
refineryId: [ refineryId: [
{ required: true, message: "请选择炼厂", trigger: "blur" }, { required: true, message: "请选择炼厂", trigger: "change" },
], ],
enableMark: [ enableMark: [
{ required: true, message: "请选择启用状态", trigger: "blur" }, { required: true, message: "请选择启用状态", trigger: "change" },
], ],
productType: [ productType: [
{ required: true, message: "请选择产品类型", trigger: "blur" }, { required: true, message: "请选择产品类型", trigger: "change" },
], ],
}, },
}; };

@ -328,10 +328,6 @@ export default {
title: "产品修改", title: "产品修改",
...row, ...row,
}; };
console.log(
"this.controlWindows.addInfo",
this.controlWindows.addInfo.floorPrice
);
this.controlWindows.add = true; this.controlWindows.add = true;
} }
}, },

@ -111,8 +111,10 @@ export default {
this.$emit("closeWindow"); this.$emit("closeWindow");
this.form = {}; this.form = {};
this.controlWindows.addInfo = {}; this.controlWindows.addInfo = {};
this.$refs.form.clearValidate(); this.$nextTick(() => {
this.controlWindows.add = false; this.$refs.form.clearValidate();
this.controlWindows.add = false;
});
}, },
}, },
}; };

@ -74,13 +74,13 @@ export default {
{ required: true, message: "请输入炼厂名称", trigger: "blur" }, { required: true, message: "请输入炼厂名称", trigger: "blur" },
], ],
refineryType: [ refineryType: [
{ required: true, message: "请选择炼厂类型", trigger: "blur" }, { required: true, message: "请选择炼厂类型", trigger: "change" },
], ],
enableMark: [ enableMark: [
{ required: true, message: "请选择启用状态", trigger: "blur" }, { required: true, message: "请选择启用状态", trigger: "change" },
], ],
refineryLevel: [ refineryLevel: [
{ required: true, message: "请选择炼厂等级", trigger: "blur" }, { required: true, message: "请选择炼厂等级", trigger: "change" },
], ],
address: [ address: [
{ required: true, message: "请输入炼厂地址", trigger: "blur" }, { required: true, message: "请输入炼厂地址", trigger: "blur" },
@ -117,8 +117,10 @@ export default {
this.$emit("closeWindow"); this.$emit("closeWindow");
this.form = {}; this.form = {};
this.controlWindows.addInfo = {}; this.controlWindows.addInfo = {};
this.$refs.form.clearValidate(); this.$nextTick(() => {
this.controlWindows.add = false; this.$refs.form.clearValidate();
this.controlWindows.add = false;
});
}, },
}, },
}; };

Loading…
Cancel
Save