1、调整发版日志-升级日志-详情、编辑界面边距

2、调整发版日志-App版本-详情、编辑界面边距
3、调整发版日志-App版本-详情界面样式
4、优化发版日志-App版本-编辑、详情页“更新说明”字段的处理方式：可自动扩展行高，避免详情页最多只展示3行问题
5、调整工单管理-工单管理-工单详情界面样式
6、调整工单管理-工单管理-工单详情界面样式

src/components/SectionDivider/SectionDivider.vue

@@ -2,7 +2,8 @@
   <div class="section-divider">
     <!-- 左侧灰色横线 -->
     <!-- <div class="left-line"></div> -->
-    <img src="./section.svg" class="divider-icon" />
+    <div class="left-icon"></div>
+    <!-- <img src="./section.svg" class="divider-icon" /> -->
     <!-- 标题文字 -->
     <div class="divider-content">
       <slot>{{ title }}</slot>
@@ -26,7 +27,7 @@ export default {
 .section-divider {
   display: flex;
   align-items: center;
-  margin: 5px 0 30px 20px;
+  margin: 5px 0 14px 20px;
 }
 
 /* 蓝色竖线（带圆角） */
@@ -72,4 +73,12 @@ export default {
   background-color: #ddd; /* 灰色 */
   margin-left: 8px; /* 与文字的间距 */
 }
+
+.left-icon{
+  width: 8px;
+  height: 18px;
+  background-color: #1890ff;
+  margin-right: 8px;
+  border-radius: 10px;
+}
 </style>

src/views/admin/IssueInfo/components/IssueInfoDetailForm.vue

@@ -4,7 +4,7 @@
       <template #detail>
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
           name="NuIssueInfoForm">
-          <a-row style="padding:14px;"  class="card-class">
+          <a-row style="padding:14px;" class="card-class">
             <!-- <a-col :span="24"  style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
               <p>
                 <span>发版类型：</span>
@@ -18,20 +18,22 @@
             <a-col :span="24" style="margin-top: 20px;">
               <div v-html="formData.content"></div>
             </a-col> -->
-            
+
             <a-col :span="12">
-              <a-form-item label="发版类型" v-bind="validateInfos.issueType_dictText" id="NuEmployeesAdvisoryInfoForm-issueType_dictText" name="issueType_dictText">
+              <a-form-item label="发版类型" v-bind="validateInfos.issueType_dictText"
-                <a-input v-model:value="formData.issueType_dictText" placeholder="请输入发版类型"   disabled  ></a-input>
+                id="NuEmployeesAdvisoryInfoForm-issueType_dictText" name="issueType_dictText">
+                <a-input v-model:value="formData.issueType_dictText" placeholder="请输入发版类型" disabled></a-input>
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="发版日期" v-bind="validateInfos.createTime" id="NuEmployeesAdvisoryInfoForm-createTime" name="createTime">
+              <a-form-item label="发版日期" v-bind="validateInfos.createTime" id="NuEmployeesAdvisoryInfoForm-createTime"
-                <a-input v-model:value="formData.createTime" placeholder="请输入发版日期"   disabled  ></a-input>
+                name="createTime">
+                <a-input v-model:value="formData.createTime" placeholder="请输入发版日期" disabled></a-input>
               </a-form-item>
             </a-col>
             <a-col :span="24">
-              <a-form-item label="发版内容：" v-bind="validateInfos.content" id="NuEmployeesAdvisoryInfoForm-content" name="content"
+              <a-form-item label="发版内容：" v-bind="validateInfos.content" id="NuEmployeesAdvisoryInfoForm-content"
-              :labelCol="labelCol2" :wrapperCol="wrapperCol2">
+                name="content" :labelCol="labelCol2" :wrapperCol="wrapperCol2">
                 <div v-html="formData.content" style="background:#f9f9fa;padding:8px;"></div>
               </a-form-item>
             </a-col>
@@ -173,7 +175,7 @@ defineExpose({
 
 <style lang="less" scoped>
 .antd-modal-form {
-  padding: 14px;
+  padding: 0 4px 0 4px;
 }
 
 .card-class {

src/views/admin/IssueInfo/components/IssueInfoDetailModal.vue

@@ -1,7 +1,8 @@
 <template>
-  <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true"
+  <a-drawer :title="title" :width="width" v-model:visible="visible" :closable="true"
-    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
+    :footer-style="{ textAlign: 'right' }" :bodyStyle="{ padding: '14px' }" @close="handleCancel">
-    <NuIssueInfoForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></NuIssueInfoForm>
+    <NuIssueInfoForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false">
+    </NuIssueInfoForm>
     <template #footer>
       <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
       <a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button>
@@ -10,73 +11,73 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, nextTick, defineExpose } from 'vue';
+import { ref, nextTick, defineExpose } from 'vue';
-  import NuIssueInfoForm from './IssueInfoDetailForm.vue'
+import NuIssueInfoForm from './IssueInfoDetailForm.vue'
-  import JModal from '/@/components/Modal/src/JModal/JModal.vue';
+import JModal from '/@/components/Modal/src/JModal/JModal.vue';
-  
-  const title = ref<string>('');
-  const width = ref<string>('70%');
-  const visible = ref<boolean>(false);
-  const disableSubmit = ref<boolean>(false);
-  const registerForm = ref();
-  const emit = defineEmits(['register', 'success']);
 
-  /**
+const title = ref<string>('');
-   * 新增
+const width = ref<string>('70%');
-   */
+const visible = ref<boolean>(false);
-  function add() {
+const disableSubmit = ref<boolean>(false);
-    title.value = '新增';
+const registerForm = ref();
-    visible.value = true;
+const emit = defineEmits(['register', 'success']);
-    nextTick(() => {
-      registerForm.value.add();
-    });
-  }
-  
-  /**
-   * 编辑
-   * @param record
-   */
-  function edit(record) {
-    title.value = disableSubmit.value ? '详情' : '编辑';
-    visible.value = true;
-    nextTick(() => {
-      registerForm.value.edit(record);
-    });
-  }
-  
-  /**
-   * 确定按钮点击事件
-   */
-  function handleOk() {
-    registerForm.value.submitForm();
-  }
 
-  /**
+/**
-   * form保存回调事件
+ * 新增
-   */
+ */
-  function submitCallback() {
+function add() {
-    handleCancel();
+  title.value = '新增';
-    emit('success');
+  visible.value = true;
-  }
+  nextTick(() => {
-
+    registerForm.value.add();
-  /**
-   * 取消按钮回调事件
-   */
-  function handleCancel() {
-    visible.value = false;
-  }
-
-  defineExpose({
-    add,
-    edit,
-    disableSubmit,
   });
+}
+
+/**
+ * 编辑
+ * @param record
+ */
+function edit(record) {
+  title.value = disableSubmit.value ? '详情' : '编辑';
+  visible.value = true;
+  nextTick(() => {
+    registerForm.value.edit(record);
+  });
+}
+
+/**
+ * 确定按钮点击事件
+ */
+function handleOk() {
+  registerForm.value.submitForm();
+}
+
+/**
+ * form保存回调事件
+ */
+function submitCallback() {
+  handleCancel();
+  emit('success');
+}
+
+/**
+ * 取消按钮回调事件
+ */
+function handleCancel() {
+  visible.value = false;
+}
+
+defineExpose({
+  add,
+  edit,
+  disableSubmit,
+});
 </script>
 
 <style lang="less">
-  /**隐藏样式-modal确定按钮 */
+/**隐藏样式-modal确定按钮 */
-  .jee-hidden {
+.jee-hidden {
-    display: none !important;
+  display: none !important;
-  }
+}
 </style>
 <style lang="less" scoped></style>

src/views/admin/IssueInfo/components/IssueInfoForm.vue

@@ -161,6 +161,6 @@ defineExpose({
 
 <style lang="less" scoped>
 .antd-modal-form {
-  padding: 14px;
+  padding: 0 4px 0 4px;
 }
 </style>

src/views/admin/appVersionConfig/AppVersionConfigList.vue

@@ -82,7 +82,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     canResize: false,
     useSearchForm: false,
     actionColumn: {
-      width: 140,
+      width: 160,
       fixed: 'right',
     },
     beforeFetch: async (params) => {

src/views/admin/appVersionConfig/components/AppVersionConfigForm.vue

@@ -1,10 +1,10 @@
 <template>
   <a-spin :spinning="confirmLoading">
-    <JFormContainer :disabled="disabled">
+    <JFormContainer :disabled="true">
       <template #detail>
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
           name="AppVersionConfigForm">
-          <a-row>
+          <a-row class="card-class">
             <a-col :span="24">
               <a-form-item label="版本号" v-bind="validateInfos.versionCode" id="AppVersionConfigForm-versionCode"
                 name="versionCode">
@@ -14,13 +14,13 @@
             <a-col :span="24">
               <a-form-item label="更新说明" v-bind="validateInfos.updateTrips" id="AppVersionConfigForm-updateTrips"
                 name="updateTrips">
-                <a-textarea v-model:value="formData.updateTrips" :rows="4" placeholder="请输入更新说明" allow-clear/>
+                <a-textarea v-model:value="formData.updateTrips" :autosize="{ minRows: 1 }" :disabled="false" placeholder="请输入更新说明" allow-clear />
               </a-form-item>
             </a-col>
             <a-col :span="24">
               <a-form-item label="是否强制更新" v-bind="validateInfos.isForceUpdate" id="AppVersionConfigForm-isForceUpdate"
                 name="isForceUpdate">
-                  <a-radio-group v-model:value="formData.isForceUpdate">
+                <a-radio-group v-model:value="formData.isForceUpdate">
                   <a-radio :value="0">否</a-radio>
                   <a-radio :value="1">是</a-radio>
                 </a-radio-group>
@@ -177,6 +177,19 @@ defineExpose({
 
 <style lang="less" scoped>
 .antd-modal-form {
-  padding: 14px;
+  padding: 0 4px 0 4px;
+}
+
+.card-class {
+  padding-top: 24px;
+  padding-bottom: 24px;
+  padding-left: 14px;
+  padding-right: 14px;
+  // background-color: rgba(255, 255, 255, 0.9);
+  background-color: #fcfdff;
+  border-radius: 10px;
+  // box-shadow: rgba(0, 0, 0, 0.1) 0px 2px 12px;
+  margin-bottom: 14px;
+
 }
 </style>

src/views/admin/appVersionConfig/components/AppVersionConfigFormEdit.vue

@@ -0,0 +1,182 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <JFormContainer :disabled="disabled">
+      <template #detail>
+        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
+          name="AppVersionConfigForm">
+          <a-row>
+            <a-col :span="24">
+              <a-form-item label="版本号" v-bind="validateInfos.versionCode" id="AppVersionConfigForm-versionCode"
+                name="versionCode">
+                <a-input v-model:value="formData.versionCode" placeholder="请输入版本号" allow-clear></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="更新说明" v-bind="validateInfos.updateTrips" id="AppVersionConfigForm-updateTrips"
+                name="updateTrips">
+                <a-textarea v-model:value="formData.updateTrips" :autosize="{ minRows: 3 }" placeholder="请输入更新说明" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="是否强制更新" v-bind="validateInfos.isForceUpdate" id="AppVersionConfigForm-isForceUpdate"
+                name="isForceUpdate">
+                  <a-radio-group v-model:value="formData.isForceUpdate">
+                  <a-radio :value="0">否</a-radio>
+                  <a-radio :value="1">是</a-radio>
+                </a-radio-group>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="状态" v-bind="validateInfos.status" id="AppVersionConfigForm-status" name="status">
+                <a-radio-group v-model:value="formData.status">
+                  <a-radio :value="1">可用</a-radio>
+                  <a-radio :value="0">不可用</a-radio>
+                </a-radio-group>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="app上传" v-bind="validateInfos.versionUrl" id="AppVersionConfigForm-versionUrl"
+                name="versionUrl">
+                <j-upload v-model:value="formData.versionUrl"></j-upload>
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-form>
+      </template>
+    </JFormContainer>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from '/@/hooks/web/useMessage';
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
+import { getValueType } from '/@/utils';
+import { saveOrUpdate } from '../AppVersionConfig.api';
+import { Form } from 'ant-design-vue';
+import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+const props = defineProps({
+  formDisabled: { type: Boolean, default: false },
+  formData: { type: Object, default: () => ({}) },
+  formBpm: { type: Boolean, default: true }
+});
+const formRef = ref();
+const useForm = Form.useForm;
+const emit = defineEmits(['register', 'ok']);
+const formData = reactive<Record<string, any>>({
+  id: '',
+  versionCode: '',
+  versionUrl: '',
+  updateTrips: '',
+  isForceUpdate: 0,
+  status: 1,
+});
+const { createMessage } = useMessage();
+const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+const confirmLoading = ref<boolean>(false);
+//表单验证
+const validatorRules = reactive({
+});
+const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
+
+// 表单禁用
+const disabled = computed(() => {
+  if (props.formBpm === true) {
+    if (props.formData.disabled === false) {
+      return false;
+    } else {
+      return true;
+    }
+  }
+  return props.formDisabled;
+});
+
+
+/**
+ * 新增
+ */
+function add() {
+  edit({});
+}
+
+/**
+ * 编辑
+ */
+function edit(record) {
+  nextTick(() => {
+    resetFields();
+    const tmpData = {};
+    Object.keys(formData).forEach((key) => {
+      if (record.hasOwnProperty(key)) {
+        tmpData[key] = record[key]
+      }
+    })
+    //赋值
+    Object.assign(formData, tmpData);
+  });
+}
+
+/**
+ * 提交数据
+ */
+async function submitForm() {
+  try {
+    // 触发表单验证
+    await validate();
+  } catch ({ errorFields }) {
+    if (errorFields) {
+      const firstField = errorFields[0];
+      if (firstField) {
+        formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+      }
+    }
+    return Promise.reject(errorFields);
+  }
+  confirmLoading.value = true;
+  const isUpdate = ref<boolean>(false);
+  //时间格式化
+  let model = formData;
+  if (model.id) {
+    isUpdate.value = true;
+  }
+  //循环数据
+  for (let data in model) {
+    //如果该数据是数组并且是字符串类型
+    if (model[data] instanceof Array) {
+      let valueType = getValueType(formRef.value.getProps, data);
+      //如果是字符串类型的需要变成以逗号分割的字符串
+      if (valueType === 'string') {
+        model[data] = model[data].join(',');
+      }
+    }
+  }
+  await saveOrUpdate(model, isUpdate.value)
+    .then((res) => {
+      if (res.success) {
+        createMessage.success(res.message);
+        emit('ok');
+      } else {
+        createMessage.warning(res.message);
+      }
+    })
+    .finally(() => {
+      confirmLoading.value = false;
+    });
+}
+
+
+defineExpose({
+  add,
+  edit,
+  submitForm,
+});
+</script>
+
+<style lang="less" scoped>
+.antd-modal-form {
+  padding: 0 4px 0 4px;
+}
+</style>

src/views/admin/appVersionConfig/components/AppVersionConfigModal.vue

@@ -1,7 +1,8 @@
 <template>
   <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true"
     :footer-style="{ textAlign: 'right' }" @close="handleCancel">
-    <AppVersionConfigForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></AppVersionConfigForm>
+    <AppVersionConfigForm v-if="disableSubmit" ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></AppVersionConfigForm>
+    <AppVersionConfigFormEdit v-else ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></AppVersionConfigFormEdit>
     <template #footer>
       <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
       <a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button>
@@ -12,6 +13,7 @@
 <script lang="ts" setup>
   import { ref, nextTick, defineExpose } from 'vue';
   import AppVersionConfigForm from './AppVersionConfigForm.vue'
+  import AppVersionConfigFormEdit from './AppVersionConfigFormEdit.vue'
   import JModal from '/@/components/Modal/src/JModal/JModal.vue';
   
   const title = ref<string>('');

src/views/admin/orginfo/components/OrgInfoForm.vue

@@ -1,98 +1,110 @@
 <template>
   <a-spin :spinning="confirmLoading">
-    <JFormContainer >
+    <JFormContainer :disabled="true">
       <template #detail>
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
           name="NuOrgInfoForm">
-          <a-row>
+          <a-row class="card-class">
-            <a-col :span="24">
+            <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
               <SectionDivider :title="'机构信息'" />
             </a-col>
-
-
             <a-col :span="12">
               <a-form-item label="机构编码" v-bind="validateInfos.orgCode" id="WorkOrderForm-orgCode" name="orgCode">
-                {{formData.orgCode}}
+                <a-input v-model:value="formData.orgCode" disabled allow-clear></a-input>
+                <!-- {{ formData.orgCode }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="机构负责人" v-bind="validateInfos.orgLeader" id="OrgApplyInfoForm-orgLeader"
                 name="orgLeader">
-                {{formData.orgLeader}}
+                <a-input v-model:value="formData.orgLeader" disabled allow-clear></a-input>
+                <!-- {{ formData.orgLeader }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="机构位置">
-                {{cityViewValue}}
+                <a-textarea :value="cityViewValue" :autosize="{ minRows: 1 }" :disabled="false" />
+                <!-- {{ cityViewValue }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="负责人电话" v-bind="validateInfos.orgLeaderPhone" id="OrgApplyInfoForm-orgLeaderPhone"
                 name="orgLeaderPhone">
-                {{formData.orgLeaderPhone}}
+                <a-input v-model:value="formData.orgLeaderPhone" disabled allow-clear></a-input>
+                <!-- {{ formData.orgLeaderPhone }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="机构名称" v-bind="validateInfos.departName" id="WorkOrderForm-departName" name="departName">
+              <a-form-item label="机构名称" v-bind="validateInfos.departName" id="WorkOrderForm-departName"
-                {{formData.departName}}
+                name="departName">
+                <a-input v-model:value="formData.departName" disabled allow-clear></a-input>
+                <!-- {{ formData.departName }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="房屋性质" v-bind="validateInfos.orgPropertyType" id="OrgApplyInfoForm-orgPropertyType"
                 name="orgPropertyType">
-                {{formData.orgPropertyType}}
+                <a-input v-model:value="formData.orgPropertyType" disabled allow-clear></a-input>
+                <!-- {{ formData.orgPropertyType }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="机构地址" v-bind="validateInfos.orgAddress" id="OrgApplyInfoForm-orgAddress"
                 name="orgAddress">
-                {{formData.orgAddress}}
+                <a-input v-model:value="formData.orgAddress" disabled allow-clear></a-input>
+                <!-- {{ formData.orgAddress }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="建筑面积" v-bind="validateInfos.orgBuildingArea" id="OrgApplyInfoForm-orgBuildingArea"
+              <a-form-item label="建筑面积(㎡)" v-bind="validateInfos.orgBuildingArea" id="OrgApplyInfoForm-orgBuildingArea"
                 name="orgBuildingArea">
-                {{formData.orgBuildingArea}} ㎡
+                <a-input v-model:value="formData.orgBuildingArea" disabled allow-clear></a-input>
+                <!-- {{ formData.orgBuildingArea }} ㎡ -->
               </a-form-item>
             </a-col>
           </a-row>
 
-          <a-row>
+          <a-row class="card-class">
-            <a-col :span="24">
+            <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
               <SectionDivider :title="'营业执照'" />
             </a-col>
-            <a-col :span="12">
+            <a-col :span="24">
-              <a-form-item label="营业执照照片" v-bind="validateInfos.comBusinessLicense"
+              <a-col :span="12">
-                id="OrgApplyInfoForm-comBusinessLicense" name="comBusinessLicense">
+                <a-form-item label="营业执照照片" v-bind="validateInfos.comBusinessLicense"
-                <JImageUpload :fileMax="1" v-model:value="formData.comBusinessLicense" :disabled="true"></JImageUpload>
+                  id="OrgApplyInfoForm-comBusinessLicense" name="comBusinessLicense">
-              </a-form-item>
+                  <JImageUpload :fileMax="1" v-model:value="formData.comBusinessLicense" :disabled="true">
+                  </JImageUpload>
+                </a-form-item>
+              </a-col>
             </a-col>
-          </a-row>
-          <a-row>
             <a-col :span="12">
               <a-form-item label="信用代码" v-bind="validateInfos.comCreditCode" id="OrgApplyInfoForm-comCreditCode"
                 name="comCreditCode">
-                {{formData.comCreditCode}}
+                <a-input v-model:value="formData.comCreditCode" disabled allow-clear></a-input>
+                <!-- {{ formData.comCreditCode }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="企业名称" v-bind="validateInfos.comName" id="OrgApplyInfoForm-comName" name="comName">
-                {{formData.comName}}
+                <a-input v-model:value="formData.comName" disabled allow-clear></a-input>
+                <!-- {{ formData.comName }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="企业法人" v-bind="validateInfos.comLegalPerson" id="OrgApplyInfoForm-comLegalPerson"
                 name="comLegalPerson">
-                {{formData.comLegalPerson}}
+                <a-input v-model:value="formData.comLegalPerson" disabled allow-clear></a-input>
+                <!-- {{ formData.comLegalPerson }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="注册地址" v-bind="validateInfos.comRegisterAddress"
                 id="OrgApplyInfoForm-comRegisterAddress" name="comRegisterAddress">
-                {{formData.comRegisterAddress}}
+                <a-textarea v-model:value="formData.comRegisterAddress" :autosize="{ minRows: 1 }" :disabled="false" />
+                <!-- {{ formData.comRegisterAddress }} -->
               </a-form-item>
             </a-col>
-            
+
             <!-- <a-col :span="24">
               <SectionDivider :title="'加盟审核'" />
             </a-col>
@@ -102,13 +114,11 @@
               </a-form-item>
             </a-col> -->
           </a-row>
-          
+
-          <a-row>
+          <a-row class="card-class">
-            <a-col :span="24">
+            <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
               <SectionDivider :title="'申请人身份证'" />
             </a-col>
-          </a-row>
-          <a-row>
             <a-col :span="12">
               <a-row>
                 <a-col :span="24">
@@ -119,34 +129,40 @@
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="姓名" v-bind="validateInfos.name" id="OrgApplyInfoForm-name" name="name">
-                    {{formData.name}}
+                    <a-input v-model:value="formData.name" disabled allow-clear></a-input>
+                    <!-- {{ formData.name }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="性别" v-bind="validateInfos.sex" id="OrgApplyInfoForm-sex" name="sex">
-                    {{formData.sex}}
+                    <a-input v-model:value="formData.sex" disabled allow-clear></a-input>
+                    <!-- {{ formData.sex }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="出生日期" v-bind="validateInfos.birthDate" id="OrgApplyInfoForm-birthDate"
                     name="birthDate">
-                    {{formData.birthDate?formData.birthDate.substring(0,10):""}}
+                    <a-input :value="formData.birthDate ? formData.birthDate.substring(0, 10) : ''" disabled
+                      allow-clear></a-input>
+                    <!-- {{ formData.birthDate ? formData.birthDate.substring(0, 10) : "" }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="身份证号" v-bind="validateInfos.idCard" id="OrgApplyInfoForm-idCard" name="idCard">
-                    {{formData.idCard}}
+                    <a-input v-model:value="formData.idCard" disabled allow-clear></a-input>
+                    <!-- {{ formData.idCard }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
                   <a-form-item label="住址" v-bind="validateInfos.idCardAddress" id="OrgApplyInfoForm-idCardAddress"
                     name="idCardAddress">
-                    {{formData.idCardAddress}}
+                    <a-textarea v-model:value="formData.idCardAddress" :autosize="{ minRows: 1 }" :disabled="false" />
+                    <!-- {{ formData.idCardAddress }} -->
                   </a-form-item>
                 </a-col>
               </a-row>
             </a-col>
-            
+
             <a-col :span="12">
               <a-row>
                 <a-col :span="24">
@@ -158,12 +174,18 @@
                 <a-col :span="24">
                   <a-form-item label="有效开始日期" v-bind="validateInfos.startTime" id="OrgApplyInfoForm-startTime"
                     name="startTime">
-                    {{formData.startTime?formData.startTime.substring(0,10):""}}
+                    <a-date-picker v-model:value="formData.startTime" value-format="YYYY-MM-DD" style="width: 100%"
+                      allow-clear />
+                    <!-- {{ formData.startTime ? formData.startTime.substring(0, 10) : "" }} -->
                   </a-form-item>
                 </a-col>
                 <a-col :span="24">
-                  <a-form-item label="有效结束日期" v-bind="validateInfos.endTime" id="OrgApplyInfoForm-endTime" name="endTime">
+                  <a-form-item label="有效结束日期" v-bind="validateInfos.endTime" id="OrgApplyInfoForm-endTime"
-                    {{formData.endTime?formData.endTime.substring(0,10):""}}
+                    name="endTime">
+                    <a-input v-if="formData.endTime == '9999-12-31'" :value="'长期'" allow-clear></a-input>
+                    <a-date-picker v-else v-model:value="formData.endTime" value-format="YYYY-MM-DD" style="width: 100%"
+                      allow-clear />
+                    <!-- {{ formData.endTime ? formData.endTime.substring(0, 10) : "" }} -->
                   </a-form-item>
                 </a-col>
                 <!-- <a-col :span="24">
@@ -172,47 +194,55 @@
                   </a-form-item>
                 </a-col> -->
                 <a-col :span="24">
-                  <a-form-item label="签发机关" v-bind="validateInfos.issuingAuthority" id="OrgApplyInfoForm-issuingAuthority"
+                  <a-form-item label="签发机关" v-bind="validateInfos.issuingAuthority"
-                    name="issuingAuthority">
+                    id="OrgApplyInfoForm-issuingAuthority" name="issuingAuthority">
-                    {{formData.issuingAuthority}}
+                    <a-input v-model:value="formData.issuingAuthority" disabled allow-clear></a-input>
+                    <!-- {{ formData.issuingAuthority }} -->
                   </a-form-item>
                 </a-col>
               </a-row>
             </a-col>
           </a-row>
-          
+
-          
+          <a-row class="card-class">
-          <a-row>
+            <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
-            <a-col :span="24">
               <SectionDivider :title="'审核信息'" />
             </a-col>
             <a-col :span="12">
               <a-form-item label="审核人">
-                {{formData.auditBy}}
+                <a-input v-model:value="formData.auditBy" disabled allow-clear></a-input>
+                <!-- {{ formData.auditBy }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="审核时间">
-                {{formData.auditTime}}
+                <a-input v-model:value="formData.auditTime" disabled allow-clear></a-input>
+                <!-- {{ formData.auditTime }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="审核状态">
-                {{formData.auditStatus}}
+                <a-input v-model:value="formData.auditStatus" disabled allow-clear></a-input>
+                <!-- {{ formData.auditStatus }} -->
               </a-form-item>
             </a-col>
           </a-row>
-
+        </a-form>
-          <a-row>
+      </template>
-            <a-col :span="24">
+    </JFormContainer>
+    <JFormContainer :disabled="false">
+      <template #detail>
+        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
+          name="NuOrgInfoForm">
+          <a-row class="card-class">
+            <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
               <SectionDivider :title="'加盟合同'" />
             </a-col>
-          </a-row>
-          <a-row>
             <a-col :span="12">
               <a-form-item label="加盟合同" v-bind="validateInfos.contract" id="OrgApplyInfoForm-contract">
                 <!-- <JUpload v-model:value="formData.contract" :maxCount="1"></JUpload> -->
-                <JUpload v-model:value="formData.contract" :maxCount="1" :buttonVisible="false" disabled="true" fileType="pdf"></JUpload>
+                <JUpload v-model:value="formData.contract" :maxCount="1" :buttonVisible="false" :disabled="true"
+                  fileType="pdf"></JUpload>
               </a-form-item>
             </a-col>
             <!-- <a-col :span="12">
@@ -225,6 +255,7 @@
         </a-form>
       </template>
     </JFormContainer>
+
   </a-spin>
 </template>
 
@@ -348,7 +379,7 @@ function edit(record) {
         tmpData[key] = record[key]
       }
     })
-    
+
     //赋值
     Object.assign(formData, tmpData);
   });
@@ -357,7 +388,7 @@ function edit(record) {
 function open(orgCode) {
   getOrgInfo({ orgCode }).then(res => {
     Object.assign(formData, res);
-    
+
     cityViewValue.value = res.orgProvince
       + (!!res.orgCity ? res.orgCity : '')
       + (!!res.orgDistrict ? res.orgDistrict : '')
@@ -423,9 +454,19 @@ defineExpose({
 
 <style lang="less" scoped>
 .antd-modal-form {
-  padding: 14px;
+  padding: 0 4px 0 4px;
 }
-.ant-form-item-label{
+
-  color: white;
+.card-class {
+  padding-top: 24px;
+  padding-bottom: 24px;
+  padding-left: 14px;
+  padding-right: 14px;
+  // background-color: rgba(255, 255, 255, 0.9);
+  background-color: #fcfdff;
+  border-radius: 10px;
+  // box-shadow: rgba(0, 0, 0, 0.1) 0px 2px 12px;
+  margin-bottom: 14px;
+
 }
 </style>

src/views/admin/workorder/components/WorkOrderForm.vue

@@ -4,30 +4,32 @@
       <template #detail>
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
           name="WorkOrderForm">
-          <div style="margin: 20px;">
+          <a-row class="card-class">
+            <a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
               <SectionDivider :title="'工单信息'" />
-          </div>
+            </a-col>
-          <a-row style="padding: 20px;margin:40px;">
             <a-col :span="12">
               <a-form-item label="机构名称" v-bind="validateInfos.orgName" id="WorkOrderForm-orgName" name="orgName">
-                {{formData.orgName}}
+                <a-input v-model:value="formData.orgName" disabled allow-clear></a-input>
+                <!-- {{ formData.orgName }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="机构编码" v-bind="validateInfos.orgCode" id="WorkOrderForm-orgCode" name="orgCode">
-                {{formData.orgCode}}
+                <a-input v-model:value="formData.orgCode" disabled allow-clear></a-input>
+                <!-- {{ formData.orgCode }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="平台类型" v-bind="validateInfos.platType" id="WorkOrderForm-platType"
+              <a-form-item label="平台类型" v-bind="validateInfos.platType" id="WorkOrderForm-platType" name="platType">
-                name="platType">
+                <a-input v-model:value="formData.platType_dictText" disabled allow-clear></a-input>
-                {{formData.platType_dictText}}
+                <!-- {{ formData.platType_dictText }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="工单类型" v-bind="validateInfos.workType" id="WorkOrderForm-workType"
+              <a-form-item label="工单类型" v-bind="validateInfos.workType" id="WorkOrderForm-workType" name="workType">
-                name="workType">
+                <a-input v-model:value="formData.workType_dictText" disabled allow-clear></a-input>
-                {{formData.workType_dictText}}
+                <!-- {{ formData.workType_dictText }} -->
               </a-form-item>
             </a-col>
             <!-- <a-col :span="12">
@@ -42,28 +44,33 @@
             </a-col> -->
             <a-col :span="12">
               <a-form-item label="提交人" v-bind="validateInfos.createBy" id="WorkOrderForm-createBy" name="createBy">
-                {{formData.createBy}}
+                <a-input v-model:value="formData.createBy" disabled allow-clear></a-input>
+                <!-- {{ formData.createBy }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="提交时间" v-bind="validateInfos.createTime" id="WorkOrderForm-createTime"
                 name="createTime">
-                {{formData.createTime}}
+                <a-input v-model:value="formData.createTime" disabled allow-clear></a-input>
+                <!-- {{ formData.createTime }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="处理人" v-bind="validateInfos.handleBy" id="WorkOrderForm-handleBy" name="handleBy">
-                {{formData.handleBy?formData.handleBy:'暂未处理'}}
+                <a-input :value="formData.handleBy ? formData.handleBy : '暂未处理'" disabled allow-clear></a-input>
+                <!-- {{ formData.handleBy ? formData.handleBy : '暂未处理' }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="反馈时间" v-bind="validateInfos.replyTime" id="WorkOrderForm-replyTime" name="replyTime">
-                {{formData.replyTime?formData.replyTime:'暂未处理'}}
+                <a-input :value="formData.replyTime ? formData.replyTime : '暂未处理'" disabled allow-clear></a-input>
+                <!-- {{ formData.replyTime ? formData.replyTime : '暂未处理' }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="工单状态" v-bind="validateInfos.status" id="WorkOrderForm-status" name="status">
-                {{formData.status_dictText}}
+                <a-input v-model:value="formData.status_dictText" disabled allow-clear></a-input>
+                <!-- {{ formData.status_dictText }} -->
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -72,8 +79,10 @@
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="反馈内容" v-bind="validateInfos.replyContent" id="WorkOrderForm-replyContent" name="replyContent">
+              <a-form-item label="反馈内容" v-bind="validateInfos.replyContent" id="WorkOrderForm-replyContent"
-                {{formData.replyContent}}
+                name="replyContent">
+                <a-textarea v-model:value="formData.replyContent" :autosize="{ minRows: 1 }" :disabled="false" />
+                <!-- {{ formData.replyContent }} -->
               </a-form-item>
             </a-col>
           </a-row>
@@ -226,6 +235,19 @@ defineExpose({
 
 <style lang="less" scoped>
 .antd-modal-form {
-  padding: 14px;
+  padding: 0 4px 0 4px;
+}
+
+.card-class {
+  padding-top: 24px;
+  padding-bottom: 24px;
+  padding-left: 14px;
+  padding-right: 14px;
+  // background-color: rgba(255, 255, 255, 0.9);
+  background-color: #fcfdff;
+  border-radius: 10px;
+  // box-shadow: rgba(0, 0, 0, 0.1) 0px 2px 12px;
+  margin-bottom: 14px;
+
 }
 </style>

src/views/admin/workorder/components/WorkOrderModal.vue

@@ -3,9 +3,9 @@
     :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
   </j-modal> -->
 
-  
+
-  <a-drawer :title="title" :width="'70vw'"  v-model:visible="visible" :closable="true"
+  <a-drawer :title="title" :width="'70vw'" v-model:visible="visible" :closable="true"
-    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
+    :footer-style="{ textAlign: 'right' }" :bodyStyle="{ padding: '14px' }" @close="handleCancel">
     <WorkOrderForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false">
     </WorkOrderForm>
     <template #footer>
@@ -21,9 +21,9 @@
     </template>
   </j-modal> -->
 
-  
+
-  <a-drawer :title="`机构详情`" :width="'70vw'"  v-model:visible="orgDetailVisible" :closable="true"
+  <a-drawer :title="`机构详情`" :width="'70vw'" v-model:visible="orgDetailVisible" :closable="true"
-    :footer-style="{ textAlign: 'right' }" @close="handleOrgDetailCancel">
+    :footer-style="{ textAlign: 'right' }" :bodyStyle="{ padding: '14px' }" @close="handleOrgDetailCancel">
     <OrgInfoForm ref="orgDetailRef" :formDisabled="true" :formBpm="false" />
     <template #footer>
       <a-button type="primary" style="margin-right: 8px" @click="handleOrgDetailCancel">关闭</a-button>
@@ -31,9 +31,9 @@
   </a-drawer>
 
 
-  
+
-  <a-drawer :title="`反馈`" :width="'70vw'"  v-model:visible="orgFankuiVisible" :closable="true"
+  <a-drawer :title="`反馈`" :width="'70vw'" v-model:visible="orgFankuiVisible" :closable="true"
-    :footer-style="{ textAlign: 'right' }" @close="handleOrgFankuiCancel">
+    :footer-style="{ textAlign: 'right' }" :bodyStyle="{ padding: '14px' }" @close="handleOrgFankuiCancel">
     <WorkOrderFankui ref="orgFankuiRef" :formDisabled="false" @ok="handleOrgFankuiFankuiCancel" :formBpm="false" />
     <template #footer>
       <a-button type="primary" style="margin-right: 8px" @click="handleOrgFankuiCancel">关闭</a-button>