BUG 优化

Merge remote-tracking branch 'origin/dev' into dev
BUG 优化
2024-04-02 18:52:04 +08:00 · 2024-04-02 08:26:09 +08:00 · 2024-04-01 18:55:28 +08:00
7 changed files with 116 additions and 80 deletions
--- a/src/views/enterprise_management/user_practitioner/details.vue
+++ b/src/views/enterprise_management/user_practitioner/details.vue
@ -5,6 +5,12 @@
      <el-descriptions-item label="姓名">
        {{ data.info.NAME }}
      </el-descriptions-item>
+      <el-descriptions-item label="手机号">
+        {{ data.info.PHONE }}
+      </el-descriptions-item>
+      <el-descriptions-item label="出生年月">
+        {{ data.info.DATE_OF_BIRTH }}
+      </el-descriptions-item>
      <el-descriptions-item label="人员类型">
        {{ data.info.PERSONNEL_TYPE_NAME }}
      </el-descriptions-item>
@ -41,6 +47,15 @@
      <el-descriptions-item label="参加工作时间">
        {{ data.info.WORKING_DATE }}
      </el-descriptions-item>
+      <el-descriptions-item label="部门排序">
+        {{ data.info.SORT }}
+      </el-descriptions-item>
+      <el-descriptions-item label="邮箱">
+        {{ data.info.EMAIL }}
+      </el-descriptions-item>
+      <el-descriptions-item label="备注">
+        {{ data.info.BZ }}
+      </el-descriptions-item>
    </el-descriptions>
    <div v-for="(item, index) in data.certificateList" :key="index">
      <el-divider content-position="left">
@ -53,6 +68,40 @@
        }}
      </el-divider>
      <el-descriptions :column="2" border>
+        <template>
+          <el-descriptions-item
+            :label="
+              item.CERTIFICATE_CATEGORY === '1'
+                ? '身份证（正面）'
+                : item.CERTIFICATE_CATEGORY === '2'
+                ? '驾驶证'
+                : '道路运输从业资格证'
+            "
+            :span="item.CERTIFICATE_CATEGORY === '1' ? 1 : 2"
+          >
+            <img
+              v-viewer
+              v-if="item.ID_PHOTO_FRONT !== null"
+              :src="item.ID_PHOTO_FRONT"
+              width="100"
+              height="100"
+              class="ml-10"
+            />
+          </el-descriptions-item>
+          <el-descriptions-item
+            v-if="item.CERTIFICATE_CATEGORY === '1'"
+            label="身份证（背面）"
+          >
+            <img
+              v-viewer
+              v-if="item.ID_PHOTO_BACK !== null"
+              :src="item.ID_PHOTO_BACK"
+              width="100"
+              height="100"
+              class="ml-10"
+            />
+          </el-descriptions-item>
+        </template>
        <el-descriptions-item
          :label="
            item.CERTIFICATE_CATEGORY === '1'
@ -138,6 +187,14 @@ const fnGetData = async () => {
    }
  });
  data.certificateList = resData.certificateList;
+  data.certificateList.forEach((item) => {
+    if(!item.ID_PHOTO_FRONT || item.ID_PHOTO_FRONT.includes("undefined")) {
+      item.ID_PHOTO_FRONT = null
+    }
+    if(!item.ID_PHOTO_BACK) {
+      item.ID_PHOTO_BACK = null
+    }
+  });
 };
 fnGetData();
 </script>
--- a/src/views/mechanical_files/inspect_annually/index.vue
+++ b/src/views/mechanical_files/inspect_annually/index.vue
@ -164,40 +164,13 @@
              >编辑
            </el-button>
            <el-button
-              v-if="expandedRows[row.INSPECTANNUALLY_ID]"
+              v-if="buttonJurisdiction.del"
              type="danger"
              text
              link
              @click="fnDelete(row.INSPECTANNUALLY_ID)"
-              >删除
-            </el-button>
-            <el-button
-              v-if="
-                expandedRows[row.INSPECTANNUALLY_ID] &&
-                row.REMINDER_STATUS === '0'
-              "
-              type="primary"
-              text
-              link
-              @click="fnStatusChange(row.INSPECTANNUALLY_ID, '1')"
-              >开启</el-button
            >
-            <el-button
-              v-if="
-                expandedRows[row.INSPECTANNUALLY_ID] &&
-                row.REMINDER_STATUS === '1'
-              "
-              type="primary"
-              text
-              link
-              @click="fnStatusChange(row.INSPECTANNUALLY_ID, '0')"
-              >关闭
-            </el-button>
-            <el-button
-              type="primary"
-              @click="toggleExpand(row.INSPECTANNUALLY_ID)"
-            >
-              {{ expandedRows[row.INSPECTANNUALLY_ID] ? "收起" : "更多" }}
+              删除
            </el-button>
          </template>
        </el-table-column>
@ -230,7 +203,6 @@ import useListData from "@/assets/js/useListData.js";
 import {
  getInspectAnnuallyList,
  setInspectAnnuallyDelete,
-  setInspectAnnuallyEdit2,
 } from "@/request/mechanical_files.js";
 import { reactive } from "vue";
 import { debounce } from "throttle-debounce";
@ -274,18 +246,6 @@ const fnResetPaginationTransfer = () => {
    REMINDER_STATUS: searchForm.value.REMINDER_STATUS,
  });
 };
-// 使用一个对象来跟踪每一行的展开状态
-const expandedRows = reactive({}); // 初始化一个空对象
-
-// 定义一个函数来切换展开状态
-function toggleExpand(rowId) {
-  if (expandedRows[rowId] === undefined) {
-    expandedRows[rowId] = true; // 如果之前没有状态，默认设置为展开
-  } else {
-    expandedRows[rowId] = !expandedRows[rowId]; // 切换状态
-  }
-}
-
 const fnDelete = debounce(
  1000,
  async (INSPECTANNUALLY_ID) => {
@ -296,19 +256,6 @@ const fnDelete = debounce(
  },
  { atBegin: true }
 );
-const fnStatusChange = debounce(
-  1000,
-  async (INSPECTANNUALLY_ID, REMINDER_STATUS) => {
-    const msg = REMINDER_STATUS === "0" ? "关闭" : "开启";
-    await ElMessageBox.confirm("确定要" + msg + "提醒吗？", {
-      type: "warning",
-    });
-    await setInspectAnnuallyEdit2({ INSPECTANNUALLY_ID, REMINDER_STATUS });
-    ElMessage.success(msg + "成功");
-    fnResetPaginationTransfer();
-  },
-  { atBegin: true }
-);
 const buttonJurisdiction = await useButtonJurisdiction("hidden");

 const fnImportDialogChangeShow = () => {
--- a/src/views/mechanical_files/insure/index.vue
+++ b/src/views/mechanical_files/insure/index.vue
@ -137,8 +137,12 @@
        <!--<el-table-column prop="CONTACTS" label="经营企业" width="150"/>-->
        <el-table-column prop="REMINDER_STATUS" label="提醒状态" width="150">
          <template #default="{ row }">
-            <el-tag v-if="row.REMINDER_STATUS === '1'">开启</el-tag>
-            <el-tag v-else-if="row.REMINDER_STATUS === '0'">关闭</el-tag>
+            <el-tag v-if="row.REMINDER_STATUS === '1'" type="success"
+            >开启</el-tag
+            >
+            <el-tag v-else-if="row.REMINDER_STATUS === '0'" type="info"
+            >关闭</el-tag
+            >
          </template>
        </el-table-column>
        <el-table-column prop="DUE_DATE_TYPE" label="到期状态" width="150">
--- a/src/views/mechanical_files/maintenance/index.vue
+++ b/src/views/mechanical_files/maintenance/index.vue
@ -108,22 +108,38 @@
        <!--<el-table-column prop="CONTACTS" label="经营企业" width="150"/>-->
        <el-table-column prop="REMINDER_STATUS" label="提醒状态" width="150">
          <template #default="{ row }">
-            <el-tag v-if="row.REMINDER_STATUS === '1'">开启</el-tag>
-            <el-tag v-else-if="row.REMINDER_STATUS === '0'">关闭</el-tag>
+            <el-tag v-if="row.REMINDER_STATUS === '1'" type="success"
+            >开启</el-tag
+            >
+            <el-tag v-else-if="row.REMINDER_STATUS === '0'" type="info"
+            >关闭</el-tag
+            >
          </template>
        </el-table-column>
        <el-table-column prop="DUE_DATE_TYPE" label="到期状态" width="150">
          <template #default="{ row }">
-            <el-tag v-if="row.DUE_DATE_TYPE === 1">未到期</el-tag>
-            <el-tag v-else-if="row.DUE_DATE_TYPE === 0">已到期</el-tag>
-            <el-tag v-else-if="row.DUE_DATE_TYPE === 2">即将到期</el-tag>
+            <el-tag v-if="row.DUE_DATE_TYPE === 1" type="success"
+            >未到期</el-tag
+            >
+            <el-tag v-else-if="row.DUE_DATE_TYPE === 0" type="error"
+            >已到期</el-tag
+            >
+            <el-tag v-else-if="row.DUE_DATE_TYPE === 2" type="info"
+            >即将到期</el-tag
+            >
          </template>
        </el-table-column>
-        <el-table-column prop="NEW_ARCHIVES_TYPE" label="车辆状态" width="150">
+        <el-table-column prop="ARCHIVES_TYPE" label="车辆状态" width="150">
          <template #default="{ row }">
-            <el-tag v-if="row.NEW_ARCHIVES_TYPE === '1'">报废</el-tag>
-            <el-tag v-else-if="row.NEW_ARCHIVES_TYPE === '0'">正常</el-tag>
-            <el-tag v-else-if="row.NEW_ARCHIVES_TYPE === '2'">过户</el-tag>
+            <el-tag v-if="row.ARCHIVES_TYPE === '2'" type="error"
+            >报废</el-tag
+            >
+            <el-tag v-else-if="row.ARCHIVES_TYPE === '0'" type="success"
+            >正常</el-tag
+            >
+            <el-tag v-else-if="row.ARCHIVES_TYPE === '1'" type="info"
+            >过户</el-tag
+            >
          </template>
        </el-table-column>
        <el-table-column prop="CREATTIME" label="创建时间" width="150" />
--- a/src/views/mechanical_files/operations/edit.vue
+++ b/src/views/mechanical_files/operations/edit.vue
@ -19,7 +19,7 @@
        </el-col>
        <el-col :span="12">
          <el-form-item label="运营车辆" prop="VEHICLE">
-            <el-select v-model="form.VEHICLE" @change="getBusInfo">
+            <el-select v-model="form.PLATE_NUMBER" @change="getBusInfo">
              <el-option
                v-for="item in data.vehicleList"
                :key="item.ID"
@ -250,6 +250,7 @@ const OPERATIONS_ID = route.query.OPERATIONS_ID;
 const annualInspectionCycleList = await layoutFnGetAnnualInspectionCycle();
 const formRef = ref(null);
 const form = ref({
+  PLATE_NUMBER: "",
  VEHICLE_MODEL: "",
  VEHICLE: "",
  NUM: "",
--- a/src/views/mechanical_files/operations/index.vue
+++ b/src/views/mechanical_files/operations/index.vue
@ -110,7 +110,7 @@
        <el-table-column prop="CAR_OWNERS" label="车主业户" width="150" />
        <el-table-column prop="TELEPHONE" label="联系电话" width="150" />
        <el-table-column prop="PROCESSING_DATE" label="办理日期" width="150" />
-        <el-table-column prop="CYCLE_NAME" label="运营周期" width="150" />
+        <el-table-column prop="NAME" label="运营周期" width="150" />
        <el-table-column prop="DUE_DATE" label="到期日期" width="150" />
        <el-table-column prop="REGISTRANT" label="登记人" width="150" />
        <!--<el-table-column prop="CONTACTS" label="经营企业" width="150"/>-->
@ -119,25 +119,35 @@
            <!--            <span v-if="row.REMINDER_STATUS === '1'">开启</span>-->
            <!--            <span v-else-if="row.REMINDER_STATUS === '0'">关闭</span>-->
            <el-tag v-if="row.REMINDER_STATUS === '1'" type="success"
-              >开启</el-tag
-            >
+              >开启
+            </el-tag>
            <el-tag v-else-if="row.REMINDER_STATUS === '0'" type="info"
-              >关闭</el-tag
-            >
+              >关闭
+            </el-tag>
          </template>
        </el-table-column>
        <el-table-column prop="DUE_DATE_TYPE" label="到期状态" width="150">
          <template #default="{ row }">
-            <span v-if="row.DUE_DATE_TYPE === 1">未到期</span>
-            <span v-else-if="row.DUE_DATE_TYPE === 0">已到期</span>
-            <span v-else-if="row.DUE_DATE_TYPE === 2">即将到期</span>
+            <el-tag v-if="row.DUE_DATE_TYPE === 1" type="success"
+              >未到期
+            </el-tag>
+            <el-tag v-else-if="row.DUE_DATE_TYPE === 0" type="error"
+              >已到期
+            </el-tag>
+            <el-tag v-else-if="row.DUE_DATE_TYPE === 2" type="info"
+              >即将到期
+            </el-tag>
          </template>
        </el-table-column>
-        <el-table-column prop="NEW_ARCHIVES_TYPE" label="车辆状态" width="150">
+        <el-table-column prop="ARCHIVES_TYPE" label="车辆状态" width="150">
          <template #default="{ row }">
-            <el-tag v-if="row.NEW_ARCHIVES_TYPE === '1'">报废</el-tag>
-            <el-tag v-else-if="row.NEW_ARCHIVES_TYPE === '0'">正常</el-tag>
-            <el-tag v-else-if="row.NEW_ARCHIVES_TYPE === '2'">过户</el-tag>
+            <el-tag v-if="row.ARCHIVES_TYPE === '2'" type="error">报废 </el-tag>
+            <el-tag v-else-if="row.ARCHIVES_TYPE === '0'" type="success"
+              >正常
+            </el-tag>
+            <el-tag v-else-if="row.ARCHIVES_TYPE === '1'" type="info"
+              >过户
+            </el-tag>
          </template>
        </el-table-column>
        <el-table-column prop="CREATTIME" label="创建时间" width="150" />
@ -237,6 +247,7 @@ import {
  REMINDER_STATUS_LIST,
 } from "@/assets/js/constant.js";

+console.log("-=-=-==", await getOperationsList());
 const router = useRouter();
 const data = reactive({
  exportExcelDialog: {
--- a/src/views/mechanical_files/production_accident/add.vue
+++ b/src/views/mechanical_files/production_accident/add.vue
@ -24,7 +24,7 @@
        </el-col>
        <el-col :span="5">
          <el-form-item label="人员性别" prop="SEX">
-            <el-select v-model="data.form.SEX" placeholder="请选择人员性别">
+            <el-select v-model="data.form.GENDER" placeholder="请选择人员性别">
              <el-option label="男" :value="'1'" />
              <el-option label="女" :value="'0'" />
            </el-select>
Author	SHA1	Message	Date
xiepeng	43b9287721	BUG 优化	2024-04-02 18:52:04 +08:00
xiepeng	a090f54ecf	Merge remote-tracking branch 'origin/dev' into dev	2024-04-02 08:26:09 +08:00
xiepeng	83faf65bb4	BUG 优化	2024-04-01 18:55:28 +08:00