diff --git a/ruoyi-admin/src/main/resources/templates/project/info/add.html b/ruoyi-admin/src/main/resources/templates/project/info/add.html
index b439ed5e..b031fcbd 100644
--- a/ruoyi-admin/src/main/resources/templates/project/info/add.html
+++ b/ruoyi-admin/src/main/resources/templates/project/info/add.html
@@ -468,7 +468,7 @@ ${softwareProjectProductInfoList.map((ele) => {
         }).join('')
         }
 </select></td>
-<td><textarea name="softwareProjectProductInfoList[${length}].productDesc" required class="form-control productDesc" placeholder="自动带入" readonly></textarea></td>
+<td><textarea name="softwareProjectProductInfoList[${length}].productDesc" required class="form-control productDesc" placeholder="自动带入" readonly>${softwareProjectProductInfoList[0]?.description||''}</textarea></td>
 <td><input name="softwareProjectProductInfoList[${length}].quantity" type="number" class="form-control quantity" step="1" required></td>
 <td><input name="softwareProjectProductInfoList[${length}].cataloguePrice" type="text" class="form-control cataloguePrice" required></td>
 <td><input name="softwareProjectProductInfoList[${length}].guidanceDiscount" type="number" class="form-control guidanceDiscount" min="0" max="1"  step="0.1" required></td>
@@ -504,7 +504,7 @@ ${hardwareProjectProductInfoList.map((ele) => {
         }
 
 </select></td>
-<td><textarea name="hardwareProjectProductInfoList[${length}].productDesc" required class="form-control productDesc" placeholder="自动带入" readonly></textarea></td>
+<td><textarea name="hardwareProjectProductInfoList[${length}].productDesc" required class="form-control productDesc" placeholder="自动带入" readonly>${hardwareProjectProductInfoList[0]?.description||''}</textarea></td>
 <td><input name="hardwareProjectProductInfoList[${length}].quantity" type="number" class="form-control quantity" step="1" required></td>
 <td><input name="hardwareProjectProductInfoList[${length}].cataloguePrice" type="text" class="form-control cataloguePrice" required></td>
 <td><input name="hardwareProjectProductInfoList[${length}].guidanceDiscount" type="number" class="form-control guidanceDiscount" min="0" max="1"  step="0.1" required></td>
@@ -540,7 +540,7 @@ ${hardwareProjectProductInfoList.map((ele) => {
         }
 
 </select></td>
-<td><textarea name="maintenanceProjectProductInfoList[${length}].productDesc" required class="form-control productDesc" placeholder="自动带入" readonly></textarea></td>
+<td><textarea name="maintenanceProjectProductInfoList[${length}].productDesc" required class="form-control productDesc" placeholder="自动带入" readonly>${maintenanceProjectProductInfoList[0]?.description||''}</textarea></td>
 <td><input name="maintenanceProjectProductInfoList[${length}].quantity" type="number" class="form-control quantity" step="1" required></td>
 <td><input name="maintenanceProjectProductInfoList[${length}].cataloguePrice" type="text" class="form-control cataloguePrice" required></td>
 <td><input name="maintenanceProjectProductInfoList[${length}].guidanceDiscount" type="number" class="form-control guidanceDiscount" min="0" max="1"  step="0.1" required></td>
@@ -592,6 +592,9 @@ ${hardwareProjectProductInfoList.map((ele) => {
             form.on('select(productModel3)', function (data) {
                 searchProduct(data.value, 'model', data.elem)
             })
+            $('.layui-input').on('mouseout',function (){
+                $(this).blur()
+            })
         })
         $('.productTable .delRow').on('click', function () {
             let ele = $(this)
diff --git a/ruoyi-admin/src/main/resources/templates/project/info/edit.html b/ruoyi-admin/src/main/resources/templates/project/info/edit.html
index 7b4deb1f..fd22b1a2 100644
--- a/ruoyi-admin/src/main/resources/templates/project/info/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/project/info/edit.html
@@ -186,7 +186,7 @@
                     </div>
 
                     <div>
-                        其它：<input type="text" name="competitorList[5]" th:field="*{competitorList[5]}"
+                        其它：<input type="text" name="competitorList[5]"
                                     class="form-control" style="width: 400px">
                     </div>
                 </td>
@@ -490,7 +490,16 @@
 
     // 添加软件
     function initData() {
-
+        console.log(123, [[${projectInfo.competitorList}]])
+      let competitorList=[[${projectInfo.competitorList}]]
+        competitorList.forEach((ele,index)=>{
+            if(ele){
+                $(`input[type="checkbox"][value="${ele}"]`).attr('checked',true)
+            }
+            if((!$(`input[type="checkbox"][value="${ele}"]`).length)&&ele){
+                $(`[name="competitorList[5]"]`).val(ele)
+            }
+        })
         let arr2 = [[${projectInfo.projectWorkProgressList}]]
         arr2.forEach((ele) => {
             addLog(ele)
@@ -616,7 +625,7 @@ ${maintenanceProjectProductInfoList.map((ele) => {
         let tr = $(`
 <tr>
 <td>${length + 1}</td>
-<td><input type="hidden" value="${data.id}" name="projectWorkProgressList[${length}].id"><textarea type="text" name="projectWorkProgressList[${length}].workContent" class="form-control" required>${data.workContent || ''}</textarea></td>
+<td><input type="hidden" value="${data.id || ''}" name="projectWorkProgressList[${length}].id"><textarea type="text" name="projectWorkProgressList[${length}].workContent" class="form-control" required>${data.workContent || ''}</textarea></td>
 <td><input type="text" class="form-control"  placeholder="保存后自动填入" value="${data.userName || ''}" readonly></td>
 <td><input type="text" class="form-control" placeholder="保存后自动填入" value="${data.workTime || ''}" readonly></td>
 </tr>`)
@@ -646,6 +655,9 @@ ${maintenanceProjectProductInfoList.map((ele) => {
             form.on('select(productModel3)', function (data) {
                 searchProduct(data.value, 'model', data.elem)
             })
+            $('.layui-input').on('mouseout',function (){
+                $(this).blur()
+            })
         })
         $('.productTable .delRow').on('click', function () {
             let ele = $(this)
diff --git a/ruoyi-admin/src/main/resources/templates/project/info/project.html b/ruoyi-admin/src/main/resources/templates/project/info/project.html
index 9e70ccae..df09ea1d 100644
--- a/ruoyi-admin/src/main/resources/templates/project/info/project.html
+++ b/ruoyi-admin/src/main/resources/templates/project/info/project.html
@@ -85,10 +85,10 @@
                             <label>项目把握度：</label>
                             <select name="projectGraspDegree" onchange="changeTimeType()" value="0">
                                 <option value="">请选择</option>
-                                <option value="0">A</option>
-                                <option value="1">B</option>
-                                <option value="2">C</option>
-                                <option value="2">D</option>
+                                <option value="A">A</option>
+                                <option value="B">B</option>
+                                <option value="C">C</option>
+                                <option value="D">D</option>
                             </select>
                         </li>
                         <li>
@@ -186,6 +186,8 @@
                     formatter: (value, row, index) => {
                         if (row.highlight) {
                             return `<span class="highlight">${value}</span>`
+                        }else{
+                            return `<span>${value}</span>`
                         }
                     }
                 },
diff --git a/ruoyi-admin/src/main/resources/templates/project/order/add.html b/ruoyi-admin/src/main/resources/templates/project/order/add.html
index cefc4f57..fd48cede 100644
--- a/ruoyi-admin/src/main/resources/templates/project/order/add.html
+++ b/ruoyi-admin/src/main/resources/templates/project/order/add.html
@@ -518,7 +518,7 @@ ${softwareProjectProductInfoList.map((ele) => {
         }).join('')
         }
 </select></td>
-<td><textarea name="softwareProjectProductInfoList[${length}].productDesc" required class="form-control productDesc" placeholder="自动带入" readonly></textarea></td>
+<td><textarea name="softwareProjectProductInfoList[${length}].productDesc" required class="form-control productDesc" placeholder="自动带入" readonly>${softwareProjectProductInfoList[0]?.description||''}</textarea></td>
 <td><input name="softwareProjectProductInfoList[${length}].quantity" type="number" class="form-control quantity" step="1" required></td>
 <td><input name="softwareProjectProductInfoList[${length}].cataloguePrice" type="text" class="form-control cataloguePrice" required></td>
 <td><input name="softwareProjectProductInfoList[${length}].guidanceDiscount" type="number" class="form-control guidanceDiscount" min="0" max="1"  step="0.1" required></td>
@@ -554,7 +554,7 @@ ${hardwareProjectProductInfoList.map((ele) => {
         }
 
 </select></td>
-<td><textarea name="hardwareProjectProductInfoList[${length}].productDesc" required class="form-control productDesc" placeholder="自动带入" readonly></textarea></td>
+<td><textarea name="hardwareProjectProductInfoList[${length}].productDesc" required class="form-control productDesc" placeholder="自动带入" readonly>${hardwareProjectProductInfoList[0]?.description||''}</textarea></td>
 <td><input name="hardwareProjectProductInfoList[${length}].quantity" type="number" class="form-control quantity" step="1" required></td>
 <td><input name="hardwareProjectProductInfoList[${length}].cataloguePrice" type="text" class="form-control cataloguePrice" required></td>
 <td><input name="hardwareProjectProductInfoList[${length}].guidanceDiscount" type="number" class="form-control guidanceDiscount" min="0" max="1"  step="0.1" required></td>
@@ -590,7 +590,7 @@ ${maintenanceProjectProductInfoList.map((ele) => {
         }
 
 </select></td>
-<td><textarea name="maintenanceProjectProductInfoList[${length}].productDesc" required class="form-control productDesc" placeholder="自动带入" readonly></textarea></td>
+<td><textarea name="maintenanceProjectProductInfoList[${length}].productDesc" required class="form-control productDesc" placeholder="自动带入" readonly>${maintenanceProjectProductInfoList[0]?.description||''}</textarea></td>
 <td><input name="maintenanceProjectProductInfoList[${length}].quantity" type="number" class="form-control quantity" step="1" required></td>
 <td><input name="maintenanceProjectProductInfoList[${length}].cataloguePrice" type="text" class="form-control cataloguePrice" required></td>
 <td><input name="maintenanceProjectProductInfoList[${length}].guidanceDiscount" type="number" class="form-control guidanceDiscount" min="0" max="1"  step="0.1" required></td>
@@ -624,6 +624,7 @@ ${maintenanceProjectProductInfoList.map((ele) => {
         layui.use(function (){
             var form=layui.form
             form.render()
+
             form.on('select(productCode1)',function (data) {
                 searchProduct(data.value, 'code', data.elem)
             })
@@ -642,6 +643,9 @@ ${maintenanceProjectProductInfoList.map((ele) => {
             form.on('select(productModel3)',function (data) {
                 searchProduct(data.value, 'model', data.elem)
             })
+            $('.layui-input').on('mouseout',function (){
+                $(this).blur()
+            })
         })
         $('.productTable .delRow').on('click', function () {
             let ele = $(this)