修改发布

src/components/OP/ConferenceTask.vue

@@ -1,5 +1,16 @@
 <template>
     <div class="ConferenceTask-all" v-loading.fullscreen.lock="SPLoading">
+        <el-dialog width="500px" title="其他事项备注" :visible.sync="OtherVisible">
+            <el-form :model="other">
+                <el-form-item label="备注:" :label-width="formLabelWidth">
+                    <el-input type="textarea" :rows="10" v-model="other.remark" placeholder="请输入内容"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="OtherVisible = false">取 消</el-button>
+                <el-button type="primary" @click="NoteConfirmation">确 定</el-button>
+            </div>
+        </el-dialog>
         <div class="ConferenceTask-Search">
             <div class="ConferenceTask-Search-ul">
                 <div class="ConferenceTask-Search-li">
@@ -170,6 +181,15 @@ export default {
 
             optionss:[],
             values:'',
+
+            formLabelWidth: '43px',
+            OtherVisible:false,
+            other:{
+                remark:'',
+                remarkid:0,
+                text:''
+            },
+            valinfo:{}
         }
     },
     methods: {
@@ -260,26 +280,34 @@ export default {
         },
         //流程更新
         ConfProcessUpdateNodeStatus(val) {
-            var url = "/api/Groups/ConfProcessUpdateNodeStatus";
-            var that = this;
-            this.$axios({
-                method: 'post',
-                url: url,
-                headers: {
-                    Authorization: 'Bearer '
-                },
-                data:{
-                    nodeId:val.id,
-                    currUserId:that.userId
-                }
-            }).then(function (res) {
-                if (res.data.code == 200) {
-                    that.$message.success(res.data.msg);
-                    that.ConfProcessDetails();
-                } else {
-                    that.$message.error(res.data.msg);
-                }
-            })
+            this.OtherVisible=true;
+            this.other.remark=val.remark
+            this.valinfo=val;
+            // var url = "/api/Groups/ConfProcessUpdateNodeStatus";
+            // var that = this;
+            // this.$axios({
+            //     method: 'post',
+            //     url: url,
+            //     headers: {
+            //         Authorization: 'Bearer '
+            //     },
+            //     data:{
+            //         nodeId:val.id,
+            //         currUserId:that.userId
+            //     }
+            // }).then(function (res) {
+            //     if (res.data.code == 200) {
+            //         that.$message.success(res.data.msg);
+            //         that.ConfProcessDetails();
+            //     } else {
+            //         that.$message.error(res.data.msg);
+            //     }
+            // })
+        },
+        //备注确认
+        NoteConfirmation(){
+            this.valinfo.remark=this.other.remark
+            this.ConfProcessSetActualDone(this.valinfo);
         },
         //设置完成时间
         ConfProcessSetActualDone(val) {
@@ -296,12 +324,14 @@ export default {
                     participators:val.participators,
                     isFileUp:val.isFileUp,
                     actualDone:val.actualDone==''?'':that.disposeTime(val.actualDone),
-                    currUserId:that.userId
+                    currUserId:that.userId,
+                    remark:val.remark?val.remark:''
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
                     that.$message.success(res.data.msg);
                     that.ConfProcessDetails();
+                    that.OtherVisible=false;
                 } else {
                     that.$message.error(res.data.msg);
                 }

src/components/OP/EntryDetails.vue

@@ -21,7 +21,7 @@
                     <el-button size="mini" @click="setpermissions=false">取消</el-button>
                 </div>
             </el-dialog>
-            <el-dialog  width="1400px" title="交通费详细" :visible.sync="TransportationVisible" :close-on-click-modal="false">
+            <el-dialog  width="1600px" title="交通费详细" :visible.sync="TransportationVisible" :close-on-click-modal="false">
                 <div style="display: flex;justify-content: space-between;align-items: center;margin: 5px 0;">
                     <div>接送机(合计)：{{ numFilters(Transportationdatatotal) }}&nbsp;CNY</div>
                     <el-button size="mini" @click="addTransportationdata" type="primary">添加一行</el-button>
@@ -89,11 +89,16 @@
                             </el-input> -->
                         </template>
                     </el-table-column>
-                    <el-table-column property="i" label="备注">
+                    <el-table-column property="remark" label="备注">
                         <template slot-scope="scope">
                             <el-input size="mini" v-model="scope.row.remark"></el-input>
                         </template>
                     </el-table-column>
+                    <el-table-column label="操作" width="100">
+                        <template slot-scope="scope">
+                            <el-button size="mini" @click.native.prevent="deleteRowJSJ(scope.$index, Transportationdata,scope.row)" type="danger">移除</el-button>
+                        </template>
+                    </el-table-column>
                 </el-table>
                 <div class="jiaotongfei-ul">
                     <div class="jiaotongfei-li">
@@ -120,6 +125,13 @@
                                     <el-input size="mini" v-model="scope.row.remark"></el-input>
                                 </template>
                             </el-table-column>
+                            <el-table-column label="操作" width="100">
+                                <template slot-scope="scope">
+                                    <el-button size="mini"
+                                        @click.native.prevent="deleteRowLC(scope.$index, pullCartFeeDetails, scope.row)"
+                                        type="danger">移除</el-button>
+                                </template>
+                            </el-table-column>
                         </el-table>
                     </div>
                     <div class="jiaotongfei-li">
@@ -145,6 +157,13 @@
                                     <el-input size="mini" v-model="scope.row.remark"></el-input>
                                 </template>
                             </el-table-column>
+                            <el-table-column label="操作" width="100">
+                                <template slot-scope="scope">
+                                    <el-button size="mini"
+                                        @click.native.prevent="deleteRowHC(scope.$index, trainFeeDetails, scope.row)"
+                                        type="danger">移除</el-button>
+                                </template>
+                            </el-table-column>
                         </el-table>
                     </div>
                     <div class="jiaotongfei-li">
@@ -170,6 +189,13 @@
                                     <el-input size="mini" v-model="scope.row.remark"></el-input>
                                 </template>
                             </el-table-column>
+                            <el-table-column label="操作" width="100">
+                                <template slot-scope="scope">
+                                    <el-button size="mini"
+                                        @click.native.prevent="deleteRowJP(scope.$index, cityAirTicketFeeDetails, scope.row)"
+                                        type="danger">移除</el-button>
+                                </template>
+                            </el-table-column>
                         </el-table>
                     </div>
                 </div>
@@ -3063,6 +3089,66 @@ export default {
             let realVal = tempVal.substring(0, tempVal.length - 1);
             return realVal;
         },
+        deleteRowJSJ(index, rows,row) {
+            this.$confirm('此操作只是移除该条数据做出计算并未保存，如要删除该条数据请点击保存！', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                rows.splice(index, 1);
+                this.UrbanTotal();
+            }).catch(() => {
+                this.$message({
+                    type: 'info',
+                    message: '操作已取消！'
+                });
+            });
+        },
+        deleteRowLC(index, rows,row) {
+            this.$confirm('此操作只是移除该条数据做出计算并未保存，如要删除该条数据请点击保存！', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                rows.splice(index, 1);
+                this.UrbanTotalLC();
+            }).catch(() => {
+                this.$message({
+                    type: 'info',
+                    message: '操作已取消！'
+                });
+            });
+        },
+        deleteRowHC(index, rows,row) {
+            this.$confirm('此操作只是移除该条数据做出计算并未保存，如要删除该条数据请点击保存！', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                rows.splice(index, 1);
+                this.UrbanTotalHC();
+            }).catch(() => {
+                this.$message({
+                    type: 'info',
+                    message: '操作已取消！'
+                });
+            });
+        },
+        deleteRowJP(index, rows,row) {
+            this.$confirm('此操作只是移除该条数据做出计算并未保存，如要删除该条数据请点击保存！', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                rows.splice(index, 1);
+                this.UrbanTotalJP();
+            }).catch(() => {
+                this.$message({
+                    type: 'info',
+                    message: '操作已取消！'
+                });
+            });
+        },
         //改值计算
         UrbanModify(val,bizhong){
             var total=0

src/components/OP/EntryDetailsdraft.vue

@@ -1,7 +1,7 @@
 <template>
     <div v-loading.fullscreen.lock="fullscreenLoading">
         <div class="Entrydraft-all">
-            <el-dialog  width="1400px" title="交通费详细" :visible.sync="TransportationVisible" :close-on-click-modal="false">
+            <el-dialog  width="1600px" title="交通费详细" :visible.sync="TransportationVisible" :close-on-click-modal="false">
                 <div style="display: flex;justify-content: space-between;align-items: center;margin: 5px 0;">
                     <div>接送机(合计)：{{ numFilters(Transportationdatatotal) }}&nbsp;CNY</div>
                     <el-button size="mini" @click="addTransportationdata" type="primary">添加一行</el-button>
@@ -67,6 +67,11 @@
                             <el-input size="mini" v-model="scope.row.remark"></el-input>
                         </template>
                     </el-table-column>
+                    <el-table-column label="操作" width="100">
+                        <template slot-scope="scope">
+                            <el-button size="mini" @click.native.prevent="deleteRowJSJ(scope.$index, Transportationdata,scope.row)" type="danger">移除</el-button>
+                        </template>
+                    </el-table-column>
                 </el-table>
                 <div class="jiaotongfeiS-ul">
                     <div class="jiaotongfeiS-li">
@@ -93,6 +98,13 @@
                                     <el-input size="mini" v-model="scope.row.remark"></el-input>
                                 </template>
                             </el-table-column>
+                            <el-table-column label="操作" width="100">
+                                <template slot-scope="scope">
+                                    <el-button size="mini"
+                                        @click.native.prevent="deleteRowLC(scope.$index, pullCartFeeDetails, scope.row)"
+                                        type="danger">移除</el-button>
+                                </template>
+                            </el-table-column>
                         </el-table>
                     </div>
                     <div class="jiaotongfeiS-li">
@@ -118,6 +130,13 @@
                                     <el-input size="mini" v-model="scope.row.remark"></el-input>
                                 </template>
                             </el-table-column>
+                            <el-table-column label="操作" width="100">
+                                <template slot-scope="scope">
+                                    <el-button size="mini"
+                                        @click.native.prevent="deleteRowHC(scope.$index, trainFeeDetails, scope.row)"
+                                        type="danger">移除</el-button>
+                                </template>
+                            </el-table-column>
                         </el-table>
                     </div>
                     <div class="jiaotongfeiS-li">
@@ -143,6 +162,13 @@
                                     <el-input size="mini" v-model="scope.row.remark"></el-input>
                                 </template>
                             </el-table-column>
+                            <el-table-column label="操作" width="100">
+                                <template slot-scope="scope">
+                                    <el-button size="mini"
+                                        @click.native.prevent="deleteRowJP(scope.$index, cityAirTicketFeeDetails, scope.row)"
+                                        type="danger">移除</el-button>
+                                </template>
+                            </el-table-column>
                         </el-table>
                     </div>
                 </div>
@@ -3562,6 +3588,66 @@ export default {
             let realVal = tempVal.substring(0, tempVal.length - 1);
             return realVal;
         },
+        deleteRowJSJ(index, rows,row) {
+            this.$confirm('此操作只是移除该条数据做出计算并未保存，如要删除该条数据请点击保存！', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                rows.splice(index, 1);
+                this.UrbanTotal();
+            }).catch(() => {
+                this.$message({
+                    type: 'info',
+                    message: '操作已取消！'
+                });
+            });
+        },
+        deleteRowLC(index, rows,row) {
+            this.$confirm('此操作只是移除该条数据做出计算并未保存，如要删除该条数据请点击保存！', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                rows.splice(index, 1);
+                this.UrbanTotalLC();
+            }).catch(() => {
+                this.$message({
+                    type: 'info',
+                    message: '操作已取消！'
+                });
+            });
+        },
+        deleteRowHC(index, rows,row) {
+            this.$confirm('此操作只是移除该条数据做出计算并未保存，如要删除该条数据请点击保存！', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                rows.splice(index, 1);
+                this.UrbanTotalHC();
+            }).catch(() => {
+                this.$message({
+                    type: 'info',
+                    message: '操作已取消！'
+                });
+            });
+        },
+        deleteRowJP(index, rows,row) {
+            this.$confirm('此操作只是移除该条数据做出计算并未保存，如要删除该条数据请点击保存！', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                rows.splice(index, 1);
+                this.UrbanTotalJP();
+            }).catch(() => {
+                this.$message({
+                    type: 'info',
+                    message: '操作已取消！'
+                });
+            });
+        },
         //改值计算
         UrbanModify(val,bizhong){
             var total=0

src/components/OP/GroupProgress.vue

@@ -1,5 +1,16 @@
 <template>
     <div class="group-progress" v-loading.fullscreen.lock="progressloading">
+        <el-dialog width="500px" title="其他事项备注" :visible.sync="OtherVisible">
+            <el-form :model="other">
+                <el-form-item label="备注:" :label-width="formLabelWidth">
+                    <el-input type="textarea" :rows="10" v-model="other.remark" placeholder="请输入内容"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="OtherVisible = false">取 消</el-button>
+                <el-button type="primary" @click="NoteConfirmation">确 定</el-button>
+            </div>
+        </el-dialog>
         <div class="progress-hade">
             <el-form style="display: flex;justify-content: space-between;align-items: center;" :inline="true"
                 :model="formInline" class="demo-form-inline">
@@ -35,7 +46,7 @@
                     <span style="font-size: 18px; font-weight: bold;">商邀报批流程</span>
                 </template>
                 <div class="process-diagram">
-                    <div @click="confirmclick(item,'商邀主管')"
+                    <div @click="confirmclick(item,'商邀')"
                         :class="item.statusText=='已完成'?'process-diagram-'+activities.length+'s':'process-diagram-'+activities.length"
                         v-for="(item,index) in activities" :key="index">
                         <el-popover v-if="item.nodeDescTips!=''" placement="top-start" title="PS" width="200"
@@ -425,7 +436,7 @@
                     <span style="font-size: 18px; font-weight: bold;">地接流程</span>
                 </template>
                 <div class="process-diagram">
-                    <div @click="confirmclick(item,'OP')"
+                    <div @click="confirmclick(item,'地接')"
                         :class="item.statusText=='已完成'?'process-diagram-'+activitiesGuide.length+'s':'process-diagram-'+activitiesGuide.length"
                         v-for="(item,index) in activitiesGuide" :key="index">
                         <el-popover v-if="item.nodeDescTips!=''" placement="top-start" title="PS" width="200"
@@ -510,7 +521,7 @@
                     <span style="font-size: 18px; font-weight: bold;">费用结算</span>
                 </template>
                 <div class="process-diagram">
-                    <div @click="financeclick(item)"
+                    <div @click="confirmclick(item,'费用结算')"
                         :class="item.statusText=='已完成'?'process-diagram-'+activitiesCost.length+'s':'process-diagram-'+activitiesCost.length"
                         v-for="(item,index) in activitiesCost" :key="index">
                         <el-popover v-if="item.nodeDescTips!=''" placement="top-start" title="PS" width="200"
@@ -645,6 +656,15 @@ export default {
 
             AuditStatusArr:[],
             searchMode: 'character', // 'character': 字符匹配, 'fuzzy': 模糊匹配
+        
+            formLabelWidth: '43px',
+            OtherVisible:false,
+            other:{
+                remark:'',
+                remarkid:0,
+                text:''
+            },
+            allarr:[],
         }
     },
     methods: {
@@ -689,7 +709,6 @@ export default {
             console.log(val);
         },
         headerCellStyle({ row, column, rowIndex, columnIndex }) {
-            console.log(row, column, rowIndex, columnIndex);
             row[0].colSpan = 1;
             row[6].colSpan = 6;
             row[7].colSpan = 1;
@@ -768,9 +787,10 @@ export default {
                     Authorization: 'Bearer ' + that.token
                 },
             }).then(function (res) {
+                that.allarr=[];
                 if (res.data.code == 200) {
+                    that.allarr=res.data.data;
                     for (let i = 0; i < res.data.data.length; i++) {
-                        console.log(res.data.data[i]);
                         if (res.data.data[i].processName == '费用结算') {
                             that.activitiesCost=res.data.data[i].nodes;
                         }
@@ -789,9 +809,7 @@ export default {
                         if (res.data.data[i].processName == '签证') {
                             that.tableData=res.data.data[i].nodes[0].visaSubNodes;
                             that.tableDataobj=res.data.data[i].nodes[1]?res.data.data[i].nodes[1]:that.tableDataobjs;
-                            console.log(res.data.data[i]);
-                            console.log(that.tableDataobj);
-                            
+
                             that.visaclickid=res.data.data[i].nodes[0].id;
                         }
                     }
@@ -864,8 +882,31 @@ export default {
             });
             
         },
+        //备注确认
+        NoteConfirmation(){
+            var info=[];
+            for (let i = 0; i < this.allarr.length; i++) {
+                if (this.allarr[i].processName===this.other.text) {
+                    info=this.allarr[i].nodes;
+                    break;
+                }
+            }
+            var obj={};
+            for (let j = 0; j < info.length; j++) {
+                if (info[j].id===this.other.remarkid) {
+                    info[j].remark=this.other.remark;
+                    obj=info[j];
+                    break;
+                }
+            }
+            this.GroupProcessSetActualDone(obj);
+        },
         //点击确认
         confirmclick(item,text){
+            this.OtherVisible=true;
+            this.other.remarkid=item.id;
+            this.other.text=text;
+            this.other.remark=item.remark;
             // if (text!=this.jobName) {
             //     this.$message({
             //         message: '该流程不在此账号的操作权限内！如有疑问联系该流程负责人！',
@@ -873,32 +914,32 @@ export default {
             //     });
             //     return
             // }
-            this.progressloading=true;
-            var url = "/api/Groups/GroupProcessUpdateNodeStatus"
-            var that = this
-            this.$axios({
-                method: 'post',
-                url: url,
-                headers: {
-                    Authorization: 'Bearer '
-                },
-                data:{
-                    nodeId:item.id,
-                    currUserId: that.userId
-                }
-            }).then(function (res) {
-                console.log(res)
-                if(res.data.code==200){
-                    that.$message({
-                        type: 'success',
-                        message: res.data.msg
-                    });
-                    that.GroupProcessDetails();
-                }else{
-                    that.$message.error(res.data.msg);
-                    that.progressloading=false;
-                }
-            })
+            // this.progressloading=true;
+            // var url = "/api/Groups/GroupProcessUpdateNodeStatus"
+            // var that = this
+            // this.$axios({
+            //     method: 'post',
+            //     url: url,
+            //     headers: {
+            //         Authorization: 'Bearer '
+            //     },
+            //     data:{
+            //         nodeId:item.id,
+            //         currUserId: that.userId
+            //     }
+            // }).then(function (res) {
+            //     console.log(res)
+            //     if(res.data.code==200){
+            //         that.$message({
+            //             type: 'success',
+            //             message: res.data.msg
+            //         });
+            //         that.GroupProcessDetails();
+            //     }else{
+            //         that.$message.error(res.data.msg);
+            //         that.progressloading=false;
+            //     }
+            // })
         },
         //处理时间
         disposeTime(val){
@@ -956,10 +997,10 @@ export default {
                     isFileUp:item.isFileUp,
                     isPart:item.isPart,
                     actualDone:that.disposeTime(item.actualDone),
-                    currUserId: that.userId
+                    currUserId: that.userId,
+                    remark:item.remark?item.remark:''
                 }
             }).then(function (res) {
-                console.log(res)
                 if(res.data.code==200){
                     that.$message({
                         type: 'success',
@@ -967,11 +1008,16 @@ export default {
                     });
                     that.GroupProcessDetails();
                     that.progressloading=false;
+                    that.OtherVisible=false;
                 }else{
                     that.$message.error(res.data.msg);
                     that.progressloading=false;
+                    that.OtherVisible=false;
                 }
-            })
+            }).catch(error => {
+                that.progressloading=false;
+                that.$message.error('服务器过载出错，请稍后再尝试！');
+            });
         },
         //财务节点点击确认
         financeclick(item){
@@ -997,7 +1043,6 @@ export default {
                     currUserId: that.userId
                 }
             }).then(function (res) {
-                console.log(res)
                 if(res.data.code==200){
                     that.$message({
                         type: 'success',

src/components/system/TaskList.vue

@@ -55,7 +55,8 @@
                             </el-select>
                         </el-form-item> -->
                     </div>
-                    <el-button :disabled="!isAddPerm" size="medium" @click="handleView" type="primary">新增任务</el-button>
+                    <!-- <el-button :disabled="!isAddPerm" size="medium" @click="handleView" type="primary">新增任务</el-button> -->
+                    <el-button size="medium" @click="handleView" type="primary">新增任务</el-button>
                 </el-form>
             </div>
             <div class="tasklist-title">任务列表</div>