diff --git a/src/components/occDisease/OccDisease.vue b/src/components/occDisease/OccDisease.vue
index 07f5282..a0f9d94 100644
--- a/src/components/occDisease/OccDisease.vue
+++ b/src/components/occDisease/OccDisease.vue
@@ -28,11 +28,13 @@
       </el-tab-pane>
     </el-tabs>
     <div style="display: flex;justify-content: space-between;">
-      <div></div>
       <div>
-        <el-button v-if="false" @click="btnTest">测试</el-button>
+        <el-button v-if="true" @click="btnTest">测试</el-button>
         <el-button class="deleteButton" @click="btnDel"
           :disabled="dataTransOpts.tableS.patient_register.completeFlag == '3'">删除</el-button>
+      </div>
+      <div>
+        <el-button class="commonbutton" @click="btnEdit">{{ btnEditName }}</el-button>
         <el-button class="commonbutton" @click="btnOk">确定</el-button>
         <el-button class="commonbutton" @click="btnClose">关闭</el-button>
       </div>
@@ -68,6 +70,7 @@ export default {
   data() {
     return {
       tabChoosed: "0",
+      btnEditName: "修改",
     };
   },
 
@@ -128,7 +131,31 @@ export default {
       postapi('/api/app/OccupationalDisease/GetOccupationalDiseaseWithDetailByPatientRegisterId', { patientRegisterId })
         .then(res => {
           if (res.code > -1) {
-            this.dataTransOpts.tableS.patient_occupational_disease = deepCopy(res.data['patientOccupationalDisease']) || { patientRegisterId }
+            if (this.dataTransOpts.tableS.patient_occupational_disease == null) {
+              this.dataTransOpts.tableS.patient_occupational_disease = deepCopy(res.data['patientOccupationalDisease']) || { patientRegisterId }
+              this.dataTransOpts.tableS.occModifiable = { //虚拟职业病允许修改表
+                isPatientOccupationalDiseaseUpdate: "Y",  //基本信息
+                isPatientPoisonsUpdate: "Y",  //接害因素
+                isPatientPastMedicalHistorysUpdate: "N", // 既往病史
+                isPatientOccupationalMedicalHistorysUpdate: "N", // 职业病史
+                isPatientOccupationalHistorysUpdate: "N", // 职业史
+                isPatientSymptomsUpdate: "Y", // 症状
+                isOccSummary: 'N', // 修改总检结论 
+              }
+            } else {
+              this.dataTransOpts.tableS.occModifiable = { //虚拟职业病允许修改表
+                isPatientOccupationalDiseaseUpdate: "N",  //基本信息
+                isPatientPoisonsUpdate: "N",  //接害因素
+                isPatientPastMedicalHistorysUpdate: "N", // 既往病史
+                isPatientOccupationalMedicalHistorysUpdate: "N", // 职业病史
+                isPatientOccupationalHistorysUpdate: "N", // 职业史
+                isPatientSymptomsUpdate: "N", // 症状
+                isOccSummary: 'N', // 修改总检结论 
+              }
+            }
+
+            this.tabChange(this.tabChoosed)
+
             this.dataTransOpts.tableM.patient_past_medical_history = deepCopy(res.data['patientPastMedicalHistoryDtos'])
             this.dataTransOpts.tableM.patient_occupational_medical_history = deepCopy(res.data['patientOccupationalMedicalHistoryDtos'])
             this.dataTransOpts.tableM.patient_poison = deepCopy(res.data['patientPoisonDtos'])
@@ -152,6 +179,8 @@ export default {
     },
 
     btnTest() {
+      console.log('this.tabChoosed', this.tabChoosed, this.btnEditName)
+      console.log('this.dataTransOpts.tableS.occModifiable', this.dataTransOpts.tableS.occModifiable)
       console.log('this.dataTransOpts.tableS.patient_occupational_disease', this.dataTransOpts.tableS.patient_occupational_disease)
       console.log('this.dataTransOpts.tableM.patient_poison', this.dataTransOpts.tableM.patient_poison)
       console.log('this.dataTransOpts.tableM.patient_occupational_history', this.dataTransOpts.tableM.patient_occupational_history)
@@ -173,40 +202,40 @@ export default {
     },
 
     // 数据验证
-    validiteData(){
+    validiteData() {
       let err = ''
       let disease = this.dataTransOpts.tableS.patient_occupational_disease
-      if(!disease.ocCheckTypeId){
+      if (!disease.ocCheckTypeId) {
         err = '请填写 检查类别'
         return err
       }
-      if(!disease.jobType){
+      if (!disease.jobType) {
         err = '请填写 工种'
         return err
       }
 
-      if(!disease.riskFactors){
+      if (!disease.riskFactors) {
         err = '请填写 基本信息-接害因素'
         return err
       }
 
-      if(disease.smokeFlag && disease.smokeFlag != '0'){
-        if(!disease.smokeNum){
+      if (disease.smokeFlag && disease.smokeFlag != '0') {
+        if (!disease.smokeNum) {
           err = '请填写 吸烟频次'
           return err
         }
-        if(!disease.smokeYears){
+        if (!disease.smokeYears) {
           err = '请填写 烟龄'
           return err
         }
       }
 
-      if(disease.drinkFlag && disease.drinkFlag != '0'){
-        if(!disease.drinkNum){
+      if (disease.drinkFlag && disease.drinkFlag != '0') {
+        if (!disease.drinkNum) {
           err = '请填写 饮酒频次'
           return err
         }
-        if(!disease.drinkYears){
+        if (!disease.drinkYears) {
           err = '请填写 酒龄'
           return err
         }
@@ -219,18 +248,116 @@ export default {
 
       // 日期为空串的，换成 null
       this.dataTransOpts.tableM.patient_past_medical_history.forEach(e => {
-        if(!e.diagnosisDate) e.diagnosisDate = null
+        if (!e.diagnosisDate) e.diagnosisDate = null
       });
       this.dataTransOpts.tableM.patient_occupational_medical_history.forEach(e => {
-        if(!e.diagnosisDate) e.diagnosisDate = null
+        if (!e.diagnosisDate) e.diagnosisDate = null
       });
       this.dataTransOpts.tableM.patient_occupational_history.forEach(e => {
-        if(!e.beginDate) e.beginDate = null
-        if(!e.endDate) e.endDate = null
+        if (!e.beginDate) e.beginDate = null
+        if (!e.endDate) e.endDate = null
       });
 
       return err
     },
+
+    changeBtnName(){
+      this.btnEditName = "修改"
+      console.log('this.btnEditName1',`${this.btnEditName}`)
+      switch (this.tabChoosed) {
+        case "0":
+          if (this.dataTransOpts.tableS.occModifiable.isPatientOccupationalDiseaseUpdate == 'Y') {
+            this.btnEditName = "取消修改"
+          }
+          break;
+        case "1":
+          if (this.dataTransOpts.tableS.occModifiable.isPatientPastMedicalHistorysUpdate == 'Y') {
+            this.btnEditName = "取消修改"
+          }
+          break;
+        case "2":
+          if (this.dataTransOpts.tableS.occModifiable.isPatientPoisonsUpdate == 'Y') {
+            this.btnEditName = "取消修改"
+          }
+          break;
+        case "3":
+          if (this.dataTransOpts.tableS.occModifiable.isPatientOccupationalHistorysUpdate == 'Y') {
+            this.btnEditName = "取消修改"
+          }
+          break;
+        case "4":
+          if (this.dataTransOpts.tableS.occModifiable.isPatientSymptomsUpdate == 'Y') {
+            this.btnEditName = "取消修改"
+          }
+          break;
+        case "7":
+          if (this.dataTransOpts.tableS.occModifiable.isOccSummary == 'Y') {
+            this.btnEditName = "取消修改"
+          }
+          break;
+        default:
+          break;
+      }
+      console.log('this.btnEditName2',`${this.btnEditName}`)
+    },
+
+    tabChange(v) {
+      this.tabChoosed = v
+      this.changeBtnName()
+    },
+
+    // 修改
+    btnEdit() {
+      switch (this.tabChoosed) {
+        case "0":
+          if (this.dataTransOpts.tableS.occModifiable.isPatientOccupationalDiseaseUpdate == 'Y') {
+            this.dataTransOpts.tableS.occModifiable.isPatientOccupationalDiseaseUpdate = 'N'
+          } else {
+            this.dataTransOpts.tableS.occModifiable.isPatientOccupationalDiseaseUpdate = 'Y'
+          }
+          break;
+        case "1":
+          if (this.dataTransOpts.tableS.occModifiable.isPatientPastMedicalHistorysUpdate == 'Y') {
+            this.dataTransOpts.tableS.occModifiable.isPatientPastMedicalHistorysUpdate = 'N'
+          } else {
+            this.dataTransOpts.tableS.occModifiable.isPatientPastMedicalHistorysUpdate = 'Y'
+          }
+          break;
+        case "2":
+          if (this.dataTransOpts.tableS.occModifiable.isPatientPoisonsUpdate == 'Y') {
+            this.dataTransOpts.tableS.occModifiable.isPatientPoisonsUpdate = 'N'
+          } else {
+            this.dataTransOpts.tableS.occModifiable.isPatientPoisonsUpdate = 'Y'
+          }
+          break;
+        case "3":
+          if (this.dataTransOpts.tableS.occModifiable.isPatientOccupationalHistorysUpdate == 'Y') {
+            this.dataTransOpts.tableS.occModifiable.isPatientOccupationalHistorysUpdate = 'N'
+          } else {
+            this.dataTransOpts.tableS.occModifiable.isPatientOccupationalHistorysUpdate = 'Y'
+          }
+          break;
+        case "4":
+          if (this.dataTransOpts.tableS.occModifiable.isPatientSymptomsUpdate == 'Y') {
+            this.dataTransOpts.tableS.occModifiable.isPatientSymptomsUpdate = 'N'
+          } else {
+            this.dataTransOpts.tableS.occModifiable.isPatientSymptomsUpdate = 'Y'
+          }
+          break;
+        case "7":
+          if (this.dataTransOpts.tableS.occModifiable.isOccSummary == 'Y') {
+            this.dataTransOpts.tableS.occModifiable.isOccSummary = 'N'
+          } else {
+            this.dataTransOpts.tableS.occModifiable.isOccSummary = 'Y'
+          }
+          break;
+        default:
+          break;
+      }
+      this.changeBtnName()
+
+    },
+
     // 点击确定
     btnOk() {
       let message = this.validiteData()
@@ -250,6 +377,13 @@ export default {
         patientSymptoms: this.dataTransOpts.tableM.patient_symptom
       }
 
+      if(this.dataTransOpts.tableS.occModifiable.isPatientPoisonsUpdate == 'Y' || this.dataTransOpts.tableS.occModifiable.isOccSummary == 'Y'){
+        this.dataTransOpts.tableS.occModifiable.isPatientOccupationalDiseaseUpdate == 'Y'
+      }
+      this.dataTransOpts.tableS.occModifiable.isPatientOccupationalMedicalHistorysUpdate = this.dataTransOpts.tableS.occModifiable.isPatientPastMedicalHistorysUpdate
+
+      body = Object.assign({},body,this.dataTransOpts.tableS.occModifiable)
+
       postapi('/api/app/OccupationalDisease/CreateOccupationalDiseaseWithDetail', body)
         .then(res => {
           if (res.code > -1) {
@@ -283,7 +417,14 @@ export default {
       }
     },
 
+    "tabChoosed": {
+      // immediate:true,
+      handler(newVal, oldVal) {       
+        if (newVal != oldVal ) this.tabChange(newVal)
+      }
+    },
   },
+  
 };
 </script>
 <style scoped>
diff --git a/src/store/index.js b/src/store/index.js
index a1fb8bf..336c16d 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -276,7 +276,7 @@ export default new Vuex.Store({
                 { id: "2", displayName: "离岗时" },
                 { id: "3", displayName: "离岗后" },
             ],
-            degree:[
+            degree: [
                 { id: "/", displayName: "/" },
                 { id: "-", displayName: "-" },
                 { id: "+-", displayName: "+-" },
@@ -286,9 +286,9 @@ export default new Vuex.Store({
                 { id: "++++", displayName: "++++" },
                 { id: "+++++", displayName: "+++++" },
             ],
-            poison:[], //毒害因素
-            poisonList:[], //毒害因素 不分组
-            symptom:[], //症状
+            poison: [], //毒害因素
+            poisonList: [], //毒害因素 不分组
+            symptom: [], //症状
             medicalPackage: [], //所有套餐
             customerOrgGroupAll: [], //所有分组，不限单位，不限次数
             customerOrg: [], //所有单位，非树结构
@@ -366,7 +366,19 @@ export default new Vuex.Store({
                 role_menu_info: { id: '' }, // 角色对应的菜单
                 sum_diagnosis: { id: '' }, // 总检诊断
 
-                patient_occupational_disease: { id: '' }, // 职业病基本信息
+                patient_occupational_disease: { id: '', patientRegisterId: '' }, // 职业病基本信息
+
+                occModifiable: { //虚拟职业病允许修改表
+                    isPatientOccupationalDiseaseUpdate: "N",  //基本信息
+                    isPatientPoisonsUpdate: "N",  //接害因素
+                    isPatientPastMedicalHistorysUpdate: "N", // 既往病史
+                    isPatientOccupationalMedicalHistorysUpdate: "N", // 职业病史
+                    isPatientOccupationalHistorysUpdate: "N", // 职业史
+                    isPatientSymptomsUpdate: "N", // 症状
+                    isOccSummary: 'N', // 修改总检结论 
+                },
+
+
             },
             //表当前数据（多条记录 M--more）
             tableM: {
@@ -388,12 +400,12 @@ export default new Vuex.Store({
                 register_check_item: [], // 体检人员登记的明细项目
                 role_menu_info: [], // 角色对应的菜单
                 sum_diagnosis: [], // 总检诊断
-                
+
                 patient_poison: [], // 病人毒害因素
                 patient_occupational_history: [],// 病人职业史
                 patient_symptom: [], // 病人症状
-                patient_past_medical_history:[], // 既往病史
-                patient_occupational_medical_history:[], // 职业病史
+                patient_past_medical_history: [], // 既往病史
+                patient_occupational_medical_history: [], // 职业病史
             },
             plus: {
                 PatientRegisterEditQuery: 0,         // 更新查询条件        
@@ -420,7 +432,7 @@ export default new Vuex.Store({
             LocalConfig: false, // 设置窗口
             AsbChargeRequest: false, // 收费申请
             OccDisease: false, // 职业病
-            Label:false, // 补打条码
+            Label: false, // 补打条码
         }
 
     },