diff --git a/src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue b/src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue
index 9dbb870b..fbe31f50 100644
--- a/src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue
+++ b/src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue
@@ -1,83 +1,151 @@
 <template>
-	<section  class="padding"> 
-		<el-row class="page-main">
-		<!--编辑界面 XmTaskSbill 任务结算表-->
-			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editFormRef">
-				<el-row>
-					<el-col :span="8">
-						<el-form-item label="编号/标题" prop="id">
-							<el-input v-model="editForm.id" placeholder="结算单据编号" disabled></el-input>
-						</el-form-item> 
-					</el-col>
-					<el-col :span="16">
-						<el-form-item label="" prop="title" :rules="[{ required: true, message: '结算单标题不能为空'}]" label-width="0px">
-							<el-input v-model="editForm.title" placeholder="结算单标题"></el-input>
-						</el-form-item>
-					</el-col>
-				</el-row>
-				<el-row>
-					<el-col :span="8">
-						<el-form-item label="审核状态" prop="id">
-							 <el-tag v-for="(item,index) in formatDictsWithClass(dicts,'bizFlowState',editForm.bizFlowState)" :key="index" :type="item.className">{{item.name}}</el-tag>
-						</el-form-item> 
-					</el-col>
-					<el-col :span="16">
-						<el-form-item label="结算项目" prop="projectId">
-				<!--          <el-button v-if="!editForm.projectId" type="primary" @click="projSelVisible=true" round>选择项目</el-button>-->
-						<div v-if="!editForm.projectId">
-							<xm-project-select style="display:inline;" :auto-select="false" @row-click="onProjectRowClick(arguments)" @clear="onProjectClear" ></xm-project-select>
-						</div>
-						<span v-else>{{editForm.projectId}} &nbsp;{{editForm.projectName}}</span>
-						</el-form-item> 
-					</el-col>
-				</el-row>
-        
-					<el-row>
-					<el-col :span="8"> 
-						<el-form-item label="结算金额" prop="amt">
-							￥{{editForm.amt}}元
-						</el-form-item> 
-					</el-col>
-					<el-col :span="8"> 
-						<el-form-item label="提交时间" prop="ctime">
-							<el-date-picker type="date" placeholder="选择日期" v-model="editForm.ctime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
-						</el-form-item> 
-					</el-col>
-					<el-col :span="8"> 
-						<el-form-item label="提交人" prop="cusername">
-							<el-input v-model="editForm.cusername" placeholder="创建人姓名"></el-input>
-						</el-form-item> 
-					</el-col>
-				</el-row> 
-				<el-form-item label="备注：" prop="remark">
-					<el-input v-model="editForm.remark" type="textarea" :autosize="{ minRows: 3}" placeholder="请输入备注" maxlength="200" show-word-limit></el-input>
-				</el-form-item>
-				<el-tabs value="1" accordion> 
-					
-					<el-tab-pane label="结算清单" name="1"  v-if="opType==='edit'"> 	
-						<el-row v-if="editForm.id">  
-							 <xm-task-sbill-detail-mng :sbill-id="editForm.id"></xm-task-sbill-detail-mng>
-						</el-row>  
-					</el-tab-pane> 
-					
-					<el-tab-pane label="审批流" name="2" v-if="opType==='edit'"> 	
-						<el-row  v-if="editForm.id">   
-							<task-mng   ref="currFlow" :biz-parent-pkid="editForm.projectId" :biz-pkid="editForm.id" @submit="afterFlowSubmit"> </task-mng>  
- 						</el-row>  
-					</el-tab-pane> 
-					
-					
-					<el-tab-pane label="历史审批流" name="3"  v-if="opType==='edit'"> 	
-						<el-row v-if="editForm.id">   
- 							<procinst-mng   ref="hisFlow" isAll="true" :biz-parent-pkid="editForm.projectId" :biz-pkid="editForm.id"></procinst-mng> 
-						</el-row>  
-					</el-tab-pane> 
-				</el-tabs>
-        <el-form-item v-if="opType==='add'">
-          <el-button @click.native="handleCancel">取消</el-button>
-          <el-button v-loading="load.edit" type="primary" @click.native="saveSubmit" :disabled="load.edit==true">提交</el-button>
-        </el-form-item>
-<!--				<el-form-item label="机构编号" prop="branchId">
+  <section class="padding">
+    <el-row class="page-main">
+      <!--编辑界面 XmTaskSbill 任务结算表-->
+      <el-form
+        :model="editForm"
+        label-width="120px"
+        :rules="editFormRules"
+        ref="editFormRef"
+      >
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="编号/标题" prop="id">
+              <el-input
+                v-model="editForm.id"
+                placeholder="结算单据编号"
+                disabled
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item
+              label=""
+              prop="title"
+              :rules="[{ required: true, message: '结算单标题不能为空' }]"
+              label-width="0px"
+            >
+              <el-input
+                v-model="editForm.title"
+                placeholder="结算单标题"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="审核状态" prop="id">
+              <el-tag
+                v-for="(item, index) in formatDictsWithClass(
+                  dicts,
+                  'bizFlowState',
+                  editForm.bizFlowState
+                )"
+                :key="index"
+                :type="item.className"
+                >{{ item.name }}</el-tag
+              >
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item label="结算项目" prop="projectId">
+              <!--          <el-button v-if="!editForm.projectId" type="primary" @click="projSelVisible=true" round>选择项目</el-button>-->
+              <div v-if="!editForm.projectId">
+                <xm-project-select
+                  style="display: inline"
+                  :auto-select="false"
+                  @row-click="onProjectRowClick(arguments)"
+                  @clear="onProjectClear"
+                ></xm-project-select>
+              </div>
+              <span v-else
+                >{{ editForm.projectId }} &nbsp;{{ editForm.projectName }}</span
+              >
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-tabs v-model="activateName">
+          <el-tab-pane label="基础信息" name="10">
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="结算金额" prop="amt">
+                  ￥{{ editForm.amt }}元
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="提交时间" prop="ctime">
+                  <el-date-picker
+                    type="date"
+                    placeholder="选择日期"
+                    v-model="editForm.ctime"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    format="yyyy-MM-dd"
+                  ></el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="提交人" prop="cusername">
+                  <el-input
+                    v-model="editForm.cusername"
+                    placeholder="创建人姓名"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-form-item label="备注：" prop="remark">
+              <el-input
+                v-model="editForm.remark"
+                type="textarea"
+                :autosize="{ minRows: 3 }"
+                placeholder="请输入备注"
+                maxlength="200"
+                show-word-limit
+              ></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button @click.native="handleCancel">取消</el-button>
+              <el-button
+                v-loading="load.edit"
+                type="primary"
+                @click.native="saveSubmit"
+                :disabled="load.edit == true"
+                >提交</el-button
+              >
+            </el-form-item>
+          </el-tab-pane>
+          <el-tab-pane label="结算清单" name="1" v-if="opType === 'edit'">
+            <el-row v-if="editForm.id &&activateName=='1'">
+              <xm-task-sbill-detail-mng
+                :sbill-id="editForm.id"
+              ></xm-task-sbill-detail-mng>
+            </el-row>
+          </el-tab-pane>
+
+          <el-tab-pane label="审批流" name="2" v-if="opType === 'edit'">
+            <el-row v-if="editForm.id  &&activateName=='2'">
+              <task-mng
+                ref="currFlow"
+                :biz-parent-pkid="editForm.projectId"
+                :biz-pkid="editForm.id"
+                @submit="afterFlowSubmit"
+              >
+              </task-mng>
+            </el-row>
+          </el-tab-pane>
+
+          <el-tab-pane label="历史审批流" name="3" v-if="opType === 'edit'">
+            <el-row v-if="editForm.id &&activateName=='3'">
+              <procinst-mng
+                ref="hisFlow"
+                isAll="true"
+                :biz-parent-pkid="editForm.projectId"
+                :biz-pkid="editForm.id"
+              ></procinst-mng>
+            </el-row>
+          </el-tab-pane>
+        </el-tabs>
+        <!--				<el-form-item label="机构编号" prop="branchId">
 					<el-input v-model="editForm.branchId" placeholder="机构编号"></el-input>
 				</el-form-item>
 				<el-form-item label="部门编号" prop="deptid">
@@ -113,170 +181,229 @@
 				<el-form-item label="最后审核意见" prop="fmsg">
 					<el-input v-model="editForm.fmsg" placeholder="最后审核意见"></el-input>
 				</el-form-item>-->
-			</el-form>
-		</el-row>
+      </el-form>
+    </el-row>
 
     <!--新增 XmTaskSbill 任务结算表界面-->
-    <el-drawer title="选择项目" :visible.sync="projSelVisible"  size="50%"  append-to-body  :close-on-click-modal="false">
-      <select-xm-project :visible="projSelVisible" @select="afterProjectSelect"></select-xm-project>
+    <el-drawer
+      title="选择项目"
+      :visible.sync="projSelVisible"
+      size="50%"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <select-xm-project
+        :visible="projSelVisible"
+        @select="afterProjectSelect"
+      ></select-xm-project>
     </el-drawer>
-	</section>
+  </section>
 </template>
 
 <script>
-	import util from '@/common/js/util';//全局公共库
-	import { getDicts,initSimpleDicts,initComplexDicts } from '@/api/mdp/meta/item';//字典表
-	import { addXmTaskSbill,editXmTaskSbill } from '@/api/xm/core/xmTaskSbill';
-	import { mapGetters } from 'vuex';
-  //import SelectXmProject from "./SelectXmProject";
-  import XmProjectSelect from "@/views/xm/core/components/XmProjectSelect";
-  import XmTaskSbillDetailMng from "@/views/xm/core/xmTaskSbillDetail/XmTaskSbillDetailMng";
+import util from "@/common/js/util"; //全局公共库
+import {
+  getDicts,
+  initSimpleDicts,
+  initComplexDicts,
+} from "@/api/mdp/meta/item"; //字典表
+import { addXmTaskSbill, editXmTaskSbill } from "@/api/xm/core/xmTaskSbill";
+import { mapGetters } from "vuex";
+//import SelectXmProject from "./SelectXmProject";
+import XmProjectSelect from "@/views/xm/core/components/XmProjectSelect";
+import XmTaskSbillDetailMng from "@/views/xm/core/xmTaskSbillDetail/XmTaskSbillDetailMng";
 
-	import TaskMng from '@/views/mdp/workflow/ru/task/TaskMng'; 
-	import ProcinstMng from '@/views//mdp/workflow/hi/procinst/ProcinstMng';
+import TaskMng from "@/views/mdp/workflow/ru/task/TaskMng";
+import ProcinstMng from "@/views//mdp/workflow/hi/procinst/ProcinstMng";
 
-	export default {
-    components: {
-      //XmTaskSbillEdit,
-      //SelectXmProject,
-      XmProjectSelect,XmTaskSbillDetailMng,TaskMng,ProcinstMng
+export default {
+  components: {
+    //XmTaskSbillEdit,
+    //SelectXmProject,
+    XmProjectSelect,
+    XmTaskSbillDetailMng,
+    TaskMng,
+    ProcinstMng,
+  },
+  computed: {
+    ...mapGetters(["userInfo"]),
+  },
+  props: ["xmTaskSbill", "visible", "opType"],
 
+  watch: {
+    xmTaskSbill: function (xmTaskSbill) {
+      if (xmTaskSbill) {
+        this.editForm = xmTaskSbill;
+      }
     },
-		computed: {
-		    ...mapGetters([ 'userInfo'  ]),
-
-		},
-		props:['xmTaskSbill','visible','opType'],
-
-		watch: {
-	      'xmTaskSbill':function( xmTaskSbill ) {
-	        if(xmTaskSbill){
-	            this.editForm = xmTaskSbill;
-	        }
-
-	      },
-	      'visible':function(visible) {
-	      	if(visible==true){
-	      		//从新打开页面时某些数据需要重新加载，可以在这里添加
-	      		this.initData();
-	      	}
-	      }
-	    },
-		data() {
-			return {
-        currOpType:'add',//add/edit
-        load:{ list: false, edit: false, del: false, add: false },//查询中...
-				dicts:{},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]}
-				editFormRules: {
-					id: [
-						//{ required: true, message: '结算单据编号不能为空', trigger: 'blur' }
-					]
-				},
+    visible: function (visible) {
+      if (visible == true) {
+        //从新打开页面时某些数据需要重新加载，可以在这里添加
+        this.initData();
+      }
+    },
+  },
+  data() {
+    return {
+      currOpType: "add", //add/edit
+      load: { list: false, edit: false, del: false, add: false }, //查询中...
+      dicts: {}, //下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]}
+      editFormRules: {
+        id: [
+          //{ required: true, message: '结算单据编号不能为空', trigger: 'blur' }
+        ],
+      },
 
-				//编辑界面数据  XmTaskSbill 任务结算表
-				editForm: {
-					id:'',title:'',amt:'',ctime:'',cuserid:'',cusername:'',remark:'',branchId:'',deptid:'',cpId:'',cpName:'',workload:'',bizMonth:'',bizDate:'',bizFlowState:'',bizProcInstId:'',ltime:'',status:'',fmsg:'',projectId:'',projectName:''
-				},
-				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
-        projSelVisible:false,
-			}//end return
-		},//end data
-		methods: {
-			...util,
-			// 取消按钮点击 父组件监听@cancel="editFormVisible=false" 监听
-			handleCancel:function(){
-				this.$refs['editFormRef'].resetFields();
-				this.$emit('cancel');
-			},
-			//编辑提交XmTaskSbill 任务结算表父组件监听@submit="afterEditSubmit"
-			saveSubmit: function () {
-			  if(this.currOpType=='add'){
-			    if(this.editForm.projectId==null || this.editForm.projectId=='' || this.editForm.projectId==undefined){
-			      this.$notify({position:'bottom-left',showClose:true,message:'请选择项目',type:'error'});
-			      return;
-          }
+      //编辑界面数据  XmTaskSbill 任务结算表
+      editForm: {
+        id: "",
+        title: "",
+        amt: "",
+        ctime: "",
+        cuserid: "",
+        cusername: "",
+        remark: "",
+        branchId: "",
+        deptid: "",
+        cpId: "",
+        cpName: "",
+        workload: "",
+        bizMonth: "",
+        bizDate: "",
+        bizFlowState: "",
+        bizProcInstId: "",
+        ltime: "",
+        status: "",
+        fmsg: "",
+        projectId: "",
+        projectName: "",
+      },
+      /**begin 在下面加自定义属性,记得补上面的一个逗号**/
+      projSelVisible: false,
+      activateName: "10",
+    }; //end return
+  }, //end data
+  methods: {
+    ...util,
+    // 取消按钮点击 父组件监听@cancel="editFormVisible=false" 监听
+    handleCancel: function () {
+      this.$refs["editFormRef"].resetFields();
+      this.$emit("cancel");
+    },
+    //编辑提交XmTaskSbill 任务结算表父组件监听@submit="afterEditSubmit"
+    saveSubmit: function () {
+      if (this.currOpType == "add") {
+        if (
+          this.editForm.projectId == null ||
+          this.editForm.projectId == "" ||
+          this.editForm.projectId == undefined
+        ) {
+          this.$notify({
+            position: "bottom-left",
+            showClose: true,
+            message: "请选择项目",
+            type: "error",
+          });
+          return;
         }
-        if(this.currOpType=='edit'){
-          if(this.editForm.status!='0'){
-            this.$notify({position:'bottom-left',showClose:true,message:'当前状态不能修改',type:'error'});
-            return;
-          }
+      }
+      if (this.currOpType == "edit") {
+        if (this.editForm.status != "0") {
+          this.$notify({
+            position: "bottom-left",
+            showClose: true,
+            message: "当前状态不能修改",
+            type: "error",
+          });
+          return;
         }
-				this.$refs.editFormRef.validate((valid) => {
-					if (valid) {
-						this.$confirm('确认提交吗？', '提示', {}).then(() => {
-							this.load.edit=true
-							let params = Object.assign({}, this.editForm);
+      }
+      this.$refs.editFormRef.validate((valid) => {
+        if (valid) {
+          this.$confirm("确认提交吗？", "提示", {}).then(() => {
+            this.load.edit = true;
+            let params = Object.assign({}, this.editForm);
 
-							/*let today = new Date();
+            /*let today = new Date();
 							let year = today.getFullYear();
 							let m = today.getMonth() + 1;
 							let d = today.getDay();
 							params.bizMonth = year+"-"+m;
 							params.bizDate = year+"-"+m+"-"+d;*/
 
-							if(this.currOpType=='edit'){
-							    editXmTaskSbill(params).then((res) => {
-                                    this.load.edit=false
-                                    var tips=res.data.tips;
-                                    if(tips.isOk){
-                                        this.$emit('submit');//  @submit="afterEditSubmit"
-                                    }
-                                    this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error' });
-                                }).catch( err =>this.load.edit=false);
-							}else{
-							    addXmTaskSbill(params).then((res) => {
-                                    this.load.edit=false
-                                    var tips=res.data.tips;
-                                    if(tips.isOk){
-                                        this.$emit('submit');//  @submit="afterAddSubmit"
-
-                                    }
-                                    this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error' });
-                                }).catch( err =>this.load.edit=false);
-							}
-						});
-					}
-				});
-			},
-			initData: function(){
-			    this.currOpType=this.opType
-          if(this.opType=='edit'){
-            if(this.xmTaskSbill){
-              this.editForm = Object.assign({},this.xmTaskSbill);
+            if (this.currOpType == "edit") {
+              editXmTaskSbill(params)
+                .then((res) => {
+                  this.load.edit = false;
+                  var tips = res.data.tips;
+                  if (tips.isOk) {
+                    this.$emit("submit"); //  @submit="afterEditSubmit"
+                  }
+                  this.$notify({
+                    position: "bottom-left",
+                    showClose: true,
+                    message: tips.msg,
+                    type: tips.isOk ? "success" : "error",
+                  });
+                })
+                .catch((err) => (this.load.edit = false));
+            } else {
+              addXmTaskSbill(params)
+                .then((res) => {
+                  this.load.edit = false;
+                  var tips = res.data.tips;
+                  if (tips.isOk) {
+                    this.$emit("submit"); //  @submit="afterAddSubmit"
+                  }
+                  this.$notify({
+                    position: "bottom-left",
+                    showClose: true,
+                    message: tips.msg,
+                    type: tips.isOk ? "success" : "error",
+                  });
+                })
+                .catch((err) => (this.load.edit = false));
             }
-          }else{
-            this.editForm = Object.assign({},{});
-          }
-      },
-			/**begin 在下面加自定义方法**/
-      afterProjectSelect(obj){
-        this.projSelVisible = false;
-        this.editForm.projectId = obj.projectId;
-        this.editForm.projectName = obj.projectName;
-      },
-      onProjectRowClick(obj){
-        this.$set(this.editForm, "projectId", obj[0].projectId);
-        this.$set(this.editForm, "projectName", obj[0].projectName);
-      },
-      onProjectClear(){
-        this.$set(this.editForm, "projectId", null);
-        this.$set(this.editForm, "projectName", null);
-      },
-	  afterFlowSubmit(){
-		
-	  }
-		},//end method
-		mounted() {
-		    this.$nextTick(() => {
-                initSimpleDicts('all',['bizFlowState']).then(res=>this.dicts=res.data.data);
-                this.initData()
-            });
-		}
-	}
-
+          });
+        }
+      });
+    },
+    initData: function () {
+      this.currOpType = this.opType;
+      if (this.opType == "edit") {
+        if (this.xmTaskSbill) {
+          this.editForm = Object.assign({}, this.xmTaskSbill);
+        }
+      } else {
+        this.editForm = Object.assign({}, {});
+      }
+    },
+    /**begin 在下面加自定义方法**/
+    afterProjectSelect(obj) {
+      this.projSelVisible = false;
+      this.editForm.projectId = obj.projectId;
+      this.editForm.projectName = obj.projectName;
+    },
+    onProjectRowClick(obj) {
+      this.$set(this.editForm, "projectId", obj[0].projectId);
+      this.$set(this.editForm, "projectName", obj[0].projectName);
+    },
+    onProjectClear() {
+      this.$set(this.editForm, "projectId", null);
+      this.$set(this.editForm, "projectName", null);
+    },
+    afterFlowSubmit() {},
+  }, //end method
+  mounted() {
+    this.$nextTick(() => {
+      initSimpleDicts("all", ["bizFlowState"]).then(
+        (res) => (this.dicts = res.data.data)
+      );
+      this.initData();
+    });
+  },
+};
 </script>
 
 <style scoped>
-
 </style>