feat: 字段名称以及取值修改

.env.production

@@ -5,7 +5,7 @@ VITE_APP_TITLE = 智能国标化验室数据平台
 VITE_APP_ENV = 'production'
 
 # 管理系统/生产环境
-VITE_APP_BASE_API = 'http://192.168.40.18:8889'
+VITE_APP_BASE_API = 'http://192.168.40.20:8889'
 
 # 是否在打包时开启压缩，支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip

src/views/client/manage/index.vue

@@ -83,7 +83,7 @@ const handleEditOrganizationOrFactory = (row) => {
   const { parentId, name: parentName, type, provinceCode, cityCode, countryCode }  = row;
   formData.value = {
     ...row,
-    parentId: type == 0 ? 0 : parentId,
+    // parentId: type == 0 ? 0 : parentId,
     parentName,
     type,
     title: type == 0 ? "编辑集团" : "编辑水厂",
@@ -101,9 +101,7 @@ const handleDelete = async ({ id }) => {
 
 const initPageData = async () => {
   tableLoading.value = true;
-
   const { rows } = await getOrganizationList(queryParams.value);
-
   tableData.value = rows.map(item => ({
     ...item,
     typeText: typeEmun[item.type],
@@ -292,9 +290,12 @@ onMounted(() => {
               <el-input v-model="formData.code" placeholder="请输入编号" clearable />
             </el-form-item>
           </el-col>
-          <el-col :span="11" v-if="formData.type == 1" prop="parentId">
-            <el-form-item label="上级机构" prop="parentName">
-              <span>{{ formData.parentName }}</span>
+          <el-col :span="11" v-if="formData.type == 1">
+            <el-form-item label="上级机构" prop="parentId">
+              <el-select v-model="formData.parentId" placeholder="请选择状态" clearable>
+                <el-option :label="item.name" :value="item.id"  v-for="item in tableData" :key="item.id"/>
+              </el-select>
+              <!-- <span>{{ formData.parentName }}</span> -->
             </el-form-item>
           </el-col>
           <el-col :span="11" prop="regionList">

src/views/report/record/index.vue

@@ -23,7 +23,7 @@ const columns = [
   {
     label: '基本资料',
     children: [
-      { label: "化验时间", prop: 'assayTime', width: 180 },
+      { label: "化验开始时间", prop: 'assayTime', width: 180 },
       // { label: "设备名称", prop: 'deviceName', width: 180 },
       // { label: "设备名称", prop: 'deviceNo', width: 180 },
       { label: "所属水厂", prop: 'worksName', width: 180 },

src/views/report/report-daily/index.vue

@@ -105,7 +105,7 @@ const reloadPageData = async (type) => {
   const { data } = await getHomeCounts({type: queryParams.value.type});
   pageCountNums.value = {
     ...data,
-    passAssayRates: Number(data.passAssayRates.slice(0, -1))
+    passAssayRates: data.passAssayRates ? Number(data.passAssayRates?.slice(0, -1)) : 0
   };
   initPageData();
 }

src/views/system/user/index.vue

@@ -179,7 +179,7 @@
       </el-row>
 
       <!-- 添加或修改用户配置对话框 -->
-      <el-dialog :title="title" v-model="open" width="600px" append-to-body>
+      <el-dialog :title="title" v-model="open" width="900px" append-to-body>
          <el-form :model="form" :rules="rules" ref="userRef" label-width="80px">
             <el-row>
                <el-col :span="12">
@@ -264,7 +264,7 @@
                   </el-form-item>
                </el-col>
                <el-col :span="12">
-                  <el-form-item label="角色">
+                  <el-form-item label="角色" prop="roleIds">
                      <el-select v-model="form.roleIds" multiple placeholder="请选择">
                         <el-option
                            v-for="item in roleOptions"
@@ -393,7 +393,8 @@ const data = reactive({
     nickName: [{ required: true, message: "用户姓名不能为空", trigger: "blur" }],
     password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }, { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }],
     email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
-    phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
+    phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
+    roleIds: [{ type: 'array', required: true, message: "角色不能为空", trigger: "blur" }]
   }
 });