Merge remote-tracking branch 'origin/test-dev' into test-dev

public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20250529111005"
+  "value": "20250604151731"
 }

src/views/manager/projectinfo/detail.vue

@@ -101,7 +101,6 @@
                     <el-input v-model="projectForm.jlSuffix">
                     </el-input>
                   </el-form-item>
-                 
                       <el-form-item
                       label="电签类别"
                       prop="remarkType"
@@ -644,15 +643,16 @@ export default {
         remarkType: [
             { required: true, message: '请选择电签类别', trigger: 'blur' },
         ],
-        sgSuffix: [
-          { required: true, message: '请输入施工后缀', trigger: 'blur' },
-        ],
-        jlSuffix: [
-          { required: true, message: '请输入监理后缀', trigger: 'blur' },
-        ],
+       
         templateType:[
             { required: true, message: '请选择是否模板引用', trigger: 'blur' },
         ],
+        sgSuffix:[
+            { required: true, message: '请输入施工文件后缀', trigger: 'blur' },
+        ],
+        jlSuffix:[
+            { required: true, message: '请输入监理文件前缀', trigger: 'blur' },
+        ],
           
         
 

src/views/manager/projectinfo/treeTemplate/template/electronicSignature.vue

@@ -116,6 +116,7 @@
             <tr>
               <th >元素位置</th>
               <th>签字岗位</th>
+              <th>是否引用系统级电签</th>
               <th>签字时间元素位置</th>
               <th >偏移x</th>
               <th>偏移y</th>
@@ -126,6 +127,10 @@
             <tr v-for="(item,key) in setsignaTable" :key="key" v-on:click="">
               <td>{{ item.colName }}</td>
               <td>{{ item.sigRoleName }}</td>
+              <td align="center">
+                  <i class="el-icon-success" style="font-size: 20px;color:#67C23A" v-if="item.isSystem==1"></i>
+                  <i class="el-icon-error" style="font-size: 20px;color:red" v-else></i>
+              </td>
               <td>{{ item.timeName }}</td>
               <td>{{ item.pyzbx }}</td>
               <td>{{ item.pyzby }}</td>