Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-20 fa791f7796c1546b1329b52a3de8d753915cb4d5

Merge remote-tracking branch 'origin/score_shop' into score_shop

 zq-erp/src/main/java/com/matrix/system/activity/dao/ActivitySignRecordDao.java

@@ -1,11 +1,14 @@
package com.matrix.system.activity.dao;


import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.matrix.system.activity.entity.ActivitySignRecord;
import com.matrix.system.shopXcx.api.vo.ActivitySignRecordVo;
import org.apache.ibatis.annotations.Param;

import java.util.Date;
import java.util.List;

/**
 * @description 签到记录表
@@ -17,4 +20,5 @@
    ActivitySignRecord selectOneByActIdAndUserIdLikesignTime(@Param("actId")long actId,
            @Param("userId")Long userId, @Param("format")Date format);

    List<ActivitySignRecordVo> selectRecordByMonth(@Param("actId")Long actId, @Param("userId")Long userId, @Param("date") DateTime date);
}

 zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignReceiveRecord.java

@@ -51,7 +51,7 @@
    private Long  awardId;
    
    /**
     * 是否已领取（1：待领取2:已领取）
     * 是否已领取（1：待领取2:已领取 3：待配送 4：待收货）
     */


@@ -59,7 +59,9 @@

    public static final int STATE_ING = 1;
    public static final int STATE_DONE = 2;
	
    public static final int STATE_THREE = 3;
    public static final int STATE_FOUR = 4;

    /**
     * 核销码
     */

 zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignAwardSetService.java

@@ -237,8 +237,10 @@
                    activitySignAwardSetUpdate.setUpdateBy(user.getSuName());
                    activitySignAwardSetUpdate.setCompanyId(companyId);
                    activitySignAwardSetUpdate.setActivityId(actId);
                    activitySignAwardSetUpdate.setAwardState(ActivitySignAwardSet.AWARDSTATE_WORK);
                    activitySignAwardSetDao.insert(activitySignAwardSetUpdate);
                }else {
                    activitySignAwardSetUpdate.setAwardState(ActivitySignAwardSet.AWARDSTATE_WORK);
                    activitySignAwardSetDao.updateById(activitySignAwardSetUpdate);
                    arrayListUpdate.add(actSubid);
                }

 zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignWriteoffService.java

@@ -278,7 +278,7 @@
            activitySignWriteoffDao.updateById(activitySignWriteoff);
            //更新领取记录
            ActivitySignReceiveRecord activitySignReceiveRecord = activitySignReceiveRecordDao.selectById(receiveId);
            activitySignReceiveRecord.setState(ActivitySignReceiveRecord.STATE_DONE);
            activitySignReceiveRecord.setState(ActivitySignReceiveRecord.STATE_THREE);
            activitySignReceiveRecord.setConsignee(logisticsSubmitDto.getShr());
            activitySignReceiveRecord.setConsigneeAddress(logisticsSubmitDto.getShdz());
            activitySignReceiveRecord.setConsigneePhone(logisticsSubmitDto.getLxdh());

 zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java

@@ -98,20 +98,20 @@
                    break;
                case "1":
                    queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
                    queryUse.setIsOver(Dictionary.FLAG_NO_N);
//                    queryUse.setIsOver(Dictionary.FLAG_NO_N);
                    break;
                case "2":
                    queryUse.setTargetFailTime(DateUtil.getDateAfterMonth(new Date(), 1));
                    queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
                    queryUse.setIsOver(Dictionary.FLAG_NO_N);
//                    queryUse.setIsOver(Dictionary.FLAG_NO_N);
                    break;
                case "3":
                    queryUse.setStatus(Dictionary.TAOCAN_STATUS_WX);
                    queryUse.setIsOver(Dictionary.FLAG_YES_Y);
//                    queryUse.setIsOver(Dictionary.FLAG_YES_Y);
                    break;
                default:
                    queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
                    queryUse.setIsOver(Dictionary.FLAG_NO_N);
//                    queryUse.setIsOver(Dictionary.FLAG_NO_N);
                    break;
            }
        } else {

 zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java

@@ -39,6 +39,9 @@
    @ApiModelProperty(value = "快过期 1-是 2-否")
    private String isInvalid;

    @ApiModelProperty(value = "项目状态 有效/无效")
    private String status;

    public String getIsInvalid() {
        Date date = DateUtil.getDateAfterMonth(new Date(), 1);
        if (invalidTime != null) {
@@ -112,4 +115,16 @@
    public void setId(Long id) {
        this.id = id;
    }

    public String getStatus() {
        if ("有效".equals(status)) {
            return "1";
        } else {
            return "2";
        }
    }

    public void setStatus(String status) {
        this.status = status;
    }
}

 zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java

@@ -43,6 +43,9 @@
    @ApiModelProperty(value = "快过期 1-是 2-否")
    private String isInvalid;

    @ApiModelProperty(value = "状态 有效/无效")
    private String status;

    @ApiModelProperty(hidden = true)
    private List<SysProjUse> taocanProjUse;

@@ -135,4 +138,16 @@
    public void setProj(List<ServiceProjVo> proj) {
        this.proj = proj;
    }

    public String getStatus() {
        if ("有效".equals(status)) {
            return "1";
        } else {
            return "2";
        }
    }

    public void setStatus(String status) {
        this.status = status;
    }
}

 zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java

@@ -44,7 +44,7 @@
    @Override
    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
    if ("dev".equals(evn)) {
            SysUsers sysUsers = sysUsersDao.selectById(1060L);
            SysUsers sysUsers = sysUsersDao.selectById(1022L);
            request.getSession().setAttribute(MatrixConstance.LOGIN_KEY, sysUsers);
            return true;
        }

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java

@@ -198,14 +198,14 @@
            achieveNew.setShoppingGoodsId(projUse.getProjId());

            if (flag) {
                if (!achieveId.equals(beauticianState.getStaffId())) {
//                if (!achieveId.equals(beauticianState.getStaffId())) {
                    AchieveNew saleMan = new AchieveNew();
                    BeanUtils.copyProperties(achieveNew, saleMan);
                    saleMan.setBeaultId(achieveId);

                    saleAchieveNumOfPeople(saleMan);
                    achieveNewList.add(saleMan);
                }
//                }
            }

            List<AchieveNew> beautyList = achieveNewDao.selectBeautyManAchieveList(beauticianState.getStaffId(), projServices.getVipId(), new Date());

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java

@@ -879,6 +879,8 @@
        if (skipServiceOrderStep(Dictionary.SERVICE_OVER_BEGIN_END)) {
            projServices.setStartTime(new Date());
            projServices.setState(Dictionary.SERVICE_STATU_FWWC);
        } else {
            projServices.setState(Dictionary.SERVICE_STATU_PLWC);
        }
        // 释放床位资源
//        SysBedState checkBedState = sysBedStateDao.selectBySerIdAndBedId(projServices.getBedId(), projServices.getId());

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java

@@ -1,6 +1,7 @@
package com.matrix.system.shopXcx.api.action;

import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON;
@@ -19,7 +20,6 @@
import com.matrix.system.activity.entity.ActivitySignRecord;
import com.matrix.system.activity.entity.ActivitySignWriteoff;
import com.matrix.system.hive.bean.SysVipInfo;
import com.matrix.system.shopXcx.api.dto.ClickSignDTO;
import com.matrix.system.shopXcx.api.dto.SeeAwardTextDto;
import com.matrix.system.shopXcx.api.dto.SignAwardDto;
import com.matrix.system.shopXcx.api.vo.*;
@@ -35,6 +35,9 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;

@@ -100,12 +103,79 @@
        }else {
            signBasicInfoVo.setJoinState(SignBasicInfoVo.JOINSTATE_NOTSIGN);
        }
        /**
         * 默认获取当前月份
         *      获取当前月份的天数
         */
        List<ActivitySignRecordVo> activitySignRecordVos = new ArrayList<>();
        //获取当前月的第一天是星期几
        DateTime dateTime = DateUtil.beginOfMonth(DateUtil.date());
        int i = DateUtil.dayOfWeek(dateTime);
        for(int j = 1;j<i;j++){
            ActivitySignRecordVo activitySignRecordVoNull = new ActivitySignRecordVo();
            activitySignRecordVos.add(activitySignRecordVoNull);
        }
        List<String> monthFullDays = getMonthFullDay(DateUtil.year(DateUtil.date()), DateUtil.month(DateUtil.date()) + 1);
        for(String monthFullDay : monthFullDays){
            ActivitySignRecordVo activitySignRecordVo = new ActivitySignRecordVo();
            activitySignRecordVo.setSignTime(monthFullDay);
            activitySignRecordVo.setActivityId(actId);
            activitySignRecordVo.setCompanyId(companyId);
            //对应日期是否已签到
            Date date = DateUtil.parse(monthFullDay);
            ActivitySignRecord activitySignRecordDone = activitySignRecordDao.selectOneByActIdAndUserIdLikesignTime(actId,userId,date);
            if(ObjectUtil.isNotEmpty(activitySignRecordDone)){
                activitySignRecordVo.setState(1);
            }else{
                activitySignRecordVo.setState(2);
            }
            activitySignRecordVos.add(activitySignRecordVo);
        }
        signBasicInfoVo.setActivitySignRecords(activitySignRecordVos);

        //累计签到日期
        int cumulativeDay = getCumulativeDay(actId, userId, DateUtil.date(), 0);
        signBasicInfoVo.setActAumulativeDay(cumulativeDay);
        ajaxResult = AjaxResult.buildSuccessInstance("");
        ajaxResult.setData(signBasicInfoVo);
        return ajaxResult;
    }
	
    /**
    /**
     *  java 获取 获取某年某月 所有日期（yyyy-mm-dd格式字符串）
     * @param year
     * @param month
     * @return
     */
    public List<String> getMonthFullDay(int year , int month){
        SimpleDateFormat dateFormatYYYYMMDD = new SimpleDateFormat("yyyy-MM-dd");
        List<String> fullDayList = new ArrayList<>(32);
        // 获得当前日期对象
        Calendar cal = Calendar.getInstance();
        cal.clear();// 清除信息
        cal.set(Calendar.YEAR, year);
        // 1月从0开始
        cal.set(Calendar.MONTH, month-1 );
        // 当月1号
        cal.set(Calendar.DAY_OF_MONTH,1);
        int count = cal.getActualMaximum(Calendar.DAY_OF_MONTH);
        for (int j = 1; j <= count ; j++) {
            fullDayList.add(dateFormatYYYYMMDD.format(cal.getTime()));
            cal.add(Calendar.DAY_OF_MONTH,1);
        }
        return fullDayList;
    }

    /**
     * 获取当月的 天数
     * */
    public static int getCurrentMonthDay(Date date) {
        Date beginOfMonth = DateUtil.beginOfMonth(date);
        Date endOfMonth = DateUtil.endOfMonth(date);
        long betweenDay = DateUtil.between(beginOfMonth, endOfMonth, DateUnit.DAY);
        return Integer.parseInt(String.valueOf(betweenDay))+1;
    }

    /**
     * 点击签到
     *
     */
@@ -113,11 +183,12 @@
    @ApiResponses({
            @ApiResponse(code = 200, message = "ok", response = SignSuccessVo.class)
    })
    @PostMapping(value = "/clickSign")

    @GetMapping(value = "/clickSign/{actId}")
    @ResponseBody
    @Transactional
    public AjaxResult clickSign(@RequestBody ClickSignDTO clickSignDTO) {
    public AjaxResult clickSign(@PathVariable("actId") long actId) {
        SysVipInfo user = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
        long actId = clickSignDTO.getActId();
        Long userId = user.getId();
        Long companyId = user.getCompanyId();
        /**
@@ -152,9 +223,9 @@
        ActivitySignRecord activitySignRecordOld = activitySignRecordDao.selectOneByActIdAndUserIdLikesignTime(actId,userId,offsetDay);
        ActivitySignRecord activitySignRecordAdd = new ActivitySignRecord();
        activitySignRecordAdd.setCompanyId(companyId);
        activitySignRecordAdd.setCreateBy(user.getName());
        activitySignRecordAdd.setCreateBy(user.getVipName());
        activitySignRecordAdd.setCreateTime(new Date());
        activitySignRecordAdd.setUpdateBy(user.getName());
        activitySignRecordAdd.setUpdateBy(user.getVipName());
        activitySignRecordAdd.setUpdateTime(new Date());
        activitySignRecordAdd.setActivityId(actId);
        activitySignRecordAdd.setSignTime(date);
@@ -187,12 +258,13 @@
            activitySignReceiveRecord.setState(ActivitySignReceiveRecord.STATE_DONE);
            activitySignReceiveRecord.setActivityId(actId);
            activitySignReceiveRecord.setCompanyId(companyId);
            activitySignReceiveRecord.setCreateBy(user.getName());
            activitySignReceiveRecord.setCreateBy(user.getVipName());
            activitySignReceiveRecord.setCreateTime(new Date());
            activitySignReceiveRecord.setUpdateBy(user.getName());
            activitySignReceiveRecord.setUpdateBy(user.getVipName());
            activitySignReceiveRecord.setUpdateTime(new Date());
            activitySignReceiveRecordDao.insert(activitySignReceiveRecord);
        	

            signSuccessVo.setScoreCnt(activitySignAwardSetNormal.getScoreCnt());
            signSuccessVo.setNormalAwardName(activitySignAwardSetNormal.getAwardName());
            signSuccessVo.setNormalAwardImg(activitySignAwardSetNormal.getIntroduceImg());
        }
@@ -228,9 +300,9 @@
            activitySignReceiveRecord.setActivityId(actId);
            activitySignReceiveRecord.setCompanyId(companyId);
            activitySignReceiveRecord.setState(ActivitySignReceiveRecord.STATE_DONE);
            activitySignReceiveRecord.setCreateBy(user.getName());
            activitySignReceiveRecord.setCreateBy(user.getVipName());
            activitySignReceiveRecord.setCreateTime(new Date());
            activitySignReceiveRecord.setUpdateBy(user.getName());
            activitySignReceiveRecord.setUpdateBy(user.getVipName());
            activitySignReceiveRecord.setUpdateTime(new Date());
            /**
             * 奖项类型（1：自定义产品2：积分3：优惠券4：店铺商品）
@@ -296,9 +368,9 @@
                activitySignWriteoff.setUserId(userId);
                activitySignWriteoff.setCompanyId(companyId);
                activitySignWriteoff.setReceiveId(activitySignReceiveRecord.getId());
                activitySignWriteoff.setCreateBy(user.getName());
                activitySignWriteoff.setCreateBy(user.getVipName());
                activitySignWriteoff.setCreateTime(new Date());
                activitySignWriteoff.setUpdateBy(user.getName());
                activitySignWriteoff.setUpdateBy(user.getVipName());
                activitySignWriteoff.setUpdateTime(new Date());
                activitySignWriteoffDao.insert(activitySignWriteoff);
            }
@@ -373,7 +445,7 @@
     *
     * @return
     */
    @ApiOperation(value = "查看劵码", notes = "")
    @ApiOperation(value = "物流配送确认", notes = "")
    @PostMapping(value = "/logisticsInsure")
    @ApiResponses({
            @ApiResponse(code = 200, message = "ok", response = SeeAwardTextVo.class)

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/ActivitySignRecordVo.java

New file
@@ -0,0 +1,39 @@
package com.matrix.system.shopXcx.api.vo;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel(value = "ActivitySignRecordVo", description = "签到明细")
public class ActivitySignRecordVo {

    @ApiModelProperty(value ="签到状态 1：已签到 2：未签到")
    private int state;
    /**
     * 签到时间
     */



    @ApiModelProperty(value ="签到时间")
    private String  signTime;

    /**
     * 活动主表ID
     */



    @ApiModelProperty(value ="活动主表ID")
    private Long  activityId;

    /**
     * 公司ID
     */



    @ApiModelProperty(value ="公司ID")
    private Long  companyId;
}

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignAwardListVo.java

@@ -27,7 +27,7 @@
    @ApiModelProperty(value ="数量")
    private int  total;
    
    @ApiModelProperty(value ="是否已领取（1：待领取2:已领取）")
    @ApiModelProperty(value ="是否已领取（1：待领取2:已领取 3：待配送 4：待收货）")
    private Integer  state;
    
    @ApiModelProperty(value ="领取时间")

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignBasicInfoVo.java

@@ -1,13 +1,12 @@
package com.matrix.system.shopXcx.api.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;
import java.util.List;

import com.fasterxml.jackson.annotation.JsonFormat;

@Data

@@ -23,7 +22,10 @@

    public static final int JOINSTATE_NOTSIGN = 1;
    public static final int JOINSTATE_SIGN = 2;
	

    @ApiModelProperty(value ="当前累计签到天数")
    private int actAumulativeDay;

    @ApiModelProperty(value ="活动名称")
    private String actName;
    @ApiModelProperty(value ="活动编码")
@@ -38,5 +40,7 @@
    private SignBasicInfoJsonVo signBasicInfoJsonVo;
    @ApiModelProperty(value ="奖品信息")
    private List<ActivitySignAwardSetVo> activitySignAwardSetVos;
    @ApiModelProperty(value ="签到天数")
    private List<ActivitySignRecordVo> activitySignRecords;

}

 zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml

@@ -86,7 +86,6 @@
        LEFT JOIN activity_sign_award_set b ON a.award_id = b.id
        where
              b.award_type = 1
              and a.state = 1
              and a.company_id = #{companyId}
            and a.user_id = #{userId}

@@ -107,7 +106,6 @@
        LEFT JOIN activity_sign_award_set b ON a.award_id = b.id
        WHERE
        b.award_type = 1
        AND a.state = 1
        and a.company_id = #{record.companyId}
        and a.user_id = #{record.userId}
        <if test="record.sort !=null">

 zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignRecordDao.xml

@@ -14,4 +14,14 @@
            and a.sign_time like concat('%',DATE(#{format}),'%')
    </select>

    <select id="selectRecordByMonth" resultType="com.matrix.system.shopXcx.api.vo.ActivitySignRecordVo">
        SELECT
            *
        FROM
            activity_sign_record a
        where a.sign_time like concat('%',DATE_FORMAT(#{date},'%Y-%m'),'%')
          and a.activity_id = #{actId}
          and a.user_id = #{userId}
    </select>

</mapper>

 zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml

@@ -896,6 +896,7 @@
            <result property="timeLength" column="proj_time_length"/>
            <result property="img" column="proj_img"/>
            <result property="projId" column="proj_projId"/>
            <result property="status" column="proj_status"/>
        </collection>
    </resultMap>

@@ -911,6 +912,7 @@
            e.SURPLUS_COUNT proj_SURPLUS_COUNT,
            e.id proj_info_id,
            e.proj_id proj_projId,
            e.status proj_status,
            f.time_length proj_time_length,
            f.img proj_img
        from sys_proj_use a

 zq-erp/src/main/resources/static/images/sign/jisumiaosha.png

 zq-erp/src/main/resources/static/images/sign/meiriqiandao.png

 zq-erp/src/main/resources/static/images/sign/shalonghuodong.png

 zq-erp/src/main/resources/static/images/sign/signButton.png

 zq-erp/src/main/resources/static/images/sign/signHead.png

 zq-erp/src/main/resources/static/images/sign/tiantianpingtuan.png

 zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html

@@ -56,7 +56,7 @@
    <el-row>
        <el-col :span="4">
            <el-card class="box-card" :body-style="{ padding: '10px 10px'}">
                <img src="imageUrlqd" class="image">
                <img src="../../../images/sign/meiriqiandao.png" class="image">
                <div style="padding: 5px;">
                    <span style="padding:5px;font-size: 30px;">每日签到</span>
                    <div class="bottom clearfix">
@@ -67,7 +67,7 @@
        </el-col>
        <el-col :span="4">
            <el-card class="box-card" :body-style="{ padding: '10px 10px'}">
                <img src="imageUrlpt" class="image">
                <img src="../../../images/sign/tiantianpingtuan.png" class="image">
                <div style="padding: 5px;">
                    <span style="padding:5px;font-size: 30px;">拼团</span>
                    <div class="bottom clearfix">
@@ -78,7 +78,7 @@
        </el-col>
        <el-col :span="4">
            <el-card class="box-card" :body-style="{ padding: '10px 10px'}">
                <img src="imageUrlms" class="image">
                <img src="../../../images/sign/jisumiaosha.png" class="image">
                <div style="padding: 5px;">
                    <span style="padding:5px;font-size: 30px;">秒杀</span>
                    <div class="bottom clearfix">
@@ -89,7 +89,7 @@
        </el-col>
        <el-col :span="4">
            <el-card class="box-card" :body-style="{ padding: '10px 10px'}">
                <img src="imageUrlsl" class="image">
                <img src="../../../images/sign/shalonghuodong.png" class="image">
                <div style="padding: 5px;">
                    <span style="padding:5px;font-size: 30px;">沙龙</span>
                    <div class="bottom clearfix">
@@ -116,10 +116,10 @@
    var app = new Vue({
        el: '#app',
        data: {
            imageUrlqd: basePath + "/image/meiriqiandao.png",
            imageUrlms: basePath + "/image/jisumiaosha.png",
            imageUrlpt: basePath + "/image/tiantianpingtuan.png",
            imageUrlsl: basePath + "/image/shalonghuodong.png",
            imageUrlqd: "../../images/sign/meiriqiandao.png",
            imageUrlms: "../../images/sign/jisumiaosha.png",
            imageUrlpt: "../../images/sign/tiantianpingtuan.png",
            imageUrlsl: "../../images/sign/shalonghuodong.png",
        },
        created: function () {
        },

 zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-logistics-info.html

@@ -49,7 +49,7 @@
                        <el-row style="display:flex;">
                            <el-col>
                                <el-form-item label="奖品图片：" :label-width="formLabelWidth">
                                    {{formSelect.jptp}}
                                    <img :src="formSelect.jptp" style="max-width: 200px;">
                                </el-form-item>
                            </el-col>
                            <el-col>

 zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-update.html

@@ -49,13 +49,12 @@
        }
        .imageTwo {
            display: block;
            height: 50px;
            height: 280px;
            padding: 5px 5px;
            text-align: center;
        }
        .imageThree {
            display: block;
            height: 50px;
            padding: 5px 5px;
            text-align: center;
        }
@@ -74,14 +73,16 @@
        <el-container>
            <el-aside width="30%">
                <el-card class="box-card" :body-style="{ padding: '10px 10px'}">
                    <div @click="uploadImg()" class="imageOne">
                    <!--<div @click="uploadImg()" class="imageOne">
                        <img v-if="imageUrlTitle" :src="imageUrlTitle" style="width: 100%;">
                        <el-button type="primary" v-show="imageUrlTitle == ''" round><span style="font-size: 20px;">标题</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
                    </div>
                    <div @click="uploadImg()" class="imageTwo" >
                        <img v-if="imageUrlHead" :src="imageUrlHead" style="width: 100%;">
                        <el-button type="primary" v-show="imageUrlHead == ''" round><span style="font-size: 20px;">头部</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
                    </div>
                    </div>-->
                    <el-row>
                        <div @click="uploadImg()" class="imageTwo" >
                            <img v-if="imageUrlHead" :src="imageUrlHead" style="width: 100%;height: 100%">
                            <el-button type="primary" v-show="imageUrlHead == ''" round><span style="font-size: 20px;">头部</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
                        </div>
                    </el-row>
                    <el-row style="display:flex;">
                        <el-col>
                            <div style="padding:5px;font-size: 15px;text-align: left;"><span>您已累计签到<span style="color: red;">3</span>天</span></div>
@@ -90,39 +91,48 @@
                            <div style="padding:5px;font-size: 15px;text-align: right;"><span>签到提醒</span></div>
                        </el-col>
                    </el-row>
                    <div @click="uploadImg()">
                        <el-calendar :range="['2019-03-04', '2019-03-24']"></el-calendar>
                        <img v-if="imageUrlState" :src="imageUrlState" style="width: 100%;">
                        <el-button type="primary" v-show="imageUrlState == ''" round><span style="font-size: 20px;">日历签到背景</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
                    </div>
                    <div @click="uploadImg()" class="imageThree" >
                        <el-button type="primary" v-show="imageUrlButton == ''" round><span style="font-size: 20px;">签到按钮</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
                        <img v-if="imageUrlButton" :src="imageUrlButton" style="width: 100%;">
                    </div>

                    <div style="text-align: center;padding: 5px;" @click="gzsmSet()">
                        <div class="col-sm-8 col-sm-offset-2" style="text-align: left;">
                            <span style="padding:5px;font-size: 30px;">-- 规则说明--</span>
                    <el-row>
                        <div @click="uploadImg()">
                            <el-calendar :range="['2019-03-04', '2019-03-24']"></el-calendar>
                            <img v-if="imageUrlState" :src="imageUrlState" style="width: 100%;">
                            <!--<el-button type="primary" v-show="imageUrlState == ''" round><span style="font-size: 20px;">日历签到背景</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>-->
                        </div>
                        <div class="el-col-sm-24" style="text-align: center;">
                            <span style="padding:5px;font-size: 15px;color: red;">(点击，编辑规则内容，背景颜色，字体颜色、大小、透明度)</span>
                    </el-row>

                    <el-row>
                        <div @click="uploadImg()" class="imageThree" >
                            <el-button type="primary" v-show="imageUrlButton == ''" round><span style="font-size: 20px;">签到按钮</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
                            <img v-if="imageUrlButton" :src="imageUrlButton" style="width: 100%;">
                        </div>
                        <div class="col-sm-8 col-sm-offset-2" style="text-align: left;">
                            <span style="padding:5px;font-size: 15px;">1、每天参与签到可获得积分</span>
                    </el-row>


                    <el-row>
                        <div style="text-align: center;padding: 5px;" @click="gzsmSet()">
                            <div class="col-sm-8 col-sm-offset-2" style="text-align: left;">
                                <span style="padding:5px;font-size: 30px;">-- 规则说明--</span>
                            </div>
                            <div class="el-col-sm-24" style="text-align: center;">
                                <span style="padding:5px;font-size: 15px;color: red;">(点击，编辑规则内容，背景颜色，字体颜色、大小、透明度)</span>
                            </div>
                            <div class="col-sm-8 col-sm-offset-2" style="text-align: left;">
                                <span style="padding:5px;font-size: 15px;">1、每天参与签到可获得积分</span>
                            </div>
                            <div class="col-sm-8 col-sm-offset-2" style="text-align: left;">
                                <span style="padding:5px;font-size: 15px;">2、连续签到7天将获得赠送大礼包</span>
                            </div>
                            <div class="col-sm-8 col-sm-offset-2" style="text-align: left;">
                                <span style="padding:5px;font-size: 15px;">3、每7天重新开始计算</span>
                            </div>
                        </div>
                        <div class="col-sm-8 col-sm-offset-2" style="text-align: left;">
                            <span style="padding:5px;font-size: 15px;">2、连续签到7天将获得赠送大礼包</span>
                        </div>
                        <div class="col-sm-8 col-sm-offset-2" style="text-align: left;">
                            <span style="padding:5px;font-size: 15px;">3、每7天重新开始计算</span>
                        </div>
                    </div>
                    </el-row>
                </el-card>
            </el-aside>

            <el-main width="70%">
                <div>
                    <el-tabs v-model="activeName" >
                    <el-tabs v-model="activeName"  @tab-click="clickSecondTab">
                        <el-tab-pane label="活动设置" name="first">
                            <div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
                                <el-form-item label="活动名称" prop="actName">
@@ -152,7 +162,7 @@
                        <el-tab-pane label="奖品设置" name="second">
                            <el-row style="display:flex;">
                                <el-col :span="20">
                                    <el-tabs v-model="editableTabsValue" type="card" closable @tab-remove="removeTab">
                                    <el-tabs v-model="editableTabsValue" type="card" closable @tab-click="clickTab" @tab-remove="removeTab">
                                        <el-tab-pane v-for="(item, index) in editableTabs" :key="item.name" :label="item.title" :name="item.name">
                                            <el-row v-show="editableTabsValue !== '1'">
                                                <el-form-item label="签到累计天数">
@@ -407,13 +417,8 @@
                                                                          stripe:true
                                                                          style="width: 100%">
                                                                    <el-table-column
                                                                            prop="cname"
                                                                            label="优惠券名称"
                                                                            show-overflow-tooltip>
                                                                    </el-table-column>
                                                                    <el-table-column
                                                                            prop="endTime"
                                                                            label="截止日期"
                                                                            prop="name"
                                                                            label="名称"
                                                                            show-overflow-tooltip>
                                                                    </el-table-column>
                                                                    <el-table-column
@@ -456,7 +461,7 @@
                        </el-tab-pane>

                        <el-tab-pane label="背景图片上传" name="third">
                            <div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
                            <!--<div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
                                <el-form-item label="标题">
                                    <el-upload
                                            action="/admin/multipleUploadFile/doUpload"
@@ -465,7 +470,7 @@
                                        <img v-if="imageUrlTitle" :src="imageUrlTitle" style="max-width: 300px;">
                                    </el-upload>
                                </el-form-item>
                            </div>
                            </div>-->
                            <div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
                                <el-form-item label="头部">
                                    <el-upload
@@ -476,7 +481,7 @@
                                    </el-upload>
                                </el-form-item>
                            </div>
                            <div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
                            <!--<div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
                                <el-form-item label="日历签到背景">
                                    <el-upload
                                            action="/admin/multipleUploadFile/doUpload"
@@ -485,7 +490,7 @@
                                        <img v-if="imageUrlState" :src="imageUrlState" style="max-width: 300px;">
                                    </el-upload>
                                </el-form-item>
                            </div>
                            </div>-->
                            <div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
                                <el-form-item label="签到按钮">
                                    <el-upload
@@ -575,8 +580,8 @@
            formLabelWidth: '120px',
            //标题图片
            imageUrlTitle: '',
            imageUrlHead: '',
            imageUrlButton: '',
            imageUrlHead: "../../../images/sign/signHead.png",
            imageUrlButton: "../../../images/sign/signButton.png",
            imageUrlState: '',

            activeClickTab:0,
@@ -666,6 +671,8 @@
                let _this = this;
                _this.drawerCoupon = true;
                _this.activeClickTab = parseInt(name);

                console.log(_this.activeClickTab);
                _this.formCoupon.yhjmc = val;
                _this.loadCouponList();
            },
@@ -701,8 +708,6 @@
            },
            //重置
            resetFormCoupon(formName) {
                // this.formCoupon.yhjmc = ''
                // console.log(this.$refs[formName].resetFields)
                (this.$refs[formName])[0].resetFields();
            },
            changePageSizeCoupon(val) {
@@ -951,6 +956,14 @@
                    content: JSON.parse(JSON.stringify(prize)),
                });
                this.editableTabsValue = newTabName;
                this.activeClickTab = parseInt(newTabName);
            },
            clickSecondTab(targetName) {
                this.activeClickTab = 1;
            },
            clickTab(targetName) {
                console.log(targetName.name);
                this.activeClickTab = parseInt(targetName.name);
            },
            removeTab(targetName) {
                let tabs = this.editableTabs;

 zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff-info.html

@@ -31,7 +31,7 @@
                <el-row style="display:flex;">
                    <el-col :span="6">
                        <el-form-item label="奖品图片：" :label-width="formLabelWidth">
                            {{formSelect.jptp}}
                            <img :src="formSelect.jptp" style="max-width: 200px;">
                        </el-form-item>
                    </el-col>
                    <el-col :span="6">

 zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html

@@ -56,13 +56,12 @@
        }
        .imageTwo {
            display: block;
            height: 50px;
            height: 280px;
            padding: 5px 5px;
            text-align: center;
        }
        .imageThree {
            display: block;
            height: 50px;
            padding: 5px 5px;
            text-align: center;
        }
@@ -81,14 +80,16 @@
    <el-container>
        <el-aside width="30%">
            <el-card class="box-card" :body-style="{ padding: '10px 10px'}">
                <div @click="uploadImg()" class="imageOne">
                <!--<div @click="uploadImg()" class="imageOne">
                    <img v-if="imageUrlTitle" :src="imageUrlTitle" style="width: 100%;">
                    <el-button type="primary" v-show="imageUrlTitle == ''" round><span style="font-size: 20px;">标题</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
                </div>
                <div @click="uploadImg()" class="imageTwo" >
                    <img v-if="imageUrlHead" :src="imageUrlHead" style="width: 100%;">
                    <el-button type="primary" v-show="imageUrlHead == ''" round><span style="font-size: 20px;">头部</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
                </div>
                </div>-->
                <el-row>
                    <div @click="uploadImg()" class="imageTwo" >
                        <img v-if="imageUrlHead" :src="imageUrlHead" style="width: 100%;height: 100%">
                        <el-button type="primary" v-show="imageUrlHead == ''" round><span style="font-size: 20px;">头部</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
                    </div>
                </el-row>
                <el-row style="display:flex;">
                    <el-col>
                        <div style="padding:5px;font-size: 15px;text-align: left;"><span>您已累计签到<span style="color: red;">3</span>天</span></div>
@@ -97,16 +98,24 @@
                        <div style="padding:5px;font-size: 15px;text-align: right;"><span>签到提醒</span></div>
                    </el-col>
                </el-row>

                <el-row>
                <div @click="uploadImg()">
                    <el-calendar :range="['2019-03-04', '2019-03-24']"></el-calendar>
                    <img v-if="imageUrlState" :src="imageUrlState" style="width: 100%;">
                    <el-button type="primary" v-show="imageUrlState == ''" round><span style="font-size: 20px;">日历签到背景</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
                    <!--<el-button type="primary" v-show="imageUrlState == ''" round><span style="font-size: 20px;">日历签到背景</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>-->
                </div>
                </el-row>

                <el-row>
                <div @click="uploadImg()" class="imageThree" >
                    <el-button type="primary" v-show="imageUrlButton == ''" round><span style="font-size: 20px;">签到按钮</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
                    <img v-if="imageUrlButton" :src="imageUrlButton" style="width: 100%;">
                </div>
                </el-row>


                <el-row>
                <div style="text-align: center;padding: 5px;" @click="gzsmSet()">
                    <div class="col-sm-8 col-sm-offset-2" style="text-align: left;">
                        <span style="padding:5px;font-size: 30px;">-- 规则说明--</span>
@@ -124,12 +133,13 @@
                        <span style="padding:5px;font-size: 15px;">3、每7天重新开始计算</span>
                    </div>
                </div>
                </el-row>
            </el-card>
        </el-aside>

        <el-main width="70%">
            <div>
                <el-tabs v-model="activeName" >
                <el-tabs v-model="activeName" @tab-click="clickSecondTab">
                            <el-tab-pane label="活动设置" name="first">
                                <div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
                                    <el-form-item label="活动名称" prop="actName">
@@ -159,7 +169,7 @@
                            <el-tab-pane label="奖品设置" name="second">
                                <el-row style="display:flex;">
                                    <el-col :span="20">
                                        <el-tabs v-model="editableTabsValue" type="card" closable @tab-remove="removeTab">
                                        <el-tabs v-model="editableTabsValue" type="card" closable @tab-click="clickTab" @tab-remove="removeTab">
                                            <el-tab-pane v-for="(item, index) in editableTabs" :key="item.name" :label="item.title" :name="item.name">
                                                <el-row v-show="editableTabsValue !== '1'">
                                                    <el-form-item label="签到累计天数">
@@ -413,13 +423,8 @@
                                                                              stripe:true
                                                                              style="width: 100%">
                                                                        <el-table-column
                                                                                prop="cname"
                                                                                label="优惠券名称"
                                                                                show-overflow-tooltip>
                                                                        </el-table-column>
                                                                        <el-table-column
                                                                                prop="endTime"
                                                                                label="截止日期"
                                                                                prop="name"
                                                                                label="名称"
                                                                                show-overflow-tooltip>
                                                                        </el-table-column>
                                                                        <el-table-column
@@ -462,7 +467,7 @@
                            </el-tab-pane>

                            <el-tab-pane label="背景图片上传" name="third">
                                <div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
                                <!--<div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
                                    <el-form-item label="标题">
                                        <el-upload
                                                action="/admin/multipleUploadFile/doUpload"
@@ -471,7 +476,7 @@
                                            <img v-if="imageUrlTitle" :src="imageUrlTitle" style="max-width: 300px;">
                                        </el-upload>
                                    </el-form-item>
                                </div>
                                </div>-->
                                <div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
                                    <el-form-item label="头部">
                                        <el-upload
@@ -482,7 +487,7 @@
                                        </el-upload>
                                    </el-form-item>
                                </div>
                                <div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
                                <!--<div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
                                    <el-form-item label="日历签到背景">
                                        <el-upload
                                                action="/admin/multipleUploadFile/doUpload"
@@ -491,7 +496,7 @@
                                            <img v-if="imageUrlState" :src="imageUrlState" style="max-width: 300px;">
                                        </el-upload>
                                    </el-form-item>
                                </div>
                                </div>-->
                                <div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
                                    <el-form-item label="签到按钮">
                                        <el-upload
@@ -616,8 +621,8 @@

            //标题图片
            imageUrlTitle: '',
            imageUrlHead: basePath + "/image/signHead.png",
            imageUrlButton: basePath + "/image/signButton.png",
            imageUrlHead: "../../../images/sign/signHead.png",
            imageUrlButton: "../../../images/sign/signButton.png",
            imageUrlState: '',

            //字体颜色
@@ -880,6 +885,14 @@
                    content: JSON.parse(JSON.stringify(prize)),
                });
                this.editableTabsValue = newTabName;
                this.activeClickTab = parseInt(newTabName);
            },
            clickSecondTab(targetName) {
                this.activeClickTab = 1;
            },
            clickTab(targetName) {
                console.log(targetName.name);
                this.activeClickTab = parseInt(targetName.name);
            },
            removeTab(targetName) {
                let tabs = this.editableTabs;
@@ -940,7 +953,6 @@
            //奖品设置的图片介绍
            introduceImgSuccess(res, file) {
                this.editableTabs[this.activeClickTab-1].content.introduceImg = res.path;
                // this.prize.introduceImg = URL.createObjectURL(file.raw);
            },
            //奖品设置的客服微信
            wechatImgSuccess(res, file) {

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/servicceAddForm.html

@@ -75,6 +75,9 @@
            padding-left: 10px;
            margin-left:10px ;
        }
        .openOrClose {
            cursor:pointer
        }
    </style>
</head>
<body>
@@ -124,14 +127,17 @@

                </el-tab-pane>
                <el-tab-pane label="套餐" name="tab2">
                    <template v-for="(item,index) in taocanList" v-if="index > 3 ? tcIsOpen : true">
                        <p class="el-big-title">{{index}}【{{item.isCourse=='N'?'固定套餐':'任选套餐'}}】{{item.projName}}
                    <template v-for="(item,index) in taocanList">
                        <p class="el-big-title">
                            <span class="openOrClose" v-if="!item.openOrClose" @click="openOrCloseTc(item, index, 1)"><i class="el-icon-arrow-down"></i></span>
                            <span class="openOrClose" v-if="item.openOrClose" @click="openOrCloseTc(item, index, 2)"><i class="el-icon-arrow-up"></i></span>
                            【{{item.isCourse=='N'?'固定套餐':'任选套餐'}}】{{item.projName}}
                            <span style="float: right" v-if="item.failTime != null">有效期:{{item.failTime}}</span>
                            <code v-if="item.projInfo.isCourse=='Y'" > 剩余次数：<span v-if="item.projInfo.isInfinite == 'Y'">无限次</span><span v-else>{{item.surplusCount}}</span> </code>
                        </p>
                        <el-table
                                :data="item.taocanProjUse"
                                style="width: 98%">
                                style="width: 98%" v-show="item.openOrClose">
                            <el-table-column
                                    prop="projName"
                                    label="项目">
@@ -165,10 +171,10 @@
                            </el-table-column>
                        </el-table>
                    </template>
                    <el-row style="text-align: center; margin-top: 5px;">
                        <el-link type="primary" v-if="!tcIsOpen && taocanList.length > 0" @click="tcIsOpen = true">点击展开</el-link>
                        <el-link type="primary" v-if="tcIsOpen" @click="tcIsOpen = false">点击隐藏</el-link>
                    </el-row>
<!--                    <el-row style="text-align: center; margin-top: 5px;">-->
<!--                        <el-link type="primary" v-if="!tcIsOpen && taocanList.length > 0" @click="tcIsOpen = true">点击展开</el-link>-->
<!--                        <el-link type="primary" v-if="tcIsOpen" @click="tcIsOpen = false">点击隐藏</el-link>-->
<!--                    </el-row>-->
                </el-tab-pane>

            </el-tabs>
@@ -370,6 +376,14 @@
            closeFram: function () {
                parent.layer.close(parent.layer.getFrameIndex(window.name));
            },
            openOrCloseTc : function (item, index, value) {
                if (value == 1) {
                    item.openOrClose = true;
                } else {
                    item.openOrClose = false;
                }
                Vue.set(this.taocanList, index, item);
            }

        }


 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yyServiceAddForm.html

@@ -75,6 +75,9 @@
            padding-left: 10px;
            margin-left:10px ;
        }
        .openOrClose {
             cursor:pointer
        }
    </style>
</head>
<body>
@@ -124,14 +127,17 @@

                </el-tab-pane>
                <el-tab-pane label="套餐" name="tab2">
                    <template v-for="(item,index) in taocanList" v-if="index > 3 ? tcIsOpen : true">
                        <p class="el-big-title">【{{item.isCourse=='N'?'固定套餐':'任选套餐'}}】{{item.projName}}
                    <template v-for="(item,index) in taocanList">
                        <p class="el-big-title">
                            <span class="openOrClose" v-if="!item.openOrClose" @click="openOrCloseTc(item, index, 1)"><i class="el-icon-arrow-down"></i></span>
                            <span class="openOrClose" v-if="item.openOrClose" @click="openOrCloseTc(item, index, 2)"><i class="el-icon-arrow-up"></i></span>
                            【{{item.isCourse=='N'?'固定套餐':'任选套餐'}}】{{item.projName}}
                            <span style="float: right" v-if="item.failTime != null">有效期:{{item.failTime}}</span>
                            <code v-if="item.projInfo.isCourse=='Y'" > 剩余次数：<span v-if="item.projInfo.isInfinite == 'Y'">无限次</span><span v-else>{{item.surplusCount}}</span> </code>
                        </p>
                        <el-table
                                :data="item.taocanProjUse"
                                style="width: 98%">
                                style="width: 98%" v-show="item.openOrClose">
                            <el-table-column
                                    prop="projName"
                                    label="项目">
@@ -165,10 +171,10 @@
                            </el-table-column>
                        </el-table>
                    </template>
                    <el-row style="text-align: center; margin-top: 5px;">
                        <el-link type="primary" v-if="!tcIsOpen && taocanList.length > 0" @click="tcIsOpen = true">点击展开</el-link>
                        <el-link type="primary" v-if="tcIsOpen" @click="tcIsOpen = false">点击隐藏</el-link>
                    </el-row>
<!--                    <el-row style="text-align: center; margin-top: 5px;">-->
<!--                        <el-link type="primary" v-if="!tcIsOpen && taocanList.length > 0" @click="tcIsOpen = true">点击展开</el-link>-->
<!--                        <el-link type="primary" v-if="tcIsOpen" @click="tcIsOpen = false">点击隐藏</el-link>-->
<!--                    </el-row>-->
                </el-tab-pane>

            </el-tabs>
@@ -336,7 +342,14 @@
            closeFram: function () {
                parent.layer.close(parent.layer.getFrameIndex(window.name));
            },

            openOrCloseTc : function (item, index, value) {
                if (value == 1) {
                    item.openOrClose = true;
                } else {
                    item.openOrClose = false;
                }
                Vue.set(this.taocanList, index, item);
            }
        }

    })

 zq-erp/src/main/resources/templates/views/admin/hive/instore/store-list-pl.html

@@ -161,7 +161,6 @@
            alarmNum = row.alarmNum;
        }
        var storeNum = parseInt(value);
        console.log(alarmNum,storeNum);
        if (alarmNum > storeNum) {
            html = '<span class="label-danger" >&nbsp;&nbsp;' + value
                + '&nbsp;&nbsp;</span>';

 zq-erp/src/main/resources/templates/views/admin/hive/store/projServiceStartpl-list.html

@@ -81,6 +81,10 @@
    var projIndex = 0;
    var myForm=MForm.initForm({
        invokeUrl:basePath+"/admin/projService/endPl",
        beforeSubmit : function() {
            var fieldArray = $("#dataform").serializeArray();
            console.log(fieldArray);
        },
        afterSubmit:function(){
            if (parent.myGrid) {
                parent.myGrid.serchData();
@@ -119,20 +123,27 @@
        if (rows) {
            var projInfo = plList[projIndex];
            var idSelect = "#"+projIndex;
            var allGroup = $(".group").length;
            console.log(idSelect);
            var groupLength = $(idSelect + " .group").length;
            for(var i = 0; i < rows.length; i++) {
                var row = rows[i];
                var nextIndex = groupLength + i + 1;
                var outItemIndex = allGroup + i;
                var html = '<tr class="group">'
                        + '<td>'+ nextIndex +'</td>'
                        + '<td>'+ row.goods.name +'</td>'
                        + '<td><span></span></td>'
                        + '<td ><input autocomplete="off"   class="form-control" style="width: 200px;float: left;"  type="text" name="amount" placeholder="实际用量" >'
                        + '<td ><input autocomplete="off"   class="form-control" style="width: 200px;float: left;"  type="text" name="outStoreItem['+ outItemIndex +'].amount" placeholder="实际用量" >'
                        + '<span style="line-height: 30px;margin-left: 10px;">'+ row.goods.measure +'</span></td>'
                        + '<td><input autocomplete="off"   type="hidden" name="skuId" value="'+ row.goods.id +'">'
                        + '<input autocomplete="off" type="text" name="remark"  class="form-control" placeholder="配料备注"></td></tr>';
                        + '<td><input autocomplete="off"   type="hidden" name="outStoreItem['+ outItemIndex +'].skuId" value="'+ row.goods.id +'">'
                        + '<input autocomplete="off" type="text" name="outStoreItem['+ outItemIndex +'].remark"  class="form-control" placeholder="配料备注"></td></tr>';

                $(idSelect).children(':last').after(html);
                if ($(idSelect).children(':last').length <= 0) {
                    $(idSelect).html(html);
                } else {
                    $(idSelect).children(':last').after(html);
                }
            }
        }
    }