Merge branch 'master' of http://121.196.213.68:3000/xiaozhiyong/refinery-admin
This commit is contained in:
@@ -21,7 +21,7 @@ service.interceptors.request.use(
|
|||||||
const JSESSIONID = utils.uuid();
|
const JSESSIONID = utils.uuid();
|
||||||
config.headers["JSESSIONID"] = JSESSIONID;
|
config.headers["JSESSIONID"] = JSESSIONID;
|
||||||
config.headers["token"] = utils.bcrypt(JSESSIONID);
|
config.headers["token"] = utils.bcrypt(JSESSIONID);
|
||||||
|
config.headers['dataSources'] = 'WEB'
|
||||||
if (env === "development") {
|
if (env === "development") {
|
||||||
return config;
|
return config;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -112,14 +112,14 @@ export default {
|
|||||||
"form.salePrice": {
|
"form.salePrice": {
|
||||||
handler(n, o) {
|
handler(n, o) {
|
||||||
if(n){
|
if(n){
|
||||||
this.form.preAmount = this.form.salePrice*(this.form.preQuantity?this.form.preQuantity:0)
|
this.form.preAmount = (this.form.salePrice*(this.form.preQuantity?this.form.preQuantity:0)).toFixed(2)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"form.preQuantity": {
|
"form.preQuantity": {
|
||||||
handler(n, o) {
|
handler(n, o) {
|
||||||
if(n){
|
if(n){
|
||||||
this.form.preAmount = this.form.preQuantity*(this.form.salePrice?this.form.salePrice:0)
|
this.form.preAmount = (this.form.preQuantity*(this.form.salePrice?this.form.salePrice:0)).toFixed(2)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@@ -193,7 +193,6 @@ export default {
|
|||||||
);
|
);
|
||||||
this.form.salePrice = this.productRowData[0].salePrice2company
|
this.form.salePrice = this.productRowData[0].salePrice2company
|
||||||
this.form.floorPrice = this.productRowData[0].floorPrice
|
this.form.floorPrice = this.productRowData[0].floorPrice
|
||||||
this.form.productMeasurement = this.productRowData[0].measurement
|
|
||||||
},
|
},
|
||||||
productChange(){
|
productChange(){
|
||||||
this.productData()
|
this.productData()
|
||||||
@@ -256,7 +255,7 @@ export default {
|
|||||||
submit() {
|
submit() {
|
||||||
this.$refs["form"].validate((valid) => {
|
this.$refs["form"].validate((valid) => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
|
this.form.productMeasurement = this.productRowData[0].measurement
|
||||||
this.judgeInterface(this.form).then((res) => {
|
this.judgeInterface(this.form).then((res) => {
|
||||||
if (res.code === 20000) {
|
if (res.code === 20000) {
|
||||||
this.$message.success(res.msg);
|
this.$message.success(res.msg);
|
||||||
|
|||||||
Reference in New Issue
Block a user