From a13a93a493e7e94e28b2225c26e7e13b52d3288c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 12 Apr 2021 19:48:45 +0800
Subject: [PATCH] 20210412  tqq环境

---
 zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-setting.html |   39 +++++++++++++++++++++++++++++++++++----
 1 files changed, 35 insertions(+), 4 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 8a272d4..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){
@@ -347,7 +365,6 @@
                         return;
                     }
                 }
-                alert(selected);
                 if (!selected) {
                     //未选中产品加入列表
                     let item = {};
@@ -377,7 +394,6 @@
                     let goodsId = ShopProduct.id;
                     submitDate = submitDate +goodsId+",";
                 }
-                alert(submitDate);
                 _this.cpid = submitDate;
                 _this.drawer = false;
             },
@@ -446,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