From 509d10498313921fd795f73b8e7ae9ee43b0a81a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 16 Apr 2021 14:24:29 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-setting.html | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-setting.html b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-setting.html
index aaf9883..888cad5 100644
--- a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-setting.html
+++ b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-setting.html
@@ -39,6 +39,22 @@
<el-row style="margin-top: 20px;">
<el-col>
+ <template v-for="paramSettingzgfy in zgfy">
+ <el-form-item>
+ <span slot="label">{{paramSettingzgfy.paramName}}</span>
+ <el-col>
+ <el-radio-group v-model="paramSettingzgfy.paramValue">
+ <el-radio :label="'1'">是</el-radio>
+ <el-radio :label="'2'">否</el-radio>
+ </el-radio-group>
+ </el-col>
+ </el-form-item >
+ </template>
+ </el-col>
+ </el-row>
+
+ <el-row style="margin-top: 20px;">
+ <el-col>
<template v-for="paramSettingTwo in fxms">
<el-form-item>
<span slot="label">{{paramSettingTwo.paramName}}</span>
@@ -100,7 +116,7 @@
</el-col>
</el-row>
- <el-row v-show="isShow" style="margin-top: 20px;">
+ <el-row style="margin-top: 20px;">
<el-col>
<template v-for="paramSettingFour in shfs">
<el-form-item>
@@ -123,7 +139,7 @@
:direction="direction"
size="90%"
>
- <el-row >
+ <el-row style="margin-left: 50px;">
<el-col :span="24">
<el-row class="vertical ">
<el-input class="searchInput" @input="searchGoods()" v-model="queryKey"
@@ -287,6 +303,7 @@
sqfs:[],
shfs:[],
sqtj:[],
+ zgfy:[],
},
created: function () {
this.loadInfo();
@@ -315,6 +332,7 @@
_this.fxkg = data.mapInfo.fxkg;
_this.fxms = data.mapInfo.fxms;
_this.sqfs = data.mapInfo.sqfs;
+ _this.zgfy = data.mapInfo.zgfy;
if(_this.sqfs.length > 0){
let paramssqfs = _this.sqfs[0].paramValue;
if(paramssqfs == 2){
@@ -444,6 +462,21 @@
}
submitDate.push(obj);
}
+ for (let i = 0; i < _this.zgfy.length; i++) {
+ let paramSetting = _this.zgfy[i];
+ let paramCode = paramSetting.paramCode;
+ let paramValue = paramSetting.paramValue;
+ let paramValue1 = paramSetting.paramValue1;
+ let paramValue2 = paramSetting.paramValue2;
+
+ let obj = {
+ paramCode: paramCode,
+ paramValue: paramValue,
+ paramValue1: paramValue1,
+ paramValue2: paramValue2,
+ }
+ submitDate.push(obj);
+ }
for (let i = 0; i < _this.fxms.length; i++) {
let paramSetting = _this.fxms[i];
let paramCode = paramSetting.paramCode;
--
Gitblit v1.9.1