Merge branch 'main' of https://github.youjiala.com/itcsx/Docker

WebVue/src/views/master/FamilyPersonEnquiry.vue

@@ -16,13 +16,13 @@
     @on-select-change="onSelectChange"
   >
     <template #control>
-      <a-button
+      <!-- <a-button
         type="primary"
         v-if="canCreate && !isModal"
         :icon="h(FileAddOutlined)"
         @click.prevent="onCreate"
         >新增</a-button
-      >
+      > -->
     </template>
     <template #bodyCell="{ column, record, index }">
       <template v-if="column.dataIndex === FamilyPersonEntity.GENDER">
@@ -51,7 +51,7 @@
                   @click.prevent="onAmend"
                   >修改</a-button
                 >
-                <a-popconfirm
+                <!-- <a-popconfirm
                   title="确定是否删除这条记录?"
                   ok-text="是"
                   cancel-text="否"
@@ -65,7 +65,7 @@
                     :disabled="!(keys && keys.length > 0)"
                     >删除</a-button
                   >
-                </a-popconfirm>
+                </a-popconfirm> -->
               </a-space>
             </a-row>
           </a-col>

WebVue/src/views/master/FamilyPersonOperation.vue

@@ -48,13 +48,13 @@
                 @click.prevent="onReset"
                 >重置</a-button
               >
-              <a-button
+              <!-- <a-button
                 type="primary"
                 :disabled="isEdit"
                 :icon="h(FileAddOutlined)"
                 @click.prevent="onCreate"
                 >新增</a-button
-              >
+              > -->
             </a-space>
           </a-col>
         </a-row>
@@ -479,7 +479,7 @@
                       @click.prevent="onAmend"
                       >修改</a-button
                     >
-                    <a-popconfirm
+                    <!-- <a-popconfirm
                       :disabled="!hasData"
                       title="确定是否删除这条记录?"
                       ok-text="是"
@@ -494,7 +494,7 @@
                         v-if="canDelete"
                         >删除</a-button
                       >
-                    </a-popconfirm>
+                    </a-popconfirm> -->
                   </a-space>
                 </a-row>
               </div>

WebVue/src/views/master/FamilyTreeOperation.vue

@@ -187,7 +187,7 @@
               <a-select
                 size="large"
                 v-model:value="data.CurrentPerson.FamilyPerson.Gender"
-                :disabled="!isEdit"
+                :disabled="true"
                 placeholder="请选择性别"
                 style="width: 100%"
               >
@@ -202,7 +202,7 @@
               <div class="ft-label">族谱名</div>
               <a-input
                 size="large"
-                :disabled="!isEdit"
+                :disabled="true"
                 v-model:value="data.CurrentPerson.FamilyPerson.GenealogyName"
                 placeholder="请输入族谱名"
               />
@@ -211,7 +211,7 @@
               <div class="ft-label">常用名</div>
               <a-input
                 size="large"
-                :disabled="!isEdit"
+                :disabled="true"
                 v-model:value="data.CurrentPerson.FamilyPerson.CommonName"
                 placeholder="请输入常用名"
               />
@@ -220,6 +220,7 @@
               <div class="ft-label">族员ID</div>
               <a-input-search
                 size="large"
+                :disabled="isEdit"
                 v-model:value="data.CurrentPerson.FamilyPerson.PersonId"
                 placeholder="请输入族员ID"
                 @search="onModalCurrentPerson"