#

lsh

2024-04-19 59292e68b11c383948b436e755a4aad8abf1ce24

#

 src/main/java/com/zy/crm/manager/controller/WeeklyController.java

@@ -649,9 +649,6 @@

                    try{
                        weeklyDailyPlanService.insert(weeklyDailyPlan);
                        WeeklyDailyReality weeklyDailyReality = new WeeklyDailyReality();
                        weeklyDailyReality.sync(weeklyDailyPlan);
                        weeklyDailyRealityService.insert(weeklyDailyReality);
                    } catch (Exception e){
                        log.error("新增日计划失败"+e);
                        throw new CoolException("新增日计划失败");
@@ -681,9 +678,10 @@
                throw new CoolException("参数为空：WeeklyId");
            } else if (Cools.isEmpty(param.getType())){
                throw new CoolException("参数为空：Type");
            } else if (Cools.isEmpty(param.getWeeklyType())){
                throw new CoolException("参数为空：Weekly");
            }
//            else if (Cools.isEmpty(param.getWeeklyType())){
//                throw new CoolException("参数为空：Weekly");
//            }
            Date now = new Date();
            Weekly weekly = weeklyService.selectById(param.getWeeklyId());
            weekly.setUpdateBy(getUserId());
@@ -704,23 +702,35 @@
                throw new CoolException("更新周计划主表失败");
            }

            List<CstmrUtilsParam> cstmrUtilsParamList = new ArrayList<>();
            List<WeeklyDailyReality> weeklyDailyRealitieList = weeklyDailyRealityService.selectList(new EntityWrapper<WeeklyDailyReality>().eq("weekly_id", weekly.getId()));
            List<Long> ids = new ArrayList<>();
            for (WeeklyDailyReality weeklyDailyReality: param.getWeeklyDailyRealityList()) {
                if (!Cools.isEmpty(weeklyDailyReality.getId())) {
                    ids.add(weeklyDailyReality.getId());
                }
            }
            try{
                for (WeeklyDailyReality weeklyDailyReality2:weeklyDailyRealitieList){
                    if (!ids.contains(weeklyDailyReality2.getId())){
                        weeklyDailyRealityService.deleteById(weeklyDailyReality2.getId());
                    }
                }
            }catch (Exception e){

            }
            for (WeeklyDailyReality  weeklyDailyReality: param.getWeeklyDailyRealityList()){
                WeeklyDailyReality weeklyDailyReality1 = new WeeklyDailyReality();
                if (!Cools.isEmpty(weeklyDailyReality.getId())){
                    Long weeklyDailyPlanId = weeklyDailyReality.getId();
                    Long weeklyDailyRealityId = weeklyDailyReality.getId();
                    weeklyDailyReality1 = weeklyDailyRealityService.selectById(weeklyDailyReality.getId());
                    if (Cools.isEmpty(weeklyDailyReality)){
                        throw new CoolException("更新失败：id:"+weeklyDailyPlanId);
                    if (Cools.isEmpty(weeklyDailyReality1)){
                        throw new CoolException("更新失败：id:"+weeklyDailyRealityId);
                    }
                    if (!Cools.isEmpty(weeklyDailyReality1.getComment())){
//                        weeklyDailyReality1.setComment(weeklyDailyReality1.getComment()+";"+weeklyDailyReality.getComment());
                        weeklyDailyReality1.setComment(weeklyDailyReality.getComment());
                    }else {
                        weeklyDailyReality1.setComment(weeklyDailyReality.getComment());
                    }
                    weeklyDailyReality1.setComment(weeklyDailyReality.getComment());
                    weeklyDailyReality1.setWorkContent(weeklyDailyReality.getWorkContent());
                    weeklyDailyReality1.setWorkPurpose(weeklyDailyReality.getWorkPurpose());
                    weeklyDailyReality1.setWeeklyMatter(weeklyDailyReality.getWeeklyMatter());
                    weeklyDailyReality1.setAddr(weeklyDailyReality.getAddr());
                    weeklyDailyReality1.setMemo(weeklyDailyReality.getMemo());
                    weeklyDailyReality1.setUpdateBy(getUserId());
                    weeklyDailyReality1.setUpdateTime(now);

 src/main/webapp/views/weekly/weekly.html

@@ -148,7 +148,69 @@
            </div>
        </el-dialog>


        <el-dialog title="日结果" :visible.sync="updateRealityDialogFormVisible" style="width: 1800px">
            <el-form :model="formReality" style="width: 100%">
                <el-form-item label="日期" :label-width="formLabelWidth">
                    <el-select v-model="formReality.name">
                        <el-option
                                v-for="item in addWeekPlanDataWeeklySignReality"
                                :key="item.value"
                                :label="item.label"
                                :value="item.value">
                        </el-option>
                    </el-select>
                </el-form-item>
                <el-form-item label="周计划" :label-width="formLabelWidth">
                    <el-button type="primary" @click="addWeekPlan">添加日计划</el-button>
                    <el-table :data="weeklyFormDataReality" border style="width: 100%">
                        <el-table-column fixed :data="addWeekPlanData" prop="weeklyDay" label="星期" width="150">
                        </el-table-column>
                        <el-table-column prop="cstmrId" label="甲方单位" width="180">
                            <div class="item" slot-scope="scope">
                                <el-select v-model="scope.row.cstmrId" placeholder="甲方单位">
                                    <el-option
                                            v-for="item in options"
                                            :key="item.value"
                                            :label="item.name"
                                            :value="item.value">
                                    </el-option>
                                </el-select>
                            </div>
                        </el-table-column>
                        <el-table-column prop="workContent" label="工作内容及目的" width="180">
                            <div class="item" slot-scope="scope">
                                <el-input v-model="scope.row.workContent" placeholder="工作内容及目的"></el-input>
                            </div>
                        </el-table-column>
                        <el-table-column prop="weeklyMatter" label="需协助事项" width="120">
                            <div class="item" slot-scope="scope">
                                <el-input v-model="scope.row.weeklyMatter" placeholder="需协助事项"></el-input>
                            </div>
                        </el-table-column>
                        <el-table-column prop="addr" label="地址" width="180">
                            <div class="item" slot-scope="scope">
                                <el-input v-model="scope.row.addr" placeholder="地址"></el-input>
                            </div>
                        </el-table-column>
                        <el-table-column prop="memo" label="备注" width="120">
                            <div class="item" slot-scope="scope">
                                <el-input v-model="scope.row.memo" placeholder="备注"></el-input>
                            </div>
                        </el-table-column>
                        <el-table-column :show="false" property="weeklyDay$" label="日期" v-if="false"></el-table-column>
                        <el-table-column fixed="right" label="操作" width="100">
                            <template slot-scope="scope">
                                <el-button @click="delWeeklyRealityUpdate(scope.row)" type="text" size="del-weekly-plan">删除</el-button>
                            </template>
                        </el-table-column>
                    </el-table>
                </el-form-item>
            </el-form>
            <div slot="footer" class="dialog-footer">
                <el-button @click="updateRealityDialogFormVisible = false, weeklyFormDataRealityInit()">取消</el-button>
                <el-button type="primary" @click="updateRealityDialogFormVisible = false, updateRealityWeekly(formReality,false)">确定</el-button>
            </div>
        </el-dialog>
        <el-dialog
                title="星期"
                :visible.sync="addWeekPlanVisible"
@@ -262,7 +324,7 @@
                    <template slot-scope="scope">
                        <el-button @click="delWeekly(scope.row)" type="text" size="del-weekly">删除</el-button>
                        <el-button @click="showUpdatePlanWeekly(scope.row)" type="text" size="del-weekly">计划</el-button>
                        <el-button @click="updateRWeekly(scope.row)" type="text" size="del-weekly">结果</el-button>
                        <el-button @click="showUpdateRealityWeekly(scope.row)" type="text" size="del-weekly">结果</el-button>
                    </template>
                </el-table-column>
            </el-table>
@@ -290,10 +352,13 @@
            weeklyDailyRealityData: [],
            dialogFormVisible: false,
            updatePlanDialogFormVisible: false,
            updateRealityDialogFormVisible: false,
            form: {},
            formPlan: {},
            formReality: {},
            formLabelWidth: '120px',
            addWeekPlanVisible: false,
            addWeekRealityVisible: false,
            addWeekPlanDataWeeklySign: [
                {
                    value: '1',
@@ -309,10 +374,12 @@
                }
            ],
            addWeekPlanDataWeeklySignPlan: [],
            addWeekPlanDataWeeklySignReality: [],
            addWeekPlanData: [],
            addWeekPlanValue: [],
            weeklyFormData: [],
            weeklyFormDataPlan: [],
            weeklyFormDataReality: [],
            options: [],
            // 需要编辑的属性
            editProp: ['cstmrId','workContent','weeklyMatter','memo']
@@ -412,6 +479,11 @@
                this.formPlan.name = []
                this.updatePlanDialogFormVisible = false
            },
            weeklyFormDataRealityInit(){
                this.weeklyFormDataReality = []
                this.formReality.name = []
                this.updateRealityDialogFormVisible = false
            },
            showWeeklyDailyPlan(id) {
                let that = this;
                // console.log(id)
@@ -446,6 +518,9 @@
            },
            addWeekPlan() {
                this.addWeekPlanVisible = true;
            },
            addWeekReality() {
                this.addWeekRealityVisible = true;
            },
            addWeekly(res,isExpAdd){
                let that = this;
@@ -494,6 +569,24 @@
                that.updatePlanDialogFormVisible = true

            },
            showUpdateRealityWeekly(res) {
                let that = this;
                that.formReality.name = res.weeklyDayMonth
                that.formReality.weeklyId = res.id
                // that.formPlan.weeklyMonth = res.weeklyMonth
                $.ajax({
                    url: baseUrl + '/weeklyDailyReality/list/auth',
                    headers: {'token': localStorage.getItem('token')},
                    method: "get",
                    data: {
                        weekly_id: res.id
                    },
                    success: (res) => {
                        that.weeklyFormDataReality = res.data.records;
                    }
                });
                that.updateRealityDialogFormVisible = true
            },
            updatePlanWeekly(res,isExpAdd){
                let that = this;
                that.updatePlanDialogFormVisible = false
@@ -511,7 +604,6 @@
                    contentType:'application/json;charset=UTF-8',
                    method: 'POST',
                    success: (res) => {
                        weeklyFormData=[]
                    },
                    error: function (jqXHR, textStatus, errorThrown) {
                        // 在这里做错误处理:
@@ -522,9 +614,37 @@
                that.formPlan.name = []
                that.formPlan.weeklyId = 0
            },
            updateRealityWeekly(res,isExpAdd){
                let that = this;
                that.updateRDialogFormVisible = false
                let weeklyFormDataReality = this.weeklyFormDataReality;
                $.ajax({
                    url: baseUrl+"/weekly/from/" + (isExpAdd?"add":"modify") + "/auth2",
                    headers: {'token': localStorage.getItem('token')},
                    data: JSON.stringify({
                        // weeklyType: Number(that.formPlan.weeklyMonth),
                        weeklyId: that.formReality.weeklyId,
                        // type: Number(data.field.type),
                        type: Number(1),
                        weeklyDailyRealityList: weeklyFormDataReality
                    }),
                    contentType:'application/json;charset=UTF-8',
                    method: 'POST',
                    success: (res) => {
                    },
                    error: function (jqXHR, textStatus, errorThrown) {
                        // 在这里做错误处理:
                        console.log('Error occurred: ', textStatus, errorThrown);
                    }
                })
                that.weeklyFormDataPlan = []
                that.formReality.name = []
                that.formReality.weeklyId = 0
            },
            addWeekPlanConfirm() {
                let list = this.weeklyFormData
                let listPlan = this.weeklyFormDataPlan
                let listReality = this.weeklyFormDataReality
                let value = this.addWeekPlanValue
                if (value.length > 0) {
                    value.forEach((item,idx) => {
@@ -534,11 +654,15 @@
                        listPlan.push({
                            weeklyDay: item
                        })
                        listReality.push({
                            weeklyDay: item
                        })
                    })
                }

                this.weeklyFormData = list;
                this.weeklyFormDataPlan = listPlan;
                this.weeklyFormDataReality = listReality;
                console.log(list)
                this.addWeekPlanVisible = false;
                this.addWeekPlanValue = [];
@@ -559,6 +683,14 @@
                    this.weeklyFormDataPlan.splice(index, 1);
                }
            },
            delWeeklyRealityUpdate(row) {
                // 找到要删除的行在数据列表中的索引
                const index = this.weeklyFormDataReality.findIndex(item => item === row);
                if (index !== -1) {
                    // 通过splice方法删除该行
                    this.weeklyFormDataReality.splice(index, 1);
                }
            },
            delWeekly(row) {
                let that = this;
                // 找到要删除的行在数据列表中的索引