diff --git a/src/views/components/firmDialog/index.vue b/src/views/components/firmDialog/index.vue
index 1270a59..93b6540 100644
--- a/src/views/components/firmDialog/index.vue
+++ b/src/views/components/firmDialog/index.vue
@@ -450,7 +450,7 @@ export default {
       for (let key in this.details) {
         this.listDes.forEach((value1, index1) => {
           if (key == value1.eng) {
-            this.listDes[index1].value = this.details[key] == '无' ? '/' : this.details[key] == 'true' ? '是' : this.details[key];
+            this.listDes[index1].value = this.details[key] == '无' ? '/' : this.details[key] == 'true' ? '是' : this.details[key] == 'null' ? '/' : this.details[key];
             return;
           }
         });
diff --git a/src/views/components/tempDialog/index.vue b/src/views/components/tempDialog/index.vue
index 0b7ada4..9e01c9c 100644
--- a/src/views/components/tempDialog/index.vue
+++ b/src/views/components/tempDialog/index.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-09-28 11:25:48
  * @LastEditors: JC9527
- * @LastEditTime: 2023-10-09 10:01:06
+ * @LastEditTime: 2023-10-11 11:06:21
 -->
 <template>
   <el-dialog
@@ -172,7 +172,6 @@ export default {
         // let listData = data.data
         this.mydistrict = district
         let myDistrict = this.componendDistrict(district)
-        console.log(myDistrict)
         let mycreateTime = createTime.split(' ')[0]
         if(idTwo == 2) {
           let obj = { entprName,myDistrict,mycreateTime,plannedYear,planName,planContent,remark }
@@ -240,8 +239,8 @@ export default {
               background: "rgba(0, 0, 0, 0.7)",
             });
             // console.log(this.form)
-            const { planName,remark,planContent } = this.form;
-            let obj = {updateTime:this.getData(),planContent:planContent,planName:planName,remark:remark,id:this.id}
+            const { planName,remark,planContent,plannedYear } = this.form;
+            let obj = {updateTime:this.getData(),planContent:planContent,planName:planName,remark:remark,id:this.id,plannedYear:plannedYear}
             // console.log(obj)
             let data = await this.$api.yingji.bPlanEnterprise('put',obj)
             console.log(data)