代码修改

src/views/baseSet/serverProjectManage/components/projectEditDialog.vue

@@ -1,5 +1,5 @@
 <template>
-    <a-modal :open="modal.open" :title="modal.title" :width="600" :confirm-loading="modal.confirmLoading"
+    <a-modal :open="modal.open" :title="modal.title" :width="750" :confirm-loading="modal.confirmLoading"
         :after-close="onAfterClose" :cancel-text="cancelText" @ok="handleOk" @cancel="handleCancel">
         <a-card>
             <a-form ref="formRef" :model="formData" :rules="formRules">
@@ -33,7 +33,7 @@
                                 <template #addonAfter>
                                     <a-select v-model:value="formData.priceUnit" style="width: 100px">
                                         <a-select-option value="次">元/次</a-select-option>
-                                        <a-select-option value="时">元/时</a-select-option>
+                                        <a-select-option value="时">元/小时</a-select-option>
                                     </a-select>
                                 </template>
                             </a-input-number>
@@ -52,9 +52,9 @@
                         <a-form-item label="服务频次" name="frequency">
                             <a-input-number v-model:value="formData.frequency" style="width: 100%;">
                                 <template #addonAfter>
-                                    <a-select v-model:value="formData.frequencyUnit" style="width: 80px">
-                                        <a-select-option value="元/次">元/次</a-select-option>
-                                        <a-select-option value="元/台">元/台</a-select-option>
+                                    <a-select v-model:value="formData.frequencyUnit" style="width: 120px">
+                                        <a-select-option value="元/次">小时/次</a-select-option>
+                                        <a-select-option value="元/台">小时/台</a-select-option>
                                     </a-select>
                                 </template>
                             </a-input-number>

src/views/baseSet/serverProjectManage/components/serverProject.vue

@@ -51,6 +51,10 @@
                     <span>{{ dicsStore.getDictLabel('PROJECT_TYPE', record.categoryType) }}</span>
                 </template>
 
+                <template v-if="column.key === 'price'">
+                    <span>{{ record.price + record.frequencyUnit }}</span>
+                </template>
+              
                 <template v-if="'action' === column.key">
                     <x-action-button @click="$refs.editDialogRef.handleEdit(record)">
                         <span>编辑</span>
@@ -85,7 +89,7 @@ const columns = [
     { title: '分类名称', dataIndex: 'name', key: 'name', align: 'center', width: 180, },
     { title: '项目名称', dataIndex: 'name', key: 'name', align: 'center', },
     { title: '价格', dataIndex: 'price', key: 'price', align: 'center', },
-    { title: '简介', dataIndex: 'remark', key: 'remark', align: 'center', },
+    { title: '简介', dataIndex: 'content', key: 'content', align: 'center', },
    
     { title: '操作', dataIndex: 'action', key: 'action', align: 'center', width: 120, fixed: 'right', }
 ];

src/views/serviceMenu/serviceOrganization/components/EditDialog.vue

@@ -28,12 +28,17 @@
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item :label="'组织机构代码'" name="orgCode" :required="true">
-              <a-input v-model:value="formData.orgCode" placeholder="统一社会信用代码或组织机构代码" allow-clear />
+            <a-form-item :label="'服务组织编号'" name="orgCode" :required="true">
+              <a-input v-model:value="formData.orgCode" placeholder="请输入服务组织编号" allow-clear />
             </a-form-item>
           </a-col>
         </a-row>
         <a-row :gutter="16">
+          <a-col :span="12">
+            <a-form-item :label="'组织机构代码'" name="orgCode33" :required="false">
+              <a-input v-model:value="formData.orgCode33" placeholder="请输入服务组织编号" allow-clear />
+            </a-form-item>
+          </a-col>
           <a-col :span="12">
             <a-form-item :label="'组织等级'" name="orgLv" :required="true">
               <a-select v-model:value="formData.orgLv" placeholder="请选择组织等级" allow-clear>
@@ -242,6 +247,7 @@ const editingId = ref(null);
 const formData = reactive({
   name: '',
   orgCode: '',
+  orgCode33: '',
   orgLv: '',
   concatName: '',
   concatPhone: '',

src/views/serviceMenu/serviceOrganization/index.vue

@@ -119,7 +119,7 @@
                         <a-button type="link" size="small" @click="handleDetail(record)">详情</a-button>
                         <a-divider type="vertical" />
                         <a-button type="link" size="small" @click="handleToggleStatus(record)">
-                            {{ record.status === 'enabled' ? '停用' : '启用' }}
+                            {{ record.status === '1' ? '停用' : '启用' }}
                         </a-button>
                         <a-divider type="vertical" />
                         <!-- <a-button type="link" size="small" @click="handleDeviceManagement(record)">设备管理</a-button> -->